You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by na...@apache.org on 2010/05/20 00:04:10 UTC
svn commit: r946445 - in /tuscany/sca-java-1.x/trunk/tutorials/travelsample:
contributions/payment-groovy/src/test/java/scatours/payment/
contributions/payment-python/src/test/java/scatours/payment/
distribution/src/main/release/
Author: nash
Date: Wed May 19 22:04:09 2010
New Revision: 946445
URL: http://svn.apache.org/viewvc?rev=946445&view=rev
Log:
Merge revision r945303 from 1.0 release branch
Modified:
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/test/java/scatours/payment/PaymentTestCase.java
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-python/src/test/java/scatours/payment/PaymentTestCase.java
tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/release/README
Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/test/java/scatours/payment/PaymentTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/test/java/scatours/payment/PaymentTestCase.java?rev=946445&r1=946444&r2=946445&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/test/java/scatours/payment/PaymentTestCase.java (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/test/java/scatours/payment/PaymentTestCase.java Wed May 19 22:04:09 2010
@@ -35,18 +35,10 @@ import com.tuscanyscatours.payment.Payme
public class PaymentTestCase {
private static SCANode paymentNode;
- private static SCANode creditCardNode;
private static SCANode emailGatewayNode;
@BeforeClass
public static void setUpBeforeClass() throws Exception {
- creditCardNode =
- SCANodeFactory.newInstance()
- .createSCANode("creditcard.composite",
- new SCAContribution("creditcard", "../creditcard-payment-jaxb/target/classes"));
-
- creditCardNode.start();
-
emailGatewayNode =
SCANodeFactory.newInstance().createSCANode("emailgateway.composite",
new SCAContribution("emailgateway",
@@ -79,7 +71,6 @@ public class PaymentTestCase {
@AfterClass
public static void tearDownAfterClass() throws Exception {
paymentNode.stop();
- creditCardNode.stop();
emailGatewayNode.stop();
}
Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-python/src/test/java/scatours/payment/PaymentTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-python/src/test/java/scatours/payment/PaymentTestCase.java?rev=946445&r1=946444&r2=946445&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-python/src/test/java/scatours/payment/PaymentTestCase.java (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-python/src/test/java/scatours/payment/PaymentTestCase.java Wed May 19 22:04:09 2010
@@ -35,18 +35,10 @@ import com.tuscanyscatours.payment.Payme
public class PaymentTestCase {
private static SCANode paymentNode;
- private static SCANode creditCardNode;
private static SCANode emailGatewayNode;
@BeforeClass
public static void setUpBeforeClass() throws Exception {
- creditCardNode =
- SCANodeFactory.newInstance()
- .createSCANode("creditcard.composite",
- new SCAContribution("creditcard", "../creditcard-payment-jaxb/target/classes"));
-
- creditCardNode.start();
-
emailGatewayNode =
SCANodeFactory.newInstance().createSCANode("emailgateway.composite",
new SCAContribution("emailgateway",
@@ -79,7 +71,6 @@ public class PaymentTestCase {
@AfterClass
public static void tearDownAfterClass() throws Exception {
paymentNode.stop();
- creditCardNode.stop();
emailGatewayNode.stop();
}
Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/release/README
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/release/README?rev=946445&r1=946444&r2=946445&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/release/README (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/release/README Wed May 19 22:04:09 2010
@@ -251,7 +251,7 @@ Launchers: payment-bpel
17b) implementation.script written in Groovy
Description: The Payment service is implemented using a Groovy script.
-Contributions: creditcard-payment-jaxb, emailgateway, payment-groovy
+Contributions: emailgateway, payment-groovy
Launchers: payment-groovy
17c) implementation.java
@@ -271,7 +271,7 @@ Launchers: payment-java-policy
17e) implementation.script written in Python
Description: The Payment service is implemented using a Python script.
-Contributions: creditcard-payment-jaxb, emailgateway, payment-python
+Contributions: emailgateway, payment-python
Launchers: payment-python
17f) implementation.spring
@@ -809,7 +809,7 @@ contributions/buildingblocks-client 5
contributions/calendar 6
contributions/car 7, 8
contributions/common 6, 7, 8, 15
-contributions/creditcard-payment-jaxb 17a, 17b, 17c, 17e, 17f, 17g, 16
+contributions/creditcard-payment-jaxb 17a, 17c, 17f, 17g, 16
contributions/creditcard-payment-jaxb-policy 7, 8, 15, 17d
contributions/creditcard-payment-sdo 14
contributions/creditcard-payment-webapp 16