geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ammul...@apache.org
Subject svn commit: r398664 - in /geronimo/branches/1.1/configs: jsp-examples-jetty/src/conf/ jsp-examples-tomcat/src/conf/ ldap-demo-jetty/ ldap-demo-jetty/src/conf/ ldap-demo-tomcat/ ldap-demo-tomcat/src/conf/ ldap-realm/ ldap-realm/src/conf/ servlets-exampl...
Date Mon, 01 May 2006 19:13:01 GMT
Author: ammulder
Date: Mon May  1 12:12:58 2006
New Revision: 398664

URL: http://svn.apache.org/viewcvs?rev=398664&view=rev
Log:
Make LDAP realm and LDAP demo web app into plugins
Declare a dependency on geronimo-directory for the LDAP
  sample realm
Typos in other example plugins

Added:
    geronimo/branches/1.1/configs/ldap-demo-jetty/src/conf/
    geronimo/branches/1.1/configs/ldap-demo-jetty/src/conf/geronimo-plugin.xml   (with props)
    geronimo/branches/1.1/configs/ldap-demo-tomcat/src/conf/
    geronimo/branches/1.1/configs/ldap-demo-tomcat/src/conf/geronimo-plugin.xml   (with props)
    geronimo/branches/1.1/configs/ldap-realm/src/conf/
    geronimo/branches/1.1/configs/ldap-realm/src/conf/geronimo-plugin.xml   (with props)
Modified:
    geronimo/branches/1.1/configs/jsp-examples-jetty/src/conf/geronimo-plugin.xml
    geronimo/branches/1.1/configs/jsp-examples-tomcat/src/conf/geronimo-plugin.xml
    geronimo/branches/1.1/configs/ldap-demo-jetty/maven.xml
    geronimo/branches/1.1/configs/ldap-demo-tomcat/maven.xml
    geronimo/branches/1.1/configs/ldap-realm/maven.xml
    geronimo/branches/1.1/configs/ldap-realm/project.xml
    geronimo/branches/1.1/configs/servlets-examples-jetty/src/conf/geronimo-plugin.xml
    geronimo/branches/1.1/configs/servlets-examples-tomcat/src/conf/geronimo-plugin.xml

Modified: geronimo/branches/1.1/configs/jsp-examples-jetty/src/conf/geronimo-plugin.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/jsp-examples-jetty/src/conf/geronimo-plugin.xml?rev=398664&r1=398663&r2=398664&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/jsp-examples-jetty/src/conf/geronimo-plugin.xml (original)
+++ geronimo/branches/1.1/configs/jsp-examples-jetty/src/conf/geronimo-plugin.xml Mon May
 1 12:12:58 2006
@@ -12,7 +12,7 @@
 <prerequisite>
 <id>geronimo/jetty//car</id>
 <resource-type>Web Container</resource-type>
-<description>This version of the JSP Examples works with the Geronimo/Jetty distribution.
 It is not intended to run in the Geronimo/Tomcat distribution.  There is a separate version
of the Welcome application that works with Tomcat.  Please install the version appropriate
to your Geronimo distribution.</description>
+<description>This version of the JSP Examples works with the Geronimo/Jetty distribution.
 It is not intended to run in the Geronimo/Tomcat distribution.  There is a separate version
of the JSP Examples application that works with Tomcat.  Please install the version appropriate
to your Geronimo distribution.</description>
 </prerequisite>
 <dependency>commons-collections/commons-collections/3.1/jar</dependency>
 <dependency>geronimo/j2ee-server//car</dependency>

Modified: geronimo/branches/1.1/configs/jsp-examples-tomcat/src/conf/geronimo-plugin.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/jsp-examples-tomcat/src/conf/geronimo-plugin.xml?rev=398664&r1=398663&r2=398664&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/jsp-examples-tomcat/src/conf/geronimo-plugin.xml (original)
+++ geronimo/branches/1.1/configs/jsp-examples-tomcat/src/conf/geronimo-plugin.xml Mon May
 1 12:12:58 2006
