geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r409063 - in /geronimo/sandbox/gshell/trunk: ./ gshell-assembly/ gshell-assembly/src/ gshell-assembly/src/main/ gshell-assembly/src/main/assembly/ gshell-assembly/src/main/config/ gshell-assembly/src/main/scripts/ gshell-cli/ gshell-cli/src...
Date Wed, 24 May 2006 03:42:47 GMT
Author: jdillon
Date: Tue May 23 20:42:46 2006
New Revision: 409063

URL: http://svn.apache.org/viewvc?rev=409063&view=rev
Log:
Split up cli and assembly into seperate modules


Added:
    geronimo/sandbox/gshell/trunk/gshell-assembly/
    geronimo/sandbox/gshell/trunk/gshell-assembly/LICENSE.txt   (with props)
    geronimo/sandbox/gshell/trunk/gshell-assembly/README.txt   (with props)
    geronimo/sandbox/gshell/trunk/gshell-assembly/pom.xml   (with props)
    geronimo/sandbox/gshell/trunk/gshell-assembly/src/
    geronimo/sandbox/gshell/trunk/gshell-assembly/src/main/
    geronimo/sandbox/gshell/trunk/gshell-assembly/src/main/assembly/
    geronimo/sandbox/gshell/trunk/gshell-assembly/src/main/assembly/bin.xml   (with props)
    geronimo/sandbox/gshell/trunk/gshell-assembly/src/main/config/
    geronimo/sandbox/gshell/trunk/gshell-assembly/src/main/config/gshell.conf
    geronimo/sandbox/gshell/trunk/gshell-assembly/src/main/config/gshell.properties   (with
props)
    geronimo/sandbox/gshell/trunk/gshell-assembly/src/main/config/gshell.xml   (with props)
    geronimo/sandbox/gshell/trunk/gshell-assembly/src/main/config/log4j.properties   (with
props)
    geronimo/sandbox/gshell/trunk/gshell-assembly/src/main/scripts/
    geronimo/sandbox/gshell/trunk/gshell-assembly/src/main/scripts/gshell
    geronimo/sandbox/gshell/trunk/gshell-assembly/src/main/scripts/gshell.bat   (with props)
Removed:
    geronimo/sandbox/gshell/trunk/gshell-cli/src/main/assembly/
    geronimo/sandbox/gshell/trunk/gshell-cli/src/main/config/
    geronimo/sandbox/gshell/trunk/gshell-cli/src/main/scripts/
Modified:
    geronimo/sandbox/gshell/trunk/gshell-cli/pom.xml
    geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/GShellImpl.java
    geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/command/CommandManager.java
    geronimo/sandbox/gshell/trunk/pom.xml

Added: geronimo/sandbox/gshell/trunk/gshell-assembly/LICENSE.txt
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-assembly/LICENSE.txt?rev=409063&view=auto
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-assembly/LICENSE.txt (added)
+++ geronimo/sandbox/gshell/trunk/gshell-assembly/LICENSE.txt Tue May 23 20:42:46 2006
@@ -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-assembly/LICENSE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/sandbox/gshell/trunk/gshell-assembly/README.txt
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-assembly/README.txt?rev=409063&view=auto
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-assembly/README.txt (added)
+++ geronimo/sandbox/gshell/trunk/gshell-assembly/README.txt Tue May 23 20:42:46 2006
@@ -0,0 +1 @@
+

Propchange: geronimo/sandbox/gshell/trunk/gshell-assembly/README.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/sandbox/gshell/trunk/gshell-assembly/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-assembly/pom.xml?rev=409063&view=auto
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-assembly/pom.xml (added)
+++ geronimo/sandbox/gshell/trunk/gshell-assembly/pom.xml Tue May 23 20:42:46 2006
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- $Id: pom.xml 407929 2006-05-19 23:04:27Z jdillon $ -->
+
+<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-assembly</artifactId>
+    <name>GShell :: Assembly</name>
+    <packaging>pom</packaging>
+    
+    <dependencies>
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>gshell-core</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+	<dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>gshell-cli</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>standard-commands</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>scripting-commands</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+    </dependencies>
+    
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <configuration>
+                    <descriptors>
+                        <descriptor>src/main/assembly/bin.xml</descriptor>
+                    </descriptors>
+                    <finalName>gshell-${pom.version}</finalName>
+                </configuration>
+                
+                <!--
+                
+                FIXME: Stupid assembly plugin does not root itself correctly
+                
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>directory</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                -->
+            </plugin>
+        </plugins>
+    </build>
+</project>

