geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r570644 - in /geronimo/sandbox/gshell/trunk: ./ gshell-assembly/ gshell-assembly/src/main/assembly/ gshell-bootstrap/ gshell-bootstrap/src/main/java/org/apache/geronimo/gshell/bootstrap/ gshell-classworlds/ gshell-cli/ gshell-cli/src/main/j...
Date Wed, 29 Aug 2007 05:52:12 GMT
Author: jdillon
Date: Tue Aug 28 22:52:10 2007
New Revision: 570644

URL: http://svn.apache.org/viewvc?rev=570644&view=rev
Log:
Beginning container refactor to use plexus instead of pico, a tad bigger but lot more functionality
Add a diet version of classworlds to trim off the fat of legacy class support
Include a diet version of plexus-utils into gshell-common

Added:
    geronimo/sandbox/gshell/trunk/gshell-classworlds/
    geronimo/sandbox/gshell/trunk/gshell-classworlds/LICENSE.txt   (with props)
    geronimo/sandbox/gshell/trunk/gshell-classworlds/NOTICE.txt   (with props)
    geronimo/sandbox/gshell/trunk/gshell-classworlds/pom.xml   (with props)
    geronimo/sandbox/gshell/trunk/gshell-core/src/main/resources/META-INF/plexus/
    geronimo/sandbox/gshell/trunk/gshell-core/src/main/resources/META-INF/plexus/plexus.xml
  (with props)
Removed:
    geronimo/sandbox/gshell/trunk/gshell-common/src/test/java/org/apache/geronimo/gshell/common/StopWatchTest.java
    geronimo/sandbox/gshell/trunk/gshell-common/src/test/java/org/apache/geronimo/gshell/common/StringUtilsTest.java
    geronimo/sandbox/gshell/trunk/gshell-common/src/test/java/org/apache/geronimo/gshell/common/SystemUtilsTest.java
Modified:
    geronimo/sandbox/gshell/trunk/gshell-assembly/pom.xml
    geronimo/sandbox/gshell/trunk/gshell-assembly/src/main/assembly/bin.xml
    geronimo/sandbox/gshell/trunk/gshell-bootstrap/pom.xml
    geronimo/sandbox/gshell/trunk/gshell-bootstrap/src/main/java/org/apache/geronimo/gshell/bootstrap/Launcher.java
    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-common/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-log4j/pom.xml
    geronimo/sandbox/gshell/trunk/pom.xml

Modified: geronimo/sandbox/gshell/trunk/gshell-assembly/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-assembly/pom.xml?rev=570644&r1=570643&r2=570644&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-assembly/pom.xml (original)
+++ geronimo/sandbox/gshell/trunk/gshell-assembly/pom.xml Tue Aug 28 22:52:10 2007
@@ -81,15 +81,6 @@
         <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>
@@ -101,41 +92,6 @@
 
     <build>
         <plugins>
-            <!--
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>shade-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        HACK: Turn this off, its just for testing
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                        <configuration>
-                            <artifactSet>
-                                <excludes>
-                                    <exclude>junit:junit</exclude>
-                                    <exclude>jtidy:jtidy</exclude>
-                                    <exclude>xml-apis:xml-apis</exclude>
-                                    <exclude>ant:ant</exclude>
-                                </excludes>
-                            </artifactSet>
-                            <relocations>
-                                <relocation>
-                                    <pattern>org.codehaus.plexus.util</pattern>
-                                    <excludes>
-                                        <exclude>org.codehaus.plexus.util.xml.Xpp3Dom</exclude>
-                                        <exclude>org.codehaus.plexus.util.xml.pull.*</exclude>
-                                    </excludes>
-                                </relocation>
-                            </relocations>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            -->
-
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>

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=570644&r1=570643&r2=570644&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 22:52:10
2007
@@ -67,8 +67,8 @@
             <outputDirectory>lib</outputDirectory>
             <excludes>
                 <exclude>org.apache.geronimo.gshell:gshell-bootstrap</exclude>
