[java-idp-testbed COMMIT] in /trunk: Main.launch pom.xml src/main/resources/conf/global-user.xml src/main/resources/c...

[noreply at shibboleth.net]

Author: tzeller
Date: Sat Nov  9 02:16:17 2013
New Revision: 39

URL: http://svn.shibboleth.net/view/java-idp-testbed?rev=39&view=rev
Log:
Some configuration location cleanup. Make idp.home a system property instead of being set in idp.properties. Replace user specific file: paths with classpath:. Rename menu.html to index.html.

The testbed can be launched from the command line via "mvn jetty:run" or in Eclipse via Main.java -> Run As -> Java Application. The provided Eclipse launch configuration, Main.launch, sets idp.home as a system property.

Added:
    trunk/Main.launch
    trunk/src/main/webapp/index.html
      - copied unchanged from r38, trunk/src/main/webapp/menu.html
Modified:
    trunk/pom.xml
    trunk/src/main/resources/conf/global-user.xml
    trunk/src/main/resources/conf/idp.properties
    trunk/src/main/resources/conf/jaas-authn-config.xml
    trunk/src/main/resources/system/conf/global-system.xml
    trunk/src/main/resources/system/flows/authn/authn-beans.xml
    trunk/src/main/webapp/WEB-INF/web.xml
    trunk/src/main/webapp/menu.html

Modified: trunk/pom.xml
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/pom.xml?rev=39&r1=38&r2=39&view=diff
==============================================================================
--- trunk/pom.xml (original)
+++ trunk/pom.xml Sat Nov  9 02:16:17 2013
@@ -211,7 +211,15 @@
                     <webApp>
                         <contextPath>/</contextPath>
                         <overrideDescriptor>src/test/config/override-web.xml</overrideDescriptor>
+                        <!-- Startup faster. https://jira.codehaus.org/browse/JETTY-1503 -->
+                        <webInfIncludeJarPattern>.*/.*jsp-api-[^/]\.jar$|./.*jsp-[^/]\.jar$|./.*taglibs[^/]*\.jar$</webInfIncludeJarPattern>
                     </webApp>
+                    <systemProperties>
+                        <systemProperty>
+                            <name>idp.home</name>
+                            <value>${project.basedir}/src/main/resources</value>
+                        </systemProperty>    
+                     </systemProperties>
                     <loginServices>
                         <loginService implementation="org.eclipse.jetty.security.HashLoginService">
                         <name>Shib Testbed Web Authentication</name>

Modified: trunk/src/main/resources/conf/global-user.xml
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/main/resources/conf/global-user.xml?rev=39&r1=38&r2=39&view=diff
==============================================================================
--- trunk/src/main/resources/conf/global-user.xml (original)
+++ trunk/src/main/resources/conf/global-user.xml Sat Nov  9 02:16:17 2013
@@ -12,7 +12,7 @@
        default-init-method="initialize"
        default-destroy-method="destroy">
 
-    <context:property-placeholder location="classpath:conf/idp.properties" />
+    <context:property-placeholder location="file://${idp.home}/conf/idp.properties" />
 
     <import resource="authn-comparison.xml" />
     <import resource="authn-flow-descriptors.xml" />

Modified: trunk/src/main/resources/conf/idp.properties
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/main/resources/conf/idp.properties?rev=39&r1=38&r2=39&view=diff
==============================================================================
--- trunk/src/main/resources/conf/idp.properties (original)
+++ trunk/src/main/resources/conf/idp.properties Sat Nov  9 02:16:17 2013
@@ -1,5 +1,5 @@
 # Provides base location of most out-of-war resources
-idp.home = /Users/scantor/Documents/workspace/3.0/java-idp-testbed/src/main/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/resources/conf/jaas-authn-config.xml
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/main/resources/conf/jaas-authn-config.xml?rev=39&r1=38&r2=39&view=diff
==============================================================================
--- trunk/src/main/resources/conf/jaas-authn-config.xml (original)
+++ trunk/src/main/resources/conf/jaas-authn-config.xml Sat Nov  9 02:16:17 2013
@@ -12,7 +12,7 @@
        default-init-method="initialize"
        default-destroy-method="destroy">
        
-    <context:property-placeholder location="classpath:conf/idp.properties" />
+    <context:property-placeholder location="file://${idp.home}/conf/idp.properties" />
     
     <!-- Specify your JAAS config. -->
     <bean id="JAASConfig" class="org.springframework.core.io.FileSystemResource" c:path="${idp.home}/conf/jaas.config" />

Modified: trunk/src/main/resources/system/conf/global-system.xml
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/main/resources/system/conf/global-system.xml?rev=39&r1=38&r2=39&view=diff
==============================================================================
--- trunk/src/main/resources/system/conf/global-system.xml (original)

[... 50 lines stripped ...]