geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sppa...@apache.org
Subject svn commit: r434541 - in /geronimo/server/branches/sachin: assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/ assemblies/geronimo-jetty-j2ee/ assemblies/geronimo-jetty-j2ee/src/main/assembly/ assemblies/geronimo-jetty-minimal/ assemblies/g...
Date Thu, 24 Aug 2006 22:11:00 GMT
Author: sppatel
Date: Thu Aug 24 15:10:59 2006
New Revision: 434541

URL: http://svn.apache.org/viewvc?rev=434541&view=rev
Log:
merge from trunk

Added:
    geronimo/server/branches/sachin/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/
      - copied from r434537, geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/
    geronimo/server/branches/sachin/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/deploy.bat
      - copied unchanged from r434537, geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/deploy.bat
    geronimo/server/branches/sachin/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/deploy.sh
      - copied unchanged from r434537, geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/deploy.sh
    geronimo/server/branches/sachin/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/geronimo.bat
      - copied unchanged from r434537, geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/geronimo.bat
    geronimo/server/branches/sachin/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/geronimo.sh
      - copied unchanged from r434537, geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/geronimo.sh
    geronimo/server/branches/sachin/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/setjavaenv.bat
      - copied unchanged from r434537, geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/setjavaenv.bat
    geronimo/server/branches/sachin/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/setjavaenv.sh
      - copied unchanged from r434537, geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/setjavaenv.sh
    geronimo/server/branches/sachin/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/shutdown.bat
      - copied unchanged from r434537, geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/shutdown.bat
    geronimo/server/branches/sachin/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/shutdown.sh
      - copied unchanged from r434537, geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/shutdown.sh
    geronimo/server/branches/sachin/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/startup.bat
      - copied unchanged from r434537, geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/startup.bat
    geronimo/server/branches/sachin/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/startup.sh
      - copied unchanged from r434537, geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/startup.sh
Removed:
    geronimo/server/branches/sachin/modules/common/xdocs/
    geronimo/server/branches/sachin/modules/core/xdocs/
    geronimo/server/branches/sachin/modules/kernel/xdocs/
    geronimo/server/branches/sachin/modules/scripts/
    geronimo/server/branches/sachin/modules/security/xdocs/
    geronimo/server/branches/sachin/modules/system/xdocs/
Modified:
    geronimo/server/branches/sachin/assemblies/geronimo-jetty-j2ee/pom.xml
    geronimo/server/branches/sachin/assemblies/geronimo-jetty-j2ee/src/main/assembly/bin.xml
    geronimo/server/branches/sachin/assemblies/geronimo-jetty-minimal/pom.xml
    geronimo/server/branches/sachin/assemblies/geronimo-jetty-minimal/src/main/assembly/bin.xml
    geronimo/server/branches/sachin/assemblies/geronimo-tomcat-j2ee/pom.xml
    geronimo/server/branches/sachin/assemblies/geronimo-tomcat-j2ee/src/main/assembly/bin.xml
    geronimo/server/branches/sachin/assemblies/geronimo-tomcat-minimal/pom.xml
    geronimo/server/branches/sachin/assemblies/geronimo-tomcat-minimal/src/main/assembly/bin.xml
    geronimo/server/branches/sachin/modules/pom.xml

Modified: geronimo/server/branches/sachin/assemblies/geronimo-jetty-j2ee/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/assemblies/geronimo-jetty-j2ee/pom.xml?rev=434541&r1=434540&r2=434541&view=diff
==============================================================================
--- geronimo/server/branches/sachin/assemblies/geronimo-jetty-j2ee/pom.xml (original)
+++ geronimo/server/branches/sachin/assemblies/geronimo-jetty-j2ee/pom.xml Thu Aug 24 15:10:59
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/branches/sachin/assemblies/geronimo-jetty-j2ee/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/assemblies/geronimo-jetty-j2ee/src/main/assembly/bin.xml?rev=434541&r1=434540&r2=434541&view=diff
==============================================================================
--- geronimo/server/branches/sachin/assemblies/geronimo-jetty-j2ee/src/main/assembly/bin.xml
(original)
+++ geronimo/server/branches/sachin/assemblies/geronimo-jetty-j2ee/src/main/assembly/bin.xml
Thu Aug 24 15:10:59 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/branches/sachin/assemblies/geronimo-jetty-minimal/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/assemblies/geronimo-jetty-minimal/pom.xml?rev=434541&r1=434540&r2=434541&view=diff
==============================================================================
--- geronimo/server/branches/sachin/assemblies/geronimo-jetty-minimal/pom.xml (original)
+++ geronimo/server/branches/sachin/assemblies/geronimo-jetty-minimal/pom.xml Thu Aug 24 15:10:59
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/branches/sachin/assemblies/geronimo-jetty-minimal/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/assemblies/geronimo-jetty-minimal/src/main/assembly/bin.xml?rev=434541&r1=434540&r2=434541&view=diff
==============================================================================
--- geronimo/server/branches/sachin/assemblies/geronimo-jetty-minimal/src/main/assembly/bin.xml
(original)
+++ geronimo/server/branches/sachin/assemblies/geronimo-jetty-minimal/src/main/assembly/bin.xml
Thu Aug 24 15:10:59 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/branches/sachin/assemblies/geronimo-tomcat-j2ee/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/assemblies/geronimo-tomcat-j2ee/pom.xml?rev=434541&r1=434540&r2=434541&view=diff
==============================================================================
--- geronimo/server/branches/sachin/assemblies/geronimo-tomcat-j2ee/pom.xml (original)
+++ geronimo/server/branches/sachin/assemblies/geronimo-tomcat-j2ee/pom.xml Thu Aug 24 15:10:59
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/branches/sachin/assemblies/geronimo-tomcat-j2ee/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/assemblies/geronimo-tomcat-j2ee/src/main/assembly/bin.xml?rev=434541&r1=434540&r2=434541&view=diff
==============================================================================
--- geronimo/server/branches/sachin/assemblies/geronimo-tomcat-j2ee/src/main/assembly/bin.xml
(original)
+++ geronimo/server/branches/sachin/assemblies/geronimo-tomcat-j2ee/src/main/assembly/bin.xml
Thu Aug 24 15:10:59 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/branches/sachin/assemblies/geronimo-tomcat-minimal/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/assemblies/geronimo-tomcat-minimal/pom.xml?rev=434541&r1=434540&r2=434541&view=diff
==============================================================================
--- geronimo/server/branches/sachin/assemblies/geronimo-tomcat-minimal/pom.xml (original)
+++ geronimo/server/branches/sachin/assemblies/geronimo-tomcat-minimal/pom.xml Thu Aug 24
15:10:59 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/branches/sachin/assemblies/geronimo-tomcat-minimal/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/assemblies/geronimo-tomcat-minimal/src/main/assembly/bin.xml?rev=434541&r1=434540&r2=434541&view=diff
==============================================================================
--- geronimo/server/branches/sachin/assemblies/geronimo-tomcat-minimal/src/main/assembly/bin.xml
(original)
+++ geronimo/server/branches/sachin/assemblies/geronimo-tomcat-minimal/src/main/assembly/bin.xml
Thu Aug 24 15:10:59 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/branches/sachin/modules/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/pom.xml?rev=434541&r1=434540&r2=434541&view=diff
==============================================================================
--- geronimo/server/branches/sachin/modules/pom.xml (original)
+++ geronimo/server/branches/sachin/modules/pom.xml Thu Aug 24 15:10:59 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>



Mime
View raw message