geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r527673 - in /geronimo/server/trunk: configs/ configs/geronimo-gbean-deployer-bootstrap/ configs/geronimo-gbean-deployer-bootstrap/src/ configs/geronimo-gbean-deployer/ configs/jee-specs/ configs/xmlbeans/ maven-plugins/car-maven-plugin/src...
Date Wed, 11 Apr 2007 21:09:34 GMT
Author: djencks
Date: Wed Apr 11 14:09:33 2007
New Revision: 527673

URL: http://svn.apache.org/viewvc?view=rev&rev=527673
Log:
GERONIMO-3090 only one module built with boostrap

Added:
    geronimo/server/trunk/configs/geronimo-gbean-deployer-bootstrap/
      - copied from r527556, geronimo/server/trunk/configs/geronimo-gbean-deployer/
    geronimo/server/trunk/configs/geronimo-gbean-deployer-bootstrap/LICENSE.txt
      - copied unchanged from r527645, geronimo/server/trunk/configs/geronimo-gbean-deployer/LICENSE.txt
    geronimo/server/trunk/configs/geronimo-gbean-deployer-bootstrap/NOTICE.txt
      - copied unchanged from r527645, geronimo/server/trunk/configs/geronimo-gbean-deployer/NOTICE.txt
    geronimo/server/trunk/configs/geronimo-gbean-deployer-bootstrap/pom.xml
      - copied, changed from r527645, geronimo/server/trunk/configs/geronimo-gbean-deployer/pom.xml
    geronimo/server/trunk/configs/geronimo-gbean-deployer-bootstrap/src/
      - copied from r527645, geronimo/server/trunk/configs/geronimo-gbean-deployer/src/
Modified:
    geronimo/server/trunk/configs/geronimo-gbean-deployer/pom.xml
    geronimo/server/trunk/configs/jee-specs/pom.xml
    geronimo/server/trunk/configs/pom.xml
    geronimo/server/trunk/configs/xmlbeans/pom.xml
    geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PackageMojo.java

