geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r412684 - in /geronimo/trunk: ./ configs/ configs/client-corba/ configs/j2ee-corba/ configs/j2ee-server/ configs/j2ee-system/ configs/jetty-deployer/ configs/jetty/ configs/openejb/ configs/rmi-naming/ modules/directory/ modules/jetty/
Date Thu, 08 Jun 2006 07:23:43 GMT
Author: djencks
Date: Thu Jun  8 00:23:42 2006
New Revision: 412684

URL: http://svn.apache.org/viewvc?rev=412684&view=rev
Log:
GERONIMO-2071 Update versions to match m1 build. Fix some dependency discrepancies between m1 and m2 builds.  Add all the configs into the base dependency management.  Add some config.xml poms from anita's patch, and fix some other config dependency problems.  configs now builds for me, although I think it does not build all the configurations

Added:
    geronimo/trunk/configs/client-corba/pom.xml   (with props)
    geronimo/trunk/configs/j2ee-corba/pom.xml   (with props)
    geronimo/trunk/configs/jetty-deployer/pom.xml   (with props)
    geronimo/trunk/configs/jetty/pom.xml   (with props)
    geronimo/trunk/configs/openejb/pom.xml   (with props)
Modified:
    geronimo/trunk/configs/j2ee-server/pom.xml
    geronimo/trunk/configs/j2ee-system/pom.xml
    geronimo/trunk/configs/pom.xml
    geronimo/trunk/configs/rmi-naming/pom.xml
    geronimo/trunk/modules/directory/pom.xml
    geronimo/trunk/modules/jetty/pom.xml
    geronimo/trunk/pom.xml

Added: geronimo/trunk/configs/client-corba/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/client-corba/pom.xml?rev=412684&view=auto
==============================================================================
--- geronimo/trunk/configs/client-corba/pom.xml (added)
+++ geronimo/trunk/configs/client-corba/pom.xml Thu Jun  8 00:23:42 2006
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  
+  Copyright 2006 The Apache Software Foundation
+  
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+  
+  http://www.apache.org/licenses/LICENSE-2.0
+  
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<!-- $Rev$ $Date$ -->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>configs-parent</artifactId>
+        <version>1.2-SNAPSHOT</version>
+    </parent>
+    <groupId>org.apache.geronimo.configs</groupId>
+    <artifactId>client-corba</artifactId>
+    <version>${geronimoVersion}</version>
+    <packaging>car</packaging>
+    <name>Corba Configuration for the J2EE Client</name>
+
+    <properties>
+        <PlanCOSNamingHost>localhost</PlanCOSNamingHost>
+        <PlanCOSNamingPort>1050</PlanCOSNamingPort>
+        <PlanORBSSLHost>localhost</PlanORBSSLHost>
+        <PlanORBSSLPort>2001</PlanORBSSLPort>
+
+        <PlanHTTPPort>8080</PlanHTTPPort>
+        <PlanHTTPSPort>8443</PlanHTTPSPort>
+        <PlanOpenEJBPort>4201</PlanOpenEJBPort>
+        <PlanServerHostname>localhost</PlanServerHostname>
+        <PlanClientAddresses>127.0.0.1</PlanClientAddresses>
+        <PlanRemoteLoginPort>4242</PlanRemoteLoginPort>
+    </properties>
+    <build>
+        <plugins>
+            <!-- This plugin needed to support package type car -->
+            <plugin>
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>geronimo-packaging-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+<deploymentConfig>${gbeanDeployer},${j2eeDeployer},${openejbDeployer},${axisDeployer}</deploymentConfig>            
+                 </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <!-- ============ -->
+    <!-- Dependencies -->
+    <!-- ============ -->
+
+    <dependencies>
+        <!-- parent config -->
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>client</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+        </dependency>
+
+        <!-- to enforce build order -->
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>openejb-deployer</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+
+        <!-- needed by GBean, this was not a dep in M1-->
+        <dependency>
+            <groupId>openejb</groupId>
+            <artifactId>openejb-core</artifactId>
+            <version>${openejbVersion}</version>
+        </dependency> 
+    </dependencies>
+</project>

