servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject svn commit: r669915 - in /servicemix/components/engines/servicemix-cxf-se/trunk: pom.xml src/main/java/org/apache/servicemix/cxfse/CxfSeProxyFactoryBean.java
Date Fri, 20 Jun 2008 14:29:37 GMT
Author: gnodet
Date: Fri Jun 20 07:29:37 2008
New Revision: 669915

URL: http://svn.apache.org/viewvc?rev=669915&view=rev
Log:
Fix cxf-se pom and get rid of activemq dependency

Modified:
    servicemix/components/engines/servicemix-cxf-se/trunk/pom.xml
    servicemix/components/engines/servicemix-cxf-se/trunk/src/main/java/org/apache/servicemix/cxfse/CxfSeProxyFactoryBean.java

Modified: servicemix/components/engines/servicemix-cxf-se/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-cxf-se/trunk/pom.xml?rev=669915&r1=669914&r2=669915&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-cxf-se/trunk/pom.xml (original)
+++ servicemix/components/engines/servicemix-cxf-se/trunk/pom.xml Fri Jun 20 07:29:37 2008
@@ -22,264 +22,202 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>org.apache.servicemix</groupId>
-		<artifactId>serviceengines</artifactId>
-		<version>3.3-SNAPSHOT</version>
+	    <groupId>org.apache.servicemix</groupId>
+	    <artifactId>components-pom</artifactId>
+	    <version>1.0-SNAPSHOT</version>
 	</parent>
 
 	<groupId>org.apache.servicemix</groupId>
 	<artifactId>servicemix-cxf-se</artifactId>
+    <version>4.0-SNAPSHOT</version>
 	<packaging>jbi-component</packaging>
+
   	<name>ServiceMix :: CXF Service Engine</name>
     <description>A CXF Service Engine</description>     
  
     <properties>
+	    <previous.releases>3.1.2,3.2,3.2.1</previous.releases>
         <surefire.fork.mode>pertest</surefire.fork.mode>
+        <cxf-version>2.1.2-SNAPSHOT</cxf-version>
         <jaxb.version>2.1</jaxb.version>
         <jaxb.impl.version>2.1.4</jaxb.impl.version>
         <jaxb.xjc.version>2.1.4</jaxb.xjc.version>
+	    <servicemix-version>3.2.1</servicemix-version>
+	    <servicemix-shared-version>4.0-SNAPSHOT</servicemix-shared-version>
+        <servicemix-specs-version>1.0.0</servicemix-specs-version>
+	    <servicemix.osgi.import>
+	        org.apache.commons.jexl*;resolution:=optional,
+	        org.apache.servicemix;resolution:=optional,
+	        org.apache.servicemix.client*;resolution:=optional,
+	        org.apache.servicemix.common.osgi,
+	        org.apache.servicemix.components*;resolution:=optional,
+	        org.apache.servicemix.expression*;resolution:=optional,
+	        org.apache.servicemix.jbi*;resolution:=optional,
+	        *
+	    </servicemix.osgi.import>
     </properties>
 
