geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r697437 - in /geronimo/server/trunk: assemblies/geronimo-boilerplate/ assemblies/geronimo-boilerplate/src/main/assembly/ assemblies/geronimo-boilerplate/src/main/underlay/bin/ buildsupport/car-maven-plugin/src/main/resources/META-INF/plexus...
Date Sun, 21 Sep 2008 00:40:28 GMT
Author: djencks
Date: Sat Sep 20 17:40:28 2008
New Revision: 697437

URL: http://svn.apache.org/viewvc?rev=697437&view=rev
Log:
GERONIMO-4302 have client-system.car self-extract client.jar and the client scripts.  This
is somewhat questionable but lets see how it works

Added:
    geronimo/server/trunk/framework/configs/client-system/src/main/resources/content/
    geronimo/server/trunk/framework/configs/client-system/src/main/resources/content/client.bat
      - copied unchanged from r696695, geronimo/server/trunk/assemblies/geronimo-boilerplate/src/main/underlay/bin/client.bat
    geronimo/server/trunk/framework/configs/client-system/src/main/resources/content/client.sh
      - copied unchanged from r696695, geronimo/server/trunk/assemblies/geronimo-boilerplate/src/main/underlay/bin/client.sh
Removed:
    geronimo/server/trunk/assemblies/geronimo-boilerplate/src/main/underlay/bin/client.bat
    geronimo/server/trunk/assemblies/geronimo-boilerplate/src/main/underlay/bin/client.sh
Modified:
    geronimo/server/trunk/assemblies/geronimo-boilerplate/pom.xml
    geronimo/server/trunk/assemblies/geronimo-boilerplate/src/main/assembly/boilerplate.xml
    geronimo/server/trunk/buildsupport/car-maven-plugin/src/main/resources/META-INF/plexus/components.xml
    geronimo/server/trunk/framework/configs/client-system/pom.xml
    geronimo/server/trunk/plugingroups/framework/pom.xml

Modified: geronimo/server/trunk/assemblies/geronimo-boilerplate/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-boilerplate/pom.xml?rev=697437&r1=697436&r2=697437&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-boilerplate/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-boilerplate/pom.xml Sat Sep 20 17:40:28 2008
@@ -132,12 +132,12 @@
             <type>car</type>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>client-system</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.framework</groupId>-->
+            <!--<artifactId>client-system</artifactId>-->
+            <!--<version>${version}</version>-->
+            <!--<type>car</type>-->
+        <!--</dependency>-->
 
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>

Modified: geronimo/server/trunk/assemblies/geronimo-boilerplate/src/main/assembly/boilerplate.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-boilerplate/src/main/assembly/boilerplate.xml?rev=697437&r1=697436&r2=697437&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-boilerplate/src/main/assembly/boilerplate.xml
(original)
+++ geronimo/server/trunk/assemblies/geronimo-boilerplate/src/main/assembly/boilerplate.xml
Sat Sep 20 17:40:28 2008
@@ -71,23 +71,23 @@
             </includes>
         </dependencySet>
         
-        <dependencySet>
-            <outputDirectory>contents/lib</outputDirectory>
-            <outputFileNameMapping>jsr88-deploymentfactory.jar</outputFileNameMapping>
-            <useStrictFiltering>true</useStrictFiltering>
-            <includes>
-                <include>org.apache.geronimo.framework:jsr88-deploymentfactory</include>
-            </includes>
-        </dependencySet>
-
-        <dependencySet>
-            <outputDirectory>contents/bin</outputDirectory>
-            <outputFileNameMapping>client.jar</outputFileNameMapping>
-            <useStrictFiltering>true</useStrictFiltering>
-            <includes>
-                <include>org.apache.geronimo.framework:client-system</include>
-            </includes>
-        </dependencySet>
+        <!--<dependencySet>-->
+            <!--<outputDirectory>contents/lib</outputDirectory>-->
+            <!--<outputFileNameMapping>jsr88-deploymentfactory.jar</outputFileNameMapping>-->
+            <!--<useStrictFiltering>true</useStrictFiltering>-->
+            <!--<includes>-->
+                <!--<include>org.apache.geronimo.framework:jsr88-deploymentfactory</include>-->
+            <!--</includes>-->
+        <!--</dependencySet>-->
+
+        <!--<dependencySet>-->
+            <!--<outputDirectory>contents/bin</outputDirectory>-->
+            <!--<outputFileNameMapping>client.jar</outputFileNameMapping>-->
+            <!--<useStrictFiltering>true</useStrictFiltering>-->
+            <!--<includes>-->
+                <!--<include>org.apache.geronimo.framework:client-system</include>-->
+            <!--</includes>-->
+        <!--</dependencySet>-->
 
         <dependencySet>
             <outputDirectory>contents/bin</outputDirectory>

Modified: geronimo/server/trunk/buildsupport/car-maven-plugin/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/buildsupport/car-maven-plugin/src/main/resources/META-INF/plexus/components.xml?rev=697437&r1=697436&r2=697437&view=diff
==============================================================================
--- geronimo/server/trunk/buildsupport/car-maven-plugin/src/main/resources/META-INF/plexus/components.xml
(original)
+++ geronimo/server/trunk/buildsupport/car-maven-plugin/src/main/resources/META-INF/plexus/components.xml
Sat Sep 20 17:40:28 2008
@@ -22,7 +22,7 @@
 
 <component-set>
     <components>
