Author: olamy
Date: Thu Dec 20 00:06:25 2012
New Revision: 1424239
URL: http://svn.apache.org/viewvc?rev=1424239&view=rev
Log:
remove not anymore used spring configuration
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/WEB-INF/applicationContext.xml
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/WEB-INF/applicationContext.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/WEB-INF/applicationContext.xml?rev=1424239&r1=1424238&r2=1424239&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/WEB-INF/applicationContext.xml
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/WEB-INF/applicationContext.xml
Thu Dec 20 00:06:25 2012
@@ -153,81 +153,6 @@
</configuration>
</component> -->
- <!-- TODO move to spring sample and test it -->
- <!-- START SNIPPET: ldap -->
- <!--
- Ldap Authentication can be enabled by setting enabling these components
and setting the following configuration options in your security.properties file
-
- ============================================================
-
- ldap.bind.authenticator.enabled=true
- redback.default.admin=admin
- security.policy.password.expiration.enabled=false
-
- ldap.config.hostname=ldap.hostname
- ldap.config.port=389
- ldap.config.base.dn=o=com
- ldap.config.context.factory=com.sun.jndi.ldap.LdapCtxFactory
- ldap.config.bind.dn=uid=myusername,o=com
- ldap.config.password=s3cr3t
- #ldap.config.authentication.method=
- ============================================================
-
- * ldap.config.hostname - The hostname of the ldap server
- * ldap.config.port - The port of the ldap server
- * ldap.config.base.dn - The baseDn of the ldap system
- * ldap.config.context.factory - context factory for ldap connections
- * ldap.config.bind.dn - the core user used for authentication the ldap
server, must be able to perform the necessary searches, etc.
- * ldap.config.password - password for the bindDn for the root ldap
connection
-
- until this process is better documented, the following is the document
for configuration ldap with redback
-
- http://archiva.apache.org/redback/integration/ldap.html
- -->
-
- <!--
-
- this component manages the connection to the ldap server
- -->
-
-
- <!--
-
- this component manages the mapping of attributes in ldap to user
information in redback. To configure the mapping, you can add the following
properties in your security.properties
-
- ============================================================
- ldap.config.mapper.attribute.email=mail
- ldap.config.mapper.attribute.fullname=givenName
- ldap.config.mapper.attribute.password=userPassword
- ldap.config.mapper.attribute.user.id=cn
- ldap.config.mapper.attribute.user.base.dn=
- ldap.config.mapper.attribute.user.object.class=inetOrgPerson
- ldap.config.mapper.attribute.user.filter=(attributeName=value)
- ============================================================
-
-
- * email-attribute - The name of the attribute on a user that contains the
email address
- * full-name-attribute - The name of the attribute on a user that contains
the users fullName
- * password-attribute - The name of the attribute containing the users
password, used for the authentiction using the user manager and not the ldap
bind authenticator
- * user-id-attribute - The name of the attribute containing the users
userId, most commonly cn or sn.
- * user-base-dn - The base dn that will be subtree searched for users.
- * user-object-class - the objectClass used in the ldap server for
indentifying users, most commonly inetOrgPerson.
- -->
-
- <!--
- <bean name="ldapUserMapper"
class="org.apache.archiva.redback.common.ldap.LdapUserMapper">
- <property name="emailAttribute" value="email"/>
- <property name="fullNameAttribute" value="givenName"/>
- <property name="passwordAttribute" value="userPassword"/>
- <property name="userIdAttribute" value="cn"/>
- <property name="userBaseDn" value="o=com"/>
- <property name="userObjectClass" value="inetOrgPerson"/>
- <property name="userConf" ref="userConfiguration"/>
- </bean>
- -->
-
-
-
<!--
If caching is desired to improve performance then make uncomment this and
make sure the following configuration parameter is in the security.properties
@@ -241,42 +166,6 @@
<property name="usersCache" ref="cache#users"/>
</bean>
-->
-
-
-
- <!--
-
- if using the user manager authenticator to authenticate the user and not
the ldap bind authenticator make sure
- this definition has the correct password encoder
-
- Note: you should probably just use the ldap bind authenticator which is
enabled by putting
-
- ldap.bind.authenticator.enabled=true
-
- in the security.properties
- -->
- <!--
- <bean name="userSecurityPolicy"
class="org.apache.archiva.redback.policy.DefaultUserSecurityPolicy">
- <property name="config" ref="userConfiguration"/>
- <property name="passwordEncoder" ref="passwordEncoder#sha1"/>
- <property name="userValidationSettings" ref="userValidationSettings"/>
- <property name="rememberMeCookieSettings"
ref="cookieSettings#rememberMe"/>
- <property name="signonCookieSettings" ref="cookieSettings#signon"/>
- <property name="rules">
- add the rules you want to applied
- <list>
- <ref bean="passwordRule#alpha-count"/>
- <ref bean="passwordRule#alpha-numeric"/>
- <ref bean="passwordRule#character-length"/>
- <ref bean="passwordRule#must-have"/>
- <ref bean="passwordRule#no-whitespaces"/>
- <ref bean="passwordRule#numerical-count"/>
- </list>
- </property>
- </bean>
- -->
- <!-- END SNIPPET: ldap -->
-
<!-- override jcr repository location -->
