Author: rfeng
Date: Wed Mar 3 05:41:33 2010
New Revision: 918327
URL: http://svn.apache.org/viewvc?rev=918327&view=rev
Log:
Copy the test cases from binding-sca-runtime-axis2 and binding-sca-runtime-rmi
into an itest
Change the code to pass binding.sca with mapped uri with the endpoint
Added:
tuscany/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/
tuscany/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/
tuscany/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/
- copied from r918252,
tuscany/sca-java-2.x/trunk/modules/binding-sca-axis2-runtime/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/
tuscany/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/
- copied from r918252,
tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/
tuscany/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/AsynchTestCase.java
- copied, changed from r918261,
tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/AsynchTestCase.java
tuscany/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/CallbackTestCase.java
- copied, changed from r918261,
tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/CallbackTestCase.java
tuscany/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/PromotionTestCase.java
- copied, changed from r918261,
tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/PromotionTestCase.java
tuscany/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/SimpleTestCase.java
- copied, changed from r918261,
tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/SimpleTestCase.java
tuscany/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/
tuscany/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/rmi/
tuscany/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/rmi/asynchReference/
- copied from r918252,
tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/asynchReference/
tuscany/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/rmi/asynchService/
- copied from r918252,
tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/asynchService/
tuscany/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/rmi/callbackReference/
- copied from r918252,
tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/callbackReference/
tuscany/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/rmi/callbackService/
- copied from r918252,
tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/callbackService/
tuscany/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/rmi/promotionReference/
- copied from r918252,
tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/promotionReference/
tuscany/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/rmi/promotionService/
- copied from r918252,
tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/promotionService/
tuscany/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/rmi/simpleReference/
- copied from r918252,
tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/simpleReference/
tuscany/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/rmi/simpleService/
- copied from r918252,
tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/simpleService/
tuscany/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/ws/
tuscany/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/ws/asynchReference/
- copied from r918252,
tuscany/sca-java-2.x/trunk/modules/binding-sca-axis2-runtime/src/test/resources/asynchReference/
tuscany/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/ws/asynchService/
- copied from r918252,
tuscany/sca-java-2.x/trunk/modules/binding-sca-axis2-runtime/src/test/resources/asynchService/
tuscany/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/ws/callbackReference/
- copied from r918252,
tuscany/sca-java-2.x/trunk/modules/binding-sca-axis2-runtime/src/test/resources/callbackReference/
tuscany/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/ws/callbackService/
- copied from r918252,
tuscany/sca-java-2.x/trunk/modules/binding-sca-axis2-runtime/src/test/resources/callbackService/
tuscany/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/ws/promotionReference/
- copied from r918252,
tuscany/sca-java-2.x/trunk/modules/binding-sca-axis2-runtime/src/test/resources/promotionReference/
tuscany/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/ws/promotionService/
- copied from r918252,
tuscany/sca-java-2.x/trunk/modules/binding-sca-axis2-runtime/src/test/resources/promotionService/
tuscany/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/ws/simpleReference/
- copied from r918252,
tuscany/sca-java-2.x/trunk/modules/binding-sca-axis2-runtime/src/test/resources/simpleReference/
tuscany/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/ws/simpleService/
- copied from r918252,
tuscany/sca-java-2.x/trunk/modules/binding-sca-axis2-runtime/src/test/resources/simpleService/
Modified:
tuscany/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/pom.xml
tuscany/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/AsynchTestCase.java
tuscany/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/CallbackTestCase.java
tuscany/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/PromotionTestCase.java
tuscany/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/SimpleTestCase.java
tuscany/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/ws/callbackReference/META-INF/sca-contribution.xml
tuscany/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/ws/callbackService/META-INF/sca-contribution.xml
tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/DefaultSCABindingMapper.java
tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/DelegatingSCAServiceBindingProvider.java
tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2ServiceBindingProvider.java
tuscany/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/BindingURIBuilderImpl.java
Modified: tuscany/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/pom.xml?rev=918327&r1=918326&r2=918327&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/pom.xml Wed Mar
3 05:41:33 2010
@@ -41,11 +41,17 @@
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-sca-axis2-runtime</artifactId>
+ <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-binding-rmi-runtime</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-host-jetty</artifactId>
<version>2.0-SNAPSHOT</version>
<scope>runtime</scope>
@@ -61,6 +67,7 @@
<version>2.0-SNAPSHOT</version>
</dependency>
</dependencies>
+ <!--
<build>
<plugins>
<plugin>
@@ -72,7 +79,7 @@
<include>**/*TestCase.java</include>
</includes>
<reportFormat>brief</reportFormat>
- <useFile>false</useFile>
+ <useFile>true</useFile>
<forkMode>once</forkMode>
<argLine>-ea -Xmx256m</argLine>
<parallel>off</parallel>
@@ -80,4 +87,5 @@
</plugin>
</plugins>
</build>
+ -->
</project>
Modified:
tuscany/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/AsynchTestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/AsynchTestCase.java?rev=918327&r1=918252&r2=918327&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/AsynchTestCase.java
(original)
+++
tuscany/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/AsynchTestCase.java
Wed Mar 3 05:41:33 2010
@@ -28,10 +28,9 @@
import org.apache.tuscany.sca.node.NodeFactory;
import org.junit.AfterClass;
import org.junit.BeforeClass;
-import org.junit.Ignore;
import org.junit.Test;
-...@ignore("TUSCANY-3138")
+// @Ignore("TUSCANY-3138")
public class AsynchTestCase {
public static Node nodeA;
@@ -43,11 +42,11 @@
try {
// create and start nodes
- Contribution contrib = new Contribution("asynch",
"./target/test-classes/asynchReference");
+ Contribution contrib = new Contribution("asynch",
"./target/test-classes/ws/asynchReference");
nodeA =
NodeFactory.getInstance().createNode("HelloWorld.composite", contrib);
nodeA.start();
- contrib = new Contribution("asynch",
"./target/test-classes/asynchService");
+ contrib = new Contribution("asynch",
"./target/test-classes/ws/asynchService");
nodeB =
NodeFactory.getInstance().createNode("HelloWorld.composite", contrib);
nodeB.start();
Modified:
tuscany/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/CallbackTestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/CallbackTestCase.java?rev=918327&r1=918252&r2=918327&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/CallbackTestCase.java
(original)
+++
tuscany/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/CallbackTestCase.java
Wed Mar 3 05:41:33 2010
@@ -26,10 +26,9 @@
import org.apache.tuscany.sca.node.NodeFactory;
import org.junit.AfterClass;
import org.junit.BeforeClass;
-import org.junit.Ignore;
import org.junit.Test;
-...@ignore("TUSCANY-3138")
+// @Ignore("TUSCANY-3138")
public class CallbackTestCase {
public static Node nodeA;
@@ -41,11 +40,11 @@
try {
// create and start nodes
- Contribution contrib = new Contribution("reference",
"./target/test-classes/callbackReference");
+ Contribution contrib = new Contribution("reference",
"./target/test-classes/ws/callbackReference");
nodeA =
NodeFactory.getInstance().createNode("HelloWorld.composite", contrib);
nodeA.start();
- contrib = new Contribution("service",
"./target/test-classes/callbackService");
+ contrib = new Contribution("service",
"./target/test-classes/ws/callbackService");
nodeB =
NodeFactory.getInstance().createNode("HelloWorld.composite", contrib);
nodeB.start();
Modified:
tuscany/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/PromotionTestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/PromotionTestCase.java?rev=918327&r1=918252&r2=918327&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/PromotionTestCase.java
(original)
+++
tuscany/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/PromotionTestCase.java
Wed Mar 3 05:41:33 2010
@@ -41,11 +41,11 @@
try {
// create and start nodes
- Contribution contrib = new Contribution("reference",
"./target/test-classes/promotionReference");
+ Contribution contrib = new Contribution("reference",
"./target/test-classes/ws/promotionReference");
nodeA =
NodeFactory.getInstance().createNode("HelloWorld.composite", contrib);
nodeA.start();
- contrib = new Contribution("service",
"./target/test-classes/promotionService");
+ contrib = new Contribution("service",
"./target/test-classes/ws/promotionService");
nodeB =
NodeFactory.getInstance().createNode("HelloWorld.composite", contrib);
nodeB.start();
Modified:
tuscany/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/SimpleTestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/SimpleTestCase.java?rev=918327&r1=918252&r2=918327&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/SimpleTestCase.java
(original)
+++
tuscany/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/SimpleTestCase.java
Wed Mar 3 05:41:33 2010
@@ -40,11 +40,11 @@
try {
// create and start nodes
- Contribution contrib = new Contribution("reference",
"./target/test-classes/simpleReference");
+ Contribution contrib = new Contribution("reference",
"./target/test-classes/ws/simpleReference");
nodeA =
NodeFactory.getInstance().createNode("HelloWorld.composite", contrib);
nodeA.start();
- contrib = new Contribution("service",
"./target/test-classes/simpleService");
+ contrib = new Contribution("service",
"./target/test-classes/ws/simpleService");
nodeB =
NodeFactory.getInstance().createNode("HelloWorld.composite", contrib);
nodeB.start();
Copied:
tuscany/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/AsynchTestCase.java
(from r918261,
tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/AsynchTestCase.java)
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/AsynchTestCase.java?p2=tuscany/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/AsynchTestCase.java&p1=tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/AsynchTestCase.java&r1=918261&r2=918327&rev=918327&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/AsynchTestCase.java
(original)
+++
tuscany/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/AsynchTestCase.java
Wed Mar 3 05:41:33 2010
@@ -41,11 +41,11 @@
//
System.setProperty("org.apache.tuscany.sca.binding.sca.provider.SCABindingMapper.mappedBinding",
RMIBinding.TYPE.toString());
try {
// create and start nodes
- Contribution contrib = new Contribution("asynch",
"./target/test-classes/asynchReference");
+ Contribution contrib = new Contribution("asynch",
"./target/test-classes/rmi/asynchReference");
nodeA =
NodeFactory.getInstance().createNode("HelloWorld.composite", contrib);
nodeA.start();
- contrib = new Contribution("asynch",
"./target/test-classes/asynchService");
+ contrib = new Contribution("asynch",
"./target/test-classes/rmi/asynchService");
nodeB =
NodeFactory.getInstance().createNode("HelloWorld.composite", contrib);
nodeB.start();
Copied:
tuscany/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/CallbackTestCase.java
(from r918261,
tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/CallbackTestCase.java)
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/CallbackTestCase.java?p2=tuscany/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/CallbackTestCase.java&p1=tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/CallbackTestCase.java&r1=918261&r2=918327&rev=918327&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/CallbackTestCase.java
(original)
+++
tuscany/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/CallbackTestCase.java
Wed Mar 3 05:41:33 2010
@@ -40,11 +40,11 @@
try {
// create and start nodes
- Contribution contrib = new Contribution("reference",
"./target/test-classes/callbackReference");
+ Contribution contrib = new Contribution("reference",
"./target/test-classes/rmi/callbackReference");
nodeA =
NodeFactory.getInstance().createNode("HelloWorld.composite", contrib);
nodeA.start();
- contrib = new Contribution("service",
"./target/test-classes/callbackService");
+ contrib = new Contribution("service",
"./target/test-classes/rmi/callbackService");
nodeB =
NodeFactory.getInstance().createNode("HelloWorld.composite", contrib);
nodeB.start();
Copied:
tuscany/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/PromotionTestCase.java
(from r918261,
tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/PromotionTestCase.java)
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/PromotionTestCase.java?p2=tuscany/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/PromotionTestCase.java&p1=tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/PromotionTestCase.java&r1=918261&r2=918327&rev=918327&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/PromotionTestCase.java
(original)
+++
tuscany/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/PromotionTestCase.java
Wed Mar 3 05:41:33 2010
@@ -20,7 +20,6 @@
import junit.framework.Assert;
-import org.apache.tuscany.sca.binding.rmi.RMIBinding;
import org.apache.tuscany.sca.binding.sca.rmi.helloworld.HelloWorldClient;
import org.apache.tuscany.sca.node.Contribution;
import org.apache.tuscany.sca.node.Node;
@@ -38,15 +37,16 @@
@BeforeClass
public static void init() throws Exception {
System.out.println("Setting up nodes");
-
System.setProperty("org.apache.tuscany.sca.binding.sca.provider.SCABindingMapper.mappedBinding",
RMIBinding.TYPE.toString());
+
System.setProperty("org.apache.tuscany.sca.binding.sca.provider.SCABindingMapper.mappedBinding",
+
"{http://tuscany.apache.org/xmlns/sca/1.1}binding.rmi";);
try {
// create and start nodes
- Contribution contrib = new Contribution("reference",
"./target/test-classes/promotionReference");
+ Contribution contrib = new Contribution("reference",
"./target/test-classes/rmi/promotionReference");
nodeA =
NodeFactory.getInstance().createNode("HelloWorld.composite", contrib);
nodeA.start();
- contrib = new Contribution("service",
"./target/test-classes/promotionService");
+ contrib = new Contribution("service",
"./target/test-classes/rmi/promotionService");
nodeB =
NodeFactory.getInstance().createNode("HelloWorld.composite", contrib);
nodeB.start();
Copied:
tuscany/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/SimpleTestCase.java
(from r918261,
tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/SimpleTestCase.java)
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/SimpleTestCase.java?p2=tuscany/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/SimpleTestCase.java&p1=tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/SimpleTestCase.java&r1=918261&r2=918327&rev=918327&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/SimpleTestCase.java
(original)
+++
tuscany/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/SimpleTestCase.java
Wed Mar 3 05:41:33 2010
@@ -20,7 +20,6 @@
import junit.framework.Assert;
-import org.apache.tuscany.sca.binding.rmi.RMIBinding;
import org.apache.tuscany.sca.binding.sca.rmi.helloworld.HelloWorldClient;
import org.apache.tuscany.sca.node.Contribution;
import org.apache.tuscany.sca.node.Node;
@@ -39,16 +38,17 @@
@BeforeClass
public static void init() throws Exception {
System.out.println("Setting up nodes");
-
System.setProperty("org.apache.tuscany.sca.binding.sca.provider.SCABindingMapper.mappedBinding",
RMIBinding.TYPE.toString());
+
System.setProperty("org.apache.tuscany.sca.binding.sca.provider.SCABindingMapper.mappedBinding",
+
"{http://tuscany.apache.org/xmlns/sca/1.1}binding.rmi";);
try {
factory = NodeFactory.getInstance();
// create and start nodes
- Contribution contrib = new Contribution("reference",
"./target/test-classes/simpleReference");
+ Contribution contrib = new Contribution("reference",
"./target/test-classes/rmi/simpleReference");
nodeA = factory.createNode("HelloWorld.composite", contrib);
nodeA.start();
- contrib = new Contribution("service",
"./target/test-classes/simpleService");
+ contrib = new Contribution("service",
"./target/test-classes/rmi/simpleService");
nodeB = factory.createNode("HelloWorld.composite", contrib);
nodeB.start();
Modified:
tuscany/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/ws/callbackReference/META-INF/sca-contribution.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/ws/callbackReference/META-INF/sca-contribution.xml?rev=918327&r1=918252&r2=918327&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/ws/callbackReference/META-INF/sca-contribution.xml
(original)
+++
tuscany/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/ws/callbackReference/META-INF/sca-contribution.xml
Wed Mar 3 05:41:33 2010
@@ -18,7 +18,6 @@
* under the License.
-->
<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912";
- targetNamespace="http://sample";
xmlns:sample="http://sample";>
<deployable composite="sample:HelloWorld"/>
</contribution>
\ No newline at end of file
Modified:
tuscany/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/ws/callbackService/META-INF/sca-contribution.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/ws/callbackService/META-INF/sca-contribution.xml?rev=918327&r1=918252&r2=918327&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/ws/callbackService/META-INF/sca-contribution.xml
(original)
+++
tuscany/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/ws/callbackService/META-INF/sca-contribution.xml
Wed Mar 3 05:41:33 2010
@@ -18,7 +18,6 @@
* under the License.
-->
<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912";
- targetNamespace="http://sample";
xmlns:sample="http://sample";>
<deployable composite="sample:HelloWorld"/>
</contribution>
\ No newline at end of file
Modified:
tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/DefaultSCABindingMapper.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/DefaultSCABindingMapper.java?rev=918327&r1=918326&r2=918327&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/DefaultSCABindingMapper.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/DefaultSCABindingMapper.java
Wed Mar 3 05:41:33 2010
@@ -134,7 +134,7 @@
// we know we can clone endpoint references
}
- Binding binding = map(endpoint.getBinding(), false);
+ Binding binding = map(endpoint.getBinding());
ep.setBinding(binding);
if (builder != null) {
builder.build(ep.getComponent(), ep.getService(), binding, new
BuilderContext(registry));
@@ -154,7 +154,7 @@
// we know we can clone endpoint references
}
- Binding binding = map(endpointReference.getBinding(), true);
+ Binding binding = map(endpointReference.getBinding());
epr.setBinding(binding);
//
epr.setTargetEndpoint(map((RuntimeEndpoint)epr.getTargetEndpoint()));
@@ -166,14 +166,11 @@
return epr;
}
- protected Binding map(Binding scaBinding, boolean referenceSide) {
+ protected Binding map(Binding scaBinding) {
try {
Binding binding = createDelegatingBinding();
binding.setName(scaBinding.getName());
- if (!referenceSide) {
- // Only set the binding URI for the service side
- binding.setURI(scaBinding.getURI());
- }
+ binding.setURI(scaBinding.getURI());
binding.setOperationSelector(scaBinding.getOperationSelector());
binding.setRequestWireFormat(scaBinding.getRequestWireFormat());
binding.setResponseWireFormat(scaBinding.getResponseWireFormat());
Modified:
tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/DelegatingSCAServiceBindingProvider.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/DelegatingSCAServiceBindingProvider.java?rev=918327&r1=918326&r2=918327&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/DelegatingSCAServiceBindingProvider.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/DelegatingSCAServiceBindingProvider.java
Wed Mar 3 05:41:33 2010
@@ -21,7 +21,6 @@
import java.util.logging.Logger;
-import org.apache.tuscany.sca.assembly.Binding;
import org.apache.tuscany.sca.interfacedef.InterfaceContract;
import org.apache.tuscany.sca.provider.ServiceBindingProvider;
import org.apache.tuscany.sca.runtime.RuntimeEndpoint;
@@ -37,14 +36,15 @@
private static final Logger logger =
Logger.getLogger(DelegatingSCAServiceBindingProvider.class.getName());
private ServiceBindingProvider provider;
- protected Class<? extends Binding> bindingClass;
+ private RuntimeEndpoint endpoint;
+ private RuntimeEndpoint mappedEndpoint;
private boolean started = false;
public DelegatingSCAServiceBindingProvider(RuntimeEndpoint endpoint,
SCABindingMapper mapper) {
- RuntimeEndpoint ep = mapper.map(endpoint);
- if (ep != null) {
- endpoint.setBinding(ep.getBinding());
- provider = ep.getBindingProvider();
+ this.endpoint = endpoint;
+ this.mappedEndpoint = mapper.map(endpoint);
+ if (mappedEndpoint != null) {
+ provider = mappedEndpoint.getBindingProvider();
}
}
@@ -62,6 +62,8 @@
return;
} else {
provider.start();
+ // Set the resolved binding URI back to the binding.sca
+ endpoint.getBinding().setURI(mappedEndpoint.getBinding().getURI());
started = true;
}
}
Modified:
tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2ServiceBindingProvider.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2ServiceBindingProvider.java?rev=918327&r1=918326&r2=918327&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2ServiceBindingProvider.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2ServiceBindingProvider.java
Wed Mar 3 05:41:33 2010
@@ -24,15 +24,11 @@
import java.util.logging.Logger;
import javax.wsdl.Port;
-import javax.wsdl.extensions.soap.SOAPAddress;
-import javax.wsdl.extensions.soap12.SOAP12Address;
-import javax.xml.namespace.QName;
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
import org.apache.axis2.AxisFault;
-import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.description.AxisService;
import org.apache.axis2.description.Parameter;
import org.apache.axis2.description.TransportInDescription;
@@ -45,11 +41,9 @@
import org.apache.tuscany.sca.binding.ws.WebServiceBinding;
import
org.apache.tuscany.sca.binding.ws.axis2.policy.mtom.Axis2MTOMPolicyProvider;
import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.FactoryExtensionPoint;
import org.apache.tuscany.sca.core.assembly.RuntimeAssemblyFactory;
import org.apache.tuscany.sca.host.http.ServletHost;
import org.apache.tuscany.sca.interfacedef.InterfaceContract;
-import org.apache.tuscany.sca.invocation.MessageFactory;
import org.apache.tuscany.sca.policy.util.PolicyHelper;
import org.apache.tuscany.sca.provider.PolicyProvider;
import org.apache.tuscany.sca.provider.ServiceBindingProvider;
@@ -169,6 +163,7 @@
if (isJMSRequired){
// TODO - do we need to go back to configurator?
}
+ wsBinding.setURI(endpointURI);
}
private static final String DEFAULT_QUEUE_CONNECTION_FACTORY =
"TuscanyQueueConnectionFactory";
Modified:
tuscany/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/BindingURIBuilderImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/BindingURIBuilderImpl.java?rev=918327&r1=918326&r2=918327&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/BindingURIBuilderImpl.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/BindingURIBuilderImpl.java
Wed Mar 3 05:41:33 2010
@@ -31,6 +31,7 @@
import org.apache.tuscany.sca.assembly.ComponentService;
import org.apache.tuscany.sca.assembly.Composite;
import org.apache.tuscany.sca.assembly.Implementation;
+import org.apache.tuscany.sca.assembly.SCABinding;
import org.apache.tuscany.sca.assembly.Service;
import org.apache.tuscany.sca.assembly.builder.BuilderContext;
import org.apache.tuscany.sca.assembly.builder.CompositeBuilder;
@@ -195,6 +196,10 @@
// calculate the service binding URI
URI bindingURI = binding.getURI() == null ? null : new
URI(binding.getURI());
+ if (binding instanceof SCABinding) {
+ // Per assembly spec, the @uri for service side binding.sca
should be ignored
+ bindingURI = null;
+ }
// if the user has provided an absolute binding URI then use it
if (bindingURI != null && bindingURI.isAbsolute()) {
@@ -218,10 +223,12 @@
// calculate the base URI
URI baseURI = null;
- if (defaultBindings != null) {
- List<String> uris = defaultBindings.get(binding.getType());
- if (uris != null && uris.size() > 0) {
- baseURI = new URI(addSlashToPath(uris.get(0)));
+ if (!(binding instanceof SCABinding)) {
+ if (defaultBindings != null) {
+ List<String> uris = defaultBindings.get(binding.getType());
+ if (uris != null && uris.size() > 0) {
+ baseURI = new URI(addSlashToPath(uris.get(0)));
+ }
}
}
