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 2007/08/21 22:22:12 UTC
svn commit: r568255 - in /geronimo/server/trunk/assemblies: ./
geronimo-jetty6-javaee5-gshell/
geronimo-jetty6-javaee5-gshell/src/main/assembly/
geronimo-jetty6-javaee5-gshell/src/main/config/
geronimo-jetty6-javaee5-gshell/src/main/resources/var/confi...
Author: jdillon
Date: Tue Aug 21 13:22:10 2007
New Revision: 568255
URL: http://svn.apache.org/viewvc?rev=568255&view=rev
Log:
(GERONIMO-3434) Add new assembly based on jetty-jee5 which uses GShell to launch the server process
Added:
geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/
- copied from r568244, geronimo/sandbox/server-gshell-launcher/assemblies/geronimo-jetty6-javaee5-gshell/
geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/src/main/underlay/
geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/src/main/underlay/bin/
geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/src/main/underlay/bin/gsh
geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/src/main/underlay/bin/gsh.bat (with props)
geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/src/main/underlay/bin/startup
geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/src/main/underlay/bin/startup.bat (with props)
geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/src/main/underlay/etc/
geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/src/main/underlay/etc/commons-logging.properties (with props)
geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/src/main/underlay/etc/gsh-classworlds.conf (with props)
geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/src/main/underlay/etc/gsh-log4j.properties (with props)
geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/src/main/underlay/etc/gsh.properties (with props)
geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/src/main/underlay/etc/rc.d/
geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/src/main/underlay/etc/rc.d/start-server,example.groovy (with props)
Removed:
geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/src/main/config/
geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/src/main/scripts/
Modified:
geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/src/main/assembly/bin.xml
geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/src/main/resources/var/config/config.xml
geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/src/main/resources/var/config/jsr88-configurer-config.xml
geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/src/main/resources/var/config/offline-deployer-config.xml
geronimo/server/trunk/assemblies/pom.xml
Modified: geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/src/main/assembly/bin.xml?rev=568255&r1=568244&r2=568255&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/src/main/assembly/bin.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/src/main/assembly/bin.xml Tue Aug 21 13:22:10 2007
@@ -38,7 +38,12 @@
</fileSet>
<fileSet>
- <directory>src/main/scripts</directory>
+ <directory>src/main/underlay/etc</directory>
+ <outputDirectory>etc</outputDirectory>
+ </fileSet>
+
+ <fileSet>
+ <directory>src/main/underlay/bin</directory>
<outputDirectory>bin</outputDirectory>
<includes>
<include>gsh</include>
@@ -49,7 +54,7 @@
</fileSet>
<fileSet>
- <directory>src/main/scripts</directory>
+ <directory>src/main/underlay/bin</directory>
<outputDirectory>bin</outputDirectory>
<includes>
<include>gsh.bat</include>
@@ -59,7 +64,7 @@
</fileSet>
<fileSet>
- <directory>src/main/config</directory>
+ <directory>src/main/underlay/etc</directory>
<outputDirectory>etc</outputDirectory>
</fileSet>
Modified: geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/src/main/resources/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/src/main/resources/var/config/config.xml?rev=568255&r1=568244&r2=568255&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/src/main/resources/var/config/config.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/src/main/resources/var/config/config.xml Tue Aug 21 13:22:10 2007
@@ -24,7 +24,7 @@
<!-- any comments added to this file will be lost. -->
<!-- ======================================================== -->
-<attributes xmlns="http://geronimo.apache.org/xml/ns/attributes-1.1">
+<attributes xmlns="http://geronimo.apache.org/xml/ns/attributes-1.2">
<module name="org.apache.geronimo.configs/rmi-naming/${version}/car">
<gbean name="RMIRegistry">
@@ -128,11 +128,15 @@
NOTE: n.b. be sure the gbean deployer is explicitly loaded before j2ee-deployer
so that defaultEnvironment overrides work properly
-->
- <module name="org.apache.geronimo.configs/geronimo-gbean-deployer/${version}/car"/>
+ <module name="org.apache.geronimo.configs/geronimo-gbean-deployer/${version}/car">
+ <gbean name="Deployer">
+ <attribute name="remoteDeployAddress">http://${RemoteDeployHostname}:${HTTPPortPrimary + PortOffset}</attribute>
+ </gbean>
+ </module>
<module name="org.apache.geronimo.configs/j2ee-deployer/${version}/car">
<gbean name="WebBuilder">
- <attribute name="defaultNamespace">http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.2</attribute>
+ <attribute name="defaultNamespace">http://geronimo.apache.org/xml/ns/j2ee/web/jetty-2.0</attribute>
</gbean>
<gbean name="EnvironmentEntryBuilder">
<attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</attribute>
Modified: geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/src/main/resources/var/config/jsr88-configurer-config.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/src/main/resources/var/config/jsr88-configurer-config.xml?rev=568255&r1=568244&r2=568255&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/src/main/resources/var/config/jsr88-configurer-config.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/src/main/resources/var/config/jsr88-configurer-config.xml Tue Aug 21 13:22:10 2007
@@ -18,7 +18,7 @@
<!-- $Rev$ $Date$ -->
-<attributes xmlns="http://geronimo.apache.org/xml/ns/attributes-1.1">
+<attributes xmlns="http://geronimo.apache.org/xml/ns/attributes-1.2">
<module name="org.apache.geronimo.configs/jsr88-cli/${version}/car"/>
<module name="org.apache.geronimo.configs/jsr88-jar-configurer/${version}/car"/>
<module name="org.apache.geronimo.configs/jsr88-rar-configurer/${version}/car"/>
Modified: geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/src/main/resources/var/config/offline-deployer-config.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/src/main/resources/var/config/offline-deployer-config.xml?rev=568255&r1=568244&r2=568255&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/src/main/resources/var/config/offline-deployer-config.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/src/main/resources/var/config/offline-deployer-config.xml Tue Aug 21 13:22:10 2007
@@ -18,7 +18,7 @@
<!-- $Rev$ $Date$ -->
-<attributes xmlns="http://geronimo.apache.org/xml/ns/attributes-1.1">
+<attributes xmlns="http://geronimo.apache.org/xml/ns/attributes-1.2">
<module name="org.apache.geronimo.configs/geronimo-gbean-deployer/${version}/car"/>
<module name="org.apache.geronimo.configs/j2ee-deployer/${version}/car"/>
<module name="org.apache.geronimo.configs/client-deployer/${version}/car"/>
Added: geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/src/main/underlay/bin/gsh
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/src/main/underlay/bin/gsh?rev=568255&view=auto
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/src/main/underlay/bin/gsh (added)
+++ geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/src/main/underlay/bin/gsh Tue Aug 21 13:22:10 2007
@@ -0,0 +1,63 @@
+#!/bin/sh
+##
+## 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: 539227 $ $Date: 2007-05-17 19:48:49 -0700 (Thu, 17 May 2007) $
+##
+
+DIRNAME=`dirname "$0"`
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false;
+case "`uname`" in
+ CYGWIN*)
+ cygwin=true
+ ;;
+esac
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin ; then
+ [ -n "$GSHELL_HOME" ] && GSHELL_HOME=`cygpath --unix "$GSHELL_HOME"`
+ [ -n "$JAVACMD" ] && JAVACMD=`cygpath --unix "$JAVACMD"`
+ [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+fi
+
+# Locate GSHELL_HOME if not it is not set
+if [ "x$GSHELL_HOME" = "x" ]; then
+ GSHELL_HOME=`cd "$DIRNAME/.."; pwd`
+fi
+
+# Determine the Java command to use to start the JVM
+if [ -z "$JAVACMD" ]; then
+ if [ -n "$JAVA_HOME" ]; then
+ JAVACMD="$JAVA_HOME/bin/java"
+ else
+ JAVACMD="java"
+ fi
+fi
+
+BOOTJAR="$GSHELL_HOME/lib/boot/gshell-bootstrap.jar"
+if $cygwin ; then
+ BOOTJAR=`cygpath --windows "$BOOTJAR"`
+fi
+
+# Start the JVM
+exec "$JAVACMD" $JAVA_OPTS -jar "$BOOTJAR" "$@"
+
Added: geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/src/main/underlay/bin/gsh.bat
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/src/main/underlay/bin/gsh.bat?rev=568255&view=auto
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/src/main/underlay/bin/gsh.bat (added)
+++ geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/src/main/underlay/bin/gsh.bat Tue Aug 21 13:22:10 2007
@@ -0,0 +1,81 @@
+@if "%DEBUG%" == "" @echo off
+rem
+rem Licensed to the Apache Software Foundation (ASF) under one
+rem or more contributor license agreements. See the NOTICE file
+rem distributed with this work for additional information
+rem regarding copyright ownership. The ASF licenses this file
+rem to you under the Apache License, Version 2.0 (the
+rem "License"); you may not use this file except in compliance
+rem with the License. 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,
+rem software distributed under the License is distributed on an
+rem "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+rem KIND, either express or implied. See the License for the
+rem specific language governing permissions and limitations
+rem under the License.
+rem
+
+rem
+rem $Rev$ $Date$
+rem
+
+if "%OS%"=="Windows_NT" setlocal
+
+:begin
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.\
+
+:check_JAVACMD
+if not "%JAVACMD%" == "" goto check_GSHELL_HOME
+
+:check_JAVA_HOME
+if not "%JAVA_HOME%" == "" goto have_JAVA_HOME
+set JAVACMD=java
+goto check_GSHELL_HOME
+
+:have_JAVA_HOME
+set JAVACMD=%JAVA_HOME%\bin\java
+goto check_GSHELL_HOME
+
+:check_GSHELL_HOME
+if "%GSHELL_HOME%" == "" set GSHELL_HOME=%DIRNAME%..
+
+:init
+rem Get command-line arguments, handling Windowz variants
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%eval[2+2]" == "4" goto 4NT_args
+
+rem Regular WinNT shell
+set ARGS=%*
+goto execute
+
+:win9xME_args
+rem Slurp the command line arguments. This loop allows for an unlimited number
+set ARGS=
+
+:win9xME_args_slurp
+if "x%1" == "x" goto execute
+set ARGS=%ARGS% %1
+shift
+goto win9xME_args_slurp
+
+:4NT_args
+rem Get arguments from the 4NT Shell from JP Software
+set ARGS=%$
+
+:execute
+
+set BOOTJAR=%GSHELL_HOME%\lib\boot\gshell-bootstrap.jar
+
+rem Start the JVM
+"%JAVACMD%" %JAVA_OPTS% -jar "%BOOTJAR% %ARGS%
+
+:end
+
+if "%OS%"=="Windows_NT" endlocal
+if "%GSHELL_BATCH_PAUSE%" == "on" pause
+
Propchange: geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/src/main/underlay/bin/gsh.bat
------------------------------------------------------------------------------
svn:eol-style = CRLF
Propchange: geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/src/main/underlay/bin/gsh.bat
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/src/main/underlay/bin/gsh.bat
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/src/main/underlay/bin/startup
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/src/main/underlay/bin/startup?rev=568255&view=auto
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/src/main/underlay/bin/startup (added)
+++ geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/src/main/underlay/bin/startup Tue Aug 21 13:22:10 2007
@@ -0,0 +1,28 @@
+#!/bin/sh
+##
+## 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: 539227 $ $Date: 2007-05-17 19:48:49 -0700 (Thu, 17 May 2007) $
+##
+
+DIRNAME=`dirname "$0"`
+
+exec "$DIRNAME/gsh" start-server "$@"
+
Added: geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/src/main/underlay/bin/startup.bat
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/src/main/underlay/bin/startup.bat?rev=568255&view=auto
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/src/main/underlay/bin/startup.bat (added)
+++ geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/src/main/underlay/bin/startup.bat Tue Aug 21 13:22:10 2007
@@ -0,0 +1,37 @@
+@if "%DEBUG%" == "" @echo off
+rem
+rem Licensed to the Apache Software Foundation (ASF) under one
+rem or more contributor license agreements. See the NOTICE file
+rem distributed with this work for additional information
+rem regarding copyright ownership. The ASF licenses this file
+rem to you under the Apache License, Version 2.0 (the
+rem "License"); you may not use this file except in compliance
+rem with the License. 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,
+rem software distributed under the License is distributed on an
+rem "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+rem KIND, either express or implied. See the License for the
+rem specific language governing permissions and limitations
+rem under the License.
+rem
+
+rem
+rem $Rev$ $Date$
+rem
+
+if "%OS%"=="Windows_NT" setlocal
+
+:begin
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.\
+
+"%DIRNAME%\gsh.bat" %*
+
+:end
+
+if "%OS%"=="Windows_NT" endlocal
+
Propchange: geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/src/main/underlay/bin/startup.bat
------------------------------------------------------------------------------
svn:eol-style = CRLF
Propchange: geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/src/main/underlay/bin/startup.bat
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/src/main/underlay/bin/startup.bat
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/src/main/underlay/etc/commons-logging.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/src/main/underlay/etc/commons-logging.properties?rev=568255&view=auto
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/src/main/underlay/etc/commons-logging.properties (added)
+++ geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/src/main/underlay/etc/commons-logging.properties Tue Aug 21 13:22:10 2007
@@ -0,0 +1,27 @@
+##
+## 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$
+##
+
+# Log4j is assumed to be the default logging provider for allowing runtime
+# customizations of logging levels/appenders
+
+org.apache.commons.logging.Log=org.apache.commons.logging.impl.Log4JLogger
\ No newline at end of file
Propchange: geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/src/main/underlay/etc/commons-logging.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/src/main/underlay/etc/commons-logging.properties
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/src/main/underlay/etc/commons-logging.properties
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/src/main/underlay/etc/gsh-classworlds.conf
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/src/main/underlay/etc/gsh-classworlds.conf?rev=568255&view=auto
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/src/main/underlay/etc/gsh-classworlds.conf (added)
+++ geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/src/main/underlay/etc/gsh-classworlds.conf Tue Aug 21 13:22:10 2007
@@ -0,0 +1,29 @@
+##
+## 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$
+##
+
+main is org.apache.geronimo.gshell.cli.Main from gshell
+
+[gshell]
+load ${gshell.home}/etc
+load ${gshell.home}/lib/gshell/*.jar
+
Propchange: geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/src/main/underlay/etc/gsh-classworlds.conf
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/src/main/underlay/etc/gsh-classworlds.conf
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/src/main/underlay/etc/gsh-classworlds.conf
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/src/main/underlay/etc/gsh-log4j.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/src/main/underlay/etc/gsh-log4j.properties?rev=568255&view=auto
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/src/main/underlay/etc/gsh-log4j.properties (added)
+++ geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/src/main/underlay/etc/gsh-log4j.properties Tue Aug 21 13:22:10 2007
@@ -0,0 +1,41 @@
+##
+## 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$
+##
+
+log4j.rootCategory=DEBUG, CONSOLE, FILE
+
+log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
+log4j.appender.CONSOLE.Target=System.out
+log4j.appender.CONSOLE.Threshold=${gshell.log.console.level}
+log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
+log4j.appender.CONSOLE.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}] %m%n
+
+log4j.appender.FILE=org.apache.log4j.FileAppender
+log4j.appender.FILE.File=${gshell.home}/log/gshell.log
+log4j.appender.FILE.Append=false
+log4j.appender.FILE.Threshold=DEBUG
+log4j.appender.FILE.layout=org.apache.log4j.PatternLayout
+log4j.appender.FILE.layout.ConversionPattern=%d{ABSOLUTE} %-5p (%t) [%c] %m%n
+
+log4j.logger.org.springframework=WARN
+log4j.logger.org.apache.xbean.spring=WARN
+
Propchange: geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/src/main/underlay/etc/gsh-log4j.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/src/main/underlay/etc/gsh-log4j.properties
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/src/main/underlay/etc/gsh-log4j.properties
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/src/main/underlay/etc/gsh.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/src/main/underlay/etc/gsh.properties?rev=568255&view=auto
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/src/main/underlay/etc/gsh.properties (added)
+++ geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/src/main/underlay/etc/gsh.properties Tue Aug 21 13:22:10 2007
@@ -0,0 +1,25 @@
+##
+## 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$
+##
+
+geronimo.home=${gshell.home}
+
Propchange: geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/src/main/underlay/etc/gsh.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/src/main/underlay/etc/gsh.properties
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/src/main/underlay/etc/gsh.properties
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/src/main/underlay/etc/rc.d/start-server,example.groovy
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/src/main/underlay/etc/rc.d/start-server%2Cexample.groovy?rev=568255&view=auto
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/src/main/underlay/etc/rc.d/start-server,example.groovy (added)
+++ geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/src/main/underlay/etc/rc.d/start-server,example.groovy Tue Aug 21 13:22:10 2007
@@ -0,0 +1,23 @@
+/*
+ * 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.
+ */
+
+println 'Adding custom flags to the JVM'
+
+command.javaFlags << '-Xmx512m'
+
Propchange: geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/src/main/underlay/etc/rc.d/start-server,example.groovy
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/src/main/underlay/etc/rc.d/start-server,example.groovy
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/src/main/underlay/etc/rc.d/start-server,example.groovy
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: geronimo/server/trunk/assemblies/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/pom.xml?rev=568255&r1=568254&r2=568255&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/pom.xml (original)
+++ geronimo/server/trunk/assemblies/pom.xml Tue Aug 21 13:22:10 2007
@@ -44,6 +44,11 @@
<module>geronimo-boilerplate-jee5</module>
<module>geronimo-jetty6-jee5</module>
<module>geronimo-tomcat6-jee5</module>
+ <!--
+ NOTE: Don't enable by default for now...
+
+ <module>geronimo-jetty6-javaee5-gshell</module>
+ -->
<module>geronimo-framework</module>
<module>geronimo-jetty6-minimal</module>
<module>geronimo-tomcat6-minimal</module>