You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2009/05/26 19:58:41 UTC
svn commit: r778816 - in
/tuscany/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution: ./
META-INF/ src/main/java/payment/creditcard/impl/ src/main/java/scatours/
src/main/java/scatours/currency/ src/main/java/scatours/currency/impl/
src/main/...
Author: rfeng
Date: Tue May 26 17:58:40 2009
New Revision: 778816
URL: http://svn.apache.org/viewvc?rev=778816&view=rev
Log:
Adding CurrencyConverter
Added:
tuscany/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/src/main/java/scatours/
tuscany/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/src/main/java/scatours/currency/
tuscany/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/src/main/java/scatours/currency/CurrencyConverter.java
tuscany/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/src/main/java/scatours/currency/impl/
tuscany/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/src/main/java/scatours/currency/impl/CurrencyConverterImpl.java
tuscany/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/src/main/java/scatours/payment/
tuscany/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/src/main/java/scatours/payment/creditcard/
tuscany/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/src/main/java/scatours/payment/creditcard/impl/
- copied from r777368, tuscany/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/src/main/java/payment/creditcard/impl/
tuscany/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/src/test/java/scatours/
tuscany/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/src/test/java/scatours/payment/
tuscany/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/src/test/java/scatours/payment/creditcard/
tuscany/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/src/test/java/scatours/payment/creditcard/test/
- copied from r777368, tuscany/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/src/test/java/payment/creditcard/test/
Removed:
tuscany/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/src/main/java/payment/creditcard/impl/
tuscany/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/src/main/resources/creditcard.composite
tuscany/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/src/test/java/payment/creditcard/test/
tuscany/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/src/test/java/scatours/payment/creditcard/test/CreditCardPaymentTestCase.java
Modified:
tuscany/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/ (props changed)
tuscany/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/META-INF/MANIFEST.MF
tuscany/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/pom.xml
tuscany/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/src/main/java/scatours/payment/creditcard/impl/CreditCardPaymentActivator.java
tuscany/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/src/main/java/scatours/payment/creditcard/impl/CreditCardPaymentImpl.java
tuscany/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/src/main/resources/CreditCardPayment.wsdl
tuscany/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/src/main/resources/OSGI-INF/sca/bundle.componentType
tuscany/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/src/main/resources/OSGI-INF/sca/bundle.composite
tuscany/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/src/test/java/scatours/payment/creditcard/test/CreditCardPaymentOSGiTestCase.java
tuscany/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/src/test/java/scatours/payment/creditcard/test/OSGiTestUtils.java
Propchange: tuscany/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue May 26 17:58:40 2009
@@ -11,3 +11,5 @@
.settings
.deployables
.wtpmodules
+.externalToolBuilders
+maven-eclipse.xml
Modified: tuscany/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/tuscany/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/META-INF/MANIFEST.MF?rev=778816&r1=778815&r2=778816&view=diff
==============================================================================
--- tuscany/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/META-INF/MANIFEST.MF (original)
+++ tuscany/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/META-INF/MANIFEST.MF Tue May 26 17:58:40 2009
@@ -20,4 +20,4 @@
Bundle-SymbolicName: scatours.creditcard.payment
Bundle-DocURL: http://www.apache.org/
Bundle-RequiredExecutionEnvironment: J2SE-1.5,JavaSE-1.6
-Bundle-Activator: payment.creditcard.impl.CreditCardPaymentActivator
+Bundle-Activator: scatours.payment.creditcard.impl.CreditCardPaymentActivator
Modified: tuscany/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/pom.xml?rev=778816&r1=778815&r2=778816&view=diff
==============================================================================
--- tuscany/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/pom.xml (original)
+++ tuscany/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/pom.xml Tue May 26 17:58:40 2009
@@ -28,6 +28,18 @@
<artifactId>scatours-creditcard-payment-dosgi</artifactId>
<name>SCATours CreditCard Payment OSGi</name>
+ <repositories>
+ <repository>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ <id>java.net</id>
+ <name>java.net Maven 1.x Repository</name>
+ <url>http://download.java.net/maven/1</url>
+ <layout>legacy</layout>
+ </repository>
+ </repositories>
+
<dependencies>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
@@ -63,6 +75,13 @@
</dependency>
<dependency>
+ <groupId>com.sun.xml.ws</groupId>
+ <artifactId>jaxws-rt</artifactId>
+ <version>2.1.7</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.5</version>
@@ -89,6 +108,45 @@
<finalName>${artifactId}</finalName>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>javax.xml.ws</groupId>
+ <artifactId>jaxws-api</artifactId>
+ <version>2.1</version>
+ <type>jar</type>
+ </artifactItem>
+ <artifactItem>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>2.1</version>
+ <type>jar</type>
+ </artifactItem>
+ </artifactItems>
+ <outputDirectory>${project.build.directory}/endorsed</outputDirectory>
+ <overWriteReleases>false</overWriteReleases>
+ <overWriteSnapshots>true</overWriteSnapshots>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <argLine>-Djava.endorsed.dirs=target/endorsed</argLine>
+ </configuration>
+ </plugin>
+ <plugin>
<artifactId>maven-eclipse-plugin</artifactId>
<version>2.5.1</version>
<configuration>
@@ -147,7 +205,7 @@
<goal>wsimport</goal>
</goals>
<configuration>
- <packageName>payment.creditcard</packageName>
+ <packageName>scatours.payment.creditcard</packageName>
<wsdlDirectory>${basedir}/src/main/resources
</wsdlDirectory>
<wsdlFiles>
Added: tuscany/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/src/main/java/scatours/currency/CurrencyConverter.java
URL: http://svn.apache.org/viewvc/tuscany/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/src/main/java/scatours/currency/CurrencyConverter.java?rev=778816&view=auto
==============================================================================
--- tuscany/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/src/main/java/scatours/currency/CurrencyConverter.java (added)
+++ tuscany/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/src/main/java/scatours/currency/CurrencyConverter.java Tue May 26 17:58:40 2009
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package scatours.currency;
+
+import org.oasisopen.sca.annotation.Remotable;
+
+/**
+ * The CurrencyConverter service interface
+ */
+@Remotable
+public interface CurrencyConverter {
+
+ float getExchangeRate(String fromCurrencyCode, String toCurrencyCode);
+
+ float convert(String fromCurrencyCode, String toCurrencyCode, float amount);
+
+}
Added: tuscany/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/src/main/java/scatours/currency/impl/CurrencyConverterImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/src/main/java/scatours/currency/impl/CurrencyConverterImpl.java?rev=778816&view=auto
==============================================================================
--- tuscany/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/src/main/java/scatours/currency/impl/CurrencyConverterImpl.java (added)
+++ tuscany/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/src/main/java/scatours/currency/impl/CurrencyConverterImpl.java Tue May 26 17:58:40 2009
@@ -0,0 +1,53 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package scatours.currency.impl;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.oasisopen.sca.annotation.Service;
+
+import scatours.currency.CurrencyConverter;
+
+/**
+ * An implementation of the CurrencyConverter service
+ */
+@Service(CurrencyConverter.class)
+public class CurrencyConverterImpl implements CurrencyConverter {
+
+ // currency index
+ private Map<String, Integer> currencyIndex = new HashMap<String, Integer>();
+
+ // exchange rates
+ private final float rates[][] = { {1.00f, 0.50f, 0.66f}, {2.00f, 1.00f, 1.33f}, {1.50f, 0.75f, 1.00f}};
+
+ public CurrencyConverterImpl() {
+ currencyIndex.put("USD", new Integer(0));
+ currencyIndex.put("GBP", new Integer(1));
+ currencyIndex.put("EUR", new Integer(2));
+ }
+
+ public float getExchangeRate(String fromCurrencyCode, String toCurrencyCode) {
+ return rates[currencyIndex.get(fromCurrencyCode).intValue()][currencyIndex.get(toCurrencyCode).intValue()];
+ }
+
+ public float convert(String fromCurrencyCode, String toCurrencyCode, float amount) {
+ return amount * getExchangeRate(fromCurrencyCode, toCurrencyCode);
+ }
+}
Modified: tuscany/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/src/main/java/scatours/payment/creditcard/impl/CreditCardPaymentActivator.java
URL: http://svn.apache.org/viewvc/tuscany/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/src/main/java/scatours/payment/creditcard/impl/CreditCardPaymentActivator.java?rev=778816&r1=777368&r2=778816&view=diff
==============================================================================
--- tuscany/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/src/main/java/scatours/payment/creditcard/impl/CreditCardPaymentActivator.java (original)
+++ tuscany/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/src/main/java/scatours/payment/creditcard/impl/CreditCardPaymentActivator.java Tue May 26 17:58:40 2009
@@ -17,12 +17,12 @@
* under the License.
*/
-package payment.creditcard.impl;
+package scatours.payment.creditcard.impl;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
-import payment.creditcard.CreditCardPayment;
+import scatours.payment.creditcard.CreditCardPayment;
/**
*
@@ -31,7 +31,7 @@
public void start(BundleContext context) throws Exception {
System.out.println("Registering CreditCardPayment service...");
- context.registerService(CreditCardPayment.class.getName(), new CreditCardPaymentImpl(), null);
+ context.registerService(CreditCardPayment.class.getName(), new CreditCardPaymentImpl(context), null);
}
public void stop(BundleContext context) throws Exception {
Modified: tuscany/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/src/main/java/scatours/payment/creditcard/impl/CreditCardPaymentImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/src/main/java/scatours/payment/creditcard/impl/CreditCardPaymentImpl.java?rev=778816&r1=777368&r2=778816&view=diff
==============================================================================
--- tuscany/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/src/main/java/scatours/payment/creditcard/impl/CreditCardPaymentImpl.java (original)
+++ tuscany/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/src/main/java/scatours/payment/creditcard/impl/CreditCardPaymentImpl.java Tue May 26 17:58:40 2009
@@ -17,31 +17,48 @@
* under the License.
*/
-package payment.creditcard.impl;
+package scatours.payment.creditcard.impl;
-import org.oasisopen.sca.annotation.Service;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceReference;
-import payment.creditcard.CreditCardDetailsType;
-import payment.creditcard.CreditCardPayment;
+import scatours.currency.CurrencyConverter;
+import scatours.payment.creditcard.CreditCardDetailsType;
+import scatours.payment.creditcard.CreditCardPayment;
-/**
- *
- */
-@Service(CreditCardPayment.class)
public class CreditCardPaymentImpl implements CreditCardPayment {
+ private BundleContext context;
+
+ public CreditCardPaymentImpl(BundleContext context) {
+ super();
+ this.context = context;
+ }
public String authorize(CreditCardDetailsType creditCard, float amount) {
- if (creditCard != null){
- System.out.println("Checking card: name = " +
- creditCard.getCardOwner().getName() +
- " number = " +
- creditCard.getCreditCardNumber() +
- " for amount " +
- amount);
+ if (creditCard != null) {
+ System.out.println("Checking card: name = " + creditCard.getCardOwner().getName()
+ + " number = "
+ + creditCard.getCreditCardNumber()
+ + " for amount "
+ + amount + " EUR");
+ amount = convertCurrency(amount);
} else {
- System.out.println("Checking card is null");
+ System.out.println("Credit card is null");
}
return "OK";
}
+
+ private float convertCurrency(float amount) {
+ ServiceReference ref = context.getServiceReference(CurrencyConverter.class.getName());
+ if (ref != null) {
+ CurrencyConverter converter = (CurrencyConverter)context.getService(ref);
+ if (converter != null) {
+ amount = converter.convert("EUR", "USD", amount);
+ context.ungetService(ref);
+ return amount;
+ }
+ }
+ throw new IllegalArgumentException("Currency cannot be converted");
+ }
}
Modified: tuscany/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/src/main/resources/CreditCardPayment.wsdl
URL: http://svn.apache.org/viewvc/tuscany/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/src/main/resources/CreditCardPayment.wsdl?rev=778816&r1=778815&r2=778816&view=diff
==============================================================================
--- tuscany/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/src/main/resources/CreditCardPayment.wsdl (original)
+++ tuscany/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/src/main/resources/CreditCardPayment.wsdl Tue May 26 17:58:40 2009
@@ -7,29 +7,29 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
- * under the License.
+ * under the License.
-->
-<wsdl:definitions name="CreditCardPayment"
+<wsdl:definitions name="CreditCardPayment"
targetNamespace="http://www.tuscanyscatours.com/CreditCardPayment/"
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
- xmlns:tns="http://www.tuscanyscatours.com/CreditCardPayment/"
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:tns="http://www.tuscanyscatours.com/CreditCardPayment/"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
xmlns:plnk="http://schemas.xmlsoap.org/ws/2004/03/partner-link/">
<wsdl:types>
- <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
targetNamespace="http://www.tuscanyscatours.com/CreditCardPayment/"
xmlns:tns="http://www.tuscanyscatours.com/CreditCardPayment/">
-
+
<xsd:element name="authorize" type="tns:AuthorizeType"/>
<xsd:complexType name="AuthorizeType">
<xsd:sequence>
@@ -106,11 +106,11 @@
</wsdl:binding>
<wsdl:service name="CreditCardPaymentService">
<wsdl:port name="CreditCardPaymentPort" binding="tns:CreditCardPaymentBinding">
- <soap:address location="http://localhost:8080/CreditCardPayment" />
+ <soap:address location="http://localhost:8086/CreditCardPayment" />
</wsdl:port>
</wsdl:service>
-
+
<plnk:partnerLinkType name="CreditCardPaymentLinkType">
<plnk:role name="forward" portType="tns:CreditCardPayment"/>
- </plnk:partnerLinkType>
+ </plnk:partnerLinkType>
</wsdl:definitions>
\ No newline at end of file
Modified: tuscany/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/src/main/resources/OSGI-INF/sca/bundle.componentType
URL: http://svn.apache.org/viewvc/tuscany/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/src/main/resources/OSGI-INF/sca/bundle.componentType?rev=778816&r1=778815&r2=778816&view=diff
==============================================================================
--- tuscany/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/src/main/resources/OSGI-INF/sca/bundle.componentType (original)
+++ tuscany/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/src/main/resources/OSGI-INF/sca/bundle.componentType Tue May 26 17:58:40 2009
@@ -30,12 +30,8 @@
</service>
<!-- The reference elment defines an SCA proxy to a remote OSGi service -->
- <!--
<reference name="currencyConverter">
<interface.java interface="currency.CurrencyConverter"/>
- <t:osgi.property name="prop1">1</t:osgi.property>
- <t:osgi.property name="prop2">ABC</t:osgi.property>
</reference>
- -->
</componentType>
Modified: tuscany/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/src/main/resources/OSGI-INF/sca/bundle.composite
URL: http://svn.apache.org/viewvc/tuscany/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/src/main/resources/OSGI-INF/sca/bundle.composite?rev=778816&r1=778815&r2=778816&view=diff
==============================================================================
--- tuscany/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/src/main/resources/OSGI-INF/sca/bundle.composite (original)
+++ tuscany/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/src/main/resources/OSGI-INF/sca/bundle.composite Tue May 26 17:58:40 2009
@@ -28,18 +28,15 @@
<service name="CreditCardPayment">
<binding.ws uri="http://localhost:8086/CreditCardPayment"/>
</service>
- <!--
<reference name="currencyConverter">
<tuscany:binding.rmi uri="rmi://localhost:8085/CurrencyConverter"/>
</reference>
- -->
</component>
- <component name="CreditCardPaymentJavaComponent">
- <implementation.java class="payment.creditcard.impl.CreditCardPaymentImpl" />
- <service name="CreditCardPayment">
- <binding.ws uri="http://localhost:8087/CreditCardPayment" />
- <binding.sca/>
+ <component name="CurrencyConverterComponent">
+ <implementation.java class="scatours.currency.impl.CurrencyConverterImpl" />
+ <service name="CurrencyConverter">
+ <tuscany:binding.rmi uri="rmi://localhost:8085/CurrencyConverter" />
</service>
</component>
Modified: tuscany/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/src/test/java/scatours/payment/creditcard/test/CreditCardPaymentOSGiTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/src/test/java/scatours/payment/creditcard/test/CreditCardPaymentOSGiTestCase.java?rev=778816&r1=777368&r2=778816&view=diff
==============================================================================
--- tuscany/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/src/test/java/scatours/payment/creditcard/test/CreditCardPaymentOSGiTestCase.java (original)
+++ tuscany/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/src/test/java/scatours/payment/creditcard/test/CreditCardPaymentOSGiTestCase.java Tue May 26 17:58:40 2009
@@ -17,9 +17,9 @@
* under the License.
*/
-package payment.creditcard.test;
+package scatours.payment.creditcard.test;
-import static payment.creditcard.test.OSGiTestUtils.bundleStatus;
+import static scatours.payment.creditcard.test.OSGiTestUtils.bundleStatus;
import java.io.InputStream;
import java.io.InputStreamReader;
@@ -30,11 +30,19 @@
import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.BeforeClass;
+import org.junit.Ignore;
import org.junit.Test;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Constants;
+import scatours.payment.creditcard.CreditCardDetailsType;
+import scatours.payment.creditcard.CreditCardPayment;
+import scatours.payment.creditcard.CreditCardPaymentService;
+import scatours.payment.creditcard.CreditCardTypeType;
+import scatours.payment.creditcard.ObjectFactory;
+import scatours.payment.creditcard.PayerType;
+
/**
*
*/
@@ -83,9 +91,7 @@
}
@Test
- /**
- * Test the Web service exposed by the Calculator
- */
+ @Ignore("Now we use the testClient")
public void testWS() throws Exception {
URL url = new URL("http://localhost:8086/CreditCardPayment?wsdl");
InputStream is = url.openStream();
@@ -106,6 +112,22 @@
}
/**
+ * Test the Web service exposed by the Calculator
+ */
+ @Test
+ public void testClient() {
+ CreditCardPaymentService service = new CreditCardPaymentService();
+ ObjectFactory objectFactory = new ObjectFactory();
+ CreditCardDetailsType ccDetails = objectFactory.createCreditCardDetailsType();
+ ccDetails.setCreditCardType(CreditCardTypeType.fromValue("Visa"));
+ PayerType ccOwner = objectFactory.createPayerType();
+ ccOwner.setName("Fred");
+ ccDetails.setCardOwner(ccOwner);
+ CreditCardPayment cc = service.getCreditCardPaymentPort();
+ System.out.println(cc.authorize(ccDetails, 100.00f));
+ }
+
+ /**
* @throws java.lang.Exception
*/
@AfterClass
Modified: tuscany/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/src/test/java/scatours/payment/creditcard/test/OSGiTestUtils.java
URL: http://svn.apache.org/viewvc/tuscany/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/src/test/java/scatours/payment/creditcard/test/OSGiTestUtils.java?rev=778816&r1=777368&r2=778816&view=diff
==============================================================================
--- tuscany/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/src/test/java/scatours/payment/creditcard/test/OSGiTestUtils.java (original)
+++ tuscany/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/src/test/java/scatours/payment/creditcard/test/OSGiTestUtils.java Tue May 26 17:58:40 2009
@@ -17,7 +17,7 @@
* under the License.
*/
-package payment.creditcard.test;
+package scatours.payment.creditcard.test;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Method;