servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject svn commit: r399296 - in /incubator/servicemix/trunk: ./ servicemix-assembly/ servicemix-assembly/src/main/assembly/ servicemix-bpe/ servicemix-console/ servicemix-core/ servicemix-eip/ servicemix-http/ servicemix-jms/ servicemix-wsn2005/
Date Wed, 03 May 2006 13:35:24 GMT
Author: gnodet
Date: Wed May  3 06:35:23 2006
New Revision: 399296

URL: http://svn.apache.org/viewcvs?rev=399296&view=rev
Log:
Fix m2 build

Modified:
    incubator/servicemix/trunk/pom.xml
    incubator/servicemix/trunk/servicemix-assembly/pom.xml
    incubator/servicemix/trunk/servicemix-assembly/src/main/assembly/bin.xml
    incubator/servicemix/trunk/servicemix-bpe/pom.xml
    incubator/servicemix/trunk/servicemix-console/pom.xml
    incubator/servicemix/trunk/servicemix-core/pom.xml
    incubator/servicemix/trunk/servicemix-eip/pom.xml
    incubator/servicemix/trunk/servicemix-http/pom.xml
    incubator/servicemix/trunk/servicemix-jms/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=399296&r1=399295&r2=399296&view=diff
==============================================================================
--- incubator/servicemix/trunk/pom.xml (original)
+++ incubator/servicemix/trunk/pom.xml Wed May  3 06:35:23 2006
@@ -201,7 +201,6 @@
     <module>servicemix-common</module>
     <module>servicemix-soap</module>
     <module>servicemix-console</module>
-    <module>servicemix-gbean</module>
     <module>servicemix-bpe</module>
     <module>servicemix-jms</module>
     <module>servicemix-jsr181</module>
@@ -215,6 +214,8 @@
   
   <properties>
     <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>
   </properties>
   
   <profiles>
@@ -232,9 +233,10 @@
   
   <pluginRepositories>
     <pluginRepository>
-      <id>servicemix-snapshots</id>
-      <name>ServiceMix Snapshots Repository</name>
-      <url>http://servicemix.org/m2-snapshots</url>
+      <id>servicemix-m2-repo</id>
+      <name>Servicemix Maven2 Repository</name>
+      <url>http://servicemix.org/m2-repo</url>
+      <snapshots><enabled>true</enabled></snapshots>
     </pluginRepository>
   </pluginRepositories>
   
@@ -245,32 +247,10 @@
       <url>http://repo1.maven.org/maven2</url>
     </repository>
     <repository>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-      <id>maven2-snapshots</id>
-      <name>Maven Repository Snapshots</name>
-      <url>http://snapshots.maven.codehaus.org/maven2</url>
-    </repository>
-    <repository>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
       <id>servicemix-m2-repo</id>
       <name>Servicemix Maven2 Repository</name>
       <url>http://servicemix.org/m2-repo</url>
     </repository>
-    <repository>
-      <id>lb-m1-repo</id>
-      <name>LogicBlaze Maven1 Repository</name>
-      <url>http://repo.logicblaze.com/maven1</url>
-      <layout>legacy</layout>
-    </repository>
-    <repository>
-      <id>apache-m2</id>
-      <name>Apache M2 Repository</name>
-      <url>http://cvs.apache.org/maven-snapshot-repository</url>
-    </repository>
   </repositories>
   
   <dependencies>
@@ -286,11 +266,6 @@
     <dependencies>
       <dependency>
         <groupId>${pom.groupId}</groupId>
-        <artifactId>servicemix</artifactId>
-        <version>3.0-SNAPSHOT</version>
-      </dependency>
-      <dependency>
-        <groupId>${pom.groupId}</groupId>
         <artifactId>servicemix-jbi</artifactId>
         <version>${pom.version}</version>
       </dependency>
@@ -366,18 +341,6 @@
         <version>1.0-pr</version>
       </dependency>
       <dependency>
-        <groupId>servicemix</groupId>
-        <artifactId>saaj-api</artifactId>
-        <!--version>20050915</version-->
-        <version>20051127</version>
-      </dependency>
-      <dependency>
-        <groupId>servicemix</groupId>
-        <artifactId>saaj-impl</artifactId>
-        <!--version>20050915</version-->
-        <version>20051127</version>
-      </dependency>
-      <dependency>
         <groupId>org.apache.servicemix.dependencies</groupId>
         <artifactId>wsif</artifactId>
         <version>2.0.1_IB3</version>
