geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r575194 - in /geronimo/server/trunk/assemblies: geronimo-boilerplate-minimal/pom.xml geronimo-boilerplate-minimal/src/main/assembly/boilerplate.xml geronimo-framework/pom.xml geronimo-framework/src/main/assembly/bin.xml
Date Thu, 13 Sep 2007 07:04:24 GMT
Author: jdillon
Date: Thu Sep 13 00:04:23 2007
New Revision: 575194

URL: http://svn.apache.org/viewvc?rev=575194&view=rev
Log:
Fixed things up so that the framework assembly can boot up

Modified:
    geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/pom.xml
    geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/assembly/boilerplate.xml
    geronimo/server/trunk/assemblies/geronimo-framework/pom.xml
    geronimo/server/trunk/assemblies/geronimo-framework/src/main/assembly/bin.xml

Modified: geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/pom.xml?rev=575194&r1=575193&r2=575194&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/pom.xml Thu Sep 13 00:04:23
2007
@@ -44,6 +44,12 @@
         <!-- lib/gshell Dependencies -->
         
         <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-commands</artifactId>
+            <version>${version}</version>
+        </dependency>
+        
+        <dependency>
             <groupId>org.apache.geronimo.gshell</groupId>
             <artifactId>gshell-bootstrap</artifactId>
         </dependency>
@@ -280,7 +286,7 @@
                             <tasks>
                                 <mkdir dir="${project.build.directory}/classes"/>
                                 <copy todir="${project.build.directory}/classes">
-                                    <fileset dir="${project.build.directory}/${project.build.finalName}/${project.build.finalName}">
+                                    <fileset dir="${project.build.directory}/${project.build.finalName}.dir/${project.build.finalName}">
                                         <include name="**"/>
                                     </fileset>
                                 </copy>
@@ -293,6 +299,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
+                <version>2.2-beta-1</version>
                 <executions>
                     <execution>
                         <id>boilerplate</id>

Modified: geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/assembly/boilerplate.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/assembly/boilerplate.xml?rev=575194&r1=575193&r2=575194&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/assembly/boilerplate.xml
(original)
+++ geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/assembly/boilerplate.xml
Thu Sep 13 00:04:23 2007
@@ -31,35 +31,25 @@
     <dependencySets>
         <dependencySet>
             <outputDirectory>lib/gshell</outputDirectory>
+            <useTransitiveFiltering>true</useTransitiveFiltering>
+            <useStrictFiltering>true</useStrictFiltering>
             <includes>
-                <include>org.slf4j:slf4j-api</include>
-                <include>org.slf4j:slf4j-log4j12</include>
-                <include>org.slf4j:jcl104-over-slf4j</include>
                 <include>org.apache.geronimo.gshell:gshell-command-api</include>
-                <include>org.apache.geronimo.gshell:gshell-cli</include>
                 <include>org.apache.geronimo.gshell:gshell-core</include>
-                <include>org.apache.geronimo.gshell:gshell-parser</include>
-                <include>org.apache.geronimo.gshell.support:gshell-ansi</include>
-                <include>org.apache.geronimo.gshell.support:gshell-clp</include>
-                <include>org.apache.geronimo.gshell.support:gshell-prefs</include>
-                <include>org.apache.geronimo.gshell.support:gshell-i18n</include>
-                <include>org.apache.geronimo.gshell.support:gshell-common</include>
-                <include>org.apache.geronimo.gshell:gshell-diet-log4j</include>
+                <include>org.apache.geronimo.gshell:gshell-cli</include>
                 <include>org.apache.geronimo.gshell.commands:gshell-builtins</include>
-                <include>org.codehaus.plexus:plexus-utils</include>
-                <include>org.codehaus.plexus:plexus-component-api</include>
-                <include>org.codehaus.plexus:plexus-container-default</include>
-                <include>org.codehaus.plexus:plexus-expression-evaluator</include>
-                <include>jline:jline</include>
-                <include>com.thoughtworks.xstream:xstream</include>
                 <include>org.codehaus.groovy:groovy-all</include>
                 <include>org.apache.ant:ant</include>
                 <include>org.apache.ant:ant-launcher</include>
+                <include>org.slf4j:slf4j-log4j12</include>
+                <include>org.slf4j:jcl104-over-slf4j</include>
+                <include>org.apache.geronimo.modules:geronimo-commands</include>
             </includes>
         </dependencySet>
 
         <dependencySet>
             <outputDirectory>lib/boot</outputDirectory>