Propchange: geronimo/sandbox/gshell/trunk/gshell-assembly/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: 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?rev=409063&view=auto
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-assembly/src/main/assembly/bin.xml (added)
+++ geronimo/sandbox/gshell/trunk/gshell-assembly/src/main/assembly/bin.xml Tue May 23 20:42:46
2006
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- $Id: bin.xml 406783 2006-05-15 17:11:04 -0700 (Mon, 15 May 2006) jdillon $ -->
+
+<assembly>
+    <id>bin</id>
+    
+    <formats>
+        <format>tar.gz</format>
+        <format>tar.bz2</format>
+        <format>zip</format>
+    </formats>
+    
+    <fileSets>
+        <fileSet>
+            <includes>
+                <include>README.txt</include>
+                <include>LICENSE.txt</include>
+            </includes>
+        </fileSet>
+        
+        <fileSet>
+            <directory>src/main/scripts</directory>
+            <outputDirectory>bin</outputDirectory>
+            <includes>
+                <include>gshell.bat</include>
+                <include>gshell.conf</include>
+            </includes>
+            <lineEnding>dos</lineEnding>
+        </fileSet>
+        
+        <fileSet>
+            <directory>src/main/scripts</directory>
+            <outputDirectory>bin</outputDirectory>
+            <includes>
+                <include>gshell</include>
+            </includes>
+            <lineEnding>unix</lineEnding>
+            <fileMode>0755</fileMode>
+        </fileSet>
+        
+        <fileSet>
+            <directory>src/main/config</directory>
+            <outputDirectory>etc</outputDirectory>
+        </fileSet>
+        
+        <fileSet>
+            <directory>target</directory>
+            <outputDirectory>lib</outputDirectory>
+            <includes>
+                <include>gshell-cli-*.jar</include>
+            </includes>
+            <excludes>
+                <exclude>gshell-cli-*-sources.jar</exclude>
+            </excludes>
+        </fileSet>
+    </fileSets>
+    
+    <dependencySets>
+        <dependencySet>
+            <outputDirectory>lib</outputDirectory>
+            <excludes>
+                <exclude>classworlds:classworlds</exclude>
+            </excludes>
+        </dependencySet>
+        
+        <dependencySet>
+            <outputDirectory>lib/boot</outputDirectory>
+            <includes>
+                <include>classworlds:classworlds</include>
+            </includes>
+        </dependencySet>
+    </dependencySets>
+</assembly>