Propchange: geronimo/trunk/configs/client-corba/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/trunk/configs/client-corba/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/trunk/configs/client-corba/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/trunk/configs/j2ee-corba/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/j2ee-corba/pom.xml?rev=412684&view=auto
==============================================================================
--- geronimo/trunk/configs/j2ee-corba/pom.xml (added)
+++ geronimo/trunk/configs/j2ee-corba/pom.xml Thu Jun  8 00:23:42 2006
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  
+  Copyright 2006 The Apache Software Foundation
+  
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+  
+  http://www.apache.org/licenses/LICENSE-2.0
+  
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<!-- $Rev$ $Date$ -->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>configs-parent</artifactId>
+        <version>1.2-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.apache.geronimo.configs</groupId>
+    <artifactId>j2ee-corba</artifactId>
+    <version>${geronimoVersion}</version>
+    <packaging>car</packaging>
+    <name>Corba Configuration for the J2EE Server</name>
+
+    <properties>
+        <PlanCOSNamingHost>localhost</PlanCOSNamingHost>
+        <PlanCOSNamingPort>1050</PlanCOSNamingPort>
+        <PlanORBSSLHost>localhost</PlanORBSSLHost>
+        <PlanORBSSLPort>2001</PlanORBSSLPort>
+
+        <PlanHTTPPort>8080</PlanHTTPPort>
+        <PlanHTTPSPort>8443</PlanHTTPSPort>
+        <PlanOpenEJBPort>4201</PlanOpenEJBPort>
+        <PlanServerHostname>localhost</PlanServerHostname>
+        <PlanClientAddresses>127.0.0.1</PlanClientAddresses>
+        <PlanRemoteLoginPort>4242</PlanRemoteLoginPort>
+     </properties>
+    <build>
+        <plugins>
+            <!-- This plugin needed to support package type car -->
+            <plugin>
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>geronimo-packaging-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <deploymentConfig>${gbeanDeployer},${j2eeDeployer},${openejbDeployer},${axisDeployer}</deploymentConfig>
+                </configuration>                  
+            </plugin>
+        </plugins>
+    </build>
+
+    <!-- ============ -->
+    <!-- Dependencies -->
+    <!-- ============ -->
+
+    <dependencies>
+        <!-- parent config -->
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>j2ee-server</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>j2ee-security</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+        </dependency>  
+
+        <dependency>
+            <groupId>openejb</groupId>
+            <artifactId>openejb-core</artifactId>
+            <version>${openejbVersion}</version>
+        </dependency>
+    </dependencies>
+</project>

Propchange: geronimo/trunk/configs/j2ee-corba/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/trunk/configs/j2ee-corba/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/trunk/configs/j2ee-corba/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: geronimo/trunk/configs/j2ee-server/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/j2ee-server/pom.xml?rev=412684&r1=412683&r2=412684&view=diff
==============================================================================
--- geronimo/trunk/configs/j2ee-server/pom.xml (original)
+++ geronimo/trunk/configs/j2ee-server/pom.xml Thu Jun  8 00:23:42 2006
@@ -50,17 +50,10 @@
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>rmi-naming</artifactId>
-            <version>${geronimoVersion}</version>
+            <!--<version>${geronimoVersion}</version>-->
             <type>car</type>
         </dependency>
-
-<!--        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>geronimo-gbean-deployer</artifactId>
-            <version>${geronimoVersion}</version>
-            <type>car</type>
-            <scope>provided</scope>
-        </dependency>  -->
+        <!-- June 7 2006 djencks.  Compared with project.xml. activeio removed, it's in rmi-naming -->
 
         <!-- ThreadPool -->
         <dependency>
@@ -72,40 +65,22 @@
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-common</artifactId>
         </dependency>
+
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-connector</artifactId>
         </dependency>
-        <!-- transitive -->
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
-        </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-transaction</artifactId>
-        </dependency>
-        <!-- transitive -->
-        <dependency>
-            <groupId>howl</groupId>
-            <artifactId>howl-logger</artifactId>
+            <artifactId>geronimo-webservices</artifactId>
         </dependency>
 
+        <!-- purpose unknown -->
         <dependency>
             <groupId>asm</groupId>
             <artifactId>asm</artifactId>
         </dependency>
 
-<!-- comming from rmi-naming - core, all the specs 
-        <dependency> 
-            <groupId>activeio</groupId>
-            <artifactId>activeio</artifactId>
-        </dependency> -->
- 
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-webservices</artifactId>
-        </dependency>
     </dependencies>
 </project>

Modified: geronimo/trunk/configs/j2ee-system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/j2ee-system/pom.xml?rev=412684&r1=412683&r2=412684&view=diff
==============================================================================
--- geronimo/trunk/configs/j2ee-system/pom.xml (original)
+++ geronimo/trunk/configs/j2ee-system/pom.xml Thu Jun  8 00:23:42 2006
@@ -74,7 +74,7 @@
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>geronimo-gbean-deployer</artifactId>
-            <version>${geronimoVersion}</version>
+            <!--<version>${geronimoVersion}</version>-->
             <type>car</type>
             <scope>provided</scope>
         </dependency>

Added: geronimo/trunk/configs/jetty-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/jetty-deployer/pom.xml?rev=412684&view=auto
==============================================================================
--- geronimo/trunk/configs/jetty-deployer/pom.xml (added)
+++ geronimo/trunk/configs/jetty-deployer/pom.xml Thu Jun  8 00:23:42 2006
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  
+  Copyright 2006 The Apache Software Foundation
+  
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+  
+  http://www.apache.org/licenses/LICENSE-2.0
+  
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<!-- $Rev$ $Date$ -->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>configs-parent</artifactId>
+        <version>1.2-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>jetty-deployer</artifactId>
+    <version>${geronimoVersion}</version>
+    <packaging>car</packaging>
+    <name>Jetty Deployer Configuration for performing J2EE deployments</name>
+
+    <build>
+        <plugins>
+            <plugin>
+                <!-- uses geronimo-gbean-deployer -->
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>geronimo-packaging-plugin</artifactId>
+                <extensions>true</extensions>
+            </plugin>
+        </plugins>
+    </build>
+
+    <!-- ============ -->
+    <!-- Dependencies -->
+    <!-- ============ -->
+
+    <dependencies>
+        <!-- parent -->
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>j2ee-deployer</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+        </dependency>
+        <!-- similar thing not needed in tomcat !!! -->
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>jetty</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-jetty-builder</artifactId>
+        </dependency>
+    </dependencies>
+</project>

