[java-idp-testbed COMMIT] in /trunk: pom.xml src/main/resources/conf/authn-comparison.xml src/main/resources/conf/aut...

[noreply at shibboleth.net]

Author: scantor
Date: Mon Oct 14 23:05:32 2013
New Revision: 7

URL: http://svn.shibboleth.net/view/java-idp-testbed?rev=7&view=rev
Log:
Updating files and shifting to file vs. classpath access to most of them.

Added:
    trunk/src/main/resources/conf/authn-comparison.xml   (with props)
    trunk/src/main/resources/conf/authn-flow-descriptors.xml   (with props)
    trunk/src/main/resources/conf/global-beans.xml   (with props)
    trunk/src/main/resources/conf/globalAppContext.xml
      - copied, changed from r6, trunk/src/main/webapp/WEB-INF/globalAppContext.xml
    trunk/src/main/resources/conf/idp.properties   (with props)
    trunk/src/main/resources/conf/logback.xml   (with props)
    trunk/src/main/resources/conf/mvc-beans.xml   (with props)
    trunk/src/main/resources/conf/session-manager.xml   (with props)
    trunk/src/main/resources/conf/webflow-config.xml   (with props)
    trunk/src/main/resources/flows/
    trunk/src/main/resources/flows/authn/
    trunk/src/main/resources/flows/authn/authn-beans.xml   (with props)
    trunk/src/main/resources/flows/authn/authn-flow.xml   (with props)
    trunk/src/main/resources/flows/authn/ipaddress-authn-beans.xml   (with props)
    trunk/src/main/resources/flows/authn/ipaddress-authn-flow.xml   (with props)
    trunk/src/main/resources/flows/authn/jaas-basic-authn-beans.xml   (with props)
    trunk/src/main/resources/flows/authn/jaas-basic-authn-flow.xml   (with props)
    trunk/src/main/resources/flows/authn/jaas-form-authn-beans.xml   (with props)
    trunk/src/main/resources/flows/authn/jaas-form-authn-flow.xml   (with props)
    trunk/src/main/resources/flows/authn/remoteuser-authn-beans.xml   (with props)
    trunk/src/main/resources/flows/authn/remoteuser-authn-flow.xml   (with props)
    trunk/src/main/resources/flows/authn/simple-subject-c14n-flow.xml   (with props)
    trunk/src/main/resources/flows/authn/subject-c14n-beans.xml   (with props)
    trunk/src/main/resources/flows/saml2/
      - copied from r6, trunk/src/main/webapp/WEB-INF/idp/flows/saml2/
    trunk/src/main/resources/views/
    trunk/src/main/resources/views/login.vm
      - copied, changed from r6, trunk/src/main/webapp/WEB-INF/templates/login.vm.off
Modified:
    trunk/pom.xml
    trunk/src/main/resources/flows/saml2/sso-abstract-beans.xml
    trunk/src/main/resources/flows/saml2/sso-post-beans.xml
    trunk/src/main/resources/flows/saml2/sso-redirect-beans.xml
    trunk/src/main/resources/flows/saml2/sso-unsolicited-beans.xml
    trunk/src/main/resources/logback.xml
    trunk/src/main/webapp/WEB-INF/globalAppContext.xml
    trunk/src/main/webapp/WEB-INF/idp/flows/
    trunk/src/main/webapp/WEB-INF/idp/idp-servlet.xml
    trunk/src/main/webapp/WEB-INF/idp/testbed.xml
    trunk/src/main/webapp/WEB-INF/idp/webflow-config.xml
    trunk/src/main/webapp/WEB-INF/internal.xml
    trunk/src/main/webapp/WEB-INF/templates/
    trunk/src/main/webapp/WEB-INF/web.xml

Modified: trunk/pom.xml
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/pom.xml?rev=7&r1=6&r2=7&view=diff
==============================================================================
--- trunk/pom.xml (original)
+++ trunk/pom.xml Mon Oct 14 23:05:32 2013
@@ -51,6 +51,12 @@
             <artifactId>idp-authn-impl</artifactId>
             <version>${idp.version}</version>
         </dependency>
+
+        <dependency>
+            <groupId>${idp.groupId}</groupId>
+            <artifactId>idp-session-impl</artifactId>
+            <version>${idp.version}</version>
+        </dependency>
         
         <dependency>
             <groupId>${idp.groupId}</groupId>
@@ -85,8 +91,7 @@
         <dependency>
             <groupId>net.shibboleth.ext</groupId>
             <artifactId>spring-extensions</artifactId>
-            <version>1.0-SNAPSHOT</version>
-        </dependency>
+            </dependency>
     
         <dependency>
             <groupId>${spring-webflow.groupId}</groupId>

Copied: trunk/src/main/resources/conf/globalAppContext.xml (from r6, trunk/src/main/webapp/WEB-INF/globalAppContext.xml)
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/main/resources/conf/globalAppContext.xml?p2=trunk/src/main/resources/conf/globalAppContext.xml&p1=trunk/src/main/webapp/WEB-INF/globalAppContext.xml&r1=6&r2=7&rev=7&view=diff
==============================================================================
--- trunk/src/main/webapp/WEB-INF/globalAppContext.xml (original)
+++ trunk/src/main/resources/conf/globalAppContext.xml Mon Oct 14 23:05:32 2013
@@ -1,25 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:context="http://www.springframework.org/schema/context"
        xmlns:util="http://www.springframework.org/schema/util"
+       xmlns:p="http://www.springframework.org/schema/p"
+       xmlns:c="http://www.springframework.org/schema/c"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="
-            http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd

[... 210 lines stripped ...]