@@ -390,15 +353,37 @@
       <dependency>
           <groupId>com.sun.xml</groupId>
           <artifactId>jaxb-impl</artifactId>
-          <version>2.0-JAXWS-2.0-EA3</version>
+          <version>2.0EA3</version>
       </dependency>
-      
       <dependency>
-        <groupId>org.apache.servicemix.dependencies</groupId>
-        <artifactId>activeio</artifactId>
-        <version>2.1</version>
+        <groupId>com.sun.xml</groupId>
+        <artifactId>jaxws-rt</artifactId>
+        <version>2.0EA3</version>
+        <exclusions>
+          <exclusion>
+            <groupId>javax.jws</groupId>
+            <artifactId>jsr181-api</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
       <dependency>
+        <groupId>com.sun.xml</groupId>
+        <artifactId>jaxws-tools</artifactId>
+        <version>2.0EA3</version>
+        <exclusions>
+          <exclusion>
+            <groupId>javax.jws</groupId>
+            <artifactId>jsr181-api</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
+      <dependency>
+        <groupId>xfire</groupId>
+        <artifactId>xfire-jsr181-api</artifactId>
+        <version>1.0-M1</version>
+      </dependency>
+      
+      <dependency>
         <groupId>incubator-activemq</groupId>
         <artifactId>activemq-core</artifactId>
         <version>4.0-SNAPSHOT</version>
@@ -1034,7 +1019,7 @@
         <version>1.1</version>
       </dependency>
       <dependency>
-        <groupId>jstl</groupId>
+        <groupId>javax.servlet</groupId>
         <artifactId>jstl</artifactId>
         <version>1.1.1</version>
       </dependency>
@@ -1122,7 +1107,7 @@
       <dependency>
         <groupId>mx4j</groupId>
         <artifactId>mx4j-tools</artifactId>
-        <version>2.1.1</version>
+        <version>3.0.1</version>
       </dependency>
       <dependency>
         <groupId>openejb</groupId>
@@ -1285,9 +1270,9 @@
         <version>1.0</version>
       </dependency>
       <dependency>
-        <groupId>net.java.dev.stax-utils</groupId>
+        <groupId>stax-utils</groupId>
         <artifactId>stax-utils</artifactId>
-        <version>20060105</version>
+        <version>snapshot-20060502</version>
       </dependency>
       <dependency>
         <groupId>taglibs</groupId>
@@ -1334,17 +1319,17 @@
       <dependency>
         <groupId>org.apache.xbean</groupId>
         <artifactId>xbean-kernel</artifactId>
-        <version>2.2</version>
+        <version>2.3</version>
       </dependency>
       <dependency>
         <groupId>org.apache.xbean</groupId>
         <artifactId>xbean-server</artifactId>
-        <version>2.2</version>
+        <version>2.3</version>
       </dependency>
       <dependency>
         <groupId>org.apache.xbean</groupId>
         <artifactId>xbean-spring</artifactId>
-        <version>2.2</version>
+        <version>2.3</version>
         <exclusions>
           <exclusion>
             <groupId>qdox</groupId>
@@ -1366,11 +1351,27 @@
         <groupId>org.codehaus.xfire</groupId>
         <artifactId>xfire-all</artifactId>
         <version>1.0</version>
+        <exclusions>
+          <exclusion>
+            <groupId>javax.mail</groupId>
+            <artifactId>mail</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>jetty</groupId>
+            <artifactId>org.mortbay.jetty</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
       <dependency>
         <groupId>org.codehaus.xfire</groupId>
         <artifactId>xfire-jaxb</artifactId>
         <version>1.0</version>
+        <exclusions>
+          <exclusion>
+            <groupId>javax.mail</groupId>
+            <artifactId>mail</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
       <dependency>
         <groupId>org.codehaus.xfire</groupId>
@@ -1395,17 +1396,17 @@
       <dependency>
         <groupId>xmlbeans</groupId>
         <artifactId>xbean</artifactId>
-        <version>2.0.0</version>
+        <version>2.1.0</version>
       </dependency>
       <dependency>
         <groupId>xmlbeans</groupId>
         <artifactId>xbean_xpath</artifactId>