Propchange: geronimo/trunk/configs/jetty-deployer/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/trunk/configs/jetty-deployer/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/trunk/configs/jetty-deployer/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/trunk/configs/jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/jetty/pom.xml?rev=412684&view=auto
==============================================================================
--- geronimo/trunk/configs/jetty/pom.xml (added)
+++ geronimo/trunk/configs/jetty/pom.xml Thu Jun  8 00:23:42 2006
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  
+  Copyright 2006 The Apache Software Foundation
+  
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+  
+  http://www.apache.org/licenses/LICENSE-2.0
+  
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<!-- $Rev$ $Date$ -->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>configs-parent</artifactId>
+        <version>1.2-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.apache.geronimo.configs</groupId>
+    <artifactId>jetty</artifactId>
+    <version>${geronimoVersion}</version>
+    <packaging>car</packaging>
+    <name>Jetty Configuration for the J2EE Server</name>
+
+    <properties>
+        <PlanHTTPPort>8090</PlanHTTPPort>
+        <PlanHTTPSPort>8453</PlanHTTPSPort>
+        <PlanAJPPort2>8019</PlanAJPPort2>
+        <PlanServerHostname>localhost</PlanServerHostname>
+    </properties>
+
+    <build>
+        <plugins>
+            <plugin>
+                <!-- uses geronimo-gbean-deployer -->
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>geronimo-packaging-plugin</artifactId>
+                <extensions>true</extensions>
+            </plugin>
+        </plugins>
+    </build>
+
+    <!-- ============ -->
+    <!-- Dependencies -->
+    <!-- ============ -->
+
+    <dependencies>
+        <!-- parent -->
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>j2ee-security</artifactId>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-jetty</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-webservices</artifactId>
+        </dependency>
+    </dependencies>
+</project>

Propchange: geronimo/trunk/configs/jetty/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/trunk/configs/jetty/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/trunk/configs/jetty/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/trunk/configs/openejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/openejb/pom.xml?rev=412684&view=auto
==============================================================================
--- geronimo/trunk/configs/openejb/pom.xml (added)
+++ geronimo/trunk/configs/openejb/pom.xml Thu Jun  8 00:23:42 2006
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  
+  Copyright 2006 The Apache Software Foundation
+  
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+  
+  http://www.apache.org/licenses/LICENSE-2.0
+  
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<!-- $Rev$ $Date$ -->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>configs-parent</artifactId>
+        <version>1.2-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.apache.geronimo.configs</groupId>
+    <artifactId>openejb</artifactId>
+    <version>${geronimoVersion}</version>
+    <packaging>car</packaging>
+    <name>openejb Configuration for the J2EE Server</name>
+
+    <properties>
+        <PlanHTTPPort>8080</PlanHTTPPort>
+        <PlanHTTPSPort>8443</PlanHTTPSPort>
+        <PlanOpenEJBPort>4201</PlanOpenEJBPort>
+        <PlanServerHostname>localhost</PlanServerHostname>
+        <PlanClientAddresses>127.0.0.1</PlanClientAddresses>
+        <PlanRemoteLoginPort>4242</PlanRemoteLoginPort>
+    </properties>
+    <build>
+        <plugins>
+            <plugin>
+                <!-- uses geronimo-gbean-deployer -->
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>geronimo-packaging-plugin</artifactId>
+                <extensions>true</extensions>
+            </plugin>
+        </plugins>
+    </build>
+
+    <!-- ============ -->
+    <!-- Dependencies -->
+    <!-- ============ -->
+
+    <dependencies>
+        <!-- parents -->
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>j2ee-server</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>axis</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+        </dependency>
+        <!-- only include classes -->
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>system-database</artifactId>
+            <version>${geronimoVersion}</version>
+            <scope>compile</scope> <!-- this is a hack -->
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>openejb</groupId>
+            <artifactId>openejb-core</artifactId>
+            <version>${openejbVersion}</version>
+        </dependency>
+        <dependency>
+            <groupId>tranql</groupId>
+            <artifactId>tranql</artifactId>
+            <version>${tranqlVersion}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>antlr</groupId>
+            <artifactId>antlr</artifactId>
+            <version>${antlrVersion}</version>
+        </dependency>
+        <!-- for GBean in the plan -->
+        <dependency>
+            <groupId>activeio</groupId>
+            <artifactId>activeio</artifactId>
+            <version>${activeIoVersion}</version>
+        </dependency>
+    </dependencies>
+</project>

