You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@esme.apache.org by le...@apache.org on 2011/04/20 16:38:28 UTC

svn commit: r1095423 - in /esme/trunk/server: ldap-loginModule.conf pom.xml src/main/resources/props/default.props

Author: lester
Date: Wed Apr 20 14:38:28 2011
New Revision: 1095423

URL: http://svn.apache.org/viewvc?rev=1095423&view=rev
Log:
Moved LDAP-specific properties for Jetty to separate Maven profile

Added:
    esme/trunk/server/ldap-loginModule.conf
Modified:
    esme/trunk/server/pom.xml
    esme/trunk/server/src/main/resources/props/default.props

Added: esme/trunk/server/ldap-loginModule.conf
URL: http://svn.apache.org/viewvc/esme/trunk/server/ldap-loginModule.conf?rev=1095423&view=auto
==============================================================================
--- esme/trunk/server/ldap-loginModule.conf (added)
+++ esme/trunk/server/ldap-loginModule.conf Wed Apr 20 14:38:28 2011
@@ -0,0 +1,21 @@
+ldaploginmodule {
+    org.mortbay.jetty.plus.jaas.ldap.LdapLoginModule required
+    debug="true"
+    useLdaps="false"
+    contextFactory="com.sun.jndi.ldap.LdapCtxFactory"
+    hostname="localhost"
+    port="10389"
+    bindDn="uid=admin,ou=system"
+    bindPassword="secret"
+    authenticationMethod="simple"
+    forceBindingLogin="false"
+    userBaseDn="ou=Users,ou=esme,dc=lester,dc=org"
+    userRdnAttribute="uid"
+    userIdAttribute="uid"
+    userPasswordAttribute="userPassword"
+    userObjectClass="inetOrgPerson"
+    roleBaseDn="ou=Groups,ou=esme,dc=lester,dc=org"
+    roleNameAttribute="cn"
+    roleMemberAttribute="uniqueMember"
+    roleObjectClass="groupOfUniqueNames";
+    };
\ No newline at end of file

Modified: esme/trunk/server/pom.xml
URL: http://svn.apache.org/viewvc/esme/trunk/server/pom.xml?rev=1095423&r1=1095422&r2=1095423&view=diff
==============================================================================
--- esme/trunk/server/pom.xml (original)
+++ esme/trunk/server/pom.xml Wed Apr 20 14:38:28 2011
@@ -386,6 +386,51 @@
              </plugin>
         </plugins>
     </build>
+
+    <profiles>
+        <profile>
+            <id>esme-ldap-jetty</id>
+            <dependencies>
+                <dependency>
+                  <groupId>org.mortbay.jetty</groupId>
+                    <artifactId>jetty-plus</artifactId>
+                    <version>[6.1.6,)</version>
+                    <scope>compile</scope>
+                </dependency>
+                <dependency>
+                  <groupId>org.mortbay.jetty</groupId>
+                    <artifactId>jetty-ldap-jaas</artifactId>
+                    <version>[6.1.6,)</version>
+                    <scope>compile</scope>
+                </dependency>
+            </dependencies>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.mortbay.jetty</groupId>
+                        <artifactId>maven-jetty-plugin</artifactId>
+                        <configuration>
+                            <contextPath>/</contextPath>
+                            <scanIntervalSeconds>0</scanIntervalSeconds>
+                            <userRealms>
+                                <userRealm implementation="org.mortbay.jetty.plus.jaas.JAASUserRealm">
+                                    <name>ESMERealm</name>
+                                    <loginModuleName>ldaploginmodule</loginModuleName>
+                                </userRealm>
+                            </userRealms>
+                            <systemProperties>
+                              <systemProperty>
+                                <name>java.security.auth.login.config</name>
+                                <value>ldap-loginModule.conf</value>
+                              </systemProperty>
+                            </systemProperties>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
     <reporting>
         <plugins>
             <plugin>

Modified: esme/trunk/server/src/main/resources/props/default.props
URL: http://svn.apache.org/viewvc/esme/trunk/server/src/main/resources/props/default.props?rev=1095423&r1=1095422&r2=1095423&view=diff
==============================================================================
--- esme/trunk/server/src/main/resources/props/default.props (original)
+++ esme/trunk/server/src/main/resources/props/default.props Wed Apr 20 14:38:28 2011
@@ -34,13 +34,13 @@ ldap.enabled=false
 ;Hostname or IP of LDAP server
 ldap.server.host=localhost
 ;Port of LDAP server
-ldap.server.port=389
+ldap.server.port=10389
 ;Base DN from the LDAP Server
-ldap.server.base=ou=esme,dc=somedomain,dc=org
+ldap.server.base=ou=esme,dc=lester,dc=org
 ;User that has access to LDAP server to perform search operations
-ldap.server.userName=cn=Directory Manager
+ldap.server.userName=uid=admin,ou=system
 ;Password for user above
-ldap.server.password=********
+ldap.server.password=secret
 ;Authentication type
 ldap.server.authType=simple
 ;Referral
@@ -51,4 +51,4 @@ ldap.server.initial_context_factory=com.
 ;Prefix for user to whom additional LDAP attributes belong, for example 'uid' or 'sAMAccountName'
 ldap.uidPrefix=uid
 ;User base DN for user to whom additional LDAP attributes belong
-ldap.userBase=ou=esme,dc=somedomain,dc=org
\ No newline at end of file
+ldap.userBase=ou=Users,ou=esme,dc=lester,dc=org
\ No newline at end of file