[java-idp-testbed COMMIT] in /trunk/src/main: java/Main.java java/sp/BaseSAMLController.java resources/system/conf/te...

[noreply at shibboleth.net]

Author: tzeller
Date: Wed Jun  4 19:30:31 2014
New Revision: 260

URL: http://svn.shibboleth.net/view/java-idp-testbed?rev=260&view=rev
Log:
Cleanup :
Remove testbed.home property.
Remove sp credentials now located in idp-conf.

Modified:
    trunk/src/main/java/Main.java
    trunk/src/main/java/sp/BaseSAMLController.java
    trunk/src/main/resources/system/conf/testbed-beans.xml
    trunk/src/main/webapp/WEB-INF/sp/testbed.xml
    trunk/src/main/webapp/WEB-INF/web.xml

Modified: trunk/src/main/java/Main.java
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/main/java/Main.java?rev=260&r1=259&r2=260&view=diff
==============================================================================
--- trunk/src/main/java/Main.java (original)
+++ trunk/src/main/java/Main.java Wed Jun  4 19:30:31 2014
@@ -54,7 +54,6 @@
             final URL location = protectionDomain.getCodeSource().getLocation();
 
             PathPropertySupport.setupIdPHomeProperties();
-            PathPropertySupport.setupTestbedHomeProperty();
 
             // Determine path to jetty-base in the idp-distribution module.
             final Path pathToJettyBase =

Modified: trunk/src/main/java/sp/BaseSAMLController.java
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/main/java/sp/BaseSAMLController.java?rev=260&r1=259&r2=260&view=diff
==============================================================================
--- trunk/src/main/java/sp/BaseSAMLController.java (original)
+++ trunk/src/main/java/sp/BaseSAMLController.java Wed Jun  4 19:30:31 2014
@@ -21,6 +21,7 @@
 
 import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
 import net.shibboleth.utilities.java.support.security.IdentifierGenerationStrategy;
+import net.shibboleth.utilities.java.support.security.Type4UuidIdentifierGenerationStrategy;
 import net.shibboleth.utilities.java.support.xml.ParserPool;
 
 import org.apache.velocity.app.VelocityEngine;
@@ -44,13 +45,13 @@
 
     @Autowired protected MarshallerFactory marshallerFactory;
 
-    @Autowired @Qualifier("testbed.IdGenerator") protected IdentifierGenerationStrategy idGenerator;
+    protected IdentifierGenerationStrategy idGenerator = new Type4UuidIdentifierGenerationStrategy();
 
     @Autowired protected VelocityEngine velocityEngine;
 
     @Autowired protected ParserPool parserPool;
 
-    @Autowired @Qualifier("sp.Credential") protected Credential spCredential;
+    @Autowired @Qualifier("test.sp.Credential") protected Credential spCredential;
 
     protected MessageContext<SAMLObject> decodeInboundMessageContextPost(HttpServletRequest servletRequest)
             throws Exception {

Modified: trunk/src/main/webapp/WEB-INF/web.xml
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/main/webapp/WEB-INF/web.xml?rev=260&r1=259&r2=260&view=diff
==============================================================================
--- trunk/src/main/webapp/WEB-INF/web.xml (original)
+++ trunk/src/main/webapp/WEB-INF/web.xml Wed Jun  4 19:30:31 2014
@@ -2,10 +2,10 @@
 <web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" version="3.0">
 
-    <!-- Context config params -->
+    <!-- Context config params, /test/test-beans.xml is from idp-conf/src/test/resources -->
     <context-param>
         <param-name>contextConfigLocation</param-name>
-        <param-value>file:///${testbed.home}/system/conf/testbed-opensaml.xml file:///${testbed.home}/system/conf/testbed-beans.xml</param-value>
+        <param-value>classpath:/system/conf/testbed-opensaml.xml classpath:/test/test-beans.xml</param-value>
     </context-param>
 
     <!-- Listeners -->
@@ -37,7 +37,7 @@
         <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
         <init-param>
             <param-name>contextConfigLocation</param-name>
-            <param-value>/WEB-INF/sp/sp-servlet.xml /WEB-INF/sp/testbed.xml</param-value>
+            <param-value>/WEB-INF/sp/sp-servlet.xml</param-value>
         </init-param>
         <load-on-startup>1</load-on-startup>
     </servlet>