Propchange: geronimo/trunk/configs/openejb/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/trunk/configs/openejb/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/trunk/configs/openejb/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: geronimo/trunk/configs/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/pom.xml?rev=412684&r1=412683&r2=412684&view=diff
==============================================================================
--- geronimo/trunk/configs/pom.xml (original)
+++ geronimo/trunk/configs/pom.xml Thu Jun  8 00:23:42 2006
@@ -69,7 +69,7 @@
           <module>axis</module>
           <module>axis-deployer</module>
           <module>client</module>
-<!--          <module>client-corba</module> -->
+          <module>client-corba</module>
           <module>client-deployer</module>
           <module>client-security</module>
           <module>client-system</module>
@@ -80,21 +80,21 @@
           <module>directory</module>
           <module>geronimo-gbean-deployer</module>
           <module>hot-deployer</module>
-<!--          <module>j2ee-corba</module> -->
+          <module>j2ee-corba</module>
           <module>j2ee-deployer</module>
           <module>j2ee-security</module>
           <module>j2ee-server</module>
           <module>j2ee-system</module>
-<!--          <module>javamail</module>
+<!--          <module>javamail</module> -->
           <module>jetty</module>
           <module>jetty-deployer</module>
-          <module>jsp-examples-jetty</module>
+<!--          <module>jsp-examples-jetty</module>
           <module>jsp-examples-tomcat</module>
           <module>ldap-demo-jetty</module>
           <module>ldap-demo-tomcat</module> -->
           <module>ldap-realm</module>
           <module>online-deployer</module>
-<!--          <module>openejb</module> -->
+          <module>openejb</module>
           <module>openejb-deployer</module>
 <!--          <module>remote-deploy-jetty</module>
           <module>remote-deploy-tomcat</module> -->

Modified: geronimo/trunk/configs/rmi-naming/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/rmi-naming/pom.xml?rev=412684&r1=412683&r2=412684&view=diff
==============================================================================
--- geronimo/trunk/configs/rmi-naming/pom.xml (original)
+++ geronimo/trunk/configs/rmi-naming/pom.xml Thu Jun  8 00:23:42 2006
@@ -53,34 +53,115 @@
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-system</artifactId>
-            <version>${geronimoVersion}</version>
+            <!--<version>${geronimoVersion}</version>-->
             <type>car</type>
         </dependency>
-        <!-- geronimo-gbean-deployer provided -->
+        <!-- June 7 2006 djencks.  This is a copy of dependencies in project.xml -->
+        <!-- only qname spec removed -->
+        <!--  Individual Spec references  -->
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-activation_1.0.2_spec</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-ejb_2.1_spec</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-j2ee-jacc_1.0_spec</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-j2ee-management_1.0_spec</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-javamail_1.3.1_spec</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jaxrpc_1.1_spec</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jaxr_1.0_spec</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jms_1.1_spec</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jsp_2.0_spec</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
+        </dependency>
+        <!-- qname is in j2ee-system module-->
+        <!--dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-qname_1.1_spec</artifactId>
+        </dependency-->
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-saaj_1.1_spec</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-servlet_2.4_spec</artifactId>
+        </dependency>
+
+
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-management</artifactId>
         </dependency>
-
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-j2ee</artifactId>
         </dependency>
-
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-core</artifactId>
         </dependency>
-
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-naming</artifactId>
         </dependency>
-        <!-- transaction, security, util, webservices, concurrent, 
-        howl-logger, activeio already in j2ee-system -->
         <dependency>
-            <groupId>concurrent</groupId>
-            <artifactId>concurrent</artifactId>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-transaction</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-security</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-util</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-webservices</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>howl</groupId>
+            <artifactId>howl-logger</artifactId>
+        </dependency>
+        <!-- remote login -->
+        <dependency>
+            <groupId>activeio</groupId>
+            <artifactId>activeio</artifactId>
         </dependency>
     </dependencies>
 </project>

Modified: geronimo/trunk/modules/directory/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/directory/pom.xml?rev=412684&r1=412683&r2=412684&view=diff
==============================================================================
--- geronimo/trunk/modules/directory/pom.xml (original)
+++ geronimo/trunk/modules/directory/pom.xml Thu Jun  8 00:23:42 2006
@@ -186,6 +186,12 @@
         </dependency>
 
         <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>${commonsIoVersion}</version>
+        </dependency>
+
+        <dependency>
             <groupId>commons-primitives</groupId>
             <artifactId>commons-primitives</artifactId>
             <version>${commonsPrimitivesVersion}</version>

Modified: geronimo/trunk/modules/jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/jetty/pom.xml?rev=412684&r1=412683&r2=412684&view=diff
==============================================================================
--- geronimo/trunk/modules/jetty/pom.xml (original)
+++ geronimo/trunk/modules/jetty/pom.xml Thu Jun  8 00:23:42 2006
@@ -78,31 +78,6 @@
             <artifactId>org.mortbay.jetty</artifactId>
             <version>${jettyVersion}</version>
         </dependency>