@@ -12,7 +12,7 @@
 <prerequisite>
 <id>geronimo/tomcat//car</id>
 <resource-type>Web Container</resource-type>
-<description>This version of the JSP Examples works with the Geronimo/Tomcat distribution.
 It is not intended to run in the Geronimo/Jetty distribution.  There is a separate version
of the Welcome application that works with Jetty.  Please install the version appropriate
to your Geronimo distribution.</description>
+<description>This version of the JSP Examples works with the Geronimo/Tomcat distribution.
 It is not intended to run in the Geronimo/Jetty distribution.  There is a separate version
of the JSP Examples application that works with Jetty.  Please install the version appropriate
to your Geronimo distribution.</description>
 </prerequisite>
 <dependency>geronimo/j2ee-server//car</dependency>
 </configuration>

Modified: geronimo/branches/1.1/configs/ldap-demo-jetty/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/ldap-demo-jetty/maven.xml?rev=398664&r1=398663&r2=398664&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/ldap-demo-jetty/maven.xml (original)
+++ geronimo/branches/1.1/configs/ldap-demo-jetty/maven.xml Mon May  1 12:12:58 2006
@@ -18,9 +18,15 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project default="default">
+<project default="default" xmlns:velocity="jelly:velocity">
 
     <goal name="default">
         <attainGoal name="car:install"/>
     </goal>
+
+    <preGoal name="car:install">
+        <velocity:merge basedir="${basedir}/src/conf"
+          template="geronimo-plugin.xml"
+          name="${geronimo.packaging.targetRepository}/${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/${pom.artifactId}-${pom.currentVersion}.car/META-INF/geronimo-plugin.xml"/>
+    </preGoal>
 </project>

