servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject svn commit: r367101 - in /incubator/servicemix/trunk: ./ servicemix-components/ servicemix-components/src/main/java/org/apache/servicemix/components/http/ servicemix-components/src/main/java/org/apache/servicemix/components/mule/ servicemix-components/...
Date Sun, 08 Jan 2006 21:45:56 GMT
Author: gnodet
Date: Sun Jan  8 13:45:34 2006
New Revision: 367101

URL: http://svn.apache.org/viewcvs?rev=367101&view=rev
Log:
Fix poms dependencies.
Move mule component to sandbox as it is not finished yet.
Remove XMarshaler.java dependency on woodstox.
Fix possible NPE in HttpSoapConnector.java

Added:
    incubator/servicemix/trunk/servicemix-components/src/sandbox/
    incubator/servicemix/trunk/servicemix-components/src/sandbox/java/
    incubator/servicemix/trunk/servicemix-components/src/sandbox/java/org/
    incubator/servicemix/trunk/servicemix-components/src/sandbox/java/org/apache/
    incubator/servicemix/trunk/servicemix-components/src/sandbox/java/org/apache/servicemix/
    incubator/servicemix/trunk/servicemix-components/src/sandbox/java/org/apache/servicemix/components/
    incubator/servicemix/trunk/servicemix-components/src/sandbox/java/org/apache/servicemix/components/mule/
      - copied from r366483, incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/mule/
    incubator/servicemix/trunk/servicemix-components/src/sandbox/java/org/apache/servicemix/components/mule/JBIConnector.java
      - copied unchanged from r367100, incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/mule/JBIConnector.java
    incubator/servicemix/trunk/servicemix-components/src/sandbox/java/org/apache/servicemix/components/mule/JBIMessageAdapter.java
      - copied unchanged from r367100, incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/mule/JBIMessageAdapter.java
    incubator/servicemix/trunk/servicemix-components/src/sandbox/java/org/apache/servicemix/components/mule/JBIMessageDispatcher.java
      - copied unchanged from r367100, incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/mule/JBIMessageDispatcher.java
    incubator/servicemix/trunk/servicemix-components/src/sandbox/java/org/apache/servicemix/components/mule/JBIMessageDispatcherFactory.java
      - copied unchanged from r367100, incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/mule/JBIMessageDispatcherFactory.java
    incubator/servicemix/trunk/servicemix-components/src/sandbox/java/org/apache/servicemix/components/mule/JBIMessageReceiver.java
      - copied unchanged from r367100, incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/mule/JBIMessageReceiver.java
    incubator/servicemix/trunk/servicemix-components/src/sandbox/java/org/apache/servicemix/components/mule/JBIMessageReceiverComponent.java
      - copied unchanged from r367100, incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/mule/JBIMessageReceiverComponent.java
    incubator/servicemix/trunk/servicemix-components/src/sandbox/java/org/apache/servicemix/components/mule/JBIMessageTransformer.java
      - copied unchanged from r367100, incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/mule/JBIMessageTransformer.java
    incubator/servicemix/trunk/servicemix-components/src/sandbox/java/org/apache/servicemix/components/mule/MuleMarshaler.java
      - copied unchanged from r367100, incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/mule/MuleMarshaler.java
    incubator/servicemix/trunk/servicemix-components/src/sandbox/java/org/apache/servicemix/components/mule/MuleMessagingException.java
      - copied unchanged from r367100, incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/mule/MuleMessagingException.java
    incubator/servicemix/trunk/servicemix-components/src/sandbox/java/org/apache/servicemix/components/mule/package.html
      - copied unchanged from r367100, incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/mule/package.html
Removed:
    incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/mule/
Modified:
    incubator/servicemix/trunk/pom.xml
    incubator/servicemix/trunk/servicemix-components/pom.xml
    incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/http/HttpSoapConnector.java
    incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/xfire/XMarshaler.java
    incubator/servicemix/trunk/servicemix-core/pom.xml
    incubator/servicemix/trunk/servicemix-gbean/pom.xml
    incubator/servicemix/trunk/servicemix-jbi/pom.xml
    incubator/servicemix/trunk/servicemix-jms/pom.xml
    incubator/servicemix/trunk/servicemix-jsr181/pom.xml
    incubator/servicemix/trunk/servicemix-lwcontainer/pom.xml
    incubator/servicemix/trunk/servicemix-sca/pom.xml
    incubator/servicemix/trunk/servicemix-wsn2005/pom.xml

Modified: incubator/servicemix/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/pom.xml?rev=367101&r1=367100&r2=367101&view=diff
==============================================================================
--- incubator/servicemix/trunk/pom.xml (original)
+++ incubator/servicemix/trunk/pom.xml Sun Jan  8 13:45:34 2006
@@ -357,9 +357,23 @@
         <groupId>org.apache.db.ddlutils</groupId>
         <artifactId>ddlutils</artifactId>
         <version>1.0-SNAPSHOT</version>
