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/05/18 04:21:41 UTC
svn commit: r539222 - in /geronimo/sandbox/gshell/trunk: ./ gshell-api/
gshell-assembly/ gshell-assembly/src/main/assembly/
gshell-assembly/src/main/config/ gshell-assembly/src/main/scripts/
gshell-bootstrap/ gshell-bootstrap/src/ gshell-bootstrap/src/...
Author: jdillon
Date: Thu May 17 19:21:39 2007
New Revision: 539222
URL: http://svn.apache.org/viewvc?view=rev&rev=539222
Log:
Adding gshell-bootstrap module to help reduce the amount of platform script muck needed to get things going
Added:
geronimo/sandbox/gshell/trunk/gshell-assembly/src/main/config/gsh-classworlds.conf (with props)
geronimo/sandbox/gshell/trunk/gshell-bootstrap/
geronimo/sandbox/gshell/trunk/gshell-bootstrap/LICENSE.txt (with props)
geronimo/sandbox/gshell/trunk/gshell-bootstrap/pom.xml (with props)
geronimo/sandbox/gshell/trunk/gshell-bootstrap/src/
geronimo/sandbox/gshell/trunk/gshell-bootstrap/src/main/
geronimo/sandbox/gshell/trunk/gshell-bootstrap/src/main/java/
geronimo/sandbox/gshell/trunk/gshell-bootstrap/src/main/java/org/
geronimo/sandbox/gshell/trunk/gshell-bootstrap/src/main/java/org/apache/
geronimo/sandbox/gshell/trunk/gshell-bootstrap/src/main/java/org/apache/geronimo/
geronimo/sandbox/gshell/trunk/gshell-bootstrap/src/main/java/org/apache/geronimo/gshell/
geronimo/sandbox/gshell/trunk/gshell-bootstrap/src/main/java/org/apache/geronimo/gshell/bootstrap/
geronimo/sandbox/gshell/trunk/gshell-bootstrap/src/main/java/org/apache/geronimo/gshell/bootstrap/Launcher.java (with props)
Removed:
geronimo/sandbox/gshell/trunk/gshell-assembly/src/main/config/gsh.conf
Modified:
geronimo/sandbox/gshell/trunk/gshell-api/pom.xml
geronimo/sandbox/gshell/trunk/gshell-assembly/pom.xml
geronimo/sandbox/gshell/trunk/gshell-assembly/src/main/assembly/bin.xml
geronimo/sandbox/gshell/trunk/gshell-assembly/src/main/scripts/gsh
geronimo/sandbox/gshell/trunk/gshell-server/gshell-server-core/pom.xml
geronimo/sandbox/gshell/trunk/pom.xml
Modified: geronimo/sandbox/gshell/trunk/gshell-api/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-api/pom.xml?view=diff&rev=539222&r1=539221&r2=539222
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-api/pom.xml (original)
+++ geronimo/sandbox/gshell/trunk/gshell-api/pom.xml Thu May 17 19:21:39 2007
@@ -39,6 +39,21 @@
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
</dependencies>
<build>
Modified: geronimo/sandbox/gshell/trunk/gshell-assembly/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-assembly/pom.xml?view=diff&rev=539222&r1=539221&r2=539222
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-assembly/pom.xml (original)
+++ geronimo/sandbox/gshell/trunk/gshell-assembly/pom.xml Thu May 17 19:21:39 2007
@@ -38,6 +38,12 @@
<dependencies>
<dependency>
<groupId>${pom.groupId}</groupId>
+ <artifactId>gshell-bootstrap</artifactId>
+ <version>${version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
<artifactId>gshell-core</artifactId>
<version>${version}</version>
</dependency>
@@ -84,7 +90,12 @@
<groupId>commons-logging</groupId>
<artifactId>commons-logging-adapters</artifactId>
</dependency>
-
+
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </dependency>
+
<!-- Include at least one scripting language for now (bsh is nice and small) -->
<dependency>
<groupId>org.beanshell</groupId>
Modified: geronimo/sandbox/gshell/trunk/gshell-assembly/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-assembly/src/main/assembly/bin.xml?view=diff&rev=539222&r1=539221&r2=539222
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-assembly/src/main/assembly/bin.xml (original)
+++ geronimo/sandbox/gshell/trunk/gshell-assembly/src/main/assembly/bin.xml Thu May 17 19:21:39 2007
@@ -42,7 +42,6 @@
<outputDirectory>bin</outputDirectory>
<includes>
<include>gsh.bat</include>
- <include>gsh.conf</include>
</includes>
<lineEnding>dos</lineEnding>
</fileSet>
@@ -78,15 +77,26 @@
<dependencySet>
<outputDirectory>lib</outputDirectory>
<excludes>
+ <exclude>org.apache.geronimo.gshell:gshell-bootstrap</exclude>
<exclude>classworlds:classworlds</exclude>
</excludes>
</dependencySet>
-
+
<dependencySet>
<outputDirectory>lib/boot</outputDirectory>
- <outputFileNameMapping>classworlds.jar</outputFileNameMapping>
<includes>
<include>classworlds:classworlds</include>
+ </includes>
+ </dependencySet>
+
+ <!--
+ NOTE: Strip off the version number to keep platform scripts simpler.
+ -->
+ <dependencySet>
+ <outputDirectory>lib/boot</outputDirectory>
+ <outputFileNameMapping>gshell-bootstrap.jar</outputFileNameMapping>
+ <includes>
+ <include>org.apache.geronimo.gshell:gshell-bootstrap</include>
</includes>
</dependencySet>
</dependencySets>
Added: geronimo/sandbox/gshell/trunk/gshell-assembly/src/main/config/gsh-classworlds.conf
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-assembly/src/main/config/gsh-classworlds.conf?view=auto&rev=539222
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-assembly/src/main/config/gsh-classworlds.conf (added)
+++ geronimo/sandbox/gshell/trunk/gshell-assembly/src/main/config/gsh-classworlds.conf Thu May 17 19:21:39 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/*.jar
+
Propchange: geronimo/sandbox/gshell/trunk/gshell-assembly/src/main/config/gsh-classworlds.conf
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/sandbox/gshell/trunk/gshell-assembly/src/main/config/gsh-classworlds.conf
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/sandbox/gshell/trunk/gshell-assembly/src/main/config/gsh-classworlds.conf
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: geronimo/sandbox/gshell/trunk/gshell-assembly/src/main/scripts/gsh
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-assembly/src/main/scripts/gsh?view=diff&rev=539222&r1=539221&r2=539222
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-assembly/src/main/scripts/gsh (original)
+++ geronimo/sandbox/gshell/trunk/gshell-assembly/src/main/scripts/gsh Thu May 17 19:21:39 2007
@@ -25,39 +25,19 @@
PROGNAME=`basename "$0"`
DIRNAME=`dirname "$0"`
-# Use the maximum available, or set MAX_FD != -1 to use that
-MAX_FD="maximum"
-
-warn() {
- echo "${PROGNAME}: $*"
-}
-
-die() {
- warn "$*"
- exit 1
-}
-
# OS specific support (must be 'true' or 'false').
cygwin=false;
-darwin=false;
case "`uname`" in
CYGWIN*)
cygwin=true
;;
-
- Darwin*)
- darwin=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"`
+ [ -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
@@ -65,72 +45,15 @@
GSHELL_HOME=`cd "$DIRNAME/.."; pwd`
fi
-# Use default classworlds config
-if [ -z "$CLASSWORLDS_CONF" ]; then
- CLASSWORLDS_CONF="$GSHELL_HOME/etc/${PROGNAME}.conf"
-fi
-CLASSWORLDS_CLASSPATH="$GSHELL_HOME/lib/boot/classworlds.jar"
-
# Determine the Java command to use to start the JVM
if [ -z "$JAVACMD" ]; then
if [ -n "$JAVA_HOME" ]; then
- if [ -x "$JAVA_HOME/jre/sh/java" ]; then
- # IBM's JDK on AIX uses strange locations for the executables
- JAVACMD="$JAVA_HOME/jre/sh/java"
- else
- JAVACMD="$JAVA_HOME/bin/java"
- fi
+ JAVACMD="$JAVA_HOME/bin/java"
else
JAVACMD="java"
fi
fi
-# Increase the maximum file descriptors if we can
-if [ "$cygwin" = "false" ]; then
- MAX_FD_LIMIT=`ulimit -H -n`
- if [ $? -eq 0 ]; then
- if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ]; then
- # use the system max
- MAX_FD="$MAX_FD_LIMIT"
- fi
-
- ulimit -n $MAX_FD
- if [ $? -ne 0 ]; then
- warn "Could not set maximum file descriptor limit: $MAX_FD"
- fi
- else
- warn "Could not query system maximum file descriptor limit: $MAX_FD_LIMIT"
- fi
-fi
-
-# Setup Profiler
-useprofiler=false
-if [ "x$PROFILER" != "x" ]; then
- if [ -r "$PROFILER" ]; then
- . $PROFILER
- useprofiler=true
- else
- die "Profiler file not found: $PROFILER"
- fi
-fi
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin; then
- GSHELL_HOME=`cygpath --path --windows "$GSHELL_HOME"`
- JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
- CLASSWORLDS_CONF=`cygpath --path --windows "$CLASSWORLDS_CONF"`
- CLASSWORLDS_CLASSPATH=`cygpath --path --windows "$CLASSWORLDS_CLASSPATH"`
-fi
+# Start the JVM
+exec "$JAVACMD" $JAVA_OPTS -jar "$GSHELL_HOME/lib/boot/gshell-bootstrap.jar" "$@"
-# Start the Profiler or the JVM
-if $useprofiler; then
- runProfiler
-else
- exec $JAVACMD $JAVA_OPTS \
- -classpath "$CLASSWORLDS_CLASSPATH" \
- -Dprogram.name="$PROGNAME" \
- -Dclassworlds.conf="$CLASSWORLDS_CONF" \
- -Dgshell.home="$GSHELL_HOME" \
- -Dlog4j.configuration="${PROGNAME}-log4j.properties" \
- org.codehaus.classworlds.Launcher "$@"
-fi
Added: geronimo/sandbox/gshell/trunk/gshell-bootstrap/LICENSE.txt
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-bootstrap/LICENSE.txt?view=auto&rev=539222
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-bootstrap/LICENSE.txt (added)
+++ geronimo/sandbox/gshell/trunk/gshell-bootstrap/LICENSE.txt Thu May 17 19:21:39 2007
@@ -0,0 +1,203 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ 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.
+
Propchange: geronimo/sandbox/gshell/trunk/gshell-bootstrap/LICENSE.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/sandbox/gshell/trunk/gshell-bootstrap/LICENSE.txt
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/sandbox/gshell/trunk/gshell-bootstrap/LICENSE.txt
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: geronimo/sandbox/gshell/trunk/gshell-bootstrap/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-bootstrap/pom.xml?view=auto&rev=539222
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-bootstrap/pom.xml (added)
+++ geronimo/sandbox/gshell/trunk/gshell-bootstrap/pom.xml Thu May 17 19:21:39 2007
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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$ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.geronimo.gshell</groupId>
+ <artifactId>gshell</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>gshell-bootstrap</artifactId>
+ <name>GShell Bootstrap</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>classworlds</groupId>
+ <artifactId>classworlds</artifactId>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifest>
+ <mainClass>org.apache.geronimo.gshell.bootstrap.Launcher</mainClass>
+ <addClasspath>true</addClasspath>
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
\ No newline at end of file
Propchange: geronimo/sandbox/gshell/trunk/gshell-bootstrap/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/sandbox/gshell/trunk/gshell-bootstrap/pom.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/sandbox/gshell/trunk/gshell-bootstrap/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: geronimo/sandbox/gshell/trunk/gshell-bootstrap/src/main/java/org/apache/geronimo/gshell/bootstrap/Launcher.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-bootstrap/src/main/java/org/apache/geronimo/gshell/bootstrap/Launcher.java?view=auto&rev=539222
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-bootstrap/src/main/java/org/apache/geronimo/gshell/bootstrap/Launcher.java (added)
+++ geronimo/sandbox/gshell/trunk/gshell-bootstrap/src/main/java/org/apache/geronimo/gshell/bootstrap/Launcher.java Thu May 17 19:21:39 2007
@@ -0,0 +1,127 @@
+/*
+ * 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.
+ */
+
+package org.apache.geronimo.gshell.bootstrap;
+
+import java.io.File;
+
+/**
+ * Platform independent launcher to setup common configuration and delegate to
+ * the Classworlds launcher.
+ *
+ * @version $Rev$ $Date$
+ */
+public class Launcher
+{
+ private static boolean debug = Boolean.getBoolean(Launcher.class.getName() + ".debug");
+
+ private static String programName;
+
+ private static File homeDir;
+
+ public static void main(final String[] args) throws Exception {
+ assert args != null;
+
+ programName = getProgramName();
+ setProperty("program.name", programName);
+
+ homeDir = getHomeDir();
+ setProperty("gshell.home", homeDir.getCanonicalPath());
+
+ File classworldsConf = getClassworldsConf();
+ setProperty("classworlds.conf", classworldsConf.getCanonicalPath());
+
+ File log4jConf = getLog4jConf();
+ setProperty("log4j.configuration", log4jConf.toURL().toString());
+
+ // Delegate to the Classworlds launcher to finish booting
+ org.codehaus.classworlds.Launcher.main(args);
+ }
+
+ private static void debug(final String message) {
+ if (debug) {
+ System.err.println("[DEBUG] " + message);
+ }
+ }
+
+ private static void warn(final String message) {
+ System.err.println("[WARNING] " + message);
+ }
+
+ private static void setProperty(final String name, final String value) {
+ System.setProperty(name, value);
+ debug(name + "=" + value);
+ }
+
+ private static String getProgramName() {
+ String name = System.getProperty("program.name");
+ if (name == null) {
+ name = "gsh";
+ }
+
+ return name;
+ }
+
+ private static File getHomeDir() throws Exception {
+ String path = System.getProperty("gshell.home");
+ File dir;
+
+ if (path == null) {
+ String jarPath = Launcher.class.getProtectionDomain().getCodeSource().getLocation().getFile();
+ jarPath = java.net.URLDecoder.decode(jarPath);
+
+ // The jar containing this class is expected to be in <gshell.home>/lib/boot
+ File bootJar = new File(jarPath);
+ dir = bootJar.getParentFile().getParentFile().getParentFile().getCanonicalFile();
+ }
+ else {
+ dir = new File(path).getCanonicalFile();
+ }
+
+ return dir;
+ }
+
+ private static File getClassworldsConf() throws Exception {
+ String path = System.getProperty("classworlds.conf");
+ File file;
+
+ if (path == null) {
+ file = new File(homeDir, "etc/" + programName + "-classworlds.conf");
+ }
+ else {
+ file = new File(path).getCanonicalFile();
+ }
+
+ return file;
+ }
+
+ private static File getLog4jConf() throws Exception {
+ String path = System.getProperty("log4j.configuration");
+ File file;
+
+ if (path == null) {
+ file = new File(homeDir, "etc/" + programName + "-log4j.properties");
+ }
+ else {
+ file = new File(path).getCanonicalFile();
+ }
+
+ return file;
+ }
+}
Propchange: geronimo/sandbox/gshell/trunk/gshell-bootstrap/src/main/java/org/apache/geronimo/gshell/bootstrap/Launcher.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/sandbox/gshell/trunk/gshell-bootstrap/src/main/java/org/apache/geronimo/gshell/bootstrap/Launcher.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/sandbox/gshell/trunk/gshell-bootstrap/src/main/java/org/apache/geronimo/gshell/bootstrap/Launcher.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: geronimo/sandbox/gshell/trunk/gshell-server/gshell-server-core/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-server/gshell-server-core/pom.xml?view=diff&rev=539222&r1=539221&r2=539222
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-server/gshell-server-core/pom.xml (original)
+++ geronimo/sandbox/gshell/trunk/gshell-server/gshell-server-core/pom.xml Thu May 17 19:21:39 2007
@@ -42,6 +42,11 @@
</dependency>
<dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.geronimo</groupId>
<artifactId>geronimo-kernel</artifactId>
</dependency>
Modified: geronimo/sandbox/gshell/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/pom.xml?view=diff&rev=539222&r1=539221&r2=539222
==============================================================================
--- geronimo/sandbox/gshell/trunk/pom.xml (original)
+++ geronimo/sandbox/gshell/trunk/pom.xml Thu May 17 19:21:39 2007
@@ -178,6 +178,7 @@
</dependencies>
</dependencyManagement>
+ <!--
<dependencies>
<dependency>
<groupId>commons-logging</groupId>
@@ -199,7 +200,8 @@
<artifactId>junit</artifactId>
</dependency>
</dependencies>
-
+ -->
+
<build>
<pluginManagement>
<plugins>
@@ -307,6 +309,7 @@
<modules>
<module>repository</module>
+ <module>gshell-bootstrap</module>
<module>javacc-maven-plugin</module>
<module>gshell-api</module>
<module>gshell-core</module>