Added: geronimo/branches/1.1/configs/ldap-demo-jetty/src/conf/geronimo-plugin.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/ldap-demo-jetty/src/conf/geronimo-plugin.xml?rev=398664&view=auto
==============================================================================
--- geronimo/branches/1.1/configs/ldap-demo-jetty/src/conf/geronimo-plugin.xml (added)
+++ geronimo/branches/1.1/configs/ldap-demo-jetty/src/conf/geronimo-plugin.xml Mon May  1
12:12:58 2006
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<geronimo-plugin>
+<configuration>
+<name>LDAP Example Web App (Jetty)</name>
+<config-id>${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car</config-id>
+<category>Examples</category>
+<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-demo/ after
+    the plugin is installed.</description>
+<license osi-approved="true">BSD -- Apache Software License (ASL) 2.0</license>
+<geronimo-version>${pom.currentVersion}</geronimo-version>
+<prerequisite>
+<id>geronimo/jetty//car</id>
+<resource-type>Web Container</resource-type>
+<description>This version of the LDAP Example works with the Geronimo/Jetty distribution.
 It is not intended to run in the Geronimo/Tomcat distribution.  There is a separate version
of the LDAP Example application that works with Tomcat.  Please install the version appropriate
to your Geronimo distribution.</description>
+</prerequisite>
+<dependency>geronimo/j2ee-server//car</dependency>
+<dependency>geronimo/ldap-realm//car</dependency>
+</configuration>
+<source-repository>http://www.geronimoplugins.com/repository/</source-repository>
+<backup-repository>http://www.ibiblio.org/maven2/</backup-repository>
+</geronimo-plugin>

Propchange: geronimo/branches/1.1/configs/ldap-demo-jetty/src/conf/geronimo-plugin.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: geronimo/branches/1.1/configs/ldap-demo-tomcat/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/ldap-demo-tomcat/maven.xml?rev=398664&r1=398663&r2=398664&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/ldap-demo-tomcat/maven.xml (original)
+++ geronimo/branches/1.1/configs/ldap-demo-tomcat/maven.xml Mon May  1 12:12:58 2006
@@ -18,9 +18,15 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project default="default">
+<project default="default" xmlns:velocity="jelly:velocity">
 
     <goal name="default">
         <attainGoal name="car:install"/>
     </goal>
+
+    <preGoal name="car:install">
+        <velocity:merge basedir="${basedir}/src/conf"
+          template="geronimo-plugin.xml"
+          name="${geronimo.packaging.targetRepository}/${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/${pom.artifactId}-${pom.currentVersion}.car/META-INF/geronimo-plugin.xml"/>
+    </preGoal>
 </project>

Added: geronimo/branches/1.1/configs/ldap-demo-tomcat/src/conf/geronimo-plugin.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/ldap-demo-tomcat/src/conf/geronimo-plugin.xml?rev=398664&view=auto
==============================================================================
--- geronimo/branches/1.1/configs/ldap-demo-tomcat/src/conf/geronimo-plugin.xml (added)
+++ geronimo/branches/1.1/configs/ldap-demo-tomcat/src/conf/geronimo-plugin.xml Mon May  1
12:12:58 2006
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<geronimo-plugin>
+<configuration>
+<name>LDAP Example Web App (Tomcat)</name>
+<config-id>${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car</config-id>
+<category>Examples</category>
+<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-demo/ after
+    the plugin is installed.</description>
+<license osi-approved="true">BSD -- Apache Software License (ASL) 2.0</license>
+<geronimo-version>${pom.currentVersion}</geronimo-version>
+<prerequisite>
+<id>geronimo/tomcat//car</id>
+<resource-type>Web Container</resource-type>
+<description>This version of the LDAP Example works with the Geronimo/Tomcat distribution.
 It is not intended to run in the Geronimo/Jetty distribution.  There is a separate version
of the LDAP Example application that works with Jetty.  Please install the version appropriate
to your Geronimo distribution.</description>
+</prerequisite>
+<dependency>geronimo/j2ee-server//car</dependency>
+<dependency>geronimo/ldap-realm//car</dependency>
+</configuration>
+<source-repository>http://www.geronimoplugins.com/repository/</source-repository>
+<backup-repository>http://www.ibiblio.org/maven2/</backup-repository>
+</geronimo-plugin>

Propchange: geronimo/branches/1.1/configs/ldap-demo-tomcat/src/conf/geronimo-plugin.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: geronimo/branches/1.1/configs/ldap-realm/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/ldap-realm/maven.xml?rev=398664&r1=398663&r2=398664&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/ldap-realm/maven.xml (original)
+++ geronimo/branches/1.1/configs/ldap-realm/maven.xml Mon May  1 12:12:58 2006
@@ -18,9 +18,15 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project default="default">
+<project default="default" xmlns:velocity="jelly:velocity">
 
     <goal name="default">
         <attainGoal name="car:install"/>
     </goal>
+
+    <preGoal name="car:install">
+        <velocity:merge basedir="${basedir}/src/conf"
+          template="geronimo-plugin.xml"
+          name="${geronimo.packaging.targetRepository}/${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/${pom.artifactId}-${pom.currentVersion}.car/META-INF/geronimo-plugin.xml"/>
+    </preGoal>
 </project>

Modified: geronimo/branches/1.1/configs/ldap-realm/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/ldap-realm/project.xml?rev=398664&r1=398663&r2=398664&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/ldap-realm/project.xml (original)
+++ geronimo/branches/1.1/configs/ldap-realm/project.xml Mon May  1 12:12:58 2006
@@ -53,6 +53,15 @@
         </dependency>
         <dependency>
             <groupId>geronimo</groupId>
+            <artifactId>directory</artifactId>
+            <version>${geronimo_version}</version>
+            <type>car</type>
+            <properties>
+                <geronimo.import>true</geronimo.import>
+            </properties>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
             <artifactId>geronimo-core</artifactId>
             <version>${geronimo_version}</version>
         </dependency>

Added: geronimo/branches/1.1/configs/ldap-realm/src/conf/geronimo-plugin.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/ldap-realm/src/conf/geronimo-plugin.xml?rev=398664&view=auto
==============================================================================
--- geronimo/branches/1.1/configs/ldap-realm/src/conf/geronimo-plugin.xml (added)
+++ geronimo/branches/1.1/configs/ldap-realm/src/conf/geronimo-plugin.xml Mon May  1 12:12:58
2006
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<geronimo-plugin>
+<configuration>
+<name>LDAP Example Security Realm</name>
+<config-id>${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car</config-id>
+<category>Examples</category>
+<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>
+<license osi-approved="true">BSD -- Apache Software License (ASL) 2.0</license>
+<geronimo-version>${pom.currentVersion}</geronimo-version>
+<dependency>geronimo/j2ee-server//car</dependency>
+<dependency>geronimo/directory//car</dependency>
+</configuration>
+<source-repository>http://www.geronimoplugins.com/repository/</source-repository>
+<backup-repository>http://www.ibiblio.org/maven2/</backup-repository>
+</geronimo-plugin>

Propchange: geronimo/branches/1.1/configs/ldap-realm/src/conf/geronimo-plugin.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: geronimo/branches/1.1/configs/servlets-examples-jetty/src/conf/geronimo-plugin.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/servlets-examples-jetty/src/conf/geronimo-plugin.xml?rev=398664&r1=398663&r2=398664&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/servlets-examples-jetty/src/conf/geronimo-plugin.xml (original)
+++ geronimo/branches/1.1/configs/servlets-examples-jetty/src/conf/geronimo-plugin.xml Mon
May  1 12:12:58 2006
@@ -12,7 +12,7 @@
 <prerequisite>
 <id>geronimo/jetty//car</id>
 <resource-type>Web Container</resource-type>
-<description>This version of the Servlet Examples works with the Geronimo/Jetty distribution.
 It is not intended to run in the Geronimo/Tomcat distribution.  There is a separate version
of the Welcome application that works with Tomcat.  Please install the version appropriate
to your Geronimo distribution.</description>
+<description>This version of the Servlet Examples works with the Geronimo/Jetty distribution.
 It is not intended to run in the Geronimo/Tomcat distribution.  There is a separate version
of the Servlet Examples application that works with Tomcat.  Please install the version appropriate
to your Geronimo distribution.</description>
 </prerequisite>
 <dependency>geronimo/j2ee-server//car</dependency>
 </configuration>

Modified: geronimo/branches/1.1/configs/servlets-examples-tomcat/src/conf/geronimo-plugin.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/servlets-examples-tomcat/src/conf/geronimo-plugin.xml?rev=398664&r1=398663&r2=398664&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/servlets-examples-tomcat/src/conf/geronimo-plugin.xml (original)
+++ geronimo/branches/1.1/configs/servlets-examples-tomcat/src/conf/geronimo-plugin.xml Mon
May  1 12:12:58 2006
@@ -12,7 +12,7 @@
 <prerequisite>
 <id>geronimo/tomcat//car</id>
 <resource-type>Web Container</resource-type>
-<description>This version of the Servlet Examples works with the Geronimo/Tomcat distribution.
 It is not intended to run in the Geronimo/Jetty distribution.  There is a separate version
of the Welcome application that works with Jetty.  Please install the version appropriate
to your Geronimo distribution.</description>
+<description>This version of the Servlet Examples works with the Geronimo/Tomcat distribution.
 It is not intended to run in the Geronimo/Jetty distribution.  There is a separate version
of the Servlet Examples application that works with Jetty.  Please install the version appropriate
to your Geronimo distribution.</description>
 </prerequisite>
 <dependency>geronimo/j2ee-server//car</dependency>
 </configuration>



Mime
View raw message