Return-Path: 
 <scm-return-14440-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 85716 invoked from network); 24 Aug 2006 22:01:09 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 24 Aug 2006 22:01:09 -0000
Received: (qmail 4130 invoked by uid 500); 24 Aug 2006 22:01:09 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 3989 invoked by uid 500); 24 Aug 2006 22:01:08 -0000
Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:scm-help@geronimo.apache.org>
list-unsubscribe: <mailto:scm-unsubscribe@geronimo.apache.org>
List-Post: <mailto:scm@geronimo.apache.org>
Reply-To: dev@geronimo.apache.org
List-Id: <scm.geronimo.apache.org>
Delivered-To: mailing list scm@geronimo.apache.org
Received: (qmail 3978 invoked by uid 99); 24 Aug 2006 22:01:08 -0000
Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 24 Aug 2006 15:01:08 -0700
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received-SPF: pass (asf.osuosl.org: local policy)
Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 24 Aug 2006 15:01:07 -0700
Received: by eris.apache.org (Postfix, from userid 65534)
	id 5F5D01A981A; Thu, 24 Aug 2006 15:00:47 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r434537 - in /geronimo/server/trunk:
 assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/
 assemblies/geronimo-jetty-j2ee/
 assemblies/geronimo-jetty-j2ee/src/main/assembly/
 assemblies/geronimo-jetty-minimal/ assemblies/geronimo-je...
Date: Thu, 24 Aug 2006 22:00:45 -0000
To: scm@geronimo.apache.org
From: jdillon@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20060824220047.5F5D01A981A@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: jdillon
Date: Thu Aug 24 15:00:44 2006
New Revision: 434537

URL: http://svn.apache.org/viewvc?rev=434537&view=rev
Log:
Moved scripts to geronimo-boilerplate-minimal

Added:
    geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/
      - copied from r434494, geronimo/server/trunk/modules/scripts/src/resources/bin/
Removed:
    geronimo/server/trunk/modules/scripts/
Modified:
    geronimo/server/trunk/assemblies/geronimo-jetty-j2ee/pom.xml
    geronimo/server/trunk/assemblies/geronimo-jetty-j2ee/src/main/assembly/bin.xml
    geronimo/server/trunk/assemblies/geronimo-jetty-minimal/pom.xml
    geronimo/server/trunk/assemblies/geronimo-jetty-minimal/src/main/assembly/bin.xml
    geronimo/server/trunk/assemblies/geronimo-tomcat-j2ee/pom.xml
    geronimo/server/trunk/assemblies/geronimo-tomcat-j2ee/src/main/assembly/bin.xml
    geronimo/server/trunk/assemblies/geronimo-tomcat-minimal/pom.xml
    geronimo/server/trunk/assemblies/geronimo-tomcat-minimal/src/main/assembly/bin.xml
    geronimo/server/trunk/modules/pom.xml

Modified: geronimo/server/trunk/assemblies/geronimo-jetty-j2ee/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty-j2ee/pom.xml?rev=434537&r1=434536&r2=434537&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty-j2ee/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty-j2ee/pom.xml Thu Aug 24 15:00:44 2006
@@ -310,29 +310,6 @@
                         </configuration>
                     </execution>
                     
-                    <!--
-                    
-                    TODO: Move scripts to boilerplate
-                    
-                    -->
-                    <execution>
-                        <id>unpack-scripts</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>unpack</goal>
-                        </goals>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>org.apache.geronimo.modules</groupId>
-                                    <artifactId>geronimo-scripts</artifactId>
-                                    <version>${pom.version}</version>
-                                </artifactItem>
-                            </artifactItems>
-                            <outputDirectory>${project.build.directory}/scripts</outputDirectory>
-                        </configuration>
-                    </execution>
-                    
                     <execution>
                         <id>unpack-schemas</id>
                         <phase>package</phase>

Modified: geronimo/server/trunk/assemblies/geronimo-jetty-j2ee/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty-j2ee/src/main/assembly/bin.xml?rev=434537&r1=434536&r2=434537&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty-j2ee/src/main/assembly/bin.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty-j2ee/src/main/assembly/bin.xml Thu Aug 24 15:00:44 2006
@@ -109,20 +109,20 @@
         </fileSet>
         
         <fileSet>