+                <exclude>org.apache.geronimo.gshell:gshell-classworlds</exclude>
                 <exclude>org.apache.geronimo.gshell:gshell-assembly</exclude>
-                <exclude>classworlds:classworlds</exclude>
                 <exclude>xml-apis:xml-apis</exclude>
             </excludes>
         </dependencySet>
@@ -76,7 +76,7 @@
         <dependencySet>
             <outputDirectory>lib/boot</outputDirectory>
             <includes>
-                <include>classworlds:classworlds</include>
+                <include>org.apache.geronimo.gshell:gshell-classworlds</include>
             </includes>
         </dependencySet>
         

Modified: geronimo/sandbox/gshell/trunk/gshell-bootstrap/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-bootstrap/pom.xml?rev=570644&r1=570643&r2=570644&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-bootstrap/pom.xml (original)
+++ geronimo/sandbox/gshell/trunk/gshell-bootstrap/pom.xml Tue Aug 28 22:52:10 2007
@@ -35,8 +35,9 @@
     
     <dependencies>
         <dependency>
-            <groupId>classworlds</groupId>
-            <artifactId>classworlds</artifactId>
+            <groupId>org.apache.geronimo.gshell</groupId>
+            <artifactId>gshell-classworlds</artifactId>
+            <version>${version}</version>
         </dependency>
     </dependencies>
     

Modified: geronimo/sandbox/gshell/trunk/gshell-bootstrap/src/main/java/org/apache/geronimo/gshell/bootstrap/Launcher.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-bootstrap/src/main/java/org/apache/geronimo/gshell/bootstrap/Launcher.java?rev=570644&r1=570643&r2=570644&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-bootstrap/src/main/java/org/apache/geronimo/gshell/bootstrap/Launcher.java
(original)
+++ geronimo/sandbox/gshell/trunk/gshell-bootstrap/src/main/java/org/apache/geronimo/gshell/bootstrap/Launcher.java
Tue Aug 28 22:52:10 2007
@@ -51,7 +51,7 @@
         setProperty("log4j.configuration", log4jConf.toURI().toURL().toString());
 
         // Delegate to the Classworlds launcher to finish booting
-        org.codehaus.classworlds.Launcher.main(args);
+        org.codehaus.plexus.classworlds.launcher.Launcher.main(args);
     }
 
     private static void debug(final String message) {

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

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

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

Added: geronimo/sandbox/gshell/trunk/gshell-classworlds/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-classworlds/NOTICE.txt?rev=570644&view=auto
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-classworlds/NOTICE.txt (added)
+++ geronimo/sandbox/gshell/trunk/gshell-classworlds/NOTICE.txt Tue Aug 28 22:52:10 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-classworlds/NOTICE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

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

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

Added: geronimo/sandbox/gshell/trunk/gshell-classworlds/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-classworlds/pom.xml?rev=570644&view=auto
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-classworlds/pom.xml (added)
+++ geronimo/sandbox/gshell/trunk/gshell-classworlds/pom.xml Tue Aug 28 22:52:10 2007
@@ -0,0 +1,111 @@
+<?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-classworlds</artifactId>
+    <name>GShell *Diet* Classworlds</name>
+    
+    <description>
+        A diet version of the Classworlds distribution.
+    </description>
+    
+    <!--
+    NOTE: We don't care about the legacy support classes for Classworlds, so put it on a
diet.
+    -->
+    
+    <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>org.codehaus.plexus</groupId>
+                                    <artifactId>plexus-classworlds</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/diet"/>
+                                <copy todir="${project.build.directory}/generated-source/diet">
+                                    <fileset dir="${project.build.directory}/dependency">
+                                        <include name="org/codehaus/plexus/classworlds/**"/>
+                                    </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/diet</source>
+                            </sources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
\ No newline at end of file

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

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

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

Modified: geronimo/sandbox/gshell/trunk/gshell-cli/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-cli/pom.xml?rev=570644&r1=570643&r2=570644&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-cli/pom.xml (original)
+++ geronimo/sandbox/gshell/trunk/gshell-cli/pom.xml Tue Aug 28 22:52:10 2007
@@ -41,8 +41,9 @@
         </dependency>
 
         <dependency>
-            <groupId>classworlds</groupId>
-            <artifactId>classworlds</artifactId>
+            <groupId>org.apache.geronimo.gshell</groupId>
+            <artifactId>gshell-classworlds</artifactId>
+            <version>${version}</version>
         </dependency>
     </dependencies>
 

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=570644&r1=570643&r2=570644&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 22:52:10 2007
@@ -34,7 +34,9 @@
 import org.apache.geronimo.gshell.console.JLineConsole;
 import org.apache.geronimo.gshell.util.Banner;
 import org.apache.geronimo.gshell.util.Version;
-import org.codehaus.classworlds.ClassWorld;
+
+import org.codehaus.plexus.classworlds.ClassWorld;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -290,6 +292,8 @@
         assert args != null;
         assert world != null;
 
+        System.err.println("Launching enhanced");
+        
         Main main = new Main(world);
         main.run(args);
     }

