geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r570636 - in /geronimo/sandbox/gshell/trunk: ./ gshell-api/ gshell-assembly/ gshell-assembly/src/main/assembly/ gshell-cli/ gshell-cli/src/main/java/org/apache/geronimo/gshell/cli/ gshell-commands/ gshell-commands/gshell-scripting-commands/...
Date Wed, 29 Aug 2007 04:46:25 GMT
Author: jdillon
Date: Tue Aug 28 21:46:23 2007
New Revision: 570636

URL: http://svn.apache.org/viewvc?rev=570636&view=rev
Log:
Adding gshell-common module to hold on to commonly used bits, as well as to soak up some fluff from commons-lang to save ~100k
Added gshell-log4j which is a diet version of log4j saving about ~200k
Hooked back up usage of StopWatch and StringUtils

Added:
    geronimo/sandbox/gshell/trunk/gshell-common/
    geronimo/sandbox/gshell/trunk/gshell-common/LICENSE.txt   (with props)
    geronimo/sandbox/gshell/trunk/gshell-common/NOTICE.txt   (with props)
    geronimo/sandbox/gshell/trunk/gshell-common/pom.xml   (with props)
    geronimo/sandbox/gshell/trunk/gshell-common/src/
    geronimo/sandbox/gshell/trunk/gshell-common/src/main/
    geronimo/sandbox/gshell/trunk/gshell-common/src/main/java/
    geronimo/sandbox/gshell/trunk/gshell-common/src/main/java/org/
    geronimo/sandbox/gshell/trunk/gshell-common/src/main/java/org/apache/
    geronimo/sandbox/gshell/trunk/gshell-common/src/main/java/org/apache/geronimo/
    geronimo/sandbox/gshell/trunk/gshell-common/src/main/java/org/apache/geronimo/gshell/
    geronimo/sandbox/gshell/trunk/gshell-common/src/main/java/org/apache/geronimo/gshell/common/
    geronimo/sandbox/gshell/trunk/gshell-common/src/main/resources/
    geronimo/sandbox/gshell/trunk/gshell-common/src/main/resources/org/
    geronimo/sandbox/gshell/trunk/gshell-common/src/main/resources/org/apache/
    geronimo/sandbox/gshell/trunk/gshell-common/src/main/resources/org/apache/geronimo/
    geronimo/sandbox/gshell/trunk/gshell-common/src/main/resources/org/apache/geronimo/gshell/
    geronimo/sandbox/gshell/trunk/gshell-common/src/main/resources/org/apache/geronimo/gshell/common/
    geronimo/sandbox/gshell/trunk/gshell-common/src/test/
    geronimo/sandbox/gshell/trunk/gshell-common/src/test/java/
    geronimo/sandbox/gshell/trunk/gshell-common/src/test/java/org/
    geronimo/sandbox/gshell/trunk/gshell-common/src/test/java/org/apache/
    geronimo/sandbox/gshell/trunk/gshell-common/src/test/java/org/apache/geronimo/
    geronimo/sandbox/gshell/trunk/gshell-common/src/test/java/org/apache/geronimo/gshell/
    geronimo/sandbox/gshell/trunk/gshell-common/src/test/java/org/apache/geronimo/gshell/common/
    geronimo/sandbox/gshell/trunk/gshell-common/src/test/java/org/apache/geronimo/gshell/common/StopWatchTest.java   (with props)
    geronimo/sandbox/gshell/trunk/gshell-common/src/test/java/org/apache/geronimo/gshell/common/StringUtilsTest.java   (with props)
    geronimo/sandbox/gshell/trunk/gshell-common/src/test/java/org/apache/geronimo/gshell/common/SystemUtilsTest.java   (with props)
    geronimo/sandbox/gshell/trunk/gshell-log4j/
    geronimo/sandbox/gshell/trunk/gshell-log4j/LICENSE.txt   (with props)
    geronimo/sandbox/gshell/trunk/gshell-log4j/NOTICE.txt   (with props)
    geronimo/sandbox/gshell/trunk/gshell-log4j/pom.xml   (with props)
