geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r397699 - in /geronimo/branches/1.1: assemblies/j2ee-jetty-server/src/var/config/ assemblies/j2ee-tomcat-server/src/var/config/ configs/activemq/ configs/console-jetty/ configs/console-tomcat/ configs/daytrader-jetty/ configs/daytrader-tomc...
Date Fri, 28 Apr 2006 01:01:17 GMT
Author: djencks
Date: Thu Apr 27 18:01:14 2006
New Revision: 397699

URL: http://svn.apache.org/viewcvs?rev=397699&view=rev
Log:
GERONIMO-1875 rearrange dependencies for servers

Modified:
    geronimo/branches/1.1/assemblies/j2ee-jetty-server/src/var/config/config.xml
    geronimo/branches/1.1/assemblies/j2ee-tomcat-server/src/var/config/config.xml
    geronimo/branches/1.1/configs/activemq/project.xml
    geronimo/branches/1.1/configs/console-jetty/project.xml
    geronimo/branches/1.1/configs/console-tomcat/project.xml
    geronimo/branches/1.1/configs/daytrader-jetty/project.xml
    geronimo/branches/1.1/configs/daytrader-tomcat/project.xml
    geronimo/branches/1.1/configs/j2ee-corba/project.xml
    geronimo/branches/1.1/configs/j2ee-deployer/project.xml
    geronimo/branches/1.1/configs/j2ee-server/project.xml
    geronimo/branches/1.1/configs/javamail/project.xml
    geronimo/branches/1.1/configs/jetty-deployer/src/plan/plan.xml
    geronimo/branches/1.1/configs/openejb-deployer/project.xml
    geronimo/branches/1.1/configs/openejb/project.xml
    geronimo/branches/1.1/configs/rmi-naming/project.xml
    geronimo/branches/1.1/configs/system-database/project.xml
    geronimo/branches/1.1/modules/client-builder/maven.xml
    geronimo/branches/1.1/modules/client-builder/project.xml
    geronimo/branches/1.1/modules/tomcat/project.xml

Modified: geronimo/branches/1.1/assemblies/j2ee-jetty-server/src/var/config/config.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/assemblies/j2ee-jetty-server/src/var/config/config.xml?rev=397699&r1=397698&r2=397699&view=diff
==============================================================================
--- geronimo/branches/1.1/assemblies/j2ee-jetty-server/src/var/config/config.xml (original)
+++ geronimo/branches/1.1/assemblies/j2ee-jetty-server/src/var/config/config.xml Thu Apr 27 18:01:14 2006
@@ -94,7 +94,7 @@
     </configuration>
     <configuration name="geronimo/openejb-deployer/${pom.currentVersion}/car">
         <gbean name="EJBBuilder">
-            <attribute name="listener">geronimo.server:J2EEApplication=null,J2EEModule=geronimo/jetty/${pom.currentVersion}/car,J2EEServer=geronimo,j2eeType=GBean,name=JettyWebContainer</attribute>
+            <attribute name="listener">?JettyWebContainer</attribute>
         </gbean>
     </configuration>
     <configuration name="geronimo/client-deployer/${pom.currentVersion}/car"/>

Modified: geronimo/branches/1.1/assemblies/j2ee-tomcat-server/src/var/config/config.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/assemblies/j2ee-tomcat-server/src/var/config/config.xml?rev=397699&r1=397698&r2=397699&view=diff
==============================================================================
--- geronimo/branches/1.1/assemblies/j2ee-tomcat-server/src/var/config/config.xml (original)
+++ geronimo/branches/1.1/assemblies/j2ee-tomcat-server/src/var/config/config.xml Thu Apr 27 18:01:14 2006
@@ -96,7 +96,7 @@
     </configuration>
     <configuration name="geronimo/openejb-deployer/${pom.currentVersion}/car">
         <gbean name="EJBBuilder">
-            <attribute name="listener">geronimo.server:J2EEApplication=null,J2EEModule=geronimo/tomcat/${pom.currentVersion}/car,J2EEServer=geronimo,j2eeType=GBean,name=TomcatWebContainer</attribute>
+            <attribute name="listener">?name=TomcatWebContainer</attribute>
         </gbean>
     </configuration>
     <configuration name="geronimo/client-deployer/${pom.currentVersion}/car"/>