Modified: geronimo/sandbox/gshell/trunk/gshell-common/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-common/pom.xml?rev=570644&r1=570643&r2=570644&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-common/pom.xml (original)
+++ geronimo/sandbox/gshell/trunk/gshell-common/pom.xml Tue Aug 28 22:52:10 2007
@@ -46,8 +46,8 @@
     </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
+    NOTE: We only use a few bits from plexus-utils and commons-lang, so pull them out here
to avoid
+          getting all that other cruft.
     -->
     
     <build>
@@ -68,6 +68,11 @@
                                     <artifactId>commons-lang</artifactId>
                                     <classifier>sources</classifier>
                                 </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.codehaus.plexus</groupId>
+                                    <artifactId>plexus-utils</artifactId>
+                                    <classifier>sources</classifier>
+                                </artifactItem>
                             </artifactItems>
                         </configuration>
                     </execution>
@@ -85,9 +90,10 @@
                         </goals>
                         <configuration>
                             <tasks>
-                                <mkdir dir="${project.build.directory}/generated-source/commons-lang"/>
-                                <copy todir="${project.build.directory}/generated-source/commons-lang">
+                                <mkdir dir="${project.build.directory}/generated-source/diet"/>
+                                <copy todir="${project.build.directory}/generated-source/diet">
                                     <fileset dir="${project.build.directory}/dependency">
+                                        <!-- Include ~100k of commons-lang -->
                                         <include name="org/apache/commons/lang/ArrayUtils.java"/>
                                         <include name="org/apache/commons/lang/BooleanUtils.java"/>
                                         <include name="org/apache/commons/lang/CharUtils.java"/>
@@ -109,6 +115,12 @@
                                         <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"/>
+                                        
+                                        <!-- Include ~160k of plexus-utils -->
+                                        <include name="org/codehaus/plexus/util/*.java"/>
+                                        <include name="org/codehaus/plexus/util/dag/**/*.java"/>
+                                        <include name="org/codehaus/plexus/util/xml/**/*.java"/>
+                                        <include name="org/codehaus/plexus/util/reflection/**/*.java"/>
                                     </fileset>
                                 </copy>
                             </tasks>
@@ -128,7 +140,7 @@
                         </goals>
                         <configuration>
                             <sources>
-                                <source>${project.build.directory}/generated-source/commons-lang</source>
+                                <source>${project.build.directory}/generated-source/diet</source>
                             </sources>
                         </configuration>
                     </execution>

Modified: geronimo/sandbox/gshell/trunk/gshell-core/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-core/pom.xml?rev=570644&r1=570643&r2=570644&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-core/pom.xml (original)
+++ geronimo/sandbox/gshell/trunk/gshell-core/pom.xml Tue Aug 28 22:52:10 2007
@@ -41,6 +41,12 @@
         </dependency>
 
         <dependency>
