From jbossws-commits at lists.jboss.org Tue Jan 30 16:23:58 2007
Content-Type: multipart/mixed; boundary="===============4345484791606101804=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r2199 - in
 branches/jbossws-1.2.0/jbossws-tests:
 src/main/java/org/jboss/test/ws/jaxrpc/samples/wsbpel and 1 other
 directories.
Date: Tue, 30 Jan 2007 16:23:58 -0500
Message-ID: <E1HC0SM-0006aN-Ix@committer01.frg.pub.inap.atl.jboss.com>

--===============4345484791606101804==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

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/jax=
rpc/samples/wsbpel/JbpmBpelTestSetup.java
   branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jax=
rpc/samples/wsbpel/hello/BpelHelloTestCase.java
Log:
JBWS-1496

Modified: branches/jbossws-1.2.0/jbossws-tests/build.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- 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=3D"jbpm.bpel.classpath">
       <path refid=3D"jbossws.jars.classpath"/>
-	  <pathelement location=3D"${thirdparty.dir}/jbpm-bpel" />
-	  <pathelement location=3D"${thirdparty.dir}/jbpm-bpel/jbpm-bpel.jar" />
-	  <pathelement location=3D"${thirdparty.dir}/jbpm-bpel/jbpm-jpdl.jar" />
-	  <pathelement location=3D"${thirdparty.dir}/jbpm-bpel/commons-lang.jar" =
/>
-	  <pathelement location=3D"${thirdparty.dir}/jbpm-bpel/jaxen.jar" />
+      <pathelement location=3D"${thirdparty.dir}/jbpm-bpel"/> <!-- jbpm.cf=
g.xml -->
+      <pathelement location=3D"${thirdparty.dir}/jbpm-bpel/jbpm-bpel.jar" =
/>
+      <pathelement location=3D"${thirdparty.dir}/jbpm-bpel/jbpm-jpdl.jar" =
/>
+      <pathelement location=3D"${thirdparty.dir}/jbpm-bpel/commons-lang.ja=
r" />
+      <pathelement location=3D"${thirdparty.dir}/jbpm-bpel/jaxen.jar" />
       <pathelement location=3D"${thirdparty.dir}/commons-collections.jar"/>
       <pathelement location=3D"${thirdparty.dir}/commons-logging.jar"/>
       <pathelement location=3D"${thirdparty.dir}/dom4j.jar"/>
       <pathelement location=3D"${thirdparty.dir}/wsdl4j.jar"/>
+      <pathelement location=3D"${tests.etc.dir}"/> <!-- log4j.xml -->
+      <pathelement location=3D"${thirdparty.dir}/log4j.jar"/>
+      <pathelement location=3D"${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
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/ja=
xrpc/samples/wsbpel/JbpmBpelTestSetup.java	2007-01-30 19:47:27 UTC (rev 219=
8)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/ja=
xrpc/samples/wsbpel/JbpmBpelTestSetup.java	2007-01-30 21:23:58 UTC (rev 219=
9)
@@ -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=3D"mailto:alex.guizar(a)jboss.com">Alejandro Guizar</a>
  * @version $Revision$
@@ -37,9 +37,9 @@
 {
    private final String[] processFiles;
 =

-   protected static final Logger log =3D Logger.getLogger(JbpmBpelTestSetu=
p.class);
+   private static final Logger log =3D Logger.getLogger(JbpmBpelTestSetup.=
class);
 =

-   public JbpmBpelTestSetup(Test test, String... processFiles)
+   public JbpmBpelTestSetup(Test test, String[] processFiles)
    {
       super(test);
       this.processFiles =3D processFiles;
@@ -77,7 +77,6 @@
 =

    private static int submitRequest(URL targetUrl) throws IOException
    {
-      // create http connection
       HttpURLConnection httpConnection =3D (HttpURLConnection)targetUrl.op=
enConnection();
 =

       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
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/ja=
xrpc/samples/wsbpel/hello/BpelHelloTestCase.java	2007-01-30 19:47:27 UTC (r=
ev 2198)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/ja=
xrpc/samples/wsbpel/hello/BpelHelloTestCase.java	2007-01-30 21:23:58 UTC (r=
ev 2199)
@@ -43,24 +43,21 @@
 =

    public static Test suite()
    {
-      JBossWSTestSetup testSetup =3D JBossWSTestSetup.newTestSetup(BpelHel=
loTestCase.class, "jaxrpc-samples-wsbpel-hello.war, jaxrpc-samples-wsbpel-h=
ello-client.jar");
-      return new JbpmBpelTestSetup(testSetup, "libs/jaxrpc-samples-wsbpel-=
hello-process.zip");
+      JBossWSTestSetup wsTestSetup =3D JBossWSTestSetup.newTestSetup(BpelH=
elloTestCase.class, "jaxrpc-samples-wsbpel-hello.war, jaxrpc-samples-wsbpel=
-hello-client.jar");
+      return new JbpmBpelTestSetup(wsTestSetup, new String[] { "libs/jaxrp=
c-samples-wsbpel-hello-process.zip" });
    }
 =

    protected void setUp() throws Exception
    {
-      if (helloService =3D=3D null)
+      if (isTargetJBoss())
       {
-         if (isTargetJBoss())
-         {
-            InitialContext iniCtx =3D getInitialContext();
-            helloService =3D (HelloWorldService)iniCtx.lookup("java:comp/e=
nv/service/BpelHello");
-         }
-         else
-         {
-            throw new IllegalStateException("Unsupported target server");
-         }
+         InitialContext iniCtx =3D getInitialContext();
+         helloService =3D (HelloWorldService)iniCtx.lookup("java:comp/env/=
service/BpelHello");
       }
+      else
+      {
+         throw new IllegalStateException("Unsupported target server");
+      }
    }
 =

    public void testSayHelloProxy() throws Exception


--===============4345484791606101804==--