geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r575239 - in /geronimo/server/trunk/assemblies: ./ geronimo-boilerplate-javaee5/ geronimo-boilerplate-javaee5/src/main/assembly/ geronimo-boilerplate-minimal/ geronimo-boilerplate-minimal/src/main/assembly/ geronimo-boilerplate-minimal/src/...
Date Thu, 13 Sep 2007 09:32:14 GMT
Author: jdillon
Date: Thu Sep 13 02:32:13 2007
New Revision: 575239

URL: http://svn.apache.org/viewvc?rev=575239&view=rev
Log:
Fix up some more assembly issues for using gsh

Added:
    geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/underlay/etc/META-INF/
    geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/underlay/etc/META-INF/plexus/
    geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/underlay/etc/META-INF/plexus/plexus.xml   (with props)
Modified:
    geronimo/server/trunk/assemblies/geronimo-boilerplate-javaee5/pom.xml
    geronimo/server/trunk/assemblies/geronimo-boilerplate-javaee5/src/main/assembly/boilerplate.xml
    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
    geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5/pom.xml
    geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5/src/main/assembly/bin.xml
    geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/pom.xml
    geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/src/main/assembly/bin.xml
    geronimo/server/trunk/assemblies/geronimo-tomcat6-javaee5/pom.xml
    geronimo/server/trunk/assemblies/geronimo-tomcat6-javaee5/src/main/assembly/bin.xml
    geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/pom.xml
    geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/src/main/assembly/bin.xml
    geronimo/server/trunk/assemblies/pom.xml

Modified: geronimo/server/trunk/assemblies/geronimo-boilerplate-javaee5/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-boilerplate-javaee5/pom.xml?rev=575239&r1=575238&r2=575239&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-boilerplate-javaee5/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-boilerplate-javaee5/pom.xml Thu Sep 13 02:32:13 2007
@@ -192,7 +192,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>

Modified: geronimo/server/trunk/assemblies/geronimo-boilerplate-javaee5/src/main/assembly/boilerplate.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-boilerplate-javaee5/src/main/assembly/boilerplate.xml?rev=575239&r1=575238&r2=575239&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-boilerplate-javaee5/src/main/assembly/boilerplate.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-boilerplate-javaee5/src/main/assembly/boilerplate.xml Thu Sep 13 02:32:13 2007
@@ -41,6 +41,7 @@
     <dependencySets>
         <dependencySet>
             <outputDirectory>lib</outputDirectory>
+            <useStrictFiltering>true</useStrictFiltering>
             <includes>
                 <include>org.apache.geronimo.modules:geronimo-transformer</include>
             </includes>

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=575239&r1=575238&r2=575239&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/pom.xml Thu Sep 13 02:32:13 2007
@@ -56,12 +56,12 @@
         
         <dependency>
             <groupId>org.apache.geronimo.gshell</groupId>
-            <artifactId>gshell-core</artifactId>
+            <artifactId>gshell-cli</artifactId>
         </dependency>
         
         <dependency>
             <groupId>org.apache.geronimo.gshell</groupId>
-            <artifactId>gshell-cli</artifactId>
+            <artifactId>gshell-embeddable</artifactId>
         </dependency>
         
         <dependency>
@@ -74,11 +74,6 @@
             <artifactId>jcl104-over-slf4j</artifactId>
         </dependency>
         
-        <dependency>
-            <groupId>org.apache.geronimo.gshell.commands</groupId>
-            <artifactId>gshell-builtins</artifactId>
-        </dependency>
-        
         <!-- lib Dependencies -->
         
         <dependency>
@@ -178,6 +173,23 @@
             <groupId>org.apache.yoko</groupId>
             <artifactId>yoko-rmi-spec</artifactId>
         </dependency>
+        
+        <!-- bin Dependencies (executable jars) -->
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>j2ee-system</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>shutdown</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+        
     </dependencies>
     
     <build>

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=575239&r1=575238&r2=575239&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 02:32:13 2007
@@ -31,19 +31,16 @@
     <dependencySets>
         <dependencySet>
             <outputDirectory>lib/gshell</outputDirectory>
