servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject svn commit: r588594 - in /incubator/servicemix/branches/servicemix-4.0: ./ apache-servicemix/ apache-servicemix/src/main/descriptors/ apache-servicemix/src/main/release/bin/ api/ camel/ core/ examples/intermediary/ itests/ itests/src/test/java/org/apac...
Date Fri, 26 Oct 2007 10:15:18 GMT
Author: gnodet
Date: Fri Oct 26 03:15:15 2007
New Revision: 588594

URL: http://svn.apache.org/viewvc?rev=588594&view=rev
Log:
Refactor api/core into a NMR module

Added:
    incubator/servicemix/branches/servicemix-4.0/nmr/api/
      - copied from r587990, incubator/servicemix/branches/servicemix-4.0/api/
    incubator/servicemix/branches/servicemix-4.0/nmr/api/pom.xml
      - copied, changed from r588593, incubator/servicemix/branches/servicemix-4.0/api/pom.xml
    incubator/servicemix/branches/servicemix-4.0/nmr/api/src/
      - copied from r588593, incubator/servicemix/branches/servicemix-4.0/api/src/
    incubator/servicemix/branches/servicemix-4.0/nmr/core/
      - copied from r587990, incubator/servicemix/branches/servicemix-4.0/core/
    incubator/servicemix/branches/servicemix-4.0/nmr/core/pom.xml
      - copied, changed from r588593, incubator/servicemix/branches/servicemix-4.0/core/pom.xml
    incubator/servicemix/branches/servicemix-4.0/nmr/core/src/
      - copied from r588593, incubator/servicemix/branches/servicemix-4.0/core/src/
    incubator/servicemix/branches/servicemix-4.0/nmr/osgi/
    incubator/servicemix/branches/servicemix-4.0/nmr/osgi/pom.xml
      - copied, changed from r587992, incubator/servicemix/branches/servicemix-4.0/nmr/pom.xml
    incubator/servicemix/branches/servicemix-4.0/nmr/osgi/src/
      - copied from r587990, incubator/servicemix/branches/servicemix-4.0/nmr/src/
    incubator/servicemix/branches/servicemix-4.0/nmr/osgi/src/main/
      - copied from r588593, incubator/servicemix/branches/servicemix-4.0/nmr/src/main/
    incubator/servicemix/branches/servicemix-4.0/nmr/spring/
      - copied from r587990, incubator/servicemix/branches/servicemix-4.0/spring/
    incubator/servicemix/branches/servicemix-4.0/nmr/spring/pom.xml
      - copied, changed from r588593, incubator/servicemix/branches/servicemix-4.0/spring/pom.xml
    incubator/servicemix/branches/servicemix-4.0/nmr/spring/src/
      - copied from r588593, incubator/servicemix/branches/servicemix-4.0/spring/src/
Removed:
    incubator/servicemix/branches/servicemix-4.0/api/
    incubator/servicemix/branches/servicemix-4.0/core/
    incubator/servicemix/branches/servicemix-4.0/nmr/src/
    incubator/servicemix/branches/servicemix-4.0/spring/
Modified:
    incubator/servicemix/branches/servicemix-4.0/apache-servicemix/pom.xml
    incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/descriptors/unix-bin.xml
    incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/release/bin/servicemix.sh
    incubator/servicemix/branches/servicemix-4.0/camel/pom.xml
    incubator/servicemix/branches/servicemix-4.0/examples/intermediary/pom.xml
    incubator/servicemix/branches/servicemix-4.0/itests/pom.xml
    incubator/servicemix/branches/servicemix-4.0/itests/src/test/java/org/apache/servicemix/IntegrationTest.java
    incubator/servicemix/branches/servicemix-4.0/jbi/runtime/pom.xml
    incubator/servicemix/branches/servicemix-4.0/nmr/pom.xml
    incubator/servicemix/branches/servicemix-4.0/pom.xml