-        
+
         <!--
         Deprecated, use geronimo-module instead.
         -->
@@ -41,11 +41,11 @@
                             <compile>
                                 org.apache.geronimo.buildsupport:car-maven-plugin:validate-configuration,
                                 org.apache.geronimo.buildsupport:car-maven-plugin:prepare-plan,
-                                org.apache.geronimo.buildsupport:car-maven-plugin:verify-no-dependency-change
+                                org.apache.geronimo.buildsupport:car-maven-plugin:verify-no-dependency-change,
+                                org.apache.geronimo.buildsupport:car-maven-plugin:package,
+                                org.apache.geronimo.buildsupport:car-maven-plugin:prepare-metadata
                             </compile>
                             <package>
-                                org.apache.geronimo.buildsupport:car-maven-plugin:package,
-                                org.apache.geronimo.buildsupport:car-maven-plugin:prepare-metadata,
                                 org.apache.geronimo.buildsupport:car-maven-plugin:archive-car
                             </package>
                             <install>
@@ -60,12 +60,12 @@
                 </lifecycles>
             </configuration>
         </component>
-        
+
         <!--
         FIXME: For some crazy reason, when the following are enabled it causes other packagings
                picked up from tools-maven-plugin to now configure their artifact handlers?!?!!
         -->
-        
+
         <!--
         Custom packaging for geronimo modules.
         -->
@@ -90,7 +90,7 @@
             </configuration>
         </component>
         -->
-        
+
         <!--
         Install geronimo-module artifact files as .car files
         -->
@@ -108,7 +108,7 @@
             </configuration>
         </component>
         -->
-        
+
         <!--
         Custom packaging for server assembly modules.
         -->
@@ -123,6 +123,12 @@
                         <phases>
                             <process-resources>org.apache.maven.plugins:maven-resources-plugin:resources</process-resources>
                             <compile>org.apache.geronimo.buildsupport:car-maven-plugin:install-modules</compile>
+                            <!-- possible way to track assembly content changes
+                            <compile>
+                                org.apache.geronimo.buildsupport:car-maven-plugin:verify-no-dependency-change,
+                                org.apache.geronimo.buildsupport:car-maven-plugin:install-modules
+                            </compile>
+                            -->
                             <package>org.apache.geronimo.buildsupport:car-maven-plugin:archive</package>
                             <install>org.apache.maven.plugins:maven-install-plugin:install</install>
                             <deploy>org.apache.maven.plugins:maven-deploy-plugin:deploy</deploy>

Modified: geronimo/server/trunk/framework/configs/client-system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/client-system/pom.xml?rev=697437&r1=697436&r2=697437&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/client-system/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/client-system/pom.xml Sat Sep 20 17:40:28 2008
@@ -109,6 +109,33 @@
     <build>
         <plugins>
             <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>compile</phase>
+                        <id>create-startup-jar</id>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <tasks>
+                                <copy toDir="${project.build.directory}/resources/META-INF">
+                                    <fileset dir="${project.build.directory}/repository"
includes="**/META-INF/**"/>
+                                    <flattenmapper/>
+                                </copy>
+                                <mkdir dir="${project.build.directory}/resources/content"/>
+                                <jar destfile="${project.build.directory}/resources/content/client.jar">
+                                    <fileset dir="${project.build.directory}/resources"
includes="META-INF/**"/>
+                                    <fileset dir="${project.build.directory}/classes"
includes="META-INF/**"/>
+                                </jar>
+                            </tasks>
+                        </configuration>
+                    </execution>
+
+                </executions>
+            </plugin>
+            <plugin>
                 <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
@@ -197,6 +224,7 @@
                             <config-xml-content load="false"/>
                             <artifact-alias server="client" key="org.apache.geronimo.framework/j2ee-system//car">org.apache.geronimo.framework/client-system/${version}/car</artifact-alias>
                             <artifact-alias server="client" key="org.apache.geronimo.framework/j2ee-system/${version}/car">org.apache.geronimo.framework/client-system/${version}/car</artifact-alias>
+                            <copy-file dest-dir="bin/">content/</copy-file>
                         </plugin-artifact>
                     </instance>
 

Modified: geronimo/server/trunk/plugingroups/framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/framework/pom.xml?rev=697437&r1=697436&r2=697437&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/framework/pom.xml (original)
+++ geronimo/server/trunk/plugingroups/framework/pom.xml Sat Sep 20 17:40:28 2008
@@ -79,13 +79,6 @@
 
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>client-system</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>rmi-naming</artifactId>
             <version>${version}</version>
             <type>car</type>
@@ -118,6 +111,14 @@
             <version>${version}</version>
             <type>car</type>
         </dependency>
+        <!-- not really part of framework -->
+        <dependency>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>client-system</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+
     </dependencies>
 
 </project>



Mime
View raw message