[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources/conf/authn: jaas-authn-config.xml ldap-authn-co...

[noreply at shibboleth.net]

Author: scantor
Date: Mon Jun 23 10:02:04 2014
New Revision: 6153

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6153&view=rev
Log:
Simplify Boolean beans.

Modified:
    trunk/idp-conf/src/main/resources/conf/authn/jaas-authn-config.xml
    trunk/idp-conf/src/main/resources/conf/authn/ldap-authn-config.xml
    trunk/idp-conf/src/main/resources/conf/authn/remoteuser-internal-authn-config.xml

Modified: trunk/idp-conf/src/main/resources/conf/authn/jaas-authn-config.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/authn/jaas-authn-config.xml?rev=6153&r1=6152&r2=6153&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/authn/jaas-authn-config.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/authn/jaas-authn-config.xml Mon Jun 23 10:02:04 2014
@@ -30,15 +30,9 @@
     <bean id="shibboleth.authn.JAAS.SSOBypassFieldName" class="java.lang.String" c:_0="donotcache" />
 
     <!-- Simple transforms to apply to username before validation. -->
-    <bean id="shibboleth.authn.JAAS.Lowercase" class="java.lang.Boolean">
-        <constructor-arg type="boolean" value="false" />
-    </bean>
-    <bean id="shibboleth.authn.JAAS.Uppercase" class="java.lang.Boolean">
-        <constructor-arg type="boolean" value="false" />
-    </bean>
-    <bean id="shibboleth.authn.JAAS.Trim" class="java.lang.Boolean">
-        <constructor-arg type="boolean" value="true" />
-    </bean>
+    <util:constant id="shibboleth.authn.JAAS.Lowercase" static-field="java.lang.Boolean.FALSE"/>
+    <util:constant id="shibboleth.authn.JAAS.Uppercase" static-field="java.lang.Boolean.FALSE"/>
+    <util:constant id="shibboleth.authn.JAAS.Trim" static-field="java.lang.Boolean.TRUE"/>
 
     <!-- Apply any regular expression replacement pairs before validation. -->
     <util:list id="shibboleth.authn.JAAS.Transforms">

Modified: trunk/idp-conf/src/main/resources/conf/authn/ldap-authn-config.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/authn/ldap-authn-config.xml?rev=6153&r1=6152&r2=6153&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/authn/ldap-authn-config.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/authn/ldap-authn-config.xml Mon Jun 23 10:02:04 2014
@@ -14,21 +14,29 @@
        
     <context:property-placeholder />
     
+    <!-- LDAP configuration. -->
+    
+    <bean id="shibboleth.authn.LDAP.ldapUrl" class="java.lang.String" c:_0="ldap://localhost:10389" />
+    <bean id="shibboleth.authn.LDAP.baseDn" class="java.lang.String" c:_0="ou=people,dc=example,dc=org" />
+    <bean id="shibboleth.authn.LDAP.userFilter" class="java.lang.String" c:_0="(uid={user})" />
+
+    <util:constant id="shibboleth.authn.LDAP.subtreeSearch" static-field="java.lang.Boolean.FALSE"/>
+
+    <util:list id="shibboleth.authn.LDAP.returnAttributes">
+        <value>cn</value>
+        <value>businessCategory</value>
+        <value>mail</value>
+    </util:list>
+    
     <!-- Names of form fields to pull username and password from. -->
     <bean id="shibboleth.authn.LDAP.UsernameFieldName" class="java.lang.String" c:_0="j_username" />
     <bean id="shibboleth.authn.LDAP.PasswordFieldName" class="java.lang.String" c:_0="j_password" />
     <bean id="shibboleth.authn.LDAP.SSOBypassFieldName" class="java.lang.String" c:_0="donotcache" />
 
     <!-- Simple transforms to apply to username before validation. -->
-    <bean id="shibboleth.authn.LDAP.Lowercase" class="java.lang.Boolean">
-        <constructor-arg type="boolean" value="false" />
-    </bean>
-    <bean id="shibboleth.authn.LDAP.Uppercase" class="java.lang.Boolean">
-        <constructor-arg type="boolean" value="false" />
-    </bean>
-    <bean id="shibboleth.authn.LDAP.Trim" class="java.lang.Boolean">
-        <constructor-arg type="boolean" value="true" />
-    </bean>
+    <util:constant id="shibboleth.authn.LDAP.Lowercase" static-field="java.lang.Boolean.FALSE"/>
+    <util:constant id="shibboleth.authn.LDAP.Uppercase" static-field="java.lang.Boolean.FALSE"/>
+    <util:constant id="shibboleth.authn.LDAP.Trim" static-field="java.lang.Boolean.TRUE"/>
 
     <!-- Apply any regular expression replacement pairs before validation. -->
     <util:list id="shibboleth.authn.LDAP.Transforms">
@@ -37,22 +45,6 @@
         -->
     </util:list>
     
-    <!-- LDAP configuration (uses the in-memory directory by default, see src/main/config/test/ldap.ldif). -->
-    
-    <bean id="shibboleth.authn.LDAP.ldapUrl" class="java.lang.String" c:_0="ldap://localhost:10389" />
-    <bean id="shibboleth.authn.LDAP.baseDn" class="java.lang.String" c:_0="ou=people,dc=example,dc=org" />
-    <bean id="shibboleth.authn.LDAP.userFilter" class="java.lang.String" c:_0="(uid={user})" />
-
-    <bean id="shibboleth.authn.LDAP.subtreeSearch" class="java.lang.Boolean">
-        <constructor-arg type="boolean" value="false" />
-    </bean>
-

[... 46 lines stripped ...]