+        <exclusions>
+          <exclusion>
+            <groupId>xml-apis</groupId>
+            <artifactId>xml-apis</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>dom4j</groupId>
+            <artifactId>dom4j</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>xerces</groupId>
+            <artifactId>xerces</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
       <dependency>
-        <groupId>servicemix</groupId>
+        <groupId>org.apache.servicemix.dependencies</groupId>
         <artifactId>jsr-223</artifactId>
         <version>1.0-pr</version>
       </dependency>
@@ -376,93 +390,58 @@
         <version>20051127</version>
       </dependency>
       <dependency>
-        <groupId>servicemix</groupId>
+        <groupId>org.apache.servicemix.dependencies</groupId>
         <artifactId>wsif</artifactId>
         <version>2.0.1_IB3</version>
       </dependency>
       <dependency>
-        <groupId>servicemix</groupId>
+        <groupId>org.apache.servicemix.dependencies</groupId>
         <artifactId>wsif-j2c</artifactId>
         <version>2.0.1_IB3</version>
       </dependency>
       <dependency>
-        <groupId>servicemix</groupId>
-        <artifactId>http</artifactId>
-        <version>20051127</version>
-      </dependency>
-      <dependency>
-        <groupId>servicemix</groupId>
-        <artifactId>jaxb-api</artifactId>
-        <version>20051127</version>
-      </dependency>
-      <dependency>
-        <groupId>servicemix</groupId>
-        <artifactId>jaxb-impl</artifactId>
-        <version>20051127</version>
-      </dependency>
-      <dependency>
-        <groupId>servicemix</groupId>
-        <artifactId>jaxb-xjc</artifactId>
-        <version>20051127</version>
-      </dependency>
-      <dependency>
-        <groupId>servicemix</groupId>
-        <artifactId>jaxws-api</artifactId>
-        <version>20051127</version>
-      </dependency>
-      <dependency>
-        <groupId>servicemix</groupId>
-        <artifactId>jaxws-rt</artifactId>
-        <version>20051127</version>
-      </dependency>
-      <dependency>
-        <groupId>servicemix</groupId>
-        <artifactId>jaxws-tools</artifactId>
-        <version>20051127</version>
-      </dependency>
-      <dependency>
-        <groupId>servicemix</groupId>
-        <artifactId>jsr181-api</artifactId>
-        <version>20051127</version>
-      </dependency>
-      <dependency>
-        <groupId>servicemix</groupId>
-        <artifactId>jsr250-api</artifactId>
-        <version>20051127</version>
-      </dependency>
-      <dependency>
-        <groupId>servicemix</groupId>
-        <artifactId>sjsxp</artifactId>
-        <version>20051127</version>
+          <groupId>com.sun.xml</groupId>
+          <artifactId>jaxb-impl</artifactId>
+          <version>2.0-JAXWS-2.0-EA3</version>
       </dependency>
       
       <dependency>
         <groupId>activecluster</groupId>
         <artifactId>activecluster</artifactId>
-        <version>1.1-SNAPSHOT</version>
+        <version>1.1-20050524.034300</version>
+        <exclusions>
+          <exclusion>
+            <groupId>activemq</groupId>
+            <artifactId>activemq</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>activeio</groupId>
+            <artifactId>activeio</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
       <dependency>
-        <groupId>activeio</groupId>
+        <groupId>org.apache.servicemix.dependencies</groupId>
         <artifactId>activeio</artifactId>
         <version>2.1</version>
       </dependency>
       <dependency>
-        <groupId>activemq</groupId>
-        <artifactId>activemq</artifactId>
+        <groupId>org.apache.servicemix.dependencies</groupId>
+        <artifactId>activemq-core</artifactId>
         <version>4.0-SNAPSHOT</version>
       </dependency>
       <dependency>
-        <groupId>activemq</groupId>
+        <groupId>org.apache.servicemix.dependencies</groupId>
         <artifactId>activemq-ra</artifactId>
         <version>4.0-SNAPSHOT</version>
       </dependency>
       <dependency>
-        <groupId>activemq</groupId>
+      <groupId>org.apache.servicemix.dependencies</groupId>
         <artifactId>smack</artifactId>
         <version>1.5.0</version>
       </dependency>
       <dependency>
-        <groupId>activemq</groupId>
+      <groupId>org.apache.servicemix.dependencies</groupId>
         <artifactId>smackx</artifactId>
         <version>1.5.0</version>
       </dependency>
@@ -474,7 +453,7 @@
       <dependency>
         <groupId>activesoap</groupId>
         <artifactId>activesoap</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.0-20050615.083700</version>
       </dependency>
       <dependency>
         <groupId>annogen</groupId>
@@ -484,7 +463,7 @@
       <dependency>
         <groupId>ant</groupId>
         <artifactId>ant</artifactId>
-        <version>1.6</version>
+        <version>1.6.5</version>
       </dependency>
       <dependency>
         <groupId>antlr</groupId>
@@ -585,6 +564,10 @@
             <groupId>commons-beanutils</groupId>
             <artifactId>commons-beanutils</artifactId>
           </exclusion>
