You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jd...@apache.org on 2006/08/25 00:00:45 UTC
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...
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>