Author: objectiser Date: 2010-12-02 09:37:45 -0500 (Thu, 02 Dec 2010) New Revision: 1177 Modified: trunk/console/integration/src/main/java/org/jboss/soa/bpel/console/SVGPlugin.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/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: Change API for server config factory. 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-12-02 12:05:03 UTC (rev 1176) +++ trunk/console/integration/src/main/java/org/jboss/soa/bpel/console/SVGPlugin.java 2010-12-02 14:37:45 UTC (rev 1177) @@ -69,7 +69,7 @@ public SVGPlugin() { // host & port resolution - ServerConfig serverConfig = ServerConfigFactory.getServerConfig(); + ServerConfig serverConfig = ServerConfigFactory.createServerConfig(); this.webServiceHost = serverConfig.getWebServiceHost(); this.webServicePort = serverConfig.getWebServicePort(); 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-12-02 12:05:03 UTC (rev 1176) +++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/BPELEngineImpl.java 2010-12-02 14:37:45 UTC (rev 1177) @@ -485,7 +485,7 @@ protected Scheduler createScheduler() { - String clusterNodeName=ServerConfigFactory.getServerConfig().getClusterNodeName(); + String clusterNodeName=ServerConfigFactory.createServerConfig().getClusterNodeName(); __log.info("Scheduler node name: "+clusterNodeName); 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-12-02 12:05:03 UTC (rev 1176) +++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/EndpointManager.java 2010-12-02 14:37:45 UTC (rev 1177) @@ -92,7 +92,7 @@ public EndpointManager(ExecutionEnvironment executionEnvironment) { this.executionEnvironment = executionEnvironment; - this.serverConfig = ServerConfigFactory.getServerConfig(); + this.serverConfig = ServerConfigFactory.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 2010-12-02 12:05:03 UTC (rev 1176) +++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/WebServiceClient.java 2010-12-02 14:37:45 UTC (rev 1177) @@ -53,6 +53,7 @@ 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.server.ServerConfig; import org.jboss.soa.dsp.server.jboss.ServerConfigFactory; import org.jboss.soa.dsp.ws.DOMWriter; import org.jboss.soa.dsp.ws.JavaUtils; @@ -114,11 +115,12 @@ private synchronized void initialize() { if (isUDDILookup()) { try { - String webServiceHost = ServerConfigFactory.getServerConfig().getWebServiceHost(); - int webServicePort = ServerConfigFactory.getServerConfig().getWebServicePort(); + ServerConfig serverConfig=ServerConfigFactory.createServerConfig(); + String webServiceHost = serverConfig.getWebServiceHost(); + int webServicePort = serverConfig.getWebServicePort(); URL url = new URL("http://" + webServiceHost + ":" + webServicePort); if (isWebserviceSecure()) { - int secureWebServicePort = ServerConfigFactory.getServerConfig().getWebServicePort(); + int secureWebServicePort = serverConfig.getWebServicePort(); url = new URL("https://" + webServiceHost + ":" + secureWebServicePort); } //give the user the option to override 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-12-02 12:05:03 UTC (rev 1176) +++ trunk/runtime/uddi/src/main/java/org/jboss/soa/bpel/uddi/UDDIRegistrationImpl.java 2010-12-02 14:37:45 UTC (rev 1177) @@ -46,6 +46,7 @@ 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.dsp.server.ServerConfig; import org.jboss.soa.dsp.server.jboss.ServerConfigFactory; import org.jboss.soa.dsp.ws.WSDLReference; import org.uddi.api_v3.AccessPoint; @@ -200,7 +201,7 @@ if (bpelClerk!=null) { try { Properties properties = bpelClerk.getUDDINode().getProperties(); - properties.put("nodeName", ServerConfigFactory.getServerConfig().getUddiNodeName()); + properties.put("nodeName", ServerConfigFactory.createServerConfig().getUddiNodeName()); //Constructing the bindingKey String bindingKey = TokenResolver.replaceTokens(DEFAULT_BINDING_KEY_FORMAT + bindingName, properties); if (properties.containsKey(BINDING_KEY_FORMAT)) { @@ -251,7 +252,7 @@ String serviceName, String portName, URL accessUrl) throws DispositionReportFaultMessage, RemoteException, ConfigurationException, TransportException { Properties properties = clerk.getUDDINode().getProperties(); - properties.put("nodeName", ServerConfigFactory.getServerConfig().getUddiNodeName()); + properties.put("nodeName", ServerConfigFactory.createServerConfig().getUddiNodeName()); //Constructing the serviceKey String serviceKey = TokenResolver.replaceTokens(DEFAULT_SERVICE_KEY_FORMAT + serviceName, properties); @@ -521,11 +522,12 @@ private String getDefaultWebServiceBaseUrl() { try { - String webServiceHost = ServerConfigFactory.getServerConfig().getWebServiceHost(); - int webServicePort = ServerConfigFactory.getServerConfig().getWebServicePort(); + ServerConfig serverConfig=ServerConfigFactory.createServerConfig(); + String webServiceHost = serverConfig.getWebServiceHost(); + int webServicePort = serverConfig.getWebServicePort(); URL theURL = new URL("http://" + webServiceHost + ":" + webServicePort); if (Boolean.valueOf(properties.getProperty(WebServiceClient.BPEL_WEBSERVICE_SECURE, "false"))) { - int secureWebServicePort = ServerConfigFactory.getServerConfig().getWebServicePort(); + int secureWebServicePort = serverConfig.getWebServicePort(); theURL = new URL("https://" + webServiceHost + ":" + secureWebServicePort); } return theURL.toExternalForm();