geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r588703 - in /geronimo/samples/trunk/samples/ldap-sample-app: ./ ldap-sample-app-jetty/ ldap-sample-app-jetty/src/main/resources/ ldap-sample-app-realm/ ldap-sample-app-realm/src/main/plan/ ldap-sample-app-realm/src/main/resources/ ldap-sam...
Date Fri, 26 Oct 2007 16:23:29 GMT
Author: gawor
Date: Fri Oct 26 09:23:26 2007
New Revision: 588703

URL: http://svn.apache.org/viewvc?rev=588703&view=rev
Log:
making ldap security realm work agin

Removed:
    geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-jetty/src/main/resources/
    geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-realm/src/main/resources/
    geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-realm/src/plan/
    geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-tomcat/src/main/resources/
Modified:
    geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-jetty/pom.xml
    geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-realm/pom.xml
    geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-realm/src/main/plan/plan.xml
    geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-tomcat/pom.xml
    geronimo/samples/trunk/samples/ldap-sample-app/pom.xml

Modified: geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-jetty/pom.xml?rev=588703&r1=588702&r2=588703&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-jetty/pom.xml (original)
+++ geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-jetty/pom.xml Fri Oct 26
09:23:26 2007
@@ -29,7 +29,7 @@
     </parent>
 
     <artifactId>ldap-sample-app-jetty</artifactId>
-    <name>Geronimo Configs :: LDAP Demo for Jetty</name>
+    <name>Geronimo Configs :: LDAP Sample for Jetty</name>
     <packaging>car</packaging>
     
     <description>
@@ -49,6 +49,13 @@
             <type>war</type>
         </dependency>
         
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>ldap-sample-app-realm</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jetty6-deployer</artifactId>

Modified: geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-realm/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-realm/pom.xml?rev=588703&r1=588702&r2=588703&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-realm/pom.xml (original)
+++ geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-realm/pom.xml Fri Oct 26
09:23:26 2007
@@ -26,12 +26,19 @@
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>configs</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <artifactId>ldap-realm</artifactId>
-    <name>Geronimo Configs :: LDAP Security Realm</name>
+    <artifactId>ldap-sample-app-realm</artifactId>
+    <name>Geronimo Configs :: LDAP Sample Security Realm</name>
     <packaging>car</packaging>
+
+    <description>
+        A sample security realm pointing to an embedded Apache Directory
+        LDAP server.  This is normally used with the LDAP Example Web Application,
+        which has instructions for setting up the LDAP server and screens to test
+        logins.  You don't need this plugin in order to create LDAP security realms,
+        this is just a sample.
+    </description>
     
     <dependencies>
         
@@ -42,13 +49,15 @@
             <type>car</type>
         </dependency>
 
+<!--
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>directory</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
-        
+-->
+    
     </dependencies>
     
     <build>
@@ -58,6 +67,24 @@
                 <filtering>true</filtering>
             </resource>
         </resources>
+
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>car-maven-plugin</artifactId>
+                <configuration>
+                    <deploymentConfigs>
+                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
+                        <deploymentConfig>${j2eeDeployer}</deploymentConfig>
+                    </deploymentConfigs>
+                    <useMavenDependencies>
+                        <value>true</value>
+                        <includeVersion>true</includeVersion>
+                    </useMavenDependencies>
+                    <category>Example</category>
+                </configuration>
+            </plugin>
+        </plugins>
     </build>
     
 </project>

Modified: geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-realm/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-realm/src/main/plan/plan.xml?rev=588703&r1=588702&r2=588703&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-realm/src/main/plan/plan.xml
(original)
+++ geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-realm/src/main/plan/plan.xml
Fri Oct 26 09:23:26 2007
@@ -1,73 +1,54 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.-->
-<!--$Rev$ $Date$-->
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements. See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership. The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License. You may obtain a copy of the License at
+    
+    http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied. See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->
 <module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
-  <environment>
-    <moduleId>
-      <groupId>org.apache.geronimo.configs</groupId>
-      <artifactId>ldap-realm</artifactId>
-      <version>2.0-SNAPSHOT</version>
-      <type>car</type>
-    </moduleId>
-    <dependencies>
-      <dependency>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>server-security-config</artifactId>
-        <type>car</type>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>directory</artifactId>
-        <type>car</type>
-      </dependency>
-    </dependencies>
-    <hidden-classes/>
-    <non-overridable-classes/>
-  </environment>
-  <gbean name="ldap-login" class="org.apache.geronimo.security.jaas.LoginModuleGBean">
-    <attribute name="loginModuleClass">org.apache.geronimo.security.realm.providers.LDAPLoginModule</attribute>
-    <attribute name="options">initialContextFactory=com.sun.jndi.ldap.LdapCtxFactory
-		connectionURL=ldap://localhost:1389
-		connectionUsername=uid=admin,ou=system
-		connectionPassword=secret
-		connectionProtocol=
-		authentication=simple
-		userBase=ou=users,ou=system
-		userSearchMatching=uid={0}
-		userSearchSubtree=false
-		roleBase=ou=groups,ou=system
-		roleName=cn
-		roleSearchMatching=(uniqueMember={0})
-		roleSearchSubtree=false
-		userRoleName=</attribute>
-    <attribute name="loginDomainName">ldap-realm</attribute>
-  </gbean>
-  <gbean name="ldap-realm" class="org.apache.geronimo.security.realm.GenericSecurityRealm">
-    <attribute name="realmName">ldap-realm</attribute>
-    <reference name="LoginModuleConfiguration">
-      <name>ldap-login</name>
-    </reference>
-    <reference name="ServerInfo">
-      <name>ServerInfo</name>
-    </reference>
-  </gbean>
-  <gbean name="ldap-login" class="org.apache.geronimo.security.jaas.JaasLoginModuleUse">
-    <attribute name="controlFlag">REQUIRED</attribute>
-    <reference name="LoginModule">
-      <name>ldap-login</name>
-    </reference>
-  </gbean>
-</module>
\ No newline at end of file
+    <gbean name="LDAP_Sample_Realm" class="org.apache.geronimo.security.realm.GenericSecurityRealm"