Modified: geronimo/branches/1.1/configs/activemq/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/activemq/project.xml?rev=397699&r1=397698&r2=397699&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/activemq/project.xml (original)
+++ geronimo/branches/1.1/configs/activemq/project.xml Thu Apr 27 18:01:14 2006
@@ -50,6 +50,33 @@
                 <packaging.config.order>2</packaging.config.order>
             </properties>
         </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>openejb-deployer</artifactId>
+            <version>${geronimo_version}</version>
+            <type>car</type>
+            <properties>
+                <packaging.config.order>3</packaging.config.order>
+            </properties>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>axis-deployer</artifactId>
+            <version>${geronimo_version}</version>
+            <type>car</type>
+            <properties>
+                <packaging.config.order>4</packaging.config.order>
+            </properties>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>client-deployer</artifactId>
+            <version>${geronimo_version}</version>
+            <type>car</type>
+            <properties>
+                <packaging.config.order>5</packaging.config.order>
+            </properties>
+        </dependency>
 
         <!-- parent config -->
         <dependency>
@@ -73,11 +100,6 @@
             <version>${geronimo_spec_j2ee_version}</version>
         </dependency>
 
-        <!--<dependency>-->
-            <!--<groupId>activemq</groupId>-->
-            <!--<artifactId>activemq-gbean-management-g1_1</artifactId>-->
-            <!--<version>${activemq_version}</version>-->
-        <!--</dependency>-->
         <dependency>
              <groupId>activemq</groupId>
              <artifactId>activemq-ra</artifactId>

Modified: geronimo/branches/1.1/configs/console-jetty/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/console-jetty/project.xml?rev=397699&r1=397698&r2=397699&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/console-jetty/project.xml (original)
+++ geronimo/branches/1.1/configs/console-jetty/project.xml Thu Apr 27 18:01:14 2006
@@ -61,12 +61,6 @@
         </dependency>
         <dependency>
             <groupId>geronimo</groupId>
-            <artifactId>client-deployer</artifactId>
-            <version>${geronimo_version}</version>
-            <type>car</type>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
             <artifactId>openejb-deployer</artifactId>
             <version>${geronimo_version}</version>
             <type>car</type>
@@ -103,6 +97,16 @@
                 <geronimo.import>true</geronimo.import>
             </properties>
         </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>system-database</artifactId>
+            <version>${geronimo_version}</version>
+            <type>car</type>
+            <properties>
+                <geronimo.import>true</geronimo.import>
+            </properties>
+        </dependency>
+
         <!-- for login module manager -->
         <dependency>
             <groupId>geronimo</groupId>
@@ -263,6 +267,14 @@
             <version>${geronimo_version}</version>
             <properties>
                 <geronimo.dependency>true</geronimo.dependency>
+            </properties>
+        </dependency>
+        <dependency>
+            <groupId>jdom</groupId>
+            <artifactId>jdom</artifactId>
+            <version>${jdom_version}</version>
+            <properties>
+                 <geronimo.dependency>true</geronimo.dependency>
             </properties>
         </dependency>
 

Modified: geronimo/branches/1.1/configs/console-tomcat/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/console-tomcat/project.xml?rev=397699&r1=397698&r2=397699&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/console-tomcat/project.xml (original)
+++ geronimo/branches/1.1/configs/console-tomcat/project.xml Thu Apr 27 18:01:14 2006
@@ -97,6 +97,16 @@
                 <geronimo.import>true</geronimo.import>
             </properties>
         </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>system-database</artifactId>
+            <version>${geronimo_version}</version>
+            <type>car</type>
+            <properties>
+                <geronimo.import>true</geronimo.import>
+            </properties>
+        </dependency>
+
         <!-- for login module manager -->
         <dependency>
             <groupId>geronimo</groupId>
@@ -257,6 +267,14 @@
             <version>${geronimo_version}</version>
             <properties>
                 <geronimo.dependency>true</geronimo.dependency>
+            </properties>
+        </dependency>
+        <dependency>
+            <groupId>jdom</groupId>
+            <artifactId>jdom</artifactId>
+            <version>${jdom_version}</version>
+            <properties>
+                 <geronimo.dependency>true</geronimo.dependency>
             </properties>
         </dependency>
 

Modified: geronimo/branches/1.1/configs/daytrader-jetty/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/daytrader-jetty/project.xml?rev=397699&r1=397698&r2=397699&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/daytrader-jetty/project.xml (original)
+++ geronimo/branches/1.1/configs/daytrader-jetty/project.xml Thu Apr 27 18:01:14 2006
@@ -86,31 +86,56 @@
                 <packaging.config.order>6</packaging.config.order>
             </properties>
         </dependency>
