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/07/11 11:40:26 UTC
svn commit: r675890 - in /servicemix/components/shared-libraries/trunk:
servicemix-common/
servicemix-common/src/main/java/org/apache/servicemix/common/util/
servicemix-common/src/main/java/org/apache/servicemix/common/wsdl1/
servicemix-soap/ servicemi...
Author: gnodet
Date: Fri Jul 11 02:40:24 2008
New Revision: 675890
URL: http://svn.apache.org/viewvc?rev=675890&view=rev
Log:
Remove some dependencies on servicemix-core
Added:
servicemix/components/shared-libraries/trunk/servicemix-common/src/main/java/org/apache/servicemix/common/util/WSAddressingConstants.java
Modified:
servicemix/components/shared-libraries/trunk/servicemix-common/pom.xml
servicemix/components/shared-libraries/trunk/servicemix-common/src/main/java/org/apache/servicemix/common/util/URIResolver.java
servicemix/components/shared-libraries/trunk/servicemix-common/src/main/java/org/apache/servicemix/common/wsdl1/AbstractWsdl1Deployer.java
servicemix/components/shared-libraries/trunk/servicemix-soap/pom.xml
servicemix/components/shared-libraries/trunk/servicemix-soap/src/main/java/org/apache/servicemix/soap/SoapHelper.java
servicemix/components/shared-libraries/trunk/servicemix-soap/src/main/java/org/apache/servicemix/soap/handlers/addressing/AddressingHandler.java
servicemix/components/shared-libraries/trunk/servicemix-soap/src/main/java/org/apache/servicemix/soap/marshalers/JBIMarshaler.java
servicemix/components/shared-libraries/trunk/servicemix-soap/src/main/java/org/apache/servicemix/soap/marshalers/SoapReader.java
servicemix/components/shared-libraries/trunk/servicemix-soap/src/main/java/org/apache/servicemix/soap/marshalers/SoapWriter.java
servicemix/components/shared-libraries/trunk/servicemix-soap2/pom.xml
servicemix/components/shared-libraries/trunk/servicemix-soap2/src/main/java/org/apache/servicemix/soap/interceptors/jbi/JbiOutInterceptor.java
servicemix/components/shared-libraries/trunk/servicemix-soap2/src/main/java/org/apache/servicemix/soap/interceptors/mime/AttachmentsOutInterceptor.java
Modified: servicemix/components/shared-libraries/trunk/servicemix-common/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/components/shared-libraries/trunk/servicemix-common/pom.xml?rev=675890&r1=675889&r2=675890&view=diff
==============================================================================
--- servicemix/components/shared-libraries/trunk/servicemix-common/pom.xml (original)
+++ servicemix/components/shared-libraries/trunk/servicemix-common/pom.xml Fri Jul 11 02:40:24 2008
@@ -34,11 +34,6 @@
<properties>
<servicemix.osgi.import>
- com.ibm.wsdl*;resolution:=optional,
- javax.resource.spi.work;resolution:=optional,
- org.apache.servicemix;resolution:=optional,
- org.apache.servicemix.jbi*;resolution:=optional,
- org.apache.servicemix.components*;resolution:=optional,
*
</servicemix.osgi.import>
<servicemix.osgi.export.pkg>
Modified: servicemix/components/shared-libraries/trunk/servicemix-common/src/main/java/org/apache/servicemix/common/util/URIResolver.java
URL: http://svn.apache.org/viewvc/servicemix/components/shared-libraries/trunk/servicemix-common/src/main/java/org/apache/servicemix/common/util/URIResolver.java?rev=675890&r1=675889&r2=675890&view=diff
==============================================================================
--- servicemix/components/shared-libraries/trunk/servicemix-common/src/main/java/org/apache/servicemix/common/util/URIResolver.java (original)
+++ servicemix/components/shared-libraries/trunk/servicemix-common/src/main/java/org/apache/servicemix/common/util/URIResolver.java Fri Jul 11 02:40:24 2008
@@ -29,10 +29,6 @@
public class URIResolver {
- private static final String WSA_NAMESPACE = "http://www.w3.org/2005/08/addressing";
- private static final String WSA_PREFIX = "wsa";
- private static final String WSA_EL_ADDRESS = "Address";
-
/**
* The uri to resolve
*/
@@ -105,7 +101,8 @@
}
DocumentFragment epr = doc.createDocumentFragment();
Element root = doc.createElement("epr");
- Element address = doc.createElementNS(WSA_NAMESPACE, WSA_PREFIX + ":" + WSA_EL_ADDRESS);
+ Element address = doc.createElementNS(WSAddressingConstants.WSA_NAMESPACE_200508,
+ WSAddressingConstants.WSA_PREFIX + ":" + WSAddressingConstants.EL_ADDRESS);
Text txt = doc.createTextNode(uri);
address.appendChild(txt);
root.appendChild(address);
Added: servicemix/components/shared-libraries/trunk/servicemix-common/src/main/java/org/apache/servicemix/common/util/WSAddressingConstants.java
URL: http://svn.apache.org/viewvc/servicemix/components/shared-libraries/trunk/servicemix-common/src/main/java/org/apache/servicemix/common/util/WSAddressingConstants.java?rev=675890&view=auto
==============================================================================
--- servicemix/components/shared-libraries/trunk/servicemix-common/src/main/java/org/apache/servicemix/common/util/WSAddressingConstants.java (added)
+++ servicemix/components/shared-libraries/trunk/servicemix-common/src/main/java/org/apache/servicemix/common/util/WSAddressingConstants.java Fri Jul 11 02:40:24 2008
@@ -0,0 +1,23 @@
+// IntelliJ API Decompiler stub source generated from a class file
+// Implementation of methods is not available
+package org.apache.servicemix.common.util;
+
+public interface WSAddressingConstants {
+
+ String WSA_NAMESPACE_200303 = "http://schemas.xmlsoap.org/ws/2003/03/addressing";
+ String WSA_NAMESPACE_200403 = "http://schemas.xmlsoap.org/ws/2004/03/addressing";
+ String WSA_NAMESPACE_200408 = "http://schemas.xmlsoap.org/ws/2004/08/addressing";
+ String WSA_NAMESPACE_200508 = "http://www.w3.org/2005/08/addressing";
+ String WSA_PREFIX = "wsa";
+ String EL_ACTION = "Action";
+ String EL_ADDRESS = "Address";
+ String EL_FAULT_TO = "FaultTo";
+ String EL_FROM = "From";
+ String EL_MESSAGE_ID = "MessageID";
+ String EL_METADATA = "Metadata";
+ String EL_REFERENCE_PARAMETERS = "ReferenceParameters";
+ String EL_RELATES_TO = "RelatesTo";
+ String EL_REPLY_TO = "ReplyTo";
+ String EL_TO = "To";
+
+}
\ No newline at end of file
Modified: servicemix/components/shared-libraries/trunk/servicemix-common/src/main/java/org/apache/servicemix/common/wsdl1/AbstractWsdl1Deployer.java
URL: http://svn.apache.org/viewvc/servicemix/components/shared-libraries/trunk/servicemix-common/src/main/java/org/apache/servicemix/common/wsdl1/AbstractWsdl1Deployer.java?rev=675890&r1=675889&r2=675890&view=diff
==============================================================================
--- servicemix/components/shared-libraries/trunk/servicemix-common/src/main/java/org/apache/servicemix/common/wsdl1/AbstractWsdl1Deployer.java (original)
+++ servicemix/components/shared-libraries/trunk/servicemix-common/src/main/java/org/apache/servicemix/common/wsdl1/AbstractWsdl1Deployer.java Fri Jul 11 02:40:24 2008
@@ -22,8 +22,6 @@
import org.apache.servicemix.common.ServiceUnit;
import org.w3c.dom.Document;
-import com.ibm.wsdl.Constants;
-
import javax.jbi.management.DeploymentException;
import javax.wsdl.Binding;
import javax.wsdl.Definition;
@@ -151,7 +149,7 @@
ExtensionRegistry registry = factory.newPopulatedExtensionRegistry();
registerExtensions(registry);
WSDLReader reader = factory.newWSDLReader();
- reader.setFeature(Constants.FEATURE_VERBOSE, false);
+ reader.setFeature("javax.wsdl.verbose", false);
reader.setExtensionRegistry(registry);
return reader;
}
Modified: servicemix/components/shared-libraries/trunk/servicemix-soap/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/components/shared-libraries/trunk/servicemix-soap/pom.xml?rev=675890&r1=675889&r2=675890&view=diff
==============================================================================
--- servicemix/components/shared-libraries/trunk/servicemix-soap/pom.xml (original)
+++ servicemix/components/shared-libraries/trunk/servicemix-soap/pom.xml Fri Jul 11 02:40:24 2008
@@ -34,11 +34,7 @@
<properties>
<servicemix.osgi.import>
- com.ibm.wsdl*;resolution:=optional,
- javax.resource.spi.work;resolution:=optional,
- org.apache.servicemix;resolution:=optional,
- org.apache.servicemix.jbi*;resolution:=optional,
- org.apache.servicemix.components*;resolution:=optional,
+ org.apache.ws.security*;resolution:=optional,
*
</servicemix.osgi.import>
<servicemix.osgi.export.pkg>
Modified: servicemix/components/shared-libraries/trunk/servicemix-soap/src/main/java/org/apache/servicemix/soap/SoapHelper.java
URL: http://svn.apache.org/viewvc/servicemix/components/shared-libraries/trunk/servicemix-soap/src/main/java/org/apache/servicemix/soap/SoapHelper.java?rev=675890&r1=675889&r2=675890&view=diff
==============================================================================
--- servicemix/components/shared-libraries/trunk/servicemix-soap/src/main/java/org/apache/servicemix/soap/SoapHelper.java (original)
+++ servicemix/components/shared-libraries/trunk/servicemix-soap/src/main/java/org/apache/servicemix/soap/SoapHelper.java Fri Jul 11 02:40:24 2008
@@ -45,12 +45,12 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.servicemix.common.JbiConstants;
import org.apache.servicemix.jbi.jaxp.W3CDOMStreamWriter;
import org.apache.servicemix.soap.marshalers.JBIMarshaler;
import org.apache.servicemix.soap.marshalers.SoapMarshaler;
import org.apache.servicemix.soap.marshalers.SoapMessage;
import org.apache.servicemix.soap.marshalers.SoapWriter;
-import org.apache.servicemix.common.JbiConstants;
import org.w3c.dom.Document;
Modified: servicemix/components/shared-libraries/trunk/servicemix-soap/src/main/java/org/apache/servicemix/soap/handlers/addressing/AddressingHandler.java
URL: http://svn.apache.org/viewvc/servicemix/components/shared-libraries/trunk/servicemix-soap/src/main/java/org/apache/servicemix/soap/handlers/addressing/AddressingHandler.java?rev=675890&r1=675889&r2=675890&view=diff
==============================================================================
--- servicemix/components/shared-libraries/trunk/servicemix-soap/src/main/java/org/apache/servicemix/soap/handlers/addressing/AddressingHandler.java (original)
+++ servicemix/components/shared-libraries/trunk/servicemix-soap/src/main/java/org/apache/servicemix/soap/handlers/addressing/AddressingHandler.java Fri Jul 11 02:40:24 2008
@@ -22,10 +22,10 @@
import javax.xml.namespace.QName;
import org.apache.servicemix.id.IdGenerator;
+import org.apache.servicemix.common.util.DOMUtil;
+import org.apache.servicemix.common.util.URIResolver;
+import org.apache.servicemix.common.util.WSAddressingConstants;
import org.apache.servicemix.jbi.jaxp.SourceTransformer;
-import org.apache.servicemix.jbi.resolver.URIResolver;
-import org.apache.servicemix.jbi.util.DOMUtil;
-import org.apache.servicemix.jbi.util.WSAddressingConstants;
import org.apache.servicemix.soap.Context;
import org.apache.servicemix.soap.SoapFault;
import org.apache.servicemix.soap.handlers.AbstractHandler;
Modified: servicemix/components/shared-libraries/trunk/servicemix-soap/src/main/java/org/apache/servicemix/soap/marshalers/JBIMarshaler.java
URL: http://svn.apache.org/viewvc/servicemix/components/shared-libraries/trunk/servicemix-soap/src/main/java/org/apache/servicemix/soap/marshalers/JBIMarshaler.java?rev=675890&r1=675889&r2=675890&view=diff
==============================================================================
--- servicemix/components/shared-libraries/trunk/servicemix-soap/src/main/java/org/apache/servicemix/soap/marshalers/JBIMarshaler.java (original)
+++ servicemix/components/shared-libraries/trunk/servicemix-soap/src/main/java/org/apache/servicemix/soap/marshalers/JBIMarshaler.java Fri Jul 11 02:40:24 2008
@@ -26,7 +26,7 @@
import javax.jbi.messaging.NormalizedMessage;
import javax.xml.namespace.QName;
-import org.apache.servicemix.JbiConstants;
+import org.apache.servicemix.common.JbiConstants;
import org.apache.servicemix.soap.SoapFault;
import org.w3c.dom.DocumentFragment;
Modified: servicemix/components/shared-libraries/trunk/servicemix-soap/src/main/java/org/apache/servicemix/soap/marshalers/SoapReader.java
URL: http://svn.apache.org/viewvc/servicemix/components/shared-libraries/trunk/servicemix-soap/src/main/java/org/apache/servicemix/soap/marshalers/SoapReader.java?rev=675890&r1=675889&r2=675890&view=diff
==============================================================================
--- servicemix/components/shared-libraries/trunk/servicemix-soap/src/main/java/org/apache/servicemix/soap/marshalers/SoapReader.java (original)
+++ servicemix/components/shared-libraries/trunk/servicemix-soap/src/main/java/org/apache/servicemix/soap/marshalers/SoapReader.java Fri Jul 11 02:40:24 2008
@@ -36,12 +36,12 @@
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamSource;
+import org.apache.servicemix.common.util.DOMUtil;
import org.apache.servicemix.jbi.jaxp.ExtendedXMLStreamReader;
import org.apache.servicemix.jbi.jaxp.FragmentStreamReader;
import org.apache.servicemix.jbi.jaxp.SourceTransformer;
import org.apache.servicemix.jbi.jaxp.StaxSource;
import org.apache.servicemix.jbi.jaxp.StringSource;
-import org.apache.servicemix.jbi.util.DOMUtil;
import org.apache.servicemix.soap.SoapFault;
import org.w3c.dom.Document;
import org.w3c.dom.DocumentFragment;
Modified: servicemix/components/shared-libraries/trunk/servicemix-soap/src/main/java/org/apache/servicemix/soap/marshalers/SoapWriter.java
URL: http://svn.apache.org/viewvc/servicemix/components/shared-libraries/trunk/servicemix-soap/src/main/java/org/apache/servicemix/soap/marshalers/SoapWriter.java?rev=675890&r1=675889&r2=675890&view=diff
==============================================================================
--- servicemix/components/shared-libraries/trunk/servicemix-soap/src/main/java/org/apache/servicemix/soap/marshalers/SoapWriter.java (original)
+++ servicemix/components/shared-libraries/trunk/servicemix-soap/src/main/java/org/apache/servicemix/soap/marshalers/SoapWriter.java Fri Jul 11 02:40:24 2008
@@ -31,6 +31,7 @@
import javax.activation.DataHandler;
import javax.mail.Header;
import javax.mail.Session;
+import javax.mail.util.ByteArrayDataSource;
import javax.mail.internet.MimeBodyPart;
import javax.mail.internet.MimeMessage;
import javax.mail.internet.MimeMultipart;
@@ -49,7 +50,6 @@
import org.apache.servicemix.jbi.jaxp.SourceTransformer;
import org.apache.servicemix.jbi.jaxp.W3CDOMStreamReader;
import org.apache.servicemix.jbi.jaxp.XMLStreamHelper;
-import org.apache.servicemix.jbi.util.ByteArrayDataSource;
import org.apache.servicemix.soap.SoapFault;
import org.w3c.dom.DocumentFragment;
import org.w3c.dom.Element;
Modified: servicemix/components/shared-libraries/trunk/servicemix-soap2/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/components/shared-libraries/trunk/servicemix-soap2/pom.xml?rev=675890&r1=675889&r2=675890&view=diff
==============================================================================
--- servicemix/components/shared-libraries/trunk/servicemix-soap2/pom.xml (original)
+++ servicemix/components/shared-libraries/trunk/servicemix-soap2/pom.xml Fri Jul 11 02:40:24 2008
@@ -34,11 +34,6 @@
<properties>
<servicemix.osgi.import>
- com.ibm.wsdl*;resolution:=optional,
- javax.resource.spi.work;resolution:=optional,
- org.apache.servicemix;resolution:=optional,
- org.apache.servicemix.jbi*;resolution:=optional,
- org.apache.servicemix.components*;resolution:=optional,
org.apache.woden*;resolution:=optional,
*
</servicemix.osgi.import>
@@ -50,35 +45,29 @@
<dependencies>
<dependency>
<groupId>org.apache.servicemix</groupId>
- <artifactId>servicemix-common</artifactId>
+ <artifactId>servicemix-jbi</artifactId>
<version>${servicemix-version}</version>
</dependency>
<dependency>
- <groupId>org.apache.servicemix</groupId>
- <artifactId>servicemix-core</artifactId>
- <version>${servicemix-version}</version>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-javamail_1.4_spec</artifactId>
+ <version>1.1</version>
<scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>org.jencks</groupId>
- <artifactId>jencks</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-jmx</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-javamail_1.3.1_spec</artifactId>
- <version>1.2</version>
+ <artifactId>geronimo-activation_1.1_spec</artifactId>
+ <version>1.0.2</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-activation</artifactId>
- <version>2.0.1</version>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+ <version>1.1</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -121,6 +110,16 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>wstx-asl</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
Modified: servicemix/components/shared-libraries/trunk/servicemix-soap2/src/main/java/org/apache/servicemix/soap/interceptors/jbi/JbiOutInterceptor.java
URL: http://svn.apache.org/viewvc/servicemix/components/shared-libraries/trunk/servicemix-soap2/src/main/java/org/apache/servicemix/soap/interceptors/jbi/JbiOutInterceptor.java?rev=675890&r1=675889&r2=675890&view=diff
==============================================================================
--- servicemix/components/shared-libraries/trunk/servicemix-soap2/src/main/java/org/apache/servicemix/soap/interceptors/jbi/JbiOutInterceptor.java (original)
+++ servicemix/components/shared-libraries/trunk/servicemix-soap2/src/main/java/org/apache/servicemix/soap/interceptors/jbi/JbiOutInterceptor.java Fri Jul 11 02:40:24 2008
@@ -26,7 +26,6 @@
import javax.xml.namespace.QName;
import javax.xml.transform.Source;
-import org.apache.servicemix.jbi.FaultException;
import org.apache.servicemix.soap.api.Fault;
import org.apache.servicemix.soap.api.Message;
import org.apache.servicemix.soap.api.model.Binding;
Modified: servicemix/components/shared-libraries/trunk/servicemix-soap2/src/main/java/org/apache/servicemix/soap/interceptors/mime/AttachmentsOutInterceptor.java
URL: http://svn.apache.org/viewvc/servicemix/components/shared-libraries/trunk/servicemix-soap2/src/main/java/org/apache/servicemix/soap/interceptors/mime/AttachmentsOutInterceptor.java?rev=675890&r1=675889&r2=675890&view=diff
==============================================================================
--- servicemix/components/shared-libraries/trunk/servicemix-soap2/src/main/java/org/apache/servicemix/soap/interceptors/mime/AttachmentsOutInterceptor.java (original)
+++ servicemix/components/shared-libraries/trunk/servicemix-soap2/src/main/java/org/apache/servicemix/soap/interceptors/mime/AttachmentsOutInterceptor.java Fri Jul 11 02:40:24 2008
@@ -31,11 +31,11 @@
import javax.mail.Header;
import javax.mail.MessagingException;
import javax.mail.Session;
+import javax.mail.util.ByteArrayDataSource;
import javax.mail.internet.MimeBodyPart;
import javax.mail.internet.MimeMessage;
import javax.mail.internet.MimeMultipart;
-import org.apache.servicemix.jbi.util.ByteArrayDataSource;
import org.apache.servicemix.soap.api.Fault;
import org.apache.servicemix.soap.api.InterceptorChain;
import org.apache.servicemix.soap.api.Message;