-        <version>2.0.0</version>
+        <version>2.1.0</version>
       </dependency>
       <dependency>
         <groupId>xmlbeans</groupId>
         <artifactId>xmlpublic</artifactId>
-        <version>2.0.0</version>
+        <version>2.1.0</version>
       </dependency>
       <dependency>
         <groupId>xmlpull</groupId>
@@ -1433,11 +1434,6 @@
             <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>
@@ -1529,7 +1525,12 @@
           <configuration>
             <warSourceDirectory>src/webapp/</warSourceDirectory>
           </configuration>
-        </plugin>                
+        </plugin>
+        <plugin>
+          <groupId>org.apache.xbean</groupId>
+          <artifactId>maven-xbean-plugin</artifactId>
+          <version>2.3</version>
+        </plugin>
       </plugins>
     </pluginManagement>
   </build>

Modified: incubator/servicemix/trunk/servicemix-assembly/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-assembly/pom.xml?rev=399296&r1=399295&r2=399296&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-assembly/pom.xml (original)
+++ incubator/servicemix/trunk/servicemix-assembly/pom.xml Wed May  3 06:35:23 2006
@@ -90,6 +90,10 @@
       <artifactId>geronimo-ejb_2.1_spec</artifactId>
     </dependency>
     <dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-servlet_2.4_spec</artifactId>
+    </dependency>
+    <dependency>
       <groupId>classworlds</groupId>
       <artifactId>classworlds</artifactId>
     </dependency>

Modified: incubator/servicemix/trunk/servicemix-assembly/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-assembly/src/main/assembly/bin.xml?rev=399296&r1=399295&r2=399296&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-assembly/src/main/assembly/bin.xml (original)
+++ incubator/servicemix/trunk/servicemix-assembly/src/main/assembly/bin.xml Wed May  3 06:35:23
2006
@@ -44,7 +44,6 @@
   <dependencySets>
     <dependencySet>
       <outputDirectory>lib</outputDirectory>
-      <scope>runtime</scope>
       <includes>
         <include>classworlds:classworlds</include>
 
@@ -68,10 +67,9 @@
         <include>org.apache.geronimo.specs:geronimo-j2ee-jacc_1.0_spec</include>
         <include>org.apache.geronimo.specs:geronimo-j2ee-connector_1.5_spec</include>
         <include>org.apache.geronimo.specs:geronimo-ejb_2.1_spec</include>
-        <include>org.apache.geronimo.specs:activation_1.0.2_spec</include>
-        <include>org.apache.geronimo.specs:javamail_1.3.1_spec</include>
-        <include>org.apache.geronimo.specs:servlet_2.4_spec</include>
-        <include>org.apache.geronimo.specs:_spec</include>
+        <include>org.apache.geronimo.specs:geronimo-servlet_2.4_spec</include>
+        <include>org.apache.geronimo.specs:geronimo-activation_1.0.2_spec</include>
+        <include>org.apache.geronimo.specs:geronimo-javamail_1.3.1_spec</include>
         
         <include>org.apache.servicemix.dependencies:jencks</include>
         
@@ -95,12 +93,10 @@
     </dependencySet>
     <dependencySet>
       <outputDirectory>lib/optional</outputDirectory>
-      <scope>runtime</scope>
       <includes>
         <include>mx4j:mx4j-tools</include>
         <include>log4j:log4j</include>
         <include>org.apache.derby:derby</include>
-        <include>hsqldb:hsqldb</include>
         <include>quartz:quartz</include>
         <include>org.apache.servicemix:servicemix-components</include>
         <include>commons-pool:commons-pool</include>
@@ -111,7 +107,7 @@
         <include>org.mortbay.jetty:jetty</include>
         <include>axis:axis-jaxrpc</include>
         <include>drools:drools-all-jdk1.4</include>
-        
+        <include>stax-utils:stax-utils</include>
       </includes>
     </dependencySet>
   </dependencySets>

Modified: incubator/servicemix/trunk/servicemix-bpe/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-bpe/pom.xml?rev=399296&r1=399295&r2=399296&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-bpe/pom.xml (original)
+++ incubator/servicemix/trunk/servicemix-bpe/pom.xml Wed May  3 06:35:23 2006
@@ -82,59 +82,41 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
+        <groupId>org.apache.servicemix.plugins</groupId>
+        <artifactId>maven2-jbi-plugin</artifactId>
         <configuration>