-         <!-- parent config -->
+
+        <!-- parent config -->
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>j2ee-server</artifactId>
             <version>${geronimo_version}</version>
             <type>car</type>
             <properties>
-                 <geronimo.import>true</geronimo.import>
-             </properties>
+                <geronimo.import>true</geronimo.import>
+            </properties>
+        </dependency>
+        <!--required as parent of this derby db to get derby engine classes -->
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>system-database</artifactId>
+            <version>${geronimo_version}</version>
+            <type>car</type>
+            <properties>
+                <geronimo.import>true</geronimo.import>
+            </properties>
         </dependency>
 
-    <dependency>
-        <groupId>geronimo</groupId>
-        <artifactId>geronimo-daytrader-derby-db</artifactId>
-        <version>${pom.currentVersion}</version>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-daytrader-derby-db</artifactId>
+            <version>${pom.currentVersion}</version>
             <properties>
-                 <geronimo.dependency>true</geronimo.dependency>
-             </properties>
-    </dependency>
-    <dependency>
-        <groupId>geronimo</groupId>
-        <artifactId>daytrader-ear</artifactId>
-        <version>${daytrader_version}</version>
+                <geronimo.dependency>true</geronimo.dependency>
+            </properties>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>daytrader-ear</artifactId>
+            <version>${daytrader_version}</version>
             <type>ear</type>
-    </dependency>
+        </dependency>
+
+        <dependency>
+            <groupId>activemq</groupId>
+            <artifactId>activemq-ra</artifactId>
+            <version>${activemq_version}</version>
+            <type>rar</type>
+        </dependency>
+
+        <dependency>
+            <groupId>tranql</groupId>
+            <artifactId>tranql-connector-derby-embed-xa</artifactId>
+            <version>${tranql_vendors_version}</version>
+            <type>rar</type>
+        </dependency>
 
 
 <!--inessentials -->

Modified: geronimo/branches/1.1/configs/daytrader-tomcat/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/daytrader-tomcat/project.xml?rev=397699&r1=397698&r2=397699&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/daytrader-tomcat/project.xml (original)
+++ geronimo/branches/1.1/configs/daytrader-tomcat/project.xml Thu Apr 27 18:01:14 2006
@@ -86,6 +86,7 @@
                 <packaging.config.order>6</packaging.config.order>
             </properties>
         </dependency>
+
          <!-- parent config -->
         <dependency>
             <groupId>geronimo</groupId>
@@ -96,23 +97,47 @@
                  <geronimo.import>true</geronimo.import>
              </properties>
         </dependency>
+        <!--required as parent of this derby db to get derby engine classes -->
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>system-database</artifactId>
+            <version>${geronimo_version}</version>
+            <type>car</type>
+            <properties>
+                <geronimo.import>true</geronimo.import>
+            </properties>
+        </dependency>
 
 
-
-    <dependency>
-        <groupId>geronimo</groupId>
-        <artifactId>geronimo-daytrader-derby-db</artifactId>
-        <version>${pom.currentVersion}</version>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-daytrader-derby-db</artifactId>
+            <version>${pom.currentVersion}</version>
             <properties>
-                 <geronimo.dependency>true</geronimo.dependency>
-             </properties>
-    </dependency>
-    <dependency>
-        <groupId>geronimo</groupId>
-        <artifactId>daytrader-ear</artifactId>
-        <version>${daytrader_version}</version>
+                <geronimo.dependency>true</geronimo.dependency>
+            </properties>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>daytrader-ear</artifactId>
+            <version>${daytrader_version}</version>
             <type>ear</type>
-    </dependency>
+        </dependency>
+
+        <dependency>
+            <groupId>activemq</groupId>
+            <artifactId>activemq-ra</artifactId>
+            <version>${activemq_version}</version>
+            <type>rar</type>
+        </dependency>
+
+
+        <dependency>
+            <groupId>tranql</groupId>
+            <artifactId>tranql-connector-derby-embed-xa</artifactId>
+            <version>${tranql_vendors_version}</version>
+            <type>rar</type>
+        </dependency>
 
 
 <!--inessentials -->

Modified: geronimo/branches/1.1/configs/j2ee-corba/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/j2ee-corba/project.xml?rev=397699&r1=397698&r2=397699&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/j2ee-corba/project.xml (original)
+++ geronimo/branches/1.1/configs/j2ee-corba/project.xml Thu Apr 27 18:01:14 2006
@@ -178,6 +178,9 @@
             <groupId>openejb</groupId>
             <artifactId>openejb-core</artifactId>
             <version>${openejb_version}</version>
