You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by gn...@apache.org on 2007/12/07 21:24:17 UTC
svn commit: r602207 - in /servicemix/branches/servicemix-4.0: bundles/
bundles/ant/ bundles/aopalliance/ bundles/asm/ bundles/cglib/
bundles/junit/ bundles/mina/ bundles/xstream/ features/ runtime/
runtime/bundles/ runtime/bundles/ant/ runtime/bundles/...
Author: gnodet
Date: Fri Dec 7 12:24:14 2007
New Revision: 602207
URL: http://svn.apache.org/viewvc?rev=602207&view=rev
Log:
Isolate ServiceMix Runtime
Added:
servicemix/branches/servicemix-4.0/features/
- copied from r602015, servicemix/branches/servicemix-4.0/runtime/features/
servicemix/branches/servicemix-4.0/runtime/bundles/
servicemix/branches/servicemix-4.0/runtime/bundles/ant/
- copied from r602010, servicemix/branches/servicemix-4.0/bundles/ant/
servicemix/branches/servicemix-4.0/runtime/bundles/ant/pom.xml
- copied, changed from r602176, servicemix/branches/servicemix-4.0/bundles/ant/pom.xml
servicemix/branches/servicemix-4.0/runtime/bundles/aopalliance/
- copied from r602010, servicemix/branches/servicemix-4.0/bundles/aopalliance/
servicemix/branches/servicemix-4.0/runtime/bundles/aopalliance/pom.xml
- copied, changed from r602176, servicemix/branches/servicemix-4.0/bundles/aopalliance/pom.xml
servicemix/branches/servicemix-4.0/runtime/bundles/asm/
- copied from r602010, servicemix/branches/servicemix-4.0/bundles/asm/
servicemix/branches/servicemix-4.0/runtime/bundles/asm/pom.xml
- copied, changed from r602176, servicemix/branches/servicemix-4.0/bundles/asm/pom.xml
servicemix/branches/servicemix-4.0/runtime/bundles/cglib/
- copied from r602010, servicemix/branches/servicemix-4.0/bundles/cglib/
servicemix/branches/servicemix-4.0/runtime/bundles/cglib/pom.xml
- copied, changed from r602176, servicemix/branches/servicemix-4.0/bundles/cglib/pom.xml
servicemix/branches/servicemix-4.0/runtime/bundles/junit/
- copied from r602010, servicemix/branches/servicemix-4.0/bundles/junit/
servicemix/branches/servicemix-4.0/runtime/bundles/junit/pom.xml
- copied, changed from r602176, servicemix/branches/servicemix-4.0/bundles/junit/pom.xml
servicemix/branches/servicemix-4.0/runtime/bundles/mina/
- copied from r602010, servicemix/branches/servicemix-4.0/bundles/mina/
servicemix/branches/servicemix-4.0/runtime/bundles/mina/pom.xml
- copied, changed from r602176, servicemix/branches/servicemix-4.0/bundles/mina/pom.xml
servicemix/branches/servicemix-4.0/runtime/bundles/pom.xml
- copied, changed from r602010, servicemix/branches/servicemix-4.0/bundles/pom.xml
servicemix/branches/servicemix-4.0/runtime/bundles/xstream/
- copied from r602010, servicemix/branches/servicemix-4.0/bundles/xstream/
servicemix/branches/servicemix-4.0/runtime/bundles/xstream/pom.xml
- copied, changed from r602176, servicemix/branches/servicemix-4.0/bundles/xstream/pom.xml
Removed:
servicemix/branches/servicemix-4.0/bundles/ant/
servicemix/branches/servicemix-4.0/bundles/aopalliance/
servicemix/branches/servicemix-4.0/bundles/asm/
servicemix/branches/servicemix-4.0/bundles/cglib/
servicemix/branches/servicemix-4.0/bundles/junit/
servicemix/branches/servicemix-4.0/bundles/mina/
servicemix/branches/servicemix-4.0/bundles/xstream/
servicemix/branches/servicemix-4.0/runtime/features/
Modified:
servicemix/branches/servicemix-4.0/bundles/pom.xml
servicemix/branches/servicemix-4.0/runtime/filemonitor/pom.xml
servicemix/branches/servicemix-4.0/runtime/gshell/gshell-core/pom.xml
servicemix/branches/servicemix-4.0/runtime/gshell/gshell-obr/pom.xml
servicemix/branches/servicemix-4.0/runtime/gshell/gshell-osgi/pom.xml
servicemix/branches/servicemix-4.0/runtime/gshell/pom.xml
servicemix/branches/servicemix-4.0/runtime/main/pom.xml
servicemix/branches/servicemix-4.0/runtime/minimum/pom.xml
servicemix/branches/servicemix-4.0/runtime/minimum/src/main/descriptors/unix-bin.xml
servicemix/branches/servicemix-4.0/runtime/pom.xml
Modified: servicemix/branches/servicemix-4.0/bundles/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/bundles/pom.xml?rev=602207&r1=602206&r2=602207&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/bundles/pom.xml (original)
+++ servicemix/branches/servicemix-4.0/bundles/pom.xml Fri Dec 7 12:24:14 2007
@@ -36,21 +36,15 @@
<modules>
<module>acegi</module>
- <module>ant</module>
- <module>aopalliance</module>
- <module>asm</module>
- <module>cglib</module>
<module>cxf</module>
<module>jaxb-api</module>
<module>jaxb-impl</module>
<module>jaxws-api</module>
<module>junit</module>
<module>httpcore</module>
- <module>mina</module>
<module>openejb</module>
<module>openjpa</module>
<module>wsdl4j</module>
- <module>xstream</module>
</modules>
<properties>
Copied: servicemix/branches/servicemix-4.0/runtime/bundles/ant/pom.xml (from r602176, servicemix/branches/servicemix-4.0/bundles/ant/pom.xml)
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/runtime/bundles/ant/pom.xml?p2=servicemix/branches/servicemix-4.0/runtime/bundles/ant/pom.xml&p1=servicemix/branches/servicemix-4.0/bundles/ant/pom.xml&r1=602176&r2=602207&rev=602207&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/bundles/ant/pom.xml (original)
+++ servicemix/branches/servicemix-4.0/runtime/bundles/ant/pom.xml Fri Dec 7 12:24:14 2007
@@ -23,14 +23,13 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.servicemix</groupId>
+ <groupId>org.apache.servicemix.runtime.bundles</groupId>
<artifactId>bundles</artifactId>
- <version>4.0-SNAPSHOT</version>
+ <version>0.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>${pom.groupId}.${pkgArtifactId}</artifactId>
- <version>${pkgVersion}-${pomVersion}</version>
+ <artifactId>${pom.groupId}.${pkgArtifactId}-${pkgVersion}</artifactId>
<packaging>bundle</packaging>
<name>ServiceMix OSGI Common Bundles: ${pkgArtifactId}</name>
<description>
@@ -39,9 +38,7 @@
<properties>
<pkgArtifactId>ant</pkgArtifactId>
- <pkgVersion>1.7.0</pkgVersion>
- <pomVersion>4.0-SNAPSHOT</pomVersion>
-
+ <pkgVersion>${ant.version}</pkgVersion>
<servicemix.osgi.export.pkg>org.apache.tools</servicemix.osgi.export.pkg>
<servicemix.osgi.import.pkg>
com.sun.tools.javac*;resolution:=optional,
Copied: servicemix/branches/servicemix-4.0/runtime/bundles/aopalliance/pom.xml (from r602176, servicemix/branches/servicemix-4.0/bundles/aopalliance/pom.xml)
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/runtime/bundles/aopalliance/pom.xml?p2=servicemix/branches/servicemix-4.0/runtime/bundles/aopalliance/pom.xml&p1=servicemix/branches/servicemix-4.0/bundles/aopalliance/pom.xml&r1=602176&r2=602207&rev=602207&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/bundles/aopalliance/pom.xml (original)
+++ servicemix/branches/servicemix-4.0/runtime/bundles/aopalliance/pom.xml Fri Dec 7 12:24:14 2007
@@ -23,14 +23,13 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.servicemix</groupId>
+ <groupId>org.apache.servicemix.runtime.bundles</groupId>
<artifactId>bundles</artifactId>
- <version>4.0-SNAPSHOT</version>
+ <version>0.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>${pom.groupId}.${pkgArtifactId}</artifactId>
- <version>${pkgVersion}-${pomVersion}</version>
+ <artifactId>${pom.groupId}.${pkgArtifactId}-${pkgVersion}</artifactId>
<packaging>bundle</packaging>
<name>ServiceMix OSGI Common Bundles: ${pkgArtifactId}</name>
<description>
@@ -39,8 +38,8 @@
<properties>
<pkgArtifactId>aopalliance</pkgArtifactId>
- <pkgVersion>1.0</pkgVersion>
- <pomVersion>4.0-SNAPSHOT</pomVersion>
+ <pkgVersion>${aopalliance.version}</pkgVersion>
+ <servicemix.osgi.export.pkg>org.aopalliance</servicemix.osgi.export.pkg>
</properties>
<dependencies>
Copied: servicemix/branches/servicemix-4.0/runtime/bundles/asm/pom.xml (from r602176, servicemix/branches/servicemix-4.0/bundles/asm/pom.xml)
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/runtime/bundles/asm/pom.xml?p2=servicemix/branches/servicemix-4.0/runtime/bundles/asm/pom.xml&p1=servicemix/branches/servicemix-4.0/bundles/asm/pom.xml&r1=602176&r2=602207&rev=602207&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/bundles/asm/pom.xml (original)
+++ servicemix/branches/servicemix-4.0/runtime/bundles/asm/pom.xml Fri Dec 7 12:24:14 2007
@@ -23,14 +23,13 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.servicemix</groupId>
+ <groupId>org.apache.servicemix.runtime.bundles</groupId>
<artifactId>bundles</artifactId>
- <version>4.0-SNAPSHOT</version>
+ <version>0.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>${pom.groupId}.${pkgArtifactId}</artifactId>
- <version>${pkgVersion}-${pomVersion}</version>
+ <artifactId>${pom.groupId}.${pkgArtifactId}-${pkgVersion}</artifactId>
<packaging>bundle</packaging>
<name>ServiceMix OSGI Common Bundles: ${pkgArtifactId}</name>
<description>
@@ -39,8 +38,8 @@
<properties>
<pkgArtifactId>asm</pkgArtifactId>
- <pkgVersion>2.2.3</pkgVersion>
- <pomVersion>4.0-SNAPSHOT</pomVersion>
+ <pkgVersion>${asm.version}</pkgVersion>
+ <servicemix.osgi.export.pkg>org.objectweb.asm</servicemix.osgi.export.pkg>
</properties>
<dependencies>
Copied: servicemix/branches/servicemix-4.0/runtime/bundles/cglib/pom.xml (from r602176, servicemix/branches/servicemix-4.0/bundles/cglib/pom.xml)
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/runtime/bundles/cglib/pom.xml?p2=servicemix/branches/servicemix-4.0/runtime/bundles/cglib/pom.xml&p1=servicemix/branches/servicemix-4.0/bundles/cglib/pom.xml&r1=602176&r2=602207&rev=602207&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/bundles/cglib/pom.xml (original)
+++ servicemix/branches/servicemix-4.0/runtime/bundles/cglib/pom.xml Fri Dec 7 12:24:14 2007
@@ -23,14 +23,13 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.servicemix</groupId>
+ <groupId>org.apache.servicemix.runtime.bundles</groupId>
<artifactId>bundles</artifactId>
- <version>4.0-SNAPSHOT</version>
+ <version>0.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>${pom.groupId}.${pkgArtifactId}</artifactId>
- <version>${pkgVersion}-${pomVersion}</version>
+ <artifactId>${pom.groupId}.${pkgArtifactId}-${pkgVersion}</artifactId>
<packaging>bundle</packaging>
<name>ServiceMix OSGI Common Bundles: ${pkgArtifactId}</name>
<description>
@@ -39,11 +38,8 @@
<properties>
<pkgArtifactId>cglib</pkgArtifactId>
- <pkgVersion>2.1_3</pkgVersion>
- <pomVersion>4.0-SNAPSHOT</pomVersion>
- <servicemix.osgi.export.pkg>
- net.sf.cglib*
- </servicemix.osgi.export.pkg>
+ <pkgVersion>${cglib.version}</pkgVersion>
+ <servicemix.osgi.export.pkg>net.sf.cglib</servicemix.osgi.export.pkg>
<servicemix.osgi.import.pkg>
net.sf.cglib.asm.util;resolution:=optional,
org.apache.tools.ant*;resolution:=optional,
Copied: servicemix/branches/servicemix-4.0/runtime/bundles/junit/pom.xml (from r602176, servicemix/branches/servicemix-4.0/bundles/junit/pom.xml)
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/runtime/bundles/junit/pom.xml?p2=servicemix/branches/servicemix-4.0/runtime/bundles/junit/pom.xml&p1=servicemix/branches/servicemix-4.0/bundles/junit/pom.xml&r1=602176&r2=602207&rev=602207&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/bundles/junit/pom.xml (original)
+++ servicemix/branches/servicemix-4.0/runtime/bundles/junit/pom.xml Fri Dec 7 12:24:14 2007
@@ -23,14 +23,13 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.servicemix</groupId>
+ <groupId>org.apache.servicemix.runtime.bundles</groupId>
<artifactId>bundles</artifactId>
- <version>4.0-SNAPSHOT</version>
+ <version>0.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>${pom.groupId}.${pkgArtifactId}</artifactId>
- <version>${pkgVersion}-${pomVersion}</version>
+ <artifactId>${pom.groupId}.${pkgArtifactId}-${pkgVersion}</artifactId>
<packaging>bundle</packaging>
<name>ServiceMix OSGI Common Bundles: ${pkgArtifactId}</name>
<description>
@@ -40,11 +39,10 @@
<properties>
<pkgArtifactId>junit</pkgArtifactId>
<pkgVersion>${junit.version}</pkgVersion>
- <pomVersion>4.0-SNAPSHOT</pomVersion>
- <servicemix.osgi.export.pkg>
- org.junit*,
- junit*
- </servicemix.osgi.export.pkg>
+ <servicemix.osgi.export>
+ org.junit*;version=${pkgVersion},
+ junit*;version=${pkgVersion}
+ </servicemix.osgi.export>
<servicemix.osgi.import.pkg>
org.hamcrest*;resolution:=optional,
*
Copied: servicemix/branches/servicemix-4.0/runtime/bundles/mina/pom.xml (from r602176, servicemix/branches/servicemix-4.0/bundles/mina/pom.xml)
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/runtime/bundles/mina/pom.xml?p2=servicemix/branches/servicemix-4.0/runtime/bundles/mina/pom.xml&p1=servicemix/branches/servicemix-4.0/bundles/mina/pom.xml&r1=602176&r2=602207&rev=602207&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/bundles/mina/pom.xml (original)
+++ servicemix/branches/servicemix-4.0/runtime/bundles/mina/pom.xml Fri Dec 7 12:24:14 2007
@@ -23,14 +23,13 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.servicemix</groupId>
+ <groupId>org.apache.servicemix.runtime.bundles</groupId>
<artifactId>bundles</artifactId>
- <version>4.0-SNAPSHOT</version>
+ <version>0.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>${pom.groupId}.${pkgArtifactId}</artifactId>
- <version>${pkgVersion}-${pomVersion}</version>
+ <artifactId>${pom.groupId}.${pkgArtifactId}-${pkgVersion}</artifactId>
<packaging>bundle</packaging>
<name>ServiceMix OSGI Common Bundles: ${pkgArtifactId}</name>
<description>
@@ -40,44 +39,51 @@
<properties>
<pkgArtifactId>mina</pkgArtifactId>
<pkgVersion>${mina.version}</pkgVersion>
- <pomVersion>4.0-SNAPSHOT</pomVersion>
+ <servicemix.osgi.export.pkg>
+ org.apache.mina
+ </servicemix.osgi.export.pkg>
<servicemix.osgi.import.pkg>
- com.jcraft.jzlib*;resolution:=optional,
- net.gleamynode.netty2*;resolution:=optional,
+ com.jcraft.jzlib*;resolution:=optional,
+ net.gleamynode.netty2*;resolution:=optional,
*
</servicemix.osgi.import.pkg>
- <servicemix.osgi.export.pkg>org.apache.mina</servicemix.osgi.export.pkg>
</properties>
<dependencies>
<dependency>
<groupId>org.apache.mina</groupId>
<artifactId>mina-core</artifactId>
+ <version>${pkgVersion}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.mina</groupId>
<artifactId>mina-filter-codec-netty</artifactId>
+ <version>${pkgVersion}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.mina</groupId>
<artifactId>mina-filter-compression</artifactId>
+ <version>${pkgVersion}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.mina</groupId>
<artifactId>mina-filter-ssl</artifactId>
+ <version>${pkgVersion}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.mina</groupId>
<artifactId>mina-integration-jmx</artifactId>
+ <version>${pkgVersion}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.mina</groupId>
<artifactId>mina-integration-spring</artifactId>
+ <version>${pkgVersion}</version>
<optional>true</optional>
</dependency>
</dependencies>
Copied: servicemix/branches/servicemix-4.0/runtime/bundles/pom.xml (from r602010, servicemix/branches/servicemix-4.0/bundles/pom.xml)
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/runtime/bundles/pom.xml?p2=servicemix/branches/servicemix-4.0/runtime/bundles/pom.xml&p1=servicemix/branches/servicemix-4.0/bundles/pom.xml&r1=602010&r2=602207&rev=602207&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/bundles/pom.xml (original)
+++ servicemix/branches/servicemix-4.0/runtime/bundles/pom.xml Fri Dec 7 12:24:14 2007
@@ -23,37 +23,28 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.servicemix</groupId>
- <artifactId>servicemix</artifactId>
- <version>4.0-SNAPSHOT</version>
+ <groupId>org.apache.servicemix.runtime</groupId>
+ <artifactId>runtime</artifactId>
+ <version>0.1-SNAPSHOT</version>
</parent>
- <groupId>org.apache.servicemix</groupId>
+ <groupId>org.apache.servicemix.runtime.bundles</groupId>
<artifactId>bundles</artifactId>
<packaging>pom</packaging>
- <version>4.0-SNAPSHOT</version>
<name>ServiceMix OSGI Common Bundles</name>
<modules>
- <module>acegi</module>
<module>ant</module>
<module>aopalliance</module>
<module>asm</module>
<module>cglib</module>
- <module>cxf</module>
- <module>jaxb-api</module>
- <module>jaxb-impl</module>
- <module>jaxws-api</module>
<module>junit</module>
- <module>httpcore</module>
<module>mina</module>
- <module>openejb</module>
- <module>openjpa</module>
- <module>wsdl4j</module>
<module>xstream</module>
</modules>
<properties>
+ <servicemix.osgi.export>${servicemix.osgi.export.pkg}*;version=${pkgVersion}</servicemix.osgi.export>
<servicemix.osgi.export.pkg></servicemix.osgi.export.pkg>
<servicemix.osgi.import.pkg></servicemix.osgi.import.pkg>
<servicemix.osgi.private.pkg></servicemix.osgi.private.pkg>
@@ -64,8 +55,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>${felix.version}</version>
- <extensions>true</extensions>
<executions>
<execution>
<goals>
@@ -76,10 +65,11 @@
<configuration>
<instructions>
<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
- <Export-Package>${servicemix.osgi.export.pkg}*;version=${pkgVersion}</Export-Package>
+ <Export-Package>${servicemix.osgi.export}</Export-Package>
<Import-Package>${servicemix.osgi.import.pkg}*</Import-Package>
<Private-Package>${servicemix.osgi.private.pkg}</Private-Package>
</instructions>
+ <unpackBundle>true</unpackBundle>
</configuration>
</plugin>
</plugins>
Copied: servicemix/branches/servicemix-4.0/runtime/bundles/xstream/pom.xml (from r602176, servicemix/branches/servicemix-4.0/bundles/xstream/pom.xml)
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/runtime/bundles/xstream/pom.xml?p2=servicemix/branches/servicemix-4.0/runtime/bundles/xstream/pom.xml&p1=servicemix/branches/servicemix-4.0/bundles/xstream/pom.xml&r1=602176&r2=602207&rev=602207&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/bundles/xstream/pom.xml (original)
+++ servicemix/branches/servicemix-4.0/runtime/bundles/xstream/pom.xml Fri Dec 7 12:24:14 2007
@@ -23,14 +23,13 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.servicemix</groupId>
+ <groupId>org.apache.servicemix.runtime.bundles</groupId>
<artifactId>bundles</artifactId>
- <version>4.0-SNAPSHOT</version>
+ <version>0.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>${pom.groupId}.${pkgArtifactId}</artifactId>
- <version>${pkgVersion}-${pomVersion}</version>
+ <artifactId>${pom.groupId}.${pkgArtifactId}-${pkgVersion}</artifactId>
<packaging>bundle</packaging>
<name>ServiceMix OSGI Common Bundles: ${pkgArtifactId}</name>
<description>
@@ -39,11 +38,7 @@
<properties>
<pkgArtifactId>xstream</pkgArtifactId>
- <pkgVersion>1.2.2</pkgVersion>
- <pomVersion>4.0-SNAPSHOT</pomVersion>
- <servicemix.osgi.export.pkg>
- com.thoughtworks.xstream*
- </servicemix.osgi.export.pkg>
+ <pkgVersion>${xstream.version}</pkgVersion>
<servicemix.osgi.import.pkg>
net.sf.cglib*;resolution:=optional,
nu.xom*;resolution:=optional,
Modified: servicemix/branches/servicemix-4.0/runtime/filemonitor/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/runtime/filemonitor/pom.xml?rev=602207&r1=602206&r2=602207&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/runtime/filemonitor/pom.xml (original)
+++ servicemix/branches/servicemix-4.0/runtime/filemonitor/pom.xml Fri Dec 7 12:24:14 2007
@@ -23,9 +23,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.servicemix</groupId>
- <artifactId>servicemix</artifactId>
- <version>4.0-SNAPSHOT</version>
+ <groupId>org.apache.servicemix.runtime</groupId>
+ <artifactId>runtime</artifactId>
+ <version>0.1-SNAPSHOT</version>
</parent>
<artifactId>org.apache.servicemix.runtime.filemonitor</artifactId>
@@ -38,17 +38,18 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.core</artifactId>
+ <version>${felix.osgi.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.ant</artifactId>
- <version>1.7.0-4.0-SNAPSHOT</version>
+ <artifactId>org.apache.servicemix.bundles.ant-${ant.version}</artifactId>
+ <version>0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.compendium</artifactId>
- <version>0.9.0-SNAPSHOT</version>
+ <version>${felix.compendium.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.felix</groupId>
@@ -69,7 +70,7 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>1.3.1</version>
+ <version>${commons.io.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: servicemix/branches/servicemix-4.0/runtime/gshell/gshell-core/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/runtime/gshell/gshell-core/pom.xml?rev=602207&r1=602206&r2=602207&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/runtime/gshell/gshell-core/pom.xml (original)
+++ servicemix/branches/servicemix-4.0/runtime/gshell/gshell-core/pom.xml Fri Dec 7 12:24:14 2007
@@ -23,13 +23,13 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.servicemix.gshell</groupId>
+ <groupId>org.apache.servicemix.runtime.gshell</groupId>
<artifactId>gshell</artifactId>
- <version>4.0-SNAPSHOT</version>
+ <version>0.1-SNAPSHOT</version>
</parent>
- <groupId>org.apache.servicemix.gshell</groupId>
- <artifactId>org.apache.servicemix.gshell.core</artifactId>
+ <groupId>org.apache.servicemix.runtime.gshell</groupId>
+ <artifactId>org.apache.servicemix.runtime.gshell.core</artifactId>
<packaging>bundle</packaging>
<name>ServiceMix GShell Core</name>
@@ -68,9 +68,9 @@
<dependencies>
<dependency>
- <groupId>org.apache.servicemix</groupId>
- <artifactId>org.apache.servicemix.main</artifactId>
- <version>4.0-SNAPSHOT</version>
+ <groupId>org.apache.servicemix.runtime</groupId>
+ <artifactId>org.apache.servicemix.runtime.main</artifactId>
+ <version>0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.springframework.osgi</groupId>
@@ -171,10 +171,12 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
+ <version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
+ <version>${spring.version}</version>
</dependency>
<dependency>
<groupId>cglib</groupId>
@@ -210,7 +212,6 @@
<include>**/*</include>
</includes>
</resource>
-
<resource>
<directory>${pom.basedir}/src/main/filtered-resources</directory>
<filtering>true</filtering>
@@ -230,8 +231,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.0.0</version>
- <extensions>true</extensions>
<configuration>
<instructions>
<Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
Modified: servicemix/branches/servicemix-4.0/runtime/gshell/gshell-obr/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/runtime/gshell/gshell-obr/pom.xml?rev=602207&r1=602206&r2=602207&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/runtime/gshell/gshell-obr/pom.xml (original)
+++ servicemix/branches/servicemix-4.0/runtime/gshell/gshell-obr/pom.xml Fri Dec 7 12:24:14 2007
@@ -23,13 +23,13 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.servicemix.gshell</groupId>
+ <groupId>org.apache.servicemix.runtime.gshell</groupId>
<artifactId>gshell</artifactId>
- <version>4.0-SNAPSHOT</version>
+ <version>0.1-SNAPSHOT</version>
</parent>
- <groupId>org.apache.servicemix.gshell</groupId>
- <artifactId>org.apache.servicemix.gshell.obr</artifactId>
+ <groupId>org.apache.servicemix.runtime.gshell</groupId>
+ <artifactId>org.apache.servicemix.runtime.gshell.obr</artifactId>
<packaging>bundle</packaging>
<name>ServiceMix GShell OBR Commands</name>
@@ -41,19 +41,20 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>${felix.version}</version>
+ <version>${felix.osgi.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.bundlerepository</artifactId>
- <version>${bundlerepository.version}</version>
+ <version>${felix.bundlerepository.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.gshell</groupId>
- <artifactId>org.apache.servicemix.gshell.core</artifactId>
+ <groupId>org.apache.servicemix.runtime.gshell</groupId>
+ <artifactId>org.apache.servicemix.runtime.gshell.core</artifactId>
+ <version>0.1-SNAPSHOT</version>
</dependency>
<dependency>
@@ -68,8 +69,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>${felix.version}</version>
- <extensions>true</extensions>
<configuration>
<instructions>
<Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
Modified: servicemix/branches/servicemix-4.0/runtime/gshell/gshell-osgi/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/runtime/gshell/gshell-osgi/pom.xml?rev=602207&r1=602206&r2=602207&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/runtime/gshell/gshell-osgi/pom.xml (original)
+++ servicemix/branches/servicemix-4.0/runtime/gshell/gshell-osgi/pom.xml Fri Dec 7 12:24:14 2007
@@ -23,13 +23,13 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.servicemix.gshell</groupId>
+ <groupId>org.apache.servicemix.runtime.gshell</groupId>
<artifactId>gshell</artifactId>
- <version>4.0-SNAPSHOT</version>
+ <version>0.1-SNAPSHOT</version>
</parent>
- <groupId>org.apache.servicemix.gshell</groupId>
- <artifactId>org.apache.servicemix.gshell.osgi</artifactId>
+ <groupId>org.apache.servicemix.runtime.gshell</groupId>
+ <artifactId>org.apache.servicemix.runtime.gshell.osgi</artifactId>
<packaging>bundle</packaging>
<name>ServiceMix GShell OSGi Commands</name>
@@ -39,28 +39,23 @@
<dependencies>
<dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.osgi.core</artifactId>
- <version>${felix.version}</version>
- <scope>provided</scope>
+ <groupId>org.apache.servicemix.runtime.gshell</groupId>
+ <artifactId>org.apache.servicemix.runtime.gshell.core</artifactId>
+ <version>0.1-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.gshell</groupId>
- <artifactId>org.apache.servicemix.gshell.core</artifactId>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <version>${felix.osgi.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework.osgi</groupId>
<artifactId>spring-osgi-core</artifactId>
<version>${spring.osgi.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.servicemix.gshell</groupId>
- <artifactId>org.apache.servicemix.gshell.core</artifactId>
- <version>4.0-SNAPSHOT</version>
- </dependency>
+ </dependency>
</dependencies>
<build>
@@ -68,8 +63,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>${felix.version}</version>
- <extensions>true</extensions>
<configuration>
<instructions>
<Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
Modified: servicemix/branches/servicemix-4.0/runtime/gshell/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/runtime/gshell/pom.xml?rev=602207&r1=602206&r2=602207&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/runtime/gshell/pom.xml (original)
+++ servicemix/branches/servicemix-4.0/runtime/gshell/pom.xml Fri Dec 7 12:24:14 2007
@@ -23,15 +23,14 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.servicemix</groupId>
- <artifactId>servicemix</artifactId>
- <version>4.0-SNAPSHOT</version>
+ <groupId>org.apache.servicemix.runtime</groupId>
+ <artifactId>runtime</artifactId>
+ <version>0.1-SNAPSHOT</version>
</parent>
- <groupId>org.apache.servicemix.gshell</groupId>
+ <groupId>org.apache.servicemix.runtime.gshell</groupId>
<artifactId>gshell</artifactId>
<packaging>pom</packaging>
- <version>4.0-SNAPSHOT</version>
<name>ServiceMix GShell</name>
<modules>
@@ -39,57 +38,5 @@
<module>gshell-osgi</module>
<module>gshell-obr</module>
</modules>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <configuration>
- <includeProjectDependencies>false</includeProjectDependencies>
- <includePluginDependencies>true</includePluginDependencies>
- <executableDependency>
- <groupId>org.ops4j.pax.runner</groupId>
- <artifactId>pax-runner</artifactId>
- </executableDependency>
- <mainClass>org.ops4j.pax.runner.Run</mainClass>
- <arguments>
- <argument>--vmOptions=-Dbundles.configuration.location=${basedir}/src/test/configs</argument>
- <argument>--noConsole</argument>
- <argument>mvn:org.apache.felix/org.apache.felix.configadmin/0.9.0-SNAPSHOT</argument>
- <argument>mvn:org.ops4j.pax.confman/pax-confman-propsloader/0.3.0-SNAPSHOT</argument>
- <argument>mvn:org.ops4j.pax.logging/pax-logging-api/0.9.7-SNAPSHOT</argument>
- <argument>mvn:org.ops4j.pax.logging/pax-logging-service/0.9.7-SNAPSHOT</argument>
- <argument>mvn:org.springframework.osgi/spring-osgi-core/${spring.osgi.version}</argument>
- <argument>mvn:org.springframework.osgi/spring-osgi-extender/${spring.osgi.version}</argument>
- <argument>mvn:org.springframework.osgi/spring-osgi-io/${spring.osgi.version}</argument>
- <argument>mvn:org.springframework/spring-aop/${spring.version}</argument>
- <argument>mvn:org.springframework/spring-beans/${spring.version}</argument>
- <argument>mvn:org.springframework/spring-context/${spring.version}</argument>
- <argument>mvn:org.springframework/spring-core/${spring.version}</argument>
- <argument>
- mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aopalliance/1.0-${project.version}
- </argument>
- <argument>
- mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cglib/2.1_3-${project.version}
- </argument>
- <argument>
- mvn:org.apache.servicemix.gshell/org.apache.servicemix.gshell.core/${project.version}
- </argument>
- <argument>
- mvn:org.apache.servicemix.gshell/org.apache.servicemix.gshell.osgi/${project.version}
- </argument>
- </arguments>
- </configuration>
- <dependencies>
- <dependency>
- <groupId>org.ops4j.pax.runner</groupId>
- <artifactId>pax-runner</artifactId>
- <version>0.5.1</version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
- </build>
</project>
Modified: servicemix/branches/servicemix-4.0/runtime/main/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/runtime/main/pom.xml?rev=602207&r1=602206&r2=602207&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/runtime/main/pom.xml (original)
+++ servicemix/branches/servicemix-4.0/runtime/main/pom.xml Fri Dec 7 12:24:14 2007
@@ -23,12 +23,12 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.servicemix</groupId>
- <artifactId>servicemix</artifactId>
- <version>4.0-SNAPSHOT</version>
+ <groupId>org.apache.servicemix.runtime</groupId>
+ <artifactId>runtime</artifactId>
+ <version>0.1-SNAPSHOT</version>
</parent>
- <artifactId>org.apache.servicemix.main</artifactId>
+ <artifactId>org.apache.servicemix.runtime.main</artifactId>
<packaging>bundle</packaging>
<name>ServiceMix Main</name>
@@ -36,6 +36,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.framework</artifactId>
+ <version>${felix.framework.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.felix</groupId>
@@ -72,8 +73,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>${felix.version}</version>
- <extensions>true</extensions>
<configuration>
<instructions>
<_donotcopy>(CVS|.svn|config.properties)</_donotcopy>
Modified: servicemix/branches/servicemix-4.0/runtime/minimum/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/runtime/minimum/pom.xml?rev=602207&r1=602206&r2=602207&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/runtime/minimum/pom.xml (original)
+++ servicemix/branches/servicemix-4.0/runtime/minimum/pom.xml Fri Dec 7 12:24:14 2007
@@ -25,45 +25,24 @@
<parent>
<groupId>org.apache.servicemix.runtime</groupId>
<artifactId>runtime</artifactId>
- <version>4.0-SNAPSHOT</version>
+ <version>0.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.servicemix.runtime</groupId>
<artifactId>org.apache.servicemix.runtime.minimum</artifactId>
<packaging>pom</packaging>
- <version>4.0-SNAPSHOT</version>
<name>ServiceMix Minimum Distribution</name>
<dependencies>
-<!--
<dependency>
- <groupId>org.apache.directory.daemon</groupId>
- <artifactId>daemon-bootstrappers</artifactId>
- <version>1.1.0</version>
+ <groupId>org.apache.servicemix.runtime</groupId>
+ <artifactId>org.apache.servicemix.runtime.main</artifactId>
+ <version>0.1-SNAPSHOT</version>
</dependency>
--->
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>nlog4j</artifactId>
- <version>1.2.19</version>
- </dependency>
-
<dependency>
- <groupId>commons-daemon</groupId>
- <artifactId>commons-daemon</artifactId>
- <version>1.0.1</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.servicemix</groupId>
- <artifactId>org.apache.servicemix.main</artifactId>
- <version>${pom.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix</groupId>
+ <groupId>org.apache.servicemix.runtime</groupId>
<artifactId>org.apache.servicemix.runtime.filemonitor</artifactId>
- <version>${pom.version}</version>
+ <version>0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.springframework.osgi</groupId>
@@ -105,249 +84,91 @@
<artifactId>spring-tx</artifactId>
<version>${spring.version}</version>
</dependency>
-
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.bundlerepository</artifactId>
- <version>${bundlerepository.version}</version>
+ <version>${felix.bundlerepository.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.gshell</groupId>
- <artifactId>org.apache.servicemix.gshell.core</artifactId>
+ <groupId>org.apache.servicemix.runtime.gshell</groupId>
+ <artifactId>org.apache.servicemix.runtime.gshell.core</artifactId>
+ <version>0.1-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.gshell</groupId>
- <artifactId>org.apache.servicemix.gshell.obr</artifactId>
+ <groupId>org.apache.servicemix.runtime.gshell</groupId>
+ <artifactId>org.apache.servicemix.runtime.gshell.obr</artifactId>
+ <version>0.1-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.gshell</groupId>
- <artifactId>org.apache.servicemix.gshell.osgi</artifactId>
+ <groupId>org.apache.servicemix.runtime.gshell</groupId>
+ <artifactId>org.apache.servicemix.runtime.gshell.osgi</artifactId>
+ <version>0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.mina</artifactId>
+ <artifactId>org.apache.servicemix.bundles.mina-${mina.version}</artifactId>
+ <version>0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.xstream</artifactId>
+ <artifactId>org.apache.servicemix.bundles.xstream-${xstream.version}</artifactId>
+ <version>0.1-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.aopalliance-${aopalliance.version}</artifactId>
+ <version>0.1-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.asm-${asm.version}</artifactId>
+ <version>0.1-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.cglib-${cglib.version}</artifactId>
+ <version>0.1-SNAPSHOT</version>
</dependency>
-
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.compendium</artifactId>
+ <version>${felix.compendium.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>javax.servlet</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.foundation</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.configadmin</artifactId>
+ <version>${felix.configadmin.version}</version>
</dependency>
<dependency>
<groupId>org.ops4j.pax.logging</groupId>
<artifactId>pax-logging-api</artifactId>
+ <version>${pax.logging.version}</version>
</dependency>
<dependency>
<groupId>org.ops4j.pax.logging</groupId>
<artifactId>pax-logging-service</artifactId>
+ <version>${pax.logging.version}</version>
</dependency>
<dependency>
- <groupId>org.ops4j.pax.confman</groupId>
- <artifactId>pax-confman-propsloader</artifactId>
- </dependency>
- <dependency>
- <groupId>org.ops4j.pax.web</groupId>
- <artifactId>pax-web-service</artifactId>
- </dependency>
-
- <dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-servlet_2.5_spec</artifactId>
+ <version>${geronimo.servlet.version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-stax-api_1.0_spec</artifactId>
+ <version>${geronimo.stax.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.aopalliance</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.asm</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.cglib</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.jaxb-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.jaxb-impl</artifactId>
- </dependency>
-
-
-<!--
- <dependency>
- <groupId>org.apache.servicemix.nmr</groupId>
- <artifactId>org.apache.servicemix.nmr.api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.nmr</groupId>
- <artifactId>org.apache.servicemix.nmr.core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.nmr</groupId>
- <artifactId>org.apache.servicemix.nmr.spring</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.nmr</groupId>
- <artifactId>org.apache.servicemix.nmr.osgi</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix</groupId>
- <artifactId>org.apache.servicemix.transaction</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix</groupId>
- <artifactId>org.apache.servicemix.activemq</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.management</groupId>
- <artifactId>org.apache.servicemix.management.core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.management</groupId>
- <artifactId>org.apache.servicemix.management.acegi</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.jbi</groupId>
- <artifactId>org.apache.servicemix.jbi.api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.jbi</groupId>
- <artifactId>org.apache.servicemix.jbi.runtime</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.jbi</groupId>
- <artifactId>org.apache.servicemix.jbi.osgi</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.openejb</groupId>
- <artifactId>org.apache.servicemix.openejb</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-core</artifactId>
- <version>${camel.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.cxf</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.jaxws-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.openejb</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.openjpa</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.wsdl4j</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jpa_3.0_spec</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-javamail_1.4_spec</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-activation_1.1_spec</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.1_spec</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_1.1_spec</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-saaj_1.1_spec</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jacc_1.1_spec</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-interceptor_3.0_spec</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-ejb_3.0_spec</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-annotation_1.0_spec</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.xbean</groupId>
- <artifactId>xbean-naming</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.xbean</groupId>
- <artifactId>xbean-reflect</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.xbean</groupId>
- <artifactId>xbean-finder</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-spring</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-jms</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.ws.commons.schema</groupId>
- <artifactId>XmlSchema</artifactId>
- </dependency>
- -->
-
</dependencies>
<build>
<resources>
@@ -386,8 +207,8 @@
<configuration>
<artifactItems>
<artifactItem>
- <groupId>org.apache.servicemix</groupId>
- <artifactId>org.apache.servicemix.main</artifactId>
+ <groupId>org.apache.servicemix.runtime</groupId>
+ <artifactId>org.apache.servicemix.runtime.main</artifactId>
<version>${pom.version}</version>
<outputDirectory>target/dependencies</outputDirectory>
<destFileName>servicemix.jar</destFileName>
Modified: servicemix/branches/servicemix-4.0/runtime/minimum/src/main/descriptors/unix-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/runtime/minimum/src/main/descriptors/unix-bin.xml?rev=602207&r1=602206&r2=602207&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/runtime/minimum/src/main/descriptors/unix-bin.xml (original)
+++ servicemix/branches/servicemix-4.0/runtime/minimum/src/main/descriptors/unix-bin.xml Fri Dec 7 12:24:14 2007
@@ -122,8 +122,8 @@
<!-- PAX config -->
<include>org.apache.felix:org.apache.felix.configadmin</include>
- <include>org.apache.servicemix:org.apache.servicemix.runtime.filemonitor</include>
- <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.ant</include>
+ <include>org.apache.servicemix.runtime:org.apache.servicemix.runtime.filemonitor</include>
+ <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.ant-${ant.version}</include>
<!-- Spring OSGi -->
<include>org.springframework:spring-aop</include>
@@ -133,19 +133,19 @@
<include>org.springframework.osgi:spring-osgi-core</include>
<include>org.springframework.osgi:spring-osgi-extender</include>
<include>org.springframework.osgi:spring-osgi-io</include>
- <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.aopalliance</include>
- <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.cglib</include>
+ <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.aopalliance-${aopalliance.version}</include>
+ <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.cglib-${cglib.version}</include>
<!-- GShell -->
<include>org.apache.geronimo.specs:geronimo-stax-api_1.0_spec</include>
- <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.mina</include>
- <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.xstream</include>
- <include>org.apache.servicemix.gshell:org.apache.servicemix.gshell.core</include>
- <include>org.apache.servicemix.gshell:org.apache.servicemix.gshell.osgi</include>
+ <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.mina-${mina.version}</include>
+ <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.xstream-${xstream.version}</include>
+ <include>org.apache.servicemix.runtime.gshell:org.apache.servicemix.runtime.gshell.core</include>
+ <include>org.apache.servicemix.runtime.gshell:org.apache.servicemix.runtime.gshell.osgi</include>
<!-- OBR + GShell command -->
<include>org.apache.felix:org.apache.felix.bundlerepository</include>
- <include>org.apache.servicemix.gshell:org.apache.servicemix.gshell.obr</include>
+ <include>org.apache.servicemix.runtime.gshell:org.apache.servicemix.runtime.gshell.obr</include>
</includes>
</dependencySet>
Modified: servicemix/branches/servicemix-4.0/runtime/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/runtime/pom.xml?rev=602207&r1=602206&r2=602207&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/runtime/pom.xml (original)
+++ servicemix/branches/servicemix-4.0/runtime/pom.xml Fri Dec 7 12:24:14 2007
@@ -23,23 +23,259 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.servicemix</groupId>
- <artifactId>servicemix</artifactId>
- <version>4.0-SNAPSHOT</version>
+ <groupId>org.apache</groupId>
+ <artifactId>apache</artifactId>
+ <version>4</version>
</parent>
<groupId>org.apache.servicemix.runtime</groupId>
<artifactId>runtime</artifactId>
<packaging>pom</packaging>
- <version>4.0-SNAPSHOT</version>
- <name>ServiceMix Runtime</name>
+ <version>0.1-SNAPSHOT</version>
+ <name>Apache ServiceMix Runtime</name>
<modules>
+ <module>bundles</module>
<module>main</module>
<module>gshell</module>
<module>filemonitor</module>
- <module>features</module>
<module>minimum</module>
</modules>
+
+ <properties>
+ <ant.version>1.7.0</ant.version>
+ <aopalliance.version>1.0</aopalliance.version>
+ <asm.version>2.2.3</asm.version>
+ <cglib.version>2.1_3</cglib.version>
+ <commons.io.version>1.3.1</commons.io.version>
+ <commons.logging.version>1.1</commons.logging.version>
+ <felix.configadmin.version>0.9.0-SNAPSHOT</felix.configadmin.version>
+ <felix.plugin.version>1.1.0-SNAPSHOT</felix.plugin.version>
+ <felix.framework.version>1.1.0-SNAPSHOT</felix.framework.version>
+ <felix.osgi.version>1.0.0</felix.osgi.version>
+ <felix.compendium.version>0.9.0-SNAPSHOT</felix.compendium.version>
+ <felix.bundlerepository.version>1.1.0-SNAPSHOT</felix.bundlerepository.version>
+ <geronimo.servlet.version>1.1.1-SNAPSHOT</geronimo.servlet.version>
+ <geronimo.stax.version>1.0.1-SNAPSHOT</geronimo.stax.version>
+ <gshell.version>1.0-alpha-1-SNAPSHOT</gshell.version>
+ <junit.version>4.4</junit.version>
+ <mina.version>1.1.6-r602102</mina.version>
+ <pax.logging.version>0.9.8-SNAPSHOT</pax.logging.version>
+ <spring.osgi.version>1.0-m3</spring.osgi.version>
+ <spring.version>2.5</spring.version>
+ <xstream.version>1.2.2</xstream.version>
+ </properties>
+
+ <repositories>
+ <!-- Default repository -->
+ <repository>
+ <id>maven-repo</id>
+ <name>Default maven repo</name>
+ <url>http://repo1.maven.org/maven2</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ <!-- I21 repository -->
+ <repository>
+ <id>i21-s3-maven-repo</id>
+ <name>i21 S3 milestone repo</name>
+ <url>http://s3.amazonaws.com/maven.springframework.org/milestone</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ <!-- OPS4J repository -->
+ <repository>
+ <id>ops4j-repo</id>
+ <name>OPS4J repo</name>
+ <url>http://repository.ops4j.org/maven2</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ <!-- Spring external dependencies -->
+ <repository>
+ <id>spring-ext</id>
+ <name>Spring External Dependencies Repository</name>
+ <url>http://springframework.svn.sourceforge.net/svnroot/springframework/repos/repo-ext/</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ <!-- Apache snapshot -->
+ <repository>
+ <id>apache-snapshots</id>
+ <name>Apache Snapshot repository</name>
+ <url>http://people.apache.org/repo/m2-snapshot-repository</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ <!-- OPS4J snapshot -->
+ <repository>
+ <id>ops4j-snapshots</id>
+ <name>OPS4J Snapshot repository</name>
+ <url>http://repository.ops4j.org/mvn-snapshots</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ <!-- Spring snapshots -->
+ <repository>
+ <id>spring-snapshots</id>
+ <name>Springframework Maven SNAPSHOT Repository</name>
+ <url>http://static.springframework.org/maven2-snapshots/</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ <!-- ServiceMix repo -->
+ <repository>
+ <id>servicemix</id>
+ <name>ServiceMix Repository</name>
+ <url>http://svn.apache.org/repos/asf/servicemix/m2-repo</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ <!-- Apache Incubating repository -->
+ <repository>
+ <id>apache-incubator</id>
+ <url>http://people.apache.org/repo/m2-incubating-repository</url>
+ </repository>
+ </repositories>
+
+ <pluginRepositories>
+ <!-- Apache snapshot -->
+ <pluginRepository>
+ <id>apache-snapshots</id>
+ <name>Apache Snapshot repository</name>
+ <url>http://people.apache.org/repo/m2-snapshot-repository</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </pluginRepository>
+ </pluginRepositories>
+
+ <build>
+ <defaultGoal>install</defaultGoal>
+
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <version>2.4</version>
+ <configuration>
+ <outputDirectory>${basedir}/eclipse-classes</outputDirectory>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>${felix.plugin.version}</version>
+ <extensions>true</extensions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.0.2</version>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ <maxmem>256M</maxmem>
+ <fork>${compiler.fork}</fork>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-idea-plugin</artifactId>
+ <version>2.1</version>
+ <configuration>
+ <downloadSources>true</downloadSources>
+ <downloadJavadocs>true</downloadJavadocs>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jxr-plugin</artifactId>
+ <version>2.0</version>
+ </plugin>
+ </plugins>
+ </reporting>
+
+ <profiles>
+ <profile>
+ <id>rat</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>rat-maven-plugin</artifactId>
+ <version>1.0-alpha-3</version>
+ <executions>
+ <execution>
+ <phase>verify</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <reportFile>${project.build.directory}/${project.build.finalName}.rat</reportFile>
+ <excludes>
+ <exclude>**/target/**/*</exclude>
+ <!-- IDEA files -->
+ <exclude>**/*.iml</exclude>
+ <exclude>**/*.ipr</exclude>
+ <exclude>**/*.iws</exclude>
+ <!-- Eclipse files -->
+ <exclude>**/.*</exclude>
+ <exclude>**/eclipse-classes/**/*</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>