geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r375137 - in /geronimo/trunk/configs: activemq-broker/project.xml j2ee-server/project.xml openejb-deployer/project.xml openejb/project.xml rmi-naming/project.xml
Date Sun, 05 Feb 2006 23:48:06 GMT
Author: djencks
Date: Sun Feb  5 15:48:05 2006
New Revision: 375137

URL: http://svn.apache.org/viewcvs?rev=375137&view=rev
Log:
Move some openejb, tranql, and activemq dependencies to more appropriate modules.

Modified:
    geronimo/trunk/configs/activemq-broker/project.xml
    geronimo/trunk/configs/j2ee-server/project.xml
    geronimo/trunk/configs/openejb-deployer/project.xml
    geronimo/trunk/configs/openejb/project.xml
    geronimo/trunk/configs/rmi-naming/project.xml

Modified: geronimo/trunk/configs/activemq-broker/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/activemq-broker/project.xml?rev=375137&r1=375136&r2=375137&view=diff
==============================================================================
--- geronimo/trunk/configs/activemq-broker/project.xml (original)
+++ geronimo/trunk/configs/activemq-broker/project.xml Sun Feb  5 15:48:05 2006
@@ -205,6 +205,14 @@
              </properties>
         </dependency>
         <dependency>
+            <groupId>activemq</groupId>
+            <artifactId>activemq-gbean-management</artifactId>
+            <version>${activemq_version}</version>
+            <properties>
+                 <geronimo.dependency>true</geronimo.dependency>
+             </properties>
+        </dependency>
+        <dependency>
             <groupId>activeio</groupId>
             <artifactId>activeio</artifactId>
             <version>${activeio_version}</version>

Modified: geronimo/trunk/configs/j2ee-server/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/j2ee-server/project.xml?rev=375137&r1=375136&r2=375137&view=diff
==============================================================================
--- geronimo/trunk/configs/j2ee-server/project.xml (original)
+++ geronimo/trunk/configs/j2ee-server/project.xml Sun Feb  5 15:48:05 2006
@@ -104,14 +104,14 @@
                  <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>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>
@@ -136,6 +136,7 @@
                  <geronimo.dependency>true</geronimo.dependency>
              </properties>
         </dependency>
+<!--
         <dependency>
             <groupId>activemq</groupId>
             <artifactId>activemq-gbean-management</artifactId>
@@ -144,6 +145,7 @@
                  <geronimo.dependency>true</geronimo.dependency>
              </properties>
         </dependency>
+-->
         <dependency>
             <groupId>activeio</groupId>
             <artifactId>activeio</artifactId>
@@ -283,20 +285,15 @@
             <artifactId>concurrent</artifactId>
             <version>${concurrent_version}</version>
         </dependency>
-        <dependency>
-            <groupId>tranql</groupId>
-            <artifactId>tranql</artifactId>
-            <version>${tranql_version}</version>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>tranql</groupId>-->
+            <!--<artifactId>tranql</artifactId>-->
+            <!--<version>${tranql_version}</version>-->
+        <!--</dependency>-->
         <dependency>
             <groupId>howl</groupId>
             <artifactId>howl-logger</artifactId>
             <version>${howl_version}</version>
-        </dependency>
-        <dependency>
-            <groupId>antlr</groupId>
-            <artifactId>antlr</artifactId>
-            <version>${antlr_version}</version>
         </dependency>
         <dependency>
             <groupId>regexp</groupId>

Modified: geronimo/trunk/configs/openejb-deployer/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/openejb-deployer/project.xml?rev=375137&r1=375136&r2=375137&view=diff
==============================================================================
--- geronimo/trunk/configs/openejb-deployer/project.xml (original)
+++ geronimo/trunk/configs/openejb-deployer/project.xml Sun Feb  5 15:48:05 2006
@@ -39,201 +39,202 @@
             <version>${geronimo_version}</version>
             <type>car</type>
             <properties>
