geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r419355 [2/6] - in /geronimo/sandbox/svkmerge/trunk: ./ applications/ applications/console/ applications/console/console-core/ applications/console/console-ear/ applications/console/console-framework/ applications/console/console-standard/ ...
Date Wed, 05 Jul 2006 22:05:50 GMT
Modified: geronimo/sandbox/svkmerge/trunk/configs/client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/configs/client/pom.xml?rev=419355&r1=419354&r2=419355&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/configs/client/pom.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/configs/client/pom.xml Wed Jul  5 15:05:45 2006
@@ -27,59 +27,40 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <groupId>org.apache.geronimo.configs</groupId>
     <artifactId>client</artifactId>
+    <name>Geronimo Configs :: J2EE Client</name>
     <packaging>car</packaging>
-    <name>Configuration for the J2EE Client</name>
-
-    <properties>
-        <PlanHTTPPort>8080</PlanHTTPPort>
-        <PlanHTTPSPort>8443</PlanHTTPSPort>
-        <PlanNamingPort>1099</PlanNamingPort>
-        <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>                  
-            </plugin>
-        </plugins>
-    </build>
-
-    <!-- ============ -->
-    <!-- Dependencies -->
-    <!-- ============ -->
 
     <dependencies>
+        
         <!-- parent config -->
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>client-system</artifactId>
-            <version>${geronimoVersion}</version>
+            <version>${pom.version}</version>
             <type>car</type>
         </dependency> 
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-activation</artifactId>
+            <version>${pom.version}</version>
         </dependency>
+        
         <!-- connector deploys jsr77 beans hence needs j2ee, mgmt -->
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-connector</artifactId>
+            <version>${pom.version}</version>
         </dependency>
+        
         <!-- ThreadPool -->
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-core</artifactId>
+            <version>${pom.version}</version>
         </dependency>
+        
         <!-- ?????? -->
         <!--
             for property editor support for some login modules/principals 
@@ -87,42 +68,56 @@
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-common</artifactId>
+            <version>${pom.version}</version>
         </dependency> -->
+        
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-naming</artifactId>
+            <version>${pom.version}</version>
         </dependency>
+        
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-management</artifactId>
+            <version>${pom.version}</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-transaction</artifactId>
+            <version>${pom.version}</version>
         </dependency>
+        
         <!-- ??? 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-security</artifactId>
         </dependency> -->
+        
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-client</artifactId>
+            <version>${pom.version}</version>
         </dependency>
+        
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-axis</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-webservices</artifactId>
+            <version>${pom.version}</version>
         </dependency>
+        
         <!-- geronimo-spec-corba, geronimo-j2ee_1.4_spec -->
         <!-- openejb-core, tranql, asm, activemq, activeio, scout, juddi, 
              concurrent, jdom -->
-        <dependency>
+        
+         <dependency>
             <groupId>concurrent</groupId>
             <artifactId>concurrent</artifactId>
         </dependency>
@@ -131,9 +126,12 @@
             <groupId>geronimo-spec</groupId>
             <artifactId>geronimo-spec-corba</artifactId>
         </dependency>
+        
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-j2ee_1.4_spec</artifactId>
         </dependency>
+        
     </dependencies>
+    
 </project>

Modified: geronimo/sandbox/svkmerge/trunk/configs/console-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/configs/console-jetty/pom.xml?rev=419355&r1=419354&r2=419355&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/configs/console-jetty/pom.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/configs/console-jetty/pom.xml Wed Jul  5 15:05:45 2006
@@ -27,172 +27,183 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <groupId>org.apache.geronimo.configs</groupId>
     <artifactId>webconsole-jetty</artifactId>
+    <name>Geronimo Configs :: Console Jetty</name>
     <packaging>car</packaging>
-    <name>Web console deployed on jetty</name>
 
-    <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>${j2eeJettyServer}</deploymentConfig>
-                    <moduleFile>${settings.localRepository}/org/apache/geronimo/applications/console/geronimo-console/${geronimoVersion}/geronimo-console-${geronimoVersion}.ear</moduleFile>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-    <!-- ============ -->
-    <!-- Dependencies -->
-    <!-- ============ -->
     <dependencies>