-            <directory>target/scripts</directory>
-            <outputDirectory>/</outputDirectory>
+            <directory>target/boilerplate/bin</directory>
+            <outputDirectory>bin</outputDirectory>
             <includes>
-                <include>**/*.sh</include>
+                <include>*.sh</include>
             </includes>
             <lineEnding>unix</lineEnding>
             <fileMode>0755</fileMode>
         </fileSet>
         
         <fileSet>
-            <directory>target/scripts</directory>
-            <outputDirectory>/</outputDirectory>
+            <directory>target/boilerplate/bin</directory>
+            <outputDirectory>bin</outputDirectory>
             <includes>
-                <include>**/*.bat</include>
+                <include>*.bat</include>
                 <include>*.txt</include>
             </includes>
             <lineEnding>dos</lineEnding>

Modified: geronimo/server/trunk/assemblies/geronimo-jetty-minimal/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty-minimal/pom.xml?rev=434537&r1=434536&r2=434537&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty-minimal/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty-minimal/pom.xml Thu Aug 24 15:00:44 2006
@@ -192,29 +192,6 @@
                         </configuration>
                     </execution>
                     
-                    <!--
-                    
-                    TODO: Move scripts to boilerplate
-                    
-                    -->
-                    <execution>
-                        <id>unpack-scripts</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>unpack</goal>
-                        </goals>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>org.apache.geronimo.modules</groupId>
-                                    <artifactId>geronimo-scripts</artifactId>
-                                    <version>${pom.version}</version>
-                                </artifactItem>
-                            </artifactItems>
-                            <outputDirectory>${project.build.directory}/scripts</outputDirectory>
-                        </configuration>
-                    </execution>
-                    
                     <execution>
                         <id>unpack-schemas</id>
                         <phase>package</phase>

Modified: geronimo/server/trunk/assemblies/geronimo-jetty-minimal/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty-minimal/src/main/assembly/bin.xml?rev=434537&r1=434536&r2=434537&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty-minimal/src/main/assembly/bin.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty-minimal/src/main/assembly/bin.xml Thu Aug 24 15:00:44 2006
@@ -109,20 +109,20 @@
         </fileSet>
         
         <fileSet>
-            <directory>target/scripts</directory>
-            <outputDirectory>/</outputDirectory>
+            <directory>target/boilerplate/bin</directory>
+            <outputDirectory>bin</outputDirectory>
             <includes>
-                <include>**/*.sh</include>
+                <include>*.sh</include>
             </includes>
             <lineEnding>unix</lineEnding>
             <fileMode>0755</fileMode>
         </fileSet>
         
         <fileSet>
-            <directory>target/scripts</directory>
-            <outputDirectory>/</outputDirectory>
+            <directory>target/boilerplate/bin</directory>
+            <outputDirectory>bin</outputDirectory>
             <includes>
-                <include>**/*.bat</include>
+                <include>*.bat</include>
                 <include>*.txt</include>
             </includes>
             <lineEnding>dos</lineEnding>

Modified: geronimo/server/trunk/assemblies/geronimo-tomcat-j2ee/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-tomcat-j2ee/pom.xml?rev=434537&r1=434536&r2=434537&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-tomcat-j2ee/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-tomcat-j2ee/pom.xml Thu Aug 24 15:00:44 2006
@@ -311,29 +311,6 @@
                         </configuration>
                     </execution>
                     
-                    <!--
-                    
-                    TODO: Move scripts to boilerplate
-                    
-                    -->
-                    <execution>
-                        <id>unpack-scripts</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>unpack</goal>
-                        </goals>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>org.apache.geronimo.modules</groupId>
-                                    <artifactId>geronimo-scripts</artifactId>
-                                    <version>${pom.version}</version>
-                                </artifactItem>
-                            </artifactItems>
-                            <outputDirectory>${project.build.directory}/scripts</outputDirectory>
-                        </configuration>
-                    </execution>
-                    
                     <execution>
                         <id>unpack-schemas</id>
                         <phase>package</phase>

