Return-Path: 
 <servicemix-commits-return-1344-apmail-geronimo-servicemix-commits-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-servicemix-commits-archive@www.apache.org
Received: (qmail 50216 invoked from network); 19 Jun 2006 20:20:28 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 19 Jun 2006 20:20:28 -0000
Received: (qmail 55141 invoked by uid 500); 19 Jun 2006 20:20:28 -0000
Delivered-To: apmail-geronimo-servicemix-commits-archive@geronimo.apache.org
Received: (qmail 55104 invoked by uid 500); 19 Jun 2006 20:20:28 -0000
Mailing-List: contact servicemix-commits-help@geronimo.apache.org;
 run by ezmlm
Precedence: bulk
List-Help: <mailto:servicemix-commits-help@geronimo.apache.org>
List-Unsubscribe: <mailto:servicemix-commits-unsubscribe@geronimo.apache.org>
List-Post: <mailto:servicemix-commits@geronimo.apache.org>
List-Id: <servicemix-commits.geronimo.apache.org>
Reply-To: servicemix-dev@geronimo.apache.org
Delivered-To: mailing list servicemix-commits@geronimo.apache.org
Received: (qmail 55090 invoked by uid 99); 19 Jun 2006 20:20:27 -0000
Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 19 Jun 2006 13:20:27 -0700
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received-SPF: pass (asf.osuosl.org: local policy)
Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 19 Jun 2006 13:20:27 -0700
Received: by eris.apache.org (Postfix, from userid 65534)
	id B68E21A983A; Mon, 19 Jun 2006 13:20:06 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r415404 - in /incubator/servicemix/trunk:
 apache-servicemix/pom.xml pom.xml servicemix-eip/pom.xml
 servicemix-jsr181/pom.xml servicemix-wsn2005/pom.xml
Date: Mon, 19 Jun 2006 20:20:05 -0000
To: servicemix-commits@geronimo.apache.org
From: gnodet@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20060619202006.B68E21A983A@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: gnodet
Date: Mon Jun 19 13:20:05 2006
New Revision: 415404

URL: http://svn.apache.org/viewvc?rev=415404&view=rev
Log:
Upgrade to xfire-1.1.1, jaxb 2.0.1
Include beanflow in distribution
Clean component installers

Modified:
    incubator/servicemix/trunk/apache-servicemix/pom.xml
    incubator/servicemix/trunk/pom.xml
    incubator/servicemix/trunk/servicemix-eip/pom.xml
    incubator/servicemix/trunk/servicemix-jsr181/pom.xml
    incubator/servicemix/trunk/servicemix-wsn2005/pom.xml

Modified: incubator/servicemix/trunk/apache-servicemix/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/apache-servicemix/pom.xml?rev=415404&r1=415403&r2=415404&view=diff
==============================================================================
--- incubator/servicemix/trunk/apache-servicemix/pom.xml (original)
+++ incubator/servicemix/trunk/apache-servicemix/pom.xml Mon Jun 19 13:20:05 2006
@@ -97,6 +97,10 @@
       <artifactId>servicemix-components</artifactId>
     </dependency>
     <dependency>
+      <groupId>${pom.groupId}</groupId>
+      <artifactId>servicemix-beanflow</artifactId>
+    </dependency>
+    <dependency>
       <groupId>org.apache.servicemix.samples</groupId>
       <artifactId>wsdl-first</artifactId>
     </dependency>

Modified: incubator/servicemix/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/pom.xml?rev=415404&r1=415403&r2=415404&view=diff
==============================================================================
--- incubator/servicemix/trunk/pom.xml (original)
+++ incubator/servicemix/trunk/pom.xml Mon Jun 19 13:20:05 2006
@@ -222,7 +222,7 @@
     <qdox.version>1.5</qdox.version>
     <jaxws.tools.version>2.0EA3</jaxws.tools.version>
     <xfire.jsr181.api.version>1.0-M1</xfire.jsr181.api.version>