+            <properties>
+                 <geronimo.dependency>true</geronimo.dependency>
+            </properties>
         </dependency>
         <dependency>
             <groupId>howl</groupId>

Modified: geronimo/branches/1.1/configs/j2ee-deployer/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/j2ee-deployer/project.xml?rev=397699&r1=397698&r2=397699&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/j2ee-deployer/project.xml (original)
+++ geronimo/branches/1.1/configs/j2ee-deployer/project.xml Thu Apr 27 18:01:14 2006
@@ -57,9 +57,6 @@
             <type>car</type>
             <artifactId>client</artifactId>
             <version>${pom.currentVersion}</version>
-            <!--<properties>-->
-            <!--<geronimo.import>true</geronimo.import>-->
-            <!--</properties>-->
         </dependency>
         <dependency>
             <groupId>geronimo</groupId>
@@ -107,23 +104,6 @@
             <version>${stax_api_version}</version>
         </dependency>
 
-        <!--        <dependency>
-                    <groupId>concurrent</groupId>
-                    <artifactId>concurrent</artifactId>
-                    <version>${concurrent_version}</version>
-                </dependency>
-                <dependency>
-                    <groupId>howl</groupId>
-                    <artifactId>howl-logger</artifactId>
-                    <version>${howl_version}</version>
-                    <url>http://forge.objectweb.org/projects/howl</url>
-                </dependency>
-                <dependency>
-                    <groupId>activeio</groupId>
-                    <artifactId>activeio</artifactId>
-                    <version>${activeio_version}</version>
-                </dependency>
-        -->
         <!-- dependencies from plan -->
 
         <!-- common libraries used by all builders -->
@@ -139,9 +119,6 @@
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-j2ee_1.4_spec</artifactId>
             <version>${geronimo_spec_j2ee_version}</version>
-            <properties>
-                <geronimo.dependency>true</geronimo.dependency>
-            </properties>
         </dependency>
         <dependency>
             <groupId>geronimo</groupId>
@@ -189,14 +166,6 @@
         </dependency>
         <dependency>
             <groupId>geronimo</groupId>
-            <artifactId>geronimo-client-builder</artifactId>
-            <version>${geronimo_version}</version>
-            <properties>
-                <geronimo.dependency>true</geronimo.dependency>
-            </properties>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
             <artifactId>geronimo-naming-builder</artifactId>
             <version>${geronimo_version}</version>
             <properties>
@@ -229,14 +198,6 @@
         </dependency>
         <dependency>
             <groupId>geronimo</groupId>
-            <artifactId>geronimo-axis</artifactId>
-            <version>${geronimo_version}</version>
-            <properties>
-                <geronimo.dependency>true</geronimo.dependency>
-            </properties>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
             <artifactId>geronimo-webservices</artifactId>
             <version>${geronimo_version}</version>
             <properties>
@@ -279,30 +240,10 @@
             <version>${jetty_version}</version>
         </dependency>
 
-        <!-- EJBs using OpenEJB -->
-        <dependency>
-            <groupId>openejb</groupId>
-            <artifactId>openejb-pkgen-builder</artifactId>
-            <version>${openejb_version}</version>
-            <properties>
-                <geronimo.dependency>true</geronimo.dependency>
-            </properties>
-        </dependency>
-        <dependency>
-            <groupId>openejb</groupId>
-            <artifactId>openejb-core</artifactId>
-            <version>${openejb_version}</version>
-            <properties>
-                <geronimo.dependency>true</geronimo.dependency>
-            </properties>
-        </dependency>
         <dependency>
             <groupId>tranql</groupId>
             <artifactId>tranql</artifactId>
             <version>${tranql_version}</version>
-            <properties>
-                <geronimo.dependency>true</geronimo.dependency>
-            </properties>
         </dependency>
 
         <!-- RARs using Geronimo Connector implementation -->

Modified: geronimo/branches/1.1/configs/j2ee-server/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/j2ee-server/project.xml?rev=397699&r1=397698&r2=397699&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/j2ee-server/project.xml (original)
+++ geronimo/branches/1.1/configs/j2ee-server/project.xml Thu Apr 27 18:01:14 2006
@@ -79,9 +79,6 @@
             <groupId>geronimo</groupId>
             <artifactId>geronimo-timer</artifactId>
             <version>${geronimo_version}</version>
