[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources: conf/attribute-filter.xml conf/attribute-resol...

[noreply at shibboleth.net]

Author: tzeller
Date: Wed Dec 18 18:17:06 2013
New Revision: 5055

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5055&view=rev
Log:
IDP-348 Sync testbed to idp-conf.

Added:
    trunk/idp-conf/src/main/resources/conf/attribute-filter.xml   (with props)
    trunk/idp-conf/src/main/resources/conf/attribute-resolver.xml   (with props)
    trunk/idp-conf/src/main/resources/flows/
    trunk/idp-conf/src/main/resources/flows/authn/
    trunk/idp-conf/src/main/resources/flows/authn/account-locked-flow.xml   (with props)
    trunk/idp-conf/src/main/resources/flows/authn/authn-conditions-flow.xml   (with props)
    trunk/idp-conf/src/main/resources/flows/authn/expired-password-flow.xml   (with props)
    trunk/idp-conf/src/main/resources/flows/authn/expiring-password-flow.xml   (with props)
    trunk/idp-conf/src/main/resources/system/conf/jetty.xml   (with props)
    trunk/idp-conf/src/main/resources/system/flows/saml2/
    trunk/idp-conf/src/main/resources/system/flows/saml2/sso-abstract-beans.xml   (with props)
    trunk/idp-conf/src/main/resources/system/flows/saml2/sso-abstract-flow.xml   (with props)
    trunk/idp-conf/src/main/resources/system/flows/saml2/sso-post-beans.xml   (with props)
    trunk/idp-conf/src/main/resources/system/flows/saml2/sso-post-flow.xml   (with props)
    trunk/idp-conf/src/main/resources/system/flows/saml2/sso-redirect-beans.xml   (with props)
    trunk/idp-conf/src/main/resources/system/flows/saml2/sso-redirect-flow.xml   (with props)
    trunk/idp-conf/src/main/resources/system/flows/saml2/sso-unsolicited-beans.xml   (with props)
    trunk/idp-conf/src/main/resources/system/flows/saml2/sso-unsolicited-flow.xml   (with props)
Modified:
    trunk/idp-conf/src/main/resources/conf/global-user.xml
    trunk/idp-conf/src/main/resources/conf/idp.properties
    trunk/idp-conf/src/main/resources/conf/jaas.config
    trunk/idp-conf/src/main/resources/conf/ldap-authn-config.xml
    trunk/idp-conf/src/main/resources/conf/webflow-config.xml
    trunk/idp-conf/src/main/resources/system/flows/authn/authn-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/authn/jaas-authn-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/authn/ldap-authn-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/authn/placeholder-flow.xml
    trunk/idp-conf/src/main/resources/views/login.vm

Modified: trunk/idp-conf/src/main/resources/conf/global-user.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/global-user.xml?rev=5055&r1=5054&r2=5055&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/global-user.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/global-user.xml Wed Dec 18 18:17:06 2013
@@ -16,5 +16,5 @@
 
     <import resource="authn-comparison.xml" />
     <import resource="authn-flow-descriptors.xml" />
-        
+     
 </beans>

Modified: trunk/idp-conf/src/main/resources/conf/idp.properties
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/idp.properties?rev=5055&r1=5054&r2=5055&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/idp.properties (original)
+++ trunk/idp-conf/src/main/resources/conf/idp.properties Wed Dec 18 18:17:06 2013
@@ -1,5 +1,10 @@
-# Provides base location of most out-of-war resources
-idp.home = ${IDP_HOME}
+# Jetty properties
+jetty.host=localhost
+jetty.port=8080
+jetty.secure.port=8443
+jetty.https.port=8443
+jetty.dump.start=false
+jetty.dump.stop=false
 
 # Use the XML Parser SecurityManager appropriate for the chosen parser
 # Sun/Oracle, use com.sun.org.apache.xerces.internal.util.SecurityManager
@@ -45,7 +50,8 @@
 idp.session.activeResultExtraction = net.shibboleth.idp.session.impl.ExtractActiveAuthenticationResults
 
 # Regular expression expressing flows to enable 
-idp.authn.flows = IPAddress|JAAS
+#idp.authn.flows = IPAddress|JAAS
+idp.authn.flows = IPAddress|LDAP
 
 # Default lifetime and timeout of various authentication methods
 idp.authn.defaultLifetime = PT60M

Modified: trunk/idp-conf/src/main/resources/conf/jaas.config
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/jaas.config?rev=5055&r1=5054&r2=5055&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/jaas.config (original)
+++ trunk/idp-conf/src/main/resources/conf/jaas.config Wed Dec 18 18:17:06 2013
@@ -1,8 +1,10 @@
 ShibUserPassAuth {
-
-	org.ldaptive.jaas.LdapLoginModule required
-    	ldapUrl="ldap://localhost:389"
-    	baseDn="ou=people,dc=example,dc=edu"
-    	userFilter="(uid={user})";
-    	
+	com.sun.security.auth.module.Krb5LoginModule required;
+/*
+    org.ldaptive.jaas.LdapLoginModule required
+      ldapUrl="ldap://ldap.example.org"
+      baseDn="ou=people,dc=example,dc=org"
+      ssl="true"
+      userFilter="uid={user}";
+*/
 };


[... 221 lines stripped ...]