[jboss-svn-commits] JBossWS SVN: r1174 - in branches/jbossws-1.0: . src/ant src/main/resources/samples/jaxrpc/wsbpel src/test/java/org/jboss/test/ws/jaxrpc/samples/wsbpel/hello
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Oct 9 17:28:19 EDT 2006
Author: alex.guizar at jboss.com
Date: 2006-10-09 17:28:11 -0400 (Mon, 09 Oct 2006)
New Revision: 1174
Modified:
branches/jbossws-1.0/src/ant/build-samples.xml
branches/jbossws-1.0/src/main/resources/samples/jaxrpc/wsbpel/build.xml
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/BpelHelloTestCase.java
branches/jbossws-1.0/version.properties
Log:
JBWS-868
Modified: branches/jbossws-1.0/src/ant/build-samples.xml
===================================================================
--- branches/jbossws-1.0/src/ant/build-samples.xml 2006-10-09 14:52:57 UTC (rev 1173)
+++ branches/jbossws-1.0/src/ant/build-samples.xml 2006-10-09 21:28:11 UTC (rev 1174)
@@ -249,7 +249,10 @@
</copy>
<copy todir="${build.src.samples.dir}/jaxrpc/wsbpel/resources">
<fileset dir="${test.resources.dir}/jaxrpc/samples/wsbpel" />
- </copy>
+ </copy>
+ <get dest="${build.src.samples.dir}/lib/jbpm-bpel.sar"
+ src="${jboss.repository}/jbpm/bpel/${jbpm-bpel}/lib/jbpm-bpel.sar"
+ usetimestamp="true" verbose="true" />
<!-- samples/wseventing -->
<mkdir dir="${build.src.samples.dir}/jaxrpc/wseventing/java"/>
Modified: branches/jbossws-1.0/src/main/resources/samples/jaxrpc/wsbpel/build.xml
===================================================================
--- branches/jbossws-1.0/src/main/resources/samples/jaxrpc/wsbpel/build.xml 2006-10-09 14:52:57 UTC (rev 1173)
+++ branches/jbossws-1.0/src/main/resources/samples/jaxrpc/wsbpel/build.xml 2006-10-09 21:28:11 UTC (rev 1174)
@@ -5,7 +5,7 @@
<project default="main" basedir="../.." name="JBossWS Examples">
<property name="chapter" value="jaxrpc/wsbpel" />
- <property name="sample.path" value="jaxrpc/samples/wsbpel"/>
+ <property name="sample.path" value="jaxrpc/samples/wsbpel" />
<property name="java.dir" value="${basedir}/${chapter}/java" />
<property name="resources.dir" value="${basedir}/${chapter}/resources" />
@@ -23,11 +23,13 @@
value="${jboss.server.deploy}/jbpm-bpel.sar" />
<available property="jbpmbpel.available"
file="${jboss.server.deploy.jbpmbpel}" />
-
+ <antcall target="install-jbpmbpel" />
<path id="jbpmbpel.classpath">
<path refid="client.classpath" />
- <path location="${jboss.lib}/dom4j.jar" />
- <path location="${jboss.server.lib}/commons-collections.jar" />
+ <fileset dir="${jboss.server.lib}">
+ <include name="dom4j.jar" />
+ <include name="commons-collections.jar" />
+ </fileset>
<fileset dir="${jboss.server.deploy.jbpmbpel}">
<include name="jbpm*.jar" />
<include name="commons-lang*.jar" />
@@ -38,9 +40,14 @@
</path>
</target>
+ <target name="install-jbpmbpel" unless="jbpmbpel.available">
+ <mkdir dir="${jboss.server.deploy.jbpmbpel}" />
+ <unjar dest="${jboss.server.deploy.jbpmbpel}"
+ src="${basedir}/lib/jbpm-bpel.sar" />
+ </target>
+
<target name="generate-sources"
depends="zip-processes,check-jbpmbpel"
- if="jbpmbpel.available"
description="Generate the deployment resources.">
<!-- Define the servicegen ant task -->
@@ -77,7 +84,6 @@
-->
<target name="jars"
depends="compile,copy-resources,generate-sources,compile-generated,copy-generated"
- if="jbpmbpel.available"
description="build the deployments">
<!-- jaxrpc-samples-wsbpel -->
@@ -114,7 +120,7 @@
</target>
- <target name="store-processes" if="jbpmbpel.available">
+ <target name="store-processes">
<taskdef name="storeprocess"
classname="org.jbpm.bpel.ant.DeployProcessTask">
<classpath refid="jbpmbpel.classpath" />
@@ -128,8 +134,7 @@
-->
<target name="tests"
depends="jars,store-processes"
- description="run the testsuite"
- if="jbpmbpel.available">
+ description="run the testsuite">
<antcall target="test">
<param name="test" value="${sample.path}" />
</antcall>
Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/BpelHelloTestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/BpelHelloTestCase.java 2006-10-09 14:52:57 UTC (rev 1173)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/BpelHelloTestCase.java 2006-10-09 21:28:11 UTC (rev 1174)
@@ -14,10 +14,14 @@
*/
package org.jboss.test.ws.jaxrpc.samples.wsbpel.hello;
+import javax.naming.InitialContext;
import javax.xml.namespace.QName;
import javax.xml.rpc.Call;
+import junit.framework.Test;
+
import org.jboss.test.ws.JBossWSTest;
+import org.jboss.test.ws.JBossWSTestSetup;
/**
* Test business process behavior based on web services.
@@ -29,37 +33,29 @@
{
private HelloWorldService service;
- /*
- public static Test suite()
- {
- return JBossWSTestSetup.newTestSetup(BpelHelloTestCase.class, "jaxrpc-samples-wsbpel-hello.war, jaxrpc-samples-wsbpel-hello-client.jar");
- }
+ public static Test suite()
+ {
+ return JBossWSTestSetup.newTestSetup(BpelHelloTestCase.class, "jaxrpc-samples-wsbpel-hello.war, jaxrpc-samples-wsbpel-hello-client.jar");
+ }
- protected void setUp() throws Exception
- {
- if (service == null)
- {
- if (isTargetServerJBoss())
- {
- InitialContext iniCtx = getInitialContext();
- service = (HelloWorldService)iniCtx.lookup("java:comp/env/service/BpelHello");
- }
- else
- {
- throw new IllegalStateException("Unsupported target server");
- }
- }
- }
- */
-
- public void testSayHelloProxy() throws Exception
+ protected void setUp() throws Exception
{
- if (true)
+ if (service == null)
{
- System.out.println("FIXME: JBWS-868");
- return;
+ if (isTargetServerJBoss())
+ {
+ InitialContext iniCtx = getInitialContext();
+ service = (HelloWorldService)iniCtx.lookup("java:comp/env/service/BpelHello");
+ }
+ else
+ {
+ throw new IllegalStateException("Unsupported target server");
+ }
}
+ }
+ public void testSayHelloProxy() throws Exception
+ {
Greeter proxy = service.getGreeterPort();
String greeting = proxy.sayHello("Popeye");
@@ -68,11 +64,6 @@
public void testSayHelloDII() throws Exception
{
- if (true)
- {
- System.out.println("FIXME: JBWS-868");
- return;
- }
String portTypeNS = "http://jbpm.org/examples/hello";
Call call = service.createCall(new QName(portTypeNS, "GreeterPort"));
call.setOperationName(new QName(portTypeNS, "sayHello"));
Modified: branches/jbossws-1.0/version.properties
===================================================================
--- branches/jbossws-1.0/version.properties 2006-10-09 14:52:57 UTC (rev 1173)
+++ branches/jbossws-1.0/version.properties 2006-10-09 21:28:11 UTC (rev 1174)
@@ -1,5 +1,5 @@
-# $Id: $
+# $Id$
specification.title=JBossWS
specification.vendor=JBoss (http://www.jboss.org)
@@ -30,6 +30,7 @@
jboss-backport-concurrent=2.1.0.GA
jboss-jbossretro=1.0.2.GA
jbossas=4.0.4.GA
+jbpm-bpel=1.1.Beta2
junit=3.8.1
oswego-concurrent=1.3.4
qdox=1.4
More information about the jboss-svn-commits
mailing list