-        <!-- these are included in geronimo-dependency.xml -->
-        <dependency>
-           <groupId>springframework</groupId>
-            <artifactId>spring</artifactId>
-            <version>${wadiSpringVersion}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>activecluster</groupId>
-            <artifactId>activecluster</artifactId>
-            <version>${wadiActiveClusterVersion}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>wadi</groupId>
-            <artifactId>wadi-core</artifactId>
-            <version>${wadiVersion}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>wadi</groupId>
-            <artifactId>wadi-jetty5</artifactId>
-            <version>${wadiVersion}</version>
-        </dependency>
-
         <dependency>
             <groupId>tomcat</groupId>
             <artifactId>jasper-compiler</artifactId>

Modified: geronimo/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/pom.xml?rev=412684&r1=412683&r2=412684&view=diff
==============================================================================
--- geronimo/trunk/pom.xml (original)
+++ geronimo/trunk/pom.xml Thu Jun  8 00:23:42 2006
@@ -37,8 +37,8 @@
         <notifiers>
             <notifier>
                 <type>mail</type>
-                <sendOnError />
-                <sendOnFailure />
+                <sendOnError/>
+                <sendOnFailure/>
                 <address>dev@geronimo.org</address>
             </notifier>
         </notifiers>
@@ -97,36 +97,36 @@
         <maven.compiler.optimize>true</maven.compiler.optimize>
         <maven.compiler.debug>true</maven.compiler.debug>
         -->
-        
+
         <!--
          |
          | Geronimo module versions
          |
          -->
         <geronimoVersion>1.2-SNAPSHOT</geronimoVersion>
-        
+
         <!--
          |
          | Geronimo specification versions
          |
          -->
-        <geronimoSpecActivationVersion>1.0</geronimoSpecActivationVersion>
-        <geronimoSpecCorbaVersion>1.0-SNAPSHOT</geronimoSpecCorbaVersion>
-        <geronimoSpecEjbVersion>1.0</geronimoSpecEjbVersion>
-        <geronimoSpecJ2eeVersion>1.1-SNAPSHOT</geronimoSpecJ2eeVersion>
-        <geronimoSpecJ2eeConnectorVersion>1.0</geronimoSpecJ2eeConnectorVersion>
-        <geronimoSpecJ2eeDeploymentVersion>1.0</geronimoSpecJ2eeDeploymentVersion>
-        <geronimoSpecJ2eeJaccVersion>1.0</geronimoSpecJ2eeJaccVersion>
-        <geronimoSpecJ2eeManagementVersion>1.0</geronimoSpecJ2eeManagementVersion>
-        <geronimoSpecJavamailVersion>1.1-SNAPSHOT</geronimoSpecJavamailVersion>
-        <geronimoSpecJaxrVersion>1.0</geronimoSpecJaxrVersion>
-        <geronimoSpecJaxrpcVersion>1.0</geronimoSpecJaxrpcVersion>
-        <geronimoSpecJmsVersion>1.0</geronimoSpecJmsVersion>
-        <geronimoSpecJspVersion>1.0</geronimoSpecJspVersion>
-        <geronimoSpecJtaVersion>1.0</geronimoSpecJtaVersion>
-        <geronimoSpecQnameVersion>1.0</geronimoSpecQnameVersion>
-        <geronimoSpecSaajVersion>1.0</geronimoSpecSaajVersion>
-        <geronimoSpecServletVersion>1.0</geronimoSpecServletVersion>
+        <geronimoSpecActivationVersion>1.1</geronimoSpecActivationVersion>
+        <geronimoSpecCorbaVersion>1.0</geronimoSpecCorbaVersion>
+        <geronimoSpecEjbVersion>1.0.1</geronimoSpecEjbVersion>
+        <geronimoSpecJ2eeVersion>1.1</geronimoSpecJ2eeVersion>
+        <geronimoSpecJ2eeConnectorVersion>1.0.1</geronimoSpecJ2eeConnectorVersion>
+        <geronimoSpecJ2eeDeploymentVersion>1.0.1</geronimoSpecJ2eeDeploymentVersion>
+        <geronimoSpecJ2eeJaccVersion>1.0.1</geronimoSpecJ2eeJaccVersion>
+        <geronimoSpecJ2eeManagementVersion>1.0.1</geronimoSpecJ2eeManagementVersion>
+        <geronimoSpecJavamailVersion>1.1</geronimoSpecJavamailVersion>
+        <geronimoSpecJaxrVersion>1.0.1</geronimoSpecJaxrVersion>
+        <geronimoSpecJaxrpcVersion>1.0.1</geronimoSpecJaxrpcVersion>
+        <geronimoSpecJmsVersion>1.0.1</geronimoSpecJmsVersion>
+        <geronimoSpecJspVersion>1.0.1</geronimoSpecJspVersion>
+        <geronimoSpecJtaVersion>1.0.1</geronimoSpecJtaVersion>
+        <geronimoSpecQnameVersion>1.0.1</geronimoSpecQnameVersion>
+        <geronimoSpecSaajVersion>1.0.1</geronimoSpecSaajVersion>
+        <geronimoSpecServletVersion>1.0.1</geronimoSpecServletVersion>
 
         <!--
          |