+          <exclusion>
+            <groupId>xerces</groupId>
+            <artifactId>xerces</artifactId>
+          </exclusion>
         </exclusions>
       </dependency>
       <dependency>
@@ -626,7 +609,13 @@
       <dependency>
         <groupId>commons-httpclient</groupId>
         <artifactId>commons-httpclient</artifactId>
-        <version>3.0-rc2</version>
+        <version>3.0</version>
+        <exclusions>
+          <exclusion>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
       <dependency>
         <groupId>commons-io</groupId>
@@ -651,7 +640,13 @@
       <dependency>
         <groupId>commons-net</groupId>
         <artifactId>commons-net</artifactId>
-        <version>1.4.0</version>
+        <version>1.4.1</version>
+        <exclusions>
+          <exclusion>
+            <groupId>oro</groupId>
+            <artifactId>oro</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
       <dependency>
         <groupId>commons-pool</groupId>
@@ -662,6 +657,10 @@
             <groupId>xerces</groupId>
             <artifactId>xerces</artifactId>
           </exclusion>
+          <exclusion>
+            <groupId>xml-apis</groupId>
+            <artifactId>xml-apis</artifactId>
+          </exclusion>
         </exclusions>
       </dependency>
       <dependency>
@@ -718,6 +717,60 @@
         <groupId>geronimo</groupId>
         <artifactId>geronimo-connector</artifactId>
         <version>1.0</version>
+        <exclusions>
+          <exclusion>
+            <groupId>cglib</groupId>
+            <artifactId>cglib-nodep</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>regexp</groupId>
+            <artifactId>regexp</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-deployment</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-common</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-naming</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-security</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>commons-jelly</groupId>
+            <artifactId>commons-jelly-tags-velocity</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-management</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-j2ee</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>velocity</groupId>
+            <artifactId>velocity</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-transaction</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-kernel</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>tranql</groupId>
+            <artifactId>tranql</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
       <dependency>
         <groupId>geronimo</groupId>
@@ -763,6 +816,40 @@
         <groupId>geronimo</groupId>
         <artifactId>geronimo-transaction</artifactId>
         <version>1.0</version>
+        <exclusions>
+          <exclusion>
+            <groupId>howl</groupId>
+            <artifactId>howl-logger</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>commons-jelly</groupId>
+            <artifactId>commons-jelly-tags-velocity</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-core</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-kernel</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>velocity</groupId>
+            <artifactId>velocity</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-system</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-j2ee</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-ejb_2.1_spec</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
       <dependency>
         <groupId>org.apache.geronimo.specs</groupId>
@@ -814,6 +901,11 @@
         <artifactId>geronimo-jsp_2.0_spec</artifactId>
         <version>1.0</version>
       </dependency>
+    <dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-saaj_1.1_spec</artifactId>
+        <version>1.0</version>
+    </dependency>
       <dependency>
         <groupId>org.apache.geronimo.specs</groupId>
         <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
@@ -850,8 +942,28 @@
         <version>1.6</version>
         <exclusions>
           <exclusion>
-            <groupId>xerces</groupId>
-            <artifactId>xerces</artifactId>
+            <groupId>jtidy</groupId>
+            <artifactId>jtidy</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>javax.activation</groupId>
+            <artifactId>activation</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>javax.mail</groupId>
+            <artifactId>mail</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>rhino</groupId>
+            <artifactId>js</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>nekohtml</groupId>
+            <artifactId>nekohtml</artifactId>
           </exclusion>
           <exclusion>
             <groupId>xerces</groupId>
@@ -878,6 +990,22 @@
             <groupId>jaxme</groupId>
             <artifactId>jaxme-api</artifactId>
           </exclusion>
+          <exclusion>
+            <groupId>dom4j</groupId>
+            <artifactId>dom4j</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>xom</groupId>
+            <artifactId>xom</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>jdom</groupId>
+            <artifactId>jdom</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>xerces</groupId>
+            <artifactId>xmlParserAPIs</artifactId>
+          </exclusion>
         </exclusions>
       </dependency>
       <dependency>
@@ -902,14 +1030,9 @@
         <version>1.0</version>
       </dependency>
       <dependency>
-        <groupId>jencks</groupId>
+        <groupId>org.apache.servicemix.dependencies</groupId>
         <artifactId>jencks</artifactId>
-        <version>1.1</version>
-      </dependency>
-      <dependency>
-        <groupId>jencks</groupId>
-        <artifactId>jencks-all</artifactId>
-        <version>1.1</version>
+        <version>1.1.2</version>
       </dependency>
       <dependency>
         <groupId>jetty</groupId>
@@ -955,6 +1078,52 @@
         <groupId>lingo</groupId>
         <artifactId>lingo</artifactId>
         <version>1.0</version>
