You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2005/12/11 10:41:08 UTC
svn commit: r355948 - in /geronimo/branches/1.0:
applications/ldap-realm-demo/ applications/ldap-realm-demo/src/
assemblies/j2ee-installer/ assemblies/j2ee-jetty-server/
assemblies/j2ee-jetty-server/src/var/config/ assemblies/j2ee-tomcat-server/
assemb...
Author: djencks
Date: Sun Dec 11 01:40:49 2005
New Revision: 355948
URL: http://svn.apache.org/viewcvs?rev=355948&view=rev
Log:
GERONIMO-1275 Ldap realm and example
Added:
geronimo/branches/1.0/applications/ldap-realm-demo/
- copied from r355935, geronimo/trunk/applications/ldap-realm-demo/
geronimo/branches/1.0/applications/ldap-realm-demo/maven.xml
- copied unchanged from r355942, geronimo/trunk/applications/ldap-realm-demo/maven.xml
geronimo/branches/1.0/applications/ldap-realm-demo/project.properties
- copied unchanged from r355942, geronimo/trunk/applications/ldap-realm-demo/project.properties
geronimo/branches/1.0/applications/ldap-realm-demo/project.xml
- copied unchanged from r355942, geronimo/trunk/applications/ldap-realm-demo/project.xml
geronimo/branches/1.0/applications/ldap-realm-demo/src/
- copied from r355942, geronimo/trunk/applications/ldap-realm-demo/src/
geronimo/branches/1.0/configs/ldap-demo-jetty/
- copied from r355935, geronimo/trunk/configs/ldap-demo-jetty/
geronimo/branches/1.0/configs/ldap-demo-jetty/LICENSE.txt
- copied unchanged from r355942, geronimo/trunk/configs/ldap-demo-jetty/LICENSE.txt
geronimo/branches/1.0/configs/ldap-demo-jetty/NOTICE.txt
- copied unchanged from r355942, geronimo/trunk/configs/ldap-demo-jetty/NOTICE.txt
geronimo/branches/1.0/configs/ldap-demo-jetty/maven.xml
- copied unchanged from r355942, geronimo/trunk/configs/ldap-demo-jetty/maven.xml
geronimo/branches/1.0/configs/ldap-demo-jetty/project.properties
- copied unchanged from r355942, geronimo/trunk/configs/ldap-demo-jetty/project.properties
geronimo/branches/1.0/configs/ldap-demo-jetty/project.xml
- copied, changed from r355942, geronimo/trunk/configs/ldap-demo-jetty/project.xml
geronimo/branches/1.0/configs/ldap-demo-jetty/src/
- copied from r355942, geronimo/trunk/configs/ldap-demo-jetty/src/
geronimo/branches/1.0/configs/ldap-demo-tomcat/
- copied from r355935, geronimo/trunk/configs/ldap-demo-tomcat/
geronimo/branches/1.0/configs/ldap-demo-tomcat/LICENSE.txt
- copied unchanged from r355942, geronimo/trunk/configs/ldap-demo-tomcat/LICENSE.txt
geronimo/branches/1.0/configs/ldap-demo-tomcat/NOTICE.txt
- copied unchanged from r355942, geronimo/trunk/configs/ldap-demo-tomcat/NOTICE.txt
geronimo/branches/1.0/configs/ldap-demo-tomcat/maven.xml
- copied unchanged from r355942, geronimo/trunk/configs/ldap-demo-tomcat/maven.xml
geronimo/branches/1.0/configs/ldap-demo-tomcat/project.properties
- copied unchanged from r355942, geronimo/trunk/configs/ldap-demo-tomcat/project.properties
geronimo/branches/1.0/configs/ldap-demo-tomcat/project.xml
- copied, changed from r355942, geronimo/trunk/configs/ldap-demo-tomcat/project.xml
geronimo/branches/1.0/configs/ldap-demo-tomcat/src/
- copied from r355942, geronimo/trunk/configs/ldap-demo-tomcat/src/
geronimo/branches/1.0/configs/ldap-realm/
- copied from r355935, geronimo/trunk/configs/ldap-realm/
geronimo/branches/1.0/configs/ldap-realm/LICENSE.txt
- copied unchanged from r355942, geronimo/trunk/configs/ldap-realm/LICENSE.txt
geronimo/branches/1.0/configs/ldap-realm/NOTICE.txt
- copied unchanged from r355942, geronimo/trunk/configs/ldap-realm/NOTICE.txt
geronimo/branches/1.0/configs/ldap-realm/maven.xml
- copied unchanged from r355942, geronimo/trunk/configs/ldap-realm/maven.xml
geronimo/branches/1.0/configs/ldap-realm/project.properties
- copied unchanged from r355942, geronimo/trunk/configs/ldap-realm/project.properties
geronimo/branches/1.0/configs/ldap-realm/project.xml
- copied, changed from r355942, geronimo/trunk/configs/ldap-realm/project.xml
geronimo/branches/1.0/configs/ldap-realm/src/
- copied from r355942, geronimo/trunk/configs/ldap-realm/src/
Modified:
geronimo/branches/1.0/assemblies/j2ee-installer/project.xml
geronimo/branches/1.0/assemblies/j2ee-jetty-server/project.xml
geronimo/branches/1.0/assemblies/j2ee-jetty-server/src/var/config/config.xml
geronimo/branches/1.0/assemblies/j2ee-tomcat-server/project.xml
geronimo/branches/1.0/assemblies/j2ee-tomcat-server/src/var/config/config.xml
Modified: geronimo/branches/1.0/assemblies/j2ee-installer/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/assemblies/j2ee-installer/project.xml?rev=355948&r1=355947&r2=355948&view=diff
==============================================================================
--- geronimo/branches/1.0/assemblies/j2ee-installer/project.xml (original)
+++ geronimo/branches/1.0/assemblies/j2ee-installer/project.xml Sun Dec 11 01:40:49 2005
@@ -1160,11 +1160,11 @@
<version>${xfire_version}</version>
</dependency>
- <!-- for service mix and wadi -->
+ <!-- for wadi -->
<dependency>
<groupId>springframework</groupId>
<artifactId>spring</artifactId>
- <version>${spring_version}</version>
+ <version>${wadi_spring_version}</version>
</dependency>
@@ -1313,16 +1313,6 @@
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-service-builder</artifactId>
- <version>${pom.currentVersion}</version>
- </dependency>
- <dependency>
- <groupId>geronimo</groupId>
- <artifactId>geronimo-servicemix</artifactId>
- <version>${pom.currentVersion}</version>
- </dependency>
- <dependency>
- <groupId>geronimo</groupId>
- <artifactId>geronimo-servicemix-builder</artifactId>
<version>${pom.currentVersion}</version>
</dependency>
<dependency>
Modified: geronimo/branches/1.0/assemblies/j2ee-jetty-server/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/assemblies/j2ee-jetty-server/project.xml?rev=355948&r1=355947&r2=355948&view=diff
==============================================================================
--- geronimo/branches/1.0/assemblies/j2ee-jetty-server/project.xml (original)
+++ geronimo/branches/1.0/assemblies/j2ee-jetty-server/project.xml Sun Dec 11 01:40:49 2005
@@ -100,6 +100,15 @@
</dependency>
<dependency>
<groupId>geronimo</groupId>
+ <artifactId>ldap-realm</artifactId>
+ <type>car</type>
+ <version>${pom.currentVersion}</version>
+ <properties>
+ <geronimo.assemble>install</geronimo.assemble>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
<artifactId>system-database</artifactId>
<type>car</type>
<version>${pom.currentVersion}</version>
@@ -203,6 +212,15 @@
<!-- applications -->
<dependency>
<groupId>geronimo</groupId>
+ <artifactId>ldap-demo-jetty</artifactId>
+ <type>car</type>
+ <version>${pom.currentVersion}</version>
+ <properties>
+ <geronimo.assemble>install</geronimo.assemble>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
<artifactId>welcome-jetty</artifactId>
<type>car</type>
<version>${pom.currentVersion}</version>
@@ -1110,11 +1128,11 @@
<version>${xfire_version}</version>
</dependency>
- <!-- for service mix and wadi -->
+ <!-- for wadi -->
<dependency>
<groupId>springframework</groupId>
<artifactId>spring</artifactId>
- <version>${spring_version}</version>
+ <version>${wadi_spring_version}</version>
</dependency>
<dependency>
<groupId>geronimo</groupId>
@@ -1267,16 +1285,6 @@
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-service-builder</artifactId>
- <version>${pom.currentVersion}</version>
- </dependency>
- <dependency>
- <groupId>geronimo</groupId>
- <artifactId>geronimo-servicemix</artifactId>
- <version>${pom.currentVersion}</version>
- </dependency>
- <dependency>
- <groupId>geronimo</groupId>
- <artifactId>geronimo-servicemix-builder</artifactId>
<version>${pom.currentVersion}</version>
</dependency>
<dependency>
Modified: geronimo/branches/1.0/assemblies/j2ee-jetty-server/src/var/config/config.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/assemblies/j2ee-jetty-server/src/var/config/config.xml?rev=355948&r1=355947&r2=355948&view=diff
==============================================================================
--- geronimo/branches/1.0/assemblies/j2ee-jetty-server/src/var/config/config.xml (original)
+++ geronimo/branches/1.0/assemblies/j2ee-jetty-server/src/var/config/config.xml Sun Dec 11 01:40:49 2005
@@ -62,6 +62,7 @@
<attribute name="port">${PlanLdapPort}</attribute>
</gbean>
</configuration>
+ <configuration name="geronimo/ldap-realm/${pom.currentVersion}/car"/>
<configuration name="geronimo/jetty/${pom.currentVersion}/car">
<gbean name="JettyWebConnector">
<attribute name="host">${PlanServerHostname}</attribute>
@@ -84,6 +85,7 @@
</configuration>
<configuration name="geronimo/jetty-deployer/${pom.currentVersion}/car"/>
<configuration name="geronimo/welcome-jetty/${pom.currentVersion}/car"/>
+ <configuration name="geronimo/ldap-demo-jetty/${pom.currentVersion}/car"/>
<configuration name="geronimo/servlets-examples-jetty/${pom.currentVersion}/car"/>
<configuration name="geronimo/jsp-examples-jetty/${pom.currentVersion}/car"/>
<configuration name="geronimo/webconsole-jetty/${pom.currentVersion}/car"/>
Modified: geronimo/branches/1.0/assemblies/j2ee-tomcat-server/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/assemblies/j2ee-tomcat-server/project.xml?rev=355948&r1=355947&r2=355948&view=diff
==============================================================================
--- geronimo/branches/1.0/assemblies/j2ee-tomcat-server/project.xml (original)
+++ geronimo/branches/1.0/assemblies/j2ee-tomcat-server/project.xml Sun Dec 11 01:40:49 2005
@@ -100,6 +100,15 @@
</dependency>
<dependency>
<groupId>geronimo</groupId>
+ <artifactId>ldap-realm</artifactId>
+ <type>car</type>
+ <version>${pom.currentVersion}</version>
+ <properties>
+ <geronimo.assemble>install</geronimo.assemble>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
<artifactId>system-database</artifactId>
<type>car</type>
<version>${pom.currentVersion}</version>
@@ -203,6 +212,15 @@
<!--applications-->
<dependency>
<groupId>geronimo</groupId>
+ <artifactId>ldap-demo-tomcat</artifactId>
+ <type>car</type>
+ <version>${pom.currentVersion}</version>
+ <properties>
+ <geronimo.assemble>install</geronimo.assemble>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
<artifactId>welcome-tomcat</artifactId>
<type>car</type>
<version>${pom.currentVersion}</version>
@@ -1124,7 +1142,7 @@
<dependency>
<groupId>springframework</groupId>
<artifactId>spring</artifactId>
- <version>${spring_version}</version>
+ <version>${wadi_spring_version}</version>
</dependency>
<dependency>
<groupId>geronimo</groupId>
@@ -1277,16 +1295,6 @@
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-service-builder</artifactId>
- <version>${pom.currentVersion}</version>
- </dependency>
- <dependency>
- <groupId>geronimo</groupId>
- <artifactId>geronimo-servicemix</artifactId>
- <version>${pom.currentVersion}</version>
- </dependency>
- <dependency>
- <groupId>geronimo</groupId>
- <artifactId>geronimo-servicemix-builder</artifactId>
<version>${pom.currentVersion}</version>
</dependency>
<dependency>
Modified: geronimo/branches/1.0/assemblies/j2ee-tomcat-server/src/var/config/config.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/assemblies/j2ee-tomcat-server/src/var/config/config.xml?rev=355948&r1=355947&r2=355948&view=diff
==============================================================================
--- geronimo/branches/1.0/assemblies/j2ee-tomcat-server/src/var/config/config.xml (original)
+++ geronimo/branches/1.0/assemblies/j2ee-tomcat-server/src/var/config/config.xml Sun Dec 11 01:40:49 2005
@@ -62,6 +62,7 @@
<attribute name="port">${PlanLdapPort}</attribute>
</gbean>
</configuration>
+ <configuration name="geronimo/ldap-realm/${pom.currentVersion}/car"/>
<configuration name="geronimo/tomcat/${pom.currentVersion}/car">
<gbean name="TomcatResources"/>
<gbean name="TomcatWebConnector">
@@ -90,6 +91,7 @@
</configuration>
<configuration name="geronimo/tomcat-deployer/${pom.currentVersion}/car"/>
<configuration name="geronimo/welcome-tomcat/${pom.currentVersion}/car"/>
+ <configuration name="geronimo/ldap-demo-tomcat/${pom.currentVersion}/car"/>
<configuration name="geronimo/servlets-examples-tomcat/${pom.currentVersion}/car"/>
<configuration name="geronimo/jsp-examples-tomcat/${pom.currentVersion}/car"/>
<configuration name="geronimo/webconsole-tomcat/${pom.currentVersion}/car"/>
Copied: geronimo/branches/1.0/configs/ldap-demo-jetty/project.xml (from r355942, geronimo/trunk/configs/ldap-demo-jetty/project.xml)
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/configs/ldap-demo-jetty/project.xml?p2=geronimo/branches/1.0/configs/ldap-demo-jetty/project.xml&p1=geronimo/trunk/configs/ldap-demo-jetty/project.xml&r1=355942&r2=355948&rev=355948&view=diff
==============================================================================
--- geronimo/trunk/configs/ldap-demo-jetty/project.xml (original)
+++ geronimo/branches/1.0/configs/ldap-demo-jetty/project.xml Sun Dec 11 01:40:49 2005
@@ -29,7 +29,7 @@
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-packaging-plugin</artifactId>
- <version>${geronimo_packaging_plugin_version}</version>
+ <version>${geronimo_version}</version>
<type>plugin</type>
</dependency>
<dependency>
Copied: geronimo/branches/1.0/configs/ldap-demo-tomcat/project.xml (from r355942, geronimo/trunk/configs/ldap-demo-tomcat/project.xml)
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/configs/ldap-demo-tomcat/project.xml?p2=geronimo/branches/1.0/configs/ldap-demo-tomcat/project.xml&p1=geronimo/trunk/configs/ldap-demo-tomcat/project.xml&r1=355942&r2=355948&rev=355948&view=diff
==============================================================================
--- geronimo/trunk/configs/ldap-demo-tomcat/project.xml (original)
+++ geronimo/branches/1.0/configs/ldap-demo-tomcat/project.xml Sun Dec 11 01:40:49 2005
@@ -29,7 +29,7 @@
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-packaging-plugin</artifactId>
- <version>${geronimo_packaging_plugin_version}</version>
+ <version>${geronimo_version}</version>
<type>plugin</type>
</dependency>
<dependency>
Copied: geronimo/branches/1.0/configs/ldap-realm/project.xml (from r355942, geronimo/trunk/configs/ldap-realm/project.xml)
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/configs/ldap-realm/project.xml?p2=geronimo/branches/1.0/configs/ldap-realm/project.xml&p1=geronimo/trunk/configs/ldap-realm/project.xml&r1=355942&r2=355948&rev=355948&view=diff
==============================================================================
--- geronimo/trunk/configs/ldap-realm/project.xml (original)
+++ geronimo/branches/1.0/configs/ldap-realm/project.xml Sun Dec 11 01:40:49 2005
@@ -29,7 +29,7 @@
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-packaging-plugin</artifactId>
- <version>${geronimo_packaging_plugin_version}</version>
+ <version>${geronimo_version}</version>
<type>plugin</type>
</dependency>
<dependency>