-          <includes>
-            <include>**/*Test*</include>
-          </includes>
-          <excludes>
-            <!--  exclude abstract tests -->
-            <exclude>**/Abstract*.*</exclude>
-            
-            <exclude>**/FileSystemJarInputStreamTest.*</exclude>
-          </excludes>
+          <type>service-engine</type>
+          <bootstrap>org.apache.servicemix.bpe.BPEBootstrap</bootstrap>
+          <component>org.apache.servicemix.bpe.BPEComponent</component>
         </configuration>
       </plugin>
       <plugin>
-        <artifactId>maven-antrun-plugin</artifactId>
+        <groupId>org.apache.xbean</groupId>
+        <artifactId>maven-xbean-plugin</artifactId>
         <executions>
           <execution>
-            <phase>generate-resources</phase>
             <configuration>
-              <tasks>
-                <taskdef classname="org.apache.xbean.spring.generator.MappingGeneratorTask"
-                  name="mapping">
-                  <classpath>
-                    <pathelement path="${basedir}/target/classes" />
-                    <path refid="maven.test.classpath" />
-                  </classpath>
-                </taskdef>
-                <mapping destFile="${basedir}/target/${pom.artifactId}-${version}.xsd"
-                  namespace="http://servicemix.apache.org/bpe/1.0" srcdir="${basedir}/src/main/java"
-                  metaInfDir="${basedir}/target/generated/" />
-              </tasks>
+              <namespace>http://servicemix.apache.org/bpe/1.0</namespace>
             </configuration>
             <goals>
-              <goal>run</goal>
+              <goal>mapping</goal>
             </goals>
           </execution>
         </executions>
-        <dependencies>
-          <dependency>
-            <groupId>qdox</groupId>
-            <artifactId>qdox</artifactId>
-            <version>${qdox.version}</version>
-          </dependency>
-        </dependencies>
       </plugin>
       <plugin>
-        <groupId>org.apache.servicemix.plugins</groupId>
-        <artifactId>maven2-jbi-plugin</artifactId>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
-          <type>service-engine</type>
-          <bootstrap>org.apache.servicemix.bpe.BPEBootstrap</bootstrap>
-          <component>org.apache.servicemix.bpe.BPEComponent</component>
+          <includes>
+            <include>**/*Test*</include>
+          </includes>
+          <excludes>
+            <!--  exclude abstract tests -->
+            <exclude>**/Abstract*.*</exclude>
+            
+            <exclude>**/FileSystemJarInputStreamTest.*</exclude>
+          </excludes>
         </configuration>
       </plugin>
     </plugins>

Modified: incubator/servicemix/trunk/servicemix-console/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-console/pom.xml?rev=399296&r1=399295&r2=399296&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-console/pom.xml (original)
+++ incubator/servicemix/trunk/servicemix-console/pom.xml Wed May  3 06:35:23 2006
@@ -81,7 +81,7 @@
       <artifactId>commons-el</artifactId>
     </dependency>
     <dependency>
-      <groupId>jstl</groupId>
+      <groupId>javax.servlet</groupId>
       <artifactId>jstl</artifactId>
     </dependency>
     <dependency>

Modified: incubator/servicemix/trunk/servicemix-core/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-core/pom.xml?rev=399296&r1=399295&r2=399296&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/pom.xml (original)
+++ incubator/servicemix/trunk/servicemix-core/pom.xml Wed May  3 06:35:23 2006
@@ -183,7 +183,7 @@
       <artifactId>wstx-asl</artifactId>
     </dependency>
     <dependency>
-      <groupId>net.java.dev.stax-utils</groupId>
+      <groupId>stax-utils</groupId>
       <artifactId>stax-utils</artifactId>
     </dependency>
     <dependency>
@@ -280,55 +280,20 @@
       </testResource>
     </testResources>
     <plugins>
-      <!--
-            <plugin>
-                <groupId>org.apache.xbean</groupId>
-                <artifactId>xbean-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>process-classes</phase>
-                <configuration>
-                   <namespace>http://servicemix.apache.org/config/1.0</namespace>
-                   <destFile>target/servicemix.xsd</destFile>
-                </configuration>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            -->
       <plugin>