-    <xfire.version>1.1</xfire.version>
+    <xfire.version>1.1.1</xfire.version>
     <mavenAssemblyPluginVersion>2.1</mavenAssemblyPluginVersion>
   </properties>
   
@@ -279,6 +279,18 @@
       <name>ActiveMQ Maven2 Temp Repository</name>
       <url>http://people.apache.org/~chirino/incubator-activemq-4.0/maven2</url>
     </repository>
+    <!-- XFire 1.1.1 release -->
+    <repository>
+      <id>codehaus</id>
+      <name>Codehaus repo</name>
+      <url>http://repository.codehaus.org</url>
+    </repository>
+    <repository>
+      <id>codehaus.m1</id>
+      <name>Codehaus M1 repo</name>
+      <url>http://dist.codehaus.org</url>
+      <layout>legacy</layout>
+    </repository>
   </repositories>
   
   <dependencies>
@@ -378,6 +390,11 @@
         <artifactId>wsdl-first</artifactId>
         <version>3.0-SNAPSHOT</version>
       </dependency>
+      <dependency>
+        <groupId>${pom.groupId}</groupId>
+        <artifactId>servicemix-beanflow</artifactId>
+        <version>3.0-SNAPSHOT</version>
+      </dependency>
  
       <dependency>
         <groupId>org.apache.servicemix.dependencies</groupId>
@@ -402,12 +419,35 @@
       <dependency>
           <groupId>com.sun.xml.bind</groupId>
           <artifactId>jaxb-impl</artifactId>
+          <version>2.0.1</version>
+          <exclusions>
+            <exclusion>
+              <groupId>javax.xml</groupId>
+              <artifactId>jsr173</artifactId>
+            </exclusion>
+            <exclusion>
+              <groupId>javax.jws</groupId>
+              <artifactId>jsr181-api</artifactId>
+            </exclusion>
+            <exclusion>
+              <groupId>javax.activation</groupId>
+              <artifactId>activation</artifactId>
+            </exclusion>
+          </exclusions>
+      </dependency>
+      <dependency>
+          <groupId>javax.xml</groupId>
+          <artifactId>jaxb-api</artifactId>
           <version>2.0</version>
           <exclusions>
             <exclusion>
               <groupId>javax.xml</groupId>
               <artifactId>jsr173</artifactId>
             </exclusion>
+            <exclusion>
+              <groupId>javax.activation</groupId>
+              <artifactId>activation</artifactId>
+            </exclusion>
           </exclusions>
       </dependency>
       <dependency>
@@ -1506,12 +1546,50 @@
             <groupId>qdox</groupId>
             <artifactId>qdox</artifactId>
           </exclusion>
+          <exclusion>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-xjc</artifactId>
+          </exclusion>
         </exclusions>
       </dependency>
       <dependency>
         <groupId>org.codehaus.xfire</groupId>
         <artifactId>xfire-xmlbeans</artifactId>
         <version>${xfire.version}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>httpunit</groupId>
+            <artifactId>httpunit</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>jetty</groupId>
+            <artifactId>org.mortbay.jetty</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>commons-httpclient</groupId>
+            <artifactId>commons-httpclient</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>javax.mail</groupId>
+            <artifactId>mail</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>javax.activation</groupId>
+            <artifactId>activation</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>ant</groupId>
+            <artifactId>ant</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>commons-beanutils</groupId>
+            <artifactId>commons-beanutils</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>qdox</groupId>
+            <artifactId>qdox</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
       <dependency>
         <groupId>org.codehaus.xfire</groupId>

Modified: incubator/servicemix/trunk/servicemix-eip/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-eip/pom.xml?rev=415404&r1=415403&r2=415404&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-eip/pom.xml (original)
+++ incubator/servicemix/trunk/servicemix-eip/pom.xml Mon Jun 19 13:20:05 2006
@@ -50,6 +50,11 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
       <scope>test</scope>