Modified: geronimo/server/trunk/assemblies/geronimo-tomcat-j2ee/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-tomcat-j2ee/src/main/assembly/bin.xml?rev=434537&r1=434536&r2=434537&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-tomcat-j2ee/src/main/assembly/bin.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-tomcat-j2ee/src/main/assembly/bin.xml Thu Aug 24 15:00:44 2006
@@ -109,20 +109,20 @@
         </fileSet>
         
         <fileSet>
-            <directory>target/scripts</directory>
-            <outputDirectory>/</outputDirectory>
+            <directory>target/boilerplate/bin</directory>
+            <outputDirectory>bin</outputDirectory>
             <includes>
-                <include>**/*.sh</include>
+                <include>*.sh</include>
             </includes>
             <lineEnding>unix</lineEnding>
             <fileMode>0755</fileMode>
         </fileSet>
         
         <fileSet>
-            <directory>target/scripts</directory>
-            <outputDirectory>/</outputDirectory>
+            <directory>target/boilerplate/bin</directory>
+            <outputDirectory>bin</outputDirectory>
             <includes>
-                <include>**/*.bat</include>
+                <include>*.bat</include>
                 <include>*.txt</include>
             </includes>
             <lineEnding>dos</lineEnding>

Modified: geronimo/server/trunk/assemblies/geronimo-tomcat-minimal/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-tomcat-minimal/pom.xml?rev=434537&r1=434536&r2=434537&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-tomcat-minimal/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-tomcat-minimal/pom.xml Thu Aug 24 15:00:44 2006
@@ -192,29 +192,6 @@
                         </configuration>
                     </execution>
                     
-                    <!--
-                    
-                    TODO: Move scripts to boilerplate
-                    
-                    -->
-                    <execution>
-                        <id>unpack-scripts</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>unpack</goal>
-                        </goals>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>org.apache.geronimo.modules</groupId>
-                                    <artifactId>geronimo-scripts</artifactId>
-                                    <version>${pom.version}</version>
-                                </artifactItem>
-                            </artifactItems>
-                            <outputDirectory>${project.build.directory}/scripts</outputDirectory>
-                        </configuration>
-                    </execution>
-                    
                     <execution>
                         <id>unpack-schemas</id>
                         <phase>package</phase>

Modified: geronimo/server/trunk/assemblies/geronimo-tomcat-minimal/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-tomcat-minimal/src/main/assembly/bin.xml?rev=434537&r1=434536&r2=434537&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-tomcat-minimal/src/main/assembly/bin.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-tomcat-minimal/src/main/assembly/bin.xml Thu Aug 24 15:00:44 2006
@@ -109,20 +109,20 @@
         </fileSet>
         
         <fileSet>
-            <directory>target/scripts</directory>
-            <outputDirectory>/</outputDirectory>
+            <directory>target/boilerplate/bin</directory>
+            <outputDirectory>bin</outputDirectory>
             <includes>
-                <include>**/*.sh</include>
+                <include>*.sh</include>
             </includes>
             <lineEnding>unix</lineEnding>
             <fileMode>0755</fileMode>
         </fileSet>
         
         <fileSet>
-            <directory>target/scripts</directory>
-            <outputDirectory>/</outputDirectory>
+            <directory>target/boilerplate/bin</directory>
+            <outputDirectory>bin</outputDirectory>
             <includes>
-                <include>**/*.bat</include>
+                <include>*.bat</include>
                 <include>*.txt</include>
             </includes>
             <lineEnding>dos</lineEnding>

Modified: geronimo/server/trunk/modules/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/pom.xml?rev=434537&r1=434536&r2=434537&view=diff
==============================================================================
--- geronimo/server/trunk/modules/pom.xml (original)
+++ geronimo/server/trunk/modules/pom.xml Thu Aug 24 15:00:44 2006
@@ -67,7 +67,6 @@
         <module>management</module>
         <module>naming</module>
         <module>naming-builder</module>
-        <module>scripts</module>
         <module>security</module>
         <module>security-builder</module>
         <module>service-builder</module>