+        <exclusions>
+          <exclusion>
+            <groupId>backport175</groupId>
+            <artifactId>backport175</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>hsqldb</groupId>
+            <artifactId>hsqldb</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>cglib</groupId>
+            <artifactId>cglib-full</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>xmlpull</groupId>
+            <artifactId>xmlpull</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>jencks</groupId>
+            <artifactId>jencks-all</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>geronimo-spec</groupId>
+            <artifactId>geronimo-spec-jta</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>geronimo-spec</groupId>
+            <artifactId>geronimo-spec-jms</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>geronimo-spec</groupId>
+            <artifactId>geronimo-spec-j2ee-connector</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>geronimo-spec</groupId>
+            <artifactId>geronimo-spec-j2ee-management</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>activemq</groupId>
+            <artifactId>activemq</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>activemq</groupId>
+            <artifactId>activemq-ra</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
       <dependency>
         <groupId>log4j</groupId>
@@ -969,22 +1138,12 @@
       <dependency>
         <groupId>mx4j</groupId>
         <artifactId>mx4j</artifactId>
-        <version>2.1.1</version>
-      </dependency>
-      <dependency>
-        <groupId>mx4j</groupId>
-        <artifactId>mx4j-jmx</artifactId>
-        <version>2.1.1</version>
+        <version>3.0.1</version>
       </dependency>
       <dependency>
         <groupId>mx4j</groupId>
         <artifactId>mx4j-remote</artifactId>
-        <version>2.1.1</version>
-      </dependency>
-      <dependency>
-        <groupId>mx4j</groupId>
-        <artifactId>mx4j-tools</artifactId>
-        <version>2.1.1</version>
+        <version>3.0.1</version>
       </dependency>
       <dependency>
         <groupId>openejb</groupId>
@@ -1029,7 +1188,7 @@
       <dependency>
         <groupId>quartz</groupId>
         <artifactId>quartz</artifactId>
-        <version>1.4.5</version>
+        <version>1.5.1</version>
       </dependency>
       <dependency>
         <groupId>regexp</groupId>
@@ -1063,6 +1222,26 @@
             <groupId>javax.transaction</groupId>
             <artifactId>jta</artifactId>
           </exclusion>
+          <exclusion>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-support</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-orm</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-hibernate</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-remoting</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-core</artifactId>
+          </exclusion>
         </exclusions>
       </dependency>
       <dependency>
@@ -1127,9 +1306,9 @@
         <version>1.0</version>
       </dependency>
       <dependency>
-        <groupId>stax-utils</groupId>
+        <groupId>net.java.dev.stax-utils</groupId>
         <artifactId>stax-utils</artifactId>
-        <version>snapshot-20040917</version>
+        <version>20060105</version>
       </dependency>
       <dependency>
         <groupId>taglibs</groupId>
@@ -1170,6 +1349,12 @@
         <groupId>xalan</groupId>
         <artifactId>xalan</artifactId>
         <version>2.7.0</version>
+        <exclusions>
+          <exclusion>
+            <groupId>xml-apis</groupId>
+            <artifactId>xml-apis</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
       <dependency>
         <groupId>org.xbean</groupId>
@@ -1207,12 +1392,12 @@
         <version>20051114</version>
       </dependency>
       <dependency>
-        <groupId>servicemix</groupId>
+        <groupId>org.apache.servicemix.dependencies</groupId>
         <artifactId>xfire-all</artifactId>
         <version>1.0-20060106</version>
       </dependency>
       <dependency>
-        <groupId>servicemix</groupId>
+        <groupId>org.apache.servicemix.dependencies</groupId>
         <artifactId>xfire-jaxws</artifactId>
         <version>1.0-20060106</version>
       </dependency>
@@ -1257,15 +1442,25 @@
         <version>1.0-alpha-2</version>
       </dependency>
       <dependency>
-        <groupId>ws-commons</groupId>
+        <groupId>org.apache.servicemix.dependencies</groupId>
         <artifactId>XmlSchema</artifactId>
-        <version>SNAPSHOT</version>
+        <version>20060108</version>
       </dependency>
         <dependency>
             <groupId>lucene</groupId>
             <artifactId>lucene</artifactId>
             <version>1.4.3</version>
         </dependency>
+    <dependency>
+      <groupId>net.java.dev.jaxb</groupId>
+      <artifactId>jaxb-impl</artifactId>
+      <version>ea3</version>
+    </dependency>
+    <dependency>
+      <groupId>net.java.dev.saaj</groupId>
+      <artifactId>saaj-impl</artifactId>
+      <version>ea3</version>
+    </dependency>
     </dependencies>
   </dependencyManagement>
   

Modified: incubator/servicemix/trunk/servicemix-components/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/pom.xml?rev=367101&r1=367100&r2=367101&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/pom.xml (original)
+++ incubator/servicemix/trunk/servicemix-components/pom.xml Sun Jan  8 13:45:34 2006
@@ -34,6 +34,151 @@
   <name>ServiceMix :: Components</name>
   <dependencies>
     <dependency>
