geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r656322 - in /geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal: pom.xml src/main/assembly/boilerplate.xml src/main/underlay/etc/gsh-classworlds.conf
Date Wed, 14 May 2008 15:53:22 GMT
Author: jdillon
Date: Wed May 14 08:53:21 2008
New Revision: 656322

URL: http://svn.apache.org/viewvc?rev=656322&view=rev
Log:
Tidy up bits which should be in the repo

Modified:
    geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/pom.xml
    geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/assembly/boilerplate.xml
    geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/underlay/etc/gsh-classworlds.conf

Modified: geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/pom.xml?rev=656322&r1=656321&r2=656322&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/pom.xml Wed May 14 08:53:21
2008
@@ -39,78 +39,12 @@
     </description>
 
     <dependencies>
-        <!-- lib/gshell Dependencies -->
-        <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-commands</artifactId>
-            <version>${version}</version>
-        </dependency>
-
-        <!-- following are now pulled in by gshell-geronimo -> gshell-remote ->
gshell-framework
+        <!-- lib/boot Dependencies -->
         <dependency>
             <groupId>org.apache.geronimo.gshell</groupId>
             <artifactId>gshell-bootstrap</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.geronimo.gshell</groupId>
-            <artifactId>gshell-cli</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.codehaus.groovy</groupId>
-            <artifactId>groovy-all-minimal</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.ant</groupId>
-            <artifactId>ant</artifactId>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.ant</groupId>
-            <artifactId>ant-launcher</artifactId>
-        </dependency>
-
-        And gshell-embeddable has been replaced with individual depends
-        <dependency>
-            <groupId>org.apache.geronimo.gshell</groupId>
-            <artifactId>gshell-embeddable</artifactId>
-        </dependency>
-        -->
-
-        <!-- following are now pulled in by gshell-geronimo -> gshell-remote
-        <dependency>
-            <groupId>org.apache.geronimo.gshell</groupId>
-            <artifactId>gshell-whisper</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.gshell.remote</groupId>
-            <artifactId>gshell-remote-client</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.gshell.remote</groupId>
-            <artifactId>gshell-remote-common</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.gshell.remote</groupId>
-            <artifactId>gshell-remote-server</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.mina</groupId>
-            <artifactId>mina-core</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.mina</groupId>
-            <artifactId>mina-filter-ssl</artifactId>
-        </dependency>
-        -->
-      
         <!-- lib Dependencies -->
         <dependency>
             <groupId>asm</groupId>

Modified: geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/assembly/boilerplate.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/assembly/boilerplate.xml?rev=656322&r1=656321&r2=656322&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/assembly/boilerplate.xml
(original)
+++ geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/assembly/boilerplate.xml
Wed May 14 08:53:21 2008
@@ -30,14 +30,6 @@
     
     <dependencySets>
         <dependencySet>
-            <outputDirectory>contents/lib/gshell</outputDirectory>
-            <useStrictFiltering>true</useStrictFiltering>
-            <includes>
-                <include>org.apache.geronimo.framework:geronimo-commands</include>
-            </includes>
-        </dependencySet>
-
-        <dependencySet>
             <outputDirectory>contents/lib/boot</outputDirectory>
             <useStrictFiltering>true</useStrictFiltering>
             <includes>

Modified: geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/underlay/etc/gsh-classworlds.conf
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/underlay/etc/gsh-classworlds.conf?rev=656322&r1=656321&r2=656322&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/underlay/etc/gsh-classworlds.conf
(original)
+++ geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/underlay/etc/gsh-classworlds.conf
Wed May 14 08:53:21 2008
@@ -29,7 +29,6 @@
     load ${gshell.home}/lib/slf4j-log4j12-*.jar
     load ${gshell.home}/lib/jcl104-over-slf4j-*.jar
     load ${gshell.home}/lib/log4j-*.jar
-    load ${gshell.home}/lib/gshell/*.jar
     load ${gshell.home}/lib/cglib-nodep-*.jar
     load ${gshell.home}/lib/geronimo-kernel-*.jar
     load ${gshell.home}/lib/xstream-*.jar
@@ -62,6 +61,7 @@
     load ${gshell.home}/repository/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-*.jar
     load ${gshell.home}/repository/org/apache/geronimo/specs/geronimo-javaee-deployment_1.1MR3_spec/1.0/geronimo-javaee-deployment_1.1MR3_spec-1.0.jar
     load ${gshell.home}/repository/org/apache/geronimo/framework/geronimo-cli/2.2-SNAPSHOT/geronimo-cli-*.jar
+    load ${gshell.home}/repository/org/apache/geronimo/framework/geronimo-commands/2.2-SNAPSHOT/geronimo-commands-*.jar
     load ${gshell.home}/repository/org/apache/geronimo/framework/geronimo-deploy-config/2.2-SNAPSHOT/geronimo-deploy-config-*.jar
     load ${gshell.home}/repository/org/apache/geronimo/framework/geronimo-deploy-jsr88/2.2-SNAPSHOT/geronimo-deploy-jsr88-*.jar
     load ${gshell.home}/repository/org/apache/geronimo/framework/geronimo-deploy-tool/2.2-SNAPSHOT/geronimo-deploy-tool-*.jar



Mime
View raw message