-                 <geronimo.import>true</geronimo.import>
-             </properties>
-        </dependency>
-    <dependency>
-        <groupId>geronimo</groupId>
-        <type>car</type>
-        <artifactId>openejb</artifactId>
-        <version>${pom.currentVersion}</version>
-            <properties>
-                 <geronimo.import>true</geronimo.import>
-             </properties>
-    </dependency>
-
-        <!-- dependencies from gbean-deployer needed as maven adds service builder to
the maven.root classloader -->
-<!--        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-system</artifactId>
-            <version>${geronimo_version}</version>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-common</artifactId>
-            <version>${geronimo_version}</version>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-deployment</artifactId>
-            <version>${geronimo_version}</version>
+                <geronimo.import>true</geronimo.import>
+            </properties>
         </dependency>
         <dependency>
             <groupId>geronimo</groupId>
-            <artifactId>geronimo-j2ee</artifactId>
-            <version>${geronimo_version}</version>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-service-builder</artifactId>
-            <version>${geronimo_version}</version>
-        </dependency>
-        <dependency>
-            <groupId>xmlbeans</groupId>
-            <artifactId>xbean</artifactId>
-            <version>${xmlbeans_version}</version>
-        </dependency>
-        <dependency>
-            <groupId>stax</groupId>
-            <artifactId>stax-api</artifactId>
-            <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>
+            <type>car</type>
+            <artifactId>openejb</artifactId>
+            <version>${pom.currentVersion}</version>
+            <properties>
+                <geronimo.import>true</geronimo.import>
+            </properties>
         </dependency>
