geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ammul...@apache.org
Subject svn commit: r355852 - in /geronimo/trunk: applications/ldap-realm-demo/project.xml configs/ldap-demo-jetty/project.xml configs/ldap-demo-jetty/src/plan/plan.xml
Date Sun, 11 Dec 2005 01:24:51 GMT
Author: ammulder
Date: Sat Dec 10 17:24:49 2005
New Revision: 355852

URL: http://svn.apache.org/viewcvs?rev=355852&view=rev
Log:
Unbreak LDAP demo realm thingy

Modified:
    geronimo/trunk/applications/ldap-realm-demo/project.xml
    geronimo/trunk/configs/ldap-demo-jetty/project.xml
    geronimo/trunk/configs/ldap-demo-jetty/src/plan/plan.xml

Modified: geronimo/trunk/applications/ldap-realm-demo/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/ldap-realm-demo/project.xml?rev=355852&r1=355851&r2=355852&view=diff
==============================================================================
--- geronimo/trunk/applications/ldap-realm-demo/project.xml (original)
+++ geronimo/trunk/applications/ldap-realm-demo/project.xml Sat Dec 10 17:24:49 2005
@@ -23,7 +23,7 @@
     <extend>../../etc/project.xml</extend>
 
     <name>Geronimo :: LDAP Demo Application</name>
-    <id>geronimo-ldap-demo</id>
+    <artifactId>geronimo-ldap-demo</artifactId>
     <shortDescription>Geronimo LDAP Demo Application</shortDescription>
     <description>
         This is a very simple application that is intended to demonstrate the ldap

Modified: geronimo/trunk/configs/ldap-demo-jetty/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/ldap-demo-jetty/project.xml?rev=355852&r1=355851&r2=355852&view=diff
==============================================================================
--- geronimo/trunk/configs/ldap-demo-jetty/project.xml (original)
+++ geronimo/trunk/configs/ldap-demo-jetty/project.xml Sat Dec 10 17:24:49 2005
@@ -21,7 +21,7 @@
 <project>
     <pomVersion>3</pomVersion>
     <extend>../../etc/project.xml</extend>
-    <id>geronimo-ldap-demo-jetty</id>
+    <artifactId>geronimo-ldap-demo-jetty</artifactId>
     <name>LDAP Demo for Jetty</name>
 
     <dependencies>
@@ -54,9 +54,12 @@
         <!-- parent config -->
         <dependency>
             <groupId>geronimo</groupId>
-            <artifactId>j2ee-server</artifactId>
+            <artifactId>ldap-realm</artifactId>
             <version>${geronimo_version}</version>
             <type>car</type>
+            <properties>
+                <geronimo.import>true</geronimo.import>
+            </properties>
         </dependency>
 
         <dependency>

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=355852&r1=355851&r2=355852&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 17:24:49 2005
@@ -2,7 +2,7 @@
 <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"
-    parentId="geronimo/ldap-realm/${pom.currentVersion}/car">
+    >
     <context-root>/ldap-demo</context-root>
     <context-priority-classloader>false</context-priority-classloader>
     <security-realm-name>ldap-realm</security-realm-name>



Mime
View raw message