Author: lresende
Date: Mon Jan 28 08:55:15 2008
New Revision: 615949
URL: http://svn.apache.org/viewvc?rev=615949&view=rev
Log:
Updates to the helloworld-reference test scenario
Modified:
incubator/tuscany/java/sca/itest/bpel/helloworld-reference/pom.xml
incubator/tuscany/java/sca/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldServiceImpl.java
incubator/tuscany/java/sca/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldTestCase.java
incubator/tuscany/java/sca/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.wsdl
incubator/tuscany/java/sca/itest/bpel/helloworld-reference/src/test/resources/helloworld/deploy.xml
incubator/tuscany/java/sca/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.bpel
incubator/tuscany/java/sca/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.componentType
incubator/tuscany/java/sca/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.composite
incubator/tuscany/java/sca/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.wsdl
incubator/tuscany/java/sca/itest/bpel/helloworld-reference/src/test/resources/log4j.properties
Modified: incubator/tuscany/java/sca/itest/bpel/helloworld-reference/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/bpel/helloworld-reference/pom.xml?rev=615949&r1=615948&r2=615949&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/bpel/helloworld-reference/pom.xml
(original)
+++ incubator/tuscany/java/sca/itest/bpel/helloworld-reference/pom.xml Mon Jan
28 08:55:15 2008
@@ -70,6 +70,13 @@
<scope>runtime</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode-dao-jpa-ojpa-derby</artifactId>
+ <version>1.1</version>
+ <type>zip</type>
+ </dependency>
+
<dependency>
<groupId>org.apache.tuscany.sdo</groupId>
<artifactId>tuscany-sdo-impl</artifactId>
@@ -104,6 +111,31 @@
<useSystemClassLoader>true</useSystemClassLoader>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>unpack</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+
<groupId>org.apache.ode</groupId>
+
<artifactId>ode-dao-jpa-ojpa-derby</artifactId>
+
<version>1.1</version>
+
<type>zip</type>
+
<overWrite>true</overWrite>
+
<outputDirectory>${project.build.directory}/test-classes/</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
<!--
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Modified:
incubator/tuscany/java/sca/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldServiceImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldServiceImpl.java?rev=615949&r1=615948&r2=615949&view=diff
==============================================================================
---
incubator/tuscany/java/sca/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldServiceImpl.java
(original)
+++
incubator/tuscany/java/sca/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldServiceImpl.java
Mon Jan 28 08:55:15 2008
@@ -27,7 +27,7 @@
*/
public class HelloWorldServiceImpl implements HelloWorldService {
- GreetingsService greetingsService;
+ protected GreetingsService greetingsService;
public GreetingsService getGreetingsService() {
System.out.println("Got Injected greetingsService");
Modified:
incubator/tuscany/java/sca/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldTestCase.java?rev=615949&r1=615948&r2=615949&view=diff
==============================================================================
---
incubator/tuscany/java/sca/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldTestCase.java
(original)
+++
incubator/tuscany/java/sca/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldTestCase.java
Mon Jan 28 08:55:15 2008
@@ -33,7 +33,7 @@
public class HelloWorldTestCase extends TestCase {
private SCADomain scaDomain;
- private SCATestCaseRunner server;
+ //private SCATestCaseRunner server;
/**
* @throws java.lang.Exception
@@ -42,8 +42,8 @@
protected void setUp() throws Exception {
scaDomain = SCADomain.newInstance("helloworld/helloworld.composite");
- server = new SCATestCaseRunner(GreetingsTestServer.class);
- server.before();
+ //server = new SCATestCaseRunner(GreetingsTestServer.class);
+ //server.before();
}
/**
@@ -51,7 +51,7 @@
*/
@Override
protected void tearDown() throws Exception {
- server.after();
+ //server.after();
scaDomain.close();
}
Modified:
incubator/tuscany/java/sca/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.wsdl
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.wsdl?rev=615949&r1=615948&r2=615949&view=diff
==============================================================================
---
incubator/tuscany/java/sca/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.wsdl
(original)
+++
incubator/tuscany/java/sca/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.wsdl
Mon Jan 28 08:55:15 2008
@@ -76,12 +76,12 @@
</wsdl:binding>
<wsdl:service name="GreetingsService">
- <wsdl:port binding="tns:GreetingsSoapBinding" name="GreetingsSoapPort">
+ <wsdl:port name="GreetingsSoapPort" binding="tns:GreetingsSoapBinding">
<wsdlsoap:address
location="http://localhost:8085/GreetingsServiceComponent"/>
</wsdl:port>
</wsdl:service>
<plnk:partnerLinkType name="GreetingsPartnerLinkType">
- <plnk:role name="processGreetings" portType="tns:Greetings"/>
+ <plnk:role name="Provider" portType="tns:Greetings"/>
</plnk:partnerLinkType>
</wsdl:definitions>
Modified:
incubator/tuscany/java/sca/itest/bpel/helloworld-reference/src/test/resources/helloworld/deploy.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/bpel/helloworld-reference/src/test/resources/helloworld/deploy.xml?rev=615949&r1=615948&r2=615949&view=diff
==============================================================================
---
incubator/tuscany/java/sca/itest/bpel/helloworld-reference/src/test/resources/helloworld/deploy.xml
(original)
+++
incubator/tuscany/java/sca/itest/bpel/helloworld-reference/src/test/resources/helloworld/deploy.xml
Mon Jan 28 08:55:15 2008
@@ -17,14 +17,18 @@
~ under the License.
-->
<deploy xmlns="http://www.apache.org/ode/schemas/dd/2007/03";
-
xmlns:tns="http://tuscany.apache.org/implementation/bpel/example/helloworld";
-
xmlns:wns="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl";>
+ xmlns:tns="http://helloworld";
+ xmlns:helloworld="http://helloworld";
+ xmlns:greetings="http://greetings";>
<process name="tns:HelloWorld">
<active>true</active>
<provide partnerLink="helloPartnerLink">
- <service name="wns:HelloService" port="HelloPort"/>
+ <service name="helloworld:HelloService"
port="HelloWorld"/>
</provide>
+ <invoke partnerLink="greetingsPartnerLink">
+ <service name="greetings:GreetingsService"
port="Greetings"/>
+ </invoke>
</process>
</deploy>
Modified:
incubator/tuscany/java/sca/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.bpel
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.bpel?rev=615949&r1=615948&r2=615949&view=diff
==============================================================================
---
incubator/tuscany/java/sca/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.bpel
(original)
+++
incubator/tuscany/java/sca/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.bpel
Mon Jan 28 08:55:15 2008
@@ -17,32 +17,32 @@
~ under the License.
-->
<process name="HelloWorld"
-
targetNamespace="http://tuscany.apache.org/implementation/bpel/example/helloworld";
+ targetNamespace="http://helloworld";
xmlns="http://schemas.xmlsoap.org/ws/2004/03/business-process/";
xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/";
-
xmlns:tns="http://tuscany.apache.org/implementation/bpel/example/helloworld";
+ xmlns:tns="http://helloworld";
xmlns:xsd="http://www.w3.org/2001/XMLSchema";
-
xmlns:helloworld="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl";
+ xmlns:helloworld="http://helloworld";
xmlns:greetings="http://greetings";
queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"
expressionLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
<import location="helloworld.wsdl"
importType="http://schemas.xmlsoap.org/wsdl/";
-
namespace="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl"/>
+ namespace="http://helloworld"/>
<import location="../greetings/greetings.wsdl"
importType="http://schemas.xmlsoap.org/wsdl/";
namespace="http://greetings"/>
<partnerLinks>
<partnerLink name="helloPartnerLink"
partnerLinkType="helloworld:HelloPartnerLinkType" myRole="me" />
- <partnerLink name="greetingsPartnerLink"
partnerLinkType="greetings:GreetingsPartnerLinkType" myRole="processGreetings"
initializePartnerRole="yes" />
+ <partnerLink name="greetingsPartnerLink"
partnerLinkType="greetings:GreetingsPartnerLinkType" partnerRole="Provider"
initializePartnerRole="yes" />
</partnerLinks>
<variables>
<variable name="helloMessage" messageType="helloworld:HelloMessage"/>
<variable name="helloResponse" messageType="helloworld:HelloMessage"/>
<variable name="greetingsRequest"
messageType="greetings:getGreetingsRequest"/>
- <variable name="greetingsResponse"
messageType="helloworld:getGreetingsResponse"/>
+ <variable name="greetingsResponse"
messageType="greetings:getGreetingsResponse"/>
</variables>
<sequence>
@@ -50,14 +50,14 @@
name="start"
createInstance="yes"
operation="hello"
+ variable="helloMessage"
partnerLink="helloPartnerLink"
- portType="helloworld:HelloPortType"
- variable="helloMessage"/>
+ portType="helloworld:HelloWorld" />
<assign name="assignToGreetingsRequest">
<copy>
<from>$helloMessage.TestPart</from>
- <to>$getGreetingsRequest.parameters</to>
+ <to>$greetingsRequest.parameters</to>
</copy>
</assign>
@@ -70,7 +70,7 @@
<assign name="assignToHelloResponse">
<copy>
- <from>$getGreetingsResponse.parameters</from>
+ <from>$greetingsResponse.parameters</from>
<to>$helloResponse.TestPart</to>
</copy>
</assign>
@@ -78,7 +78,7 @@
<reply name="end"
operation="hello"
partnerLink="helloPartnerLink"
- portType="helloworld:HelloPortType"
+ portType="helloworld:HelloWorld"
variable="helloResponse"/>
</sequence>
</process>
Modified:
incubator/tuscany/java/sca/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.componentType
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.componentType?rev=615949&r1=615948&r2=615949&view=diff
==============================================================================
---
incubator/tuscany/java/sca/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.componentType
(original)
+++
incubator/tuscany/java/sca/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.componentType
Mon Jan 28 08:55:15 2008
@@ -22,11 +22,12 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns:xsd="http://www.w3.org/2001/XMLSchema";>
- <!--
+
<service name="HelloService">
- <interface.wsdl
interface="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl#wsdl.interface(HelloPortType)"
/>
+ <interface.wsdl
interface="http://helloworld#wsdl.interface(HelloWorld)" />
</service>
-
+
+ <!--
<reference name="greetingsService" target="GreetingsServiceComponent">
<binding.ws uri="http://localhost:8085/GreetingsService"/>
</reference>
Modified:
incubator/tuscany/java/sca/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.composite
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.composite?rev=615949&r1=615948&r2=615949&view=diff
==============================================================================
---
incubator/tuscany/java/sca/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.composite
(original)
+++
incubator/tuscany/java/sca/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.composite
Mon Jan 28 08:55:15 2008
@@ -19,7 +19,7 @@
-->
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0";
targetNamespace="http://bpel";
-
xmlns:hns="http://tuscany.apache.org/implementation/bpel/example/helloworld";
+ xmlns:hns="http://helloworld";
name="helloworld">
<!-- component name="BPELHelloWorldServiceComponent">
@@ -27,9 +27,24 @@
</component -->
<component name="HelloWorldService">
+ <implementation.bpel process="hns:HelloWorld"/>
+ <reference name="greetingsService" target="GreetingsServiceComponent"/>
+ </component>
+
+ <component name="GreetingsServiceComponent">
+ <implementation.java class="greetings.GreetingsServiceImpl" />
+ <service name="GreetingsService">
+ <interface.java interface="greetings.GreetingsService" />
+ </service>
+ </component>
+
+ <!-- Simple ws-reference -->
+ <!--
+ <component name="HelloWorldService">
<implementation.java class="helloworld.HelloWorldServiceImpl"/>
<reference name="greetingsService">
<binding.ws uri="http://localhost:8085/GreetingsService"/>
</reference>
</component>
+ -->
</composite>
Modified:
incubator/tuscany/java/sca/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.wsdl
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.wsdl?rev=615949&r1=615948&r2=615949&view=diff
==============================================================================
---
incubator/tuscany/java/sca/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.wsdl
(original)
+++
incubator/tuscany/java/sca/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.wsdl
Mon Jan 28 08:55:15 2008
@@ -19,9 +19,9 @@
-->
<wsdl:definitions name="helloworld"
-
targetNamespace="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl";
+ targetNamespace="http://helloworld";
xmlns="http://schemas.xmlsoap.org/wsdl/";
-
xmlns:tns="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl";
+ xmlns:tns="http://helloworld";
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/";
xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/";
xmlns:xsd="http://www.w3.org/2001/XMLSchema";
@@ -31,7 +31,7 @@
<wsdl:types>
<schema elementFormDefault="qualified"
-
targetNamespace="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl";
+ targetNamespace="http://helloworld";
xmlns="http://www.w3.org/2001/XMLSchema";>
<element name="hello">
@@ -48,7 +48,7 @@
<wsdl:part element="tns:hello" name="TestPart"/>
</wsdl:message>
- <wsdl:portType name="HelloPortType">
+ <wsdl:portType name="HelloWorld">
<wsdl:operation name="hello">
<wsdl:input message="tns:HelloMessage" name="TestIn"/>
<wsdl:output message="tns:HelloMessage" name="TestOut"/>
@@ -56,7 +56,7 @@
</wsdl:portType>
- <wsdl:binding name="HelloSoapBinding" type="tns:HelloPortType">
+ <wsdl:binding name="HelloSoapBinding" type="tns:HelloWorld">
<wsdlsoap:binding style="document"
transport="http://schemas.xmlsoap.org/soap/http"/>
<wsdl:operation name="hello">
<wsdlsoap:operation soapAction=""/>
@@ -69,14 +69,14 @@
</wsdl:operation>
</wsdl:binding>
- <wsdl:service name="HelloService">
- <wsdl:port name="HelloPort" binding="tns:HelloSoapBinding">
+ <wsdl:service name="HelloWorldService">
+ <wsdl:port name="HelloSoapPort" binding="tns:HelloSoapBinding">
<soap:address
location="http://localhost:8085/ode/processes/helloWorld"/>
</wsdl:port>
</wsdl:service>
<plnk:partnerLinkType name="HelloPartnerLinkType">
- <plnk:role name="me" portType="tns:HelloPortType"/>
- <plnk:role name="you" portType="tns:HelloPortType"/>
+ <plnk:role name="me" portType="tns:HelloWorld"/>
+ <plnk:role name="you" portType="tns:HelloWorld"/>
</plnk:partnerLinkType>
</wsdl:definitions>
Modified:
incubator/tuscany/java/sca/itest/bpel/helloworld-reference/src/test/resources/log4j.properties
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/bpel/helloworld-reference/src/test/resources/log4j.properties?rev=615949&r1=615948&r2=615949&view=diff
==============================================================================
---
incubator/tuscany/java/sca/itest/bpel/helloworld-reference/src/test/resources/log4j.properties
(original)
+++
incubator/tuscany/java/sca/itest/bpel/helloworld-reference/src/test/resources/log4j.properties
Mon Jan 28 08:55:15 2008
@@ -26,6 +26,8 @@
log4j.category.org.apache.ode.bpel.engine=OFF
log4j.category.org.apache.ode.daohib.bpel.CorrelatorDaoImpl=OFF
log4j.category.org.apache.ode.bpel.epr=OFF
+log4j.category.org.apache.tuscany.sca.implementation.bpel=DEBUG
+log4j.category.org.apache.tuscany.sca.implementation.bpel.ode=DEBUG
# Console appender
log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