+            <useStrictFiltering>true</useStrictFiltering>
             <includes>
                 <include>org.codehaus.plexus:plexus-classworlds</include>
             </includes>
@@ -67,6 +57,7 @@
         
         <dependencySet>
             <outputDirectory>lib/boot</outputDirectory>
+            <useStrictFiltering>true</useStrictFiltering>
             <!-- Strip off the version number to keep platform scripts simpler. -->
             <outputFileNameMapping>gshell-bootstrap.jar</outputFileNameMapping>
             <includes>
@@ -76,17 +67,19 @@
         
         <dependencySet>
             <outputDirectory>lib</outputDirectory>
+            <useStrictFiltering>true</useStrictFiltering>
             <includes>
                 <include>asm:asm</include>
                 <include>asm:asm-commons</include>
                 <include>cglib:cglib-nodep</include>
                 <include>commons-cli:commons-cli</include>
+                <include>commons-logging:commons-logging</include>
                 <include>log4j:log4j</include>
                 <include>xpp3:xpp3</include>
                 <include>xstream:xstream</include>
                 <include>javax.xml.bind:jaxb-api</include>
                 <include>com.sun.xml.bind:jaxb-impl</include>
-                <include>woodstox:xstx-asl</include>
+                <include>woodstox:wstx-asl</include>
                 <include>org.apache.geronimo.modules:geronimo-cli</include>
                 <include>org.apache.geronimo.modules:geronimo-kernel</include>
                 <include>org.apache.geronimo.modules:geronimo-deploy-jsr88-bootstrapper</include>

Modified: geronimo/server/trunk/assemblies/geronimo-framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-framework/pom.xml?rev=575194&r1=575193&r2=575194&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-framework/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-framework/pom.xml Thu Sep 13 00:04:23 2007
@@ -30,7 +30,7 @@
     </parent>
 
     <artifactId>geronimo-framework</artifactId>
-    <name>Geronimo Assemblies :: Minimal Framework</name>
+    <name>Geronimo Assemblies :: Framework</name>
     <packaging>application-assembly</packaging>
     
     <description>
@@ -43,6 +43,7 @@
             <groupId>org.apache.geronimo.assemblies</groupId>
             <artifactId>geronimo-boilerplate-minimal</artifactId>
             <version>${version}</version>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
@@ -73,20 +74,6 @@
             <type>car</type>
         </dependency>
 
-        <!--<dependency>-->
-            <!--<groupId>org.apache.geronimo.configs</groupId>-->
-            <!--<artifactId>geronimo-gbean-deployer</artifactId>-->
-            <!--<version>${version}</version>-->
-            <!--<type>car</type>-->
-        <!--</dependency>-->
-        <!---->
-        <!--<dependency>-->
-            <!--<groupId>org.apache.geronimo.configs</groupId>-->
-            <!--<artifactId>connector-deployer</artifactId>-->
-            <!--<version>${version}</version>-->
-            <!--<type>car</type>-->
-        <!--</dependency>-->
-        
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>shutdown</artifactId>
@@ -121,28 +108,6 @@
             <version>${version}</version>
             <type>car</type>
         </dependency>
- 
-        <!--<dependency>-->
-            <!--<groupId>org.apache.geronimo.configs</groupId>-->
-            <!--<artifactId>unavailable-client-deployer</artifactId>-->
-            <!--<version>${version}</version>-->
-            <!--<type>car</type>-->
-        <!--</dependency>-->
-        <!---->
-        <!--<dependency>-->
-            <!--<groupId>org.apache.geronimo.configs</groupId>-->
-            <!--<artifactId>unavailable-webservices-deployer</artifactId>-->
-            <!--<version>${version}</version>-->
-            <!--<type>car</type>-->
-        <!--</dependency>-->
-        <!---->
-        <!--<dependency>-->
-            <!--<groupId>org.apache.geronimo.configs</groupId>-->
-            <!--<artifactId>unavailable-ejb-deployer</artifactId>-->
-            <!--<version>${version}</version>-->
-            <!--<type>car</type>-->
-        <!--</dependency>-->
-        <!---->
     </dependencies>
     
     <build>
@@ -160,7 +125,7 @@
                 <executions>
                     <execution>
                         <id>unpack-boilerplate</id>
-                        <phase>package</phase>
+                        <phase>generate-resources</phase>
                         <goals>
                             <goal>unpack</goal>
                         </goals>