+            <groupId>org.apache.geronimo.gshell</groupId>
+            <artifactId>gshell-classworlds</artifactId>
+            <version>${version}</version>
+        </dependency>
+        
+        <dependency>
             <groupId>jline</groupId>
             <artifactId>jline</artifactId>
         </dependency>
@@ -49,6 +55,11 @@
             <groupId>org.apache.xbean</groupId>
             <artifactId>xbean-finder</artifactId>
         </dependency>
+        
+        <dependency>
+            <groupId>org.codehaus.plexus</groupId>
+            <artifactId>plexus-container-default</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>picocontainer</groupId>
@@ -59,7 +70,11 @@
             <groupId>commons-jexl</groupId>
             <artifactId>commons-jexl</artifactId>
         </dependency>
-
+        
+        <!--
+        NOTE: This is to support use of commons-jexl, which uses JCL internally.
+        -->
+        
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>jcl104-over-slf4j</artifactId>

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=570644&r1=570643&r2=570644&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 22:52:10 2007
@@ -37,6 +37,11 @@
 import org.apache.geronimo.gshell.commandline.CommandLineBuilder;
 import org.apache.geronimo.gshell.console.IO;
 import org.apache.geronimo.gshell.util.Arguments;
+import org.codehaus.plexus.ContainerConfiguration;
+import org.codehaus.plexus.DefaultContainerConfiguration;
+import org.codehaus.plexus.DefaultPlexusContainer;
+import org.codehaus.plexus.PlexusContainer;
+import org.codehaus.plexus.classworlds.ClassWorld;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -68,6 +73,24 @@
         
         this.io = io;
 
+        /*
+        ContainerConfiguration config = new DefaultContainerConfiguration();
+
+        config.setName("gshell.core");
+        config.setClassWorld(new ClassWorld("gshell.core", Thread.currentThread().getContextClassLoader()));
+
+        try {
+            PlexusContainer plexus = new DefaultPlexusContainer(config);
+            
+            System.err.println("Booted plexus container: " + plexus);
+
+            plexus.lookup("fuckfuckfuck");
+        }
+        catch (Exception e) {
+            throw new CommandException(e);
+        }
+        */
+        
         shellContainer.registerComponentInstance(this);
         shellContainer.registerComponentImplementation(CommandManagerImpl.class);
         shellContainer.registerComponentImplementation(CommandLineBuilder.class);

Added: geronimo/sandbox/gshell/trunk/gshell-core/src/main/resources/META-INF/plexus/plexus.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-core/src/main/resources/META-INF/plexus/plexus.xml?rev=570644&view=auto
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-core/src/main/resources/META-INF/plexus/plexus.xml
(added)
+++ geronimo/sandbox/gshell/trunk/gshell-core/src/main/resources/META-INF/plexus/plexus.xml
Tue Aug 28 22:52:10 2007
@@ -0,0 +1,43 @@
+<?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$ -->
+
+<plexus>
+    <!--
+    <component-discoverer-manager implementation="org.codehaus.plexus.component.discovery.DefaultComponentDiscovererManager">
+        <listeners>
+            <listener implementation="org.codehaus.plexus.component.discovery.DiscoveryListenerDescriptor">
+                <role>org.apache.maven.plugin.MavenPluginCollector</role>
+            </listener>
+        </listeners>
+        <component-discoverers>
+            <component-discoverer implementation="org.apache.maven.plugin.MavenPluginDiscoverer"/>
+        </component-discoverers>
+    </component-discoverer-manager>
+    -->
+    
+    <components>
+        <component>
+            <role>test</role>
+            <implementation>ing</implementation>
+        </component>
+    </components>
+</plexus>
\ No newline at end of file

