You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2005/12/06 00:29:39 UTC
svn commit: r354222 - in /geronimo/trunk: assemblies/j2ee-installer/
assemblies/j2ee-jetty-server/ assemblies/j2ee-tomcat-server/
modules/scripts/ modules/scripts/src/ modules/scripts/src/resources/
modules/scripts/src/resources/bin/ plugins/geronimo-a...
Author: djencks
Date: Mon Dec 5 15:29:29 2005
New Revision: 354222
URL: http://svn.apache.org/viewcvs?rev=354222&view=rev
Log:
Add 'unpack' option to assembly plugin. Use it to unpack scripts
Added:
geronimo/trunk/modules/scripts/
geronimo/trunk/modules/scripts/project.xml
- copied, changed from r351907, geronimo/trunk/modules/webservices/project.xml
geronimo/trunk/modules/scripts/src/
geronimo/trunk/modules/scripts/src/resources/
geronimo/trunk/modules/scripts/src/resources/bin/
geronimo/trunk/modules/scripts/src/resources/bin/deploy.bat (with props)
geronimo/trunk/modules/scripts/src/resources/bin/deploy.sh (with props)
geronimo/trunk/modules/scripts/src/resources/bin/shutdown.bat
geronimo/trunk/modules/scripts/src/resources/bin/shutdown.sh
geronimo/trunk/modules/scripts/src/resources/bin/startup.bat (with props)
geronimo/trunk/modules/scripts/src/resources/bin/startup.sh (with props)
Modified:
geronimo/trunk/assemblies/j2ee-installer/project.xml
geronimo/trunk/assemblies/j2ee-jetty-server/project.xml
geronimo/trunk/assemblies/j2ee-tomcat-server/project.xml
geronimo/trunk/plugins/geronimo-assembly-plugin/plugin.jelly
Modified: geronimo/trunk/assemblies/j2ee-installer/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/assemblies/j2ee-installer/project.xml?rev=354222&r1=354221&r2=354222&view=diff
==============================================================================
--- geronimo/trunk/assemblies/j2ee-installer/project.xml (original)
+++ geronimo/trunk/assemblies/j2ee-installer/project.xml Mon Dec 5 15:29:29 2005
@@ -253,6 +253,16 @@
</properties>
</dependency>
+ <!-- unpack -->
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-scripts</artifactId>
+ <version>${pom.currentVersion}</version>
+ <properties>
+ <geronimo.assemble>unpack</geronimo.assemble>
+ </properties>
+ </dependency>
+
<!-- lib dependencies -->
<dependency>
<groupId>cglib</groupId>
Modified: geronimo/trunk/assemblies/j2ee-jetty-server/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/assemblies/j2ee-jetty-server/project.xml?rev=354222&r1=354221&r2=354222&view=diff
==============================================================================
--- geronimo/trunk/assemblies/j2ee-jetty-server/project.xml (original)
+++ geronimo/trunk/assemblies/j2ee-jetty-server/project.xml Mon Dec 5 15:29:29 2005
@@ -226,6 +226,17 @@
</properties>
</dependency>
+ <!-- unpack -->
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-scripts</artifactId>
+ <version>${pom.currentVersion}</version>
+ <properties>
+ <geronimo.assemble>unpack</geronimo.assemble>
+ </properties>
+ </dependency>
+
+
<!-- lib dependencies -->
<dependency>
<groupId>cglib</groupId>
Modified: geronimo/trunk/assemblies/j2ee-tomcat-server/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/assemblies/j2ee-tomcat-server/project.xml?rev=354222&r1=354221&r2=354222&view=diff
==============================================================================
--- geronimo/trunk/assemblies/j2ee-tomcat-server/project.xml (original)
+++ geronimo/trunk/assemblies/j2ee-tomcat-server/project.xml Mon Dec 5 15:29:29 2005
@@ -226,6 +226,16 @@
</properties>
</dependency>
+ <!-- unpack -->
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-scripts</artifactId>
+ <version>${pom.currentVersion}</version>
+ <properties>
+ <geronimo.assemble>unpack</geronimo.assemble>
+ </properties>
+ </dependency>
+
<!-- lib dependencies -->
<dependency>
<groupId>cglib</groupId>
Copied: geronimo/trunk/modules/scripts/project.xml (from r351907, geronimo/trunk/modules/webservices/project.xml)
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/scripts/project.xml?p2=geronimo/trunk/modules/scripts/project.xml&p1=geronimo/trunk/modules/webservices/project.xml&r1=351907&r2=354222&rev=354222&view=diff
==============================================================================
--- geronimo/trunk/modules/webservices/project.xml (original)
+++ geronimo/trunk/modules/scripts/project.xml Mon Dec 5 15:29:29 2005
@@ -28,15 +28,15 @@
<!-- Module Identification -->
<!-- ===================== -->
- <name>Geronimo :: Web Services</name>
- <id>geronimo-webservices</id>
- <shortDescription>Geronimo Web Services</shortDescription>
- <description>Geronimo Web Services</description>
+ <name>Geronimo :: Scripts</name>
+ <id>geronimo-scripts</id>
+ <shortDescription>Scripts</shortDescription>
+ <description>Scripts</description>
<url>http://incubator.apache.org/projects/geronimo/webservices/</url>
<siteDirectory>/www/incubator.apache.org/projects/geronimo/webservices</siteDirectory>
<distributionDirectory>/www/incubator.apache.org/projects/geronimo/builds/webservices</distributionDirectory>
- <package>org.apache.geronimo.webservices</package>
+ <package></package>
<!-- ============ -->
<!-- Dependencies -->
@@ -44,120 +44,14 @@
<dependencies>
<!-- Module Dependencies -->
-
- <dependency>
- <groupId>geronimo</groupId>
- <artifactId>geronimo-common</artifactId>
- <version>${geronimo_version}</version>
- </dependency>
-
- <dependency>
- <groupId>geronimo</groupId>
- <artifactId>geronimo-core</artifactId>
- <version>${geronimo_version}</version>
- </dependency>
-
- <dependency>
- <groupId>geronimo</groupId>
- <artifactId>geronimo-kernel</artifactId>
- <version>${pom.currentVersion}</version>
- </dependency>
-
- <dependency>
- <groupId>geronimo</groupId>
- <artifactId>geronimo-j2ee</artifactId>
- <version>${geronimo_version}</version>
- </dependency>
-
- <dependency>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-qname</artifactId>
- <version>${geronimo_spec_qname_version}</version>
- </dependency>
-
- <dependency>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-jaxrpc</artifactId>
- <version>${geronimo_spec_jaxrpc_version}</version>
- </dependency>
-
- <dependency>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-servlet</artifactId>
- <version>${geronimo_spec_servlet_version}</version>
- </dependency>
-
- <!-- Thirdparty -->
-
- <dependency>
- <groupId>cglib</groupId>
- <artifactId>cglib-nodep</artifactId>
- <version>${cglib_version}</version>
- <url>http://cglib.sf.net/</url>
- </dependency>
-
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>${commons_logging_version}</version>
- <url>http://jakarta.apache.org/commons/logging/</url>
- </dependency>
-
- <dependency>
- <groupId>castor</groupId>
- <artifactId>castor</artifactId>
- <version>${castor_version}</version>
- <url>http://www.castor.org</url>
- </dependency>
-
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>${log4j_version}</version>
- <url>http://jakarta.apache.org/log4j</url>
- </dependency>
-
- <dependency>
- <groupId>xfire</groupId>
- <artifactId>xfire</artifactId>
- <version>${xfire_version}</version>
- </dependency>
-
- <dependency>
- <groupId>xfire</groupId>
- <artifactId>xfire-java</artifactId>
- <version>${xfire_version}</version>
- </dependency>
-
- <dependency>
- <groupId>wsdl4j</groupId>
- <artifactId>wsdl4j</artifactId>
- <version>${wsdl4j_version}</version>
- </dependency>
-
- <!-- JAXR (Apache Scout) -->
- <dependency>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-jaxr</artifactId>
- <version>${geronimo_spec_jaxr_version}</version>
- </dependency>
-
-
- <dependency>
- <groupId>scout</groupId>
- <artifactId>scout</artifactId>
- <version>${scout_version}</version>
- </dependency>
-
</dependencies>
<build>
<resources>
<resource>
- <directory>${basedir}/src/java</directory>
+ <directory>${basedir}/src/resources</directory>
<includes>
- <include>**/*.xml</include>
- <include>**/*.properties</include>
+ <include>**/*</include>
</includes>
</resource>
</resources>
Added: geronimo/trunk/modules/scripts/src/resources/bin/deploy.bat
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/scripts/src/resources/bin/deploy.bat?rev=354222&view=auto
==============================================================================
--- geronimo/trunk/modules/scripts/src/resources/bin/deploy.bat (added)
+++ geronimo/trunk/modules/scripts/src/resources/bin/deploy.bat Mon Dec 5 15:29:29 2005
@@ -0,0 +1,78 @@
+@rem
+@rem Copyright 2005 The Apache Software Foundation
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem http://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+@rem --------------------------------------------------------------------
+@rem $Rev$ $Date$
+@rem --------------------------------------------------------------------
+@echo off
+
+@rem Verify we are running on Windows XP or Server
+if not "%OS%"=="Windows_NT" goto FailOS
+setlocal
+goto Init
+
+:FailOS
+echo Error - Unrecognized OS type.
+echo.
+set ERRORLEVEL=1
+goto End
+
+:Init
+@rem Capture any passed in arguments
+set ARGS=%*
+@rem Capture the current dir the script was started in
+set CUR_DIR="%cd%"
+for %%z in (%CUR_DIR%) do set CUR_DIR=%%~sz
+
+@rem Set the path to the deployer.jar
+set DEPLOYER_JAR="%~dp0deployer.jar"
+for %%z in (%DEPLOYER_JAR%) do set DEPLOYER_JAR=%%~sz
+
+:CheckDeployerJar
+@rem Verify the deployer.jar exists:
+if exist "%DEPLOYER_JAR%" goto CheckJavaHome
+echo Error - Unable to locate the deployer jar file.
+echo.
+set ERRORLEVEL=1
+goto End
+
+:CheckJavaHome
+for %%z in ("%JAVA_HOME%") do set JAVA_HOME=%%~sz
+if not "%JAVA_HOME%"=="" goto CheckJavaExe
+echo Error - The JAVA_HOME env variable MUST be set.
+echo.
+set ERRORLEVEL=1
+goto End
+
+:CheckJavaExe
+if not exist "%JAVA_HOME%\bin" goto FailJavaHome
+if not exist "%JAVA_HOME%\bin\java.exe" goto FailJavaHome
+set JAVA="%JAVA_HOME%\bin\java.exe"
+goto StartDeployer
+
+:FailJavaHome
+echo Error - Unable to locate Java binary under the JAVA_HOME:
+echo JAVA_HOME: [ %JAVA_HOME%\bin\java.exe ]
+echo.
+set ERRORLEVEL=1
+goto End
+
+:StartDeployer
+%JAVA% -jar %DEPLOYER_JAR% %ARGS%
+
+:End
+echo.
+@endlocal
+
Propchange: geronimo/trunk/modules/scripts/src/resources/bin/deploy.bat
------------------------------------------------------------------------------
svn:executable = *
Added: geronimo/trunk/modules/scripts/src/resources/bin/deploy.sh
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/scripts/src/resources/bin/deploy.sh?rev=354222&view=auto
==============================================================================
--- geronimo/trunk/modules/scripts/src/resources/bin/deploy.sh (added)
+++ geronimo/trunk/modules/scripts/src/resources/bin/deploy.sh Mon Dec 5 15:29:29 2005
@@ -0,0 +1,58 @@
+#!/bin/sh
+#
+# Copyright 2005 The Apache Software Foundation
+#
+# Licensed 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$
+# --------------------------------------------------------------------
+
+ARGS=
+
+if [ -z "$JAVA_HOME" ]; then
+ JAVA=`which java`
+ if [ -z "$JAVA" ]; then
+ echo "Unable to locate Java binary. Please add it to the PATH."
+ exit 1
+ fi
+ JAVA_BIN=`dirname $JAVA`
+ JAVA_HOME=$JAVA_BIN/..
+fi
+
+JAVA=$JAVA_HOME/bin/java
+if [ ! -f "$JAVA" ]; then
+ echo "Unable to locate Java"
+ exit 1
+fi
+
+PRG="$0"
+while [ -h "$PRG" ] ; do
+ ls=`ls -ld "$PRG"`
+ link=`expr "$ls" : '.*-> \(.*\)$'`
+ if expr "$link" : '.*/.*' > /dev/null; then
+ PRG="$link"
+ else
+ PRG=`dirname "$PRG"`/"$link"
+ fi
+done
+
+PRGDIR=`dirname "$PRG"`
+DEPLOYER_JAR=$PRGDIR/deployer.jar
+
+if [ ! -f "$DEPLOYER_JAR" ]; then
+ echo "Unable to locate the $DEPLOYER_JAR jar"
+ exit 1
+fi
+
+$JAVA $ARGS -jar $DEPLOYER_JAR "$@"
Propchange: geronimo/trunk/modules/scripts/src/resources/bin/deploy.sh
------------------------------------------------------------------------------
svn:executable = *
Added: geronimo/trunk/modules/scripts/src/resources/bin/shutdown.bat
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/scripts/src/resources/bin/shutdown.bat?rev=354222&view=auto
==============================================================================
--- geronimo/trunk/modules/scripts/src/resources/bin/shutdown.bat (added)
+++ geronimo/trunk/modules/scripts/src/resources/bin/shutdown.bat Mon Dec 5 15:29:29 2005
@@ -0,0 +1,78 @@
+@rem
+@rem Copyright 2005 The Apache Software Foundation
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem http://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+@rem --------------------------------------------------------------------
+@rem $Rev$ $Date$
+@rem --------------------------------------------------------------------
+@echo off
+
+@rem Verify we are running on Windows XP or Server
+if not "%OS%"=="Windows_NT" goto FailOS
+setlocal
+goto Init
+
+:FailOS
+echo Error - Unrecognized OS type.
+echo.
+set ERRORLEVEL=1
+goto End
+
+:Init
+@rem Capture any passed in arguments
+set ARGS=%*
+@rem Capture the current dir the script was started in
+set CUR_DIR="%cd%"
+for %%z in (%CUR_DIR%) do set CUR_DIR=%%~sz
+
+@rem Set the path to the shutdown.jar
+set SHUTDOWN_JAR="%~dp0shutdown.jar"
+for %%z in (%SHUTDOWN_JAR%) do set SHUTDOWN_JAR=%%~sz
+
+:CheckDeployerJar
+@rem Verify the shutdown.jar exists:
+if exist "%SHUTDOWN_JAR%" goto CheckJavaHome
+echo Error - Unable to locate the deployer jar file.
+echo.
+set ERRORLEVEL=1
+goto End
+
+:CheckJavaHome
+for %%z in ("%JAVA_HOME%") do set JAVA_HOME=%%~sz
+if not "%JAVA_HOME%"=="" goto CheckJavaExe
+echo Error - The JAVA_HOME env variable MUST be set.
+echo.
+set ERRORLEVEL=1
+goto End
+
+:CheckJavaExe
+if not exist "%JAVA_HOME%\bin" goto FailJavaHome
+if not exist "%JAVA_HOME%\bin\java.exe" goto FailJavaHome
+set JAVA="%JAVA_HOME%\bin\java.exe"
+goto StartDeployer
+
+:FailJavaHome
+echo Error - Unable to locate Java binary under the JAVA_HOME:
+echo JAVA_HOME: [ %JAVA_HOME%\bin\java.exe ]
+echo.
+set ERRORLEVEL=1
+goto End
+
+:StartDeployer
+%JAVA% -jar %SHUTDOWN_JAR% %ARGS%
+
+:End
+echo.
+@endlocal
+
Added: geronimo/trunk/modules/scripts/src/resources/bin/shutdown.sh
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/scripts/src/resources/bin/shutdown.sh?rev=354222&view=auto
==============================================================================
--- geronimo/trunk/modules/scripts/src/resources/bin/shutdown.sh (added)
+++ geronimo/trunk/modules/scripts/src/resources/bin/shutdown.sh Mon Dec 5 15:29:29 2005
@@ -0,0 +1,58 @@
+#!/bin/sh
+#
+# Copyright 2005 The Apache Software Foundation
+#
+# Licensed 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$
+# --------------------------------------------------------------------
+
+ARGS=
+
+if [ -z "$JAVA_HOME" ]; then
+ JAVA=`which java`
+ if [ -z "$JAVA" ]; then
+ echo "Unable to locate Java binary. Please add it to the PATH."
+ exit 1
+ fi
+ JAVA_BIN=`dirname $JAVA`
+ JAVA_HOME=$JAVA_BIN/..
+fi
+
+JAVA=$JAVA_HOME/bin/java
+if [ ! -f "$JAVA" ]; then
+ echo "Unable to locate Java"
+ exit 1
+fi
+
+PRG="$0"
+while [ -h "$PRG" ] ; do
+ ls=`ls -ld "$PRG"`
+ link=`expr "$ls" : '.*-> \(.*\)$'`
+ if expr "$link" : '.*/.*' > /dev/null; then
+ PRG="$link"
+ else
+ PRG=`dirname "$PRG"`/"$link"
+ fi
+done
+
+PRGDIR=`dirname "$PRG"`
+SHUTDOWN_JAR=$PRGDIR/shutdown.jar
+
+if [ ! -f "$SHUTDOWN_JAR" ]; then
+ echo "Unable to locate the $SHUTDOWN_JAR jar"
+ exit 1
+fi
+
+$JAVA $ARGS -jar $SHUTDOWN_JAR "$@"
Added: geronimo/trunk/modules/scripts/src/resources/bin/startup.bat
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/scripts/src/resources/bin/startup.bat?rev=354222&view=auto
==============================================================================
--- geronimo/trunk/modules/scripts/src/resources/bin/startup.bat (added)
+++ geronimo/trunk/modules/scripts/src/resources/bin/startup.bat Mon Dec 5 15:29:29 2005
@@ -0,0 +1,78 @@
+@rem
+@rem Copyright 2005 The Apache Software Foundation
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem http://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+@rem --------------------------------------------------------------------
+@rem $Rev$ $Date$
+@rem --------------------------------------------------------------------
+@echo off
+
+@rem Verify we are running on Windows XP or Server
+if not "%OS%"=="Windows_NT" goto FailOS
+setlocal
+goto Init
+
+:FailOS
+echo Error - Unrecognized OS type.
+echo.
+set ERRORLEVEL=1
+goto End
+
+:Init
+@rem Capture any passed in arguments
+set ARGS=%*
+@rem Capture the current dir the script was started in
+set CUR_DIR="%cd%"
+for %%z in (%CUR_DIR%) do set CUR_DIR=%%~sz
+
+@rem Set the path to the server.jar
+set SERVER_JAR="%~dp0server.jar"
+for %%z in (%SERVER_JAR%) do set SERVER_JAR=%%~sz
+
+:CheckServerJar
+@rem Verify the server.jar exists:
+if exist "%SERVER_JAR%" goto CheckJavaHome
+echo Error - Unable to locate the server jar file.
+echo.
+set ERRORLEVEL=1
+goto End
+
+:CheckJavaHome
+for %%z in ("%JAVA_HOME%") do set JAVA_HOME=%%~sz
+if not "%JAVA_HOME%"=="" goto CheckJavaExe
+echo Error - The JAVA_HOME env variable MUST be set.
+echo.
+set ERRORLEVEL=1
+goto End
+
+:CheckJavaExe
+if not exist "%JAVA_HOME%\bin" goto FailJavaHome
+if not exist "%JAVA_HOME%\bin\java.exe" goto FailJavaHome
+set JAVA="%JAVA_HOME%\bin\java.exe"
+goto StartServer
+
+:FailJavaHome
+echo Error - Unable to locate Java binary under the JAVA_HOME:
+echo JAVA_HOME: [ %JAVA_HOME%\bin\java.exe ]
+echo.
+set ERRORLEVEL=1
+goto End
+
+:StartServer
+%JAVA% -jar %SERVER_JAR% %ARGS%
+
+:End
+echo.
+@endlocal
+
Propchange: geronimo/trunk/modules/scripts/src/resources/bin/startup.bat
------------------------------------------------------------------------------
svn:executable = *
Added: geronimo/trunk/modules/scripts/src/resources/bin/startup.sh
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/scripts/src/resources/bin/startup.sh?rev=354222&view=auto
==============================================================================
--- geronimo/trunk/modules/scripts/src/resources/bin/startup.sh (added)
+++ geronimo/trunk/modules/scripts/src/resources/bin/startup.sh Mon Dec 5 15:29:29 2005
@@ -0,0 +1,58 @@
+#!/bin/sh
+#
+# Copyright 2005 The Apache Software Foundation
+#
+# Licensed 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$
+# --------------------------------------------------------------------
+
+ARGS=
+
+if [ -z "$JAVA_HOME" ]; then
+ JAVA=`which java`
+ if [ -z "$JAVA" ]; then
+ echo "Unable to locate Java binary. Please add it to the PATH."
+ exit 1
+ fi
+ JAVA_BIN=`dirname $JAVA`
+ JAVA_HOME=$JAVA_BIN/..
+fi
+
+JAVA=$JAVA_HOME/bin/java
+if [ ! -f "$JAVA" ]; then
+ echo "Unable to locate Java"
+ exit 1
+fi
+
+PRG="$0"
+while [ -h "$PRG" ] ; do
+ ls=`ls -ld "$PRG"`
+ link=`expr "$ls" : '.*-> \(.*\)$'`
+ if expr "$link" : '.*/.*' > /dev/null; then
+ PRG="$link"
+ else
+ PRG=`dirname "$PRG"`/"$link"
+ fi
+done
+
+PRGDIR=`dirname "$PRG"`
+SERVER_JAR=$PRGDIR/server.jar
+
+if [ ! -f "$SERVER_JAR" ]; then
+ echo "Unable to locate the $SERVER_JAR jar"
+ exit 1
+fi
+
+$JAVA $ARGS -jar $SERVER_JAR "$@"
Propchange: geronimo/trunk/modules/scripts/src/resources/bin/startup.sh
------------------------------------------------------------------------------
svn:executable = *
Modified: geronimo/trunk/plugins/geronimo-assembly-plugin/plugin.jelly
URL: http://svn.apache.org/viewcvs/geronimo/trunk/plugins/geronimo-assembly-plugin/plugin.jelly?rev=354222&r1=354221&r2=354222&view=diff
==============================================================================
--- geronimo/trunk/plugins/geronimo-assembly-plugin/plugin.jelly (original)
+++ geronimo/trunk/plugins/geronimo-assembly-plugin/plugin.jelly Mon Dec 5 15:29:29 2005
@@ -101,8 +101,7 @@
<j:set var="hasRepo" value="false"/>
<j:forEach var="artifact" items="${pom.artifacts}">
<j:set var="dependency" value="${artifact.dependency}"/>
- <j:if test="${dependency.getProperty('geronimo.assemble') == 'repository' || dependency.getProperty('geronimo.assemble') == 'install' || dependency.getProperty('geronimo.assemble') == 'library' || dependency.getProperty('geronimo.assem
-ble') == 'endorsed' || dependency.getProperty('geronimo.assemble') == 'extension'}">
+ <j:if test="${dependency.getProperty('geronimo.assemble') == 'repository' || dependency.getProperty('geronimo.assemble') == 'install' || dependency.getProperty('geronimo.assemble') == 'library' || dependency.getProperty('geronimo.assemble') == 'endorsed' || dependency.getProperty('geronimo.assemble') == 'extension'}">
<ant:include name="${dependency.getArtifactDirectory()}/${dependency.getType()}s/${dependency.getArtifact()}"/>
<j:set var="hasRepo" value="true"/>
</j:if>
@@ -114,6 +113,25 @@
</ant:copy>
</goal>
+ <goal name="assemble:assemble-unpack">
+ <ant:mkdir dir="${geronimo.assembly.dest}"/>
+ <ant:unjar dest="${geronimo.assembly.dest}">
+ <ant:fileset dir="${maven.repo.local}">
+ <j:set var="hasUnpack" value="false"/>
+ <j:forEach var="artifact" items="${pom.artifacts}">
+ <j:set var="dependency" value="${artifact.dependency}"/>
+ <j:if test="${dependency.getProperty('geronimo.assemble') == 'unpack'}">
+ <ant:include name="${dependency.getArtifactDirectory()}/${dependency.getType()}s/${dependency.getArtifact()}"/>
+ <j:set var="hasUnpack" value="true"/>
+ </j:if>
+ </j:forEach>
+ <j:if test="${hasUnpack == 'false'}">
+ <ant:exclude name="**/*"/>
+ </j:if>
+ </ant:fileset>
+ </ant:unjar>
+ </goal>
+
<!-- todo automatically add libraries listed in an executable's MCP in the right place, relative to it -->
<goal name="assemble:assemble-configurations">
<j:set var="configStoreDir" value="${geronimo.assembly.dest}/config-store"/>
@@ -172,6 +190,7 @@
<goal name="assemble:assemble" prereqs="assemble:assemble-prepare" description="Assemble a Geronimo installation">
<attainGoal name="assemble:assemble-repository"/>
<attainGoal name="assemble:assemble-lib"/>
+ <attainGoal name="assemble:assemble-unpack"/>
<attainGoal name="assemble:assemble-configurations"/>
</goal>