Copied: geronimo/server/trunk/configs/geronimo-gbean-deployer-bootstrap/pom.xml (from r527645,
geronimo/server/trunk/configs/geronimo-gbean-deployer/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/geronimo-gbean-deployer-bootstrap/pom.xml?view=diff&rev=527673&p1=geronimo/server/trunk/configs/geronimo-gbean-deployer/pom.xml&r1=527645&p2=geronimo/server/trunk/configs/geronimo-gbean-deployer-bootstrap/pom.xml&r2=527673
==============================================================================
--- geronimo/server/trunk/configs/geronimo-gbean-deployer/pom.xml (original)
+++ geronimo/server/trunk/configs/geronimo-gbean-deployer-bootstrap/pom.xml Wed Apr 11 14:09:33
2007
@@ -29,20 +29,13 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <artifactId>geronimo-gbean-deployer</artifactId>
-    <name>Geronimo Configs :: GBean Deployer</name>
+    <artifactId>geronimo-gbean-deployer-bootstrap</artifactId>
+    <name>Geronimo Configs :: GBean Deployer Boostrap version</name>
     <packaging>car</packaging>
     
     <dependencies>
 
         <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>xmlbeans</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-        
-        <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-common</artifactId>
             <version>${version}</version>
@@ -75,7 +68,7 @@
         </dependency>
 
         <!-- Thirdparty Dependencies -->
-<!--
+
         <dependency>
             <groupId>xmlbeans</groupId>
             <artifactId>xbean</artifactId>
@@ -85,7 +78,6 @@
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-stax-api_1.0_spec</artifactId>
         </dependency>
--->
 
     </dependencies>
     
@@ -95,6 +87,8 @@
                 <groupId>org.apache.geronimo.plugins</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
+                    <deploymentConfigs>
+                    </deploymentConfigs>
                     <bootstrap>true</bootstrap>
                 </configuration>
             </plugin>

Modified: geronimo/server/trunk/configs/geronimo-gbean-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/geronimo-gbean-deployer/pom.xml?view=diff&rev=527673&r1=527672&r2=527673
==============================================================================
--- geronimo/server/trunk/configs/geronimo-gbean-deployer/pom.xml (original)
+++ geronimo/server/trunk/configs/geronimo-gbean-deployer/pom.xml Wed Apr 11 14:09:33 2007
@@ -74,28 +74,27 @@
             <version>${version}</version>
         </dependency>
 
-        <!-- Thirdparty Dependencies -->
-<!--
+        <!-- build order hint -->
         <dependency>
-            <groupId>xmlbeans</groupId>
-            <artifactId>xbean</artifactId>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>geronimo-gbean-deployer-bootstrap</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+            <scope>provided</scope>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-stax-api_1.0_spec</artifactId>
-        </dependency>
--->
-
     </dependencies>
-    
+
     <build>
         <plugins>
             <plugin>
                 <groupId>org.apache.geronimo.plugins</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
-                    <bootstrap>true</bootstrap>
+                    <deploymentConfigs>
+                        <deploymentConfig>${gbeanDeployerBootstrap}</deploymentConfig>
+                    </deploymentConfigs>
+                    <deployerName>org.apache.geronimo.configs/geronimo-gbean-deployer-bootstrap/${geronimoVersion}/car?j2eeType=Deployer,name=Deployer</deployerName>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/server/trunk/configs/jee-specs/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jee-specs/pom.xml?view=diff&rev=527673&r1=527672&r2=527673
==============================================================================
--- geronimo/server/trunk/configs/jee-specs/pom.xml (original)
+++ geronimo/server/trunk/configs/jee-specs/pom.xml Wed Apr 11 14:09:33 2007
@@ -160,22 +160,26 @@
         </dependency>
 
         <!-- build order hint -->
-        <!--<dependency>-->
-            <!--<groupId>org.apache.geronimo.configs</groupId>-->
-            <!--<artifactId>geronimo-gbean-deployer</artifactId>-->
-            <!--<version>${version}</version>-->
-            <!--<type>car</type>-->
-            <!--<scope>provided</scope>-->
-        <!--</dependency>-->
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>geronimo-gbean-deployer-bootstrap</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
 
     </dependencies>
+
     <build>
         <plugins>
             <plugin>
                 <groupId>org.apache.geronimo.plugins</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
-                    <bootstrap>true</bootstrap>
+                    <deploymentConfigs>
+                        <deploymentConfig>${gbeanDeployerBootstrap}</deploymentConfig>
+                    </deploymentConfigs>
+                    <deployerName>org.apache.geronimo.configs/geronimo-gbean-deployer-bootstrap/${geronimoVersion}/car?j2eeType=Deployer,name=Deployer</deployerName>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/server/trunk/configs/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/pom.xml?view=diff&rev=527673&r1=527672&r2=527673
==============================================================================
--- geronimo/server/trunk/configs/pom.xml (original)
+++ geronimo/server/trunk/configs/pom.xml Wed Apr 11 14:09:33 2007
@@ -38,6 +38,7 @@
         <!-- This property is required by the car:package mojo -->
         <geronimoVersion>${version}</geronimoVersion>
 
+        <gbeanDeployerBootstrap>org.apache.geronimo.configs/geronimo-gbean-deployer-bootstrap/${version}/car</gbeanDeployerBootstrap>
         <gbeanDeployer>org.apache.geronimo.configs/geronimo-gbean-deployer/${version}/car</gbeanDeployer>
         <j2eeDeployer>org.apache.geronimo.configs/j2ee-deployer/${version}/car</j2eeDeployer>
         <clientDeployer>org.apache.geronimo.configs/client-deployer/${version}/car</clientDeployer>
@@ -106,6 +107,7 @@
     </build>
 
     <modules>
+        <module>geronimo-gbean-deployer-bootstrap</module>
         <module>activemq-ra</module>
         <module>activemq-broker</module>
         <module>axis</module>

Modified: geronimo/server/trunk/configs/xmlbeans/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/xmlbeans/pom.xml?view=diff&rev=527673&r1=527672&r2=527673
==============================================================================
--- geronimo/server/trunk/configs/xmlbeans/pom.xml (original)
+++ geronimo/server/trunk/configs/xmlbeans/pom.xml Wed Apr 11 14:09:33 2007
@@ -44,6 +44,15 @@
             <version>${version}</version>
             <type>car</type>
         </dependency>
+        <!-- build order hint -->
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>geronimo-gbean-deployer-bootstrap</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+
     </dependencies>
 
     <build>
@@ -52,7 +61,10 @@
                 <groupId>org.apache.geronimo.plugins</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
-                    <bootstrap>true</bootstrap>
+                    <deploymentConfigs>
+                        <deploymentConfig>${gbeanDeployerBootstrap}</deploymentConfig>
+                    </deploymentConfigs>
+                    <deployerName>org.apache.geronimo.configs/geronimo-gbean-deployer-bootstrap/${geronimoVersion}/car?j2eeType=Deployer,name=Deployer</deployerName>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PackageMojo.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PackageMojo.java?view=diff&rev=527673&r1=527672&r2=527673
==============================================================================
--- geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PackageMojo.java
(original)
+++ geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PackageMojo.java
Wed Apr 11 14:09:33 2007
@@ -248,9 +248,11 @@
 
         // Use the default configs if none specified
         if (deploymentConfigs == null) {
-            deploymentConfigs = new String[] {
-                    defaultDeploymentConfig
-            };
+            if (!bootstrap) {
+                deploymentConfigs = new String[] {defaultDeploymentConfig};
+            } else {
+                deploymentConfigs = new String[] {};
+            }
         }
         log.debug("Deployment configs: " + Arrays.asList(deploymentConfigs));
 



Mime
View raw message