Propchange: geronimo/sandbox/gshell/trunk/gshell-core/src/main/resources/META-INF/plexus/plexus.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/gshell/trunk/gshell-core/src/main/resources/META-INF/plexus/plexus.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/sandbox/gshell/trunk/gshell-core/src/main/resources/META-INF/plexus/plexus.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: geronimo/sandbox/gshell/trunk/gshell-log4j/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-log4j/pom.xml?rev=570644&r1=570643&r2=570644&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-log4j/pom.xml (original)
+++ geronimo/sandbox/gshell/trunk/gshell-log4j/pom.xml Tue Aug 28 22:52:10 2007
@@ -37,14 +37,6 @@
         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.
     -->
@@ -84,8 +76,8 @@
                         </goals>
                         <configuration>
                             <tasks>
-                                <mkdir dir="${project.build.directory}/generated-source/log4j"/>
-                                <copy todir="${project.build.directory}/generated-source/log4j">
+                                <mkdir dir="${project.build.directory}/generated-source/diet"/>
+                                <copy todir="${project.build.directory}/generated-source/diet">
                                     <fileset dir="${project.build.directory}/dependency">
                                         <include name="org/apache/log4j/*.java"/>
                                         <include name="org/apache/log4j/spi/*.java"/>
@@ -111,7 +103,7 @@
                         </goals>
                         <configuration>
                             <sources>
-                                <source>${project.build.directory}/generated-source/log4j</source>
+                                <source>${project.build.directory}/generated-source/diet</source>
                             </sources>
                         </configuration>
                     </execution>

Modified: geronimo/sandbox/gshell/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/pom.xml?rev=570644&r1=570643&r2=570644&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/pom.xml (original)
+++ geronimo/sandbox/gshell/trunk/pom.xml Tue Aug 28 22:52:10 2007
@@ -79,6 +79,15 @@
                 <groupId>org.slf4j</groupId>
                 <artifactId>slf4j-log4j12</artifactId>
                 <version>1.4.3</version>
+                <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>
@@ -93,7 +102,48 @@
                 <version>3.8.2</version>
                 <scope>test</scope>
             </dependency>
-
+            
+            <dependency>
+                <groupId>org.codehaus.plexus</groupId>
+                <artifactId>plexus-classworlds</artifactId>
+                <version>1.2-alpha-10</version>
+            </dependency>
+            
+            <dependency>
+                <groupId>org.codehaus.plexus</groupId>
+                <artifactId>plexus-component-api</artifactId>
+                <version>1.0-alpha-32</version>
+            </dependency>
+            
+            <dependency>
+                <groupId>org.codehaus.plexus</groupId>
+                <artifactId>plexus-container-default</artifactId>
+                <version>1.0-alpha-32</version>
+                <exclusions>
+                    <!--
+                    NOTE: Use our *diet* version of Plexus Classwords to save a few grams.
+                    -->
+                    <exclusion>
+                        <groupId>org.codehaus.plexus</groupId>
+                        <artifactId>plexus-classworlds</artifactId>
+                    </exclusion>
+                    
+                    <!--
+                    NOTE: Use our *diet* version of Plexus Utils to save a few grams.
+                    -->
+                    <exclusion>
+                        <groupId>org.codehaus.plexus</groupId>
+                        <artifactId>plexus-utils</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+            
+            <dependency>
+                <groupId>org.codehaus.plexus</groupId>
+                <artifactId>plexus-utils</artifactId>
+                <version>1.4.5</version>
+            </dependency>
+            
             <dependency>
                 <groupId>commons-lang</groupId>
                 <artifactId>commons-lang</artifactId>
@@ -113,12 +163,6 @@
             </dependency>
 
             <dependency>
-                <groupId>classworlds</groupId>
-                <artifactId>classworlds</artifactId>
-                <version>1.1</version>
-            </dependency>
-
-            <dependency>
                 <groupId>jline</groupId>
                 <artifactId>jline</artifactId>
                 <version>0.9.91</version>
@@ -266,6 +310,7 @@
     </build>
     
     <modules>
+        <module>gshell-classworlds</module>
         <module>gshell-common</module>
         <module>gshell-clp</module>
         <module>gshell-prefs</module>



Mime
View raw message