-        <artifactId>maven-antrun-plugin</artifactId>
+        <groupId>org.apache.xbean</groupId>
+        <artifactId>maven-xbean-plugin</artifactId>
         <executions>
           <execution>
-            <phase>generate-resources</phase>
             <configuration>
-              <tasks>
-                <taskdef classname="org.apache.xbean.spring.generator.MappingGeneratorTask"
-                  name="mapping">
-                  <classpath>
-                    <pathelement path="${basedir}/target/classes" />
-                    <path refid="maven.test.classpath" />
-                  </classpath>
-                </taskdef>
-                <mapping destFile="${basedir}/target/servicemix.xsd"
-                  namespace="http://servicemix.apache.org/config/1.0"
-                  srcdir="${basedir}/src/main/java" metaInfDir="${basedir}/target/generated/"
/>
-              </tasks>
+              <namespace>http://servicemix.apache.org/config/1.0</namespace>
+              <schema>target/servicemix.xsd</schema>
             </configuration>
             <goals>
-              <goal>run</goal>
+              <goal>mapping</goal>
             </goals>
           </execution>
         </executions>
-        <dependencies>
-          <dependency>
-            <groupId>qdox</groupId>
-            <artifactId>qdox</artifactId>
-            <version>${qdox.version}</version>
-          </dependency>
-        </dependencies>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>

Modified: incubator/servicemix/trunk/servicemix-eip/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-eip/pom.xml?rev=399296&r1=399295&r2=399296&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-eip/pom.xml (original)
+++ incubator/servicemix/trunk/servicemix-eip/pom.xml Wed May  3 06:35:23 2006
@@ -49,45 +49,27 @@
   <build>
     <plugins>
       <plugin>
-        <artifactId>maven-antrun-plugin</artifactId>
+        <groupId>org.apache.servicemix.plugins</groupId>
+        <artifactId>maven2-jbi-plugin</artifactId>
+        <configuration>
+          <type>service-engine</type>
+          <bootstrap>org.apache.servicemix.eip.EIPBootstrap</bootstrap>
+          <component>org.apache.servicemix.eip.EIPComponent</component>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.xbean</groupId>
+        <artifactId>maven-xbean-plugin</artifactId>
         <executions>
           <execution>
-            <phase>generate-resources</phase>
             <configuration>
-              <tasks>
-                <taskdef classname="org.apache.xbean.spring.generator.MappingGeneratorTask"
-                  name="mapping">
-                  <classpath>
-                    <pathelement path="${basedir}/target/classes" />
-                    <path refid="maven.test.classpath" />
-                  </classpath>
-                </taskdef>
-                <mapping destFile="${basedir}/target/${pom.artifactId}-${version}.xsd"
-                  namespace="http://servicemix.apache.org/eip/1.0" srcdir="${basedir}/src/main/java"
-                  metaInfDir="${basedir}/target/generated/" />
-              </tasks>
+              <namespace>http://servicemix.apache.org/eip/1.0</namespace>
             </configuration>
             <goals>
-              <goal>run</goal>
+              <goal>mapping</goal>
             </goals>
           </execution>
         </executions>
-        <dependencies>
-          <dependency>
-            <groupId>qdox</groupId>
-            <artifactId>qdox</artifactId>
-            <version>${qdox.version}</version>
-          </dependency>
-        </dependencies>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.servicemix.plugins</groupId>
-        <artifactId>maven2-jbi-plugin</artifactId>
-        <configuration>
-          <type>service-engine</type>
-          <bootstrap>org.apache.servicemix.eip.EIPBootstrap</bootstrap>
-          <component>org.apache.servicemix.eip.EIPComponent</component>
-        </configuration>
       </plugin>
     </plugins>
   </build>

Modified: incubator/servicemix/trunk/servicemix-http/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-http/pom.xml?rev=399296&r1=399295&r2=399296&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-http/pom.xml (original)
+++ incubator/servicemix/trunk/servicemix-http/pom.xml Wed May  3 06:35:23 2006
@@ -67,71 +67,27 @@
   <build>
     <plugins>
       <plugin>