-            <properties>
-                 <geronimo.dependency>true</geronimo.dependency>
-             </properties>
         </dependency>
         <dependency>
             <groupId>geronimo</groupId>
@@ -95,41 +92,11 @@
             <groupId>geronimo</groupId>
             <artifactId>geronimo-client</artifactId>
             <version>${geronimo_version}</version>
-            <properties>
-                 <geronimo.dependency>true</geronimo.dependency>
-             </properties>
         </dependency>
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>geronimo-axis</artifactId>
             <version>${geronimo_version}</version>
-            <properties>
-                 <geronimo.dependency>true</geronimo.dependency>
-             </properties>
-        </dependency>
-        <dependency>
-            <groupId>openejb</groupId>
-            <artifactId>openejb-core</artifactId>
-            <version>${openejb_version}</version>
-            <properties>
-                 <geronimo.dependency>true</geronimo.dependency>
-             </properties>
-        </dependency>
-        <dependency>
-            <groupId>xstream</groupId>
-            <artifactId>xstream</artifactId>
-            <version>${xstream_version}</version>
-            <properties>
-                 <geronimo.dependency>true</geronimo.dependency>
-             </properties>
-        </dependency>
-        <dependency>
-            <groupId>xpp3</groupId>
-            <artifactId>xpp3</artifactId>
-            <version>${xpp3_version}</version>
-            <properties>
-                 <geronimo.dependency>true</geronimo.dependency>
-             </properties>
         </dependency>
         <dependency>
             <groupId>asm</groupId>
@@ -143,9 +110,6 @@
             <groupId>activemq</groupId>
             <artifactId>activemq-gbean-management-g1_1</artifactId>
             <version>${activemq_version}</version>
-            <properties>
-                 <geronimo.dependency>true</geronimo.dependency>
-             </properties>
         </dependency>
         <dependency>
             <groupId>activeio</groupId>
@@ -155,71 +119,6 @@
                  <geronimo.dependency>true</geronimo.dependency>
              </properties>
         </dependency>
-       <dependency>
-            <groupId>scout</groupId>
-            <artifactId>jaxr-api</artifactId>
-            <version>${scout_version}</version>
-            <properties>
-                 <geronimo.dependency>true</geronimo.dependency>
-            </properties>
-        </dependency>
-
-        <dependency>
-            <groupId>scout</groupId>
-            <artifactId>scout</artifactId>
-            <version>${scout_version}</version>
-            <properties>
-                 <geronimo.dependency>true</geronimo.dependency>
-            </properties>
-        </dependency>
-
-        <dependency>
-            <groupId>juddi</groupId>
-            <artifactId>juddi</artifactId>
-            <version>${juddi_version}</version>
-            <properties>
-                 <geronimo.dependency>true</geronimo.dependency>
-            </properties>
-        </dependency>
-
-        <dependency>
-            <groupId>jdom</groupId>
-            <artifactId>jdom</artifactId>
-            <version>${jdom_version}</version>
-            <properties>
-                 <geronimo.dependency>true</geronimo.dependency>
-            </properties>
-        </dependency>
-
-
-        <!-- TODO why are these here rather than in system-database??? -->
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-derby</artifactId>
-            <version>${pom.currentVersion}</version>
-            <properties>
-                 <geronimo.dependency>true</geronimo.dependency>
-            </properties>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.derby</groupId>
-            <artifactId>derby</artifactId>
-            <version>${derby_version}</version>
-            <properties>
-                 <geronimo.dependency>true</geronimo.dependency>
-            </properties>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.derby</groupId>
-            <artifactId>derbynet</artifactId>
-            <version>${derby_version}</version>
-            <properties>
-                 <geronimo.dependency>true</geronimo.dependency>
-            </properties>
-        </dependency>
-
 
         <dependency>
             <groupId>geronimo</groupId>

Modified: geronimo/branches/1.1/configs/javamail/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/javamail/project.xml?rev=397699&r1=397698&r2=397699&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/javamail/project.xml (original)
+++ geronimo/branches/1.1/configs/javamail/project.xml Thu Apr 27 18:01:14 2006
@@ -68,6 +68,16 @@
             <properties>
                  <geronimo.dependency>true</geronimo.dependency>
              </properties>
+
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-javamail_1.3.1_spec</artifactId>
+            <version>${geronimo_spec_javamail_version}</version>
+            <properties>
+                 <geronimo.dependency>true</geronimo.dependency>
+             </properties>
+        </dependency>
+
         </dependency>
     </dependencies>
 </project>

