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

[noreply at shibboleth.net]

Author: tzeller
Date: Tue Dec 24 19:25:58 2013
New Revision: 99

URL: http://svn.shibboleth.net/view/java-idp-testbed?rev=99&view=rev
Log:
Move testbed specific resources to src/main/resources. Introduce an 'app.home' property which points to java-idp-testbed/src/main/resources similar to 'idp.home' which points to idp-conf/src/main/resources.

Added:
    trunk/src/main/resources/conf/logback.xml
      - copied unchanged from r97, trunk/src/main/config/conf/logback.xml
    trunk/src/main/resources/creds/idp.crt
      - copied unchanged from r97, trunk/src/main/config/creds/idp.crt
    trunk/src/main/resources/creds/idp.key
      - copied unchanged from r97, trunk/src/main/config/creds/idp.key
    trunk/src/main/resources/creds/sp.crt
      - copied unchanged from r97, trunk/src/main/config/creds/sp.crt
    trunk/src/main/resources/creds/sp.key
      - copied unchanged from r97, trunk/src/main/config/creds/sp.key
    trunk/src/main/resources/system/conf/mvc-beans.xml
      - copied unchanged from r97, trunk/src/main/config/system/conf/mvc-beans.xml
    trunk/src/main/resources/system/conf/testbed-beans.xml
      - copied, changed from r97, trunk/src/main/config/system/conf/testbed-beans.xml
    trunk/src/main/resources/test/jetty-realm.properties
      - copied unchanged from r97, trunk/src/main/config/test/jetty-realm.properties
    trunk/src/main/resources/test/jetty.jks
      - copied unchanged from r97, trunk/src/main/config/test/jetty.jks
    trunk/src/main/resources/test/ldap.ldif
      - copied unchanged from r97, trunk/src/main/config/test/ldap.ldif
    trunk/src/main/resources/test/override-web.xml
      - copied unchanged from r97, trunk/src/main/config/test/override-web.xml
Modified:
    trunk/idp-testbed-logback.launch
    trunk/pom.xml
    trunk/src/main/config/conf/logback.xml
    trunk/src/main/config/creds/idp.crt
    trunk/src/main/config/creds/idp.key
    trunk/src/main/config/creds/sp.crt
    trunk/src/main/config/creds/sp.key
    trunk/src/main/config/system/conf/mvc-beans.xml
    trunk/src/main/config/system/conf/testbed-beans.xml
    trunk/src/main/config/test/jetty-realm.properties
    trunk/src/main/config/test/jetty.jks
    trunk/src/main/config/test/ldap.ldif
    trunk/src/main/config/test/override-web.xml
    trunk/src/main/java/Main.java

Modified: trunk/idp-testbed-logback.launch
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/idp-testbed-logback.launch?rev=99&r1=98&r2=99&view=diff
==============================================================================
--- trunk/idp-testbed-logback.launch (original)
+++ trunk/idp-testbed-logback.launch Tue Dec 24 19:25:58 2013
@@ -11,5 +11,5 @@
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="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="-Dlogback.configurationFile=${workspace_loc:java-idp-testbed}/src/main/config/conf/logback.xml"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dlogback.configurationFile=${workspace_loc:java-idp-testbed}/src/main/resources/conf/logback.xml"/>
 </launchConfiguration>

Modified: trunk/pom.xml
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/pom.xml?rev=99&r1=98&r2=99&view=diff
==============================================================================
--- trunk/pom.xml (original)
+++ trunk/pom.xml Tue Dec 24 19:25:58 2013
@@ -20,6 +20,9 @@
         <opensaml.version>3.0-SNAPSHOT</opensaml.version>
         <!-- The assembly-directory is where the testbed is built before being archived. -->
         <assembly-directory>${project.build.directory}/${project.artifactId}-${project.version}-distribution</assembly-directory>
+        <!-- TODO tz These paths are fragile. -->
+        <idp.home>${project.basedir}/../java-identity-provider/idp-conf/src/main/resources</idp.home>
+        <app.home>${project.basedir}/src/main/resources</app.home>
     </properties>
 
     <repositories>
@@ -237,7 +240,7 @@
                             <properties>
                                 <property>
                                     <name>logback.configurationFile</name>
-                                    <value>${project.baseUri}/src/main/config/conf/logback.xml</value>
+                                    <value>${project.baseUri}/src/main/resources/conf/logback.xml</value>
                                 </property>
                             </properties>
                         </configuration>
@@ -253,49 +256,39 @@
                     <scanIntervalSeconds>10</scanIntervalSeconds>
                     <webApp>
                         <contextPath>/</contextPath>
-                        <overrideDescriptor>src/test/config/override-web.xml</overrideDescriptor>
+                        <overrideDescriptor>src/main/resources/test/override-web.xml</overrideDescriptor>

[... 213 lines stripped ...]