Modified: incubator/servicemix/branches/servicemix-4.0/apache-servicemix/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/apache-servicemix/pom.xml?rev=588594&r1=588593&r2=588594&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/apache-servicemix/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-4.0/apache-servicemix/pom.xml Fri Oct 26 03:15:15
2007
@@ -98,23 +98,23 @@
       <version>${spring.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.servicemix</groupId>
+      <groupId>org.apache.servicemix.nmr</groupId>
       <artifactId>org.apache.servicemix.api</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.servicemix</groupId>
+      <groupId>org.apache.servicemix.nmr</groupId>
       <artifactId>org.apache.servicemix.core</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.servicemix</groupId>
+      <groupId>org.apache.servicemix.nmr</groupId>
       <artifactId>org.apache.servicemix.spring</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.servicemix</groupId>
-      <artifactId>org.apache.servicemix.nmr</artifactId>
+      <groupId>org.apache.servicemix.nmr</groupId>
+      <artifactId>org.apache.servicemix.osgi</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>

Modified: incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/descriptors/unix-bin.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/descriptors/unix-bin.xml?rev=588594&r1=588593&r2=588594&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/descriptors/unix-bin.xml
(original)
+++ incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/descriptors/unix-bin.xml
Fri Oct 26 03:15:15 2007
@@ -127,15 +127,16 @@
             </includes>
         </dependencySet>
 
-        <!-- ServiceMix bundles -->
+        <!-- NMR -->
         <dependencySet>
             <outputDirectory>/bundle</outputDirectory>
             <unpack>false</unpack>
             <scope>runtime</scope>
             <includes>
-                <include>org.apache.servicemix:org.apache.servicemix.api</include>
-                <include>org.apache.servicemix:org.apache.servicemix.core</include>
-                <include>org.apache.servicemix:org.apache.servicemix.nmr</include>
+                <include>org.apache.servicemix.nmr:org.apache.servicemix.api</include>
+                <include>org.apache.servicemix.nmr:org.apache.servicemix.core</include>
+                <include>org.apache.servicemix.nmr:org.apache.servicemix.spring</include>
+                <include>org.apache.servicemix.nmr:org.apache.servicemix.osgi</include>
             </includes>
         </dependencySet>
 

Modified: incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/release/bin/servicemix.sh
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/release/bin/servicemix.sh?rev=588594&r1=588593&r2=588594&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/release/bin/servicemix.sh
(original)
+++ incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/release/bin/servicemix.sh
Fri Oct 26 03:15:15 2007
@@ -190,7 +190,7 @@
 
     #Set the JVM_VENDOR specific JVM flags
     if [ "$JVM_VENDOR" = "SUN" ]; then
-        DEFAULT_JAVA_OPTS="-server $DEFAULT_JAVA_OPTS"
+        DEFAULT_JAVA_OPTS="-server $DEFAULT_JAVA_OPTS -Dcom.sun.management.jmxremote"
     elif [ "$JVM_VENDOR" = "IBM" ]; then
         if $os400; then
             DEFAULT_JAVA_OPTS="$DEFAULT_JAVA_OPTS"

Modified: incubator/servicemix/branches/servicemix-4.0/camel/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/camel/pom.xml?rev=588594&r1=588593&r2=588594&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/camel/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-4.0/camel/pom.xml Fri Oct 26 03:15:15 2007
@@ -35,7 +35,7 @@
 
   <dependencies>
 	<dependency>
-	  <groupId>org.apache.servicemix</groupId>
+	  <groupId>org.apache.servicemix.nmr</groupId>
 	  <artifactId>org.apache.servicemix.api</artifactId>
       <version>${project.version}</version>
 	</dependency>

Modified: incubator/servicemix/branches/servicemix-4.0/examples/intermediary/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/examples/intermediary/pom.xml?rev=588594&r1=588593&r2=588594&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/examples/intermediary/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-4.0/examples/intermediary/pom.xml Fri Oct 26
03:15:15 2007
@@ -35,7 +35,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.servicemix</groupId>
+      <groupId>org.apache.servicemix.nmr</groupId>
       <artifactId>org.apache.servicemix.api</artifactId>
       <version>4.0-SNAPSHOT</version>
     </dependency>

Modified: incubator/servicemix/branches/servicemix-4.0/itests/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/itests/pom.xml?rev=588594&r1=588593&r2=588594&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/itests/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-4.0/itests/pom.xml Fri Oct 26 03:15:15 2007
@@ -39,8 +39,8 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.servicemix</groupId>
-      <artifactId>org.apache.servicemix.nmr</artifactId>
+      <groupId>org.apache.servicemix.nmr</groupId>
+      <artifactId>org.apache.servicemix.osgi</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>

Modified: incubator/servicemix/branches/servicemix-4.0/itests/src/test/java/org/apache/servicemix/IntegrationTest.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/itests/src/test/java/org/apache/servicemix/IntegrationTest.java?rev=588594&r1=588593&r2=588594&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/itests/src/test/java/org/apache/servicemix/IntegrationTest.java
(original)
+++ incubator/servicemix/branches/servicemix-4.0/itests/src/test/java/org/apache/servicemix/IntegrationTest.java
Fri Oct 26 03:15:15 2007
@@ -72,10 +72,10 @@
             "org.apache.camel,camel-osgi," + camelVersion,
             "org.apache.camel,camel-jms," + camelVersion,
             "org.apache.camel,camel-jhc," + camelVersion,
-            "org.apache.servicemix,org.apache.servicemix.api," + servicemixVersion,
-            "org.apache.servicemix,org.apache.servicemix.core," + servicemixVersion,
-			"org.apache.servicemix,org.apache.servicemix.spring," + servicemixVersion,
-            "org.apache.servicemix,org.apache.servicemix.nmr," + servicemixVersion,
+            "org.apache.servicemix.nmr,org.apache.servicemix.api," + servicemixVersion,
+            "org.apache.servicemix.nmr,org.apache.servicemix.core," + servicemixVersion,
+			"org.apache.servicemix.nmr,org.apache.servicemix.spring," + servicemixVersion,
+            "org.apache.servicemix.nmr,org.apache.servicemix.osgi," + servicemixVersion,
             "org.apache.servicemix,org.apache.servicemix.camel," + servicemixVersion,
             "org.apache.servicemix.examples,org.apache.servicemix.examples.intermediary,"
+ servicemixVersion,
 		};

