Author: ramkumar
Date: Tue Apr 21 17:20:10 2009
New Revision: 767230
URL: http://svn.apache.org/viewvc?rev=767230&view=rev
Log:
Fixes for Spring itest
Modified:
tuscany/java/sca/itest/implementation-spring/pom.xml
tuscany/java/sca/itest/implementation-spring/src/main/resources/context/multiple/MultipleContext.composite
tuscany/java/sca/itest/implementation-spring/src/main/resources/implementation/policies/ImplementationPolicies.composite
tuscany/java/sca/itest/implementation-spring/src/main/resources/spring/annotations/Calculator.composite
tuscany/java/sca/itest/implementation-spring/src/test/java/context/multiple/StockQuoteServer.java
tuscany/java/sca/itest/implementation-spring/src/test/java/implementation/policies/CalculatorClient.java
tuscany/java/sca/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractSCATestCase.java
tuscany/java/sca/itest/implementation-spring/src/test/java/spring/annotations/CalculatorClient.java
Modified: tuscany/java/sca/itest/implementation-spring/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/itest/implementation-spring/pom.xml?rev=767230&r1=767229&r2=767230&view=diff
==============================================================================
--- tuscany/java/sca/itest/implementation-spring/pom.xml (original)
+++ tuscany/java/sca/itest/implementation-spring/pom.xml Tue Apr 21 17:20:10
2009
@@ -47,6 +47,12 @@
<version>2.0-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-binding-ws-axis2</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ </dependency>
+
<!-- Spring dependencies... -->
<dependency>
<groupId>org.springframework</groupId>
Modified:
tuscany/java/sca/itest/implementation-spring/src/main/resources/context/multiple/MultipleContext.composite
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/itest/implementation-spring/src/main/resources/context/multiple/MultipleContext.composite?rev=767230&r1=767229&r2=767230&view=diff
==============================================================================
---
tuscany/java/sca/itest/implementation-spring/src/main/resources/context/multiple/MultipleContext.composite
(original)
+++
tuscany/java/sca/itest/implementation-spring/src/main/resources/context/multiple/MultipleContext.composite
Tue Apr 21 17:20:10 2009
@@ -19,8 +19,8 @@
-->
<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903";
xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903";
- targetNamespace="http://multiplecontext";
- xmlns:hw="http://multiplecontext";
+ targetNamespace="http://stockquote";
+ xmlns:hw="http://stockquote";
name="MultipleContext">
<service name="StockQuoteService" promote="StockQuoteServiceComponent">
Modified:
tuscany/java/sca/itest/implementation-spring/src/main/resources/implementation/policies/ImplementationPolicies.composite
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/itest/implementation-spring/src/main/resources/implementation/policies/ImplementationPolicies.composite?rev=767230&r1=767229&r2=767230&view=diff
==============================================================================
---
tuscany/java/sca/itest/implementation-spring/src/main/resources/implementation/policies/ImplementationPolicies.composite
(original)
+++
tuscany/java/sca/itest/implementation-spring/src/main/resources/implementation/policies/ImplementationPolicies.composite
Tue Apr 21 17:20:10 2009
@@ -18,16 +18,13 @@
* under the License.
-->
<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903";
- targetNamespace="http://implementationpolicies";
- xmlns:sample="http://implementationpolicies";
- name="ImplementationPolicies"
+ targetNamespace="http://sample";
+ xmlns:sample="http://sample";
+ name="Calculator"
xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1";>
<component name="CalculatorServiceComponent">
- <implementation.spring
location="META-INF/sca/implementation-policies/CalculatorService-context.xml">
- <operation name="divide" requires="tuscany:logging"/>
- <operation name="subtract" requires="tuscany:logging"/>
- </implementation.spring>
+ <implementation.spring
location="META-INF/sca/implementation-policies/CalculatorService-context.xml"/>
<reference name="addService" target="AddServiceComponent" />
<reference name="subtractService" target="SubtractServiceComponent" />
<reference name="multiplyService" target="MultiplyServiceComponent" />
Modified:
tuscany/java/sca/itest/implementation-spring/src/main/resources/spring/annotations/Calculator.composite
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/itest/implementation-spring/src/main/resources/spring/annotations/Calculator.composite?rev=767230&r1=767229&r2=767230&view=diff
==============================================================================
---
tuscany/java/sca/itest/implementation-spring/src/main/resources/spring/annotations/Calculator.composite
(original)
+++
tuscany/java/sca/itest/implementation-spring/src/main/resources/spring/annotations/Calculator.composite
Tue Apr 21 17:20:10 2009
@@ -17,8 +17,8 @@
* specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903";
- targetNamespace="http://sample";
+<composite targetNamespace="http://sample";
+ xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903";
xmlns:sample="http://sample";
name="Calculator"
xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1";>
Modified:
tuscany/java/sca/itest/implementation-spring/src/test/java/context/multiple/StockQuoteServer.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/itest/implementation-spring/src/test/java/context/multiple/StockQuoteServer.java?rev=767230&r1=767229&r2=767230&view=diff
==============================================================================
---
tuscany/java/sca/itest/implementation-spring/src/test/java/context/multiple/StockQuoteServer.java
(original)
+++
tuscany/java/sca/itest/implementation-spring/src/test/java/context/multiple/StockQuoteServer.java
Tue Apr 21 17:20:10 2009
@@ -36,7 +36,7 @@
System.out.println("Starting the Sample SCA StockQuote Service...");
String location =
ContributionLocationHelper.getContributionLocation("context/multiple/MultipleContext.composite");
- Node node =
NodeFactory.newInstance().createNode("MultipleContext.composite", new
Contribution("c1", location));
+ Node node =
NodeFactory.newInstance().createNode("context/multiple/MultipleContext.composite",
new Contribution("c1", location));
node.start();
// Method 1: To access the Spring Application Context instance
Modified:
tuscany/java/sca/itest/implementation-spring/src/test/java/implementation/policies/CalculatorClient.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/itest/implementation-spring/src/test/java/implementation/policies/CalculatorClient.java?rev=767230&r1=767229&r2=767230&view=diff
==============================================================================
---
tuscany/java/sca/itest/implementation-spring/src/test/java/implementation/policies/CalculatorClient.java
(original)
+++
tuscany/java/sca/itest/implementation-spring/src/test/java/implementation/policies/CalculatorClient.java
Tue Apr 21 17:20:10 2009
@@ -42,7 +42,7 @@
}
String location =
ContributionLocationHelper.getContributionLocation("implementation/policies/ImplementationPolicies.composite");
- Node node =
NodeFactory.newInstance().createNode("ImplementationPolicies.composite", new
Contribution("c1", location));
+ Node node =
NodeFactory.newInstance().createNode("implementation/policies/ImplementationPolicies.composite",
new Contribution("c1", location));
node.start();
CalculatorService calculatorService =
Modified:
tuscany/java/sca/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractSCATestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractSCATestCase.java?rev=767230&r1=767229&r2=767230&view=diff
==============================================================================
---
tuscany/java/sca/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractSCATestCase.java
(original)
+++
tuscany/java/sca/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractSCATestCase.java
Tue Apr 21 17:20:10 2009
@@ -21,6 +21,8 @@
import junit.framework.TestCase;
import org.apache.tuscany.sca.node.Client;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.ContributionLocationHelper;
import org.apache.tuscany.sca.node.Node;
import org.apache.tuscany.sca.node.NodeFactory;
@@ -31,8 +33,9 @@
@Override
protected void setUp() throws Exception {
- NodeFactory factory = NodeFactory.newInstance();
- node = factory.createNode(getCompositeName());
+ NodeFactory factory = NodeFactory.newInstance();
+ String location =
ContributionLocationHelper.getContributionLocation(getCompositeName());
+ node = factory.createNode(getCompositeName(), new Contribution("c1",
location));
node.start();
service = ((Client)node).getService(getServiceClass(),
"ClientComponent");
}
Modified:
tuscany/java/sca/itest/implementation-spring/src/test/java/spring/annotations/CalculatorClient.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/itest/implementation-spring/src/test/java/spring/annotations/CalculatorClient.java?rev=767230&r1=767229&r2=767230&view=diff
==============================================================================
---
tuscany/java/sca/itest/implementation-spring/src/test/java/spring/annotations/CalculatorClient.java
(original)
+++
tuscany/java/sca/itest/implementation-spring/src/test/java/spring/annotations/CalculatorClient.java
Tue Apr 21 17:20:10 2009
@@ -35,7 +35,7 @@
public static void main(String[] args) throws Exception {
String location =
ContributionLocationHelper.getContributionLocation("spring/annotations/Calculator.composite");
- Node node =
NodeFactory.newInstance().createNode("Calculator.composite", new
Contribution("c1", location));
+ Node node =
NodeFactory.newInstance().createNode("spring/annotations/Calculator.composite",
new Contribution("c1", location));
node.start();
CalculatorService calculatorService =
