[java-idp-testbed COMMIT] in /trunk: idp-testbed.launch pom.xml src/main/config/ src/main/config/conf/ src/main/confi...

[noreply at shibboleth.net]

Author: tzeller
Date: Wed Nov 13 16:19:55 2013
New Revision: 44

URL: http://svn.shibboleth.net/view/java-idp-testbed?rev=44&view=rev
Log:
Move configuration resources from classpath to filesystem, from src/main/resources to src/main/config.

Added:
    trunk/src/main/config/
    trunk/src/main/config/conf/
      - copied from r42, trunk/src/main/resources/conf/
    trunk/src/main/config/creds/
      - copied from r42, trunk/src/main/resources/creds/
    trunk/src/main/config/flows/
      - copied from r42, trunk/src/main/resources/flows/
    trunk/src/main/config/logback.xml
      - copied unchanged from r42, trunk/src/main/resources/logback.xml
    trunk/src/main/config/system/
      - copied from r42, trunk/src/main/resources/system/
    trunk/src/main/config/views/
      - copied from r42, trunk/src/main/resources/views/
Modified:
    trunk/idp-testbed.launch
    trunk/pom.xml
    trunk/src/main/config/conf/idp.properties
    trunk/src/main/config/system/conf/testbed-beans.xml
    trunk/src/main/resources/conf/
    trunk/src/main/resources/creds/
    trunk/src/main/resources/flows/
    trunk/src/main/resources/logback.xml
    trunk/src/main/resources/system/
    trunk/src/main/resources/views/
    trunk/src/main/webapp/WEB-INF/web.xml

Modified: trunk/idp-testbed.launch
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/idp-testbed.launch?rev=44&r1=43&r2=44&view=diff
==============================================================================
--- trunk/idp-testbed.launch (original)
+++ trunk/idp-testbed.launch Wed Nov 13 16:19:55 2013
@@ -11,5 +11,5 @@
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="common.Main"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="java-idp-testbed"/>
 <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Didp.home=${workspace_loc:java-idp-testbed}/src/main/resources"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Didp.home=${workspace_loc:java-idp-testbed}/src/main/config"/>
 </launchConfiguration>

Modified: trunk/pom.xml
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/pom.xml?rev=44&r1=43&r2=44&view=diff
==============================================================================
--- trunk/pom.xml (original)
+++ trunk/pom.xml Wed Nov 13 16:19:55 2013
@@ -217,7 +217,7 @@
                     <systemProperties>
                         <systemProperty>
                             <name>idp.home</name>
-                            <value>${project.basedir}/src/main/resources</value>
+                            <value>${project.basedir}/src/main/config</value>
                         </systemProperty>    
                      </systemProperties>
                     <loginServices>

Modified: trunk/src/main/config/conf/idp.properties
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/main/config/conf/idp.properties?rev=44&r1=42&r2=44&view=diff
==============================================================================
--- trunk/src/main/config/conf/idp.properties (original)
+++ trunk/src/main/config/conf/idp.properties Wed Nov 13 16:19:55 2013
@@ -1,5 +1,4 @@
 # Provides base location of most out-of-war resources
-# idp.home = /Users/scantor/Documents/workspace/3.0/java-idp-testbed/src/main/resources
 
 # Use the XML Parser SecurityManager appropriate for the chosen parser
 # Sun/Oracle, use com.sun.org.apache.xerces.internal.util.SecurityManager

Modified: trunk/src/main/config/system/conf/testbed-beans.xml
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/main/config/system/conf/testbed-beans.xml?rev=44&r1=42&r2=44&view=diff
==============================================================================
--- trunk/src/main/config/system/conf/testbed-beans.xml (original)
+++ trunk/src/main/config/system/conf/testbed-beans.xml Wed Nov 13 16:19:55 2013
@@ -32,7 +32,7 @@
     <bean id="testbed.idp.PrivateKey" class="net.shibboleth.ext.spring.factory.PrivateKeyFactoryBean">
         <property name="privateKeyFile">
             <bean class="java.io.File">
-                <constructor-arg value="src/main/resources/creds/idp.key" />
+                <constructor-arg value="${idp.home}/creds/idp.key" />
             </bean>
         </property>
     </bean>
@@ -40,7 +40,7 @@
     <bean id="testbed.idp.X509Certificate" class="net.shibboleth.ext.spring.factory.X509CertificateFactoryBean">
         <property name="certificateFile">
             <bean class="java.io.File">
-                <constructor-arg value="src/main/resources/creds/idp.crt" />
+                <constructor-arg value="${idp.home}/creds/idp.crt" />
             </bean>
         </property>
     </bean>
@@ -52,7 +52,7 @@
     <bean id="testbed.sp.PrivateKey" class="net.shibboleth.ext.spring.factory.PrivateKeyFactoryBean">
         <property name="privateKeyFile">
             <bean class="java.io.File">

[... 39 lines stripped ...]