Modified:
    geronimo/sandbox/gshell/trunk/README.txt
    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-cli/pom.xml
    geronimo/sandbox/gshell/trunk/gshell-cli/src/main/java/org/apache/geronimo/gshell/cli/Main.java
    geronimo/sandbox/gshell/trunk/gshell-commands/gshell-scripting-commands/pom.xml
    geronimo/sandbox/gshell/trunk/gshell-commands/gshell-standard-commands/src/main/java/org/apache/geronimo/gshell/commands/standard/CatCommand.java
    geronimo/sandbox/gshell/trunk/gshell-commands/gshell-vfs-commands/pom.xml
    geronimo/sandbox/gshell/trunk/gshell-commands/pom.xml
    geronimo/sandbox/gshell/trunk/gshell-core/pom.xml
    geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/Shell.java
    geronimo/sandbox/gshell/trunk/gshell-testsuite/pom.xml
    geronimo/sandbox/gshell/trunk/pom.xml

Modified: geronimo/sandbox/gshell/trunk/README.txt
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/README.txt?rev=570636&r1=570635&r2=570636&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/README.txt (original)
+++ geronimo/sandbox/gshell/trunk/README.txt Tue Aug 28 21:46:23 2007
@@ -11,23 +11,3 @@
 
 ./gshell-*/bin/gsh "$@"
 
-
- +-----------+
- | Releasing |
- +-----------+
-
-Make sure that settings.xml contains details for these servers:
-
- * gshell-releases
- * gshell-site
-
-Then run:
-
-  mvn -Denv=release -Dusername=USER release:prepare
-
-And then:
-
-  mvn -Denv=release -Dusername=USER release:perform
-
-USER must be be replaced by your SVN username
-