-	<dependencies>
-
-        <dependency>
-            <groupId>org.apache.servicemix</groupId>
-            <artifactId>servicemix-jbi</artifactId>
-        </dependency>
-		<dependency>
-		    <groupId>org.apache.servicemix</groupId>
-		    <artifactId>servicemix-shared</artifactId>
-            <exclusions>
-              <exclusion>
-                <groupId>org.apache.ws.commons</groupId>
-                <artifactId>XmlSchema</artifactId>
-              </exclusion>
-            </exclusions>
-        </dependency>
-                <dependency>
-                    <groupId>wsdl4j</groupId>
-                    <artifactId>wsdl4j</artifactId>
-                    <scope>provided</scope>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-activation_1.1_spec</artifactId>
-                    <version>1.0-M1</version>
-                    <scope>provided</scope>
-                </dependency>
-                <dependency>
-                    <groupId>stax</groupId>
-                    <artifactId>stax-api</artifactId>
-                    <scope>provided</scope>
-                </dependency>
-
-                <dependency>
-                    <groupId>javax.xml.ws</groupId>
-                    <artifactId>jaxws-api</artifactId>
-                    <version>2.1-1</version>
-                    <exclusions>
-                    <exclusion>
-                        <groupId>javax.annotation</groupId>
-                        <artifactId>jsr250-api</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>javax.xml.soap</groupId>
-                        <artifactId>saaj-api</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>javax.xml.stream</groupId>
-                        <artifactId>stax-api</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>javax.xml.bind</groupId>
-                        <artifactId>jaxb-api</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>javax.xml.bind</groupId>
-                        <artifactId>jsr173_api</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>javax.jws</groupId>
-                        <artifactId>jsr181-api</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>javax.jws</groupId>
-                        <artifactId>jsr181</artifactId>
-                    </exclusion>
-                    </exclusions>
-                </dependency>
-                <dependency>
-                <groupId>javax.xml.bind</groupId>
-                <artifactId>jaxb-api</artifactId>
-                <version>${jaxb.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>javax.xml.bind</groupId>
-                        <artifactId>jsr173_api</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>javax.xml</groupId>
-                        <artifactId>jsr173</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>javax.xml.stream</groupId>
-                        <artifactId>stax-api</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>javax.activation</groupId>
-                        <artifactId>activation</artifactId>
-                    </exclusion>
-                </exclusions>
-                </dependency>
-                <dependency>
-                <groupId>com.sun.xml.bind</groupId>
-                <artifactId>jaxb-impl</artifactId>
-                <version>${jaxb.impl.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>javax.xml.bind</groupId>
-                        <artifactId>jsr173_api</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>javax.xml</groupId>
-                        <artifactId>jsr173</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>javax.activation</groupId>
-                        <artifactId>activation</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>javax.xml.bind</groupId>
-                        <artifactId>activation</artifactId>
-                    </exclusion>
-                </exclusions>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.ws.commons.schema</groupId>
-                    <artifactId>XmlSchema</artifactId>
-                    <version>1.3.2</version>
-                </dependency>         
-                <dependency>
-                <groupId>com.sun.xml.bind</groupId>
-                <artifactId>jaxb-xjc</artifactId>
-                <version>${jaxb.xjc.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>javax.xml.bind</groupId>
-                        <artifactId>jsr173_api</artifactId>
-                    </exclusion>
-                </exclusions>
-                </dependency>
-		<dependency>
-		    <groupId>org.apache.cxf</groupId>
-		    <artifactId>cxf-rt-frontend-jaxws</artifactId>
-		    <version>${cxf-version}</version>
-		</dependency>
-		<dependency>
-		    <groupId>org.apache.servicemix</groupId>
-		    <artifactId>servicemix-core</artifactId>
-		    <scope>provided</scope>
-		</dependency>
-		<dependency>
-		    <groupId>commons-logging</groupId>
-		    <artifactId>commons-logging</artifactId>
-		    <scope>provided</scope>
-		</dependency>
-		<dependency>
-		    <groupId>org.springframework</groupId>
-		    <artifactId>spring-support</artifactId>
-		    <version>${spring-version}</version>
- 	            <scope>provided</scope>
-		</dependency>
-		<dependency>
-		    <groupId>org.springframework</groupId>
-		    <artifactId>spring-aop</artifactId>
-		    <version>${spring-version}</version>
-		    <scope>provided</scope>
-		</dependency>
-	        <dependency>
-        	    <groupId>org.springframework</groupId>
-                    <artifactId>spring-jmx</artifactId>
-                    <version>${spring-version}</version>
-                    <scope>provided</scope>
-                </dependency>
-		<dependency>
-		    <groupId>org.springframework</groupId>
-		    <artifactId>spring-context</artifactId>
-		    <version>${spring-version}</version>
-		    <scope>provided</scope>
-		</dependency>
-		<dependency>
-		    <groupId>org.springframework</groupId>
-		    <artifactId>spring-beans</artifactId>
-		    <version>${spring-version}</version>
-		    <scope>provided</scope>
-		</dependency>
-		<dependency>
-		    <groupId>org.springframework</groupId>
-		    <artifactId>spring-core</artifactId>
-		    <version>${spring-version}</version>
-		    <scope>provided</scope>
-		</dependency>
-		<dependency>
-		    <groupId>org.apache.cxf</groupId>
-		    <artifactId>cxf-rt-transports-jbi</artifactId>
-		    <version>${cxf-version}</version>
-	      <exclusions>
-		    <exclusion>
-		      <groupId>org.apache.servicemix</groupId>
-		      <artifactId>servicemix-jbi</artifactId>
-		    </exclusion>
-		  </exclusions>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.cxf</groupId>
-			<artifactId>cxf-rt-bindings-jbi</artifactId>
-			<version>${cxf-version}</version>
-	      <exclusions>
-		    <exclusion>
-		      <groupId>org.apache.servicemix</groupId>
-		      <artifactId>servicemix-jbi</artifactId>
-		    </exclusion>
-		  </exclusions>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.cxf</groupId>
-			<artifactId>cxf-testutils</artifactId>
-			<version>${cxf-version}</version>
-                        <scope>provided</scope>
-		</dependency>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.servicemix</groupId>
+      <artifactId>servicemix-shared</artifactId>
+      <version>${servicemix-shared-version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.servicemix.specs</groupId>
+      <artifactId>org.apache.servicemix.specs.jaxb-api-2.1</artifactId>
+      <version>${servicemix-specs-version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.servicemix.specs</groupId>
+      <artifactId>org.apache.servicemix.specs.stax-api-1.0</artifactId>
+      <version>${servicemix-specs-version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.sun.xml.bind</groupId>
+      <artifactId>jaxb-impl</artifactId>
+      <version>${jaxb.impl.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>javax.xml.bind</groupId>
+          <artifactId>jsr173_api</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>javax.xml</groupId>
+          <artifactId>jsr173</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>javax.activation</groupId>
+          <artifactId>activation</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>javax.xml.bind</groupId>
+          <artifactId>activation</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.ws.commons.schema</groupId>
+      <artifactId>XmlSchema</artifactId>
+      <version>1.3.2</version>
+    </dependency>         
+    <dependency>
+      <groupId>com.sun.xml.bind</groupId>
+      <artifactId>jaxb-xjc</artifactId>
+      <version>${jaxb.xjc.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>javax.xml.bind</groupId>
+          <artifactId>jsr173_api</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.servicemix</groupId>
+      <artifactId>servicemix-core</artifactId>
+      <version>${servicemix-version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-support</artifactId>
+      <version>${spring-version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-aop</artifactId>
+      <version>${spring-version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-jmx</artifactId>
+      <version>${spring-version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context</artifactId>
+      <version>${spring-version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-beans</artifactId>
+      <version>${spring-version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-core</artifactId>
+      <version>${spring-version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.cxf</groupId>
+      <artifactId>cxf-rt-frontend-jaxws</artifactId>
+      <version>${cxf-version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>asm</groupId>
+          <artifactId>asm</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.cxf</groupId>
+      <artifactId>cxf-rt-transports-jbi</artifactId>
+      <version>${cxf-version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.cxf</groupId>
+      <artifactId>cxf-rt-bindings-jbi</artifactId>
+      <version>${cxf-version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.cxf</groupId>
+      <artifactId>cxf-testutils</artifactId>
+      <version>${cxf-version}</version>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
 
-	</dependencies>
-	<build>
-		<plugins>
-                        <plugin>
-                                <groupId>org.apache.xbean</groupId>
-                                <artifactId>maven-xbean-plugin</artifactId>
-                                <!--version>${xbean-version}</version-->
-                                <executions>
-                                        <execution>
-                                                <configuration>
-                                                        <namespace>
-                                                                http://servicemix.apache.org/cxfse/1.0
-                                                        </namespace>
-                                                </configuration>
-                                                <goals>
-                                                        <goal>mapping</goal>
-                                                </goals>
-                                        </execution>
-                                </executions>
-                        </plugin>
-			<plugin>
-				<groupId>org.apache.servicemix.tooling</groupId>
-				<artifactId>jbi-maven-plugin</artifactId>
-				<version>${servicemix-version}</version>
-				<!--extensions>true</extensions-->
-				<configuration>
-					<type>service-engine</type>
-					<component>org.apache.servicemix.cxfse.CxfSeComponent</component>
-				</configuration>
-			</plugin>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.xbean</groupId>
+        <artifactId>maven-xbean-plugin</artifactId>
+        <!--version>${xbean-version}</version-->
+        <executions>
+          <execution>
+            <configuration>
+               <namespace>
+                 http://servicemix.apache.org/cxfse/1.0
+              </namespace>
+            </configuration>
+            <goals>
+              <goal>mapping</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.servicemix.tooling</groupId>
+        <artifactId>jbi-maven-plugin</artifactId>
+        <version>${servicemix-version}</version>
+        <configuration>
+          <type>service-engine</type>
+          <component>org.apache.servicemix.cxfse.CxfSeComponent</component>
+        </configuration>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
@@ -296,6 +234,6 @@
         </configuration>
       </plugin>
     </plugins>
-	</build>
+  </build>
 
 </project>

Modified: servicemix/components/engines/servicemix-cxf-se/trunk/src/main/java/org/apache/servicemix/cxfse/CxfSeProxyFactoryBean.java
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-cxf-se/trunk/src/main/java/org/apache/servicemix/cxfse/CxfSeProxyFactoryBean.java?rev=669915&r1=669914&r2=669915&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-cxf-se/trunk/src/main/java/org/apache/servicemix/cxfse/CxfSeProxyFactoryBean.java
(original)
+++ servicemix/components/engines/servicemix-cxf-se/trunk/src/main/java/org/apache/servicemix/cxfse/CxfSeProxyFactoryBean.java
Fri Jun 20 07:29:37 2008
@@ -21,7 +21,6 @@
 import javax.naming.InitialContext;
 import javax.xml.namespace.QName;
 
-import org.apache.activemq.util.IdGenerator;
 import org.apache.cxf.Bus;
 import org.apache.cxf.BusFactory;
 import org.apache.cxf.jaxws.JaxWsProxyFactoryBean;
@@ -29,6 +28,7 @@
 import org.apache.cxf.transport.jbi.JBITransportFactory;
 import org.apache.servicemix.client.ClientFactory;
 import org.apache.servicemix.client.ServiceMixClient;
+import org.apache.servicemix.id.IdGenerator;
 import org.apache.servicemix.jbi.container.JBIContainer;
 
 import org.springframework.beans.factory.DisposableBean;



Mime
View raw message