Author: alex.guizar(a)jboss.com Date: 2007-01-30 16:23:58 -0500 (Tue, 30 Jan 2007) New Revision: 2199 Modified: branches/jbossws-1.2.0/jbossws-tests/build.xml branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/wsbpel/JbpmBpelTestSetup.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/BpelHelloTestCase.java Log: JBWS-1496 Modified: branches/jbossws-1.2.0/jbossws-tests/build.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/build.xml 2007-01-30 19:47:27 UTC (rev 2198) +++ branches/jbossws-1.2.0/jbossws-tests/build.xml 2007-01-30 21:23:58 UTC (rev 2199) @@ -208,15 +208,18 @@ <!-- The jBPM BPEL classpath --> <path id="jbpm.bpel.classpath"> <path refid="jbossws.jars.classpath"/> - <pathelement location="${thirdparty.dir}/jbpm-bpel" /> - <pathelement location="${thirdparty.dir}/jbpm-bpel/jbpm-bpel.jar" /> - <pathelement location="${thirdparty.dir}/jbpm-bpel/jbpm-jpdl.jar" /> - <pathelement location="${thirdparty.dir}/jbpm-bpel/commons-lang.jar" /> - <pathelement location="${thirdparty.dir}/jbpm-bpel/jaxen.jar" /> + <pathelement location="${thirdparty.dir}/jbpm-bpel"/> <!-- jbpm.cfg.xml --> + <pathelement location="${thirdparty.dir}/jbpm-bpel/jbpm-bpel.jar" /> + <pathelement location="${thirdparty.dir}/jbpm-bpel/jbpm-jpdl.jar" /> + <pathelement location="${thirdparty.dir}/jbpm-bpel/commons-lang.jar" /> + <pathelement location="${thirdparty.dir}/jbpm-bpel/jaxen.jar" /> <pathelement location="${thirdparty.dir}/commons-collections.jar"/> <pathelement location="${thirdparty.dir}/commons-logging.jar"/> <pathelement location="${thirdparty.dir}/dom4j.jar"/> <pathelement location="${thirdparty.dir}/wsdl4j.jar"/> + <pathelement location="${tests.etc.dir}"/> <!-- log4j.xml --> + <pathelement location="${thirdparty.dir}/log4j.jar"/> + <pathelement location="${thirdparty.dir}/jboss-logging-log4j.jar"/> </path> </target> Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/wsbpel/JbpmBpelTestSetup.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/wsbpel/JbpmBpelTestSetup.java 2007-01-30 19:47:27 UTC (rev 2198) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/wsbpel/JbpmBpelTestSetup.java 2007-01-30 21:23:58 UTC (rev 2199) @@ -28,7 +28,7 @@ import org.jboss.test.ws.JBossWSTestHelper; /** - * A test setup that deploys process files. + * A test setup that deploys process archives. * * @author <a href="mailto:alex.guizar@jboss.com">Alejandro Guizar</a> * @version $Revision$ @@ -37,9 +37,9 @@ { private final String[] processFiles; - protected static final Logger log = Logger.getLogger(JbpmBpelTestSetup.class); + private static final Logger log = Logger.getLogger(JbpmBpelTestSetup.class); - public JbpmBpelTestSetup(Test test, String... processFiles) + public JbpmBpelTestSetup(Test test, String[] processFiles) { super(test); this.processFiles = processFiles; @@ -77,7 +77,6 @@ private static int submitRequest(URL targetUrl) throws IOException { - // create http connection HttpURLConnection httpConnection = (HttpURLConnection)targetUrl.openConnection(); try @@ -98,7 +97,14 @@ public static int getServerHttpPort() { - return Integer.getInteger("jbpm.bpel.http.port", 8080); + try + { + return Integer.parseInt(System.getProperty("jbpm.bpel.http.port")); + } + catch (NumberFormatException e) + { + return 8080; + } } public static String getJbpmBpelDeployContext() Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/BpelHelloTestCase.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/BpelHelloTestCase.java 2007-01-30 19:47:27 UTC (rev 2198) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/BpelHelloTestCase.java 2007-01-30 21:23:58 UTC (rev 2199) @@ -43,24 +43,21 @@ public static Test suite() { - JBossWSTestSetup testSetup = JBossWSTestSetup.newTestSetup(BpelHelloTestCase.class, "jaxrpc-samples-wsbpel-hello.war, jaxrpc-samples-wsbpel-hello-client.jar"); - return new JbpmBpelTestSetup(testSetup, "libs/jaxrpc-samples-wsbpel-hello-process.zip"); + JBossWSTestSetup wsTestSetup = JBossWSTestSetup.newTestSetup(BpelHelloTestCase.class, "jaxrpc-samples-wsbpel-hello.war, jaxrpc-samples-wsbpel-hello-client.jar"); + return new JbpmBpelTestSetup(wsTestSetup, new String[] { "libs/jaxrpc-samples-wsbpel-hello-process.zip" }); } protected void setUp() throws Exception { - if (helloService == null) + if (isTargetJBoss()) { - if (isTargetJBoss()) - { - InitialContext iniCtx = getInitialContext(); - helloService = (HelloWorldService)iniCtx.lookup("java:comp/env/service/BpelHello"); - } - else - { - throw new IllegalStateException("Unsupported target server"); - } + InitialContext iniCtx = getInitialContext(); + helloService = (HelloWorldService)iniCtx.lookup("java:comp/env/service/BpelHello"); } + else + { + throw new IllegalStateException("Unsupported target server"); + } } public void testSayHelloProxy() throws Exception