-        <!-- parent config --> 
+    
+        <!-- parent config -->
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-server</artifactId>
+            <version>${pom.version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>system-database</artifactId>
+            <version>${pom.version}</version>
             <type>car</type>
         </dependency>
+        
         <!-- for login module manager -->
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-security</artifactId>
+            <version>${pom.version}</version>
             <type>car</type>
         </dependency>
+        
         <!-- To enforce build order -->
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jetty-deployer</artifactId>
+            <version>${pom.version}</version>
             <type>car</type>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.pluto</groupId>
-            <artifactId>pluto</artifactId>
-            <version>${plutoVersion}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>portlet-api</groupId>
-            <artifactId>portlet-api</artifactId>
-            <version>${portletApiVersion}</version>
-        </dependency>
-
-        <dependency>
             <groupId>org.apache.geronimo.applications.console</groupId>
             <artifactId>geronimo-console-core</artifactId>
-            <version>${geronimoVersion}</version>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.applications.console</groupId>
             <artifactId>geronimo-console</artifactId>
-            <version>${geronimoVersion}</version>
+            <version>${pom.version}</version>
             <type>ear</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-converter</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-connector-builder</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-deploy-jsr88</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-deploy-config</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-j2ee-schema</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-jetty</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-management</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-naming-builder</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-security-builder</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-service-builder</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-test-ddbean</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-upgrade</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-util</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>activemq</groupId>
             <artifactId>activemq-gbean-g1_1</artifactId>
-            <version>${activeMqVersion}</version>
         </dependency>
+        
         <dependency>
             <groupId>activemq</groupId>
             <artifactId>activemq-gbean-management-g1_1</artifactId>
-            <version>${activeMqVersion}</version>
         </dependency>
 
         <dependency>
             <groupId>jdom</groupId>
             <artifactId>jdom</artifactId>
-            <version>${jdomVersion}</version>
         </dependency>
+        
         <dependency>
             <groupId>xmlbeans</groupId>
             <artifactId>xbean</artifactId>
-            <version>${xmlbeansVersion}</version>
         </dependency>
 
         <dependency>
             <groupId>stax</groupId>
             <artifactId>stax-api</artifactId>
-            <version>${staxApiVersion}</version>
         </dependency>
+        
+        <dependency>
+            <groupId>org.apache.pluto</groupId>
+            <artifactId>pluto</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>portlet-api</groupId>
+            <artifactId>portlet-api</artifactId>
+        </dependency>
+
     </dependencies>
+    
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>geronimo-packaging-plugin</artifactId>
+                <configuration>
+                    <deploymentConfig>${j2eeJettyServer}</deploymentConfig>
+                    <moduleFile>${settings.localRepository}/org/apache/geronimo/applications/console/geronimo-console/${pom.version}/geronimo-console-${pom.version}.ear</moduleFile>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    
 </project>

Modified: geronimo/sandbox/svkmerge/trunk/configs/console-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/configs/console-tomcat/pom.xml?rev=419355&r1=419354&r2=419355&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/configs/console-tomcat/pom.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/configs/console-tomcat/pom.xml Wed Jul  5 15:05:45 2006
@@ -16,6 +16,7 @@
 -->
 
 <!-- $Rev$ $Date$ -->
+
 <project>
     <modelVersion>4.0.0</modelVersion>
 
@@ -26,173 +27,183 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <groupId>org.apache.geronimo.configs</groupId>
     <artifactId>webconsole-tomcat</artifactId>
     <packaging>car</packaging>
-    <name>Web console deployed on tomcat</name>
+    <name>Geronimo Configs :: Console Tomcat</name>
 
-    <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>${j2eeTomcatServer}</deploymentConfig>
-                    <moduleFile>${settings.localRepository}/org/apache/geronimo/applications/console/geronimo-console/${geronimoVersion}/geronimo-console-${geronimoVersion}.ear</moduleFile>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-    <!-- ============ -->
-    <!-- Dependencies -->
-    <!-- ============ -->
-    
     <dependencies>
-        <!-- parent configs --> 
+        
+        <!-- parent configs -->
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-server</artifactId>
+            <version>${pom.version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>system-database</artifactId>
+            <version>${pom.version}</version>
             <type>car</type>
         </dependency>
+        
         <!-- for login module manager -->
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-security</artifactId>
+            <version>${pom.version}</version>
             <type>car</type>
         </dependency>
+        
         <!-- to enforce build order -->
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>tomcat-deployer</artifactId>
+            <version>${pom.version}</version>
             <type>car</type>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.pluto</groupId>
-            <artifactId>pluto</artifactId>
-            <version>${plutoVersion}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>portlet-api</groupId>
-            <artifactId>portlet-api</artifactId>
-            <version>${portletApiVersion}</version>
-        </dependency>
-
-        <dependency>
             <groupId>org.apache.geronimo.applications.console</groupId>
             <artifactId>geronimo-console-core</artifactId>
-            <version>${geronimoVersion}</version>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.applications.console</groupId>
             <artifactId>geronimo-console</artifactId>
-            <version>${geronimoVersion}</version>
+            <version>${pom.version}</version>
             <type>ear</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-converter</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-connector-builder</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-deploy-jsr88</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-deploy-config</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-j2ee-schema</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-tomcat</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-management</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-naming-builder</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-security-builder</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-service-builder</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-test-ddbean</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-upgrade</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-util</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>activemq</groupId>
             <artifactId>activemq-gbean-g1_1</artifactId>
-            <version>${activeMqVersion}</version>
         </dependency>
+        
         <dependency>
             <groupId>activemq</groupId>
             <artifactId>activemq-gbean-management-g1_1</artifactId>
-            <version>${activeMqVersion}</version>
         </dependency>
 
         <dependency>
             <groupId>jdom</groupId>
             <artifactId>jdom</artifactId>
-            <version>${jdomVersion}</version>
         </dependency>
+        
         <dependency>
             <groupId>xmlbeans</groupId>
             <artifactId>xbean</artifactId>
-            <version>${xmlbeansVersion}</version>
         </dependency>
 
         <dependency>
             <groupId>stax</groupId>
             <artifactId>stax-api</artifactId>
-            <version>${staxApiVersion}</version>
         </dependency>
+        
+        <dependency>
+            <groupId>org.apache.pluto</groupId>
+            <artifactId>pluto</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>portlet-api</groupId>
+            <artifactId>portlet-api</artifactId>
+        </dependency>
+        
     </dependencies>
+    
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>geronimo-packaging-plugin</artifactId>
+                <configuration>
+                    <deploymentConfig>${j2eeTomcatServer}</deploymentConfig>
+                    <moduleFile>${settings.localRepository}/org/apache/geronimo/applications/console/geronimo-console/${pom.version}/geronimo-console-${pom.version}.ear</moduleFile>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    
 </project>

Modified: geronimo/sandbox/svkmerge/trunk/configs/directory/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/configs/directory/pom.xml?rev=419355&r1=419354&r2=419355&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/configs/directory/pom.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/configs/directory/pom.xml Wed Jul  5 15:05:45 2006
@@ -28,36 +28,22 @@
     </parent>
 
     <artifactId>directory</artifactId>
+    <name>Geronimo Configs :: Directory</name>
     <packaging>car</packaging>
-    <name>Directory Configuration</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-server</artifactId>
-            <version>${geronimoVersion}</version>
+            <version>${pom.version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-directory</artifactId>
+            <version>${pom.version}</version>
         </dependency>
     </dependencies>
 </project>

Modified: geronimo/sandbox/svkmerge/trunk/configs/geronimo-gbean-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/configs/geronimo-gbean-deployer/pom.xml?rev=419355&r1=419354&r2=419355&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/configs/geronimo-gbean-deployer/pom.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/configs/geronimo-gbean-deployer/pom.xml Wed Jul  5 15:05:45 2006
@@ -28,40 +28,41 @@
     </parent>
 
     <artifactId>geronimo-gbean-deployer</artifactId>
+    <name>Geronimo Configs :: GBean Deployer</name>
     <packaging>car</packaging>
-    <name>Geronimo Configuration for performing service deployments</name>
     
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.geronimo.plugins</groupId>
-                <artifactId>geronimo-packaging-plugin</artifactId>
-                <extensions>true</extensions>
-                <configuration>
-                    <boot>true</boot>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-    <!-- ============ -->
-    <!-- Dependencies -->
-    <!-- ============ -->
-
     <dependencies>
         <!-- needed by the plan -->
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-deployment</artifactId>
+            <version>${pom.version}</version>
         </dependency>
+        
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-service-builder</artifactId>
+            <version>${pom.version}</version>
         </dependency>
+        
         <!-- bootstrap -->
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-deploy-tool</artifactId>
+            <version>${pom.version}</version>
         </dependency>
     </dependencies>
+    
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>geronimo-packaging-plugin</artifactId>
+                <configuration>
+                    <boot>true</boot>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>

Modified: geronimo/sandbox/svkmerge/trunk/configs/hot-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/configs/hot-deployer/pom.xml?rev=419355&r1=419354&r2=419355&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/configs/hot-deployer/pom.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/configs/hot-deployer/pom.xml Wed Jul  5 15:05:45 2006
@@ -28,45 +28,33 @@
     </parent>
 
     <artifactId>hot-deployer</artifactId>
+    <name>Geronimo Configs :: Hot Deployer</name>
     <packaging>car</packaging>
-    <name>Hot Deployer</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 configurations -->
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>rmi-naming</artifactId>
-            <version>${geronimoVersion}</version>
+            <version>${pom.version}</version>
             <type>car</type>
         </dependency>
+        
         <!-- needs ref cars -->
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-deployer</artifactId>
-            <version>${geronimoVersion}</version>
+            <version>${pom.version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-hot-deploy</artifactId>
-            <version>${geronimoVersion}</version>
+            <version>${pom.version}</version>
         </dependency>
-        <!-- should have deploy-tool, deploy-jsr88, j2ee-deployment_spec as T dep -->
+        
     </dependencies>
+    
 </project>

Modified: geronimo/sandbox/svkmerge/trunk/configs/j2ee-corba/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/configs/j2ee-corba/pom.xml?rev=419355&r1=419354&r2=419355&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/configs/j2ee-corba/pom.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/configs/j2ee-corba/pom.xml Wed Jul  5 15:05:45 2006
@@ -27,64 +27,44 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <groupId>org.apache.geronimo.configs</groupId>
     <artifactId>j2ee-corba</artifactId>
+    <name>Geronimo Configs :: J2EE Corba</name>
     <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>
+            <version>${pom.version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-security</artifactId>
-            <version>${geronimoVersion}</version>
+            <version>${pom.version}</version>
             <type>car</type>
         </dependency>  
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>openejb</artifactId>
-            <version>${geronimoVersion}</version>
+            <version>${pom.version}</version>
             <type>car</type>
         </dependency>
     </dependencies>
     
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>geronimo-packaging-plugin</artifactId>
+                <configuration>
+                    <deploymentConfig>${gbeanDeployer},${j2eeDeployer},${openejbDeployer},${axisDeployer}</deploymentConfig>
+                </configuration>                  
+            </plugin>
+        </plugins>
+    </build>
+
 </project>

Modified: geronimo/sandbox/svkmerge/trunk/configs/j2ee-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/configs/j2ee-deployer/pom.xml?rev=419355&r1=419354&r2=419355&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/configs/j2ee-deployer/pom.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/configs/j2ee-deployer/pom.xml Wed Jul  5 15:05:45 2006
@@ -28,30 +28,16 @@
     </parent>
 
     <artifactId>j2ee-deployer</artifactId>
+    <name>Geronimo Configs :: J2EE Deployer</name>
     <packaging>car</packaging>
-    <name>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>
+    
         <!-- why is this a parent ? -->
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>geronimo-gbean-deployer</artifactId>
-            <version>${geronimoVersion}</version>
+            <version>${pom.version}</version>
             <type>car</type>
         </dependency>
 
@@ -59,53 +45,67 @@
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-server</artifactId>
-            <version>${geronimoVersion}</version>
+            <version>${pom.version}</version>
             <type>car</type>
             <scope>compile</scope>
         </dependency>
-
+        
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-j2ee-schema</artifactId>
+            <version>${pom.version}</version>
         </dependency>
+        
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-client</artifactId>
+            <version>${pom.version}</version>
         </dependency>
+        
         <!-- need transaction, core, j2ee-schema, management -->
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-naming-builder</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-j2ee-builder</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-web-builder</artifactId>
+            <version>${pom.version}</version>
         </dependency>
+        
         <!-- this should get connector -->
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-connector-builder</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-security-builder</artifactId>
+            <version>${pom.version}</version>
         </dependency>
+        
         <!-- webservices, naming -->
         <!-- why is this spec not in the classpath ?? -->
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-j2ee-jacc_1.0_spec</artifactId>
         </dependency>
+        
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-security</artifactId>
+            <version>${pom.version}</version>
         </dependency>
     </dependencies>
+    
 </project>

Modified: geronimo/sandbox/svkmerge/trunk/configs/j2ee-security/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/configs/j2ee-security/pom.xml?rev=419355&r1=419354&r2=419355&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/configs/j2ee-security/pom.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/configs/j2ee-security/pom.xml Wed Jul  5 15:05:45 2006
@@ -26,47 +26,19 @@
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
-
-    <artifactId>j2ee-security</artifactId>
+    
     <!-- change this to server-security -->
+    <artifactId>j2ee-security</artifactId>
+    <name>Geronimo Configs :: J2EE Security</name>
     <packaging>car</packaging>
-    <name>Security Configuration for the J2EE server</name>
-
-    <properties>
-        <PlanHTTPPort>8080</PlanHTTPPort>
-        <PlanHTTPSPort>8443</PlanHTTPSPort>
-        <PlanNamingPort>1099</PlanNamingPort>
-        <PlanJMXPort>9999</PlanJMXPort>
-        <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>
-                <configuration>
-                    <deploymentConfig>${gbeanDeployer},${j2eeDeployer}</deploymentConfig>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-    <!-- ============ -->
-    <!-- Dependencies -->
-    <!-- ============ -->
-
+    
     <dependencies>
+        
         <!-- parent -->
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>rmi-naming</artifactId>
-            <version>${geronimoVersion}</version>
+            <version>${pom.version}</version>
             <type>car</type>
         </dependency>
         
@@ -74,7 +46,7 @@
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-deployer</artifactId>
-            <version>${geronimoVersion}</version>
+            <version>${pom.version}</version>
             <type>car</type>
             <scope>provided</scope>
         </dependency>
@@ -83,6 +55,7 @@
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-security</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <!-- These 2 need to be in plan.xml ????? -->
@@ -90,6 +63,7 @@
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-j2ee-jacc_1.0_spec</artifactId>
         </dependency>
+        
         <dependency>
             <groupId>activeio</groupId>
             <artifactId>activeio</artifactId>
@@ -98,11 +72,26 @@
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-jmx-remoting</artifactId>
+            <version>${pom.version}</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-util</artifactId>
+            <version>${pom.version}</version>
         </dependency>
     </dependencies>
+    
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>geronimo-packaging-plugin</artifactId>
+                <configuration>
+                    <deploymentConfig>${gbeanDeployer},${j2eeDeployer}</deploymentConfig>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    
 </project>

Modified: geronimo/sandbox/svkmerge/trunk/configs/j2ee-server/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/configs/j2ee-server/pom.xml?rev=419355&r1=419354&r2=419355&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/configs/j2ee-server/pom.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/configs/j2ee-server/pom.xml Wed Jul  5 15:05:45 2006
@@ -28,53 +28,42 @@
     </parent>
 
     <artifactId>j2ee-server</artifactId>
+    <name>Geronimo Configs :: J2EE Server</name>
     <packaging>car</packaging>
-    <name>Server Configuration for the J2EE Server</name>
-
-    <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>
-            </plugin>
-        </plugins>
-    </build>
-
-    <!-- ============ -->
-    <!-- Dependencies -->
-    <!-- ============ -->
-
+    
     <dependencies>
         <!-- parent config -->
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>rmi-naming</artifactId>
-            <!--<version>${geronimoVersion}</version>-->
+            <version>${pom.version}</version>
             <type>car</type>
         </dependency>
-        <!-- June 7 2006 djencks.  Compared with project.xml. activeio removed, it's in rmi-naming -->
-
+        
         <!-- ThreadPool -->
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-core</artifactId>
+            <version>${pom.version}</version>
         </dependency>
+        
         <!-- ?????? -->
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-common</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-connector</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-webservices</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <!-- purpose unknown -->
@@ -84,4 +73,5 @@
         </dependency>
 
     </dependencies>
+    
 </project>

Modified: geronimo/sandbox/svkmerge/trunk/configs/j2ee-system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/configs/j2ee-system/pom.xml?rev=419355&r1=419354&r2=419355&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/configs/j2ee-system/pom.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/configs/j2ee-system/pom.xml Wed Jul  5 15:05:45 2006
@@ -28,25 +28,47 @@
     </parent>
 
     <artifactId>j2ee-system</artifactId>
+    <name>Geronimo Configs :: J2EE System</name>
     <packaging>car</packaging>
-    <name>System Configuration for the J2EE Server</name>
+    
+    <dependencies>
+    
+        <!-- uses geronimo-gbean-deployer by default -->
+        <!-- this forces gbean-deployer to be built before j2ee-system -->
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>geronimo-gbean-deployer</artifactId>
+            <version>${pom.version}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+        
+        <!-- dependencies referenced in the plan g-k, g-common -->
+        <!-- g-common, g-kernel, cglib, commons-logging, log4j,
+             mx4j, mx4j-remote, g-qname_spec, xercesImpl, xmlParserAPIS,
+             xstream, xpp3 comming from this -->
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-system</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+    </dependencies>
     
     <build>
         <plugins>
             <plugin>
-                
                 <groupId>org.apache.geronimo.plugins</groupId>
                 <artifactId>geronimo-packaging-plugin</artifactId>
-                <extensions>true</extensions>
                 <configuration>
                     <!-- uses default DeploymentConfig=geronimo-gbean-deployer -->
                     <!-- written to Manifest.mf -->
                     <classPath>\
                         ../lib/geronimo-qname_1.1_spec-${geronimoSpecQnameVersion}.jar \
-                        ../lib/geronimo-common-${geronimoVersion}.jar \
-                        ../lib/geronimo-kernel-${geronimoVersion}.jar \
-                        ../lib/geronimo-system-${geronimoVersion}.jar \
-                        ../lib/geronimo-util-${geronimoVersion}.jar \
+                        ../lib/geronimo-common-${pom.version}.jar \
+                        ../lib/geronimo-kernel-${pom.version}.jar \
+                        ../lib/geronimo-system-${pom.version}.jar \
+                        ../lib/geronimo-util-${pom.version}.jar \
                         ../lib/cglib-nodep-${cglibVersion}.jar \
                         ../lib/commons-cli-${commonsCliVersion}.jar \
                         ../lib/commons-logging-${commonsLoggingVersion}.jar \
@@ -65,28 +87,5 @@
             </plugin>
         </plugins>
     </build>
-
-    <!-- ============ -->
-    <!-- Dependencies -->
-    <!-- ============ -->
-
-    <dependencies>
-        <!-- uses geronimo-gbean-deployer by default -->
-        <!-- this forces gbean-deployer to be built before j2ee-system -->
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>geronimo-gbean-deployer</artifactId>
-            <!--<version>${geronimoVersion}</version>-->
-            <type>car</type>
-            <scope>provided</scope>
-        </dependency>
-        <!-- dependencies referenced in the plan g-k, g-common -->
-        <!-- g-common, g-kernel, cglib, commons-logging, log4j,
-             mx4j, mx4j-remote, g-qname_spec, xercesImpl, xmlParserAPIS,
-             xstream, xpp3 comming from this -->
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-system</artifactId>
-        </dependency>
-    </dependencies>
+    
 </project>

Modified: geronimo/sandbox/svkmerge/trunk/configs/javamail/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/configs/javamail/pom.xml?rev=419355&r1=419354&r2=419355&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/configs/javamail/pom.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/configs/javamail/pom.xml Wed Jul  5 15:05:45 2006
@@ -28,39 +28,29 @@
     </parent>
 
     <artifactId>javamail</artifactId>
+    <name>Geronimo Configs :: JavaMail</name>
     <packaging>car</packaging>
-    <name>Security Configuration for the J2EE server</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>rmi-naming</artifactId>
+            <version>${pom.version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-javamail-transport</artifactId>
+            <version>${pom.version}</version>
         </dependency>
+        
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-mail</artifactId>
+            <version>${pom.version}</version>
         </dependency>
     </dependencies>
+    
 </project>

Modified: geronimo/sandbox/svkmerge/trunk/configs/jetty-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/configs/jetty-deployer/pom.xml?rev=419355&r1=419354&r2=419355&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/configs/jetty-deployer/pom.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/configs/jetty-deployer/pom.xml Wed Jul  5 15:05:45 2006
@@ -28,37 +28,24 @@
     </parent>
 
     <artifactId>jetty-deployer</artifactId>
+    <name>Geronimo Configs :: Jetty Deployer</name>
     <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>
+            <version>${pom.version}</version>
             <type>car</type>
         </dependency>
+        
         <!-- similar thing not needed in tomcat !!! -->
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jetty</artifactId>
-            <version>${geronimoVersion}</version>
+            <version>${pom.version}</version>
             <type>car</type>
             <scope>compile</scope>
         </dependency>
@@ -66,6 +53,9 @@
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-jetty-builder</artifactId>
+            <version>${pom.version}</version>
         </dependency>
+        
     </dependencies>
+    
 </project>

Modified: geronimo/sandbox/svkmerge/trunk/configs/jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/configs/jetty/pom.xml?rev=419355&r1=419354&r2=419355&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/configs/jetty/pom.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/configs/jetty/pom.xml Wed Jul  5 15:05:45 2006
@@ -27,49 +27,32 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <groupId>org.apache.geronimo.configs</groupId>
     <artifactId>jetty</artifactId>
+    <name>Geronimo Configs :: Jetty</name>
     <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>
+            <version>${pom.version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-jetty</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-webservices</artifactId>
+            <version>${pom.version}</version>
         </dependency>
+        
     </dependencies>
+    
 </project>

Modified: geronimo/sandbox/svkmerge/trunk/configs/jsp-examples-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/configs/jsp-examples-jetty/pom.xml?rev=419355&r1=419354&r2=419355&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/configs/jsp-examples-jetty/pom.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/configs/jsp-examples-jetty/pom.xml Wed Jul  5 15:05:45 2006
@@ -27,35 +27,17 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <groupId>org.apache.geronimo.configs</groupId>
     <artifactId>jsp-examples-jetty</artifactId>
+    <name>Geronimo Configs :: JSP Examples Jetty</name>
     <packaging>car</packaging>
-    <name>JSP Examples Jetty</name>
 
-    <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>${j2eeJettyServer}</deploymentConfig>
-                    <moduleFile>${settings.localRepository}/geronimo-samples/geronimo-jsp-examples-tomcat/${tomcatVersion}/geronimo-jsp-examples-tomcat-${tomcatVersion}.war</moduleFile>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-    <!-- ============ -->
-    <!-- Dependencies -->
-    <!-- ============ -->
-    
     <dependencies>
-        <!-- to enforce build order --> 
+        
+        <!-- to enforce build order -->
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jetty</artifactId>
+            <version>${pom.version}</version>
             <type>car</type>
             <scope>provided</scope>
         </dependency>
@@ -70,7 +52,21 @@
         <dependency>
             <groupId>commons-collections</groupId>
             <artifactId>commons-collections</artifactId>
-            <version>${commonsCollectionsVersion}</version>
         </dependency>
+        
     </dependencies>
+    
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>geronimo-packaging-plugin</artifactId>
+                <configuration>
+                    <deploymentConfig>${j2eeJettyServer}</deploymentConfig>
+                    <moduleFile>${settings.localRepository}/geronimo-samples/geronimo-jsp-examples-tomcat/${tomcatVersion}/geronimo-jsp-examples-tomcat-${tomcatVersion}.war</moduleFile>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    
 </project>

Modified: geronimo/sandbox/svkmerge/trunk/configs/jsp-examples-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/configs/jsp-examples-tomcat/pom.xml?rev=419355&r1=419354&r2=419355&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/configs/jsp-examples-tomcat/pom.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/configs/jsp-examples-tomcat/pom.xml Wed Jul  5 15:05:45 2006
@@ -27,35 +27,17 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <groupId>org.apache.geronimo.configs</groupId>
     <artifactId>jsp-examples-tomcat</artifactId>
+    <name>Geronimo Configs :: JSP Examples Tomcat</name>
     <packaging>car</packaging>
-    <name>JSP Examples Tomcat</name>
-
-    <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>${j2eeTomcatServer}</deploymentConfig>
-                    <moduleFile>${settings.localRepository}/geronimo-samples/geronimo-jsp-examples-tomcat/${tomcatVersion}/geronimo-jsp-examples-tomcat-${tomcatVersion}.war</moduleFile>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-    <!-- ============ -->
-    <!-- Dependencies -->
-    <!-- ============ -->
-
+    
     <dependencies>
+        
         <!-- To enforce build order -->
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>tomcat-deployer</artifactId>
+            <version>${pom.version}</version>
             <type>car</type>
             <scope>provided</scope>
         </dependency>
@@ -66,5 +48,20 @@
             <version>${tomcatVersion}</version>
             <type>war</type>
         </dependency>
+        
     </dependencies>
+    
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>geronimo-packaging-plugin</artifactId>
+                <configuration>
+                    <deploymentConfig>${j2eeTomcatServer}</deploymentConfig>
+                    <moduleFile>${settings.localRepository}/geronimo-samples/geronimo-jsp-examples-tomcat/${tomcatVersion}/geronimo-jsp-examples-tomcat-${tomcatVersion}.war</moduleFile>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    
 </project>

Modified: geronimo/sandbox/svkmerge/trunk/configs/ldap-demo-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/configs/ldap-demo-jetty/pom.xml?rev=419355&r1=419354&r2=419355&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/configs/ldap-demo-jetty/pom.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/configs/ldap-demo-jetty/pom.xml Wed Jul  5 15:05:45 2006
@@ -27,35 +27,17 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <groupId>org.apache.geronimo.configs</groupId>
     <artifactId>ldap-demo-jetty</artifactId>
+    <name>Geronimo Configs :: LDAP Demo for Jetty</name>
     <packaging>car</packaging>
-    <name>LDAP Demo for Jetty</name>
-
-    <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>${j2eeJettyServer}</deploymentConfig>
-                    <moduleFile>${settings.localRepository}/org/apache/geronimo/applications/geronimo-ldap-demo/${geronimoVersion}/geronimo-ldap-demo-${geronimoVersion}.war</moduleFile>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-    <!-- ============ -->
-    <!-- Dependencies -->
-    <!-- ============ -->
-
+    
     <dependencies>
-        <!-- to enforce build order --> 
+        
+        <!-- to enforce build order -->
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jetty</artifactId>
+            <version>${pom.version}</version>
             <type>car</type>
             <scope>provided</scope>
         </dependency>
@@ -63,8 +45,23 @@
         <dependency>
             <groupId>org.apache.geronimo.applications</groupId>
             <artifactId>geronimo-ldap-demo</artifactId>
-            <version>${geronimoVersion}</version>
+            <version>${pom.version}</version>
             <type>war</type>
         </dependency>
+        
     </dependencies>
+    
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>geronimo-packaging-plugin</artifactId>
+                <configuration>
+                    <deploymentConfig>${j2eeJettyServer}</deploymentConfig>
+                    <moduleFile>${settings.localRepository}/org/apache/geronimo/applications/geronimo-ldap-demo/${pom.version}/geronimo-ldap-demo-${pom.version}.war</moduleFile>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    
 </project>

Modified: geronimo/sandbox/svkmerge/trunk/configs/ldap-demo-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/configs/ldap-demo-tomcat/pom.xml?rev=419355&r1=419354&r2=419355&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/configs/ldap-demo-tomcat/pom.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/configs/ldap-demo-tomcat/pom.xml Wed Jul  5 15:05:45 2006
@@ -27,43 +27,41 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <groupId>org.apache.geronimo.configs</groupId>
     <artifactId>ldap-demo-tomcat</artifactId>
+    <name>Geronimo Configs :: LDAP Demo for Tomcat</name>
     <packaging>car</packaging>
-    <name>LDAP Demo for Tomcat</name>
-
-    <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>${j2eeTomcatServer}</deploymentConfig>
-                    <moduleFile>${settings.localRepository}/org/apache/geronimo/applications/geronimo-ldap-demo/${geronimoVersion}/geronimo-ldap-demo-${geronimoVersion}.war</moduleFile>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-    <!-- ============ -->
-    <!-- Dependencies -->
-    <!-- ============ -->
-
+    
     <dependencies>
+        
         <dependency>
             <!-- To enforce build order -->
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>tomcat-deployer</artifactId>
+            <version>${pom.version}</version>
             <type>car</type>
             <scope>provided</scope>
         </dependency>
+        
         <dependency>
             <groupId>org.apache.geronimo.applications</groupId>
             <artifactId>geronimo-ldap-demo</artifactId>
-            <version>${geronimoVersion}</version>
+            <version>${pom.version}</version>
             <type>war</type>
+            
         </dependency>
     </dependencies>
+    
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>geronimo-packaging-plugin</artifactId>
+                <configuration>
+                    <deploymentConfig>${j2eeTomcatServer}</deploymentConfig>
+                    <moduleFile>${settings.localRepository}/org/apache/geronimo/applications/geronimo-ldap-demo/${pom.version}/geronimo-ldap-demo-${pom.version}.war</moduleFile>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    
 </project>

Modified: geronimo/sandbox/svkmerge/trunk/configs/ldap-realm/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/configs/ldap-realm/pom.xml?rev=419355&r1=419354&r2=419355&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/configs/ldap-realm/pom.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/configs/ldap-realm/pom.xml Wed Jul  5 15:05:45 2006
@@ -28,38 +28,26 @@
     </parent>
 
     <artifactId>ldap-realm</artifactId>
+    <name>Geronimo Configs :: LDAP Security Realm</name>
     <packaging>car</packaging>
-    <name>LDAP Security Realm</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-security</artifactId>
-            <version>${geronimoVersion}</version>
+            <version>${pom.version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>directory</artifactId>
-            <version>${geronimoVersion}</version>
+            <version>${pom.version}</version>
             <type>car</type>
         </dependency>
+        
     </dependencies>
+    
 </project>

Modified: geronimo/sandbox/svkmerge/trunk/configs/online-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/configs/online-deployer/pom.xml?rev=419355&r1=419354&r2=419355&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/configs/online-deployer/pom.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/configs/online-deployer/pom.xml Wed Jul  5 15:05:45 2006
@@ -28,29 +28,27 @@
     </parent>
 
     <artifactId>online-deployer</artifactId>
+    <name>Geronimo Configs :: Online Deployer</name>
     <packaging>car</packaging>
-    <name>Online Deployer Configuration</name>
-    <!-- This is deployer.jar -->
     
     <build>
         <plugins>
             <plugin>                
                 <groupId>org.apache.geronimo.plugins</groupId>
                 <artifactId>geronimo-packaging-plugin</artifactId>
-                <extensions>true</extensions>
                 <configuration>
                     <!-- uses default DeploymentConfig=geronimo-gbean-deployer -->
                     <!-- written to Manifest.mf -->
-                    <classPath>../lib/geronimo-deployment-${geronimoVersion}.jar \
+                    <classPath>../lib/geronimo-deployment-${pom.version}.jar \
                         ../lib/xpp3-${xpp3_version}.jar \
                         ../lib/xstream-${xstream_version}.jar \
-                        ../lib/geronimo-deploy-jsr88-${geronimoVersion}.jar \
-                        ../lib/geronimo-deploy-tool-${geronimoVersion}.jar \
+                        ../lib/geronimo-deploy-jsr88-${pom.version}.jar \
+                        ../lib/geronimo-deploy-tool-${pom.version}.jar \
                         ../lib/geronimo-j2ee-deployment_${geronimoSpecJ2eeDeploymentVersion}_spec.jar \
-                        ../lib/geronimo-common-${geronimoVersion}.jar \
-                        ../lib/geronimo-kernel-${geronimoVersion}.jar \
-                        ../lib/geronimo-system-${geronimoVersion}.jar \
-                        ../lib/geronimo-util-${geronimoVersion}.jar \
+                        ../lib/geronimo-common-${pom.version}.jar \
+                        ../lib/geronimo-kernel-${pom.version}.jar \
+                        ../lib/geronimo-system-${pom.version}.jar \
+                        ../lib/geronimo-util-${pom.version}.jar \
                         ../lib/cglib-nodep-${cglibVersion}.jar \
                         ../lib/commons-cli-${commonsCliVersion}.jar \
                         ../lib/commons-logging-${commonsLoggingVersion}.jar \
@@ -63,8 +61,4 @@
         </plugins>
     </build>
 
-    <!-- ============ -->
-    <!-- Dependencies -->
-    <!-- ============ -->
-    <!-- none -->
 </project>

Modified: geronimo/sandbox/svkmerge/trunk/configs/openejb-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/configs/openejb-deployer/pom.xml?rev=419355&r1=419354&r2=419355&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/configs/openejb-deployer/pom.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/configs/openejb-deployer/pom.xml Wed Jul  5 15:05:45 2006
@@ -27,83 +27,54 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
     
-    <groupId>org.apache.geronimo.configs</groupId>
     <artifactId>openejb-deployer</artifactId>
+    <name>Geronimo Configs :: OpenEJB Deployer</name>
     <packaging>car</packaging>
-    <name>openejb Configuration for performing J2EE deployments</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>
+    
         <!-- parent -->
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-deployer</artifactId>
-            <version>${geronimoVersion}</version>
+            <version>${pom.version}</version>
             <type>car</type>
         </dependency>
 
-        <!-- import the classes ???? -->
-        <!--<dependency>-->
-            <!--<groupId>org.apache.geronimo.configs</groupId>-->
-            <!--<artifactId>j2ee-server</artifactId>-->
-            <!--<version>${geronimoVersion}</version>-->
-            <!--<type>car</type>-->
-            <!--<scope>compile</scope>-->
-        <!--</dependency>-->
-
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-axis</artifactId>
+            <version>${pom.version}</version>
         </dependency>
+        
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-axis-builder</artifactId>
+            <version>${pom.version}</version>
         </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-web-builder</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
         <!-- this should get openejb -->
         <dependency>
-            <groupId>openejb</groupId>
+            <groupId>org.openejb</groupId>
             <artifactId>openejb-builder</artifactId>
-            <version>${openejbVersion}</version>
         </dependency>
 
         <dependency>
-            <groupId>openejb</groupId>
+            <groupId>org.openejb</groupId>
             <artifactId>openejb-pkgen-builder</artifactId>
-            <version>${openejbVersion}</version>
         </dependency>
 
         <dependency>
-            <groupId>openejb</groupId>
+            <groupId>org.openejb</groupId>
             <artifactId>openejb-core</artifactId>
-            <version>${openejbVersion}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-web-builder</artifactId>
         </dependency>
+        
     </dependencies>
+    
 </project>

Modified: geronimo/sandbox/svkmerge/trunk/configs/openejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/configs/openejb/pom.xml?rev=419355&r1=419354&r2=419355&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/configs/openejb/pom.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/configs/openejb/pom.xml Wed Jul  5 15:05:45 2006
@@ -27,77 +27,39 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <groupId>org.apache.geronimo.configs</groupId>
     <artifactId>openejb</artifactId>
+    <name>Geronimo Configs :: OpenEJB</name>
     <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>
+            <version>${pom.version}</version>
             <type>car</type>
         </dependency>
+        
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>axis</artifactId>
-            <version>${geronimoVersion}</version>
+            <version>${pom.version}</version>
             <type>car</type>
         </dependency>
+        
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>system-database</artifactId>
-            <version>${geronimoVersion}</version>
+            <version>${pom.version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
-            <groupId>openejb</groupId>
+            <groupId>org.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>

Modified: geronimo/sandbox/svkmerge/trunk/configs/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/configs/pom.xml?rev=419355&r1=419354&r2=419355&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/configs/pom.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/configs/pom.xml Wed Jul  5 15:05:45 2006
@@ -17,7 +17,11 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project>
+<project
+    xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
@@ -29,110 +33,147 @@
 
     <groupId>org.apache.geronimo.configs</groupId>
     <artifactId>configs-parent</artifactId>
+    <name>Geronimo :: Configs</name>
     <packaging>pom</packaging>
-    <name>Geronimo Configs</name>
-    <description>Geronimo Configs</description>
-
+    
     <properties>
+        <!-- HACK: These properties are referenced internally by plans (or something) -->
+        <geronimoVersion>${pom.version}</geronimoVersion>
         <pom.currentVersion>${pom.version}</pom.currentVersion>
         
         <!-- add from etc/explicit_version.properties here to use filter-->
-        <gbeanDeployer>org.apache.geronimo.configs/geronimo-gbean-deployer/${geronimoVersion}/car</gbeanDeployer>
-        <j2eeDeployer>org.apache.geronimo.configs/j2ee-deployer/${geronimoVersion}/car</j2eeDeployer>
-        <clientDeployer>org.apache.geronimo.configs/client-deployer/${geronimoVersion}/car</clientDeployer>
-        <openejbDeployer>org.apache.geronimo.configs/openejb-deployer/${geronimoVersion}/car</openejbDeployer>
-        <axisDeployer>org.apache.geronimo.configs/axis-deployer/${geronimoVersion}/car</axisDeployer>
-        <tomcatDeployer>org.apache.geronimo.configs/tomcat-deployer/${geronimoVersion}/car</tomcatDeployer>
-
-        <j2eeTomcatServer>org.apache.geronimo.configs/geronimo-gbean-deployer/${geronimoVersion}/car,org.apache.geronimo.configs/j2ee-deployer/${geronimoVersion}/car,org.apache.geronimo.configs/tomcat-deployer/${geronimoVersion}/car,org.apache.geronimo.configs/client-deployer/${geronimoVersion}/car,org.apache.geronimo.configs/openejb-deployer/${geronimoVersion}/car,org.apache.geronimo.configs/axis-deployer/${geronimoVersion}/car</j2eeTomcatServer>
-        <j2eeJettyServer>org.apache.geronimo.configs/geronimo-gbean-deployer/${geronimoVersion}/car,org.apache.geronimo.configs/j2ee-deployer/${geronimoVersion}/car,org.apache.geronimo.configs/jetty-deployer/${geronimoVersion}/car,org.apache.geronimo.configs/client-deployer/${geronimoVersion}/car,org.apache.geronimo.configs/openejb-deployer/${geronimoVersion}/car,org.apache.geronimo.configs/axis-deployer/${geronimoVersion}/car</j2eeJettyServer>
-        <!-- no web deployer -->
-        <j2eeNowebServer>org.apache.geronimo.configs/geronimo-gbean-deployer/${geronimoVersion}/car,org.apache.geronimo.configs/j2ee-deployer/${geronimoVersion}/car,org.apache.geronimo.configs/client-deployer/${geronimoVersion}/car,org.apache.geronimo.configs/openejb-deployer/${geronimoVersion}/car,org.apache.geronimo.configs/axis-deployer/${geronimoVersion}/car</j2eeNowebServer>
+        <gbeanDeployer>org.apache.geronimo.configs/geronimo-gbean-deployer/${pom.version}/car</gbeanDeployer>
+        <j2eeDeployer>org.apache.geronimo.configs/j2ee-deployer/${pom.version}/car</j2eeDeployer>
+        <clientDeployer>org.apache.geronimo.configs/client-deployer/${pom.version}/car</clientDeployer>
+        <openejbDeployer>org.apache.geronimo.configs/openejb-deployer/${pom.version}/car</openejbDeployer>
+        <axisDeployer>org.apache.geronimo.configs/axis-deployer/${pom.version}/car</axisDeployer>
+        <tomcatDeployer>org.apache.geronimo.configs/tomcat-deployer/${pom.version}/car</tomcatDeployer>
+        <j2eeTomcatServer>org.apache.geronimo.configs/geronimo-gbean-deployer/${pom.version}/car,org.apache.geronimo.configs/j2ee-deployer/${pom.version}/car,org.apache.geronimo.configs/tomcat-deployer/${pom.version}/car,org.apache.geronimo.configs/client-deployer/${pom.version}/car,org.apache.geronimo.configs/openejb-deployer/${pom.version}/car,org.apache.geronimo.configs/axis-deployer/${pom.version}/car</j2eeTomcatServer>
+        <j2eeJettyServer>org.apache.geronimo.configs/geronimo-gbean-deployer/${pom.version}/car,org.apache.geronimo.configs/j2ee-deployer/${pom.version}/car,org.apache.geronimo.configs/jetty-deployer/${pom.version}/car,org.apache.geronimo.configs/client-deployer/${pom.version}/car,org.apache.geronimo.configs/openejb-deployer/${pom.version}/car,org.apache.geronimo.configs/axis-deployer/${pom.version}/car</j2eeJettyServer>
+        <j2eeNowebServer>org.apache.geronimo.configs/geronimo-gbean-deployer/${pom.version}/car,org.apache.geronimo.configs/j2ee-deployer/${pom.version}/car,org.apache.geronimo.configs/client-deployer/${pom.version}/car,org.apache.geronimo.configs/openejb-deployer/${pom.version}/car,org.apache.geronimo.configs/axis-deployer/${pom.version}/car</j2eeNowebServer>
+        
+        <!-- Common plan properties -->
+        <PlanServerHostname>localhost</PlanServerHostname>
+        <PlanClientAddresses>127.0.0.1</PlanClientAddresses>
+        <PlanHTTPPort>8080</PlanHTTPPort>
+        <PlanHTTPSPort>8443</PlanHTTPSPort>
+        <PlanHTTPPort2>8090</PlanHTTPPort2>
+        <PlanHTTPSPort2>8453</PlanHTTPSPort2>
+        <PlanAJPPort2>8019</PlanAJPPort2>
+        <PlanOpenEJBPort>4201</PlanOpenEJBPort>
+        <PlanRemoteLoginPort>4242</PlanRemoteLoginPort>
+        <PlanNamingPort>1099</PlanNamingPort>
+        <PlanActiveMQPort>61616</PlanActiveMQPort>
+        <PlanCOSNamingHost>localhost</PlanCOSNamingHost>
+        <PlanCOSNamingPort>1050</PlanCOSNamingPort>
+        <PlanORBSSLHost>localhost</PlanORBSSLHost>
+        <PlanORBSSLPort>2001</PlanORBSSLPort>
+        <PlanJMXPort>9999</PlanJMXPort>
     </properties>
-
+    
     <build>
+        <!--
+        
+        NOTE: Don't add to extentions here, or JCL will freak out about multipule versions.
+        
+        <extensions>
+            <extension>
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>geronimo-packaging-plugin</artifactId>
+                <version>${pom.version}</version>
+            </extension>
+        </extensions>
+        -->
+        
         <pluginManagement>
             <plugins>
                 <plugin>
                     <groupId>org.apache.geronimo.plugins</groupId>
                     <artifactId>geronimo-packaging-plugin</artifactId>
-                    <version>${geronimoPackagingPluginVersion}</version>
+                    <version>${pom.version}</version>
+                    <extensions>true</extensions>
                 </plugin>
             </plugins>
         </pluginManagement>
+        
+        <plugins>
+            <!--
+               | NOTE: Currently to build CAR files, we need to ensure that the module has been cleaned first
+               |       otherwise the second time around the build will fail.
+             -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-clean-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>clean</goal>
+                        </goals>
+                        <phase>validate</phase>
+                    </execution>
+                </executions>
+            </plugin>
+            
+            <plugin>
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>geronimo-packaging-plugin</artifactId>
+                <extensions>true</extensions>
+            </plugin>
+        </plugins>
     </build>
-
-    <profiles>
-        <profile>
-            <id>default</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <modules>
-                <!-- <module>activemq</module> -->
-                <!-- <module>activemq-broker</module> -->
-                <module>axis</module>
-                <module>axis-deployer</module>
-                <module>client</module>
-                <module>client-corba</module>
-                <module>client-deployer</module>
-                <module>client-security</module>
-                <module>client-system</module>
-                <!-- <module>console-jetty</module> -->
-                <!-- <module>console-tomcat</module> -->
-                <!-- <module>daytrader-jetty</module> -->
-                <!-- <module>daytrader-tomcat</module> -->
-                <module>directory</module>
-                <module>geronimo-gbean-deployer</module>
-                <module>hot-deployer</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>jetty</module>
-                <module>jetty-deployer</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-deployer</module>
-                <!-- <module>remote-deploy-jetty</module> -->
-                <!-- <module>remote-deploy-tomcat</module> -->
-                <module>rmi-naming</module>
-                <module>servlets-examples-jetty</module>
-                <module>servlets-examples-tomcat</module>
-                <module>sharedlib</module>
-                <module>shutdown</module>
-                <module>system-database</module>
-                <module>tomcat</module>
-                <module>tomcat-deployer</module>
-                <!-- <module>uddi-jetty</module> -->
-                <!-- <module>uddi-tomcat</module> -->
-                <module>unavailable-client-deployer</module>
-                <module>unavailable-ejb-deployer</module>
-                <module>unavailable-webservices-deployer</module>
-                <module>upgrade</module>
-                <module>upgrade-cli</module>
-                <module>welcome-jetty</module>
-                <module>welcome-tomcat</module>
-            </modules>
-        </profile>
-        
-        <profile>
-            <id>singlemodule</id>
-            <activation>
-                <property>
-                    <name>module</name>
-                </property>
-            </activation>
-            <modules>
-                <module>${module}</module>
-            </modules>
-        </profile>
-    </profiles>
+    
+    <modules>
+        <!-- <module>activemq</module> -->
+        <!-- <module>activemq-broker</module> -->
+        <module>axis</module>
+        <module>axis-deployer</module>
+        <module>client</module>
+        <module>client-corba</module>
+        <module>client-deployer</module>
+        <module>client-security</module>
+        <module>client-system</module>
+        <!-- <module>console-jetty</module> -->
+        <!-- <module>console-tomcat</module> -->
+        <!-- <module>daytrader-jetty</module> -->
+        <!-- <module>daytrader-tomcat</module> -->
+        <module>directory</module>
+        <module>geronimo-gbean-deployer</module>
+        <module>hot-deployer</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>jetty</module>
+        <module>jetty-deployer</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-deployer</module>
+        <!-- <module>remote-deploy-jetty</module> -->
+        <!-- <module>remote-deploy-tomcat</module> -->
+        <module>rmi-naming</module>
+        <module>servlets-examples-jetty</module>
+        <module>servlets-examples-tomcat</module>
+        <module>sharedlib</module>
+        <module>shutdown</module>
+        <module>system-database</module>
+        <module>tomcat</module>
+        <module>tomcat-deployer</module>
+        <!-- <module>uddi-jetty</module> -->
+        <!-- <module>uddi-tomcat</module> -->
+        <module>unavailable-client-deployer</module>
+        <module>unavailable-ejb-deployer</module>
+        <module>unavailable-webservices-deployer</module>
+        <module>upgrade</module>
+        <module>upgrade-cli</module>
+        <module>welcome-jetty</module>
+        <module>welcome-tomcat</module>
+    </modules>
+    
 </project>



Mime
View raw message