Author: alessio.soldano(a)jboss.com Date: 2007-11-12 17:58:29 -0500 (Mon, 12 Nov 2007) New Revision: 5035 Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/interop/nov2007/wsaSoap12/AddressingTestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/interop/nov2007/wsse/AbstractWSSEBase.java stack/native/trunk/src/test/resources/interop/nov2007/wsaSoap12/META-INF/scenarios.xml stack/native/trunk/src/test/resources/interop/nov2007/wsse/encrypt/META-INF/scenarios.xml stack/native/trunk/src/test/resources/interop/nov2007/wsse/encrypt3DES/META-INF/scenarios.xml stack/native/trunk/src/test/resources/interop/nov2007/wsse/usernameTokenHTTPS/META-INF/scenarios.xml Log: Replacing localhost with a placeholder in scenario urls to set it using the actual jboss bind address Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/interop/nov2007/wsaSoap12/AddressingTestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/interop/nov2007/wsaSoap12/AddressingTestCase.java 2007-11-12 14:08:23 UTC (rev 5034) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/interop/nov2007/wsaSoap12/AddressingTestCase.java 2007-11-12 22:58:29 UTC (rev 5035) @@ -132,25 +132,28 @@ private void configureClient() { - ((BindingProvider)echoPort).getRequestContext().put( - BindingProvider.ENDPOINT_ADDRESS_PROPERTY, "http://"+getServerHost()+":8080/nov2007/wsaSoap12/echo" - ); - - ((BindingProvider)notifyPort).getRequestContext().put( - BindingProvider.ENDPOINT_ADDRESS_PROPERTY, "http://"+getServerHost()+":8080/nov2007/wsaSoap12/notify" - ); - - InteropConfigFactory factory = InteropConfigFactory.newInstance(); ClientScenario scenario = factory.createClientScenario(System.getProperty("client.scenario")); - //ClientScenario scenario = factory.createClientScenario("msft-public"); if(scenario!=null) { String notifyEndpoint = scenario.getTargetEndpoint().toString(); log.info("Using scenario: " + scenario); log.info("Endpoint at: " + notifyEndpoint); - - ((BindingProvider)echoPort).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, scenario.getParameter("echoPort")); + + + if (notifyEndpoint.contains("REPLACE_WITH_ACTUAL_HOST")) + { + notifyEndpoint = notifyEndpoint.replace("REPLACE_WITH_ACTUAL_HOST", getServerHost()); + } + System.out.println("Using notify target endpoint: " + notifyEndpoint); + String echoEndpoint = scenario.getParameter("echoPort"); + if (echoEndpoint.contains("REPLACE_WITH_ACTUAL_HOST")) + { + echoEndpoint = echoEndpoint.replace("REPLACE_WITH_ACTUAL_HOST", getServerHost()); + } + System.out.println("... and echo target endpoint: " + echoEndpoint); + + ((BindingProvider)echoPort).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, echoEndpoint); ((BindingProvider)notifyPort).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, notifyEndpoint); } Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/interop/nov2007/wsse/AbstractWSSEBase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/interop/nov2007/wsse/AbstractWSSEBase.java 2007-11-12 14:08:23 UTC (rev 5034) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/interop/nov2007/wsse/AbstractWSSEBase.java 2007-11-12 22:58:29 UTC (rev 5035) @@ -72,14 +72,19 @@ protected void configureClient() { - + InteropConfigFactory factory = InteropConfigFactory.newInstance(); ClientScenario scenario = factory.createClientScenario(System.getProperty("client.scenario")); if (scenario != null) { - System.out.println("SCENARIO: "+scenario); log.info("Using scenario: " + scenario); - ((BindingProvider)port).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, scenario.getTargetEndpoint().toString()); + String targetEndpoint = scenario.getTargetEndpoint().toString(); + if (targetEndpoint.contains("REPLACE_WITH_ACTUAL_HOST")) + { + targetEndpoint = targetEndpoint.replace("REPLACE_WITH_ACTUAL_HOST", getServerHost()); + } + System.out.println("Using target endpoint: " + targetEndpoint); + ((BindingProvider)port).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, targetEndpoint); } else { Modified: stack/native/trunk/src/test/resources/interop/nov2007/wsaSoap12/META-INF/scenarios.xml =================================================================== --- stack/native/trunk/src/test/resources/interop/nov2007/wsaSoap12/META-INF/scenarios.xml 2007-11-12 14:08:23 UTC (rev 5034) +++ stack/native/trunk/src/test/resources/interop/nov2007/wsaSoap12/META-INF/scenarios.xml 2007-11-12 22:58:29 UTC (rev 5035) @@ -1,7 +1,7 @@ <client-scenarios> <scenario name="default" description="Testing local WSA endpoints"> - <target-endpoint>http://localhost:8080/nov2007/wsaSoap12/notify</target-endpoint> - <param name="echoPort" value="http://localhost:8080/nov2007/wsaSoap12/echo"/> + <target-endpoint>http://REPLACE_WITH_ACTUAL_HOST:8080/nov2007/wsaSoap12/notify</target-endpoint> + <param name="echoPort" value="http://REPLACE_WITH_ACTUAL_HOST:8080/nov2007/wsaSoap12/echo"/> </scenario> <scenario name="default-munich" description="Testing Munich WSA endpoints"> <target-endpoint>http://jbossws.demo.jboss.com:8080/nov2007/wsaSoap12/notify</target-endpoint> Modified: stack/native/trunk/src/test/resources/interop/nov2007/wsse/encrypt/META-INF/scenarios.xml =================================================================== --- stack/native/trunk/src/test/resources/interop/nov2007/wsse/encrypt/META-INF/scenarios.xml 2007-11-12 14:08:23 UTC (rev 5034) +++ stack/native/trunk/src/test/resources/interop/nov2007/wsse/encrypt/META-INF/scenarios.xml 2007-11-12 22:58:29 UTC (rev 5035) @@ -1,6 +1,6 @@ <client-scenarios> <scenario name="default" description="Testing local endpoint"> - <target-endpoint>http://localhost:8080/nov2007/wsseEncrypt/endpoint</target-endpoint> + <target-endpoint>http://REPLACE_WITH_ACTUAL_HOST:8080/nov2007/wsseEncrypt/endpoint</target-endpoint> </scenario> <scenario name="default-munich" description="Testing Munich endpoint"> <target-endpoint>http://jbossws.demo.jboss.com:8080/nov2007/wsseEncrypt/endpoint</target-endpoint> Modified: stack/native/trunk/src/test/resources/interop/nov2007/wsse/encrypt3DES/META-INF/scenarios.xml =================================================================== --- stack/native/trunk/src/test/resources/interop/nov2007/wsse/encrypt3DES/META-INF/scenarios.xml 2007-11-12 14:08:23 UTC (rev 5034) +++ stack/native/trunk/src/test/resources/interop/nov2007/wsse/encrypt3DES/META-INF/scenarios.xml 2007-11-12 22:58:29 UTC (rev 5035) @@ -1,6 +1,6 @@ <client-scenarios> <scenario name="default" description="Testing local endpoint"> - <target-endpoint>http://localhost:8080/nov2007/wsseEncrypt3DES/endpoint</target-endpoint> + <target-endpoint>http://REPLACE_WITH_ACTUAL_HOST:8080/nov2007/wsseEncrypt3DES/endpoint</target-endpoint> </scenario> <scenario name="default-munich" description="Testing Munich endpoint"> <target-endpoint>http://jbossws.demo.jboss.com:8080/nov2007/wsseEncrypt3DES/endpoint</target-endpoint> Modified: stack/native/trunk/src/test/resources/interop/nov2007/wsse/usernameTokenHTTPS/META-INF/scenarios.xml =================================================================== --- stack/native/trunk/src/test/resources/interop/nov2007/wsse/usernameTokenHTTPS/META-INF/scenarios.xml 2007-11-12 14:08:23 UTC (rev 5034) +++ stack/native/trunk/src/test/resources/interop/nov2007/wsse/usernameTokenHTTPS/META-INF/scenarios.xml 2007-11-12 22:58:29 UTC (rev 5035) @@ -1,6 +1,6 @@ <client-scenarios> <scenario name="default" description="Testing local endpoint"> - <target-endpoint>https://localhost:8443/nov2007/wsseUsernameTokenHTTPS/endpoint</target-endpoint> + <target-endpoint>https://REPLACE_WITH_ACTUAL_HOST:8443/nov2007/wsseUsernameTokenHTTPS/endpoint</target-endpoint> </scenario> <scenario name="default-munich" description="Testing Munich endpoint"> <target-endpoint>https://jbossws.demo.jboss.com:8443/nov2007/wsseUsernameTokenHTTPS/endpoint</target-endpoint>