Title: [954] trunk: Move ws-notification to root and remove jaxws component from build
Revision
954
Author
gnt
Date
2005-11-28 09:08:56 -0500 (Mon, 28 Nov 2005)

Log Message

Move ws-notification to root and remove jaxws component from build

Modified Paths


Added Paths

  • trunk/sandbox/jaxws/
  • trunk/servicemix-wsnotification/
  • trunk/servicemix-wspojo/
  • trunk/servicemix-wsrm/

Removed Paths

  • trunk/components/jaxws/
  • trunk/ws/

Diff

Modified: trunk/assembly/project.xml (953 => 954)

--- trunk/assembly/project.xml	2005-11-28 13:11:56 UTC (rev 953)
+++ trunk/assembly/project.xml	2005-11-28 14:08:56 UTC (rev 954)
@@ -46,17 +46,16 @@
     
     <dependency>
       <groupId>servicemix</groupId>
-      <artifactId>servicemix-jaxws</artifactId>
+      <artifactId>servicemix-common</artifactId>
       <version>${pom.currentVersion}</version>
       <properties>
         <servicemix.module>true</servicemix.module>
         <eclipse.dependency>true</eclipse.dependency>
       </properties>
     </dependency>
-    
     <dependency>
       <groupId>servicemix</groupId>
-      <artifactId>servicemix-wsn</artifactId>
+      <artifactId>servicemix-jms</artifactId>
       <version>${pom.currentVersion}</version>
       <properties>
         <eclipse.dependency>true</eclipse.dependency>
@@ -72,12 +71,28 @@
     </dependency>
     <dependency>
       <groupId>servicemix</groupId>
-      <artifactId>servicemix-jms</artifactId>
+      <artifactId>servicemix-wspojo</artifactId>
       <version>${pom.currentVersion}</version>
       <properties>
         <eclipse.dependency>true</eclipse.dependency>
       </properties>
     </dependency>
+    <dependency>
+      <groupId>servicemix</groupId>
+      <artifactId>servicemix-wsnotification</artifactId>
+      <version>${pom.currentVersion}</version>
+      <properties>
+        <eclipse.dependency>true</eclipse.dependency>
+      </properties>
+    </dependency>
+    <dependency>
+      <groupId>servicemix</groupId>
+      <artifactId>servicemix-wsrm</artifactId>
+      <version>${pom.currentVersion}</version>
+      <properties>
+        <eclipse.dependency>true</eclipse.dependency>
+      </properties>
+    </dependency>
     
     <dependency>
       <groupId>org.xbean</groupId>

Modified: trunk/project.properties (953 => 954)

--- trunk/project.properties	2005-11-28 13:11:56 UTC (rev 953)
+++ trunk/project.properties	2005-11-28 14:08:56 UTC (rev 954)
@@ -51,7 +51,6 @@
   jbi/project.xml,\
   core/project.xml,\
   components/base/project.xml,\
-  components/jaxws/project.xml,\
   servicemix-console/project.xml,\
   servicemix-gbean/project.xml,\
   servicemix-common/project.xml,\
@@ -60,9 +59,9 @@
   tooling/servicemix-web/project.xml,\
   tooling/jboss-deployer/project.xml,\
   tooling/maven-jbi-plugin/project.xml,\
-  ws/jaxws/wspojo/project.xml,\
-  ws/jaxws/wsnotification/project.xml,\
-  ws/jaxws/wsrm/project.xml,\
+  servicemix-wspojo/project.xml,\
+  servicemix-wsnotification/project.xml,\
+  servicemix-wsrm/project.xml,\
   assembly/project.xml
 
 

Copied: trunk/sandbox/jaxws (from rev 953, trunk/components/jaxws) ( => )

Copied: trunk/servicemix-wsnotification (from rev 953, trunk/ws/jaxws/wsnotification)

Modified: trunk/servicemix-wsnotification/project.xml (953 => 954)

--- trunk/ws/jaxws/wsnotification/project.xml	2005-11-28 13:11:56 UTC (rev 953)
+++ trunk/servicemix-wsnotification/project.xml	2005-11-28 14:08:56 UTC (rev 954)
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <project>
   <pomVersion>3</pomVersion>
-  <extend>${basedir}/../../../etc/project.xml</extend>
+  <extend>${basedir}/../etc/project.xml</extend>
 
   <name>ServiceMix :: WS-Notification</name>
-  <id>servicemix-wsn</id>
+  <id>servicemix-wsnotification</id>
   <description>
         ServiceMix implementation of WS Notification
   </description>
@@ -14,7 +14,7 @@
  <packageGroups>
     <packageGroup>
       <title>WS-Notification Implementation</title>
-      <packages>org.servicemix.wsn</packages>
+      <packages>org.servicemix.ws.notification</packages>
     </packageGroup>
   </packageGroups>
 

Copied: trunk/servicemix-wspojo (from rev 953, trunk/ws/jaxws/wspojo) ( => )

Modified: trunk/servicemix-wspojo/project.xml
===================================================================
--- trunk/ws/jaxws/wspojo/project.xml	2005-11-28 13:11:56 UTC (rev 953)
+++ trunk/servicemix-wspojo/project.xml	2005-11-28 14:08:56 UTC (rev 954)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <project>
   <pomVersion>3</pomVersion>
-  <extend>${basedir}/../../../etc/project.xml</extend>
+  <extend>${basedir}/../etc/project.xml</extend>
 
   <name>ServiceMix :: WSPOJOs</name>
   <id>servicemix-wspojo</id>

Copied: trunk/servicemix-wsrm (from rev 953, trunk/ws/jaxws/wsrm) ( => )

Modified: trunk/servicemix-wsrm/project.xml
===================================================================
--- trunk/ws/jaxws/wsrm/project.xml	2005-11-28 13:11:56 UTC (rev 953)
+++ trunk/servicemix-wsrm/project.xml	2005-11-28 14:08:56 UTC (rev 954)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <project>
   <pomVersion>3</pomVersion>
-  <extend>${basedir}/../../../etc/project.xml</extend>
+  <extend>${basedir}/../etc/project.xml</extend>
 
   <name>ServiceMix :: WS-ReliableMessaging</name>
   <id>servicemix-wsrm</id>
@@ -14,7 +14,7 @@
  <packageGroups>
     <packageGroup>
       <title>WS-ReliableMessaging Implementation</title>
-      <packages>org.servicemix.ws</packages>
+      <packages>org.servicemix.ws.rm</packages>
     </packageGroup>
   </packageGroups>
 

Reply via email to