Modified: geronimo/branches/1.1/configs/jetty-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/jetty-deployer/src/plan/plan.xml?rev=397699&r1=397698&r2=397699&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/jetty-deployer/src/plan/plan.xml (original)
+++ geronimo/branches/1.1/configs/jetty-deployer/src/plan/plan.xml Thu Apr 27 18:01:14 2006
@@ -34,9 +34,14 @@
         <reference name="PojoWebServiceTemplate">
             <name>POJOTemplate</name>
         </reference>
-        <reference name="WebServiceBuilder">
-            <name>WebServiceBuilder</name>
-        </reference>
+        <references name="WebServiceBuilder">
+            <pattern>
+                <name>WebServiceBuilder</name>
+            </pattern>
+            <pattern>
+                <name>UnavailableWebServiceBuilder</name>
+            </pattern>
+        </references>
         <xml-attribute name="defaultEnvironment">
             <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
                 <dependencies>

Modified: geronimo/branches/1.1/configs/openejb-deployer/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/openejb-deployer/project.xml?rev=397699&r1=397698&r2=397699&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/openejb-deployer/project.xml (original)
+++ geronimo/branches/1.1/configs/openejb-deployer/project.xml Thu Apr 27 18:01:14 2006
@@ -49,16 +49,34 @@
                 <geronimo.import>true</geronimo.import>
             </properties>
         </dependency>
+<!--
         <dependency>
             <groupId>geronimo</groupId>
             <type>car</type>
             <artifactId>openejb</artifactId>
             <version>${pom.currentVersion}</version>
-<!--  replaced import with dependency below to avoid starting j2ee-server during build -->
             <properties>
                 <geronimo.dependency>true</geronimo.dependency>
             </properties>
         </dependency>
+-->
+
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-axis</artifactId>
+            <version>${geronimo_version}</version>
+            <properties>
+                 <geronimo.dependency>true</geronimo.dependency>
+             </properties>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-axis-builder</artifactId>
+            <version>${geronimo_version}</version>
+            <properties>
+                 <geronimo.dependency>true</geronimo.dependency>
+             </properties>
+        </dependency>
 
         <!-- dependencies from gbean-deployer needed as maven adds service builder to the maven.root classloader -->
         <!-- dependencies from plan -->
@@ -124,6 +142,9 @@
             <groupId>openejb</groupId>
             <artifactId>openejb-core</artifactId>
             <version>${openejb_version}</version>
+            <properties>
+                <geronimo.dependency>true</geronimo.dependency>
+            </properties>
         </dependency>
         <dependency>
             <groupId>tranql</groupId>

Modified: geronimo/branches/1.1/configs/openejb/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/openejb/project.xml?rev=397699&r1=397698&r2=397699&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/openejb/project.xml (original)
+++ geronimo/branches/1.1/configs/openejb/project.xml Thu Apr 27 18:01:14 2006
@@ -41,6 +41,7 @@
                 <packaging.config.order>1</packaging.config.order>
             </properties>
         </dependency>
+
         <!-- parent config -->
         <dependency>
             <groupId>geronimo</groupId>
@@ -60,6 +61,7 @@
                 <geronimo.import>true</geronimo.import>
             </properties>
         </dependency>
+
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>geronimo-timer</artifactId>
@@ -152,6 +154,9 @@
             <groupId>tranql</groupId>
             <artifactId>tranql</artifactId>
             <version>${tranql_version}</version>
+            <properties>
+                 <geronimo.dependency>true</geronimo.dependency>
+            </properties>
         </dependency>
         <dependency>
             <groupId>howl</groupId>
@@ -162,6 +167,9 @@
             <groupId>antlr</groupId>
             <artifactId>antlr</artifactId>
             <version>${antlr_version}</version>
+            <properties>
+                 <geronimo.dependency>true</geronimo.dependency>
+            </properties>
         </dependency>
         <dependency>
             <groupId>regexp</groupId>

Modified: geronimo/branches/1.1/configs/rmi-naming/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/rmi-naming/project.xml?rev=397699&r1=397698&r2=397699&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/rmi-naming/project.xml (original)
+++ geronimo/branches/1.1/configs/rmi-naming/project.xml Thu Apr 27 18:01:14 2006
@@ -59,33 +59,138 @@
             <type>car</type>
         </dependency>
 