+                                    xsi:type="dep:gbeanType" xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2"

+                                    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+        <attribute name="realmName">LDAP_Sample_Realm</attribute>
+        <reference name="ServerInfo">
+            <name>ServerInfo</name>
+        </reference>
+        <xml-reference name="LoginModuleConfiguration">
+            <log:login-config xmlns:log="http://geronimo.apache.org/xml/ns/loginconfig-1.2">
+                <log:login-module control-flag="REQUIRED" wrap-principals="false">
+                    <log:login-domain-name>LDAP_Sample_Realm</log:login-domain-name>
+                    <log:login-module-class>org.apache.geronimo.security.realm.providers.LDAPLoginModule</log:login-module-class>
+                    <log:option name="initialContextFactory">com.sun.jndi.ldap.LdapCtxFactory</log:option>
+                    <log:option name="connectionURL">ldap://localhost:10389</log:option>
+                    <log:option name="connectionUsername">uid=admin,ou=system</log:option>
+                    <log:option name="connectionPassword">secret</log:option>
+                    <log:option name="authentication">simple</log:option>
+                    <log:option name="userBase">ou=users,ou=system</log:option>
+                    <log:option name="userSearchMatching">uid={0}</log:option>
+                    <log:option name="userSearchSubtree">false</log:option>
+                    <log:option name="roleBase">ou=groups,ou=system</log:option>
+                    <log:option name="roleName">cn</log:option>
+                    <log:option name="roleSearchMatching">(uniqueMember={0})</log:option>
+                    <log:option name="roleSearchSubtree">false</log:option>
+                </log:login-module>
+                <log:login-module control-flag="OPTIONAL" wrap-principals="false">
+                    <log:login-domain-name>LDAP_Sample_Realm-Audit</log:login-domain-name>
+                    <log:login-module-class>org.apache.geronimo.security.realm.providers.FileAuditLoginModule</log:login-module-class>
+                    <log:option name="file">var/log/login-attempts.log</log:option>
+                </log:login-module>
+            </log:login-config>
+        </xml-reference>
+    </gbean>
+</module>
+

Modified: geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-tomcat/pom.xml?rev=588703&r1=588702&r2=588703&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-tomcat/pom.xml (original)
+++ geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-tomcat/pom.xml Fri Oct
26 09:23:26 2007
@@ -29,7 +29,7 @@
     </parent>
 
     <artifactId>ldap-sample-app-tomcat</artifactId>
-    <name>Geronimo Configs :: LDAP Demo for Tomcat</name>
+    <name>Geronimo Configs :: LDAP Sample for Tomcat</name>
     <packaging>car</packaging>
 
     <description>
@@ -49,6 +49,13 @@
             <type>war</type>
         </dependency>
         
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>ldap-sample-app-realm</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>tomcat6-deployer</artifactId>

Modified: geronimo/samples/trunk/samples/ldap-sample-app/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/ldap-sample-app/pom.xml?rev=588703&r1=588702&r2=588703&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/ldap-sample-app/pom.xml (original)
+++ geronimo/samples/trunk/samples/ldap-sample-app/pom.xml Fri Oct 26 09:23:26 2007
@@ -32,20 +32,21 @@
     </parent>
     
     <artifactId>ldap-sample-app</artifactId>
-    <name>Geronimo Samples :: ldap-sample-app</name>
+    <name>Geronimo Samples :: LDAP Sample</name>
     <packaging>pom</packaging>
     
     <description>
         Geronimo ldap-sample-app sample created from an archetype.
     </description>
     
-   <modules>
+    <modules>
         <module>ldap-sample-app-war</module>
+        <module>ldap-sample-app-realm</module>
         <module>ldap-sample-app-jetty</module>
         <module>ldap-sample-app-tomcat</module>
     </modules>
 
-   <build>
+    <build>
         <plugins>
             <plugin>
                 <artifactId>maven-site-plugin</artifactId>
@@ -56,22 +57,5 @@
             </plugin>
         </plugins>
     </build>
-
-    <repositories>
-        <repository>
-            <id>apache-snapshots</id>
-            <name>Apache Snapshots Repository</name>
-            <url>http://people.apache.org/repo/m2-snapshot-repository</url>
-            <layout>default</layout>
-            <snapshots>
-                <enabled>true</enabled>
-                <updatePolicy>daily</updatePolicy>
-                <checksumPolicy>ignore</checksumPolicy>
-            </snapshots>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-        </repository>
-    </repositories> 
 
 </project>



Mime
View raw message