+      <groupId>org.apache.servicemix</groupId>
+      <artifactId>servicemix-core</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-httpclient</groupId>
+      <artifactId>commons-httpclient</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-vfs</groupId>
+      <artifactId>commons-vfs</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-net</groupId>
+      <artifactId>commons-net</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-pool</groupId>
+      <artifactId>commons-pool</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.servicemix.dependencies</groupId>
+      <artifactId>xfire-all</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.servicemix.dependencies</groupId>
+      <artifactId>wsif</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.servicemix.dependencies</groupId>
+      <artifactId>wsif-j2c</artifactId>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-servlet_2.4_spec</artifactId>
+    </dependency>
+    
+    <!-- Drools dependencies -->
+    <dependency>
+      <groupId>drools</groupId>
+      <artifactId>drools-all-jdk1.4</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>janino</groupId>
+      <artifactId>janino</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>antlr</groupId>
+      <artifactId>antlr</artifactId>
+    </dependency>
+    
+    <dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-javamail_1.3.1_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-jaxrpc_1.1_spec</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>groovy</groupId>
+      <artifactId>groovy-all-1.0-jsr</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>quartz</groupId>
+      <artifactId>quartz</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>rome</groupId>
+      <artifactId>rome</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>jetty</groupId>
+      <artifactId>org.mortbay.jetty</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.servicemix.dependencies</groupId>
+      <artifactId>smack</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.servicemix.dependencies</groupId>
+      <artifactId>smackx</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>activesoap</groupId>
+      <artifactId>activesoap</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>groovy</groupId>
+      <artifactId>groovy-all-1.0-jsr</artifactId>
+    </dependency>
+      <dependency>
+        <groupId>org.apache.servicemix.dependencies</groupId>
+        <artifactId>jsr-223</artifactId>
+      </dependency>
+    <dependency>
+      <groupId>jdom</groupId>
+      <artifactId>jdom</artifactId>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.servicemix.dependencies</groupId>
+      <artifactId>wsif</artifactId>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.servicemix.dependencies</groupId>
+      <artifactId>wsif-j2c</artifactId>
+    </dependency>
+    <dependency>
+        <groupId>wsdl4j</groupId>
+      <artifactId>wsdl4j</artifactId>
+    </dependency>
+    
+    
+    <dependency>
+      <groupId>httpunit</groupId>
+      <artifactId>httpunit</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>axis</groupId>
+      <artifactId>axis-jaxrpc</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>axis</groupId>
+      <artifactId>axis</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>net.java.dev.saaj</groupId>
+      <artifactId>saaj-impl</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <scope>test</scope>
+    </dependency>
+ 
+    <!--
+    <dependency>
       <groupId>activecluster</groupId>
       <artifactId>activecluster</artifactId>
     </dependency>
@@ -138,10 +283,6 @@
       <artifactId>concurrent</artifactId>
     </dependency>
     <dependency>
-      <groupId>drools</groupId>
-      <artifactId>drools-all-jdk1.4</artifactId>
-    </dependency>
-    <dependency>
       <groupId>geronimo</groupId>
       <artifactId>geronimo-connector</artifactId>
     </dependency>
@@ -171,10 +312,6 @@
     </dependency>
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-javamail_1.3.1_spec</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
       <artifactId>geronimo-servlet_2.4_spec</artifactId>
     </dependency>
     <dependency>
@@ -234,10 +371,6 @@
       <artifactId>mx4j-remote</artifactId>
     </dependency>
     <dependency>
-      <groupId>mx4j</groupId>
-      <artifactId>mx4j-tools</artifactId>
-    </dependency>
-    <dependency>
       <groupId>org.apache.derby</groupId>
       <artifactId>derby</artifactId>
     </dependency>
@@ -283,10 +416,6 @@
     </dependency>
     <dependency>
       <groupId>org.apache.servicemix</groupId>
-      <artifactId>servicemix-core</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.servicemix</groupId>
       <artifactId>servicemix-jbi</artifactId>
     </dependency>
     <dependency>
@@ -377,6 +506,7 @@
       <groupId>xstream</groupId>
       <artifactId>xstream</artifactId>
     </dependency>
+    -->
   </dependencies>
 
     <build>