@@ -157,7 +157,7 @@
         <commonsElVersion>1.0</commonsElVersion>
         <commonsFileuploadVersion>1.1-dev</commonsFileuploadVersion>
         <commonsHttpclientVersion>2.0.1</commonsHttpclientVersion>
-        <commonsIoVersion>1.0</commonsIoVersion>
+        <commonsIoVersion>1.1</commonsIoVersion>
         <commonsJxpathVersion>1.1</commonsJxpathVersion>
         <commonsLangVersion>2.0</commonsLangVersion>
         <commonsLoggingVersion>1.0.4</commonsLoggingVersion>
@@ -200,9 +200,9 @@
         <staxApiVersion>1.0</staxApiVersion>
         <tomcatAjpVersion>5.5.15</tomcatAjpVersion>
         <tomcatVersion>5.5.15</tomcatVersion>
-        <tranqlConnectorVersion>1.2-SNAPSHOT</tranqlConnectorVersion>
+        <tranqlConnectorVersion>1.3-SNAPSHOT</tranqlConnectorVersion>
         <tranqlVendorsVersion>1.1</tranqlVendorsVersion>
-        <tranqlVersion>1.3-SNAPSHOT</tranqlVersion>
+        <tranqlVersion>1.4-SNAPSHOT</tranqlVersion>
         <velocityVersion>1.4</velocityVersion>
         <wadiActiveClusterVersion>1.2-20051115174934</wadiActiveClusterVersion>
         <wadiSpringVersion>1.5.2</wadiSpringVersion>
@@ -213,7 +213,7 @@
         <xfireVersion>20050202</xfireVersion>
         <xmlApisVersion>1.0.b2</xmlApisVersion>
         <xmlbeansVersion>2.0.0</xmlbeansVersion>
-        <xmlbeansMavenPluginVersion>2.0</xmlbeansMavenPluginVersion>
+        <xmlbeansMavenPluginVersion>2.0.1-SNAPSHOT</xmlbeansMavenPluginVersion>
         <xmlParserApisVersion>2.2.1</xmlParserApisVersion>
         <xmlpullVersion>1.1.3.4d_b4_min</xmlpullVersion>
         <xmlResolverVersion>1.1</xmlResolverVersion>
@@ -632,7 +632,13 @@
                 <artifactId>geronimo-jetty</artifactId>
                 <version>${geronimoVersion}</version>
             </dependency>
-                                                                                                                                                                                                                   
+
+            <dependency>
+                <groupId>org.apache.geronimo.modules</groupId>
+                <artifactId>geronimo-jetty-builder</artifactId>
+                <version>${geronimoVersion}</version>
+            </dependency>
+
             <dependency>
                 <groupId>org.apache.geronimo.modules</groupId>
                 <artifactId>geronimo-jmx-remoting</artifactId>
@@ -746,6 +752,327 @@
                 <artifactId>geronimo-axis-builder</artifactId>
                 <version>${geronimoVersion}</version>
             </dependency>
