From 6b4bc0c967a75cb4e57240dad2972cf6800d0ecd Mon Sep 17 00:00:00 2001 From: rfeng Date: Fri, 29 May 2009 18:20:02 +0000 Subject: Update the test scenarios git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@780056 13f79535-47bb-0310-9956-ffa450edef68 --- .../META-INF/MANIFEST.MF | 6 +- .../impl/CreditCardPaymentActivator.java | 2 +- .../creditcard/impl/CreditCardPaymentImpl.java | 1 + .../main/resources/META-INF/sca-contribution.xml | 22 ---- .../resources/OSGI-INF/sca/bundle.componentType | 5 +- .../main/resources/OSGI-INF/sca/bundle.composite | 3 + .../META-INF/MANIFEST.MF | 21 ++++ .../pom.xml | 117 +++++++++++++++++++++ .../java/scatours/currency/CurrencyConverter.java | 33 ++++++ .../currency/impl/CurrencyConverterActivator.java | 40 +++++++ .../currency/impl/CurrencyConverterImpl.java | 55 ++++++++++ .../resources/OSGI-INF/sca/bundle.componentType | 27 +++++ .../main/resources/OSGI-INF/sca/bundle.composite | 32 ++++++ 13 files changed, 336 insertions(+), 28 deletions(-) delete mode 100644 sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/src/main/resources/META-INF/sca-contribution.xml create mode 100644 sandbox/rfeng/scatours-currency-converter-dosgi-contribution/META-INF/MANIFEST.MF create mode 100644 sandbox/rfeng/scatours-currency-converter-dosgi-contribution/pom.xml create mode 100644 sandbox/rfeng/scatours-currency-converter-dosgi-contribution/src/main/java/scatours/currency/CurrencyConverter.java create mode 100644 sandbox/rfeng/scatours-currency-converter-dosgi-contribution/src/main/java/scatours/currency/impl/CurrencyConverterActivator.java create mode 100644 sandbox/rfeng/scatours-currency-converter-dosgi-contribution/src/main/java/scatours/currency/impl/CurrencyConverterImpl.java create mode 100644 sandbox/rfeng/scatours-currency-converter-dosgi-contribution/src/main/resources/OSGI-INF/sca/bundle.componentType create mode 100644 sandbox/rfeng/scatours-currency-converter-dosgi-contribution/src/main/resources/OSGI-INF/sca/bundle.composite (limited to 'sandbox/rfeng') diff --git a/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/META-INF/MANIFEST.MF b/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/META-INF/MANIFEST.MF index bbc88e69ec..cdf9a9df05 100644 --- a/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/META-INF/MANIFEST.MF +++ b/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/META-INF/MANIFEST.MF @@ -17,8 +17,12 @@ Import-Package: javax.jws, javax.xml.ws, org.apache.tuscany.sca.node;version="2.0.0", org.oasisopen.sca.annotation;version="2.0.0", - org.osgi.framework;version="1.4" + org.osgi.framework;version="1.4", + scatours.currency, + scatours.payment.creditcard Bundle-SymbolicName: scatours.creditcard.payment Bundle-DocURL: http://www.apache.org/ Bundle-RequiredExecutionEnvironment: J2SE-1.5,JavaSE-1.6 Bundle-Activator: scatours.payment.creditcard.impl.CreditCardPaymentActivator +Export-Package: scatours.currency, + scatours.payment.creditcard diff --git a/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/src/main/java/scatours/payment/creditcard/impl/CreditCardPaymentActivator.java b/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/src/main/java/scatours/payment/creditcard/impl/CreditCardPaymentActivator.java index ba09b15de4..9c7364d4d5 100644 --- a/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/src/main/java/scatours/payment/creditcard/impl/CreditCardPaymentActivator.java +++ b/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/src/main/java/scatours/payment/creditcard/impl/CreditCardPaymentActivator.java @@ -30,7 +30,7 @@ import scatours.payment.creditcard.CreditCardPayment; public class CreditCardPaymentActivator implements BundleActivator { public void start(BundleContext context) throws Exception { - System.out.println("Registering CreditCardPayment service..."); + System.out.println("[" + context.getBundle().getSymbolicName() + "]: Registering CreditCardPayment service..."); context.registerService(CreditCardPayment.class.getName(), new CreditCardPaymentImpl(context), null); } diff --git a/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/src/main/java/scatours/payment/creditcard/impl/CreditCardPaymentImpl.java b/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/src/main/java/scatours/payment/creditcard/impl/CreditCardPaymentImpl.java index 591e02e31b..54a6f722de 100644 --- a/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/src/main/java/scatours/payment/creditcard/impl/CreditCardPaymentImpl.java +++ b/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/src/main/java/scatours/payment/creditcard/impl/CreditCardPaymentImpl.java @@ -76,6 +76,7 @@ public class CreditCardPaymentImpl implements CreditCardPayment { marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true); context.createMarshaller().marshal(element, writer); writer.flush(); + System.out.println("[CreditCard]: "); System.out.println(writer.toString()); } diff --git a/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index f8ce8b7af7..0000000000 --- a/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - \ No newline at end of file diff --git a/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/src/main/resources/OSGI-INF/sca/bundle.componentType b/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/src/main/resources/OSGI-INF/sca/bundle.componentType index 2b006a34b5..847213af37 100644 --- a/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/src/main/resources/OSGI-INF/sca/bundle.componentType +++ b/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/src/main/resources/OSGI-INF/sca/bundle.componentType @@ -18,15 +18,12 @@ * under the License. --> + - - 1 - ABC diff --git a/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/src/main/resources/OSGI-INF/sca/bundle.composite b/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/src/main/resources/OSGI-INF/sca/bundle.composite index 97550f027c..0bb37a02e8 100644 --- a/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/src/main/resources/OSGI-INF/sca/bundle.composite +++ b/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/src/main/resources/OSGI-INF/sca/bundle.composite @@ -33,6 +33,8 @@ + + @@ -40,4 +42,5 @@ + diff --git a/sandbox/rfeng/scatours-currency-converter-dosgi-contribution/META-INF/MANIFEST.MF b/sandbox/rfeng/scatours-currency-converter-dosgi-contribution/META-INF/MANIFEST.MF new file mode 100644 index 0000000000..68c5603763 --- /dev/null +++ b/sandbox/rfeng/scatours-currency-converter-dosgi-contribution/META-INF/MANIFEST.MF @@ -0,0 +1,21 @@ +Manifest-Version: 1.0 +Private-Package: calculator;version="2.0.0" +Tool: Bnd-0.0.255 +Bundle-Name: SCATours Currency Converter +Created-By: 1.6.0_07 (Sun Microsystems Inc.) +Bundle-Vendor: The Apache Software Foundation +Eclipse-LazyStart: true +Bundle-Version: 1.0.0 +Bnd-LastModified: 1223949424781 +Bundle-ManifestVersion: 2 +Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt +Bundle-Description: Apache Tuscany SCA Calculator OSGi Sample +Import-Package: org.oasisopen.sca.annotation;version="2.0.0", + org.osgi.framework;version="1.4", + scatours.currency +Bundle-SymbolicName: scatours.currency.converter +Bundle-DocURL: http://www.apache.org/ +Bundle-RequiredExecutionEnvironment: J2SE-1.5,JavaSE-1.6 +Export-Package: scatours.currency +Bundle-Activator: scatours.currency.impl.CurrencyConverterActivator + diff --git a/sandbox/rfeng/scatours-currency-converter-dosgi-contribution/pom.xml b/sandbox/rfeng/scatours-currency-converter-dosgi-contribution/pom.xml new file mode 100644 index 0000000000..dfb58c6676 --- /dev/null +++ b/sandbox/rfeng/scatours-currency-converter-dosgi-contribution/pom.xml @@ -0,0 +1,117 @@ + + + + 4.0.0 + + org.apache.tuscany.sca + tuscany-sca + 2.0-SNAPSHOT + ../../pom.xml + + scatours-currency-converter-dosgi + SCATours Currency Converter OSGi + + + + org.apache.tuscany.sca + tuscany-feature-ejava + 2.0-SNAPSHOT + pom + + + + org.apache.tuscany.sca + tuscany-node-launcher-equinox + 2.0-SNAPSHOT + test + + + + org.apache.tuscany.sca + tuscany-node-impl-osgi + 2.0-SNAPSHOT + runtime + + + + org.eclipse.osgi + services + 3.1.200-v20071203 + + + + junit + junit + 4.5 + test + + + + + org.eclipse.equinox + ds + 1.0.0-v20080427-0830 + test + + + + org.eclipse.equinox + util + 1.0.0-v20080414 + test + + + + + + ${artifactId} + + + + maven-eclipse-plugin + 2.5.1 + + + org.eclipse.pde.ManifestBuilder + org.eclipse.jdt.core.javabuilder + + + org.eclipse.jdt.core.javanature + org.eclipse.pde.PluginNature + + + org.eclipse.jdt.launching.JRE_CONTAINER + + + + + + + maven-jar-plugin + + + ${basedir}/META-INF/MANIFEST.MF + + + + + + + diff --git a/sandbox/rfeng/scatours-currency-converter-dosgi-contribution/src/main/java/scatours/currency/CurrencyConverter.java b/sandbox/rfeng/scatours-currency-converter-dosgi-contribution/src/main/java/scatours/currency/CurrencyConverter.java new file mode 100644 index 0000000000..49e1f6a119 --- /dev/null +++ b/sandbox/rfeng/scatours-currency-converter-dosgi-contribution/src/main/java/scatours/currency/CurrencyConverter.java @@ -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); + +} diff --git a/sandbox/rfeng/scatours-currency-converter-dosgi-contribution/src/main/java/scatours/currency/impl/CurrencyConverterActivator.java b/sandbox/rfeng/scatours-currency-converter-dosgi-contribution/src/main/java/scatours/currency/impl/CurrencyConverterActivator.java new file mode 100644 index 0000000000..63982ef5e6 --- /dev/null +++ b/sandbox/rfeng/scatours-currency-converter-dosgi-contribution/src/main/java/scatours/currency/impl/CurrencyConverterActivator.java @@ -0,0 +1,40 @@ +/* + * 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 org.osgi.framework.BundleActivator; +import org.osgi.framework.BundleContext; + +import scatours.currency.CurrencyConverter; + +/** + * + */ +public class CurrencyConverterActivator implements BundleActivator { + + public void start(BundleContext context) throws Exception { + System.out.println("[" + context.getBundle().getSymbolicName() + "]: Registering CurrencyConverter service..."); + context.registerService(CurrencyConverter.class.getName(), new CurrencyConverterImpl(), null); + } + + public void stop(BundleContext arg0) throws Exception { + } + +} diff --git a/sandbox/rfeng/scatours-currency-converter-dosgi-contribution/src/main/java/scatours/currency/impl/CurrencyConverterImpl.java b/sandbox/rfeng/scatours-currency-converter-dosgi-contribution/src/main/java/scatours/currency/impl/CurrencyConverterImpl.java new file mode 100644 index 0000000000..2a3ffc1a1e --- /dev/null +++ b/sandbox/rfeng/scatours-currency-converter-dosgi-contribution/src/main/java/scatours/currency/impl/CurrencyConverterImpl.java @@ -0,0 +1,55 @@ +/* + * 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 currencyIndex = new HashMap(); + + // 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) { + float converted = amount * getExchangeRate(fromCurrencyCode, toCurrencyCode); + System.out.println(fromCurrencyCode + amount + "=" + toCurrencyCode + converted); + return converted; + } +} diff --git a/sandbox/rfeng/scatours-currency-converter-dosgi-contribution/src/main/resources/OSGI-INF/sca/bundle.componentType b/sandbox/rfeng/scatours-currency-converter-dosgi-contribution/src/main/resources/OSGI-INF/sca/bundle.componentType new file mode 100644 index 0000000000..c673715e21 --- /dev/null +++ b/sandbox/rfeng/scatours-currency-converter-dosgi-contribution/src/main/resources/OSGI-INF/sca/bundle.componentType @@ -0,0 +1,27 @@ + + + + + + + + + + diff --git a/sandbox/rfeng/scatours-currency-converter-dosgi-contribution/src/main/resources/OSGI-INF/sca/bundle.composite b/sandbox/rfeng/scatours-currency-converter-dosgi-contribution/src/main/resources/OSGI-INF/sca/bundle.composite new file mode 100644 index 0000000000..65f62d62d2 --- /dev/null +++ b/sandbox/rfeng/scatours-currency-converter-dosgi-contribution/src/main/resources/OSGI-INF/sca/bundle.composite @@ -0,0 +1,32 @@ + + + + + + + + + + + + -- cgit v1.2.3