Modified: incubator/servicemix/branches/servicemix-4.0/jbi/runtime/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/jbi/runtime/pom.xml?rev=588594&r1=588593&r2=588594&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/jbi/runtime/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-4.0/jbi/runtime/pom.xml Fri Oct 26 03:15:15 2007
@@ -35,7 +35,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.servicemix</groupId>
+      <groupId>org.apache.servicemix.nmr</groupId>
       <artifactId>org.apache.servicemix.core</artifactId>
     </dependency>
     <dependency>
@@ -45,6 +45,17 @@
     <dependency>
       <groupId>org.apache.servicemix</groupId>
       <artifactId>servicemix-eip</artifactId>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+	      <groupId>org.apache.servicemix</groupId>
+	      <artifactId>servicemix-shared</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.servicemix</groupId>
+      <artifactId>servicemix-common</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>

Copied: incubator/servicemix/branches/servicemix-4.0/nmr/api/pom.xml (from r588593, incubator/servicemix/branches/servicemix-4.0/api/pom.xml)
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/nmr/api/pom.xml?p2=incubator/servicemix/branches/servicemix-4.0/nmr/api/pom.xml&p1=incubator/servicemix/branches/servicemix-4.0/api/pom.xml&r1=588593&r2=588594&rev=588594&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/api/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-4.0/nmr/api/pom.xml Fri Oct 26 03:15:15 2007
@@ -22,12 +22,12 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.apache.servicemix</groupId>
-    <artifactId>servicemix</artifactId>
+    <groupId>org.apache.servicemix.nmr</groupId>
+    <artifactId>org.apache.servicemix.nmr</artifactId>
     <version>4.0-SNAPSHOT</version>
   </parent>
 
-  <groupId>org.apache.servicemix</groupId>
+  <groupId>org.apache.servicemix.nmr</groupId>
   <artifactId>org.apache.servicemix.api</artifactId>
   <packaging>bundle</packaging>
   <version>4.0-SNAPSHOT</version>

Copied: incubator/servicemix/branches/servicemix-4.0/nmr/core/pom.xml (from r588593, incubator/servicemix/branches/servicemix-4.0/core/pom.xml)
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/nmr/core/pom.xml?p2=incubator/servicemix/branches/servicemix-4.0/nmr/core/pom.xml&p1=incubator/servicemix/branches/servicemix-4.0/core/pom.xml&r1=588593&r2=588594&rev=588594&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/core/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-4.0/nmr/core/pom.xml Fri Oct 26 03:15:15 2007
@@ -22,12 +22,12 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.apache.servicemix</groupId>
-    <artifactId>servicemix</artifactId>
+    <groupId>org.apache.servicemix.nmr</groupId>
+    <artifactId>org.apache.servicemix.nmr</artifactId>
     <version>4.0-SNAPSHOT</version>
   </parent>
 
