[java-identity-provider COMMIT] in /trunk/idp-conf/src: main/resources/creds/TODO.txt main/resources/creds/idp-encryp...

[noreply at shibboleth.net]

Author: tzeller
Date: Wed Jul  9 19:02:17 2014
New Revision: 6261

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6261&view=rev
Log:
IDP-436 
- Move test certificates and keys in idp-conf from src/main/resources to src/test/resources
- Change 'idp.home' to 'classpath:' in the testbed and integration tests
- Override the path to the keystore used by Jetty in the testbed
- Add a classpath example metadata provider to idp-conf/src/test/resources

Added:
    trunk/idp-conf/src/test/resources/conf/
    trunk/idp-conf/src/test/resources/conf/metadata-providers.xml   (with props)
    trunk/idp-conf/src/test/resources/creds/TODO.txt
      - copied unchanged from r6258, trunk/idp-conf/src/main/resources/creds/TODO.txt
    trunk/idp-conf/src/test/resources/creds/idp-encryption.crt
      - copied unchanged from r6258, trunk/idp-conf/src/main/resources/creds/idp-encryption.crt
    trunk/idp-conf/src/test/resources/creds/idp-encryption.key
      - copied unchanged from r6258, trunk/idp-conf/src/main/resources/creds/idp-encryption.key
    trunk/idp-conf/src/test/resources/creds/idp-signing.crt
      - copied unchanged from r6258, trunk/idp-conf/src/main/resources/creds/idp-signing.crt
    trunk/idp-conf/src/test/resources/creds/idp-signing.key
      - copied unchanged from r6258, trunk/idp-conf/src/main/resources/creds/idp-signing.key
    trunk/idp-conf/src/test/resources/creds/localhost.p12
      - copied unchanged from r6258, trunk/idp-conf/src/main/resources/creds/localhost.p12
    trunk/idp-conf/src/test/resources/creds/sealer.jks
      - copied unchanged from r6258, trunk/idp-conf/src/main/resources/creds/sealer.jks
Modified:
    trunk/idp-conf/src/main/resources/creds/TODO.txt
    trunk/idp-conf/src/main/resources/creds/idp-encryption.crt
    trunk/idp-conf/src/main/resources/creds/idp-encryption.key
    trunk/idp-conf/src/main/resources/creds/idp-signing.crt
    trunk/idp-conf/src/main/resources/creds/idp-signing.key
    trunk/idp-conf/src/main/resources/creds/localhost.p12
    trunk/idp-conf/src/main/resources/creds/sealer.jks
    trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/AbstractFlowTest.java

Modified: trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/AbstractFlowTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/AbstractFlowTest.java?rev=6261&r1=6260&r2=6261&view=diff
==============================================================================
--- trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/AbstractFlowTest.java (original)
+++ trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/AbstractFlowTest.java Wed Jul  9 19:02:17 2014
@@ -18,8 +18,6 @@
 package net.shibboleth.idp.test.flows;
 
 import java.io.IOException;
-import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -70,7 +68,6 @@
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.testng.AbstractTestNGSpringContextTests;
 import org.springframework.test.context.web.WebAppConfiguration;
-import org.springframework.util.StringUtils;
 import org.springframework.webflow.core.collection.MutableAttributeMap;
 import org.springframework.webflow.definition.FlowDefinition;
 import org.springframework.webflow.engine.EndState;
@@ -185,13 +182,10 @@
     }
 
     /**
-     * Set the 'idp.home' property to absolute path to idp-conf/src/main/resources.
+     * Set the 'idp.home' property to "classpath:".
      */
     public static void setIdPHomeProperty() {
-        Path idpHome = Paths.get(Paths.get("").toAbsolutePath().toString(), "src", "main", "resources");
-        String normalized = StringUtils.cleanPath(idpHome.toString());
-        System.setProperty("idp.home", normalized);
-        log.debug("Setting idp.home to '{}'", normalized);
+        System.setProperty("idp.home", "classpath:");
     }
 
     /**