svn commit: r1163010 - in /incubator/rave/sandbox/science-gateways: gridshib-extensions/pom.xml rave-gateway-extensions/pom.xml rave-gateway-extensions/src/main/java/org/apache/rave/portal/service/impl/CommunityUserService.java

[mp...@apache.org]

Author: mpierce
Date: Mon Aug 29 21:16:05 2011
New Revision: 1163010

URL: http://svn.apache.org/viewvc?rev=1163010&view=rev
Log:
(RAVE-213) Completing sandbox cleanup

Modified:
    incubator/rave/sandbox/science-gateways/gridshib-extensions/pom.xml
    incubator/rave/sandbox/science-gateways/rave-gateway-extensions/pom.xml
    incubator/rave/sandbox/science-gateways/rave-gateway-extensions/src/main/java/org/apache/rave/portal/service/impl/CommunityUserService.java

Modified: incubator/rave/sandbox/science-gateways/gridshib-extensions/pom.xml
URL: http://svn.apache.org/viewvc/incubator/rave/sandbox/science-gateways/gridshib-extensions/pom.xml?rev=1163010&r1=1163009&r2=1163010&view=diff
==============================================================================
--- incubator/rave/sandbox/science-gateways/gridshib-extensions/pom.xml (original)
+++ incubator/rave/sandbox/science-gateways/gridshib-extensions/pom.xml Mon Aug 29 21:16:05 2011
@@ -10,7 +10,7 @@
 
   <properties>
 	 <!-- This must match the cargo path used in rave-merger -->
-	 <catalina.home>${project.basedir}/../rave-portal/target/tomcat6x/</catalina.home>
+	 <catalina.home>${project.basedir}/../rave-gateway-extensions/target/tomcat6x/</catalina.home>
   </properties>
 
   <build>
@@ -37,7 +37,7 @@
 				<phase>install</phase>
 				<configuration>
 				  <tasks>
-					 <echo message="Installing gridshib extension:${basedir}/${catalina.home}/endorsed"/>
+					 <echo message="Installing gridshib extension:${catalina.home}/endorsed"/>
 					 <mkdir dir="${catalina.home}/endorsed"/>
 					 <copy todir="${catalina.home}/endorsed">
 						<fileset dir="./gridshib-endorsed-lib"/>

Modified: incubator/rave/sandbox/science-gateways/rave-gateway-extensions/pom.xml
URL: http://svn.apache.org/viewvc/incubator/rave/sandbox/science-gateways/rave-gateway-extensions/pom.xml?rev=1163010&r1=1163009&r2=1163010&view=diff
==============================================================================
--- incubator/rave/sandbox/science-gateways/rave-gateway-extensions/pom.xml (original)
+++ incubator/rave/sandbox/science-gateways/rave-gateway-extensions/pom.xml Mon Aug 29 21:16:05 2011
@@ -90,6 +90,14 @@
 	 <!-- ================================================== -->
 	 <!-- Gridshib dependencies -->
 	 <!-- ================================================== -->
+    <dependency>
+      <groupId>xml-security</groupId>
+      <artifactId>xmlsec</artifactId>
+      <version>1.3.0</version>
+      <scope>compile</scope>
+      <type>jar</type>
+    </dependency>
+
 	 <dependency>
 		<groupId>edu.ncsa</groupId>
 		<artifactId>gridshib-saml-tools</artifactId>

Modified: incubator/rave/sandbox/science-gateways/rave-gateway-extensions/src/main/java/org/apache/rave/portal/service/impl/CommunityUserService.java
URL: http://svn.apache.org/viewvc/incubator/rave/sandbox/science-gateways/rave-gateway-extensions/src/main/java/org/apache/rave/portal/service/impl/CommunityUserService.java?rev=1163010&r1=1163009&r2=1163010&view=diff
==============================================================================
--- incubator/rave/sandbox/science-gateways/rave-gateway-extensions/src/main/java/org/apache/rave/portal/service/impl/CommunityUserService.java (original)
+++ incubator/rave/sandbox/science-gateways/rave-gateway-extensions/src/main/java/org/apache/rave/portal/service/impl/CommunityUserService.java Mon Aug 29 21:16:05 2011
@@ -106,6 +106,7 @@ public class CommunityUserService extend
 
     @Override
 	 public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException, DataAccessException {
+		  //TODO: logger isn't working properly.
         logger.debug("loadUserByUsername called with: " + username);
 		  logger.info("Running GSI login");
         final User user = userRepository.getByUsername(username);
@@ -136,6 +137,8 @@ public class CommunityUserService extend
 
 				//This is the authentication instant for the user's portal session.
 				Date authnInstant=new Date();
+				//This requires some magic: the RequestContextHolder is enabled here by
+				//including RequestContextListener as a listener in web.xml.  Yikes.
 				String ipAddress = ((ServletRequestAttributes)RequestContextHolder.currentRequestAttributes()).getRequest().getRemoteAddr();
 				
 				logger.info("SAMLAttributes to assign:"+userName+" "+userEmail+" "+authnInstant