-  <groupId>org.apache.servicemix</groupId>
+  <groupId>org.apache.servicemix.nmr</groupId>
   <artifactId>org.apache.servicemix.core</artifactId>
   <packaging>bundle</packaging>
   <version>4.0-SNAPSHOT</version>
@@ -35,7 +35,7 @@
 
   <dependencies>
 	<dependency>
-	  <groupId>org.apache.servicemix</groupId>
+	  <groupId>org.apache.servicemix.nmr</groupId>
 	  <artifactId>org.apache.servicemix.api</artifactId>
 	</dependency>
 	<dependency>

Copied: incubator/servicemix/branches/servicemix-4.0/nmr/osgi/pom.xml (from r587992, incubator/servicemix/branches/servicemix-4.0/nmr/pom.xml)
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/nmr/osgi/pom.xml?p2=incubator/servicemix/branches/servicemix-4.0/nmr/osgi/pom.xml&p1=incubator/servicemix/branches/servicemix-4.0/nmr/pom.xml&r1=587992&r2=588594&rev=588594&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/nmr/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-4.0/nmr/osgi/pom.xml Fri Oct 26 03:15:15 2007
@@ -22,30 +22,30 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.apache.servicemix</groupId>
-    <artifactId>servicemix</artifactId>
+    <groupId>org.apache.servicemix.nmr</groupId>
+    <artifactId>org.apache.servicemix.nmr</artifactId>
     <version>4.0-SNAPSHOT</version>
   </parent>
 
-  <groupId>org.apache.servicemix</groupId>
-  <artifactId>org.apache.servicemix.nmr</artifactId>
+  <groupId>org.apache.servicemix.nmr</groupId>
+  <artifactId>org.apache.servicemix.osgi</artifactId>
   <packaging>bundle</packaging>
   <version>4.0-SNAPSHOT</version>
-  <name>org.apache.servicemix.nmr</name>
+  <name>org.apache.servicemix.osgi</name>
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.servicemix</groupId>
+      <groupId>org.apache.servicemix.nmr</groupId>
       <artifactId>org.apache.servicemix.api</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.servicemix</groupId>
+      <groupId>org.apache.servicemix.nmr</groupId>
       <artifactId>org.apache.servicemix.core</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.servicemix</groupId>
+      <groupId>org.apache.servicemix.nmr</groupId>
       <artifactId>org.apache.servicemix.spring</artifactId>
       <version>${project.version}</version>
     </dependency>

Modified: incubator/servicemix/branches/servicemix-4.0/nmr/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/nmr/pom.xml?rev=588594&r1=588593&r2=588594&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/nmr/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-4.0/nmr/pom.xml Fri Oct 26 03:15:15 2007
@@ -27,68 +27,17 @@
     <version>4.0-SNAPSHOT</version>
   </parent>
 
-  <groupId>org.apache.servicemix</groupId>
+  <groupId>org.apache.servicemix.nmr</groupId>
   <artifactId>org.apache.servicemix.nmr</artifactId>
