Author: objectiser Date: 2011-01-10 10:43:33 -0500 (Mon, 10 Jan 2011) New Revision: 1228 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/runtime/clustering/src/main/resources/META-INF/jboss-beans.xml 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/uddi/src/main/java/org/jboss/soa/bpel/uddi/UDDIRegistrationImpl.java Log: Update to refect changes in the DSP api. 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-10 15:40:23 UTC (rev 1227) +++ trunk/console/integration/src/main/java/org/jboss/soa/bpel/console/SVGPlugin.java 2011-01-10 15:43:33 UTC (rev 1228) @@ -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.ServerConfig; -import org.jboss.soa.dsp.server.jboss.ServerConfigFactory; +import org.jboss.soa.dsp.server.jboss.JBossServerConfig; +import org.jboss.soa.dsp.server.jboss.JBossServerConfigFactory; 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 - ServerConfig serverConfig = ServerConfigFactory.createServerConfig(); + JBossServerConfig serverConfig = JBossServerConfigFactory.createServerConfig(); this.webServiceHost = serverConfig.getWebServiceHost(); this.webServicePort = serverConfig.getWebServicePort(); Modified: trunk/distribution/src/main/release/db/jboss/jboss-beans.xml =================================================================== --- trunk/distribution/src/main/release/db/jboss/jboss-beans.xml 2011-01-10 15:40:23 UTC (rev 1227) +++ trunk/distribution/src/main/release/db/jboss/jboss-beans.xml 2011-01-10 15:43:33 UTC (rev 1228) @@ -34,7 +34,7 @@ ServerConfig --> <bean name="org.jboss.soa.dsp:service=ServerConfig" - class="org.jboss.soa.dsp.server.jboss.ServerConfigImpl"> + class="org.jboss.soa.dsp.server.jboss.JBossServerConfigImpl"> <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property> <property name="webServiceHost">${jboss.bind.address}</property> </bean> 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-10 15:40:23 UTC (rev 1227) +++ trunk/runtime/clustering/src/main/resources/META-INF/jboss-beans.xml 2011-01-10 15:43:33 UTC (rev 1228) @@ -35,7 +35,7 @@ ServerConfig --> <bean name="org.jboss.soa.dsp:service=ServerConfig" - class="org.jboss.soa.dsp.server.jboss.ServerConfigImpl"> + class="org.jboss.soa.dsp.server.jboss.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/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-10 15:40:23 UTC (rev 1227) +++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/BPELEngineImpl.java 2011-01-10 15:43:33 UTC (rev 1228) @@ -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.ServerConfigFactory; +import org.jboss.soa.dsp.server.jboss.JBossServerConfigFactory; import org.w3c.dom.Element; import javax.transaction.*; @@ -485,7 +485,7 @@ protected Scheduler createScheduler() { - String clusterNodeName=ServerConfigFactory.createServerConfig().getClusterNodeName(); + String clusterNodeName=JBossServerConfigFactory.createServerConfig().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-10 15:40:23 UTC (rev 1227) +++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/JAXWSBindingContext.java 2011-01-10 15:43:33 UTC (rev 1228) @@ -23,7 +23,7 @@ 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.ServerConfigFactory; +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-10 15:40:23 UTC (rev 1227) +++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/EndpointManager.java 2011-01-10 15:43:33 UTC (rev 1228) @@ -45,7 +45,7 @@ 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.server.jboss.JBossServerConfigFactory; import org.jboss.soa.dsp.ws.BaseWebServiceEndpoint; import org.jboss.soa.dsp.ws.DeploymentBuilder; import org.jboss.soa.dsp.ws.WSDLParser; @@ -92,7 +92,7 @@ public EndpointManager(ExecutionEnvironment executionEnvironment) { this.executionEnvironment = executionEnvironment; - this.serverConfig = ServerConfigFactory.createServerConfig(); + this.serverConfig = JBossServerConfigFactory.createServerConfig(); if (isUDDIRegistration()) { try { uddiRegistration = UDDIClientFactory.newInstance(executionEnvironment.getOdeConfig().getProperties()); 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-10 15:40:23 UTC (rev 1227) +++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/WebServiceClient.java 2011-01-10 15:43:33 UTC (rev 1228) @@ -54,7 +54,8 @@ 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.ServerConfigFactory; +import org.jboss.soa.dsp.server.jboss.JBossServerConfig; +import org.jboss.soa.dsp.server.jboss.JBossServerConfigFactory; import org.jboss.soa.dsp.ws.DOMWriter; import org.jboss.soa.dsp.ws.JavaUtils; import org.jboss.soa.dsp.ws.SOAPMessageAdapter; @@ -115,7 +116,7 @@ private synchronized void initialize() { if (isUDDILookup()) { try { - ServerConfig serverConfig=ServerConfigFactory.createServerConfig(); + JBossServerConfig serverConfig=JBossServerConfigFactory.createServerConfig(); String webServiceHost = serverConfig.getWebServiceHost(); int webServicePort = serverConfig.getWebServicePort(); URL url = new URL("http://" + webServiceHost + ":" + webServicePort); 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-10 15:40:23 UTC (rev 1227) +++ trunk/runtime/uddi/src/main/java/org/jboss/soa/bpel/uddi/UDDIRegistrationImpl.java 2011-01-10 15:43:33 UTC (rev 1228) @@ -47,7 +47,8 @@ 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.ServerConfigFactory; +import org.jboss.soa.dsp.server.jboss.JBossServerConfig; +import org.jboss.soa.dsp.server.jboss.JBossServerConfigFactory; import org.jboss.soa.dsp.ws.WSDLReference; import org.uddi.api_v3.AccessPoint; import org.uddi.api_v3.BindingTemplate; @@ -201,7 +202,7 @@ if (bpelClerk!=null) { try { Properties properties = bpelClerk.getUDDINode().getProperties(); - properties.put("nodeName", ServerConfigFactory.createServerConfig().getUddiNodeName()); + properties.put("nodeName", JBossServerConfigFactory.createServerConfig().getUddiNodeName()); //Constructing the bindingKey String bindingKey = TokenResolver.replaceTokens(DEFAULT_BINDING_KEY_FORMAT + bindingName, properties); if (properties.containsKey(BINDING_KEY_FORMAT)) { @@ -252,7 +253,7 @@ String serviceName, String portName, URL accessUrl) throws DispositionReportFaultMessage, RemoteException, ConfigurationException, TransportException { Properties properties = clerk.getUDDINode().getProperties(); - properties.put("nodeName", ServerConfigFactory.createServerConfig().getUddiNodeName()); + properties.put("nodeName", JBossServerConfigFactory.createServerConfig().getUddiNodeName()); //Constructing the serviceKey String serviceKey = TokenResolver.replaceTokens(DEFAULT_SERVICE_KEY_FORMAT + serviceName, properties); @@ -522,7 +523,7 @@ private String getDefaultWebServiceBaseUrl() { try { - ServerConfig serverConfig=ServerConfigFactory.createServerConfig(); + JBossServerConfig serverConfig=JBossServerConfigFactory.createServerConfig(); String webServiceHost = serverConfig.getWebServiceHost(); int webServicePort = serverConfig.getWebServicePort(); URL theURL = new URL("http://" + webServiceHost + ":" + webServicePort);