You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jd...@apache.org on 2008/03/26 17:28:33 UTC
svn commit: r641381 - in /geronimo/gshell/trunk/gshell-assembly: pom.xml
src/main/assembly/full.xml
Author: jdillon
Date: Wed Mar 26 09:28:25 2008
New Revision: 641381
URL: http://svn.apache.org/viewvc?rev=641381&view=rev
Log:
Drop use of the embeddale jar for now
Modified:
geronimo/gshell/trunk/gshell-assembly/pom.xml
geronimo/gshell/trunk/gshell-assembly/src/main/assembly/full.xml
Modified: geronimo/gshell/trunk/gshell-assembly/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-assembly/pom.xml?rev=641381&r1=641380&r2=641381&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-assembly/pom.xml (original)
+++ geronimo/gshell/trunk/gshell-assembly/pom.xml Wed Mar 26 09:28:25 2008
@@ -46,10 +46,15 @@
<dependency>
<groupId>org.apache.geronimo.gshell</groupId>
- <artifactId>gshell-embeddable</artifactId>
+ <artifactId>gshell-core</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.geronimo.gshell.commands</groupId>
+ <artifactId>gshell-builtins</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.geronimo.gshell</groupId>
<artifactId>gshell-cli</artifactId>
</dependency>
@@ -121,7 +126,11 @@
</executions>
<configuration>
<descriptors>
+ <!--
+ NOTE: Disabled while refactoring
+
<descriptor>${pom.basedir}/src/main/assembly/minimal.xml</descriptor>
+ -->
<descriptor>${pom.basedir}/src/main/assembly/full.xml</descriptor>
</descriptors>
<finalName>gshell-${version}</finalName>
Modified: geronimo/gshell/trunk/gshell-assembly/src/main/assembly/full.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-assembly/src/main/assembly/full.xml?rev=641381&r1=641380&r2=641381&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-assembly/src/main/assembly/full.xml (original)
+++ geronimo/gshell/trunk/gshell-assembly/src/main/assembly/full.xml Wed Mar 26 09:28:25 2008
@@ -66,34 +66,11 @@
<dependencySet>
<outputDirectory>lib</outputDirectory>
<useStrictFiltering>true</useStrictFiltering>
- <includes>
- <include>org.apache.geronimo.gshell:gshell-embeddable</include>
- <include>org.apache.geronimo.gshell:gshell-cli</include>
- <include>org.apache.geronimo.gshell.commands:gshell-optional</include>
-
- <!-- Logging -->
- <include>org.slf4j:jcl104-over-slf4j</include>
- <include>org.slf4j:slf4j-log4j12</include>
- <include>org.apache.geronimo.gshell:gshell-diet-log4j</include>
-
- <!-- BSF -->
- <include>org.apache.geronimo.gshell.commands:gshell-bsf</include>
- <include>bsf:bsf</include>
- <include>org.beanshell:bsh-core</include>
- <include>org.beanshell:bsh-bsf</include>
-
- <!-- VFS -->
- <include>org.apache.geronimo.gshell.commands:gshell-vfs</include>
- <include>commons-vfs:commons-vfs</include>
-
- <!-- Remote -->
- <include>org.apache.geronimo.gshell:gshell-whisper</include>
- <include>org.apache.geronimo.gshell.remote:gshell-remote-common</include>
- <include>org.apache.geronimo.gshell.remote:gshell-remote-server</include>
- <include>org.apache.geronimo.gshell.remote:gshell-remote-client</include>
- <include>org.apache.mina:mina-core</include>
- <include>org.apache.mina:mina-filter-ssl</include>
- </includes>
+ <excludes>
+ <exclude>org.codehaus.plexus:plexus-classworlds</exclude>
+ <exclude>org.apache.geronimo.gshell:gshell-assembly</exclude>
+ <exclude>org.apache.geronimo.gshell:gshell-bootstrap</exclude>
+ </excludes>
</dependencySet>
<dependencySet>