-  <packaging>bundle</packaging>
+  <packaging>pom</packaging>
   <version>4.0-SNAPSHOT</version>
   <name>org.apache.servicemix.nmr</name>
 
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.servicemix</groupId>
-      <artifactId>org.apache.servicemix.api</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.servicemix</groupId>
-      <artifactId>org.apache.servicemix.core</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.servicemix</groupId>
-      <artifactId>org.apache.servicemix.spring</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.osgi</groupId>
-      <artifactId>spring-osgi-core</artifactId>
-      <version>${spring.osgi.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.felix</groupId>
-      <artifactId>org.osgi.core</artifactId>
-      <version>${felix.version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>${junit.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
-      <version>${commons.logging.version}</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <configuration>
-          <instructions>
-            <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
-            <Import-Package></Import-Package>
-            <DynamicImport-Package>*</DynamicImport-Package>
-            <Spring-Context>*;publish-context:=false</Spring-Context>
-          </instructions>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
+  <modules>
+	<module>api</module>
+	<module>core</module>
+	<module>spring</module>
+	<module>osgi</module>
+  </modules>
 
 </project>

Copied: incubator/servicemix/branches/servicemix-4.0/nmr/spring/pom.xml (from r588593, incubator/servicemix/branches/servicemix-4.0/spring/pom.xml)
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/nmr/spring/pom.xml?p2=incubator/servicemix/branches/servicemix-4.0/nmr/spring/pom.xml&p1=incubator/servicemix/branches/servicemix-4.0/spring/pom.xml&r1=588593&r2=588594&rev=588594&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/spring/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-4.0/nmr/spring/pom.xml Fri Oct 26 03:15:15 2007
@@ -22,12 +22,12 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.apache.servicemix</groupId>
-    <artifactId>servicemix</artifactId>
+    <groupId>org.apache.servicemix.nmr</groupId>
+    <artifactId>org.apache.servicemix.nmr</artifactId>
     <version>4.0-SNAPSHOT</version>
   </parent>
 
-  <groupId>org.apache.servicemix</groupId>
+  <groupId>org.apache.servicemix.nmr</groupId>
   <artifactId>org.apache.servicemix.spring</artifactId>
   <packaging>bundle</packaging>
   <version>4.0-SNAPSHOT</version>
@@ -35,7 +35,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.servicemix</groupId>
+      <groupId>org.apache.servicemix.nmr</groupId>
       <artifactId>org.apache.servicemix.api</artifactId>
     </dependency>
     <dependency>

Modified: incubator/servicemix/branches/servicemix-4.0/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/pom.xml?rev=588594&r1=588593&r2=588594&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-4.0/pom.xml Fri Oct 26 03:15:15 2007
@@ -28,9 +28,6 @@
   <name>servicemix</name>
 
   <modules>
-	<module>api</module>
-	<module>core</module>
-	<module>spring</module>
 	<module>nmr</module>
 	<module>camel</module>
 	<module>bundles</module>
@@ -163,18 +160,18 @@
   <dependencyManagement>
 	<dependencies>
 		<dependency>
-		  <groupId>org.apache.servicemix</groupId>
+		  <groupId>org.apache.servicemix.nmr</groupId>
 		  <artifactId>org.apache.servicemix.api</artifactId>
 	      <version>${project.version}</version>
 		</dependency>
 		<dependency>
-		  <groupId>org.apache.servicemix</groupId>
+		  <groupId>org.apache.servicemix.nmr</groupId>
 		  <artifactId>org.apache.servicemix.core</artifactId>
 	      <version>${project.version}</version>
 		</dependency>
 	    <dependency>
-	      <groupId>org.apache.servicemix</groupId>
-	      <artifactId>org.apache.servicemix.nmr</artifactId>
+	      <groupId>org.apache.servicemix.nmr</groupId>
+	      <artifactId>org.apache.servicemix.osgi</artifactId>
 	      <version>${project.version}</version>
 	    </dependency>
 	    <dependency>
@@ -278,6 +275,11 @@
 	      <version>3.1.2</version>
 	    </dependency>
 	    <dependency>
+	      <groupId>org.apache.servicemix</groupId>
+	      <artifactId>servicemix-common</artifactId>
+	      <version>3.1.2</version>
+	    </dependency>
+	    <dependency>
 	      <groupId>org.jencks</groupId>
 	      <artifactId>jencks</artifactId>
 	      <version>2.1</version>
@@ -301,19 +303,16 @@
 	      <groupId>org.springframework.osgi</groupId>
 	      <artifactId>spring-osgi-test</artifactId>
 	      <version>${spring.osgi.version}</version>
-	      <scope>test</scope>
 	    </dependency>
 	    <dependency>
 	      <groupId>org.springframework.osgi</groupId>
 	      <artifactId>spring-osgi-extender</artifactId>
 	      <version>${spring.osgi.version}</version>
-	      <scope>test</scope>
 	    </dependency>
 	    <dependency>
 	      <groupId>org.springframework.osgi</groupId>
 	      <artifactId>spring-osgi-annotation</artifactId>
 	      <version>${spring.osgi.version}</version>
-	      <scope>test</scope>
 	    </dependency>
         <dependency>
             <groupId>org.springframework</groupId>



Mime
View raw message