--->
+
+        <!-- dependencies from gbean-deployer needed as maven adds service builder to
the maven.root classloader -->
+        <!--        <dependency>
+                    <groupId>geronimo</groupId>
+                    <artifactId>geronimo-system</artifactId>
+                    <version>${geronimo_version}</version>
+                </dependency>
+                <dependency>
+                    <groupId>geronimo</groupId>
+                    <artifactId>geronimo-common</artifactId>
+                    <version>${geronimo_version}</version>
+                </dependency>
+                <dependency>
+                    <groupId>geronimo</groupId>
+                    <artifactId>geronimo-deployment</artifactId>
+                    <version>${geronimo_version}</version>
+                </dependency>
+                <dependency>
+                    <groupId>geronimo</groupId>
+                    <artifactId>geronimo-j2ee</artifactId>
+                    <version>${geronimo_version}</version>
+                </dependency>
+                <dependency>
+                    <groupId>geronimo</groupId>
+                    <artifactId>geronimo-service-builder</artifactId>
+                    <version>${geronimo_version}</version>
+                </dependency>
+                <dependency>
+                    <groupId>xmlbeans</groupId>
+                    <artifactId>xbean</artifactId>
+                    <version>${xmlbeans_version}</version>
+                </dependency>
+                <dependency>
+                    <groupId>stax</groupId>
+                    <artifactId>stax-api</artifactId>
+                    <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 -->
-<!--        <dependency>
-            <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>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-corba_2.3_spec</artifactId>
-            <version>${geronimo_spec_corba_version}</version>
-            <properties>
-                 <geronimo.dependency>true</geronimo.dependency>
-             </properties>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-j2ee-schema</artifactId>
-            <version>${geronimo_version}</version>
-            <properties>
-                 <geronimo.dependency>true</geronimo.dependency>
-             </properties>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-core</artifactId>
-            <version>${geronimo_version}</version>
-            <properties>
-                 <geronimo.dependency>true</geronimo.dependency>
-             </properties>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-management</artifactId>
-            <version>${geronimo_version}</version>
-            <properties>
-                 <geronimo.dependency>true</geronimo.dependency>
-             </properties>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-transaction</artifactId>
-            <version>${geronimo_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>
+                    <properties>
+                         <geronimo.dependency>true</geronimo.dependency>
+                     </properties>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-corba_2.3_spec</artifactId>
+                    <version>${geronimo_spec_corba_version}</version>
+                    <properties>
+                         <geronimo.dependency>true</geronimo.dependency>
+                     </properties>
+                </dependency>
+                <dependency>
+                    <groupId>geronimo</groupId>
+                    <artifactId>geronimo-j2ee-schema</artifactId>
+                    <version>${geronimo_version}</version>
+                    <properties>
+                         <geronimo.dependency>true</geronimo.dependency>
+                     </properties>
+                </dependency>
+                <dependency>
+                    <groupId>geronimo</groupId>
+                    <artifactId>geronimo-core</artifactId>
+                    <version>${geronimo_version}</version>
+                    <properties>
+                         <geronimo.dependency>true</geronimo.dependency>
+                     </properties>
+                </dependency>
+                <dependency>
+                    <groupId>geronimo</groupId>
+                    <artifactId>geronimo-management</artifactId>
+                    <version>${geronimo_version}</version>
+                    <properties>
+                         <geronimo.dependency>true</geronimo.dependency>
+                     </properties>
+                </dependency>
+                <dependency>
+                    <groupId>geronimo</groupId>
+                    <artifactId>geronimo-transaction</artifactId>
+                    <version>${geronimo_version}</version>
+                    <properties>
+                         <geronimo.dependency>true</geronimo.dependency>
+                     </properties>
+                </dependency>
+        -->
 
         <!-- todo builder implementations - can we move these to sub-plans? -->
         <!-- EAR, application-clients and other J2EE artifacts -->
-<!--        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-j2ee-builder</artifactId>
-            <version>${geronimo_version}</version>
-            <properties>
-                 <geronimo.dependency>true</geronimo.dependency>
-             </properties>
-        </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>
-                 <geronimo.dependency>true</geronimo.dependency>
-             </properties>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-naming</artifactId>
-            <version>${geronimo_version}</version>
-            <properties>
-                 <geronimo.dependency>true</geronimo.dependency>
-             </properties>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-security-builder</artifactId>
-            <version>${geronimo_version}</version>
-            <properties>
-                 <geronimo.dependency>true</geronimo.dependency>
-             </properties>
-        </dependency>
+        <!--        <dependency>
+                    <groupId>geronimo</groupId>
+                    <artifactId>geronimo-j2ee-builder</artifactId>
+                    <version>${geronimo_version}</version>
+                    <properties>
+                         <geronimo.dependency>true</geronimo.dependency>
+                     </properties>
+                </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>
+                         <geronimo.dependency>true</geronimo.dependency>
+                     </properties>
+                </dependency>
+                <dependency>
+                    <groupId>geronimo</groupId>
+                    <artifactId>geronimo-naming</artifactId>
+                    <version>${geronimo_version}</version>
+                    <properties>
+                         <geronimo.dependency>true</geronimo.dependency>
+                     </properties>
+                </dependency>
+                <dependency>
+                    <groupId>geronimo</groupId>
+                    <artifactId>geronimo-security-builder</artifactId>
+                    <version>${geronimo_version}</version>
+                    <properties>
+                         <geronimo.dependency>true</geronimo.dependency>
+                     </properties>
+                </dependency>
+                <dependency>
+                    <groupId>geronimo</groupId>
+                    <artifactId>geronimo-security</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>
+                <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>
+                         <geronimo.dependency>true</geronimo.dependency>
+                     </properties>
+                </dependency>
+        -->
         <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-security</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>
-        <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>
-                 <geronimo.dependency>true</geronimo.dependency>
-             </properties>
-        </dependency>
--->        <dependency>
             <groupId>axis</groupId>
             <artifactId>axis</artifactId>
             <version>${axis_version}</version>
@@ -250,8 +251,8 @@
             <artifactId>geronimo-web-builder</artifactId>
             <version>${geronimo_version}</version>
             <properties>
-                 <geronimo.dependency>true</geronimo.dependency>
-             </properties>
+                <geronimo.dependency>true</geronimo.dependency>
+            </properties>
         </dependency>
         <dependency>
             <groupId>geronimo</groupId>
@@ -275,52 +276,46 @@
             <artifactId>openejb-builder</artifactId>
             <version>${openejb_version}</version>
             <properties>
-                 <geronimo.dependency>true</geronimo.dependency>
-             </properties>
+                <geronimo.dependency>true</geronimo.dependency>
+            </properties>
         </dependency>
         <dependency>
             <groupId>openejb</groupId>
             <artifactId>openejb-pkgen-builder</artifactId>
             <version>${openejb_version}</version>
             <properties>
-                 <geronimo.dependency>true</geronimo.dependency>
-             </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 -->
-<!--        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-connector-builder</artifactId>
-            <version>${geronimo_version}</version>
-            <properties>
-                 <geronimo.dependency>true</geronimo.dependency>
-             </properties>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-connector</artifactId>
-            <version>${geronimo_version}</version>
-            <properties>
-                 <geronimo.dependency>true</geronimo.dependency>
-             </properties>
-        </dependency>
--->
+        <!--        <dependency>
+                    <groupId>geronimo</groupId>
+                    <artifactId>geronimo-connector-builder</artifactId>
+                    <version>${geronimo_version}</version>
+                    <properties>
+                         <geronimo.dependency>true</geronimo.dependency>
+                     </properties>
+                </dependency>
+                <dependency>
+                    <groupId>geronimo</groupId>
+                    <artifactId>geronimo-connector</artifactId>
+                    <version>${geronimo_version}</version>
+                    <properties>
+                         <geronimo.dependency>true</geronimo.dependency>
+                     </properties>
+                </dependency>
+        -->
     </dependencies>
 </project>
 

Modified: geronimo/trunk/configs/openejb/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/openejb/project.xml?rev=375137&r1=375136&r2=375137&view=diff
==============================================================================
--- geronimo/trunk/configs/openejb/project.xml (original)
+++ geronimo/trunk/configs/openejb/project.xml Sun Feb  5 15:48:05 2006
@@ -112,7 +112,7 @@
             <properties>
                  <geronimo.dependency>true</geronimo.dependency>
              </properties>
-        </dependency>
+        </dependency>-->
         <dependency>
             <groupId>openejb</groupId>
             <artifactId>openejb-core</artifactId>
@@ -121,7 +121,7 @@
                 <geronimo.dependency>true</geronimo.dependency>
             </properties>
         </dependency>
-        <dependency>
+        <!--<dependency>
             <groupId>xstream</groupId>
             <artifactId>xstream</artifactId>
             <version>${xstream_version}</version>

Modified: geronimo/trunk/configs/rmi-naming/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/rmi-naming/project.xml?rev=375137&r1=375136&r2=375137&view=diff
==============================================================================
--- geronimo/trunk/configs/rmi-naming/project.xml (original)
+++ geronimo/trunk/configs/rmi-naming/project.xml Sun Feb  5 15:48:05 2006
@@ -49,12 +49,6 @@
              </properties>
         </dependency>
 
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-gbean-deployer</artifactId>
-            <version>${geronimo_version}</version>
-            <type>car</type>
-        </dependency>
 
     <!-- activation must come before spec-j2ee to override stock mailcap file in its javamail
api -->
         <dependency>
@@ -175,9 +169,6 @@
             <groupId>tranql</groupId>
             <artifactId>tranql</artifactId>
             <version>${tranql_version}</version>
-            <properties>
-                 <geronimo.dependency>true</geronimo.dependency>
-             </properties>
         </dependency>
         <dependency>
             <groupId>openejb</groupId>
@@ -197,9 +188,6 @@
             <groupId>antlr</groupId>
             <artifactId>antlr</artifactId>
             <version>${antlr_version}</version>
-            <properties>
-                 <geronimo.dependency>true</geronimo.dependency>
-             </properties>
         </dependency>
         <dependency>
             <groupId>regexp</groupId>



Mime
View raw message