Modified: geronimo/sandbox/gshell/trunk/gshell-api/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-api/pom.xml?rev=570636&r1=570635&r2=570636&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-api/pom.xml (original)
+++ geronimo/sandbox/gshell/trunk/gshell-api/pom.xml Tue Aug 28 21:46:23 2007
@@ -40,6 +40,12 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.gshell</groupId>
+            <artifactId>gshell-common</artifactId>
+            <version>${version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.gshell</groupId>
             <artifactId>gshell-clp</artifactId>
             <version>${version}</version>
         </dependency>

Modified: geronimo/sandbox/gshell/trunk/gshell-assembly/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-assembly/pom.xml?rev=570636&r1=570635&r2=570636&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-assembly/pom.xml (original)
+++ geronimo/sandbox/gshell/trunk/gshell-assembly/pom.xml Tue Aug 28 21:46:23 2007
@@ -36,38 +36,38 @@
 
     <dependencies>
         <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>org.apache.geronimo.gshell</groupId>
             <artifactId>gshell-bootstrap</artifactId>
             <version>${version}</version>
         </dependency>
 
         <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>org.apache.geronimo.gshell</groupId>
             <artifactId>gshell-core</artifactId>
             <version>${version}</version>
         </dependency>
 
         <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>org.apache.geronimo.gshell</groupId>
             <artifactId>gshell-cli</artifactId>
             <version>${version}</version>
         </dependency>
 
         <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>org.apache.geronimo.gshell</groupId>
             <artifactId>gshell-standard-commands</artifactId>
             <version>${version}</version>
         </dependency>
 
         <!--
         <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>org.apache.geronimo.gshell</groupId>
             <artifactId>gshell-scripting-commands</artifactId>
             <version>${version}</version>
         </dependency>
 
         <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>org.apache.geronimo.gshell</groupId>
             <artifactId>gshell-vfs-commands</artifactId>
             <version>${version}</version>
         </dependency>
@@ -81,11 +81,21 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-log4j12</artifactId>
+            <exclusions>
+                <!--
+                NOTE: Using our *diet* version of Log4j instead to save some pounds of unwanted fat.
+                -->
+                <exclusion>
+                    <groupId>log4j</groupId>
+                    <artifactId>log4j</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
-
+        
         <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
+            <groupId>org.apache.geronimo.gshell</groupId>
+            <artifactId>gshell-log4j</artifactId>
+            <version>${version}</version>
         </dependency>
     </dependencies>
 

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?rev=570636&r1=570635&r2=570636&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-assembly/src/main/assembly/bin.xml (original)
+++ geronimo/sandbox/gshell/trunk/gshell-assembly/src/main/assembly/bin.xml Tue Aug 28 21:46:23 2007
@@ -60,19 +60,6 @@
             <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>

Modified: geronimo/sandbox/gshell/trunk/gshell-cli/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-cli/pom.xml?rev=570636&r1=570635&r2=570636&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-cli/pom.xml (original)
+++ geronimo/sandbox/gshell/trunk/gshell-cli/pom.xml Tue Aug 28 21:46:23 2007
@@ -35,7 +35,7 @@
     
     <dependencies>
         <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>org.apache.geronimo.gshell</groupId>
             <artifactId>gshell-core</artifactId>
             <version>${version}</version>
         </dependency>

Modified: geronimo/sandbox/gshell/trunk/gshell-cli/src/main/java/org/apache/geronimo/gshell/cli/Main.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-cli/src/main/java/org/apache/geronimo/gshell/cli/Main.java?rev=570636&r1=570635&r2=570636&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-cli/src/main/java/org/apache/geronimo/gshell/cli/Main.java (original)
+++ geronimo/sandbox/gshell/trunk/gshell-cli/src/main/java/org/apache/geronimo/gshell/cli/Main.java Tue Aug 28 21:46:23 2007
@@ -22,6 +22,7 @@
 import java.util.List;
 
 import jline.Terminal;
+import org.apache.commons.lang.time.StopWatch;
 import org.apache.geronimo.gshell.InteractiveShell;
 import org.apache.geronimo.gshell.Shell;
 import org.apache.geronimo.gshell.clp.Argument;
@@ -56,15 +57,14 @@
 
     private final IO io = new IO();
 
-    // FIXME
-    // private final StopWatch watch = new StopWatch();
+    private final StopWatch watch = new StopWatch();
 
     public Main(final ClassWorld world) {
         assert world != null;
+
         this.world = world;
 
-        // FIXME:
-        // watch.start();
+        watch.start();
     }
 
     private void setConsoleLogLevel(final String level) {
@@ -220,19 +220,15 @@
 
         if (debug) {
             log.debug("Using terminal: " + term);
-            log.debug("  supported: " + term.isSupported());
-            log.debug("  height: " + term.getTerminalHeight());
-            log.debug("  width: " + term.getTerminalWidth());
-            log.debug("  echo: " + term.getEcho());
+            log.debug("  Supported: " + term.isSupported());
+            log.debug("  H x W: " + term.getTerminalHeight() + " x " + term.getTerminalWidth());
+            log.debug("  Echo: " + term.getEcho());
             log.debug("  ANSI: " + term.isANSISupported());
         }
 
-        // FIXME:
-        /*
         if (debug) {
             log.debug("Started in " + watch);
         }
-        */
 
         Object result = null;
 
@@ -268,12 +264,9 @@
             result = gshell.execute(args);
         }
 
-        // FIXME:
-        /*
         if (debug) {
             log.debug("Ran for " + watch);
         }
-        */
         
         // If the result is a number, then pass that back to the calling shell
         int code = 0;

Modified: geronimo/sandbox/gshell/trunk/gshell-commands/gshell-scripting-commands/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-commands/gshell-scripting-commands/pom.xml?rev=570636&r1=570635&r2=570636&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-commands/gshell-scripting-commands/pom.xml (original)
+++ geronimo/sandbox/gshell/trunk/gshell-commands/gshell-scripting-commands/pom.xml Tue Aug 28 21:46:23 2007
@@ -39,7 +39,7 @@
                    then depend on core.
         -->
         <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>org.apache.geronimo.gshell</groupId>
             <artifactId>gshell-core</artifactId>
             <version>${version}</version>
         </dependency>

Modified: geronimo/sandbox/gshell/trunk/gshell-commands/gshell-standard-commands/src/main/java/org/apache/geronimo/gshell/commands/standard/CatCommand.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-commands/gshell-standard-commands/src/main/java/org/apache/geronimo/gshell/commands/standard/CatCommand.java?rev=570636&r1=570635&r2=570636&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-commands/gshell-standard-commands/src/main/java/org/apache/geronimo/gshell/commands/standard/CatCommand.java (original)
+++ geronimo/sandbox/gshell/trunk/gshell-commands/gshell-standard-commands/src/main/java/org/apache/geronimo/gshell/commands/standard/CatCommand.java Tue Aug 28 21:46:23 2007
@@ -27,6 +27,8 @@
 import java.net.URL;
 import java.util.List;
 
+import org.apache.commons.lang.StringUtils;
+
 import org.apache.geronimo.gshell.clp.Argument;
 import org.apache.geronimo.gshell.clp.Option;
 import org.apache.geronimo.gshell.command.Command;
@@ -92,12 +94,8 @@
 
             while ((line = reader.readLine()) != null) {
                 if (displayLineNumbers) {
-                    // FIXME:
-                    // String gutter = StringUtils.leftPad(String.valueOf(lineno++), 6);
-                    // io.out.print(gutter);
-
-
-                    io.out.println(lineno++);
+                    String gutter = StringUtils.leftPad(String.valueOf(lineno++), 6);
+                    io.out.print(gutter);
                     io.out.print("  ");
                 }
                 io.out.println(line);

Modified: geronimo/sandbox/gshell/trunk/gshell-commands/gshell-vfs-commands/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-commands/gshell-vfs-commands/pom.xml?rev=570636&r1=570635&r2=570636&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-commands/gshell-vfs-commands/pom.xml (original)
+++ geronimo/sandbox/gshell/trunk/gshell-commands/gshell-vfs-commands/pom.xml Tue Aug 28 21:46:23 2007
@@ -35,7 +35,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>org.apache.geronimo.gshell</groupId>
             <artifactId>gshell-api</artifactId>
             <version>${version}</version>
         </dependency>

Modified: geronimo/sandbox/gshell/trunk/gshell-commands/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-commands/pom.xml?rev=570636&r1=570635&r2=570636&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-commands/pom.xml (original)
+++ geronimo/sandbox/gshell/trunk/gshell-commands/pom.xml Tue Aug 28 21:46:23 2007
@@ -36,7 +36,7 @@
     
     <dependencies>
         <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>org.apache.geronimo.gshell</groupId>
             <artifactId>gshell-api</artifactId>
             <version>${version}</version>
         </dependency>

Added: geronimo/sandbox/gshell/trunk/gshell-common/LICENSE.txt
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-common/LICENSE.txt?rev=570636&view=auto
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-common/LICENSE.txt (added)
+++ geronimo/sandbox/gshell/trunk/gshell-common/LICENSE.txt Tue Aug 28 21:46:23 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-common/LICENSE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/gshell/trunk/gshell-common/LICENSE.txt
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/sandbox/gshell/trunk/gshell-common/LICENSE.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/sandbox/gshell/trunk/gshell-common/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-common/NOTICE.txt?rev=570636&view=auto
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-common/NOTICE.txt (added)
+++ geronimo/sandbox/gshell/trunk/gshell-common/NOTICE.txt Tue Aug 28 21:46:23 2007
@@ -0,0 +1,11 @@
+=========================================================================
+==  NOTICE file corresponding to section 4(d) of the Apache License,   ==
+==  Version 2.0, in this case for the Apache Geronimo distribution.    ==
+=========================================================================
+
+Apache Geronimo
+Copyright 2007 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+

Propchange: geronimo/sandbox/gshell/trunk/gshell-common/NOTICE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/gshell/trunk/gshell-common/NOTICE.txt
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/sandbox/gshell/trunk/gshell-common/NOTICE.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/sandbox/gshell/trunk/gshell-common/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-common/pom.xml?rev=570636&view=auto
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-common/pom.xml (added)
+++ geronimo/sandbox/gshell/trunk/gshell-common/pom.xml Tue Aug 28 21:46:23 2007
@@ -0,0 +1,140 @@
+<?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-alpha-1-SNAPSHOT</version>
+    </parent>
+    
+    <artifactId>gshell-common</artifactId>
+    <name>GShell Common</name>
+    
+    <description>
+        Common support classes.
+    </description>
+    
+    <dependencies>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+    
+    <!--
+    NOTE: We only use a few bits from commons-lang, so pull them out here to avoid getting all that other cruft.
+          Though really, its a bunch of crap we pull in anyways, but the following saves ~100k
+    -->
+    
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>unpack</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>commons-lang</groupId>
+                                    <artifactId>commons-lang</artifactId>
+                                    <classifier>sources</classifier>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <tasks>
+                                <mkdir dir="${project.build.directory}/generated-source/commons-lang"/>
+                                <copy todir="${project.build.directory}/generated-source/commons-lang">
+                                    <fileset dir="${project.build.directory}/dependency">
+                                        <include name="org/apache/commons/lang/ArrayUtils.java"/>
+                                        <include name="org/apache/commons/lang/BooleanUtils.java"/>
+                                        <include name="org/apache/commons/lang/CharUtils.java"/>
+                                        <include name="org/apache/commons/lang/CharSet.java"/>
+                                        <include name="org/apache/commons/lang/CharSetUtils.java"/>
+                                        <include name="org/apache/commons/lang/CharRange.java"/>
+                                        <include name="org/apache/commons/lang/ClassUtils.java"/>
+                                        <include name="org/apache/commons/lang/Entities.java"/>
+                                        <include name="org/apache/commons/lang/IntHashMap.java"/>
+                                        <include name="org/apache/commons/lang/NullArgumentException.java"/>
+                                        <include name="org/apache/commons/lang/SystemUtils.java"/>
+                                        <include name="org/apache/commons/lang/StringUtils.java"/>
+                                        <include name="org/apache/commons/lang/StringEscapeUtils.java"/>
+                                        <include name="org/apache/commons/lang/ObjectUtils.java"/>
+                                        <include name="org/apache/commons/lang/UnhandledException.java"/>
+                                        <include name="org/apache/commons/lang/Validate.java"/>
+                                        <include name="org/apache/commons/lang/WordUtils.java"/>
+                                        <include name="org/apache/commons/lang/exception/**/*.java"/>
+                                        <include name="org/apache/commons/lang/builder/**/*.java"/>
+                                        <include name="org/apache/commons/lang/math/NumberUtils.java"/>
+                                        <include name="org/apache/commons/lang/time/**/*.java"/>
+                                    </fileset>
+                                </copy>
+                            </tasks>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>add-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                                <source>${project.build.directory}/generated-source/commons-lang</source>
+                            </sources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
\ No newline at end of file

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

Propchange: geronimo/sandbox/gshell/trunk/gshell-common/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/sandbox/gshell/trunk/gshell-common/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/sandbox/gshell/trunk/gshell-common/src/test/java/org/apache/geronimo/gshell/common/StopWatchTest.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-common/src/test/java/org/apache/geronimo/gshell/common/StopWatchTest.java?rev=570636&view=auto
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-common/src/test/java/org/apache/geronimo/gshell/common/StopWatchTest.java (added)
+++ geronimo/sandbox/gshell/trunk/gshell-common/src/test/java/org/apache/geronimo/gshell/common/StopWatchTest.java Tue Aug 28 21:46:23 2007
@@ -0,0 +1,37 @@
+/*
+ * 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.common;
+
+import org.apache.commons.lang.time.StopWatch;
+
+import junit.framework.TestCase;
+
+/**
+ * Simple test to ensure we pick up the required bits from <tt>commons-lang</tt> to use the {@link StopWatch} class.
+ *
+ * @version $Rev$ $Date$
+ */
+public class StopWatchTest
+    extends TestCase
+{
+    public void test1() throws Exception {
+        StopWatch watch = new StopWatch();
+    }
+}
\ No newline at end of file

Propchange: geronimo/sandbox/gshell/trunk/gshell-common/src/test/java/org/apache/geronimo/gshell/common/StopWatchTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/gshell/trunk/gshell-common/src/test/java/org/apache/geronimo/gshell/common/StopWatchTest.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/sandbox/gshell/trunk/gshell-common/src/test/java/org/apache/geronimo/gshell/common/StopWatchTest.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/sandbox/gshell/trunk/gshell-common/src/test/java/org/apache/geronimo/gshell/common/StringUtilsTest.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-common/src/test/java/org/apache/geronimo/gshell/common/StringUtilsTest.java?rev=570636&view=auto
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-common/src/test/java/org/apache/geronimo/gshell/common/StringUtilsTest.java (added)
+++ geronimo/sandbox/gshell/trunk/gshell-common/src/test/java/org/apache/geronimo/gshell/common/StringUtilsTest.java Tue Aug 28 21:46:23 2007
@@ -0,0 +1,37 @@
+/*
+ * 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.common;
+
+import org.apache.commons.lang.StringUtils;
+
+import junit.framework.TestCase;
+
+/**
+ * Simple test to ensure we pick up the required bits from <tt>commons-lang</tt> to use the {@link StringUtils} class.
+ *
+ * @version $Rev$ $Date$
+ */
+public class StringUtilsTest
+    extends TestCase
+{
+    public void test1() throws Exception {
+        StringUtils.leftPad("1", 6);
+    }
+}
\ No newline at end of file

Propchange: geronimo/sandbox/gshell/trunk/gshell-common/src/test/java/org/apache/geronimo/gshell/common/StringUtilsTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/gshell/trunk/gshell-common/src/test/java/org/apache/geronimo/gshell/common/StringUtilsTest.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/sandbox/gshell/trunk/gshell-common/src/test/java/org/apache/geronimo/gshell/common/StringUtilsTest.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/sandbox/gshell/trunk/gshell-common/src/test/java/org/apache/geronimo/gshell/common/SystemUtilsTest.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-common/src/test/java/org/apache/geronimo/gshell/common/SystemUtilsTest.java?rev=570636&view=auto
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-common/src/test/java/org/apache/geronimo/gshell/common/SystemUtilsTest.java (added)
+++ geronimo/sandbox/gshell/trunk/gshell-common/src/test/java/org/apache/geronimo/gshell/common/SystemUtilsTest.java Tue Aug 28 21:46:23 2007
@@ -0,0 +1,37 @@
+/*
+ * 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.common;
+
+import org.apache.commons.lang.SystemUtils;
+
+import junit.framework.TestCase;
+
+/**
+ * Simple test to ensure we pick up the required bits from <tt>commons-lang</tt> to use the {@link SystemUtils} class.
+ *
+ * @version $Rev$ $Date$
+ */
+public class SystemUtilsTest
+    extends TestCase
+{
+    public void test1() throws Exception {
+        SystemUtils.getJavaHome();
+    }
+}
\ No newline at end of file

Propchange: geronimo/sandbox/gshell/trunk/gshell-common/src/test/java/org/apache/geronimo/gshell/common/SystemUtilsTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/gshell/trunk/gshell-common/src/test/java/org/apache/geronimo/gshell/common/SystemUtilsTest.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/sandbox/gshell/trunk/gshell-common/src/test/java/org/apache/geronimo/gshell/common/SystemUtilsTest.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/sandbox/gshell/trunk/gshell-core/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-core/pom.xml?rev=570636&r1=570635&r2=570636&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-core/pom.xml (original)
+++ geronimo/sandbox/gshell/trunk/gshell-core/pom.xml Tue Aug 28 21:46:23 2007
@@ -35,7 +35,7 @@
     
     <dependencies>
         <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>org.apache.geronimo.gshell</groupId>
             <artifactId>gshell-api</artifactId>
             <version>${version}</version>
         </dependency>
@@ -76,7 +76,7 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>${pom.groupId}</groupId>
+                <groupId>org.apache.geronimo.gshell</groupId>
                 <artifactId>javacc-maven-plugin</artifactId>
                 <version>1.0-alpha-1-SNAPSHOT</version>
                 <executions>

Modified: geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/Shell.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/Shell.java?rev=570636&r1=570635&r2=570636&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/Shell.java (original)
+++ geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/Shell.java Tue Aug 28 21:46:23 2007
@@ -21,6 +21,7 @@
 
 import java.util.Iterator;
 
+import org.apache.commons.lang.time.StopWatch;
 import org.apache.geronimo.gshell.command.Command;
 import org.apache.geronimo.gshell.command.CommandContext;
 import org.apache.geronimo.gshell.command.CommandDefinition;
@@ -184,26 +185,20 @@
             }
         });
 