Modified: incubator/servicemix/trunk/servicemix-jsr181/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-jsr181/pom.xml?rev=415404&r1=415403&r2=415404&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-jsr181/pom.xml (original)
+++ incubator/servicemix/trunk/servicemix-jsr181/pom.xml Mon Jun 19 13:20:05 2006
@@ -43,6 +43,10 @@
       <artifactId>xfire-jaxb2</artifactId>
     </dependency>
     <dependency>
+      <groupId>com.sun.xml.bind</groupId>
+      <artifactId>jaxb-impl</artifactId>
+    </dependency>
+    <dependency>
       <groupId>org.codehaus.xfire</groupId>
       <artifactId>xfire-xmlbeans</artifactId>
     </dependency>
@@ -84,6 +88,7 @@
 
   <build>
     <plugins>
+      <!--
       <plugin>
         <artifactId>maven-antrun-plugin</artifactId>
         <executions>
@@ -115,6 +120,21 @@
             <version>${qdox.version}</version>
           </dependency>
         </dependencies>
+      </plugin>
+      -->
+      <plugin>
+        <groupId>org.apache.xbean</groupId>
+        <artifactId>maven-xbean-plugin</artifactId>
+        <executions>
+          <execution>
+            <configuration>
+              <namespace>http://servicemix.apache.org/jsr181/1.0</namespace>
+            </configuration>
+            <goals>
+              <goal>mapping</goal>
+            </goals>
+          </execution>
+        </executions>
       </plugin>
       <plugin>
         <groupId>org.apache.servicemix.tooling</groupId>

Modified: incubator/servicemix/trunk/servicemix-wsn2005/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-wsn2005/pom.xml?rev=415404&r1=415403&r2=415404&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-wsn2005/pom.xml (original)
+++ incubator/servicemix/trunk/servicemix-wsn2005/pom.xml Mon Jun 19 13:20:05 2006
@@ -57,16 +57,11 @@
     <dependency>
       <groupId>incubator-activemq</groupId>
       <artifactId>activemq-core</artifactId>
+      <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>com.sun.xml</groupId>
+      <groupId>com.sun.xml.bind</groupId>
       <artifactId>jaxb-impl</artifactId>
-      <exclusions>
-        <exclusion>
-          <groupId>javax.jws</groupId>
-          <artifactId>jsr181-api</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>javax.xml</groupId>
@@ -117,6 +112,7 @@
           </execution>
         </executions>
       </plugin>
+      <!--
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>jaxws-maven-plugin</artifactId>
@@ -132,6 +128,46 @@
           <wsdlDirectory>${basedir}/src/main/resources/org/apache/servicemix/wsn</wsdlDirectory>
           <wsdlFiles>wsn.wsdl</wsdlFiles>
         </configuration>
+      </plugin>
+      -->
+      <plugin>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>generate-sources</phase>
+            <configuration>
+              <tasks>
+                <taskdef classname="org.codehaus.xfire.gen.WsGenTask" name="wsgen">
+                  <classpath>
+                    <pathelement path="${basedir}/target/classes" />
+                    <path refid="maven.test.classpath" />
+                  </classpath>
+                </taskdef>
+                <wsgen 
+                  wsdl="${basedir}/src/main/resources/org/apache/servicemix/wsn/wsn.wsdl"
+                  outputDirectory="${basedir}/target/jaxws" 
+                  profile="org.codehaus.xfire.jaxws.gen.JAXWSProfile"
+                  explicitAnnotation="true" />
+              </tasks>
+              <sourceRoot>${basedir}/target/jaxws</sourceRoot>
+            </configuration>
+            <goals>
+              <goal>run</goal>
+            </goals>
+          </execution>
+        </executions>
+        <dependencies>
+          <dependency>
+            <groupId>org.codehaus.xfire</groupId>
+            <artifactId>xfire-generator</artifactId>
+            <version>1.1.1</version>
+          </dependency>
+          <dependency>
+            <groupId>org.codehaus.xfire</groupId>
+            <artifactId>xfire-jaxws</artifactId>
+            <version>1.1.1</version>
+          </dependency>
+        </dependencies>
       </plugin>
     </plugins>
   </build>