@@ -178,7 +143,7 @@
                     
                     <execution>
                         <id>unpack-schemas</id>
-                        <phase>package</phase>
+                        <phase>generate-resources</phase>
                         <goals>
                             <goal>unpack</goal>
                         </goals>
@@ -195,7 +160,7 @@
                                     <version>${version}</version>
                                 </artifactItem>
                             </artifactItems>
-                            <outputDirectory>${project.build.directory}/scratch/schema</outputDirectory>
+                            <outputDirectory>${project.build.directory}/schema</outputDirectory>
                         </configuration>
                     </execution>
                 </executions>
@@ -206,31 +171,21 @@
                 <artifactId>maven-antrun-plugin</artifactId>
                 <executions>
                     <execution>
-                        <id>pre-assembly</id>
-                        <phase>package</phase>
+                        <id>flatten-schemas</id>
+                        <phase>process-resources</phase>
                         <goals>
                             <goal>run</goal>
                         </goals>
                         <configuration>
                             <tasks>
-                                <!-- Flatten all schemas -->
-                                <mkdir dir="${project.build.directory}/schema"/>
-                                <copy todir="${project.build.directory}/schema">
-                                    <fileset dir="${project.build.directory}/scratch/schema">
+                                <mkdir dir="${project.build.directory}/classes/schema"/>
+                                <copy todir="${project.build.directory}/classes/schema">
+                                    <fileset dir="${project.build.directory}/schema">
                                         <include name="**/*.xsd"/>
                                         <include name="**/*.dtd"/>
                                     </fileset>
                                     <mapper type="flatten"/>
                                 </copy>
-                                
-                                <!-- Move filtered files -->
-                                <move todir="${project.build.directory}/scratch">
-                                    <fileset dir="${project.build.directory}/classes">
-                                        <include name="config.xml"/>
-                                        <include name="offline-deployer-config.xml"/>
-                                        <include name="jsr88-configurer-config.xml"/>
-                                    </fileset>
-                                </move>
                             </tasks>
                         </configuration>
                     </execution>
@@ -242,7 +197,7 @@
                 <artifactId>car-maven-plugin</artifactId>
                 <executions>
                     <execution>
-                        <phase>package</phase>
+                        <phase>compile</phase>
                         <goals>
                             <goal>install-modules</goal>
                         </goals>

Modified: geronimo/server/trunk/assemblies/geronimo-framework/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-framework/src/main/assembly/bin.xml?rev=575194&r1=575193&r2=575194&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-framework/src/main/assembly/bin.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-framework/src/main/assembly/bin.xml Thu Sep
13 00:04:23 2007
@@ -24,26 +24,11 @@
     <formats>
         <format>zip</format>
         <format>tar.gz</format>
-        
-        <!--
-        
-        HACK: Turn off bz2 for now, it takes too long to generate.
-        
-        <format>tar.bz2</format>
-        -->
     </formats>
 
     <includeBaseDirectory>true</includeBaseDirectory>
 
     <dependencySets>
-        <!--
-        NOTE: lib/ is picked up from boilerplate.
-        -->
-        
-        <!--
-        NOTE: lib/endorsed/ is picked up from boilerplate.
-        -->
-        
         <dependencySet>
             <outputDirectory>bin</outputDirectory>
             <outputFileNameMapping>server.jar</outputFileNameMapping>
@@ -121,8 +106,13 @@
             <directory>target/boilerplate/bin</directory>
             <outputDirectory>bin</outputDirectory>
             <includes>
-                <include>*.sh</include>
+                <include>*</include>
             </includes>
+            <excludes>
+                <exclude>*.bat</exclude>
+                <exclude>*.cmd</exclude>
+                <exclude>*.txt</exclude>
+            </excludes>
             <lineEnding>unix</lineEnding>
             <fileMode>0755</fileMode>
         </fileSet>
@@ -132,6 +122,7 @@
             <outputDirectory>bin</outputDirectory>
             <includes>
                 <include>*.bat</include>
+                <include>*.cmd</include>
                 <include>*.txt</include>
             </includes>
             <lineEnding>dos</lineEnding>
@@ -140,9 +131,6 @@
         <fileSet>
             <directory>target/classes</directory>
             <outputDirectory>/</outputDirectory>
-            <includes>
-                <include>var/config/**</include>
-            </includes>
         </fileSet>
         
         <!--



Mime
View raw message