-            <useTransitiveFiltering>true</useTransitiveFiltering>
             <useStrictFiltering>true</useStrictFiltering>
             <includes>
-                <include>org.apache.geronimo.gshell:gshell-command-api</include>
-                <include>org.apache.geronimo.gshell:gshell-core</include>
+                <include>org.apache.geronimo.modules:geronimo-commands</include>
+                <include>org.apache.geronimo.gshell:gshell-embeddable</include>
                 <include>org.apache.geronimo.gshell:gshell-cli</include>
-                <include>org.apache.geronimo.gshell.commands:gshell-builtins</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>
 
@@ -88,9 +85,23 @@
             </includes>
         </dependencySet>
         
-        <!--
-        FIXME: Should probably include the basic executable bin/*.jar files here
-        -->
+        <dependencySet>
+            <outputDirectory>bin</outputDirectory>
+            <outputFileNameMapping>server.jar</outputFileNameMapping>
+            <useStrictFiltering>true</useStrictFiltering>
+            <includes>
+                <include>org.apache.geronimo.configs:j2ee-system</include>
+            </includes>
+        </dependencySet>
+
+        <dependencySet>
+            <outputDirectory>bin</outputDirectory>
+            <outputFileNameMapping>shutdown.jar</outputFileNameMapping>
+            <useStrictFiltering>true</useStrictFiltering>
+            <includes>
+                <include>org.apache.geronimo.configs:shutdown</include>
+            </includes>
+        </dependencySet>
     </dependencySets>
 
 </assembly>

Added: geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/underlay/etc/META-INF/plexus/plexus.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/underlay/etc/META-INF/plexus/plexus.xml?rev=575239&view=auto
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/underlay/etc/META-INF/plexus/plexus.xml (added)
+++ geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/underlay/etc/META-INF/plexus/plexus.xml Thu Sep 13 02:32:13 2007
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<plexus>
+    <components>
+        <!--
+        Configure the branding to use.
+        -->
+        <component>
+            <role>org.apache.geronimo.gshell.branding.Branding</role>
+            <role-hint>default</role-hint>
+            <implementation>org.apache.geronimo.commands.GeronimoBranding</implementation>
+            <instantiation-strategy>singleton</instantiation-strategy>
+            <requirements>
+                <!--
+                <requirement>
+                    <role>org.apache.geronimo.gshell.branding.VersionLoader</role>
+                    <role-hint>default</role-hint>
+                    <field-name>versionLoader</field-name>
+                </requirement>
+                -->
+                <requirement>
+                    <role>jline.Terminal</role>
+                    <role-hint>default</role-hint>
+                    <field-name>terminal</field-name>
+                </requirement>
+            </requirements>
+        </component>
+    </components>
+</plexus>

Propchange: geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/underlay/etc/META-INF/plexus/plexus.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/underlay/etc/META-INF/plexus/plexus.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/underlay/etc/META-INF/plexus/plexus.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: geronimo/server/trunk/assemblies/geronimo-framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-framework/pom.xml?rev=575239&r1=575238&r2=575239&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-framework/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-framework/pom.xml Thu Sep 13 02:32:13 2007
@@ -38,7 +38,6 @@
     </description>
     
     <dependencies>
-        
         <dependency>
             <groupId>org.apache.geronimo.assemblies</groupId>
             <artifactId>geronimo-boilerplate-minimal</artifactId>
@@ -49,6 +48,20 @@
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-system</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>client-system</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>upgrade-cli</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>

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=575239&r1=575238&r2=575239&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 02:32:13 2007
@@ -29,6 +29,7 @@
     <includeBaseDirectory>true</includeBaseDirectory>
 
     <dependencySets>
+        <!--
         <dependencySet>
             <outputDirectory>bin</outputDirectory>
             <outputFileNameMapping>server.jar</outputFileNameMapping>
@@ -36,10 +37,12 @@
                 <include>org.apache.geronimo.configs:j2ee-system</include>
             </includes>
         </dependencySet>
+        -->
         
         <dependencySet>
             <outputDirectory>bin</outputDirectory>
             <outputFileNameMapping>client.jar</outputFileNameMapping>
+            <useStrictFiltering>true</useStrictFiltering>
             <includes>
                 <include>org.apache.geronimo.configs:client-system</include>
             </includes>
@@ -48,6 +51,7 @@
         <dependencySet>
             <outputDirectory>bin</outputDirectory>
             <outputFileNameMapping>deployer.jar</outputFileNameMapping>
+            <useStrictFiltering>true</useStrictFiltering>
             <includes>
                 <include>org.apache.geronimo.configs:online-deployer</include>
             </includes>
@@ -56,11 +60,13 @@
         <dependencySet>
             <outputDirectory>lib</outputDirectory>
             <outputFileNameMapping>jsr88-deploymentfactory.jar</outputFileNameMapping>
+            <useStrictFiltering>true</useStrictFiltering>
             <includes>
                 <include>org.apache.geronimo.configs:jsr88-deploymentfactory</include>
             </includes>
         </dependencySet>
 
+        <!--
         <dependencySet>
             <outputDirectory>bin</outputDirectory>
             <outputFileNameMapping>shutdown.jar</outputFileNameMapping>
@@ -68,10 +74,12 @@
                 <include>org.apache.geronimo.configs:shutdown</include>
             </includes>
         </dependencySet>
+        -->
         
         <dependencySet>
             <outputDirectory>bin</outputDirectory>
             <outputFileNameMapping>upgrade.jar</outputFileNameMapping>
+            <useStrictFiltering>true</useStrictFiltering>
             <includes>
                 <include>org.apache.geronimo.configs:upgrade-cli</include>
             </includes>

Modified: geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5/pom.xml?rev=575239&r1=575238&r2=575239&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5/pom.xml Thu Sep 13 02:32:13 2007
@@ -38,7 +38,13 @@
     </description>
 
     <dependencies>
-
+        <dependency>
+            <groupId>org.apache.geronimo.assemblies</groupId>
+            <artifactId>geronimo-boilerplate-javaee5</artifactId>
+            <version>${version}</version>
+            <scope>provided</scope>
+        </dependency>
+        
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>transformer-agent</artifactId>
@@ -135,24 +141,6 @@
             <type>car</type>
         </dependency>
 
-<!--
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>directory</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
--->
-
-<!--
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>ldap-realm</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
--->
-
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>system-database</artifactId>
@@ -386,6 +374,13 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>upgrade-cli</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>sharedlib</artifactId>
             <version>${version}</version>
             <type>car</type>
@@ -439,7 +434,12 @@
             <version>${version}</version>
             <type>car</type>
         </dependency>
-
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-jaxws-builder</artifactId>
+            <version>${version}</version>
+        </dependency>
     </dependencies>
 
     <build>
@@ -465,7 +465,7 @@
                             <artifactItems>
                                 <artifactItem>
                                     <groupId>org.apache.geronimo.assemblies</groupId>
-                                    <artifactId>geronimo-boilerplate-jee5</artifactId>
+                                    <artifactId>geronimo-boilerplate-javaee5</artifactId>
                                     <version>${version}</version>
                                 </artifactItem>
                             </artifactItems>
@@ -490,25 +490,6 @@
                             <outputDirectory>${project.build.directory}/scratch/schema</outputDirectory>
                         </configuration>
                     </execution>
-
-                    <execution>
-                        <id>install-lib</id>
-                        <phase>compile</phase>
-                        <goals>
-                            <goal>copy</goal>
-                        </goals>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>org.apache.geronimo.modules</groupId>
-                                    <artifactId>geronimo-jaxws-builder</artifactId>
-                                    <version>${version}</version>
-                                </artifactItem>
-                            </artifactItems>
-                            <outputDirectory>${project.build.directory}/classes/lib</outputDirectory>
-                        </configuration>
-                    </execution>
-
                 </executions>
             </plugin>
 

Modified: geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5/src/main/assembly/bin.xml?rev=575239&r1=575238&r2=575239&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5/src/main/assembly/bin.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5/src/main/assembly/bin.xml Thu Sep 13 02:32:13 2007
@@ -24,45 +24,43 @@
     <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>lib</outputDirectory>
+            <useStrictFiltering>true</useStrictFiltering>
+            <includes>
+                <include>org.apache.geronimo.modules:geronimo-jaxws-builder</include>
+            </includes>
+        </dependencySet>
         
         <dependencySet>
             <outputDirectory>bin</outputDirectory>
             <outputFileNameMapping>jpa.jar</outputFileNameMapping>
+            <useStrictFiltering>true</useStrictFiltering>
             <includes>
                 <include>org.apache.geronimo.configs:transformer-agent</include>
             </includes>
         </dependencySet>
-
+        
+        <!--
         <dependencySet>
             <outputDirectory>bin</outputDirectory>
             <outputFileNameMapping>server.jar</outputFileNameMapping>
+            <useStrictFiltering>true</useStrictFiltering>
             <includes>
                 <include>org.apache.geronimo.configs:j2ee-system</include>
             </includes>
         </dependencySet>
-
+        -->
+        
         <dependencySet>
             <outputDirectory>bin</outputDirectory>
             <outputFileNameMapping>client.jar</outputFileNameMapping>
+            <useStrictFiltering>true</useStrictFiltering>
             <includes>
                 <include>org.apache.geronimo.configs:client-system</include>
             </includes>
@@ -71,6 +69,7 @@
         <dependencySet>
             <outputDirectory>bin</outputDirectory>
             <outputFileNameMapping>deployer.jar</outputFileNameMapping>
+            <useStrictFiltering>true</useStrictFiltering>
             <includes>
                 <include>org.apache.geronimo.configs:online-deployer</include>
             </includes>
@@ -79,22 +78,27 @@
         <dependencySet>
             <outputDirectory>lib</outputDirectory>
             <outputFileNameMapping>jsr88-deploymentfactory.jar</outputFileNameMapping>
+            <useStrictFiltering>true</useStrictFiltering>
             <includes>
                 <include>org.apache.geronimo.configs:jsr88-deploymentfactory</include>
             </includes>
         </dependencySet>
         
+        <!--
         <dependencySet>
             <outputDirectory>bin</outputDirectory>
             <outputFileNameMapping>shutdown.jar</outputFileNameMapping>
+            <useStrictFiltering>true</useStrictFiltering>
             <includes>
                 <include>org.apache.geronimo.configs:shutdown</include>
             </includes>
         </dependencySet>
+        -->
         
         <dependencySet>
             <outputDirectory>bin</outputDirectory>
             <outputFileNameMapping>upgrade.jar</outputFileNameMapping>
+            <useStrictFiltering>true</useStrictFiltering>
             <includes>
                 <include>org.apache.geronimo.configs:upgrade-cli</include>
             </includes>
@@ -103,6 +107,7 @@
         <dependencySet>
             <outputDirectory>bin</outputDirectory>
             <outputFileNameMapping>jaxws-tools.jar</outputFileNameMapping>
+            <useStrictFiltering>true</useStrictFiltering>
             <includes>
                 <include>org.apache.geronimo.configs:jaxws-deployer</include>
             </includes>
@@ -138,8 +143,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>
@@ -149,6 +159,33 @@
             <outputDirectory>bin</outputDirectory>
             <includes>
                 <include>*.bat</include>
+                <include>*.cmd</include>
+                <include>*.txt</include>
+            </includes>
+            <lineEnding>dos</lineEnding>
+        </fileSet>
+        
+        <fileSet>
+            <directory>src/main/resources/bin</directory>
+            <outputDirectory>bin</outputDirectory>
+            <includes>
+                <include>*</include>
+            </includes>
+            <excludes>
+                <exclude>*.bat</exclude>
+                <exclude>*.cmd</exclude>
+                <exclude>*.txt</exclude>
+            </excludes>
+            <lineEnding>unix</lineEnding>
+            <fileMode>0755</fileMode>
+        </fileSet>
+        
+        <fileSet>
+            <directory>src/main/resources/bin</directory>
+            <outputDirectory>bin</outputDirectory>
+            <includes>
+                <include>*.bat</include>
+                <include>*.cmd</include>
                 <include>*.txt</include>
             </includes>
             <lineEnding>dos</lineEnding>
@@ -173,34 +210,6 @@
             <includes>
                 <include>var/config/config.xml</include>
             </includes>
-        </fileSet>
-
-        <fileSet>
-            <directory>target/classes/lib</directory>
-            <outputDirectory>lib</outputDirectory>
-            <includes>
-                <include>*.jar</include>
-            </includes>
-        </fileSet>
-
-        <fileSet>
-            <directory>src/main/resources/bin</directory>
-            <outputDirectory>bin</outputDirectory>
-            <includes>
-                <include>*.sh</include>
-            </includes>
-            <lineEnding>unix</lineEnding>
-            <fileMode>0755</fileMode>
-        </fileSet>
-        
-        <fileSet>
-            <directory>src/main/resources/bin</directory>
-            <outputDirectory>bin</outputDirectory>
-            <includes>
-                <include>*.bat</include>
-                <include>*.txt</include>
-            </includes>
-            <lineEnding>dos</lineEnding>
         </fileSet>
     </fileSets>
 

Modified: geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/pom.xml?rev=575239&r1=575238&r2=575239&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/pom.xml Thu Sep 13 02:32:13 2007
@@ -38,6 +38,12 @@
     </description>
     
     <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.assemblies</groupId>
+            <artifactId>geronimo-boilerplate-minimal</artifactId>
+            <version>${version}</version>
+            <scope>provided</scope>
+        </dependency>
         
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
@@ -48,6 +54,20 @@
         
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>client-system</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>upgrade-cli</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>rmi-naming</artifactId>
             <version>${version}</version>
             <type>car</type>
@@ -206,7 +226,6 @@
             <version>${version}</version>
             <type>car</type>
         </dependency>
-        
     </dependencies>
     
     <build>

Modified: geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/src/main/assembly/bin.xml?rev=575239&r1=575238&r2=575239&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/src/main/assembly/bin.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/src/main/assembly/bin.xml Thu Sep 13 02:32:13 2007
@@ -24,26 +24,12 @@
     <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>
@@ -51,10 +37,12 @@
                 <include>org.apache.geronimo.configs:j2ee-system</include>
             </includes>
         </dependencySet>
+        -->
         
         <dependencySet>
             <outputDirectory>bin</outputDirectory>
             <outputFileNameMapping>client.jar</outputFileNameMapping>
+            <useStrictFiltering>true</useStrictFiltering>
             <includes>
                 <include>org.apache.geronimo.configs:client-system</include>
             </includes>
@@ -63,6 +51,7 @@
         <dependencySet>
             <outputDirectory>bin</outputDirectory>
             <outputFileNameMapping>deployer.jar</outputFileNameMapping>
+            <useStrictFiltering>true</useStrictFiltering>
             <includes>
                 <include>org.apache.geronimo.configs:online-deployer</include>
             </includes>
@@ -71,11 +60,13 @@
         <dependencySet>
             <outputDirectory>lib</outputDirectory>
             <outputFileNameMapping>jsr88-deploymentfactory.jar</outputFileNameMapping>
+            <useStrictFiltering>true</useStrictFiltering>
             <includes>
                 <include>org.apache.geronimo.configs:jsr88-deploymentfactory</include>
             </includes>
         </dependencySet>
         
+        <!--
         <dependencySet>
             <outputDirectory>bin</outputDirectory>
             <outputFileNameMapping>shutdown.jar</outputFileNameMapping>
@@ -83,10 +74,12 @@
                 <include>org.apache.geronimo.configs:shutdown</include>
             </includes>
         </dependencySet>
+        -->
         
         <dependencySet>
             <outputDirectory>bin</outputDirectory>
             <outputFileNameMapping>upgrade.jar</outputFileNameMapping>
+            <useStrictFiltering>true</useStrictFiltering>
             <includes>
                 <include>org.apache.geronimo.configs:upgrade-cli</include>
             </includes>
@@ -121,8 +114,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 +130,7 @@
             <outputDirectory>bin</outputDirectory>
             <includes>
                 <include>*.bat</include>
+                <include>*.cmd</include>
                 <include>*.txt</include>
             </includes>
             <lineEnding>dos</lineEnding>

Modified: geronimo/server/trunk/assemblies/geronimo-tomcat6-javaee5/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-tomcat6-javaee5/pom.xml?rev=575239&r1=575238&r2=575239&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-tomcat6-javaee5/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-tomcat6-javaee5/pom.xml Thu Sep 13 02:32:13 2007
@@ -38,7 +38,13 @@
     </description>
 
     <dependencies>
-
+        <dependency>
+            <groupId>org.apache.geronimo.assemblies</groupId>
+            <artifactId>geronimo-boilerplate-javaee5</artifactId>
+            <version>${version}</version>
+            <scope>provided</scope>
+        </dependency>
+        
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>transformer-agent</artifactId>
@@ -52,7 +58,21 @@
             <version>${version}</version>
             <type>car</type>
         </dependency>
-
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>client-system</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>upgrade-cli</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+        
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>rmi-naming</artifactId>
@@ -121,20 +141,6 @@
             <type>car</type>
         </dependency>
 
-        <!--<dependency>-->
-            <!--<groupId>org.apache.geronimo.configs</groupId>-->
-            <!--<artifactId>directory</artifactId>-->
-            <!--<version>${version}</version>-->
-            <!--<type>car</type>-->
-        <!--</dependency>-->
-
-        <!--<dependency>-->
-            <!--<groupId>org.apache.geronimo.configs</groupId>-->
-            <!--<artifactId>ldap-realm</artifactId>-->
-            <!--<version>${version}</version>-->
-            <!--<type>car</type>-->
-        <!--</dependency>-->
-
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>system-database</artifactId>
@@ -421,7 +427,6 @@
             <version>${version}</version>
             <type>car</type>
         </dependency>
-
     </dependencies>
 
     <build>
@@ -447,7 +452,7 @@
                             <artifactItems>
                                 <artifactItem>
                                     <groupId>org.apache.geronimo.assemblies</groupId>
-                                    <artifactId>geronimo-boilerplate-jee5</artifactId>
+                                    <artifactId>geronimo-boilerplate-javaee5</artifactId>
                                     <version>${version}</version>
                                 </artifactItem>
                             </artifactItems>
@@ -472,25 +477,6 @@
                             <outputDirectory>${project.build.directory}/scratch/schema</outputDirectory>
                         </configuration>
                     </execution>
-
-                    <execution>
-                        <id>install-lib</id>
-                        <phase>compile</phase>
-                        <goals>
-                            <goal>copy</goal>
-                        </goals>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>org.apache.geronimo.modules</groupId>
-                                    <artifactId>geronimo-jaxws-builder</artifactId>
-                                    <version>${version}</version>
-                                </artifactItem>
-                            </artifactItems>
-                            <outputDirectory>${project.build.directory}/classes/lib</outputDirectory>
-                        </configuration>
-                    </execution>
-
                 </executions>
             </plugin>
 

Modified: geronimo/server/trunk/assemblies/geronimo-tomcat6-javaee5/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-tomcat6-javaee5/src/main/assembly/bin.xml?rev=575239&r1=575238&r2=575239&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-tomcat6-javaee5/src/main/assembly/bin.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-tomcat6-javaee5/src/main/assembly/bin.xml Thu Sep 13 02:32:13 2007
@@ -24,34 +24,29 @@
     <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>lib</outputDirectory>
+            <useStrictFiltering>true</useStrictFiltering>
+            <includes>
+                <include>org.apache.geronimo.modules:geronimo-jaxws-builder</include>
+            </includes>
+        </dependencySet>
         
         <dependencySet>
             <outputDirectory>bin</outputDirectory>
             <outputFileNameMapping>jpa.jar</outputFileNameMapping>
+            <useStrictFiltering>true</useStrictFiltering>
             <includes>
                 <include>org.apache.geronimo.configs:transformer-agent</include>
             </includes>
         </dependencySet>
 
+        <!--
         <dependencySet>
             <outputDirectory>bin</outputDirectory>
             <outputFileNameMapping>server.jar</outputFileNameMapping>
@@ -59,10 +54,12 @@
                 <include>org.apache.geronimo.configs:j2ee-system</include>
             </includes>
         </dependencySet>
+        -->
         
         <dependencySet>
             <outputDirectory>bin</outputDirectory>
             <outputFileNameMapping>client.jar</outputFileNameMapping>
+            <useStrictFiltering>true</useStrictFiltering>
             <includes>
                 <include>org.apache.geronimo.configs:client-system</include>
             </includes>
@@ -71,6 +68,7 @@
         <dependencySet>
             <outputDirectory>bin</outputDirectory>
             <outputFileNameMapping>deployer.jar</outputFileNameMapping>
+            <useStrictFiltering>true</useStrictFiltering>
             <includes>
                 <include>org.apache.geronimo.configs:online-deployer</include>
             </includes>
@@ -79,11 +77,13 @@
         <dependencySet>
             <outputDirectory>lib</outputDirectory>
             <outputFileNameMapping>jsr88-deploymentfactory.jar</outputFileNameMapping>
+            <useStrictFiltering>true</useStrictFiltering>
             <includes>
                 <include>org.apache.geronimo.configs:jsr88-deploymentfactory</include>
             </includes>
         </dependencySet>
-
+        
+        <!--
         <dependencySet>
             <outputDirectory>bin</outputDirectory>
             <outputFileNameMapping>shutdown.jar</outputFileNameMapping>
@@ -91,10 +91,12 @@
                 <include>org.apache.geronimo.configs:shutdown</include>
             </includes>
         </dependencySet>
+        -->
         
         <dependencySet>
             <outputDirectory>bin</outputDirectory>
             <outputFileNameMapping>upgrade.jar</outputFileNameMapping>
+            <useStrictFiltering>true</useStrictFiltering>
             <includes>
                 <include>org.apache.geronimo.configs:upgrade-cli</include>
             </includes>
@@ -103,6 +105,7 @@
         <dependencySet>
             <outputDirectory>bin</outputDirectory>
             <outputFileNameMapping>jaxws-tools.jar</outputFileNameMapping>
+            <useStrictFiltering>true</useStrictFiltering>
             <includes>
                 <include>org.apache.geronimo.configs:jaxws-deployer</include>
             </includes>
@@ -138,8 +141,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>
@@ -149,6 +157,33 @@
             <outputDirectory>bin</outputDirectory>
             <includes>
                 <include>*.bat</include>
+                <include>*.cmd</include>
+                <include>*.txt</include>
+            </includes>
+            <lineEnding>dos</lineEnding>
+        </fileSet>
+        
+        <fileSet>
+            <directory>src/main/resources/bin</directory>
+            <outputDirectory>bin</outputDirectory>
+            <includes>
+                <include>*</include>
+            </includes>
+            <excludes>
+                <exclude>*.bat</exclude>
+                <exclude>*.cmd</exclude>
+                <exclude>*.txt</exclude>
+            </excludes>
+            <lineEnding>unix</lineEnding>
+            <fileMode>0755</fileMode>
+        </fileSet>
+        
+        <fileSet>
+            <directory>src/main/resources/bin</directory>
+            <outputDirectory>bin</outputDirectory>
+            <includes>
+                <include>*.bat</include>
+                <include>*.cmd</include>
                 <include>*.txt</include>
             </includes>
             <lineEnding>dos</lineEnding>
@@ -173,34 +208,6 @@
             <includes>
                 <include>var/config/config.xml</include>
             </includes>
-        </fileSet>
-
-        <fileSet>
-            <directory>target/classes/lib</directory>
-            <outputDirectory>lib</outputDirectory>
-            <includes>
-                <include>*.jar</include>
-            </includes>
-        </fileSet>
-
-        <fileSet>
-            <directory>src/main/resources/bin</directory>
-            <outputDirectory>bin</outputDirectory>
-            <includes>
-                <include>*.sh</include>
-            </includes>
-            <lineEnding>unix</lineEnding>
-            <fileMode>0755</fileMode>
-        </fileSet>
-        
-        <fileSet>
-            <directory>src/main/resources/bin</directory>
-            <outputDirectory>bin</outputDirectory>
-            <includes>
-                <include>*.bat</include>
-                <include>*.txt</include>
-            </includes>
-            <lineEnding>dos</lineEnding>
         </fileSet>
     </fileSets>
 

Modified: geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/pom.xml?rev=575239&r1=575238&r2=575239&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/pom.xml Thu Sep 13 02:32:13 2007
@@ -38,6 +38,12 @@
     </description>
     
     <dependencies>
+            <dependency>
+            <groupId>org.apache.geronimo.assemblies</groupId>
+            <artifactId>geronimo-boilerplate-minimal</artifactId>
+            <version>${version}</version>
+            <scope>provided</scope>
+        </dependency>
         
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
@@ -56,6 +62,20 @@
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-server</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>client-system</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>upgrade-cli</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>

Modified: geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/src/main/assembly/bin.xml?rev=575239&r1=575238&r2=575239&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/src/main/assembly/bin.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/src/main/assembly/bin.xml Thu Sep 13 02:32:13 2007
@@ -24,26 +24,12 @@
     <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>
@@ -51,10 +37,12 @@
                 <include>org.apache.geronimo.configs:j2ee-system</include>
             </includes>
         </dependencySet>
+        -->
         
         <dependencySet>
             <outputDirectory>bin</outputDirectory>
             <outputFileNameMapping>client.jar</outputFileNameMapping>
+            <useStrictFiltering>true</useStrictFiltering>
             <includes>
                 <include>org.apache.geronimo.configs:client-system</include>
             </includes>
@@ -63,6 +51,7 @@
         <dependencySet>
             <outputDirectory>bin</outputDirectory>
             <outputFileNameMapping>deployer.jar</outputFileNameMapping>
+            <useStrictFiltering>true</useStrictFiltering>
             <includes>
                 <include>org.apache.geronimo.configs:online-deployer</include>
             </includes>
@@ -71,11 +60,13 @@
         <dependencySet>
             <outputDirectory>lib</outputDirectory>
             <outputFileNameMapping>jsr88-deploymentfactory.jar</outputFileNameMapping>
+            <useStrictFiltering>true</useStrictFiltering>
             <includes>
                 <include>org.apache.geronimo.configs:jsr88-deploymentfactory</include>
             </includes>
         </dependencySet>
         
+        <!--
         <dependencySet>
             <outputDirectory>bin</outputDirectory>
             <outputFileNameMapping>shutdown.jar</outputFileNameMapping>
@@ -83,10 +74,12 @@
                 <include>org.apache.geronimo.configs:shutdown</include>
             </includes>
         </dependencySet>
+        -->
         
         <dependencySet>
             <outputDirectory>bin</outputDirectory>
             <outputFileNameMapping>upgrade.jar</outputFileNameMapping>
+            <useStrictFiltering>true</useStrictFiltering>
             <includes>
                 <include>org.apache.geronimo.configs:upgrade-cli</include>
             </includes>
@@ -121,8 +114,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 +130,7 @@
             <outputDirectory>bin</outputDirectory>
             <includes>
                 <include>*.bat</include>
+                <include>*.cmd</include>
                 <include>*.txt</include>
             </includes>
             <lineEnding>dos</lineEnding>

Modified: geronimo/server/trunk/assemblies/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/pom.xml?rev=575239&r1=575238&r2=575239&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/pom.xml (original)
+++ geronimo/server/trunk/assemblies/pom.xml Thu Sep 13 02:32:13 2007
@@ -41,11 +41,11 @@
 
     <modules>
         <module>geronimo-boilerplate-minimal</module>
+        <module>geronimo-boilerplate-javaee5</module>
         <module>geronimo-framework</module>
         <module>geronimo-jetty6-minimal</module>
-        <module>geronimo-tomcat6-minimal</module>
-        <module>geronimo-boilerplate-javaee5</module>
         <module>geronimo-jetty6-javaee5</module>
+        <module>geronimo-tomcat6-minimal</module>
         <module>geronimo-tomcat6-javaee5</module>
     </modules>
 



Mime
View raw message