+
+            <!-- geronimo configurations (modules) -->
+            <dependency>
+                <groupId>org.apache.geronimo.configs</groupId>
+                <artifactId>activemq</artifactId>
+                <type>car</type>
+                <version>${geronimoVersion}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.configs</groupId>
+                <artifactId>activemq-broker</artifactId>
+                <type>car</type>
+                <version>${geronimoVersion}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.configs</groupId>
+                <artifactId>axis</artifactId>
+                <type>car</type>
+                <version>${geronimoVersion}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.configs</groupId>
+                <artifactId>axis-deployer</artifactId>
+                <type>car</type>
+                <version>${geronimoVersion}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.configs</groupId>
+                <artifactId>client</artifactId>
+                <type>car</type>
+                <version>${geronimoVersion}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.configs</groupId>
+                <artifactId>client-corba</artifactId>
+                <type>car</type>
+                <version>${geronimoVersion}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.configs</groupId>
+                <artifactId>client-deployer</artifactId>
+                <type>car</type>
+                <version>${geronimoVersion}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.configs</groupId>
+                <artifactId>client-security</artifactId>
+                <type>car</type>
+                <version>${geronimoVersion}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.configs</groupId>
+                <artifactId>client-system</artifactId>
+                <type>car</type>
+                <version>${geronimoVersion}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.configs</groupId>
+                <artifactId>console-jetty</artifactId>
+                <type>car</type>
+                <version>${geronimoVersion}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.configs</groupId>
+                <artifactId>console-tomcat</artifactId>
+                <type>car</type>
+                <version>${geronimoVersion}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.configs</groupId>
+                <artifactId>daytrader-jetty</artifactId>
+                <type>car</type>
+                <version>${geronimoVersion}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.configs</groupId>
+                <artifactId>daytrader-tomcat</artifactId>
+                <type>car</type>
+                <version>${geronimoVersion}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.configs</groupId>
+                <artifactId>directory</artifactId>
+                <type>car</type>
+                <version>${geronimoVersion}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.configs</groupId>
+                <artifactId>geronimo-gbean-deployer</artifactId>
+                <type>car</type>
+                <version>${geronimoVersion}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.configs</groupId>
+                <artifactId>hot-deployer</artifactId>
+                <type>car</type>
+                <version>${geronimoVersion}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.configs</groupId>
+                <artifactId>j2ee-corba</artifactId>
+                <type>car</type>
+                <version>${geronimoVersion}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.configs</groupId>
+                <artifactId>j2ee-deployer</artifactId>
+                <type>car</type>
+                <version>${geronimoVersion}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.configs</groupId>
+                <artifactId>j2ee-security</artifactId>
+                <type>car</type>
+                <version>${geronimoVersion}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.configs</groupId>
+                <artifactId>j2ee-server</artifactId>
+                <type>car</type>
+                <version>${geronimoVersion}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.configs</groupId>
+                <artifactId>j2ee-system</artifactId>
+                <type>car</type>
+                <version>${geronimoVersion}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.configs</groupId>
+                <artifactId>javamail</artifactId>
+                <type>car</type>
+                <version>${geronimoVersion}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.configs</groupId>
+                <artifactId>jetty</artifactId>
+                <type>car</type>
+                <version>${geronimoVersion}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.configs</groupId>
+                <artifactId>jetty-deployer</artifactId>
+                <type>car</type>
+                <version>${geronimoVersion}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.configs</groupId>
+                <artifactId>jsp-examples-jetty</artifactId>
+                <type>car</type>
+                <version>${geronimoVersion}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.configs</groupId>
+                <artifactId>jsp-examples-tomcat</artifactId>
+                <type>car</type>
+                <version>${geronimoVersion}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.configs</groupId>
+                <artifactId>ldap-demo-jetty</artifactId>
+                <type>car</type>
+                <version>${geronimoVersion}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.configs</groupId>
+                <artifactId>ldap-demo-tomcat</artifactId>
+                <type>car</type>
+                <version>${geronimoVersion}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.configs</groupId>
+                <artifactId>ldap-realm</artifactId>
+                <type>car</type>
+                <version>${geronimoVersion}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.configs</groupId>
+                <artifactId>online-deployer</artifactId>
+                <type>car</type>
+                <version>${geronimoVersion}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.configs</groupId>
+                <artifactId>openejb</artifactId>
+                <type>car</type>
+                <version>${geronimoVersion}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.configs</groupId>
+                <artifactId>openejb-deployer</artifactId>
+                <type>car</type>
+                <version>${geronimoVersion}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.configs</groupId>
+                <artifactId>project.properties</artifactId>
+                <type>car</type>
+                <version>${geronimoVersion}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.configs</groupId>
+                <artifactId>remote-deploy-jetty</artifactId>
+                <type>car</type>
+                <version>${geronimoVersion}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.configs</groupId>
+                <artifactId>remote-deploy-tomcat</artifactId>
+                <type>car</type>
+                <version>${geronimoVersion}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.configs</groupId>
+                <artifactId>rmi-naming</artifactId>
+                <type>car</type>
+                <version>${geronimoVersion}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.configs</groupId>
+                <artifactId>servlets-examples-jetty</artifactId>
+                <type>car</type>
+                <version>${geronimoVersion}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.configs</groupId>
+                <artifactId>servlets-examples-tomcat</artifactId>
+                <type>car</type>
+                <version>${geronimoVersion}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.configs</groupId>
+                <artifactId>sharedlib</artifactId>
+                <type>car</type>
+                <version>${geronimoVersion}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.configs</groupId>
+                <artifactId>shutdown</artifactId>
+                <type>car</type>
+                <version>${geronimoVersion}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.configs</groupId>
+                <artifactId>system-database</artifactId>
+                <type>car</type>
+                <version>${geronimoVersion}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.configs</groupId>
+                <artifactId>tomcat</artifactId>
+                <type>car</type>
+                <version>${geronimoVersion}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.configs</groupId>
+                <artifactId>tomcat-deployer</artifactId>
+                <type>car</type>
+                <version>${geronimoVersion}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.configs</groupId>
+                <artifactId>uddi-jetty</artifactId>
+                <type>car</type>
+                <version>${geronimoVersion}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.configs</groupId>
+                <artifactId>uddi-tomcat</artifactId>
+                <type>car</type>
+                <version>${geronimoVersion}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.configs</groupId>
+                <artifactId>unavailable-client-deployer</artifactId>
+                <type>car</type>
+                <version>${geronimoVersion}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.configs</groupId>
+                <artifactId>unavailable-ejb-deployer</artifactId>
+                <type>car</type>
+                <version>${geronimoVersion}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.configs</groupId>
+                <artifactId>unavailable-webservices-deployer</artifactId>
+                <type>car</type>
+                <version>${geronimoVersion}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.configs</groupId>
+                <artifactId>upgrade</artifactId>
+                <type>car</type>
+                <version>${geronimoVersion}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.configs</groupId>
+                <artifactId>upgrade-cli</artifactId>
+                <type>car</type>
+                <version>${geronimoVersion}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.configs</groupId>
+                <artifactId>velocity.log</artifactId>
+                <type>car</type>
+                <version>${geronimoVersion}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.configs</groupId>
+                <artifactId>welcome-jetty</artifactId>
+                <type>car</type>
+                <version>${geronimoVersion}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.configs</groupId>
+                <artifactId>welcome-tomcat</artifactId>
+                <type>car</type>
+                <version>${geronimoVersion}</version>
+            </dependency>
+
         </dependencies>
     </dependencyManagement>
 
