You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by gn...@apache.org on 2008/06/10 17:35:22 UTC
svn commit: r666159 - in /servicemix/smx4/features/trunk:
camel/servicemix-camel/pom.xml
camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/MtomImpl.java
pom.xml
Author: gnodet
Date: Tue Jun 10 08:35:22 2008
New Revision: 666159
URL: http://svn.apache.org/viewvc?rev=666159&view=rev
Log:
Fix one camel failing test
Modified:
servicemix/smx4/features/trunk/camel/servicemix-camel/pom.xml
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/MtomImpl.java
servicemix/smx4/features/trunk/pom.xml
Modified: servicemix/smx4/features/trunk/camel/servicemix-camel/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/pom.xml?rev=666159&r1=666158&r2=666159&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/camel/servicemix-camel/pom.xml (original)
+++ servicemix/smx4/features/trunk/camel/servicemix-camel/pom.xml Tue Jun 10 08:35:22 2008
@@ -140,20 +140,6 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-bundle</artifactId>
<version>${cxf.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.codehaus.jra</groupId>
- <artifactId>jra</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- </exclusion>
- <exclusion>
- <groupId>jaxen</groupId>
- <artifactId>jaxen</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>bouncycastle</groupId>
Modified: servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/MtomImpl.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/MtomImpl.java?rev=666159&r1=666158&r2=666159&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/MtomImpl.java (original)
+++ servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/MtomImpl.java Tue Jun 10 08:35:22 2008
@@ -21,9 +21,15 @@
import javax.activation.DataHandler;
import javax.jws.WebService;
+import javax.jws.WebResult;
+import javax.jws.WebMethod;
+import javax.jws.WebParam;
+import javax.jws.soap.SOAPBinding;
import javax.mail.util.ByteArrayDataSource;
import javax.xml.ws.Holder;
+import org.apache.cxf.mime.types.XopStringType;
+
@WebService(serviceName = "TestMtomService",
portName = "TestMtomPort",
targetNamespace = "http://cxf.apache.org/mime",
@@ -47,7 +53,9 @@
}
}
-
+ public XopStringType testXopString(XopStringType data) {
+ return data;
+ }
}
Modified: servicemix/smx4/features/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/pom.xml?rev=666159&r1=666158&r2=666159&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/pom.xml (original)
+++ servicemix/smx4/features/trunk/pom.xml Tue Jun 10 08:35:22 2008
@@ -60,7 +60,7 @@
</prerequisites>
<properties>
- <activemq.version>5.2-SNAPSHOT</activemq.version>
+ <activemq.version>5.1.0</activemq.version>
<acegi.version>1.0.0</acegi.version>
<ant.version>1.7.0</ant.version>
<aopalliance.version>1.0</aopalliance.version>
@@ -327,6 +327,22 @@
<groupId>net.java.dev.stax-utils</groupId>
<artifactId>stax-utils</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.codehaus.jra</groupId>
+ <artifactId>jra</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jaxen</groupId>
+ <artifactId>jaxen</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>opensaml</groupId>
+ <artifactId>opensaml</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>