Author: objectiser Date: 2010-11-22 11:18:20 -0500 (Mon, 22 Nov 2010) New Revision: 1131 Removed: trunk/runtime/si/ 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/pom.xml trunk/runtime/uddi/pom.xml trunk/runtime/uddi/src/main/java/org/jboss/soa/bpel/uddi/UDDIRegistrationImpl.java Log: RIFTSAW-319 - separated out 'dynamic web service provider' mechanism into riftsaw sub-project. 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-22 13:22:37 UTC (rev 1130) +++ trunk/console/integration/src/main/java/org/jboss/soa/bpel/console/SVGPlugin.java 2010-11-22 16:18:20 UTC (rev 1131) @@ -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.si.server.ServerConfig; -import org.jboss.soa.si.server.jboss.ServerConfigFactory; +import org.jboss.soa.dwsp.server.ServerConfig; +import org.jboss.soa.dwsp.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-22 13:22:37 UTC (rev 1130) +++ trunk/distribution/src/main/release/db/jboss/jboss-beans.xml 2010-11-22 16:18:20 UTC (rev 1131) @@ -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.si.server.jboss.KernelLocator"> + class="org.jboss.soa.dwsp.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.si.server.jboss.ServerConfigImpl"> + class="org.jboss.soa.dwsp.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-22 13:22:37 UTC (rev 1130) +++ trunk/pom.xml 2010-11-22 16:18:20 UTC (rev 1131) @@ -110,6 +110,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> </properties> <dependencyManagement> @@ -229,8 +230,8 @@ </dependency> <dependency> <groupId>org.jboss.soa</groupId> - <artifactId>si</artifactId> - <version>${riftsaw.engine.version}</version> + <artifactId>dwsp</artifactId> + <version>${dwsp.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-22 13:22:37 UTC (rev 1130) +++ trunk/runtime/clustering/src/main/resources/META-INF/jboss-beans.xml 2010-11-22 16:18:20 UTC (rev 1131) @@ -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.si.server.jboss.KernelLocator"> + class="org.jboss.soa.dwsp.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.si.server.jboss.ServerConfigImpl"> + class="org.jboss.soa.dwsp.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-22 13:22:37 UTC (rev 1130) +++ trunk/runtime/engine/pom.xml 2010-11-22 16:18:20 UTC (rev 1131) @@ -44,7 +44,7 @@ <dependency> <groupId>org.jboss.soa</groupId> - <artifactId>si</artifactId> + <artifactId>dwsp</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-22 13:22:37 UTC (rev 1130) +++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/BPELEngine.java 2010-11-22 16:18:20 UTC (rev 1131) @@ -17,8 +17,8 @@ */ package org.jboss.soa.bpel.runtime.engine; -import org.jboss.soa.si.InvocationAdapter; -import org.jboss.soa.si.ServiceProvider; +import org.jboss.soa.dwsp.InvocationAdapter; +import org.jboss.soa.dwsp.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-22 13:22:37 UTC (rev 1130) +++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/BPELEngineImpl.java 2010-11-22 16:18:20 UTC (rev 1131) @@ -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.si.InvocationAdapter; -import org.jboss.soa.si.server.jboss.ServerConfigFactory; +import org.jboss.soa.dwsp.InvocationAdapter; +import org.jboss.soa.dwsp.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-22 13:22:37 UTC (rev 1130) +++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/JAXWSBindingContext.java 2010-11-22 16:18:20 UTC (rev 1131) @@ -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.si.EndpointMetaData; -import org.jboss.soa.si.server.jboss.ServerConfigFactory; -import org.jboss.soa.si.ws.WSDLReference; +import org.jboss.soa.dwsp.EndpointMetaData; +import org.jboss.soa.dwsp.server.jboss.ServerConfigFactory; +import org.jboss.soa.dwsp.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-22 13:22:37 UTC (rev 1130) +++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/UDDIRegistration.java 2010-11-22 16:18:20 UTC (rev 1131) @@ -25,7 +25,7 @@ import javax.xml.namespace.QName; -import org.jboss.soa.si.ws.WSDLReference; +import org.jboss.soa.dwsp.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-22 13:22:37 UTC (rev 1130) +++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/EndpointManager.java 2010-11-22 16:18:20 UTC (rev 1131) @@ -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.si.EndpointMetaData; -import org.jboss.soa.si.ServiceEndpointReference; -import org.jboss.soa.si.deployer.jboss.JBossServiceDeployer; -import org.jboss.soa.si.server.ServerConfig; -import org.jboss.soa.si.server.jboss.KernelLocator; -import org.jboss.soa.si.server.jboss.ServerConfigFactory; -import org.jboss.soa.si.ws.BaseWebServiceEndpoint; -import org.jboss.soa.si.ws.DeploymentBuilder; -import org.jboss.soa.si.ws.WSDLParser; -import org.jboss.soa.si.ws.WSDLReference; -import org.jboss.soa.si.ws.WebServiceProviderGenerator; +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.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.si.ws.BaseWebServiceEndpoint + * @see org.jboss.soa.dwsp.ws.BaseWebServiceEndpoint * @see org.jboss.soa.bpel.runtime.ws.WebServiceClient * @see org.jboss.soa.bpel.runtime.engine.ode.JAXWSBindingContext * 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-22 13:22:37 UTC (rev 1130) +++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/ODEMessageAdapter.java 2010-11-22 16:18:20 UTC (rev 1131) @@ -18,7 +18,7 @@ package org.jboss.soa.bpel.runtime.ws; import org.apache.ode.bpel.iapi.Message; -import org.jboss.soa.si.MessageAdapter; +import org.jboss.soa.dwsp.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-22 13:22:37 UTC (rev 1130) +++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/ODEServiceEndpointReference.java 2010-11-22 16:18:20 UTC (rev 1131) @@ -23,7 +23,7 @@ import org.apache.ode.bpel.iapi.EndpointReference; import org.w3c.dom.Document; -import org.jboss.soa.si.ServiceEndpointReference; +import org.jboss.soa.dwsp.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-22 13:22:37 UTC (rev 1130) +++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/ODEWebServiceFactory.java 2010-11-22 16:18:20 UTC (rev 1131) @@ -22,10 +22,10 @@ import javax.xml.namespace.QName; import org.jboss.soa.bpel.runtime.engine.BPELEngine; -import org.jboss.soa.si.ServiceProvider; -import org.jboss.soa.si.ws.SOAPMessageAdapter; -import org.jboss.soa.si.ws.WSInvocationAdapter; -import org.jboss.soa.si.ws.WebServiceProviderFactory; +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; 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-22 13:22:37 UTC (rev 1130) +++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/WSDLHelper.java 2010-11-22 16:18:20 UTC (rev 1131) @@ -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.si.ws.WSDLParser; -import org.jboss.soa.si.ws.WSDLReference; +import org.jboss.soa.dwsp.ws.WSDLParser; +import org.jboss.soa.dwsp.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-22 13:22:37 UTC (rev 1130) +++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/WebServiceClient.java 2010-11-22 16:18:20 UTC (rev 1131) @@ -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.si.EndpointMetaData; -import org.jboss.soa.si.server.jboss.ServerConfigFactory; -import org.jboss.soa.si.ws.DOMWriter; -import org.jboss.soa.si.ws.JavaUtils; -import org.jboss.soa.si.ws.SOAPMessageAdapter; -import org.jboss.soa.si.ws.WSDLReference; +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.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-22 13:22:37 UTC (rev 1130) +++ trunk/runtime/engine/src/test/java/riftsaw124/Riftsaw124TestCase.java 2010-11-22 16:18:20 UTC (rev 1131) @@ -23,7 +23,7 @@ import junit.framework.TestCase; -import org.jboss.soa.si.ws.WSDLParser; +import org.jboss.soa.dwsp.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-22 13:22:37 UTC (rev 1130) +++ trunk/runtime/engine/src/test/java/riftsaw277/Riftsaw277TestCase.java 2010-11-22 16:18:20 UTC (rev 1131) @@ -23,7 +23,7 @@ import javax.xml.soap.SOAPMessage; -import org.jboss.soa.si.ws.SOAPMessageAdapter; +import org.jboss.soa.dwsp.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-22 13:22:37 UTC (rev 1130) +++ trunk/runtime/engine-assembly/src/main/assembly/sar.xml 2010-11-22 16:18:20 UTC (rev 1131) @@ -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:si</include> + <include>org.jboss.soa:dwsp</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-22 13:22:37 UTC (rev 1130) +++ trunk/runtime/jbossesb-bpel/pom.xml 2010-11-22 16:18:20 UTC (rev 1131) @@ -21,6 +21,10 @@ <version>${riftsaw.engine.version}</version> </dependency> <dependency> + <groupId>org.jboss.soa</groupId> + <artifactId>dwsp</artifactId> + </dependency> + <dependency> <groupId>org.jboss.soa.bpel.dependencies.esb</groupId> <artifactId>jbossesb-rosetta</artifactId> <version>${jbossesb.version}</version> 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-22 13:22:37 UTC (rev 1130) +++ trunk/runtime/jbossesb-bpel/src/main/java/org/jboss/internal/soa/esb/actions/bpel/ESBInvocationAdapter.java 2010-11-22 16:18:20 UTC (rev 1131) @@ -21,8 +21,8 @@ */ package org.jboss.internal.soa.esb.actions.bpel; -import org.jboss.soa.si.InvocationAdapter; -import org.jboss.soa.si.MessageAdapter; +import org.jboss.soa.dwsp.InvocationAdapter; +import org.jboss.soa.dwsp.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-22 13:22:37 UTC (rev 1130) +++ trunk/runtime/jbossesb-bpel/src/test/java/org/jboss/soa/esb/actions/bpel/TestBPELEngine.java 2010-11-22 16:18:20 UTC (rev 1131) @@ -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.si.InvocationAdapter; +import org.jboss.soa.dwsp.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-22 13:22:37 UTC (rev 1130) +++ trunk/runtime/jbossesb-bpel-assembly/src/main/assembly/esb.xml 2010-11-22 16:18:20 UTC (rev 1131) @@ -41,7 +41,7 @@ <outputDirectory>/lib</outputDirectory> <includes> <include>org.jboss.soa.bpel.runtime:riftsaw-engine</include> - <include>org.jboss.soa:si</include> + <include>org.jboss.soa:dwsp</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/pom.xml =================================================================== --- trunk/runtime/pom.xml 2010-11-22 13:22:37 UTC (rev 1130) +++ trunk/runtime/pom.xml 2010-11-22 16:18:20 UTC (rev 1131) @@ -17,7 +17,6 @@ <modules> <module>deployer</module> - <module>si</module> <module>engine</module> <module>uddi</module> <module>engine-assembly</module> Modified: trunk/runtime/uddi/pom.xml =================================================================== --- trunk/runtime/uddi/pom.xml 2010-11-22 13:22:37 UTC (rev 1130) +++ trunk/runtime/uddi/pom.xml 2010-11-22 16:18:20 UTC (rev 1131) @@ -35,6 +35,10 @@ <artifactId>riftsaw-engine</artifactId> <version>${riftsaw.engine.version}</version> </dependency> + <dependency> + <groupId>org.jboss.soa</groupId> + <artifactId>dwsp</artifactId> + </dependency> <dependency> <groupId>wsdl4j</groupId> 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-22 13:22:37 UTC (rev 1130) +++ trunk/runtime/uddi/src/main/java/org/jboss/soa/bpel/uddi/UDDIRegistrationImpl.java 2010-11-22 16:18:20 UTC (rev 1131) @@ -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.si.server.jboss.ServerConfigFactory; -import org.jboss.soa.si.ws.WSDLReference; +import org.jboss.soa.dwsp.server.jboss.ServerConfigFactory; +import org.jboss.soa.dwsp.ws.WSDLReference; import org.uddi.api_v3.AccessPoint; import org.uddi.api_v3.BindingTemplate; import org.uddi.api_v3.BindingTemplates;