[riftsaw-commits] riftsaw SVN: r1138 - in trunk: console/integration/src/main/java/org/jboss/soa/bpel/console and 15 other directories.

Author: objectiser Date: 2010-11-23 08:58:05 -0500 (Tue, 23 Nov 2010) New Revision: 1138 Added: trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/JBossWSCXFBuildProcessor.java Modified: trunk/console/integration/src/main/java/org/jboss/soa/bpel/console/SVGPlugin.java trunk/distribution/src/main/release/db/jboss/jboss-beans.xml trunk/pom.xml trunk/runtime/clustering/src/main/resources/META-INF/jboss-beans.xml trunk/runtime/engine-assembly/src/main/assembly/sar.xml trunk/runtime/engine/pom.xml trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/BPELEngine.java trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/BPELEngineImpl.java trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/JAXWSBindingContext.java trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/UDDIRegistration.java trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/EndpointManager.java trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/ODEMessageAdapter.java trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/ODEServiceEndpointReference.java trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/ODEWebServiceFactory.java trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/WSDLHelper.java trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/WebServiceClient.java trunk/runtime/engine/src/test/java/riftsaw124/Riftsaw124TestCase.java trunk/runtime/engine/src/test/java/riftsaw277/Riftsaw277TestCase.java trunk/runtime/jbossesb-bpel-assembly/src/main/assembly/esb.xml trunk/runtime/jbossesb-bpel/pom.xml trunk/runtime/jbossesb-bpel/src/main/java/org/jboss/internal/soa/esb/actions/bpel/ESBInvocationAdapter.java trunk/runtime/jbossesb-bpel/src/test/java/org/jboss/soa/esb/actions/bpel/TestBPELEngine.java trunk/runtime/uddi/pom.xml trunk/runtime/uddi/src/main/java/org/jboss/soa/bpel/uddi/UDDIRegistrationImpl.java Log: Changed dwsp package/artifact to dsp, to be web service independent. Modified: trunk/console/integration/src/main/java/org/jboss/soa/bpel/console/SVGPlugin.java =================================================================== --- trunk/console/integration/src/main/java/org/jboss/soa/bpel/console/SVGPlugin.java 2010-11-23 13:54:42 UTC (rev 1137) +++ trunk/console/integration/src/main/java/org/jboss/soa/bpel/console/SVGPlugin.java 2010-11-23 13:58:05 UTC (rev 1138) @@ -29,8 +29,8 @@ import org.jboss.soa.bpel.bpel2svg.BPEL2SVGUtil; import org.jboss.soa.bpel.runtime.engine.BPELEngine; import org.jboss.soa.bpel.runtime.engine.ode.BPELEngineImpl; -import org.jboss.soa.dwsp.server.ServerConfig; -import org.jboss.soa.dwsp.server.jboss.ServerConfigFactory; +import org.jboss.soa.dsp.server.ServerConfig; +import org.jboss.soa.dsp.server.jboss.ServerConfigFactory; import org.wso2.carbon.bpel.ui.bpel2svg.ActivityInterface; import org.wso2.carbon.bpel.ui.bpel2svg.SVGInterface; Modified: trunk/distribution/src/main/release/db/jboss/jboss-beans.xml =================================================================== --- trunk/distribution/src/main/release/db/jboss/jboss-beans.xml 2010-11-23 13:54:42 UTC (rev 1137) +++ trunk/distribution/src/main/release/db/jboss/jboss-beans.xml 2010-11-23 13:58:05 UTC (rev 1138) @@ -24,7 +24,7 @@ Locate the single instance of the kernel --> <bean name="org.jboss.soa.bpel.runtime.util:service=KernelLocator" - class="org.jboss.soa.dwsp.server.jboss.KernelLocator"> + class="org.jboss.soa.dsp.server.jboss.KernelLocator"> <property name="kernel"> <inject bean="jboss.kernel:service=Kernel" /> </property> @@ -34,7 +34,7 @@ ServerConfig --> <bean name="org.jboss.soa.bpel.runtime.util:service=ServerConfig" - class="org.jboss.soa.dwsp.server.jboss.ServerConfigImpl"> + class="org.jboss.soa.dsp.server.jboss.ServerConfigImpl"> <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property> <property name="webServiceHost">${jboss.bind.address}</property> </bean> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-11-23 13:54:42 UTC (rev 1137) +++ trunk/pom.xml 2010-11-23 13:58:05 UTC (rev 1138) @@ -111,7 +111,7 @@ <axiom.version>1.2.8</axiom.version> <commons.codec.version>1.4</commons.codec.version> <picketlink.version>1.0.3.final</picketlink.version> - <dwsp.version>1.0.0-SNAPSHOT</dwsp.version> + <dsp.version>1.0.0-SNAPSHOT</dsp.version> </properties> <dependencyManagement> @@ -231,8 +231,8 @@ </dependency> <dependency> <groupId>org.jboss.soa</groupId> - <artifactId>dwsp</artifactId> - <version>${dwsp.version}</version> + <artifactId>dsp</artifactId> + <version>${dsp.version}</version> </dependency> <!-- ODE1.3.3 dependencies --> <dependency> Modified: trunk/runtime/clustering/src/main/resources/META-INF/jboss-beans.xml =================================================================== --- trunk/runtime/clustering/src/main/resources/META-INF/jboss-beans.xml 2010-11-23 13:54:42 UTC (rev 1137) +++ trunk/runtime/clustering/src/main/resources/META-INF/jboss-beans.xml 2010-11-23 13:58:05 UTC (rev 1138) @@ -25,7 +25,7 @@ Locate the single instance of the kernel --> <bean name="org.jboss.soa.bpel.runtime.util:service=KernelLocator" - class="org.jboss.soa.dwsp.server.jboss.KernelLocator"> + class="org.jboss.soa.dsp.server.jboss.KernelLocator"> <property name="kernel"> <inject bean="jboss.kernel:service=Kernel" /> </property> @@ -35,7 +35,7 @@ ServerConfig --> <bean name="org.jboss.soa.bpel.runtime.util:service=ServerConfig" - class="org.jboss.soa.dwsp.server.jboss.ServerConfigImpl"> + class="org.jboss.soa.dsp.server.jboss.ServerConfigImpl"> <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property> <property name="webServiceHost">${jboss.bind.address}</property> <property name="clusterNodeName"><inject bean="HAPartition" property="nodeName" /></property> Modified: trunk/runtime/engine/pom.xml =================================================================== --- trunk/runtime/engine/pom.xml 2010-11-23 13:54:42 UTC (rev 1137) +++ trunk/runtime/engine/pom.xml 2010-11-23 13:58:05 UTC (rev 1138) @@ -44,7 +44,7 @@ <dependency> <groupId>org.jboss.soa</groupId> - <artifactId>dwsp</artifactId> + <artifactId>dsp</artifactId> </dependency> <!-- ODE2 dependencies Modified: trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/BPELEngine.java =================================================================== --- trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/BPELEngine.java 2010-11-23 13:54:42 UTC (rev 1137) +++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/BPELEngine.java 2010-11-23 13:58:05 UTC (rev 1138) @@ -17,8 +17,8 @@ */ package org.jboss.soa.bpel.runtime.engine; -import org.jboss.soa.dwsp.InvocationAdapter; -import org.jboss.soa.dwsp.ServiceProvider; +import org.jboss.soa.dsp.InvocationAdapter; +import org.jboss.soa.dsp.ServiceProvider; /** * This interface represents a BPEL engine. Modified: trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/BPELEngineImpl.java =================================================================== --- trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/BPELEngineImpl.java 2010-11-23 13:54:42 UTC (rev 1137) +++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/BPELEngineImpl.java 2010-11-23 13:58:05 UTC (rev 1138) @@ -42,8 +42,8 @@ import org.apache.ode.utils.Properties; import org.jboss.soa.bpel.runtime.engine.BPELEngine; import org.jboss.soa.bpel.runtime.ws.ODEMessageAdapter; -import org.jboss.soa.dwsp.InvocationAdapter; -import org.jboss.soa.dwsp.server.jboss.ServerConfigFactory; +import org.jboss.soa.dsp.InvocationAdapter; +import org.jboss.soa.dsp.server.jboss.ServerConfigFactory; import org.w3c.dom.Element; import javax.transaction.*; Modified: trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/JAXWSBindingContext.java =================================================================== --- trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/JAXWSBindingContext.java 2010-11-23 13:54:42 UTC (rev 1137) +++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/JAXWSBindingContext.java 2010-11-23 13:58:05 UTC (rev 1138) @@ -22,9 +22,9 @@ import org.apache.ode.bpel.iapi.*; import org.jboss.soa.bpel.runtime.engine.PartnerChannel; import org.jboss.soa.bpel.runtime.ws.*; -import org.jboss.soa.dwsp.EndpointMetaData; -import org.jboss.soa.dwsp.server.jboss.ServerConfigFactory; -import org.jboss.soa.dwsp.ws.WSDLReference; +import org.jboss.soa.dsp.EndpointMetaData; +import org.jboss.soa.dsp.server.jboss.ServerConfigFactory; +import org.jboss.soa.dsp.ws.WSDLReference; import javax.wsdl.Definition; Modified: trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/UDDIRegistration.java =================================================================== --- trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/UDDIRegistration.java 2010-11-23 13:54:42 UTC (rev 1137) +++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/UDDIRegistration.java 2010-11-23 13:58:05 UTC (rev 1138) @@ -25,7 +25,7 @@ import javax.xml.namespace.QName; -import org.jboss.soa.dwsp.ws.WSDLReference; +import org.jboss.soa.dsp.ws.WSDLReference; /** * Modified: trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/EndpointManager.java =================================================================== --- trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/EndpointManager.java 2010-11-23 13:54:42 UTC (rev 1137) +++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/EndpointManager.java 2010-11-23 13:58:05 UTC (rev 1138) @@ -40,17 +40,17 @@ import org.jboss.soa.bpel.runtime.engine.ode.ExecutionEnvironment; import org.jboss.soa.bpel.runtime.engine.ode.UDDIClientFactory; import org.jboss.soa.bpel.runtime.engine.ode.UDDIRegistration; -import org.jboss.soa.dwsp.EndpointMetaData; -import org.jboss.soa.dwsp.ServiceEndpointReference; -import org.jboss.soa.dwsp.deployer.jboss.JBossServiceDeployer; -import org.jboss.soa.dwsp.server.ServerConfig; -import org.jboss.soa.dwsp.server.jboss.KernelLocator; -import org.jboss.soa.dwsp.server.jboss.ServerConfigFactory; -import org.jboss.soa.dwsp.ws.BaseWebServiceEndpoint; -import org.jboss.soa.dwsp.ws.DeploymentBuilder; -import org.jboss.soa.dwsp.ws.WSDLParser; -import org.jboss.soa.dwsp.ws.WSDLReference; -import org.jboss.soa.dwsp.ws.WebServiceProviderGenerator; +import org.jboss.soa.dsp.EndpointMetaData; +import org.jboss.soa.dsp.ServiceEndpointReference; +import org.jboss.soa.dsp.deployer.jboss.JBossServiceDeployer; +import org.jboss.soa.dsp.server.ServerConfig; +import org.jboss.soa.dsp.server.jboss.KernelLocator; +import org.jboss.soa.dsp.server.jboss.ServerConfigFactory; +import org.jboss.soa.dsp.ws.BaseWebServiceEndpoint; +import org.jboss.soa.dsp.ws.DeploymentBuilder; +import org.jboss.soa.dsp.ws.WSDLParser; +import org.jboss.soa.dsp.ws.WSDLReference; +import org.jboss.soa.dsp.ws.WebServiceProviderGenerator; import org.jboss.virtual.VFS; import org.jboss.virtual.VirtualFile; @@ -66,7 +66,7 @@ * This instance is stateful and retains references to both endpoints and clients. * As such it should only exists once. * - * @see org.jboss.soa.dwsp.ws.BaseWebServiceEndpoint + * @see org.jboss.soa.dsp.ws.BaseWebServiceEndpoint * @see org.jboss.soa.bpel.runtime.ws.WebServiceClient * @see org.jboss.soa.bpel.runtime.engine.ode.JAXWSBindingContext * @@ -133,24 +133,18 @@ // Check if a handler file has been specified File handlerFile=new File(root, "jws_handlers.xml"); + String handlerFilePath=null; - if (handlerFile.exists() == false) { - handlerFile = null; + if (handlerFile.exists()) { + handlerFilePath = "/"+handlerFile.getName(); } // generate provider impl WebServiceProviderGenerator providerFactory = new WebServiceProviderGenerator(); BaseWebServiceEndpoint providerImpl = - providerFactory.createProvider( - metaData.getServiceName(), - metaData.getPortName(), - metaData.getEndpointId(), - wsdlRef, - classLoader, - handlerFile, - ODEWebServiceFactory.class - ); + providerFactory.createProvider(metaData, wsdlRef, classLoader, + handlerFilePath, ODEWebServiceFactory.class); log.debug("Created dynamic endpoint class " + providerImpl.getClass().getName()); @@ -159,6 +153,7 @@ .setEndpoint(metaData.getEndpointId()) .setWSDL(wsdlFile, root) .setProvider(providerImpl) + .process(new JBossWSCXFBuildProcessor(providerImpl)) .build(); if (!stableInterface) { Added: trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/JBossWSCXFBuildProcessor.java =================================================================== --- trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/JBossWSCXFBuildProcessor.java (rev 0) +++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/JBossWSCXFBuildProcessor.java 2010-11-23 13:58:05 UTC (rev 1138) @@ -0,0 +1,87 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2009, Red Hat Middleware LLC, and others contributors as indicated + * by the @authors tag. All rights reserved. + * See the copyright.txt in the distribution for a + * full listing of individual contributors. + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License, v. 2.1. + * This program is distributed in the hope that it will be useful, but WITHOUT A + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. + * You should have received a copy of the GNU Lesser General Public License, + * v.2.1 along with this distribution; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + */ +package org.jboss.soa.bpel.runtime.ws; + +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; + +/** + * This build processor implementation sets the JAXWS web service provider class + * name in the JBossWS CXF configuration file, in one has been defined. + * + */ +public class JBossWSCXFBuildProcessor implements org.jboss.soa.dsp.ws.BuildProcessor { + + private javax.xml.ws.Provider<?> provider; + + public JBossWSCXFBuildProcessor(javax.xml.ws.Provider<?> provider) { + this.provider = provider; + } + + public void process(File war, File webInf, File wsdlDir) { + // Check if jbossws-cxf.xml is present, and if so, updated the provider implementation class attribute + File f=new File(webInf, "jbossws-cxf.xml"); + + if (f.exists()) { + FileInputStream fis=null; + FileOutputStream fos=null; + + try { + fis=new FileInputStream(f); + + byte[] b=new byte[fis.available()]; + fis.read(b); + + String str=new String(b); + + fis.close(); + fis = null; + + if (str.indexOf("@provider@") != -1) { + fos=new FileOutputStream(f); + + str = str.replaceAll("@provider@", provider.getClass().getName()); + + fos.write(str.getBytes()); + + fos.flush(); + fos.close(); + + fos = null; + } else { + // Report error + System.err.println("jbossws-cxf.xml file does not contain @provider@ field"); + } + + } catch (IOException e) { + throw new RuntimeException("Failed to copy files", e); + } finally { + try { + if (fis != null) fis.close(); + } catch (IOException e) { + } + try { + if (fos != null) fos.close(); + } catch (IOException e) { + } + } + } + } +} Modified: trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/ODEMessageAdapter.java =================================================================== --- trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/ODEMessageAdapter.java 2010-11-23 13:54:42 UTC (rev 1137) +++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/ODEMessageAdapter.java 2010-11-23 13:58:05 UTC (rev 1138) @@ -18,7 +18,7 @@ package org.jboss.soa.bpel.runtime.ws; import org.apache.ode.bpel.iapi.Message; -import org.jboss.soa.dwsp.MessageAdapter; +import org.jboss.soa.dsp.MessageAdapter; public class ODEMessageAdapter implements MessageAdapter { Modified: trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/ODEServiceEndpointReference.java =================================================================== --- trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/ODEServiceEndpointReference.java 2010-11-23 13:54:42 UTC (rev 1137) +++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/ODEServiceEndpointReference.java 2010-11-23 13:58:05 UTC (rev 1138) @@ -23,7 +23,7 @@ import org.apache.ode.bpel.iapi.EndpointReference; import org.w3c.dom.Document; -import org.jboss.soa.dwsp.ServiceEndpointReference; +import org.jboss.soa.dsp.ServiceEndpointReference; /** * References webservice endpoint deployment properties. Modified: trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/ODEWebServiceFactory.java =================================================================== --- trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/ODEWebServiceFactory.java 2010-11-23 13:54:42 UTC (rev 1137) +++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/ODEWebServiceFactory.java 2010-11-23 13:58:05 UTC (rev 1138) @@ -22,10 +22,10 @@ import javax.xml.namespace.QName; import org.jboss.soa.bpel.runtime.engine.BPELEngine; -import org.jboss.soa.dwsp.ServiceProvider; -import org.jboss.soa.dwsp.ws.SOAPMessageAdapter; -import org.jboss.soa.dwsp.ws.WSInvocationAdapter; -import org.jboss.soa.dwsp.ws.WebServiceProviderFactory; +import org.jboss.soa.dsp.ServiceProvider; +import org.jboss.soa.dsp.ws.SOAPMessageAdapter; +import org.jboss.soa.dsp.ws.WSInvocationAdapter; +import org.jboss.soa.dsp.ws.WebServiceProviderFactory; public class ODEWebServiceFactory implements WebServiceProviderFactory { Modified: trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/WSDLHelper.java =================================================================== --- trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/WSDLHelper.java 2010-11-23 13:54:42 UTC (rev 1137) +++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/WSDLHelper.java 2010-11-23 13:58:05 UTC (rev 1138) @@ -14,8 +14,8 @@ import org.apache.ode.bpel.iapi.ContextException; import org.apache.ode.bpel.iapi.ProcessConf; import org.jboss.soa.bpel.runtime.engine.ode.BPELEngineImpl; -import org.jboss.soa.dwsp.ws.WSDLParser; -import org.jboss.soa.dwsp.ws.WSDLReference; +import org.jboss.soa.dsp.ws.WSDLParser; +import org.jboss.soa.dsp.ws.WSDLReference; public class WSDLHelper { Modified: trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/WebServiceClient.java =================================================================== --- trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/WebServiceClient.java 2010-11-23 13:54:42 UTC (rev 1137) +++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/WebServiceClient.java 2010-11-23 13:58:05 UTC (rev 1138) @@ -52,12 +52,12 @@ import org.jboss.soa.bpel.runtime.engine.ode.ExecutionEnvironment; import org.jboss.soa.bpel.runtime.engine.ode.UDDIClientFactory; import org.jboss.soa.bpel.runtime.engine.ode.UDDIRegistration; -import org.jboss.soa.dwsp.EndpointMetaData; -import org.jboss.soa.dwsp.server.jboss.ServerConfigFactory; -import org.jboss.soa.dwsp.ws.DOMWriter; -import org.jboss.soa.dwsp.ws.JavaUtils; -import org.jboss.soa.dwsp.ws.SOAPMessageAdapter; -import org.jboss.soa.dwsp.ws.WSDLReference; +import org.jboss.soa.dsp.EndpointMetaData; +import org.jboss.soa.dsp.server.jboss.ServerConfigFactory; +import org.jboss.soa.dsp.ws.DOMWriter; +import org.jboss.soa.dsp.ws.JavaUtils; +import org.jboss.soa.dsp.ws.SOAPMessageAdapter; +import org.jboss.soa.dsp.ws.WSDLReference; import org.w3c.dom.Document; import org.w3c.dom.Element; Modified: trunk/runtime/engine/src/test/java/riftsaw124/Riftsaw124TestCase.java =================================================================== --- trunk/runtime/engine/src/test/java/riftsaw124/Riftsaw124TestCase.java 2010-11-23 13:54:42 UTC (rev 1137) +++ trunk/runtime/engine/src/test/java/riftsaw124/Riftsaw124TestCase.java 2010-11-23 13:58:05 UTC (rev 1138) @@ -23,7 +23,7 @@ import junit.framework.TestCase; -import org.jboss.soa.dwsp.ws.WSDLParser; +import org.jboss.soa.dsp.ws.WSDLParser; import javax.wsdl.Definition; import javax.wsdl.Operation; Modified: trunk/runtime/engine/src/test/java/riftsaw277/Riftsaw277TestCase.java =================================================================== --- trunk/runtime/engine/src/test/java/riftsaw277/Riftsaw277TestCase.java 2010-11-23 13:54:42 UTC (rev 1137) +++ trunk/runtime/engine/src/test/java/riftsaw277/Riftsaw277TestCase.java 2010-11-23 13:58:05 UTC (rev 1138) @@ -23,7 +23,7 @@ import javax.xml.soap.SOAPMessage; -import org.jboss.soa.dwsp.ws.SOAPMessageAdapter; +import org.jboss.soa.dsp.ws.SOAPMessageAdapter; import junit.framework.TestCase; Modified: trunk/runtime/engine-assembly/src/main/assembly/sar.xml =================================================================== --- trunk/runtime/engine-assembly/src/main/assembly/sar.xml 2010-11-23 13:54:42 UTC (rev 1137) +++ trunk/runtime/engine-assembly/src/main/assembly/sar.xml 2010-11-23 13:58:05 UTC (rev 1138) @@ -57,7 +57,7 @@ <include>org.jboss.soa.bpel:riftsaw-dao-jpa-hibernate</include> <!--include>org.jboss.soa.bpel:riftsaw-dao-hibernate</include--> <include>org.jboss.soa.bpel.runtime:riftsaw-engine</include> - <include>org.jboss.soa:dwsp</include> + <include>org.jboss.soa:dsp</include> <include>org.jboss.soa.bpel:riftsaw-jacob</include> <include>org.jboss.soa.bpel:riftsaw-scheduler-simple</include> <include>org.jboss.soa.bpel.runtime:riftsaw-uddi</include> Modified: trunk/runtime/jbossesb-bpel/pom.xml =================================================================== --- trunk/runtime/jbossesb-bpel/pom.xml 2010-11-23 13:54:42 UTC (rev 1137) +++ trunk/runtime/jbossesb-bpel/pom.xml 2010-11-23 13:58:05 UTC (rev 1138) @@ -22,7 +22,7 @@ </dependency> <dependency> <groupId>org.jboss.soa</groupId> - <artifactId>dwsp</artifactId> + <artifactId>dsp</artifactId> </dependency> <dependency> <groupId>org.jboss.soa.bpel.dependencies.esb</groupId> Modified: trunk/runtime/jbossesb-bpel/src/main/java/org/jboss/internal/soa/esb/actions/bpel/ESBInvocationAdapter.java =================================================================== --- trunk/runtime/jbossesb-bpel/src/main/java/org/jboss/internal/soa/esb/actions/bpel/ESBInvocationAdapter.java 2010-11-23 13:54:42 UTC (rev 1137) +++ trunk/runtime/jbossesb-bpel/src/main/java/org/jboss/internal/soa/esb/actions/bpel/ESBInvocationAdapter.java 2010-11-23 13:58:05 UTC (rev 1138) @@ -21,8 +21,8 @@ */ package org.jboss.internal.soa.esb.actions.bpel; -import org.jboss.soa.dwsp.InvocationAdapter; -import org.jboss.soa.dwsp.MessageAdapter; +import org.jboss.soa.dsp.InvocationAdapter; +import org.jboss.soa.dsp.MessageAdapter; import org.w3c.dom.Element; import javax.xml.namespace.QName; Modified: trunk/runtime/jbossesb-bpel/src/test/java/org/jboss/soa/esb/actions/bpel/TestBPELEngine.java =================================================================== --- trunk/runtime/jbossesb-bpel/src/test/java/org/jboss/soa/esb/actions/bpel/TestBPELEngine.java 2010-11-23 13:54:42 UTC (rev 1137) +++ trunk/runtime/jbossesb-bpel/src/test/java/org/jboss/soa/esb/actions/bpel/TestBPELEngine.java 2010-11-23 13:58:05 UTC (rev 1138) @@ -20,7 +20,7 @@ import org.jboss.internal.soa.esb.actions.bpel.ESBInvocationAdapter; import org.jboss.soa.bpel.runtime.engine.BPELEngine; -import org.jboss.soa.dwsp.InvocationAdapter; +import org.jboss.soa.dsp.InvocationAdapter; import org.w3c.dom.Document; import org.w3c.dom.Element; import javax.xml.namespace.QName; Modified: trunk/runtime/jbossesb-bpel-assembly/src/main/assembly/esb.xml =================================================================== --- trunk/runtime/jbossesb-bpel-assembly/src/main/assembly/esb.xml 2010-11-23 13:54:42 UTC (rev 1137) +++ trunk/runtime/jbossesb-bpel-assembly/src/main/assembly/esb.xml 2010-11-23 13:58:05 UTC (rev 1138) @@ -41,7 +41,7 @@ <outputDirectory>/lib</outputDirectory> <includes> <include>org.jboss.soa.bpel.runtime:riftsaw-engine</include> - <include>org.jboss.soa:dwsp</include> + <include>org.jboss.soa:dsp</include> <include>org.jboss.soa.bpel.dependencies.esb:jbossesb-rosetta</include> <include>org.jboss.soa.bpel:riftsaw-agents</include> <include>org.jboss.soa.bpel:riftsaw-bpel-runtime</include> Modified: trunk/runtime/uddi/pom.xml =================================================================== --- trunk/runtime/uddi/pom.xml 2010-11-23 13:54:42 UTC (rev 1137) +++ trunk/runtime/uddi/pom.xml 2010-11-23 13:58:05 UTC (rev 1138) @@ -37,7 +37,7 @@ </dependency> <dependency> <groupId>org.jboss.soa</groupId> - <artifactId>dwsp</artifactId> + <artifactId>dsp</artifactId> </dependency> <dependency> Modified: trunk/runtime/uddi/src/main/java/org/jboss/soa/bpel/uddi/UDDIRegistrationImpl.java =================================================================== --- trunk/runtime/uddi/src/main/java/org/jboss/soa/bpel/uddi/UDDIRegistrationImpl.java 2010-11-23 13:54:42 UTC (rev 1137) +++ trunk/runtime/uddi/src/main/java/org/jboss/soa/bpel/uddi/UDDIRegistrationImpl.java 2010-11-23 13:58:05 UTC (rev 1138) @@ -46,8 +46,8 @@ import org.apache.juddi.v3.client.transport.TransportException; import org.jboss.soa.bpel.runtime.engine.ode.UDDIRegistration; import org.jboss.soa.bpel.runtime.ws.WebServiceClient; -import org.jboss.soa.dwsp.server.jboss.ServerConfigFactory; -import org.jboss.soa.dwsp.ws.WSDLReference; +import org.jboss.soa.dsp.server.jboss.ServerConfigFactory; +import org.jboss.soa.dsp.ws.WSDLReference; import org.uddi.api_v3.AccessPoint; import org.uddi.api_v3.BindingTemplate; import org.uddi.api_v3.BindingTemplates;