From b2225d892351fb04e76fe238b5f2a0231e54ff5a Mon Sep 17 00:00:00 2001
From: "Jeremy R. Easton-Marks" <j.r.eastonmarks@gmail.com>
Date: Fri, 27 May 2016 12:39:37 -0400
Subject: [PATCH] RC 3

- Fix dependency issues
- Fix Persistence DB issue
---
 .../hms/dbmi/bd2k/irct/cl/filter/SessionFilter.java      | 9 ++-------
 src/main/resources/META-INF/persistence.xml              | 2 +-
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/main/java/edu/harvard/hms/dbmi/bd2k/irct/cl/filter/SessionFilter.java b/src/main/java/edu/harvard/hms/dbmi/bd2k/irct/cl/filter/SessionFilter.java
index 369cef8..942cec8 100644
--- a/src/main/java/edu/harvard/hms/dbmi/bd2k/irct/cl/filter/SessionFilter.java
+++ b/src/main/java/edu/harvard/hms/dbmi/bd2k/irct/cl/filter/SessionFilter.java
@@ -43,24 +43,19 @@
 @WebFilter(filterName = "session-filter", urlPatterns = { "/*" })
 public class SessionFilter implements Filter {
 	
-	@javax.annotation.Resource(mappedName ="java:global/client_secret")
-	private String clientId;
 	@javax.annotation.Resource(mappedName ="java:global/client_id")
+	private String clientId;
+	@javax.annotation.Resource(mappedName ="java:global/client_secret")
 	private String clientSecret;
 	@javax.annotation.Resource(mappedName ="java:global/userField")
 	private String userField;
 
-//	@Inject
-//	private ServletContext context;
 
 	@Inject
 	private SecurityController sc;
 
 	@Override
 	public void init(FilterConfig fliterConfig) throws ServletException {
-//		this.clientSecret = context.getInitParameter("client_secret");
-//		this.clientId = context.getInitParameter("client_id");
-//		this.userField = context.getInitParameter("userField");
 	}
 
 	@Override
diff --git a/src/main/resources/META-INF/persistence.xml b/src/main/resources/META-INF/persistence.xml
index 6963080..cf9a3d8 100644
--- a/src/main/resources/META-INF/persistence.xml
+++ b/src/main/resources/META-INF/persistence.xml
@@ -22,7 +22,7 @@
         http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd">
    
    <persistence-unit name="primary">
-      <jta-data-source>java:jboss/datasources/irct-cl-dev-DS</jta-data-source>
+      <jta-data-source>java:jboss/datasources/irct-cl-DS</jta-data-source>
       <class>edu.harvard.hms.dbmi.bd2k.irct.model.resource.Field</class>
       <class>edu.harvard.hms.dbmi.bd2k.irct.model.resource.Resource</class>
       <class>edu.harvard.hms.dbmi.bd2k.irct.model.resource.ProcessType</class>