Author: objectiser Date: 2011-01-26 13:25:14 -0500 (Wed, 26 Jan 2011) New Revision: 1279 Added: trunk/distribution/src/main/release/db/jboss/as6.properties trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/JBossDSPFactory.java Modified: trunk/console/integration/pom.xml trunk/console/integration/src/main/java/org/jboss/soa/bpel/console/SVGPlugin.java trunk/distribution/src/main/release/db/jboss/as5.properties 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/pom.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/db/H2Database.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/ws/EndpointManager.java trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/WebServiceClient.java trunk/runtime/jbossesb-bpel/pom.xml trunk/runtime/uddi/pom.xml trunk/runtime/uddi/src/main/java/org/jboss/soa/bpel/uddi/UDDIRegistrationImpl.java Log: Further work to support AS5 and AS6. Changed to use an updated DSP - still needs further config work to sort out the jboss-beans.xml - set to AS5 for now. Modified: trunk/console/integration/pom.xml =================================================================== --- trunk/console/integration/pom.xml 2011-01-26 15:41:31 UTC (rev 1278) +++ trunk/console/integration/pom.xml 2011-01-26 18:25:14 UTC (rev 1279) @@ -77,7 +77,7 @@ <dependency> <groupId>org.jboss.soa.dsp</groupId> - <artifactId>dsp-jboss</artifactId> + <artifactId>dsp-api</artifactId> </dependency> <!-- ODE 2.0 dependencies 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 2011-01-26 15:41:31 UTC (rev 1278) +++ trunk/console/integration/src/main/java/org/jboss/soa/bpel/console/SVGPlugin.java 2011-01-26 18:25:14 UTC (rev 1279) @@ -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.dsp.server.jboss.JBossServerConfig; -import org.jboss.soa.dsp.server.jboss.JBossServerConfigFactory; +import org.jboss.soa.bpel.runtime.JBossDSPFactory; +import org.jboss.soa.dsp.server.ServerConfig; import org.wso2.carbon.bpel.ui.bpel2svg.ActivityInterface; import org.wso2.carbon.bpel.ui.bpel2svg.SVGInterface; @@ -69,7 +69,7 @@ public SVGPlugin() { // host & port resolution - JBossServerConfig serverConfig = JBossServerConfigFactory.createServerConfig(); + ServerConfig serverConfig = JBossDSPFactory.getServerConfig(); this.webServiceHost = serverConfig.getWebServiceHost(); this.webServicePort = serverConfig.getWebServicePort(); Modified: trunk/distribution/src/main/release/db/jboss/as5.properties =================================================================== --- trunk/distribution/src/main/release/db/jboss/as5.properties 2011-01-26 15:41:31 UTC (rev 1278) +++ trunk/distribution/src/main/release/db/jboss/as5.properties 2011-01-26 18:25:14 UTC (rev 1279) @@ -1,2 +1,2 @@ -dsp.service.deployer=org.jboss.soa.dsp.deployer.jboss.JBossServiceDeployer -dsp.server.config.factory=org.jboss.soa.dsp.server.jboss.JBossServerConfigFactory +dsp.service.deployer=org.jboss.soa.dsp.deployer.jbossas5.JBossServiceDeployer +dsp.server.config.factory=org.jboss.soa.dsp.server.jbossas5.JBossServerConfigFactory Added: trunk/distribution/src/main/release/db/jboss/as6.properties =================================================================== --- trunk/distribution/src/main/release/db/jboss/as6.properties (rev 0) +++ trunk/distribution/src/main/release/db/jboss/as6.properties 2011-01-26 18:25:14 UTC (rev 1279) @@ -0,0 +1,2 @@ +dsp.service.deployer=org.jboss.soa.dsp.deployer.jbossas6.JBossServiceDeployer +dsp.server.config.factory=org.jboss.soa.dsp.server.jbossas6.JBossServerConfigFactory Modified: trunk/distribution/src/main/release/db/jboss/jboss-beans.xml =================================================================== --- trunk/distribution/src/main/release/db/jboss/jboss-beans.xml 2011-01-26 15:41:31 UTC (rev 1278) +++ trunk/distribution/src/main/release/db/jboss/jboss-beans.xml 2011-01-26 18:25:14 UTC (rev 1279) @@ -24,7 +24,7 @@ Locate the single instance of the kernel --> <bean name="org.jboss.soa.dsp:service=KernelLocator" - class="org.jboss.soa.dsp.server.jboss.KernelLocator"> + class="org.jboss.soa.dsp.server.jbossas5.KernelLocator"> <property name="kernel"> <inject bean="jboss.kernel:service=Kernel" /> </property> @@ -34,7 +34,7 @@ ServerConfig --> <bean name="org.jboss.soa.dsp:service=ServerConfig" - class="org.jboss.soa.dsp.server.jboss.JBossServerConfigImpl"> + class="org.jboss.soa.dsp.server.jbossas5.JBossServerConfigImpl"> <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property> <property name="webServiceHost">${jboss.bind.address}</property> </bean> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-01-26 15:41:31 UTC (rev 1278) +++ trunk/pom.xml 2011-01-26 18:25:14 UTC (rev 1279) @@ -242,9 +242,14 @@ </dependency> <dependency> <groupId>org.jboss.soa.dsp</groupId> - <artifactId>dsp-jboss</artifactId> + <artifactId>dsp-jbossas5</artifactId> <version>${dsp.version}</version> </dependency> + <dependency> + <groupId>org.jboss.soa.dsp</groupId> + <artifactId>dsp-jbossas6</artifactId> + <version>${dsp.version}</version> + </dependency> <!-- ODE1.3.3 dependencies --> <dependency> <groupId>org.jboss.soa.bpel</groupId> Modified: trunk/runtime/clustering/src/main/resources/META-INF/jboss-beans.xml =================================================================== --- trunk/runtime/clustering/src/main/resources/META-INF/jboss-beans.xml 2011-01-26 15:41:31 UTC (rev 1278) +++ trunk/runtime/clustering/src/main/resources/META-INF/jboss-beans.xml 2011-01-26 18:25:14 UTC (rev 1279) @@ -25,7 +25,7 @@ Locate the single instance of the kernel --> <bean name="org.jboss.soa.dsp:service=KernelLocator" - class="org.jboss.soa.dsp.server.jboss.KernelLocator"> + class="org.jboss.soa.dsp.server.jbossas5.KernelLocator"> <property name="kernel"> <inject bean="jboss.kernel:service=Kernel" /> </property> @@ -35,7 +35,7 @@ ServerConfig --> <bean name="org.jboss.soa.dsp:service=ServerConfig" - class="org.jboss.soa.dsp.server.jboss.JBossServerConfigImpl"> + class="org.jboss.soa.dsp.server.jbossas5.JBossServerConfigImpl"> <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 2011-01-26 15:41:31 UTC (rev 1278) +++ trunk/runtime/engine/pom.xml 2011-01-26 18:25:14 UTC (rev 1279) @@ -46,10 +46,6 @@ <groupId>org.jboss.soa.dsp</groupId> <artifactId>dsp-api</artifactId> </dependency> - <dependency> - <groupId>org.jboss.soa.dsp</groupId> - <artifactId>dsp-jboss</artifactId> - </dependency> <!-- ODE2 dependencies <dependency> Added: trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/JBossDSPFactory.java =================================================================== --- trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/JBossDSPFactory.java (rev 0) +++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/JBossDSPFactory.java 2011-01-26 18:25:14 UTC (rev 1279) @@ -0,0 +1,89 @@ +/* + * 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; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.jboss.soa.dsp.deployer.ServiceDeployer; +import org.jboss.soa.dsp.server.ServerConfig; +import org.jboss.soa.dsp.server.ServerConfigFactory; + +/** + * This class provides a factory for retrieving the Dynamic Service + * Provider components suitable for the JBoss environment. + * + */ +public class JBossDSPFactory { + + private static final String BPEL_DSP_SERVICE_DEPLOYER = "bpel.dsp.service.deployer"; + private static final String BPEL_DSP_SERVER_CONFIG_FACTORY = "bpel.dsp.server.config.factory"; + + private static final Log log = LogFactory.getLog(JBossDSPFactory.class); + + private static ServiceDeployer m_serviceDeployer=null; + private static ServerConfig m_serverConfig=null; + + public static ServerConfig getServerConfig() { + if (m_serverConfig == null) { + java.util.ResourceBundle bundle=java.util.ResourceBundle.getBundle("bpel"); + + String configFactoryClassName=bundle.getString(BPEL_DSP_SERVER_CONFIG_FACTORY); + + if (configFactoryClassName != null) { + try { + Class<?> cls=Class.forName(configFactoryClassName); + + ServerConfigFactory factory = (ServerConfigFactory)cls.newInstance(); + + m_serverConfig = factory.getServerConfig(); + + } catch(Exception e) { + log.error("Failed to get server config factory '"+configFactoryClassName+"'", e); + } + } else { + log.error("Failed to find server config factory property '"+BPEL_DSP_SERVER_CONFIG_FACTORY+"'"); + } + } + + return(m_serverConfig); + } + + public static synchronized ServiceDeployer getServiceDeployer() { + if (m_serviceDeployer == null) { + java.util.ResourceBundle bundle=java.util.ResourceBundle.getBundle("bpel"); + + String deployerClassName=bundle.getString(BPEL_DSP_SERVICE_DEPLOYER); + + if (deployerClassName != null) { + try { + Class<?> cls=Class.forName(deployerClassName); + + m_serviceDeployer = (ServiceDeployer)cls.newInstance(); + + } catch(Exception e) { + log.error("Failed to get service deployer '"+deployerClassName+"'", e); + } + } else { + log.error("Failed to find service deployer property '"+BPEL_DSP_SERVICE_DEPLOYER+"'"); + } + } + + return(m_serviceDeployer); + } + +} Modified: trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/db/H2Database.java =================================================================== --- trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/db/H2Database.java 2011-01-26 15:41:31 UTC (rev 1278) +++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/db/H2Database.java 2011-01-26 18:25:14 UTC (rev 1279) @@ -29,10 +29,7 @@ import java.sql.Statement; import org.h2.tools.Server; -import org.jboss.mx.util.MBeanProxyExt; import org.jboss.system.ServiceMBeanSupport; -import org.jboss.system.server.ServerConfigImpl; -import org.jboss.system.server.ServerConfigImplMBean; /** * Integration with H2. @@ -582,7 +579,7 @@ //final ServerConfigImpl serverConfig = (ServerConfigImpl) MBeanProxyExt.create(ServerConfigImplMBean.class,ServerConfigImplMBean.OBJECT_NAME); //return serverConfig.getServerDataDir(); org.jboss.soa.dsp.server.ServerConfig serverConfig= - org.jboss.soa.dsp.server.jboss.JBossServerConfigFactory.createServerConfig(); + org.jboss.soa.bpel.runtime.JBossDSPFactory.getServerConfig(); return(serverConfig.getServerDeployDir()); } return new File(datadir); 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 2011-01-26 15:41:31 UTC (rev 1278) +++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/BPELEngineImpl.java 2011-01-26 18:25:14 UTC (rev 1279) @@ -43,7 +43,7 @@ import org.jboss.soa.bpel.runtime.engine.BPELEngine; import org.jboss.soa.bpel.runtime.ws.ODEMessageAdapter; import org.jboss.soa.dsp.InvocationAdapter; -import org.jboss.soa.dsp.server.jboss.JBossServerConfigFactory; +import org.jboss.soa.bpel.runtime.JBossDSPFactory; import org.w3c.dom.Element; import javax.transaction.*; @@ -485,7 +485,7 @@ protected Scheduler createScheduler() { - String clusterNodeName=JBossServerConfigFactory.createServerConfig().getClusterNodeName(); + String clusterNodeName=JBossDSPFactory.getServerConfig().getClusterNodeName(); __log.info("Scheduler node name: "+clusterNodeName); 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 2011-01-26 15:41:31 UTC (rev 1278) +++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/JAXWSBindingContext.java 2011-01-26 18:25:14 UTC (rev 1279) @@ -23,7 +23,6 @@ import org.jboss.soa.bpel.runtime.engine.PartnerChannel; import org.jboss.soa.bpel.runtime.ws.*; import org.jboss.soa.dsp.EndpointMetaData; -import org.jboss.soa.dsp.server.jboss.JBossServerConfigFactory; 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 2011-01-26 15:41:31 UTC (rev 1278) +++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/EndpointManager.java 2011-01-26 18:25:14 UTC (rev 1279) @@ -26,15 +26,15 @@ import org.apache.ode.bpel.iapi.EndpointReference; import org.apache.ode.bpel.iapi.ProcessConf; import org.jboss.soa.bpel.deployer.BPELDeploymentUnit; +import org.jboss.soa.bpel.runtime.JBossDSPFactory; import org.jboss.soa.bpel.runtime.engine.ode.BPELEngineImpl; 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.dsp.EndpointMetaData; import org.jboss.soa.dsp.ServiceEndpointReference; -import org.jboss.soa.dsp.deployer.ServiceDeployer; import org.jboss.soa.dsp.server.ServerConfig; -import org.jboss.soa.dsp.server.jboss.JBossServerConfigFactory; +import org.jboss.soa.bpel.runtime.JBossDSPFactory; import org.jboss.soa.dsp.ws.BaseWebServiceEndpoint; import org.jboss.soa.dsp.ws.DeploymentBuilder; import org.jboss.soa.dsp.ws.WSDLParser; @@ -60,8 +60,7 @@ */ public class EndpointManager { - private static final String BPEL_DSP_SERVICE_DEPLOYER = "dsp.service.deployer"; -protected final Log log = LogFactory.getLog(getClass()); + protected final Log log = LogFactory.getLog(getClass()); // we should consider having our own OdeConfigProperties class if we need more properties private final static String BPEL_UDDI_REGISTRATION = "uddi.registration"; private static final String BPEL_WS_STABLE_INTERFACE = "ws.stableInterface"; @@ -73,13 +72,10 @@ private UDDIRegistration uddiRegistration = null; private boolean stableInterface=false; - private ServiceDeployer m_deployer=null; //new JBossServiceDeployer(); - - public EndpointManager(ExecutionEnvironment executionEnvironment) { this.executionEnvironment = executionEnvironment; - this.serverConfig = JBossServerConfigFactory.createServerConfig(); + this.serverConfig = JBossDSPFactory.getServerConfig(); if (isUDDIRegistration()) { try { uddiRegistration = UDDIClientFactory.newInstance(executionEnvironment.getOdeConfig().getProperties()); @@ -94,27 +90,6 @@ log.info("Use stable interface: "+stableInterface); } - protected synchronized ServiceDeployer getDeployer() { - if (m_deployer == null) { - String deployerClassName=executionEnvironment.getOdeConfig().getProperty(BPEL_DSP_SERVICE_DEPLOYER); - - if (deployerClassName != null) { - try { - Class<?> cls=Class.forName(deployerClassName); - - m_deployer = (ServiceDeployer)cls.newInstance(); - - } catch(Exception e) { - log.error("Failed to get service deployer '"+deployerClassName+"'", e); - } - } else { - log.error("Failed to find service deployer property '"+BPEL_DSP_SERVICE_DEPLOYER+"'"); - } - } - - return(m_deployer); - } - public boolean isStableInterface() { return(stableInterface); } @@ -176,7 +151,7 @@ URL serviceUrl = new WSDLParser(wsdlRef.getDefinition()).getServiceLocationURL(metaData.getServiceName(), metaData.getPortName()); - ServiceEndpointReference ref = getDeployer().deploy(metaData, providerImpl.getClass(), + ServiceEndpointReference ref = JBossDSPFactory.getServiceDeployer().deploy(metaData, providerImpl.getClass(), serviceUrl, classLoader, warArchive, serverConfig); /* @@ -257,7 +232,7 @@ try { - getDeployer().undeploy(ref, serverConfig); + JBossDSPFactory.getServiceDeployer().undeploy(ref, serverConfig); // unregister endpointMapping.remove(key); 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 2011-01-26 15:41:31 UTC (rev 1278) +++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/WebServiceClient.java 2011-01-26 18:25:14 UTC (rev 1279) @@ -54,8 +54,7 @@ import org.jboss.soa.bpel.runtime.engine.ode.UDDIRegistration; import org.jboss.soa.dsp.EndpointMetaData; import org.jboss.soa.dsp.server.ServerConfig; -import org.jboss.soa.dsp.server.jboss.JBossServerConfig; -import org.jboss.soa.dsp.server.jboss.JBossServerConfigFactory; +import org.jboss.soa.bpel.runtime.JBossDSPFactory; import org.jboss.soa.dsp.ws.DOMWriter; import org.jboss.soa.dsp.ws.JavaUtils; import org.jboss.soa.dsp.ws.SOAPMessageAdapter; @@ -116,7 +115,7 @@ private synchronized void initialize() { if (isUDDILookup()) { try { - JBossServerConfig serverConfig=JBossServerConfigFactory.createServerConfig(); + ServerConfig serverConfig=JBossDSPFactory.getServerConfig(); String webServiceHost = serverConfig.getWebServiceHost(); int webServicePort = serverConfig.getWebServicePort(); URL url = new URL("http://" + webServiceHost + ":" + webServicePort); Modified: trunk/runtime/engine-assembly/pom.xml =================================================================== --- trunk/runtime/engine-assembly/pom.xml 2011-01-26 15:41:31 UTC (rev 1278) +++ trunk/runtime/engine-assembly/pom.xml 2011-01-26 18:25:14 UTC (rev 1279) @@ -28,9 +28,13 @@ </dependency> <dependency> <groupId>org.jboss.soa.dsp</groupId> - <artifactId>dsp-jboss</artifactId> + <artifactId>dsp-jbossas5</artifactId> </dependency> <dependency> + <groupId>org.jboss.soa.dsp</groupId> + <artifactId>dsp-jbossas6</artifactId> + </dependency> + <dependency> <groupId>org.jboss.soa.bpel</groupId> <artifactId>riftsaw-bpel-compiler</artifactId> </dependency> Modified: trunk/runtime/engine-assembly/src/main/assembly/sar.xml =================================================================== --- trunk/runtime/engine-assembly/src/main/assembly/sar.xml 2011-01-26 15:41:31 UTC (rev 1278) +++ trunk/runtime/engine-assembly/src/main/assembly/sar.xml 2011-01-26 18:25:14 UTC (rev 1279) @@ -58,7 +58,8 @@ <!--include>org.jboss.soa.bpel:riftsaw-dao-hibernate</include--> <include>org.jboss.soa.bpel.runtime:riftsaw-engine</include> <include>org.jboss.soa.dsp:dsp-api</include> - <include>org.jboss.soa.dsp:dsp-jboss</include> + <include>org.jboss.soa.dsp:dsp-jbossas5</include> + <include>org.jboss.soa.dsp:dsp-jbossas6</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 2011-01-26 15:41:31 UTC (rev 1278) +++ trunk/runtime/jbossesb-bpel/pom.xml 2011-01-26 18:25:14 UTC (rev 1279) @@ -24,10 +24,6 @@ <groupId>org.jboss.soa.dsp</groupId> <artifactId>dsp-api</artifactId> </dependency> - <dependency> - <groupId>org.jboss.soa.dsp</groupId> - <artifactId>dsp-jboss</artifactId> - </dependency> <dependency> <groupId>org.jboss.soa.bpel.dependencies.esb</groupId> <artifactId>jbossesb-rosetta</artifactId> Modified: trunk/runtime/uddi/pom.xml =================================================================== --- trunk/runtime/uddi/pom.xml 2011-01-26 15:41:31 UTC (rev 1278) +++ trunk/runtime/uddi/pom.xml 2011-01-26 18:25:14 UTC (rev 1279) @@ -39,10 +39,6 @@ <groupId>org.jboss.soa.dsp</groupId> <artifactId>dsp-api</artifactId> </dependency> - <dependency> - <groupId>org.jboss.soa.dsp</groupId> - <artifactId>dsp-jboss</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 2011-01-26 15:41:31 UTC (rev 1278) +++ trunk/runtime/uddi/src/main/java/org/jboss/soa/bpel/uddi/UDDIRegistrationImpl.java 2011-01-26 18:25:14 UTC (rev 1279) @@ -47,8 +47,7 @@ import org.jboss.soa.bpel.runtime.engine.ode.UDDIRegistration; import org.jboss.soa.bpel.runtime.ws.WebServiceClient; import org.jboss.soa.dsp.server.ServerConfig; -import org.jboss.soa.dsp.server.jboss.JBossServerConfig; -import org.jboss.soa.dsp.server.jboss.JBossServerConfigFactory; +import org.jboss.soa.bpel.runtime.JBossDSPFactory; import org.jboss.soa.dsp.ws.WSDLReference; import org.uddi.api_v3.AccessPoint; import org.uddi.api_v3.BindingTemplate; @@ -202,7 +201,7 @@ if (bpelClerk!=null) { try { Properties properties = bpelClerk.getUDDINode().getProperties(); - properties.put("nodeName", JBossServerConfigFactory.createServerConfig().getUddiNodeName()); + properties.put("nodeName", JBossDSPFactory.getServerConfig().getUddiNodeName()); //Constructing the bindingKey String bindingKey = TokenResolver.replaceTokens(DEFAULT_BINDING_KEY_FORMAT + bindingName, properties); if (properties.containsKey(BINDING_KEY_FORMAT)) { @@ -253,7 +252,7 @@ String serviceName, String portName, URL accessUrl) throws DispositionReportFaultMessage, RemoteException, ConfigurationException, TransportException { Properties properties = clerk.getUDDINode().getProperties(); - properties.put("nodeName", JBossServerConfigFactory.createServerConfig().getUddiNodeName()); + properties.put("nodeName", JBossDSPFactory.getServerConfig().getUddiNodeName()); //Constructing the serviceKey String serviceKey = TokenResolver.replaceTokens(DEFAULT_SERVICE_KEY_FORMAT + serviceName, properties); @@ -523,7 +522,7 @@ private String getDefaultWebServiceBaseUrl() { try { - JBossServerConfig serverConfig=JBossServerConfigFactory.createServerConfig(); + ServerConfig serverConfig=JBossDSPFactory.getServerConfig(); String webServiceHost = serverConfig.getWebServiceHost(); int webServicePort = serverConfig.getWebServicePort(); URL theURL = new URL("http://" + webServiceHost + ":" + webServicePort);