-        <artifactId>maven-antrun-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>generate-resources</phase>
-            <configuration>
-              <tasks>
-                <taskdef classname="org.apache.xbean.spring.generator.MappingGeneratorTask"
-                  name="mapping">
-                  <classpath>
-                    <pathelement path="${basedir}/target/classes" />
-                    <path refid="maven.test.classpath" />
-                  </classpath>
-                </taskdef>
-                <mapping destFile="${basedir}/target/${pom.artifactId}-${version}.xsd"
-                  namespace="http://servicemix.apache.org/http/1.0"
-                  srcdir="${basedir}/src/main/java" metaInfDir="${basedir}/target/generated/"
/>
-              </tasks>
-            </configuration>
-            <goals>
-              <goal>run</goal>
-            </goals>
-          </execution>
-        </executions>
-        <dependencies>
-          <dependency>
-            <groupId>qdox</groupId>
-            <artifactId>qdox</artifactId>
-            <version>${qdox.version}</version>
-          </dependency>
-        </dependencies>
+        <groupId>org.apache.servicemix.plugins</groupId>
+        <artifactId>maven2-jbi-plugin</artifactId>
+        <configuration>
+          <type>service-engine</type>
+          <bootstrap>org.apache.servicemix.http.HttpBootstrap</bootstrap>
+          <component>org.apache.servicemix.http.HttpComponent</component>
+        </configuration>
       </plugin>
-      <!--
       <plugin>
         <groupId>org.apache.xbean</groupId>
         <artifactId>maven-xbean-plugin</artifactId>
-        <version>2.3-SNAPSHOT</version>
         <executions>
           <execution>
-            <id>first-phase</id>
-            <phase>generate-resources</phase>
-            <goals>
-              <goal>mapping</goal>
-            </goals>
-          </execution>
-          <execution>
-            <id>second-phase</id>
-            <phase>process-classes</phase>
+            <configuration>
+              <namespace>http://servicemix.apache.org/http/1.0</namespace>
+            </configuration>
             <goals>
               <goal>mapping</goal>
             </goals>
           </execution>
         </executions>
-        <configuration>
-          <namespace>http://servicemix.apache.org/http/1.0</namespace>
-        </configuration>
-      </plugin>
-      -->
-      <plugin>
-        <groupId>org.apache.servicemix.plugins</groupId>
-        <artifactId>maven2-jbi-plugin</artifactId>
-        <configuration>
-          <type>service-engine</type>
-          <bootstrap>org.apache.servicemix.http.HttpBootstrap</bootstrap>
-          <component>org.apache.servicemix.http.HttpComponent</component>
-        </configuration>
       </plugin>
     </plugins>
   </build>

Modified: incubator/servicemix/trunk/servicemix-jms/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-jms/pom.xml?rev=399296&r1=399295&r2=399296&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-jms/pom.xml (original)
+++ incubator/servicemix/trunk/servicemix-jms/pom.xml Wed May  3 06:35:23 2006
@@ -59,45 +59,27 @@
   <build>
     <plugins>
       <plugin>
-        <artifactId>maven-antrun-plugin</artifactId>
+        <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>
+      <plugin>
+        <groupId>org.apache.xbean</groupId>
+        <artifactId>maven-xbean-plugin</artifactId>
         <executions>
           <execution>
-            <phase>generate-resources</phase>
             <configuration>
-              <tasks>
-                <taskdef classname="org.apache.xbean.spring.generator.MappingGeneratorTask"
-                  name="mapping">
-                  <classpath>
-                    <pathelement path="${basedir}/target/classes" />
-                    <path refid="maven.test.classpath" />
-                  </classpath>
-                </taskdef>
-                <mapping destFile="${basedir}/target/${pom.artifactId}-${version}.xsd"
-                  namespace="http://servicemix.apache.org/jms/1.0" srcdir="${basedir}/src/main/java"
-                  metaInfDir="${basedir}/target/generated/" />
-              </tasks>
+              <namespace>http://servicemix.apache.org/jms/1.0</namespace>
             </configuration>
             <goals>
-              <goal>run</goal>
+              <goal>mapping</goal>
             </goals>
           </execution>
         </executions>
-        <dependencies>
-          <dependency>
-            <groupId>qdox</groupId>
-            <artifactId>qdox</artifactId>
-            <version>${qdox.version}</version>
-          </dependency>
-        </dependencies>
-      </plugin>
-      <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>

