You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jg...@apache.org on 2005/12/11 07:31:35 UTC
svn commit: r355926 - in /geronimo/trunk: assemblies/j2ee-jetty-server/
assemblies/j2ee-jetty-server/src/var/config/ assemblies/j2ee-tomcat-server/
assemblies/j2ee-tomcat-server/src/var/config/ configs/ldap-demo-jetty/
configs/ldap-demo-jetty/src/plan/...
Author: jgenender
Date: Sat Dec 10 22:31:29 2005
New Revision: 355926
URL: http://svn.apache.org/viewcvs?rev=355926&view=rev
Log:
Tidy up the ldap-demo
Modified:
geronimo/trunk/assemblies/j2ee-jetty-server/project.xml
geronimo/trunk/assemblies/j2ee-jetty-server/src/var/config/config.xml
geronimo/trunk/assemblies/j2ee-tomcat-server/project.xml
geronimo/trunk/assemblies/j2ee-tomcat-server/src/var/config/config.xml
geronimo/trunk/configs/ldap-demo-jetty/project.xml
geronimo/trunk/configs/ldap-demo-jetty/src/plan/plan.xml
geronimo/trunk/configs/ldap-demo-tomcat/project.xml
geronimo/trunk/configs/ldap-demo-tomcat/src/plan/plan.xml
Modified: geronimo/trunk/assemblies/j2ee-jetty-server/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/assemblies/j2ee-jetty-server/project.xml?rev=355926&r1=355925&r2=355926&view=diff
==============================================================================
--- geronimo/trunk/assemblies/j2ee-jetty-server/project.xml (original)
+++ geronimo/trunk/assemblies/j2ee-jetty-server/project.xml Sat Dec 10 22:31:29 2005
@@ -212,7 +212,7 @@
<!-- applications -->
<dependency>
<groupId>geronimo</groupId>
- <artifactId>geronimo-ldap-demo-jetty</artifactId>
+ <artifactId>ldap-demo-jetty</artifactId>
<type>car</type>
<version>${pom.currentVersion}</version>
<properties>
Modified: geronimo/trunk/assemblies/j2ee-jetty-server/src/var/config/config.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/assemblies/j2ee-jetty-server/src/var/config/config.xml?rev=355926&r1=355925&r2=355926&view=diff
==============================================================================
--- geronimo/trunk/assemblies/j2ee-jetty-server/src/var/config/config.xml (original)
+++ geronimo/trunk/assemblies/j2ee-jetty-server/src/var/config/config.xml Sat Dec 10 22:31:29 2005
@@ -85,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/trunk/assemblies/j2ee-tomcat-server/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/assemblies/j2ee-tomcat-server/project.xml?rev=355926&r1=355925&r2=355926&view=diff
==============================================================================
--- geronimo/trunk/assemblies/j2ee-tomcat-server/project.xml (original)
+++ geronimo/trunk/assemblies/j2ee-tomcat-server/project.xml Sat Dec 10 22:31:29 2005
@@ -212,7 +212,7 @@
<!--applications-->
<dependency>
<groupId>geronimo</groupId>
- <artifactId>geronimo-ldap-demo-tomcat</artifactId>
+ <artifactId>ldap-demo-tomcat</artifactId>
<type>car</type>
<version>${pom.currentVersion}</version>
<properties>
Modified: geronimo/trunk/assemblies/j2ee-tomcat-server/src/var/config/config.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/assemblies/j2ee-tomcat-server/src/var/config/config.xml?rev=355926&r1=355925&r2=355926&view=diff
==============================================================================
--- geronimo/trunk/assemblies/j2ee-tomcat-server/src/var/config/config.xml (original)
+++ geronimo/trunk/assemblies/j2ee-tomcat-server/src/var/config/config.xml Sat Dec 10 22:31:29 2005
@@ -91,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"/>
Modified: geronimo/trunk/configs/ldap-demo-jetty/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/ldap-demo-jetty/project.xml?rev=355926&r1=355925&r2=355926&view=diff
==============================================================================
--- geronimo/trunk/configs/ldap-demo-jetty/project.xml (original)
+++ geronimo/trunk/configs/ldap-demo-jetty/project.xml Sat Dec 10 22:31:29 2005
@@ -21,7 +21,7 @@
<project>
<pomVersion>3</pomVersion>
<extend>../../etc/project.xml</extend>
- <artifactId>geronimo-ldap-demo-jetty</artifactId>
+ <artifactId>ldap-demo-jetty</artifactId>
<name>LDAP Demo for Jetty</name>
<dependencies>
Modified: geronimo/trunk/configs/ldap-demo-jetty/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/ldap-demo-jetty/src/plan/plan.xml?rev=355926&r1=355925&r2=355926&view=diff
==============================================================================
--- geronimo/trunk/configs/ldap-demo-jetty/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/ldap-demo-jetty/src/plan/plan.xml Sat Dec 10 22:31:29 2005
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.0"
xmlns:sec="http://geronimo.apache.org/xml/ns/security"
- configId="${pom.groupId}/cars/${pom.artifactId}-${pom.currentVersion}.car"
+ configId="${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car"
>
<context-root>/ldap-demo</context-root>
<context-priority-classloader>false</context-priority-classloader>
Modified: geronimo/trunk/configs/ldap-demo-tomcat/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/ldap-demo-tomcat/project.xml?rev=355926&r1=355925&r2=355926&view=diff
==============================================================================
--- geronimo/trunk/configs/ldap-demo-tomcat/project.xml (original)
+++ geronimo/trunk/configs/ldap-demo-tomcat/project.xml Sat Dec 10 22:31:29 2005
@@ -21,7 +21,7 @@
<project>
<pomVersion>3</pomVersion>
<extend>../../etc/project.xml</extend>
- <id>geronimo-ldap-demo-tomcat</id>
+ <id>ldap-demo-tomcat</id>
<name>LDAP Demo for Tomcat</name>
<dependencies>
Modified: geronimo/trunk/configs/ldap-demo-tomcat/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/ldap-demo-tomcat/src/plan/plan.xml?rev=355926&r1=355925&r2=355926&view=diff
==============================================================================
--- geronimo/trunk/configs/ldap-demo-tomcat/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/ldap-demo-tomcat/src/plan/plan.xml Sat Dec 10 22:31:29 2005
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.0"
xmlns:sec="http://geronimo.apache.org/xml/ns/security"
- configId="${pom.groupId}/cars/${pom.artifactId}-${pom.currentVersion}.car"
+ configId="${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car"
parentId="geronimo/ldap-realm/${pom.currentVersion}/car">
<context-root>/ldap-demo</context-root>
<context-priority-classloader>false</context-priority-classloader>