You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ga...@apache.org on 2007/10/26 17:41:36 UTC
svn commit: r588691 - in /geronimo/samples/trunk/samples/ldap-sample-app: ./
ldap-sample-app-jetty/ ldap-sample-app-jetty/src/main/plan/
ldap-sample-app-jetty/src/plan/ ldap-sample-app-tomcat/
ldap-sample-app-tomcat/src/main/plan/ ldap-sample-app-tomca...
Author: gawor
Date: Fri Oct 26 08:41:35 2007
New Revision: 588691
URL: http://svn.apache.org/viewvc?rev=588691&view=rev
Log:
cleaning up the ldap sample and its plugins
Added:
geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-war/LICENSE.txt
- copied unchanged from r588525, geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-jetty/LICENSE.txt
geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-war/NOTICE.txt
- copied unchanged from r588525, geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-jetty/NOTICE.txt
Removed:
geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-jetty/src/plan/
geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-tomcat/src/plan/
geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-war/src/main/java/
Modified:
geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-jetty/pom.xml
geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-jetty/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/ldap-sample-app-tomcat/src/main/plan/plan.xml
geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-war/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=588691&r1=588690&r2=588691&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 08:41:35 2007
@@ -26,26 +26,25 @@
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>configs</artifactId>
<version>2.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>ldap-demo-jetty</artifactId>
+ <artifactId>ldap-sample-app-jetty</artifactId>
<name>Geronimo Configs :: LDAP Demo for Jetty</name>
<packaging>car</packaging>
+ <description>
+ A web application that walks you through configuring the sample
+ data in the embedded Apache Directory LDAP server, and then tests logins
+ with a demonstration security realm configured for that LDAP server.
+ The LDAP Example web application be found via HTTP at /LDAP_Sample/ after
+ the plugin is installed.
+ </description>
+
<dependencies>
- <!--<dependency>-->
- <!--<groupId>org.apache.geronimo.configs</groupId>-->
- <!--<artifactId>jetty-deployer</artifactId>-->
- <!--<version>${version}</version>-->
- <!--<type>car</type>-->
- <!--<scope>test</scope>-->
- <!--</dependency>-->
-
<dependency>
<groupId>org.apache.geronimo.applications</groupId>
- <artifactId>geronimo-ldap-demo</artifactId>
+ <artifactId>ldap-sample-app-war</artifactId>
<version>${version}</version>
<type>war</type>
</dependency>
@@ -65,12 +64,14 @@
<type>car</type>
<scope>provided</scope>
</dependency>
+
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>jasper</artifactId>
<version>${version}</version>
<type>car</type>
</dependency>
+
</dependencies>
<build>
@@ -93,10 +94,32 @@
</deploymentConfigs>
<module>
<groupId>org.apache.geronimo.applications</groupId>
- <artifactId>geronimo-ldap-demo</artifactId>
+ <artifactId>ldap-sample-app-war</artifactId>
<version>${version}</version>
<type>war</type>
</module>
+ <useMavenDependencies>
+ <value>true</value>
+ <includeVersion>true</includeVersion>
+ </useMavenDependencies>
+ <category>Example</category>
+ <instance>
+ <plugin-artifact>
+ <prerequisite>
+ <id>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>jetty6</artifactId>
+ </id>
+ <resource-type>Web Container</resource-type>
+ <description>
+ This version of the application works with the Geronimo/Jetty distribution.
+ It is not intended to run in the Geronimo/Tomcat distribution.
+ There is a separate version of the application that works with Tomcat.
+ Please install the version appropriate to your Geronimo distribution.
+ </description>
+ </prerequisite>
+ </plugin-artifact>
+ </instance>
</configuration>
</plugin>
</plugins>
Modified: geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-jetty/src/main/plan/plan.xml?rev=588691&r1=588690&r2=588691&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-jetty/src/main/plan/plan.xml (original)
+++ geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-jetty/src/main/plan/plan.xml Fri Oct 26 08:41:35 2007
@@ -1,58 +1,43 @@
<?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
+<!--
+ 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.
+-->
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.2">
+ <context-root>/LDAP_Sample</context-root>
- 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$-->
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.2" xmlns:sec="http://geronimo.apache.org/xml/ns/security">
- <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
- <dep:moduleId>
- <dep:groupId>org.apache.geronimo.configs</dep:groupId>
- <dep:artifactId>ldap-demo-jetty</dep:artifactId>
- <dep:version>2.0-SNAPSHOT</dep:version>
- <dep:type>car</dep:type>
- </dep:moduleId>
- <dep:dependencies>
- <dep:dependency>
- <dep:groupId>org.apache.geronimo.configs</dep:groupId>
- <dep:artifactId>jasper</dep:artifactId>
- <dep:type>car</dep:type>
- </dep:dependency>
- </dep:dependencies>
- <dep:hidden-classes/>
- <dep:non-overridable-classes/>
- </dep:environment>
- <context-root>/ldap-demo</context-root>
- <security-realm-name>ldap-realm</security-realm-name>
- <security>
- <default-subject>
- <realm>geronimo-admin</realm>
- <id>system</id>
- </default-subject>
- <role-mappings>
- <role role-name="content-administrator">
- <realm realm-name="ldap-realm">
- <principal class="org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal" name="admin"/>
- <principal class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal" name="system"/>
- </realm>
- </role>
- <role role-name="guest">
- <realm realm-name="ldap-realm">
- <principal class="org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal" name="guest"/>
- <principal class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal" name="user1"/>
- <principal class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal" name="user2"/>
- </realm>
- </role>
- </role-mappings>
- </security>
+ <security-realm-name>LDAP_Sample_Realm</security-realm-name>
+ <security>
+ <default-principal realm-name="LDAP_Sample_Realm">
+ <principal class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal" name="system"/>
+ </default-principal>
+ <role-mappings>
+ <role role-name="content-administrator">
+ <realm realm-name="LDAP_Sample_Realm">
+ <principal class="org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal" name="admin" designated-run-as="true"/>
+ <principal class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal" name="system"/>
+ </realm>
+ </role>
+ <role role-name="guest">
+ <realm realm-name="LDAP_Sample_Realm">
+ <principal class="org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal" name="guest" designated-run-as="true"/>
+ <principal class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal" name="user1"/>
+ </realm>
+ </role>
+ </role-mappings>
+ </security>
</web-app>
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=588691&r1=588690&r2=588691&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 08:41:35 2007
@@ -26,18 +26,25 @@
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>configs</artifactId>
<version>2.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>ldap-demo-tomcat</artifactId>
+ <artifactId>ldap-sample-app-tomcat</artifactId>
<name>Geronimo Configs :: LDAP Demo for Tomcat</name>
<packaging>car</packaging>
-
+
+ <description>
+ A web application that walks you through configuring the sample
+ data in the embedded Apache Directory LDAP server, and then tests logins
+ with a demonstration security realm configured for that LDAP server.
+ The LDAP Example web application be found via HTTP at /LDAP_Sample/ after
+ the plugin is installed.
+ </description>
+
<dependencies>
<dependency>
<groupId>org.apache.geronimo.applications</groupId>
- <artifactId>geronimo-ldap-demo</artifactId>
+ <artifactId>ldap-sample-app-war</artifactId>
<version>${version}</version>
<type>war</type>
</dependency>
@@ -57,12 +64,14 @@
<type>car</type>
<scope>provided</scope>
</dependency>
+
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>jasper</artifactId>
<version>${version}</version>
<type>car</type>
</dependency>
+
</dependencies>
<build>
@@ -85,10 +94,32 @@
</deploymentConfigs>
<module>
<groupId>org.apache.geronimo.applications</groupId>
- <artifactId>geronimo-ldap-demo</artifactId>
+ <artifactId>ldap-sample-app-war</artifactId>
<version>${version}</version>
<type>war</type>
</module>
+ <useMavenDependencies>
+ <value>true</value>
+ <includeVersion>true</includeVersion>
+ </useMavenDependencies>
+ <category>Example</category>
+ <instance>
+ <plugin-artifact>
+ <prerequisite>
+ <id>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>tomcat6</artifactId>
+ </id>
+ <resource-type>Web Container</resource-type>
+ <description>
+ This version of the application works with the Geronimo/Tomcat distribution.
+ It is not intended to run in the Geronimo/Jetty distribution.
+ There is a separate version of the application that works with Jetty.
+ Please install the version appropriate to your Geronimo distribution.
+ </description>
+ </prerequisite>
+ </plugin-artifact>
+ </instance>
</configuration>
</plugin>
</plugins>
Modified: geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-tomcat/src/main/plan/plan.xml?rev=588691&r1=588690&r2=588691&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-tomcat/src/main/plan/plan.xml Fri Oct 26 08:41:35 2007
@@ -1,58 +1,43 @@
<?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
+<!--
+ 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.
+-->
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.2">
+ <context-root>/LDAP_Sample</context-root>
- 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$-->
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.2" xmlns:sec="http://geronimo.apache.org/xml/ns/security">
- <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
- <dep:moduleId>
- <dep:groupId>org.apache.geronimo.configs</dep:groupId>
- <dep:artifactId>ldap-demo-tomcat</dep:artifactId>
- <dep:version>2.0-SNAPSHOT</dep:version>
- <dep:type>car</dep:type>
- </dep:moduleId>
- <dep:dependencies>
- <dep:dependency>
- <dep:groupId>org.apache.geronimo.configs</dep:groupId>
- <dep:artifactId>jasper</dep:artifactId>
- <dep:type>car</dep:type>
- </dep:dependency>
- </dep:dependencies>
- <dep:hidden-classes/>
- <dep:non-overridable-classes/>
- </dep:environment>
- <context-root>/ldap-demo</context-root>
- <security-realm-name>ldap-realm</security-realm-name>
- <security>
- <default-subject>
- <realm>geronimo-admin</realm>
- <id>system</id>
- </default-subject>
- <role-mappings>
- <role role-name="content-administrator">
- <realm realm-name="ldap-realm">
- <principal class="org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal" name="admin"/>
- <principal class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal" name="system"/>
- </realm>
- </role>
- <role role-name="guest">
- <realm realm-name="ldap-realm">
- <principal class="org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal" name="guest"/>
- <principal class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal" name="user1"/>
- <principal class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal" name="user2"/>
- </realm>
- </role>
- </role-mappings>
- </security>
+ <security-realm-name>LDAP_Sample_Realm</security-realm-name>
+ <security>
+ <default-principal realm-name="LDAP_Sample_Realm">
+ <principal class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal" name="system"/>
+ </default-principal>
+ <role-mappings>
+ <role role-name="content-administrator">
+ <realm realm-name="LDAP_Sample_Realm">
+ <principal class="org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal" name="admin" designated-run-as="true"/>
+ <principal class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal" name="system"/>
+ </realm>
+ </role>
+ <role role-name="guest">
+ <realm realm-name="LDAP_Sample_Realm">
+ <principal class="org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal" name="guest" designated-run-as="true"/>
+ <principal class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal" name="user1"/>
+ </realm>
+ </role>
+ </role-mappings>
+ </security>
</web-app>
Modified: geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-war/pom.xml?rev=588691&r1=588690&r2=588691&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-war/pom.xml (original)
+++ geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-war/pom.xml Fri Oct 26 08:41:35 2007
@@ -25,23 +25,30 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.samples</groupId>
- <artifactId>ldap-sample-app</artifactId>
- <version>2.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <groupId>org.apache.geronimo.applications</groupId>
+ <artifactId>applications</artifactId>
+ <version>2.1-SNAPSHOT</version>
</parent>
<artifactId>ldap-sample-app-war</artifactId>
- <name>Geronimo Samples :: ldap-sample-app :: WAR</name>
+ <name>Geronimo Applications, Examples :: LDAP Demo</name>
<packaging>war</packaging>
- <description>Geronimo Samples. WEB Module</description>
-
<dependencies>
</dependencies>
<build>
<plugins>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <configuration>
+ <warSourceDirectory>${pom.basedir}/src/main/webapp</warSourceDirectory>
+ <webXml>${pom.basedir}/src/main/webapp/WEB-INF/web.xml</webXml>
+ </configuration>
+ </plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</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=588691&r1=588690&r2=588691&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/ldap-sample-app/pom.xml (original)
+++ geronimo/samples/trunk/samples/ldap-sample-app/pom.xml Fri Oct 26 08:41:35 2007
@@ -41,6 +41,8 @@
<modules>
<module>ldap-sample-app-war</module>
+ <module>ldap-sample-app-jetty</module>
+ <module>ldap-sample-app-tomcat</module>
</modules>
<build>