Modified: incubator/servicemix/trunk/servicemix-wsn2005/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-wsn2005/pom.xml?rev=399296&r1=399295&r2=399296&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-wsn2005/pom.xml (original)
+++ incubator/servicemix/trunk/servicemix-wsn2005/pom.xml Wed May  3 06:35:23 2006
@@ -61,7 +61,16 @@
     <dependency>
       <groupId>com.sun.xml</groupId>
       <artifactId>jaxws-tools</artifactId>
-      <version>2.0-JAXWS-2.0-EA3</version>
+      <exclusions>
+        <exclusion>
+          <groupId>javax.jws</groupId>
+          <artifactId>jsr181-api</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>xfire</groupId>
+      <artifactId>xfire-jsr181-api</artifactId>
     </dependency>
   </dependencies>
 
@@ -76,47 +85,44 @@
         </configuration>
       </plugin>
       <plugin>
-        <artifactId>maven-antrun-plugin</artifactId>
+        <groupId>org.apache.servicemix.plugins</groupId>
+        <artifactId>maven2-jbi-plugin</artifactId>
+        <configuration>
+          <type>service-engine</type>
+          <bootstrap>org.apache.servicemix.wsn.component.WSNBootstrap</bootstrap>
+          <component>org.apache.servicemix.wsn.component.WSNComponent</component>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.xbean</groupId>
+        <artifactId>maven-xbean-plugin</artifactId>
         <executions>
           <execution>
-            <phase>generate-sources</phase>
             <configuration>
-              <tasks>
-                <taskdef name="wsimport" classname="com.sun.tools.ws.ant.WsImport">
-                  <classpath refid="maven.test.classpath" />
-                </taskdef>
-                <mkdir dir="${basedir}/target/generated" />
-                <mkdir dir="${basedir}/target/generated-classes" />
-                <wsimport fork="true" debug="false" verbose="false" keep="true"
-                  destdir="${basedir}/target/generated-classes"
-                  sourcedestdir="${basedir}/target/generated"
-                  wsdl="${basedir}/src/main/resources/org/apache/servicemix/wsn/wsn.wsdl">
</wsimport>
-
-                <taskdef classname="org.apache.xbean.spring.generator.MappingGeneratorTask"
-                  name="mapping">
-                  <classpath>
-                    <pathelement path="${basedir}/target/classes" />
-                    <path refid="maven.test.classpath" />
-                  </classpath>
-                </taskdef>
-                <mapping destFile="${basedir}/target/${pom.artifactId}-${version}.xsd"
-                  namespace="http://servicemix.apache.org/wsn/1.0"
-                  srcdir="${basedir}/src/main/java/org/apache/servicemix/wsn/spring" metaInfDir="${basedir}/target/generated/"
/>
-              </tasks>
-              <sourceRoot>${basedir}/target/generated</sourceRoot>
+              <namespace>http://servicemix.apache.org/wsn/1.0</namespace>
+              <srcDir>${basedir}/src/main/java/org/apache/servicemix/wsn/spring</srcDir>
             </configuration>
             <goals>
-              <goal>run</goal>
+              <goal>mapping</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>jaxws-maven-plugin</artifactId>
+        <version>1.0-SNAPSHOT</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>wsimport</goal>
             </goals>
           </execution>
         </executions>
-        <dependencies>
-          <dependency>
-            <groupId>qdox</groupId>
-            <artifactId>qdox</artifactId>
-            <version>${qdox.version}</version>
-          </dependency>
-        </dependencies>
+        <configuration>
+          <wsdlDirectory>${basedir}/src/main/resources/org/apache/servicemix/wsn</wsdlDirectory>
+          <wsdlFiles>wsn.wsdl</wsdlFiles>
+        </configuration>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -132,15 +138,6 @@
             <!-- while does this one fail in multiproject builds ? -->
             <exclude>**/WSNComponentTest.*</exclude>
           </excludes>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.servicemix.plugins</groupId>
-        <artifactId>maven2-jbi-plugin</artifactId>
-        <configuration>
-          <type>service-engine</type>
-          <bootstrap>org.apache.servicemix.wsn.component.WSNBootstrap</bootstrap>
-          <component>org.apache.servicemix.wsn.component.WSNComponent</component>
         </configuration>
       </plugin>
     </plugins>



Mime
View raw message