@@ -797,82 +1124,83 @@
             </testResource>
         </testResources>
         <pluginManagement>
-        <plugins>
-            <plugin>
-                <artifactId>maven-surefire-plugin</artifactId>
-
-                <!-- <version>2.1.3-SNAPSHOT</version> -->
-                <configuration>
-                    <!-- Todo move these here -->
-                    <!--
-                    <systemProperties>
-                        <property>
-                          <name>log4j.configuration</name>
-                          <value>${basedir}/log4j.properties</value>
-                        </property>
-                        <property>
-                          <name>java.security.auth.login.config</name>
-                          <value>${basedir}/src/test-data/data/login.config</value>
-                        </property>
-                    </systemProperties>
-                    -->
-                    <forkMode>once</forkMode>
-                    <workingDirectory>${basedir}</workingDirectory>
-                </configuration>
-            </plugin>
-
-            <plugin>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <version>1.1</version>
-            </plugin>
-
-            <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.4</source>
-                    <target>1.4</target>
-                    <optimize>true</optimize>
-                </configuration>
-                <inherited>true</inherited>
-            </plugin>
-
-            <plugin>
-                <artifactId>maven-one-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <configuration>
-                            <remoteRepositoryUrl>scpexe://cvs.apache.org/www/cvs.apache.org/repository</remoteRepositoryUrl>
-                        </configuration>
-                        <goals>
-                            <goal>install-maven-one-repository</goal>
-                            <goal>deploy-maven-one-repository</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </pluginManagement>
+            <plugins>
+                <plugin>
+                    <artifactId>maven-surefire-plugin</artifactId>
+
+                    <!-- <version>2.1.3-SNAPSHOT</version> -->
+                    <configuration>
+                        <!-- Todo move these here -->
+                        <!--
+                        <systemProperties>
+                            <property>
+                              <name>log4j.configuration</name>
+                              <value>${basedir}/log4j.properties</value>
+                            </property>
+                            <property>
+                              <name>java.security.auth.login.config</name>
+                              <value>${basedir}/src/test-data/data/login.config</value>
+                            </property>
+                        </systemProperties>
+                        -->
+                        <forkMode>once</forkMode>
+                        <workingDirectory>${basedir}</workingDirectory>
+                    </configuration>
+                </plugin>
+
+                <plugin>
+                    <artifactId>maven-antrun-plugin</artifactId>
+                    <version>1.1</version>
+                </plugin>
+
+                <plugin>
+                    <artifactId>maven-compiler-plugin</artifactId>
+                    <configuration>
+                        <source>1.4</source>
+                        <target>1.4</target>
+                        <optimize>true</optimize>
+                    </configuration>
+                    <inherited>true</inherited>
+                </plugin>
+
+                <plugin>
+                    <artifactId>maven-one-plugin</artifactId>
+                    <executions>
+                        <execution>
+                            <configuration>
+                                <remoteRepositoryUrl>
+                                    scpexe://cvs.apache.org/www/cvs.apache.org/repository</remoteRepositoryUrl>
+                            </configuration>
+                            <goals>
+                                <goal>install-maven-one-repository</goal>
+                                <goal>deploy-maven-one-repository</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
+            </plugins>
+        </pluginManagement>
         <extensions>
-          <extension>
-            <groupId>org.apache.maven.wagon</groupId>
-            <artifactId>wagon-ssh-external</artifactId>
-            <version>1.0-alpha-5</version>
-          </extension>
+            <extension>
+                <groupId>org.apache.maven.wagon</groupId>
+                <artifactId>wagon-ssh-external</artifactId>
+                <version>1.0-alpha-5</version>
+            </extension>
         </extensions>
     </build>
 
     <repositories>
-      <repository>
-              <id>codehaus-dist</id>
-              <name>Codehaus-Distribution</name>
-              <url>http://dist.codehaus.org</url>
-              <layout>legacy</layout>
-              <snapshots>
-                  <enabled>true</enabled>
-                  <updatePolicy>daily</updatePolicy>
-                  <checksumPolicy>ignore</checksumPolicy>
-              </snapshots>
-          </repository>
+        <repository>
+            <id>codehaus-dist</id>
+            <name>Codehaus-Distribution</name>
+            <url>http://dist.codehaus.org</url>
+            <layout>legacy</layout>
+            <snapshots>
+                <enabled>true</enabled>
+                <updatePolicy>daily</updatePolicy>
+                <checksumPolicy>ignore</checksumPolicy>
+            </snapshots>
+        </repository>
 
         <repository>
             <snapshots>



Mime
View raw message