-    <!-- activation must come before spec-j2ee to override stock mailcap file in its javamail api -->
+<!--  Individual Spec references  -->
         <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-activation</artifactId>
-            <version>${geronimo_version}</version>
+            <groupId>geronimo-spec</groupId>
+            <artifactId>geronimo-spec-corba</artifactId>
+            <version>${geronimo_spec_corba_version}</version>
+            <properties>
+                <geronimo.dependency>true</geronimo.dependency>
+            </properties>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-activation_1.0.2_spec</artifactId>
+            <version>${geronimo_spec_activation_version}</version>
+            <properties>
+                 <geronimo.dependency>true</geronimo.dependency>
+            </properties>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-ejb_2.1_spec</artifactId>
+            <version>${geronimo_spec_ejb_version}</version>
+            <properties>
+                 <geronimo.dependency>true</geronimo.dependency>
+            </properties>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
+            <version>${geronimo_spec_j2ee_connector_version}</version>
             <properties>
                  <geronimo.dependency>true</geronimo.dependency>
              </properties>
         </dependency>
-     <!-- corba spec is needed before spec-j2ee to pick up corba api that works with geronimo -->
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-corba</artifactId>
-            <version>${geronimo_spec_corba_version}</version>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
+            <version>${geronimo_spec_j2ee_deployment_version}</version>
             <properties>
-                <geronimo.dependency>true</geronimo.dependency>
+                 <geronimo.dependency>true</geronimo.dependency>
+             </properties>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-j2ee-jacc_1.0_spec</artifactId>
+            <version>${geronimo_spec_j2ee_jacc_version}</version>
+            <properties>
+                 <geronimo.dependency>true</geronimo.dependency>
+             </properties>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-j2ee-management_1.0_spec</artifactId>
+            <version>${geronimo_spec_j2ee_management_version}</version>
+            <properties>
+                 <geronimo.dependency>true</geronimo.dependency>
+             </properties>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-javamail_1.3.1_spec</artifactId>
+            <version>${geronimo_spec_javamail_version}</version>
+            <properties>
+                 <geronimo.dependency>true</geronimo.dependency>
+             </properties>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jaxrpc_1.1_spec</artifactId>
+            <version>${geronimo_spec_jaxrpc_version}</version>
+            <properties>
+                 <geronimo.dependency>true</geronimo.dependency>
+            </properties>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jaxr_1.0_spec</artifactId>
+            <version>${geronimo_spec_jaxr_version}</version>
+            <properties>
+                 <geronimo.dependency>true</geronimo.dependency>
+            </properties>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jms_1.1_spec</artifactId>
+            <version>${geronimo_spec_jms_version}</version>
+            <properties>
+                 <geronimo.dependency>true</geronimo.dependency>
             </properties>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-j2ee_1.4_spec</artifactId>
-            <version>${geronimo_spec_j2ee_version}</version>
+            <artifactId>geronimo-jsp_2.0_spec</artifactId>
+            <version>${geronimo_spec_jsp_version}</version>
+            <properties>
+                 <geronimo.dependency>true</geronimo.dependency>
+             </properties>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
+            <version>${geronimo_spec_jta_version}</version>
+            <properties>
+                 <geronimo.dependency>true</geronimo.dependency>
+             </properties>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-qname_1.1_spec</artifactId>
+            <version>${geronimo_spec_qname_version}</version>
+            <properties>
+                 <geronimo.dependency>true</geronimo.dependency>
+             </properties>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-saaj_1.1_spec</artifactId>
+            <version>${geronimo_spec_saaj_version}</version>
+            <properties>
+                 <geronimo.dependency>true</geronimo.dependency>
+             </properties>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-servlet_2.4_spec</artifactId>
+            <version>${geronimo_spec_servlet_version}</version>
             <properties>
                  <geronimo.dependency>true</geronimo.dependency>
              </properties>
         </dependency>
 
+
+
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>geronimo-management</artifactId>
@@ -195,9 +300,6 @@
             <groupId>tranql</groupId>
             <artifactId>tranql</artifactId>
             <version>${tranql_version}</version>
-            <properties>
-                 <geronimo.dependency>true</geronimo.dependency>
-             </properties>
         </dependency>
         <dependency>
             <groupId>openejb</groupId>
@@ -217,9 +319,6 @@
             <groupId>antlr</groupId>
             <artifactId>antlr</artifactId>
             <version>${antlr_version}</version>
