You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ff...@apache.org on 2008/12/07 14:56:51 UTC
svn commit: r724133 - in /servicemix/smx4/kernel/trunk: ./ assembly/
assembly/src/main/descriptors/ assembly/src/main/filtered-resources/etc/
gshell/gshell-core/
gshell/itests/src/test/java/org/apache/servicemix/kernel/gshell/itests/
Author: ffang
Date: Sun Dec 7 05:56:50 2008
New Revision: 724133
URL: http://svn.apache.org/viewvc?rev=724133&view=rev
Log:
[SMX4KNL-158]should refer Jline bundle in gshell-core but not use it as private package
Modified:
servicemix/smx4/kernel/trunk/assembly/pom.xml
servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/unix-bin.xml
servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/windows-bin.xml
servicemix/smx4/kernel/trunk/assembly/src/main/filtered-resources/etc/startup.properties
servicemix/smx4/kernel/trunk/gshell/gshell-core/pom.xml
servicemix/smx4/kernel/trunk/gshell/itests/src/test/java/org/apache/servicemix/kernel/gshell/itests/CoreTest.java
servicemix/smx4/kernel/trunk/pom.xml
Modified: servicemix/smx4/kernel/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/assembly/pom.xml?rev=724133&r1=724132&r2=724133&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/assembly/pom.xml (original)
+++ servicemix/smx4/kernel/trunk/assembly/pom.xml Sun Dec 7 05:56:50 2008
@@ -175,6 +175,10 @@
<artifactId>org.apache.servicemix.bundles.commons-httpclient</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.jline</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.compendium</artifactId>
</dependency>
@@ -409,4 +413,4 @@
</build>
</profile>
</profiles>
-</project>
\ No newline at end of file
+</project>
Modified: servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/unix-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/unix-bin.xml?rev=724133&r1=724132&r2=724133&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/unix-bin.xml (original)
+++ servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/unix-bin.xml Sun Dec 7 05:56:50 2008
@@ -177,6 +177,7 @@
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.commons-vfs</include>
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.commons-codec</include>
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.commons-httpclient</include>
+ <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.jline</include>
</includes>
</dependencySet>
<dependencySet>
Modified: servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/windows-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/windows-bin.xml?rev=724133&r1=724132&r2=724133&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/windows-bin.xml (original)
+++ servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/windows-bin.xml Sun Dec 7 05:56:50 2008
@@ -169,6 +169,7 @@
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.commons-vfs</include>
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.commons-codec</include>
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.commons-httpclient</include>
+ <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.jline</include>
</includes>
</dependencySet>
<dependencySet>
Modified: servicemix/smx4/kernel/trunk/assembly/src/main/filtered-resources/etc/startup.properties
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/assembly/src/main/filtered-resources/etc/startup.properties?rev=724133&r1=724132&r2=724133&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/assembly/src/main/filtered-resources/etc/startup.properties (original)
+++ servicemix/smx4/kernel/trunk/assembly/src/main/filtered-resources/etc/startup.properties Sun Dec 7 05:56:50 2008
@@ -38,6 +38,7 @@
# The rest of the services..
#
org/apache/geronimo/specs/geronimo-annotation_1.0_spec/${geronimo.annotation.version}/geronimo-annotation_1.0_spec-${geronimo.annotation.version}.jar=10
+org/apache/servicemix/bundles/org.apache.servicemix.bundles.jline/${jline.version}/org.apache.servicemix.bundles.jline-${jline.version}.jar=50
org/apache/servicemix/bundles/org.apache.servicemix.bundles.aopalliance/${aopalliance.version}/org.apache.servicemix.bundles.aopalliance-${aopalliance.version}.jar=50
org/apache/servicemix/bundles/org.apache.servicemix.bundles.cglib/${cglib.version}/org.apache.servicemix.bundles.cglib-${cglib.version}.jar=50
org/apache/servicemix/bundles/org.apache.servicemix.bundles.mina/${mina.version}/org.apache.servicemix.bundles.mina-${mina.version}.jar=50
Modified: servicemix/smx4/kernel/trunk/gshell/gshell-core/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-core/pom.xml?rev=724133&r1=724132&r2=724133&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-core/pom.xml (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-core/pom.xml Sun Dec 7 05:56:50 2008
@@ -45,6 +45,7 @@
org.aopalliance.aop,
org.apache.commons.vfs.provider.temp,
org.apache.commons.vfs.provider.ram,
+ jline*,
org.apache.ivy*;resolution:=optional,
org.apache.servicemix.kernel.jaas.config;resolution:=optional,
org.apache.servicemix.kernel.main.spi;resolution:=optional;version="1.0.0",
@@ -69,9 +70,6 @@
org.codehaus.plexus.interpolation*,
org.codehaus.plexus.util
</gshell.osgi.export>
- <gshell.osgi.private>
- jline*,
- </gshell.osgi.private>
</properties>
<dependencies>
@@ -141,10 +139,6 @@
</exclusions>
</dependency>
<dependency>
- <groupId>jline</groupId>
- <artifactId>jline</artifactId>
- </dependency>
- <dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
</dependency>
@@ -213,6 +207,10 @@
<artifactId>org.apache.servicemix.bundles.junit</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.jline</artifactId>
+ </dependency>
</dependencies>
<build>
@@ -248,7 +246,6 @@
<Import-Package>${gshell.osgi.import}</Import-Package>
<DynamicImport-Package>sun.misc.*</DynamicImport-Package>
<Export-Package>${gshell.osgi.export}</Export-Package>
- <Private-Package>${gshell.osgi.private}</Private-Package>
<Spring-Context>*;publish-context:=false;create-asynchronously:=false</Spring-Context>
</instructions>
<unpackBundle>true</unpackBundle>
@@ -296,7 +293,6 @@
-->
<include>org.apache.geronimo.gshell.wisdom:gshell-wisdom-core</include>
<include>org.apache.geronimo.gshell.wisdom:gshell-wisdom-bootstrap</include>
- <include>jline:jline</include>
<include>${project.groupId}:${project.artifactId}</include>
</includes>
</artifactSet>
@@ -471,12 +467,6 @@
<exclude>org/apache/geronimo/gshell/**</exclude>
</excludes>
</filter>
- <filter>
- <artifact>jline:jline</artifact>
- <excludes>
- <exclude>jline/**</exclude>
- </excludes>
- </filter>
</filters>
<createSourcesJar>${createSourcesJar}</createSourcesJar>
<promoteTransitiveDependencies>true</promoteTransitiveDependencies>
Modified: servicemix/smx4/kernel/trunk/gshell/itests/src/test/java/org/apache/servicemix/kernel/gshell/itests/CoreTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/itests/src/test/java/org/apache/servicemix/kernel/gshell/itests/CoreTest.java?rev=724133&r1=724132&r2=724133&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/itests/src/test/java/org/apache/servicemix/kernel/gshell/itests/CoreTest.java (original)
+++ servicemix/smx4/kernel/trunk/gshell/itests/src/test/java/org/apache/servicemix/kernel/gshell/itests/CoreTest.java Sun Dec 7 05:56:50 2008
@@ -29,6 +29,7 @@
@Override
protected String[] getTestBundlesNames() {
return new String[] {
+ getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.jline"),
getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.commons-httpclient"),
getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.commons-jexl"),
getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.commons-vfs"),
Modified: servicemix/smx4/kernel/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/pom.xml?rev=724133&r1=724132&r2=724133&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/pom.xml (original)
+++ servicemix/smx4/kernel/trunk/pom.xml Sun Dec 7 05:56:50 2008
@@ -87,7 +87,7 @@
<gshell.version>1.0-alpha-2-SNAPSHOT</gshell.version>
<jaxp.ri.version>1.4.2_1-SNAPSHOT</jaxp.ri.version>
<junit.version>4.4_1</junit.version>
- <jline.version>0.9.94</jline.version>
+ <jline.version>0.9.94_1-SNAPSHOT</jline.version>
<log4j.version>1.2.14</log4j.version>
<mina.version>1.1.7_1-SNAPSHOT</mina.version>
<oro.version>2.0.8_1</oro.version>
@@ -446,15 +446,9 @@
<version>${log4j.version}</version>
</dependency>
<dependency>
- <groupId>jline</groupId>
- <artifactId>jline</artifactId>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.jline</artifactId>
<version>${jline.version}</version>
- <exclusions>
- <exclusion>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>commons-logging</groupId>