Modified: incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/http/HttpSoapConnector.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/http/HttpSoapConnector.java?rev=367101&r1=367100&r2=367101&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/http/HttpSoapConnector.java (original)
+++ incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/http/HttpSoapConnector.java Sun Jan  8 13:45:34 2006
@@ -104,7 +104,9 @@
 	 */
 	public void stop() throws JBIException {
 		try {
-			server.stop();
+		  if (server != null) {
+			  server.stop();
+			}
 		} catch (InterruptedException e) {
 			throw new JBIException("Stop failed: " + e, e);
 		}

Modified: incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/xfire/XMarshaler.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/xfire/XMarshaler.java?rev=367101&r1=367100&r2=367101&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/xfire/XMarshaler.java (original)
+++ incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/xfire/XMarshaler.java Sun Jan  8 13:45:34 2006
@@ -33,9 +33,6 @@
 import org.apache.servicemix.jbi.jaxp.StringSource;
 import org.codehaus.xfire.exchange.OutMessage;
 
-import com.ctc.wstx.stax.WstxInputFactory;
-import com.ctc.wstx.stax.WstxOutputFactory;
-
 /**
  * @version $Revision$
  */
@@ -46,8 +43,8 @@
     
     public XMarshaler()
     {
-        outputFactory = new WstxOutputFactory();
-        inputFactory = new WstxInputFactory();
+        outputFactory = XMLOutputFactory.newInstance();
+        inputFactory = XMLInputFactory.newInstance();
     }
 
     public void setContent(NormalizedMessage message, String xml) throws MessagingException {

Modified: incubator/servicemix/trunk/servicemix-core/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-core/pom.xml?rev=367101&r1=367100&r2=367101&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/pom.xml (original)
+++ incubator/servicemix/trunk/servicemix-core/pom.xml Sun Jan  8 13:45:34 2006
@@ -40,23 +40,35 @@
             <artifactId>servicemix-jbi</artifactId>
         </dependency>
         <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+        </dependency>
+        <dependency>
             <groupId>xml-apis</groupId>
             <artifactId>xml-apis</artifactId>
         </dependency>
-
+      <dependency>
+        <groupId>geronimo</groupId>
+        <artifactId>geronimo-connector</artifactId>
+        </dependency>
+      <dependency>
+        <groupId>geronimo</groupId>
+        <artifactId>geronimo-transaction</artifactId>
+        </dependency>
+        
         <dependency>
-            <groupId>activemq</groupId>
-            <artifactId>activemq</artifactId>
+            <groupId>org.apache.servicemix.dependencies</groupId>
+            <artifactId>activeio</artifactId>
         </dependency>
         <dependency>
-            <groupId>activemq</groupId>
-            <artifactId>activemq-ra</artifactId>
+            <groupId>org.apache.servicemix.dependencies</groupId>
+            <artifactId>activemq-core</artifactId>
         </dependency>
-
         <dependency>
-            <groupId>concurrent</groupId>
-            <artifactId>concurrent</artifactId>
+            <groupId>org.apache.servicemix.dependencies</groupId>
+            <artifactId>activemq-ra</artifactId>
         </dependency>
+
         <dependency>
             <groupId>backport-util-concurrent</groupId>
             <artifactId>backport-util-concurrent</artifactId>
@@ -112,25 +124,7 @@
 
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>spring-beans</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-context</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-web</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-dao</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-remoting</artifactId>
-            <scope>test</scope>
+            <artifactId>spring</artifactId>
         </dependency>
 
         <dependency>
@@ -146,17 +140,13 @@
             <groupId>mx4j</groupId>
             <artifactId>mx4j-remote</artifactId>
         </dependency>
-        <dependency>
-            <groupId>mx4j</groupId>
-            <artifactId>mx4j-tools</artifactId>
-        </dependency>
 
         <dependency>
             <groupId>ant</groupId>
             <artifactId>ant</artifactId>
         </dependency>
         <dependency>
-            <groupId>jencks</groupId>
+            <groupId>org.apache.servicemix.dependencies</groupId>
             <artifactId>jencks</artifactId>
         </dependency>
         <dependency>
@@ -195,8 +185,12 @@
             <groupId>xerces</groupId>
             <artifactId>xercesImpl</artifactId>
         </dependency>
+    <dependency>
+      <groupId>woodstox</groupId>
+      <artifactId>wstx-asl</artifactId>
+    </dependency>
         <dependency>
-            <groupId>stax-utils</groupId>
+            <groupId>net.java.dev.stax-utils</groupId>
             <artifactId>stax-utils</artifactId>
         </dependency>
         <dependency>

Modified: incubator/servicemix/trunk/servicemix-gbean/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-gbean/pom.xml?rev=367101&r1=367100&r2=367101&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-gbean/pom.xml (original)
+++ incubator/servicemix/trunk/servicemix-gbean/pom.xml Sun Jan  8 13:45:34 2006
@@ -36,67 +36,22 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.servicemix</groupId>
-            <artifactId>servicemix-jbi</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix</groupId>
             <artifactId>servicemix-core</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.xbean</groupId>
-            <artifactId>xbean-spring</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-        </dependency>
-        <dependency>
             <groupId>geronimo</groupId>
             <artifactId>geronimo-kernel</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-system</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>geronimo-deployment</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-common</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>geronimo-j2ee</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-connector</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-transaction</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>jencks</groupId>
-            <artifactId>jencks</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>mx4j</groupId>
-            <artifactId>mx4j</artifactId>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 </project>

Modified: incubator/servicemix/trunk/servicemix-jbi/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-jbi/pom.xml?rev=367101&r1=367100&r2=367101&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-jbi/pom.xml (original)
+++ incubator/servicemix/trunk/servicemix-jbi/pom.xml Sun Jan  8 13:45:34 2006
@@ -19,7 +19,7 @@
     </dependency>
     <dependency>
       <groupId>mx4j</groupId>
-      <artifactId>mx4j-jmx</artifactId>
+      <artifactId>mx4j</artifactId>
     </dependency>
   </dependencies>
 </project>

Modified: incubator/servicemix/trunk/servicemix-jms/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-jms/pom.xml?rev=367101&r1=367100&r2=367101&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-jms/pom.xml (original)
+++ incubator/servicemix/trunk/servicemix-jms/pom.xml Sun Jan  8 13:45:34 2006
@@ -31,88 +31,42 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.servicemix</groupId>
     <artifactId>servicemix-jms</artifactId>
-    <packaging>jar</packaging>
+    <packaging>jbi-component</packaging>
     <name>ServiceMix :: JMS</name>
     <description>JMS Binding Component</description>
+
     <dependencies>
-        
-        <!-- Check this dependency -->
-        <!--dependency>
-            <groupId>servicemix</groupId>
-            <artifactId>maven-jbi-plugin</artifactId>
-        </dependency-->
         <dependency>
-	        <groupId>org.apache.servicemix</groupId>
+	          <groupId>org.apache.servicemix</groupId>
             <artifactId>servicemix-common</artifactId>
         </dependency>
         <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>backport-util-concurrent</groupId>
-            <artifactId>backport-util-concurrent</artifactId>
+	          <groupId>org.apache.servicemix</groupId>
+            <artifactId>servicemix-core</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>wsdl4j</groupId>
+	          <groupId>wsdl4j</groupId>
             <artifactId>wsdl4j</artifactId>
         </dependency>
         <dependency>
-	        <groupId>org.apache.servicemix</groupId>
-            <artifactId>servicemix-jbi</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-jta_1.0.1B_spec</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jms_1.1_spec</artifactId>
-        </dependency>
-        <dependency>
-	          <groupId>org.apache.servicemix</groupId>
-            <artifactId>servicemix-core</artifactId>
-        </dependency>
-        <dependency>
 	          <groupId>org.apache.servicemix</groupId>
             <artifactId>servicemix-components</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>activemq</groupId>
-            <artifactId>activemq</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>concurrent</groupId>
-            <artifactId>concurrent</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>jencks</groupId>
-            <artifactId>jencks-all</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>commons-beanutils</groupId>
-            <artifactId>commons-beanutils-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>commons-pool</groupId>
-            <artifactId>commons-pool</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>commons-collections</groupId>
-            <artifactId>commons-collections</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>mx4j</groupId>
-            <artifactId>mx4j</artifactId>
-        </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.servicemix.plugins</groupId>
+                <artifactId>maven2-jbi-plugin</artifactId>
+                <configuration>
+                   <type>service-engine</type>
+                   <bootstrap>org.apache.servicemix.jms.JmsBootstrap</bootstrap>
+                   <component>org.apache.servicemix.Jms.JmsComponent</component>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>

Modified: incubator/servicemix/trunk/servicemix-jsr181/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-jsr181/pom.xml?rev=367101&r1=367100&r2=367101&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-jsr181/pom.xml (original)
+++ incubator/servicemix/trunk/servicemix-jsr181/pom.xml Sun Jan  8 13:45:34 2006
@@ -34,8 +34,48 @@
     <packaging>jbi-component</packaging>
     <name>ServiceMix :: JSR-181 Service Engine</name>
     <description>JSR-181 service engine</description>
-    <dependencies>
     
+    <dependencies>
+        <dependency>
+	          <groupId>org.apache.servicemix</groupId>
+            <artifactId>servicemix-common</artifactId>
+        </dependency>
+        <dependency>
+	          <groupId>org.apache.servicemix</groupId>
+            <artifactId>servicemix-core</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.servicemix.dependencies</groupId>
+            <artifactId>xfire-all</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.servicemix.dependencies</groupId>
+            <artifactId>xfire-jaxws</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>jdom</groupId>
+            <artifactId>jdom</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>commons-attributes</groupId>
+            <artifactId>commons-attributes-api</artifactId>
+            <exclusions>
+              <exclusion>
+                <groupId>ant</groupId>
+                <artifactId>ant</artifactId>
+              </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+          <groupId>beehive</groupId>
+          <artifactId>wsm</artifactId>
+        </dependency>
+        <dependency>
+        <groupId>org.apache.servicemix.dependencies</groupId>
+          <artifactId>XmlSchema</artifactId>
+        </dependency>
+<!--    
         <dependency>
             <groupId>org.apache.servicemix</groupId>
             <artifactId>servicemix-common</artifactId>
@@ -53,14 +93,6 @@
             <artifactId>wsdl4j</artifactId>
         </dependency>
         <dependency>
-            <groupId>servicemix</groupId>
-            <artifactId>xfire-all</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>servicemix</groupId>
-            <artifactId>xfire-jaxws</artifactId>
-        </dependency>
-        <dependency>
             <groupId>stax</groupId>
             <artifactId>stax-api</artifactId>
         </dependency>
@@ -99,7 +131,6 @@
         <dependency>
             <groupId>commons-attributes</groupId>
             <artifactId>commons-attributes-plugin</artifactId>
-            <!--type>plugin</type-->
         </dependency>
         <dependency>
             <groupId>backport175</groupId>
@@ -155,6 +186,7 @@
             <groupId>ws-commons</groupId>
             <artifactId>XmlSchema</artifactId>
         </dependency>
+        -->
     </dependencies>
 
     <build>

Modified: incubator/servicemix/trunk/servicemix-lwcontainer/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-lwcontainer/pom.xml?rev=367101&r1=367100&r2=367101&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-lwcontainer/pom.xml (original)
+++ incubator/servicemix/trunk/servicemix-lwcontainer/pom.xml Sun Jan  8 13:45:34 2006
@@ -49,13 +49,13 @@
             <artifactId>servicemix-core</artifactId>
             <scope>provided</scope>
         </dependency>
-
+<!--
         <dependency>
-            <groupId>servicemix</groupId>
+            <groupId>org.apache.servicemix.dependencies</groupId>
             <artifactId>xfire-all</artifactId>
         </dependency>
         <dependency>
-            <groupId>servicemix</groupId>
+            <groupId>org.apache.servicemix.dependencies</groupId>
             <artifactId>xfire-jaxws</artifactId>
         </dependency>
         <dependency>
@@ -85,7 +85,6 @@
         <dependency>
             <groupId>commons-attributes</groupId>
             <artifactId>commons-attributes-plugin</artifactId>
-            <!--type>plugin</type-->
         </dependency>
         <dependency>
             <groupId>backport175</groupId>
@@ -116,6 +115,7 @@
             <artifactId>log4j</artifactId>
             <scope>test</scope>
         </dependency>
+        -->
     </dependencies>
 
     <build>

Modified: incubator/servicemix/trunk/servicemix-sca/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-sca/pom.xml?rev=367101&r1=367100&r2=367101&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-sca/pom.xml (original)
+++ incubator/servicemix/trunk/servicemix-sca/pom.xml Sun Jan  8 13:45:34 2006
@@ -81,39 +81,34 @@
         	<version>2.1.1</version>
         </dependency>
         <dependency>
-        	<groupId>servicemix</groupId>
+        	<groupId>org.apache.servicemix.dependencies.tuscany</groupId>
         	<artifactId>tuscany-common</artifactId>
-        	<version>SNAPSHOT</version>
+        	<version>dev-200512</version>
         </dependency>
         <dependency>
-        	<groupId>servicemix</groupId>
+        	<groupId>org.apache.servicemix.dependencies.tuscany</groupId>
         	<artifactId>tuscany-container-java</artifactId>
-        	<version>SNAPSHOT</version>
+        	<version>dev-200512</version>
         </dependency>
         <dependency>
-        	<groupId>servicemix</groupId>
+        	<groupId>org.apache.servicemix.dependencies.tuscany</groupId>
         	<artifactId>tuscany-core</artifactId>
-        	<version>SNAPSHOT</version>
+        	<version>dev-200512</version>
         </dependency>
         <dependency>
-        	<groupId>servicemix</groupId>
+        	<groupId>org.apache.servicemix.dependencies.tuscany</groupId>
         	<artifactId>tuscany-model</artifactId>
-        	<version>SNAPSHOT</version>
+        	<version>dev-200512</version>
         </dependency>
         <dependency>
-        	<groupId>servicemix</groupId>
+        	<groupId>org.apache.servicemix.dependencies.tuscany</groupId>
         	<artifactId>sca-api</artifactId>
-        	<version>SNAPSHOT</version>
+        	<version>dev-200512</version>
         </dependency>
         <dependency>
-          <groupId>servicemix</groupId>
-          <artifactId>jaxb-api</artifactId>
-          <version>20051215</version>
-        </dependency>
-        <dependency>
-          <groupId>servicemix</groupId>
+          <groupId>com.sun.xml</groupId>
           <artifactId>jaxb-impl</artifactId>
-          <version>20051215</version>
+          <version>2.0-JAXWS-2.0-EA3</version>
         </dependency>
         
         <dependency>

Modified: incubator/servicemix/trunk/servicemix-wsn2005/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-wsn2005/pom.xml?rev=367101&r1=367100&r2=367101&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-wsn2005/pom.xml (original)
+++ incubator/servicemix/trunk/servicemix-wsn2005/pom.xml Sun Jan  8 13:45:34 2006
@@ -51,10 +51,17 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>activemq</groupId>
-            <artifactId>activemq</artifactId>
+            <groupId>org.apache.servicemix.dependencies</groupId>
+            <artifactId>activemq-core</artifactId>
         </dependency>
         
+        
+        <dependency>
+            <groupId>com.sun.xml</groupId>
+            <artifactId>jaxws-tools</artifactId>
+            <version>2.0-JAXWS-2.0-EA3</version>
+        </dependency>
+        <!--
     <dependency>
       <groupId>servicemix</groupId>
       <artifactId>jsr181-api</artifactId>
@@ -127,7 +134,7 @@
             <artifactId>stax-api</artifactId>
             <scope>compile</scope>
         </dependency>
-
+-->
 
     </dependencies>
 
@@ -149,7 +156,7 @@
                         <configuration>
                             <tasks>
 							    <taskdef name="wsimport" classname="com.sun.tools.ws.ant.WsImport">
-							      <classpath refid="maven.dependency.classpath"/>
+							      <classpath refid="maven.test.classpath"/>
 							    </taskdef>
 							    <mkdir dir="${basedir}/target/generated" />
 							    <mkdir dir="${basedir}/target/generated-classes" />



Mime
View raw message