-        // FIXME:
-        /*
         // Setup command timings
         StopWatch watch = null;
         if (debug) {
             watch = new StopWatch();
             watch.start();
         }
-        */
 
         Object result;
         try {
             result = cmd.execute(args);
 
-            // FIXME:
-            /*
             if (debug) {
                 log.debug("Command completed in " + watch);
             }
-            */
         }
         finally {
             cmd.destroy();

Added: geronimo/sandbox/gshell/trunk/gshell-log4j/LICENSE.txt
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-log4j/LICENSE.txt?rev=570636&view=auto
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-log4j/LICENSE.txt (added)
+++ geronimo/sandbox/gshell/trunk/gshell-log4j/LICENSE.txt Tue Aug 28 21:46:23 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-log4j/LICENSE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/gshell/trunk/gshell-log4j/LICENSE.txt
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/sandbox/gshell/trunk/gshell-log4j/LICENSE.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/sandbox/gshell/trunk/gshell-log4j/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-log4j/NOTICE.txt?rev=570636&view=auto
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-log4j/NOTICE.txt (added)
+++ geronimo/sandbox/gshell/trunk/gshell-log4j/NOTICE.txt Tue Aug 28 21:46:23 2007
@@ -0,0 +1,11 @@
+=========================================================================
+==  NOTICE file corresponding to section 4(d) of the Apache License,   ==
+==  Version 2.0, in this case for the Apache Geronimo distribution.    ==
+=========================================================================
+
+Apache Geronimo
+Copyright 2007 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+

Propchange: geronimo/sandbox/gshell/trunk/gshell-log4j/NOTICE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/gshell/trunk/gshell-log4j/NOTICE.txt
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/sandbox/gshell/trunk/gshell-log4j/NOTICE.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/sandbox/gshell/trunk/gshell-log4j/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-log4j/pom.xml?rev=570636&view=auto
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-log4j/pom.xml (added)
+++ geronimo/sandbox/gshell/trunk/gshell-log4j/pom.xml Tue Aug 28 21:46:23 2007
@@ -0,0 +1,123 @@
+<?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-alpha-1-SNAPSHOT</version>
+    </parent>
+    
+    <artifactId>gshell-log4j</artifactId>
+    <name>GShell *Diet* Log4j</name>
+    
+    <description>
+        A diet version of the Log4j distribution.
+    </description>
+    
+    <dependencies>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+    
+    <!--
+    NOTE: The log4j distribution contains a bunch of cruft, so we put it on a diet here for our usage.
+    -->
+    
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>unpack</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>log4j</groupId>
+                                    <artifactId>log4j</artifactId>
+                                    <classifier>sources</classifier>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <tasks>
+                                <mkdir dir="${project.build.directory}/generated-source/log4j"/>
+                                <copy todir="${project.build.directory}/generated-source/log4j">
+                                    <fileset dir="${project.build.directory}/dependency">
+                                        <include name="org/apache/log4j/*.java"/>
+                                        <include name="org/apache/log4j/spi/*.java"/>
+                                        <include name="org/apache/log4j/helpers/*.java"/>
+                                        <include name="org/apache/log4j/or/*.java"/>
+                                        <include name="org/apache/log4j/config/*.java"/>
+                                    </fileset>
+                                </copy>
+                            </tasks>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>add-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                                <source>${project.build.directory}/generated-source/log4j</source>
+                            </sources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
\ No newline at end of file

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

Propchange: geronimo/sandbox/gshell/trunk/gshell-log4j/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/sandbox/gshell/trunk/gshell-log4j/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: geronimo/sandbox/gshell/trunk/gshell-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-testsuite/pom.xml?rev=570636&r1=570635&r2=570636&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-testsuite/pom.xml (original)
+++ geronimo/sandbox/gshell/trunk/gshell-testsuite/pom.xml Tue Aug 28 21:46:23 2007
@@ -35,25 +35,25 @@
     
     <dependencies>
         <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>org.apache.geronimo.gshell</groupId>
             <artifactId>gshell-core</artifactId>
             <version>${version}</version>
         </dependency>
         
         <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>org.apache.geronimo.gshell</groupId>
             <artifactId>gshell-cli</artifactId>
             <version>${version}</version>
         </dependency>
 
         <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>org.apache.geronimo.gshell</groupId>
             <artifactId>gshell-standard-commands</artifactId>
             <version>${version}</version>
         </dependency>
 
         <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>org.apache.geronimo.gshell</groupId>
             <artifactId>gshell-scripting-commands</artifactId>
             <version>${version}</version>
         </dependency>

Modified: geronimo/sandbox/gshell/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/pom.xml?rev=570636&r1=570635&r2=570636&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/pom.xml (original)
+++ geronimo/sandbox/gshell/trunk/pom.xml Tue Aug 28 21:46:23 2007
@@ -94,13 +94,11 @@
                 <scope>test</scope>
             </dependency>
 
-            <!--
             <dependency>
                 <groupId>commons-lang</groupId>
                 <artifactId>commons-lang</artifactId>
-                <version>2.1</version>
+                <version>2.3</version>
             </dependency>
-            -->
             
             <dependency>
                 <groupId>commons-jexl</groupId>
@@ -173,6 +171,12 @@
                 
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-dependency-plugin</artifactId>
+                    <version>2.0-alpha-4</version>
+                </plugin>
+                
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-idea-plugin</artifactId>
                     <version>2.1</version>
                     <configuration>
@@ -262,6 +266,7 @@
     </build>
     
     <modules>
+        <module>gshell-common</module>
         <module>gshell-clp</module>
         <module>gshell-prefs</module>
         <module>gshell-bootstrap</module>
@@ -270,6 +275,7 @@
         <module>gshell-core</module>
         <module>gshell-cli</module>
         <module>gshell-commands</module>
+        <module>gshell-log4j</module>
         <module>gshell-testsuite</module>
         <module>gshell-assembly</module>
     </modules>
@@ -363,7 +369,7 @@
                 </plugins>
             </build>
         </profile>
-
+        
         <profile>
             <id>super-helpful-integration-tests</id>
             



Mime
View raw message