-            <properties>
-                 <geronimo.dependency>true</geronimo.dependency>
-             </properties>
         </dependency>
         <dependency>
             <groupId>regexp</groupId>

Modified: geronimo/branches/1.1/configs/system-database/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/system-database/project.xml?rev=397699&r1=397698&r2=397699&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/system-database/project.xml (original)
+++ geronimo/branches/1.1/configs/system-database/project.xml Thu Apr 27 18:01:14 2006
@@ -174,6 +174,9 @@
             <groupId>geronimo</groupId>
             <artifactId>geronimo-timer</artifactId>
             <version>${geronimo_version}</version>
+            <properties>
+                 <geronimo.dependency>true</geronimo.dependency>
+            </properties>
         </dependency>
         <dependency>
             <groupId>geronimo</groupId>

Modified: geronimo/branches/1.1/modules/client-builder/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/client-builder/maven.xml?rev=397699&r1=397698&r2=397699&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/client-builder/maven.xml (original)
+++ geronimo/branches/1.1/modules/client-builder/maven.xml Thu Apr 27 18:01:14 2006
@@ -34,4 +34,9 @@
             <ant:fileset dir="${basedir}/target/classes/schemaorg_apache_xmlbeans"/>
         </copy>
     </preGoal>
+
+    <postGoal name="java:compile">
+        <attainGoal name="geronimo:dependency"/>
+    </postGoal>
+
 </project>

Modified: geronimo/branches/1.1/modules/client-builder/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/client-builder/project.xml?rev=397699&r1=397698&r2=397699&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/client-builder/project.xml (original)
+++ geronimo/branches/1.1/modules/client-builder/project.xml Thu Apr 27 18:01:14 2006
@@ -42,6 +42,12 @@
 
     <dependencies>
         <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-dependency-plugin</artifactId>
+            <version>${geronimo_dependency_plugin_version}</version>
+            <type>plugin</type>
+        </dependency>
+        <dependency>
             <groupId>xmlbeans</groupId>
             <artifactId>xmlbeans-maven-plugin</artifactId>
             <version>${xmlbeans_maven_plugin_version}</version>
@@ -66,6 +72,9 @@
             <groupId>geronimo</groupId>
             <artifactId>geronimo-client</artifactId>
             <version>${pom.currentVersion}</version>
+            <properties>
+                 <geronimo.dependency>true</geronimo.dependency>
+            </properties>
         </dependency>
 
         <dependency>

Modified: geronimo/branches/1.1/modules/tomcat/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/tomcat/project.xml?rev=397699&r1=397698&r2=397699&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/tomcat/project.xml (original)
+++ geronimo/branches/1.1/modules/tomcat/project.xml Thu Apr 27 18:01:14 2006
@@ -181,23 +181,6 @@
             </properties>
         </dependency>
         <dependency>
-            <groupId>activecluster</groupId>
-            <artifactId>activecluster</artifactId>
-            <version>${wadi_activecluster_version}</version>
-            <properties>
-                 <geronimo.dependency>true</geronimo.dependency>
-             </properties>
-        </dependency>
-        <dependency>
-            <groupId>springframework</groupId>
-            <artifactId>spring</artifactId>
-            <version>${wadi_spring_version}</version>
-            <url>http://www.springframework.org/</url>
-            <properties>
-                 <geronimo.dependency>true</geronimo.dependency>
-             </properties>
-        </dependency>
-        <dependency>
             <groupId>tomcat</groupId>
             <artifactId>catalina</artifactId>
             <version>${tomcat_version}</version>
@@ -390,9 +373,6 @@
             <artifactId>regexp</artifactId>
             <version>${regexp_version}</version>
             <url>http://jakarta.apache.org/regexp/</url>
-            <properties>
-                 <geronimo.dependency>true</geronimo.dependency>
-             </properties>
         </dependency>
         <dependency>
             <groupId>mx4j</groupId>
@@ -403,17 +383,11 @@
             <groupId>wadi</groupId>
             <artifactId>wadi-core</artifactId>
             <version>${wadi_version}</version>
-            <properties>
-                 <geronimo.dependency>true</geronimo.dependency>
-             </properties>
         </dependency>
         <dependency>
             <groupId>wadi</groupId>
             <artifactId>wadi-tomcat55</artifactId>
             <version>${wadi_version}</version>
-            <properties>
-                 <geronimo.dependency>true</geronimo.dependency>
-             </properties>
         </dependency>
     </dependencies>
 </project>



Mime
View raw message