Propchange: geronimo/sandbox/gshell/trunk/gshell-assembly/src/main/assembly/bin.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/sandbox/gshell/trunk/gshell-assembly/src/main/config/gshell.conf
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-assembly/src/main/config/gshell.conf?rev=409063&view=auto
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-assembly/src/main/config/gshell.conf (added)
+++ geronimo/sandbox/gshell/trunk/gshell-assembly/src/main/config/gshell.conf Tue May 23 20:42:46
2006
@@ -0,0 +1,14 @@
+##
+## $Id$
+##
+
+main is org.apache.geronimo.gshell.cli.Main from gshell.core
+
+##
+## set maven.home default ${user.home}/m2
+##
+
+[gshell.core]
+load ${gshell.home}/etc
+load ${gshell.home}/lib/*.jar
+

Added: geronimo/sandbox/gshell/trunk/gshell-assembly/src/main/config/gshell.properties
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-assembly/src/main/config/gshell.properties?rev=409063&view=auto
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-assembly/src/main/config/gshell.properties (added)
+++ geronimo/sandbox/gshell/trunk/gshell-assembly/src/main/config/gshell.properties Tue May
23 20:42:46 2006
@@ -0,0 +1,4 @@
+##
+## $Id: gshell.properties 399599 2006-05-04 08:13:57Z jdillon $
+##
+

Propchange: geronimo/sandbox/gshell/trunk/gshell-assembly/src/main/config/gshell.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/sandbox/gshell/trunk/gshell-assembly/src/main/config/gshell.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-assembly/src/main/config/gshell.xml?rev=409063&view=auto
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-assembly/src/main/config/gshell.xml (added)
+++ geronimo/sandbox/gshell/trunk/gshell-assembly/src/main/config/gshell.xml Tue May 23 20:42:46
2006
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+
+<!-- $Id -->
+
+<beans>
+
+    <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+        <property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE"/>
+        <property name="locations">
+            <list>
+                <value>classpath:/gshell.properties</value>
+            </list>
+        </property>
+    </bean>
+    
+    <bean id="gshell" class="org.apache.geronimo.gshell.GShellImpl">
+    </bean>
+    
+</beans>

Propchange: geronimo/sandbox/gshell/trunk/gshell-assembly/src/main/config/gshell.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/sandbox/gshell/trunk/gshell-assembly/src/main/config/log4j.properties
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-assembly/src/main/config/log4j.properties?rev=409063&view=auto
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-assembly/src/main/config/log4j.properties (added)
+++ geronimo/sandbox/gshell/trunk/gshell-assembly/src/main/config/log4j.properties Tue May
23 20:42:46 2006
@@ -0,0 +1,22 @@
+##
+## $Id: log4j.properties 399599 2006-05-04 08:13:57Z jdillon $
+##
+
+log4j.rootCategory=DEBUG, CONSOLE
+
+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/sandbox/gshell/trunk/gshell-assembly/src/main/config/log4j.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/sandbox/gshell/trunk/gshell-assembly/src/main/scripts/gshell
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-assembly/src/main/scripts/gshell?rev=409063&view=auto
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-assembly/src/main/scripts/gshell (added)
+++ geronimo/sandbox/gshell/trunk/gshell-assembly/src/main/scripts/gshell Tue May 23 20:42:46
2006
@@ -0,0 +1,125 @@
+#!/bin/sh
+##
+## $Id$
+##
+
+PROGNAME=`basename "$0"`
+DIRNAME=`dirname "$0"`
+
+# Use the maximum available, or set MAX_FD != -1 to use that
+MAX_FD="maximum"
+
+# The version of classworlds to boot with
+CLASSWORLDS_VERSION="1.1"
+
+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"`
+fi
+
+# Locate GSHELL_HOME if not it is not set
+if [ "x$GSHELL_HOME" = "x" ]; then
+    GSHELL_HOME=`cd "$DIRNAME/.."; pwd`
+fi
+
+# Use default classworlds config
+if [ -z "$CLASSWORLDS_CONF" ]; then
+    CLASSWORLDS_CONF="$GSHELL_HOME/etc/gshell.conf"
+fi
+CLASSWORLDS_CLASSPATH="$GSHELL_HOME/lib/boot/classworlds-${CLASSWORLDS_VERSION}.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
+    else
+        JAVACMD="java"
+    fi
+fi
+if [ ! -x "$JAVACMD" ]; then
+    die "JAVA_HOME is not defined correctly; can not execute: $JAVACMD"
+fi
+if [ -z "$JAVA_HOME" ] ; then
+    warn "JAVA_HOME environment variable is not set"
+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 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" \
+        org.codehaus.classworlds.Launcher "$@"
+fi

Added: geronimo/sandbox/gshell/trunk/gshell-assembly/src/main/scripts/gshell.bat
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-assembly/src/main/scripts/gshell.bat?rev=409063&view=auto
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-assembly/src/main/scripts/gshell.bat (added)
+++ geronimo/sandbox/gshell/trunk/gshell-assembly/src/main/scripts/gshell.bat Tue May 23 20:42:46
2006
@@ -0,0 +1,101 @@
+@if "%DEBUG%" == "" @echo off
+@rem 
+@rem $Id$
+@rem 
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+@rem The version of classworlds to boot with
+set CLASSWORLDS_VERSION=1.1
+
+:begin
+@rem Determine what directory it is in.
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.\
+
+@rem Determine the command interpreter to execute the "CD" later
+set COMMAND_COM="cmd.exe"
+if exist "%SystemRoot%\system32\cmd.exe" set COMMAND_COM="%SystemRoot%\system32\cmd.exe"
+if exist "%SystemRoot%\command.com" set COMMAND_COM="%SystemRoot%\command.com"
+
+@rem Use explicit find.exe to prevent cygwin and others find.exe from being used
+set FIND_EXE="find.exe"
+if exist "%SystemRoot%\system32\find.exe" set FIND_EXE="%SystemRoot%\system32\find.exe"
+if exist "%SystemRoot%\command\find.exe" set FIND_EXE="%SystemRoot%\command\find.exe"
+
+:check_JAVA_HOME
+@rem Make sure we have a valid JAVA_HOME
+if not "%JAVA_HOME%" == "" goto have_JAVA_HOME
+
+echo.
+echo ERROR: Environment variable JAVA_HOME has not been set.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+echo.
+goto end
+
+:have_JAVA_HOME
+@rem Validate JAVA_HOME
+%COMMAND_COM% /C DIR "%JAVA_HOME%" 2>&1 | %FIND_EXE% /I /C "%JAVA_HOME%" >nul
+if not errorlevel 1 goto check_GSHELL_HOME
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+echo.
+goto end
+
+:check_GSHELL_HOME
+@rem Define GSHELL_HOME if not set
+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 CMD_LINE_ARGS=%*
+goto execute
+
+:win9xME_args
+@rem Slurp the command line arguments.  This loop allows for an unlimited number
+set CMD_LINE_ARGS=
+
+:win9xME_args_slurp
+if "x%1" == "x" goto execute
+set CMD_LINE_ARGS=%CMD_LINE_ARGS% %1
+shift
+goto win9xME_args_slurp
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+@rem Setup the command line
+set CLASSWORLDS_CLASSPATH=%GSHELL_HOME%\lib\boot\classworlds-%CLASSWORLDS_VERSION%.jar
+set CLASSWORLDS_MAIN_CLASS=org.codehaus.classworlds.Launcher
+set CLASSWORLDS_CONF=%GSHELL_HOME%\etc\gshell.conf
+
+set JAVA_EXE=%JAVA_HOME%\bin\java.exe
+
+if "%JAVA_OPTS%" == "" set JAVA_OPTS=""
+set JAVA_OPTS=%JAVA_OPTS% -Dprogram.name="%PROGNAME%"
+set JAVA_OPTS=%JAVA_OPTS% -Dgshell.home="%GSHELL_HOME%"
+set JAVA_OPTS=%JAVA_OPTS% -Dclassworlds.conf="%CLASSWORLDS_CONF%"
+
+@rem Execute Gshell
+"%JAVA_EXE%" %JAVA_OPTS% -classpath "%CLASSWORLDS_CLASSPATH%" %CLASSWORLDS_MAIN_CLASS% %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" endlocal
+
+@rem Optional pause the batch file
+if "%GSHELL_BATCH_PAUSE%" == "on" pause
+

Propchange: geronimo/sandbox/gshell/trunk/gshell-assembly/src/main/scripts/gshell.bat
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: geronimo/sandbox/gshell/trunk/gshell-cli/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-cli/pom.xml?rev=409063&r1=409062&r2=409063&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-cli/pom.xml (original)
+++ geronimo/sandbox/gshell/trunk/gshell-cli/pom.xml Tue May 23 20:42:46 2006
@@ -26,18 +26,6 @@
             <artifactId>gshell-core</artifactId>
             <version>${pom.version}</version>
         </dependency>
-        
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>standard-commands</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>scripting-commands</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
 
         <dependency>
             <groupId>classworlds</groupId>
@@ -49,32 +37,5 @@
             <artifactId>commons-cli</artifactId>
         </dependency>
     </dependencies>
-    
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <configuration>
-                    <descriptors>
-                        <descriptor>src/main/assembly/bin.xml</descriptor>
-                    </descriptors>
-                    <finalName>gshell-${pom.version}</finalName>
-                </configuration>
-                
-                <!--
-                
-                FIXME: Stupid assembly plugin does not root itself correctly
-                
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>directory</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                -->
-            </plugin>
-        </plugins>
-    </build>
+
 </project>

Modified: geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/GShellImpl.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/GShellImpl.java?rev=409063&r1=409062&r2=409063&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/GShellImpl.java
(original)
+++ geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/GShellImpl.java
Tue May 23 20:42:46 2006
@@ -22,6 +22,7 @@
 import org.apache.geronimo.gshell.command.CommandContext;
 import org.apache.geronimo.gshell.command.Variables;
 import org.apache.geronimo.gshell.command.VariablesMap;
+import org.apache.geronimo.gshell.command.CommandManager;
 import org.apache.geronimo.gshell.console.IO;
 import org.apache.geronimo.gshell.util.Arguments;
 import org.springframework.beans.BeansException;
@@ -40,7 +41,7 @@
 
     private IO io;
     private ApplicationContext ctx;
-    
+
     public void setIO(final IO io) {
         assert io != null;
         
@@ -72,8 +73,10 @@
         //
         // HACK: Just get something working right now
         //
-        
-        Command cmd = (Command)ctx.getBean(commandName);
+
+        Command cmd = new CommandManager().getCommand(commandName);
+
+        // Command cmd = (Command)ctx.getBean(commandName);
         
         cmd.init(new CommandContext() {
             Variables vars = new VariablesMap();

Modified: geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/command/CommandManager.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/command/CommandManager.java?rev=409063&r1=409062&r2=409063&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/command/CommandManager.java
(original)
+++ geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/command/CommandManager.java
Tue May 23 20:42:46 2006
@@ -22,6 +22,7 @@
 import java.util.Iterator;
 import java.util.Map;
 import java.util.Properties;
+import java.util.HashMap;
 
 /**
  * ???
@@ -30,6 +31,8 @@
  */
 public class CommandManager
 {
+    private Map<String,Properties> commandDefMap = new HashMap<String,Properties>();
+
     public CommandManager() throws IOException {
         ResourceFinder resourceFinder = new ResourceFinder("META-INF/");
 
@@ -37,12 +40,25 @@
         Iterator<String> iter = propertiesMap.keySet().iterator();
 
         while (iter.hasNext()) {
-            String name = iter.next();
-            Properties props = propertiesMap.get(name);
-            System.err.println("name: " + name);
-            System.err.println(props);
-            System.err.println("----");
+            String filename = iter.next();
+            Properties props = propertiesMap.get(filename);
+
+            String name = props.getProperty("name");
+            if (name != null) {
+                commandDefMap.put(name, props);
+            }
         }
+    }
+
+    public Command getCommand(final String name) throws ClassNotFoundException, IllegalAccessException,
InstantiationException {
+        assert name != null;
+
+        Properties props = commandDefMap.get(name);
+        ClassLoader cl = Thread.currentThread().getContextClassLoader();
+        Class type = cl.loadClass(props.getProperty("class"));
+        Command cmd = (Command)type.newInstance();
+
+        return cmd;
     }
 
     //

Modified: geronimo/sandbox/gshell/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/pom.xml?rev=409063&r1=409062&r2=409063&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/pom.xml (original)
+++ geronimo/sandbox/gshell/trunk/pom.xml Tue May 23 20:42:46 2006
@@ -169,6 +169,7 @@
         <module>gshell-core</module>
         <module>gshell-cli</module>
         <module>gshell-commands</module>
+        <module>gshell-assembly</module>
     </modules>
     
 </project>



Mime
View raw message