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 2009/09/14 19:28:15 UTC
svn commit: r814744 - in /tuscany/sandbox/travelsample/contributions: ./
payment-spring-scatag-contribution/ payment-spring-scatag/
payment-spring-scatag/src/main/java/com/tuscanyscatours/payment/impl/
payment-spring-scatag/src/main/resources/ payment-...
Author: nash
Date: Mon Sep 14 17:28:15 2009
New Revision: 814744
URL: http://svn.apache.org/viewvc?rev=814744&view=rev
Log:
Apply new naming convention to contributions/payment-spring-scatag
Added:
tuscany/sandbox/travelsample/contributions/payment-spring-scatag/
- copied from r814729, tuscany/sandbox/travelsample/contributions/payment-spring/
Removed:
tuscany/sandbox/travelsample/contributions/payment-spring-scatag-contribution/
Modified:
tuscany/sandbox/travelsample/contributions/payment-spring-scatag/pom.xml
tuscany/sandbox/travelsample/contributions/payment-spring-scatag/src/main/java/com/tuscanyscatours/payment/impl/PaymentImpl.java
tuscany/sandbox/travelsample/contributions/payment-spring-scatag/src/main/resources/Payment-context.xml
tuscany/sandbox/travelsample/contributions/payment-spring-scatag/src/main/resources/payment.composite
tuscany/sandbox/travelsample/contributions/payment-spring-scatag/src/test/java/scatours/payment/PaymentTestCase.java
tuscany/sandbox/travelsample/contributions/pom.xml
Modified: tuscany/sandbox/travelsample/contributions/payment-spring-scatag/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/payment-spring-scatag/pom.xml?rev=814744&r1=814729&r2=814744&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/contributions/payment-spring-scatag/pom.xml (original)
+++ tuscany/sandbox/travelsample/contributions/payment-spring-scatag/pom.xml Mon Sep 14 17:28:15 2009
@@ -26,8 +26,8 @@
<!--relativePath>../../pom.xml</relativePath-->
</parent>
<version>1.0-SNAPSHOT</version>
- <artifactId>scatours-contribution-payment-spring</artifactId>
- <name>Apache Tuscany SCA Tours Payment Spring Contribution</name>
+ <artifactId>scatours-contribution-payment-spring-scatag</artifactId>
+ <name>Apache Tuscany SCA Tours Payment Spring SCA Tag Contribution</name>
<dependencies>
<dependency>
Modified: tuscany/sandbox/travelsample/contributions/payment-spring-scatag/src/main/java/com/tuscanyscatours/payment/impl/PaymentImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/payment-spring-scatag/src/main/java/com/tuscanyscatours/payment/impl/PaymentImpl.java?rev=814744&r1=814729&r2=814744&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/contributions/payment-spring-scatag/src/main/java/com/tuscanyscatours/payment/impl/PaymentImpl.java (original)
+++ tuscany/sandbox/travelsample/contributions/payment-spring-scatag/src/main/java/com/tuscanyscatours/payment/impl/PaymentImpl.java Mon Sep 14 17:28:15 2009
@@ -28,12 +28,14 @@
import com.tuscanyscatours.payment.creditcard.ObjectFactory;
import com.tuscanyscatours.payment.creditcard.PayerType;
+//@Service(Payment.class)
public class PaymentImpl implements Payment {
- private CreditCardPayment creditCardPayment;
- private EmailGateway emailGateway;
- private float transactionFee;
+ protected CreditCardPayment creditCardPayment;
+ protected EmailGateway emailGateway;
+ protected float transactionFee = 0;
+ //@Reference
public void setCreditCardPayment(CreditCardPayment creditCardPayment) {
this.creditCardPayment = creditCardPayment;
}
@@ -42,6 +44,7 @@
this.emailGateway = emailGateway;
}
+ //@Property
public void setTransactionFee(Float transactionFee) {
this.transactionFee = transactionFee;
}
@@ -59,8 +62,7 @@
String status = creditCardPayment.authorize(ccDetails, amount);
- com.tuscanyscatours.emailgateway.ObjectFactory emailFactory
- = new com.tuscanyscatours.emailgateway.ObjectFactory();
+ com.tuscanyscatours.emailgateway.ObjectFactory emailFactory = new com.tuscanyscatours.emailgateway.ObjectFactory();
EmailType email = emailFactory.createEmailType();
email.setTitle("Payment Received");
email.setTo(customerId);
Modified: tuscany/sandbox/travelsample/contributions/payment-spring-scatag/src/main/resources/Payment-context.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/payment-spring-scatag/src/main/resources/Payment-context.xml?rev=814744&r1=814729&r2=814744&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/contributions/payment-spring-scatag/src/main/resources/Payment-context.xml (original)
+++ tuscany/sandbox/travelsample/contributions/payment-spring-scatag/src/main/resources/Payment-context.xml Mon Sep 14 17:28:15 2009
@@ -20,16 +20,25 @@
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:sca="http://www.springframework.org/schema/sca"
- xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd">
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/sca http://www.osoa.org/xmlns/sca/1.0/spring-sca.xsd">
+
+ <sca:service name="Payment"
+ type="com.tuscanyscatours.payment.Payment"
+ target="Payment"/>
<bean id="Payment" class="com.tuscanyscatours.payment.impl.PaymentImpl">
- <property name="creditCardPayment" ref="creditCardPaymentReference"/>
+ <property name="creditCardPayment" ref="creditCardPayment"/>
<property name="emailGateway" ref="EmailGateway"/>
- <property name="transactionFee" value="0.5f"/>
+ <property name="transactionFee" ref="transactionFee"/>
</bean>
<bean id="EmailGateway" class="com.tuscanyscatours.emailgateway.impl.EmailGatewayImpl">
</bean>
-
+
+ <sca:reference name="creditCardPayment"
+ type="com.tuscanyscatours.payment.creditcard.CreditCardPayment"/>
+
+ <sca:property name="transactionFee"
+ type="java.lang.Float"/>
</beans>
Modified: tuscany/sandbox/travelsample/contributions/payment-spring-scatag/src/main/resources/payment.composite
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/payment-spring-scatag/src/main/resources/payment.composite?rev=814744&r1=814729&r2=814744&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/contributions/payment-spring-scatag/src/main/resources/payment.composite (original)
+++ tuscany/sandbox/travelsample/contributions/payment-spring-scatag/src/main/resources/payment.composite Mon Sep 14 17:28:15 2009
@@ -21,12 +21,12 @@
targetNamespace="http://tuscanyscatours.com/"
name="payment">
- <component name="Payment">
+ <component name="Payment">
<implementation.spring location="Payment-context.xml"/>
<service name="Payment">
<binding.ws uri="http://localhost:8081/Payment"/>
</service>
- <reference name="creditCardPaymentReference">
+ <reference name="creditCardPayment">
<binding.ws uri="http://localhost:8082/CreditCardPayment"/>
</reference>
<property name="transactionFee">1.23</property>
Modified: tuscany/sandbox/travelsample/contributions/payment-spring-scatag/src/test/java/scatours/payment/PaymentTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/payment-spring-scatag/src/test/java/scatours/payment/PaymentTestCase.java?rev=814744&r1=814729&r2=814744&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/contributions/payment-spring-scatag/src/test/java/scatours/payment/PaymentTestCase.java (original)
+++ tuscany/sandbox/travelsample/contributions/payment-spring-scatag/src/test/java/scatours/payment/PaymentTestCase.java Mon Sep 14 17:28:15 2009
@@ -43,8 +43,8 @@
creditCardNode.start();
paymentNode = SCANodeFactory.newInstance().createSCANode(null,
- new SCAContribution("payment-spring", "./target/classes"),
- new SCAContribution("payment-spring-test", "./target/test-classes"));
+ new SCAContribution("payment-spring-annotation", "./target/classes"),
+ new SCAContribution("payment-spring-annotation-test", "./target/test-classes"));
paymentNode.start();
}
Modified: tuscany/sandbox/travelsample/contributions/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/pom.xml?rev=814744&r1=814743&r2=814744&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/contributions/pom.xml (original)
+++ tuscany/sandbox/travelsample/contributions/pom.xml Mon Sep 14 17:28:15 2009
@@ -81,7 +81,7 @@
<module>payment-java</module>
<module>payment-java-policy</module>
<module>payment-spring</module>
- <module>payment-spring-scatag-contribution</module>
+ <module>payment-spring-scatag</module>
<module>payment-bpel-contribution</module>
<module>payment-groovy-contribution</module>
<module>policy-client</module>