geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r584850 - in /geronimo/server/trunk: configs/j2ee-deployer/pom.xml configs/jetty6-deployer/pom.xml configs/tomcat6-deployer/pom.xml modules/geronimo-j2ee-schema/src/main/resources/
Date Mon, 15 Oct 2007 18:59:11 GMT
Author: gawor
Date: Mon Oct 15 11:59:11 2007
New Revision: 584850

URL: http://svn.apache.org/viewvc?rev=584850&view=rev
Log:
moved dependencies from geronimo-dependency.xml to config modules. right version of schemas
is getting installed now

Removed:
    geronimo/server/trunk/modules/geronimo-j2ee-schema/src/main/resources/
Modified:
    geronimo/server/trunk/configs/j2ee-deployer/pom.xml
    geronimo/server/trunk/configs/jetty6-deployer/pom.xml
    geronimo/server/trunk/configs/tomcat6-deployer/pom.xml

Modified: geronimo/server/trunk/configs/j2ee-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/j2ee-deployer/pom.xml?rev=584850&r1=584849&r2=584850&view=diff
==============================================================================
--- geronimo/server/trunk/configs/j2ee-deployer/pom.xml (original)
+++ geronimo/server/trunk/configs/j2ee-deployer/pom.xml Mon Oct 15 11:59:11 2007
@@ -69,6 +69,16 @@
         </dependency>
 
         <dependency>
+            <groupId>org.apache.geronimo.schema</groupId>
+            <artifactId>geronimo-schema-jee_5</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.schema</groupId>
+            <artifactId>geronimo-schema-j2ee_1.4</artifactId>
+        </dependency>
+
+        <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-client</artifactId>
             <version>${version}</version>
@@ -128,6 +138,20 @@
                             <groupId>org.apache.geronimo.modules</groupId>
                             <artifactId>geronimo-j2ee-schema</artifactId>
                             <version>2.1-SNAPSHOT</version>
+                            <type>jar</type>
+                            <import>classes</import>
+                        </dependency>
+                        <dependency>
+                            <groupId>org.apache.geronimo.schema</groupId>
+                            <artifactId>geronimo-schema-jee_5</artifactId>
+                            <version>1.1</version>
+                            <type>jar</type>
+                            <import>classes</import>
+                        </dependency>
+                        <dependency>
+                            <groupId>org.apache.geronimo.schema</groupId>
+                            <artifactId>geronimo-schema-j2ee_1.4</artifactId>
+                            <version>1.2</version>
                             <type>jar</type>
                             <import>classes</import>
                         </dependency>

Modified: geronimo/server/trunk/configs/jetty6-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jetty6-deployer/pom.xml?rev=584850&r1=584849&r2=584850&view=diff
==============================================================================
--- geronimo/server/trunk/configs/jetty6-deployer/pom.xml (original)
+++ geronimo/server/trunk/configs/jetty6-deployer/pom.xml Mon Oct 15 11:59:11 2007
@@ -72,11 +72,6 @@
             <version>${version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.geronimo.schema</groupId>
-            <artifactId>geronimo-schema-jee_5</artifactId>
-        </dependency>
-
     </dependencies>
     
     <build>
@@ -94,13 +89,6 @@
                         <groupId>org.apache.geronimo.configs</groupId>
                         <artifactId>connector-deployer</artifactId>
                         <type>car</type>
-                      </dependency>
-                      <dependency>
-                        <groupId>org.apache.geronimo.schema</groupId>
-                        <artifactId>geronimo-schema-jee_5</artifactId>
-                        <version>1.1</version>
-                        <type>jar</type>
-                        <import>classes</import>
                       </dependency>
                       <dependency>
                         <groupId>org.apache.geronimo.configs</groupId>

Modified: geronimo/server/trunk/configs/tomcat6-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/tomcat6-deployer/pom.xml?rev=584850&r1=584849&r2=584850&view=diff
==============================================================================
--- geronimo/server/trunk/configs/tomcat6-deployer/pom.xml (original)
+++ geronimo/server/trunk/configs/tomcat6-deployer/pom.xml Mon Oct 15 11:59:11 2007
@@ -73,11 +73,6 @@
             <version>${version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.geronimo.schema</groupId>
-            <artifactId>geronimo-schema-jee_5</artifactId>
-        </dependency>
-
     </dependencies>
 
     <build>
@@ -107,13 +102,6 @@
                             <groupId>org.apache.geronimo.modules</groupId>
                             <artifactId>geronimo-tomcat6-builder</artifactId>
                             <version>2.1-SNAPSHOT</version>
-                            <type>jar</type>
-                            <import>classes</import>
-                        </dependency>
-                        <dependency>
-                            <groupId>org.apache.geronimo.schema</groupId>
-                            <artifactId>geronimo-schema-jee_5</artifactId>
-                            <version>1.1</version>
                             <type>jar</type>
                             <import>classes</import>
                         </dependency>



Mime
View raw message