diff options
| author | rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68> | 2009-10-26 16:45:11 +0000 |
|---|---|---|
| committer | rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68> | 2009-10-26 16:45:11 +0000 |
| commit | 2589907eeee152f9f9a3281caf799463b7d2828d (patch) | |
| tree | cc8441940a0f882d8086133ee86c007dc002c8de | |
| parent | 2d4112728d8d14a3fdbdbfa6410193eae84f345d (diff) | |
Move 2.x code into contrib/2.x
Change the pom.xml to depend on node-impl
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@829858 13f79535-47bb-0310-9956-ffa450edef68
54 files changed, 363 insertions, 40 deletions
diff --git a/sandbox/travelsample/contributions/creditcard-payment-dosgi-contribution/META-INF/MANIFEST.MF b/sandbox/travelsample/contrib/2.x/creditcard-payment-dosgi-contribution/META-INF/MANIFEST.MF index cdf9a9df05..cdf9a9df05 100644 --- a/sandbox/travelsample/contributions/creditcard-payment-dosgi-contribution/META-INF/MANIFEST.MF +++ b/sandbox/travelsample/contrib/2.x/creditcard-payment-dosgi-contribution/META-INF/MANIFEST.MF diff --git a/sandbox/travelsample/contributions/creditcard-payment-dosgi-contribution/src/main/resources/OSGI-INF/sca/bundle.componentType b/sandbox/travelsample/contrib/2.x/creditcard-payment-dosgi-contribution/OSGI-INF/sca/bundle.componentType index 847213af37..847213af37 100644 --- a/sandbox/travelsample/contributions/creditcard-payment-dosgi-contribution/src/main/resources/OSGI-INF/sca/bundle.componentType +++ b/sandbox/travelsample/contrib/2.x/creditcard-payment-dosgi-contribution/OSGI-INF/sca/bundle.componentType diff --git a/sandbox/travelsample/contributions/creditcard-payment-dosgi-contribution/src/main/resources/OSGI-INF/sca/bundle.composite b/sandbox/travelsample/contrib/2.x/creditcard-payment-dosgi-contribution/OSGI-INF/sca/bundle.composite index 7b12b36368..7b12b36368 100644 --- a/sandbox/travelsample/contributions/creditcard-payment-dosgi-contribution/src/main/resources/OSGI-INF/sca/bundle.composite +++ b/sandbox/travelsample/contrib/2.x/creditcard-payment-dosgi-contribution/OSGI-INF/sca/bundle.composite diff --git a/sandbox/travelsample/contributions/creditcard-payment-dosgi-contribution/pom.xml b/sandbox/travelsample/contrib/2.x/creditcard-payment-dosgi-contribution/pom.xml index 083a158c7e..074a6004cb 100644 --- a/sandbox/travelsample/contributions/creditcard-payment-dosgi-contribution/pom.xml +++ b/sandbox/travelsample/contrib/2.x/creditcard-payment-dosgi-contribution/pom.xml @@ -71,7 +71,7 @@ <dependency>
<groupId>org.eclipse.osgi</groupId>
<artifactId>services</artifactId>
- <version>3.1.200-v20071203</version>
+ <version>3.2.0-v20090520-1800</version>
</dependency>
<dependency>
@@ -92,14 +92,14 @@ <dependency>
<groupId>org.eclipse.equinox</groupId>
<artifactId>ds</artifactId>
- <version>1.0.0-v20080427-0830</version>
+ <version>1.1.0-v20090601</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.equinox</groupId>
<artifactId>util</artifactId>
- <version>1.0.0-v20080414</version>
+ <version>1.0.100-v20090520-1800</version>
<scope>test</scope>
</dependency>
@@ -134,7 +134,7 @@ <artifactItem>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
- <version>2.1.11</version>
+ <version>2.1.12</version>
<type>jar</type>
</artifactItem>
<artifactItem>
diff --git a/sandbox/travelsample/contributions/creditcard-payment-dosgi-contribution/src/main/java/scatours/currency/CurrencyConverter.java b/sandbox/travelsample/contrib/2.x/creditcard-payment-dosgi-contribution/src/main/java/scatours/currency/CurrencyConverter.java index 49e1f6a119..49e1f6a119 100644 --- a/sandbox/travelsample/contributions/creditcard-payment-dosgi-contribution/src/main/java/scatours/currency/CurrencyConverter.java +++ b/sandbox/travelsample/contrib/2.x/creditcard-payment-dosgi-contribution/src/main/java/scatours/currency/CurrencyConverter.java diff --git a/sandbox/travelsample/contributions/creditcard-payment-dosgi-contribution/src/main/java/scatours/currency/impl/CurrencyConverterImpl.java b/sandbox/travelsample/contrib/2.x/creditcard-payment-dosgi-contribution/src/main/java/scatours/currency/impl/CurrencyConverterImpl.java index 2a3ffc1a1e..2a3ffc1a1e 100644 --- a/sandbox/travelsample/contributions/creditcard-payment-dosgi-contribution/src/main/java/scatours/currency/impl/CurrencyConverterImpl.java +++ b/sandbox/travelsample/contrib/2.x/creditcard-payment-dosgi-contribution/src/main/java/scatours/currency/impl/CurrencyConverterImpl.java diff --git a/sandbox/travelsample/contributions/creditcard-payment-dosgi-contribution/src/main/java/scatours/payment/creditcard/impl/CreditCardPaymentActivator.java b/sandbox/travelsample/contrib/2.x/creditcard-payment-dosgi-contribution/src/main/java/scatours/payment/creditcard/impl/CreditCardPaymentActivator.java index 9c7364d4d5..9c7364d4d5 100644 --- a/sandbox/travelsample/contributions/creditcard-payment-dosgi-contribution/src/main/java/scatours/payment/creditcard/impl/CreditCardPaymentActivator.java +++ b/sandbox/travelsample/contrib/2.x/creditcard-payment-dosgi-contribution/src/main/java/scatours/payment/creditcard/impl/CreditCardPaymentActivator.java diff --git a/sandbox/travelsample/contributions/creditcard-payment-dosgi-contribution/src/main/java/scatours/payment/creditcard/impl/CreditCardPaymentImpl.java b/sandbox/travelsample/contrib/2.x/creditcard-payment-dosgi-contribution/src/main/java/scatours/payment/creditcard/impl/CreditCardPaymentImpl.java index 6605c23bcd..6605c23bcd 100644 --- a/sandbox/travelsample/contributions/creditcard-payment-dosgi-contribution/src/main/java/scatours/payment/creditcard/impl/CreditCardPaymentImpl.java +++ b/sandbox/travelsample/contrib/2.x/creditcard-payment-dosgi-contribution/src/main/java/scatours/payment/creditcard/impl/CreditCardPaymentImpl.java diff --git a/sandbox/travelsample/contributions/creditcard-payment-dosgi-contribution/src/main/resources/CreditCardPayment.wsdl b/sandbox/travelsample/contrib/2.x/creditcard-payment-dosgi-contribution/src/main/resources/CreditCardPayment.wsdl index d50a63ac42..d50a63ac42 100644 --- a/sandbox/travelsample/contributions/creditcard-payment-dosgi-contribution/src/main/resources/CreditCardPayment.wsdl +++ b/sandbox/travelsample/contrib/2.x/creditcard-payment-dosgi-contribution/src/main/resources/CreditCardPayment.wsdl diff --git a/sandbox/travelsample/contributions/creditcard-payment-dosgi-contribution/src/test/java/scatours/payment/creditcard/test/CreditCardPaymentClient.java b/sandbox/travelsample/contrib/2.x/creditcard-payment-dosgi-contribution/src/test/java/scatours/payment/creditcard/test/CreditCardPaymentClient.java index d41571f679..d41571f679 100644 --- a/sandbox/travelsample/contributions/creditcard-payment-dosgi-contribution/src/test/java/scatours/payment/creditcard/test/CreditCardPaymentClient.java +++ b/sandbox/travelsample/contrib/2.x/creditcard-payment-dosgi-contribution/src/test/java/scatours/payment/creditcard/test/CreditCardPaymentClient.java diff --git a/sandbox/travelsample/contributions/creditcard-payment-dosgi-contribution/src/test/java/scatours/payment/creditcard/test/CreditCardPaymentOSGiTestCase.java b/sandbox/travelsample/contrib/2.x/creditcard-payment-dosgi-contribution/src/test/java/scatours/payment/creditcard/test/CreditCardPaymentOSGiTestCase.java index 98c1fced9d..98c1fced9d 100644 --- a/sandbox/travelsample/contributions/creditcard-payment-dosgi-contribution/src/test/java/scatours/payment/creditcard/test/CreditCardPaymentOSGiTestCase.java +++ b/sandbox/travelsample/contrib/2.x/creditcard-payment-dosgi-contribution/src/test/java/scatours/payment/creditcard/test/CreditCardPaymentOSGiTestCase.java diff --git a/sandbox/travelsample/contributions/creditcard-payment-dosgi-contribution/src/test/java/scatours/payment/creditcard/test/OSGiTestUtils.java b/sandbox/travelsample/contrib/2.x/creditcard-payment-dosgi-contribution/src/test/java/scatours/payment/creditcard/test/OSGiTestUtils.java index de8a77a818..de8a77a818 100644 --- a/sandbox/travelsample/contributions/creditcard-payment-dosgi-contribution/src/test/java/scatours/payment/creditcard/test/OSGiTestUtils.java +++ b/sandbox/travelsample/contrib/2.x/creditcard-payment-dosgi-contribution/src/test/java/scatours/payment/creditcard/test/OSGiTestUtils.java diff --git a/sandbox/travelsample/contributions/creditcard-payment-web-contribution/pom.xml b/sandbox/travelsample/contrib/2.x/creditcard-payment-web-contribution/pom.xml index a7fa84ae74..a7fa84ae74 100644 --- a/sandbox/travelsample/contributions/creditcard-payment-web-contribution/pom.xml +++ b/sandbox/travelsample/contrib/2.x/creditcard-payment-web-contribution/pom.xml diff --git a/sandbox/travelsample/contributions/creditcard-payment-web-contribution/src/main/resources/CreditCardPayment.wsdl b/sandbox/travelsample/contrib/2.x/creditcard-payment-web-contribution/src/main/resources/CreditCardPayment.wsdl index c8660c4ffe..c8660c4ffe 100644 --- a/sandbox/travelsample/contributions/creditcard-payment-web-contribution/src/main/resources/CreditCardPayment.wsdl +++ b/sandbox/travelsample/contrib/2.x/creditcard-payment-web-contribution/src/main/resources/CreditCardPayment.wsdl diff --git a/sandbox/travelsample/contributions/creditcard-payment-web-contribution/src/main/webapp/WEB-INF/web.composite b/sandbox/travelsample/contrib/2.x/creditcard-payment-web-contribution/src/main/webapp/WEB-INF/web.composite index 188c9937f7..188c9937f7 100644 --- a/sandbox/travelsample/contributions/creditcard-payment-web-contribution/src/main/webapp/WEB-INF/web.composite +++ b/sandbox/travelsample/contrib/2.x/creditcard-payment-web-contribution/src/main/webapp/WEB-INF/web.composite diff --git a/sandbox/travelsample/contributions/creditcard-payment-web-contribution/src/main/webapp/WEB-INF/web.xml b/sandbox/travelsample/contrib/2.x/creditcard-payment-web-contribution/src/main/webapp/WEB-INF/web.xml index 33332936b3..33332936b3 100644 --- a/sandbox/travelsample/contributions/creditcard-payment-web-contribution/src/main/webapp/WEB-INF/web.xml +++ b/sandbox/travelsample/contrib/2.x/creditcard-payment-web-contribution/src/main/webapp/WEB-INF/web.xml diff --git a/sandbox/travelsample/contributions/creditcard-payment-web-contribution/src/main/webapp/creditcard.jsp b/sandbox/travelsample/contrib/2.x/creditcard-payment-web-contribution/src/main/webapp/creditcard.jsp index d40f91eabf..d40f91eabf 100644 --- a/sandbox/travelsample/contributions/creditcard-payment-web-contribution/src/main/webapp/creditcard.jsp +++ b/sandbox/travelsample/contrib/2.x/creditcard-payment-web-contribution/src/main/webapp/creditcard.jsp diff --git a/sandbox/travelsample/contrib/2.x/currency-converter-dosgi-contribution/META-INF/MANIFEST.MF b/sandbox/travelsample/contrib/2.x/currency-converter-dosgi-contribution/META-INF/MANIFEST.MF new file mode 100644 index 0000000000..68c5603763 --- /dev/null +++ b/sandbox/travelsample/contrib/2.x/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/travelsample/contrib/2.x/currency-converter-dosgi-contribution/OSGI-INF/sca/bundle.componentType b/sandbox/travelsample/contrib/2.x/currency-converter-dosgi-contribution/OSGI-INF/sca/bundle.componentType new file mode 100644 index 0000000000..c673715e21 --- /dev/null +++ b/sandbox/travelsample/contrib/2.x/currency-converter-dosgi-contribution/OSGI-INF/sca/bundle.componentType @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * 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.
+-->
+<componentType xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903">
+
+ <service name="CurrencyConverter">
+ <!-- The interface will be mapped into the OSGi service class -->
+ <interface.java interface="scatours.currency.CurrencyConverter"/>
+ </service>
+
+</componentType>
diff --git a/sandbox/travelsample/contrib/2.x/currency-converter-dosgi-contribution/OSGI-INF/sca/bundle.composite b/sandbox/travelsample/contrib/2.x/currency-converter-dosgi-contribution/OSGI-INF/sca/bundle.composite new file mode 100644 index 0000000000..b59e8bf248 --- /dev/null +++ b/sandbox/travelsample/contrib/2.x/currency-converter-dosgi-contribution/OSGI-INF/sca/bundle.composite @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * 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.
+-->
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+ xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
+ targetNamespace="http://currency"
+ name="CurrencyConverterComposite">
+
+ <component name="CurrencyConverterComponent">
+ <tuscany:implementation.osgi bundleSymbolicName="scatours.currency.converter" bundleVersion="1.0.0" />
+ <service name="CurrencyConverter">
+ <tuscany:binding.rmi uri="rmi://localhost:8089/CurrencyConverter" />
+ </service>
+ </component>
+
+</composite>
diff --git a/sandbox/travelsample/contrib/2.x/currency-converter-dosgi-contribution/pom.xml b/sandbox/travelsample/contrib/2.x/currency-converter-dosgi-contribution/pom.xml new file mode 100644 index 0000000000..6d7388d833 --- /dev/null +++ b/sandbox/travelsample/contrib/2.x/currency-converter-dosgi-contribution/pom.xml @@ -0,0 +1,117 @@ +<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * 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.
+-->
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-sca</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
+ <artifactId>scatours-currency-converter-dosgi</artifactId>
+ <name>SCATours Currency Converter OSGi</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-feature-ejava</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ <type>pom</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-node-launcher-equinox</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-node-impl-osgi</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.osgi</groupId>
+ <artifactId>services</artifactId>
+ <version>3.2.0-v20090520-1800</version>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.5</version>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- Equinox Declarative Services -->
+ <dependency>
+ <groupId>org.eclipse.equinox</groupId>
+ <artifactId>ds</artifactId>
+ <version>1.1.0-v20090601</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.equinox</groupId>
+ <artifactId>util</artifactId>
+ <version>1.0.100-v20090520-1800</version>
+ <scope>test</scope>
+ </dependency>
+
+ </dependencies>
+
+ <build>
+ <finalName>${artifactId}</finalName>
+ <plugins>
+
+ <plugin>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <version>2.5.1</version>
+ <configuration>
+ <buildcommands>
+ <buildcommand>org.eclipse.pde.ManifestBuilder</buildcommand>
+ <buildcommand>org.eclipse.jdt.core.javabuilder</buildcommand>
+ </buildcommands>
+ <projectnatures>
+ <projectnature>org.eclipse.jdt.core.javanature</projectnature>
+ <projectnature>org.eclipse.pde.PluginNature</projectnature>
+ </projectnatures>
+ <classpathContainers>
+ <classpathContainer>org.eclipse.jdt.launching.JRE_CONTAINER
+ </classpathContainer>
+ </classpathContainers>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestFile>${basedir}/META-INF/MANIFEST.MF</manifestFile>
+ </archive>
+ </configuration>
+ </plugin>
+
+ </plugins>
+ </build>
+</project>
diff --git a/sandbox/travelsample/contrib/2.x/currency-converter-dosgi-contribution/src/main/java/scatours/currency/CurrencyConverter.java b/sandbox/travelsample/contrib/2.x/currency-converter-dosgi-contribution/src/main/java/scatours/currency/CurrencyConverter.java new file mode 100644 index 0000000000..49e1f6a119 --- /dev/null +++ b/sandbox/travelsample/contrib/2.x/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/travelsample/contrib/2.x/currency-converter-dosgi-contribution/src/main/java/scatours/currency/impl/CurrencyConverterActivator.java b/sandbox/travelsample/contrib/2.x/currency-converter-dosgi-contribution/src/main/java/scatours/currency/impl/CurrencyConverterActivator.java new file mode 100644 index 0000000000..90b26aa2b3 --- /dev/null +++ b/sandbox/travelsample/contrib/2.x/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 context) throws Exception {
+ }
+
+}
diff --git a/sandbox/travelsample/contrib/2.x/currency-converter-dosgi-contribution/src/main/java/scatours/currency/impl/CurrencyConverterImpl.java b/sandbox/travelsample/contrib/2.x/currency-converter-dosgi-contribution/src/main/java/scatours/currency/impl/CurrencyConverterImpl.java new file mode 100644 index 0000000000..2a3ffc1a1e --- /dev/null +++ b/sandbox/travelsample/contrib/2.x/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<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) {
+ float converted = amount * getExchangeRate(fromCurrencyCode, toCurrencyCode);
+ System.out.println(fromCurrencyCode + amount + "=" + toCurrencyCode + converted);
+ return converted;
+ }
+}
diff --git a/sandbox/travelsample/contributions/blog-feed/pom.xml b/sandbox/travelsample/contributions/blog-feed/pom.xml index c93d2edc3f..c2f4f4c70b 100644 --- a/sandbox/travelsample/contributions/blog-feed/pom.xml +++ b/sandbox/travelsample/contributions/blog-feed/pom.xml @@ -31,7 +31,7 @@ <dependencies>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-embedded</artifactId>
+ <artifactId>tuscany-node-impl</artifactId>
<version>1.6-SNAPSHOT</version>
</dependency>
diff --git a/sandbox/travelsample/contributions/creditcard-payment-webapp/pom.xml b/sandbox/travelsample/contributions/creditcard-payment-webapp/pom.xml index afb42b6180..a401fc0bc7 100644 --- a/sandbox/travelsample/contributions/creditcard-payment-webapp/pom.xml +++ b/sandbox/travelsample/contributions/creditcard-payment-webapp/pom.xml @@ -24,7 +24,8 @@ <artifactId>tuscany-sca</artifactId>
<version>1.6-SNAPSHOT</version>
<!--relativePath>../../pom.xml</relativePath-->
- </parent><version>1.0-SNAPSHOT</version>
+ </parent>
+ <version>1.0-SNAPSHOT</version>
<artifactId>scatours-contribution-creditcard-payment-webapp</artifactId>
<packaging>war</packaging>
<name>Apache Tuscany SCA Tours CreditCard Payment WebApp Contribution</name>
diff --git a/sandbox/travelsample/contributions/currency-jms/pom.xml b/sandbox/travelsample/contributions/currency-jms/pom.xml index 17a2016d04..69c0212ed6 100644 --- a/sandbox/travelsample/contributions/currency-jms/pom.xml +++ b/sandbox/travelsample/contributions/currency-jms/pom.xml @@ -31,7 +31,7 @@ <dependencies>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-embedded</artifactId>
+ <artifactId>tuscany-node-impl</artifactId>
<version>1.6-SNAPSHOT</version>
</dependency>
diff --git a/sandbox/travelsample/contributions/currency-ws/pom.xml b/sandbox/travelsample/contributions/currency-ws/pom.xml index bd6f9f7736..0bbd681222 100644 --- a/sandbox/travelsample/contributions/currency-ws/pom.xml +++ b/sandbox/travelsample/contributions/currency-ws/pom.xml @@ -31,7 +31,7 @@ <dependencies>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-embedded</artifactId>
+ <artifactId>tuscany-node-impl</artifactId>
<version>1.6-SNAPSHOT</version>
</dependency>
diff --git a/sandbox/travelsample/contributions/currency/pom.xml b/sandbox/travelsample/contributions/currency/pom.xml index 0a5d00cef8..56103465f7 100644 --- a/sandbox/travelsample/contributions/currency/pom.xml +++ b/sandbox/travelsample/contributions/currency/pom.xml @@ -31,7 +31,7 @@ <dependencies>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-embedded</artifactId>
+ <artifactId>tuscany-node-impl</artifactId>
<version>1.6-SNAPSHOT</version>
</dependency>
diff --git a/sandbox/travelsample/contributions/emailgateway/pom.xml b/sandbox/travelsample/contributions/emailgateway/pom.xml index edb7143f7b..b864ae7717 100644 --- a/sandbox/travelsample/contributions/emailgateway/pom.xml +++ b/sandbox/travelsample/contributions/emailgateway/pom.xml @@ -32,7 +32,7 @@ <dependencies>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-embedded</artifactId>
+ <artifactId>tuscany-node-impl</artifactId>
<version>1.6-SNAPSHOT</version>
</dependency>
diff --git a/sandbox/travelsample/contributions/feed-logger/pom.xml b/sandbox/travelsample/contributions/feed-logger/pom.xml index 2c70e79528..9ac94fed8f 100644 --- a/sandbox/travelsample/contributions/feed-logger/pom.xml +++ b/sandbox/travelsample/contributions/feed-logger/pom.xml @@ -31,7 +31,7 @@ <dependencies>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-embedded</artifactId>
+ <artifactId>tuscany-node-impl</artifactId>
<version>1.6-SNAPSHOT</version>
</dependency>
diff --git a/sandbox/travelsample/contributions/fullapp-bespoketrip/pom.xml b/sandbox/travelsample/contributions/fullapp-bespoketrip/pom.xml index fa7ce37acc..5d49309881 100644 --- a/sandbox/travelsample/contributions/fullapp-bespoketrip/pom.xml +++ b/sandbox/travelsample/contributions/fullapp-bespoketrip/pom.xml @@ -31,7 +31,7 @@ <dependencies> <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-host-embedded</artifactId> + <artifactId>tuscany-node-impl</artifactId> <version>1.6-SNAPSHOT</version> </dependency> diff --git a/sandbox/travelsample/contributions/fullapp-currency/pom.xml b/sandbox/travelsample/contributions/fullapp-currency/pom.xml index bc019808f6..459b9772ff 100644 --- a/sandbox/travelsample/contributions/fullapp-currency/pom.xml +++ b/sandbox/travelsample/contributions/fullapp-currency/pom.xml @@ -31,7 +31,7 @@ <dependencies> <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-host-embedded</artifactId> + <artifactId>tuscany-node-impl</artifactId> <version>1.6-SNAPSHOT</version> </dependency> diff --git a/sandbox/travelsample/contributions/fullapp-frontend/pom.xml b/sandbox/travelsample/contributions/fullapp-frontend/pom.xml index 8d16499312..e8463b21db 100644 --- a/sandbox/travelsample/contributions/fullapp-frontend/pom.xml +++ b/sandbox/travelsample/contributions/fullapp-frontend/pom.xml @@ -31,7 +31,7 @@ <dependencies> <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-host-embedded</artifactId> + <artifactId>tuscany-node-impl</artifactId> <version>1.6-SNAPSHOT</version> </dependency> diff --git a/sandbox/travelsample/contributions/fullapp-packagedtrip/pom.xml b/sandbox/travelsample/contributions/fullapp-packagedtrip/pom.xml index 637ea9da57..538dd21259 100644 --- a/sandbox/travelsample/contributions/fullapp-packagedtrip/pom.xml +++ b/sandbox/travelsample/contributions/fullapp-packagedtrip/pom.xml @@ -31,7 +31,7 @@ <dependencies> <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-host-embedded</artifactId> + <artifactId>tuscany-node-impl</artifactId> <version>1.6-SNAPSHOT</version> </dependency> diff --git a/sandbox/travelsample/contributions/fullapp-shoppingcart/pom.xml b/sandbox/travelsample/contributions/fullapp-shoppingcart/pom.xml index e1038a1570..04a3951f2c 100644 --- a/sandbox/travelsample/contributions/fullapp-shoppingcart/pom.xml +++ b/sandbox/travelsample/contributions/fullapp-shoppingcart/pom.xml @@ -31,7 +31,7 @@ <dependencies> <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-host-embedded</artifactId> + <artifactId>tuscany-node-impl</artifactId> <version>1.6-SNAPSHOT</version> </dependency> diff --git a/sandbox/travelsample/contributions/fullapp-ui/pom.xml b/sandbox/travelsample/contributions/fullapp-ui/pom.xml index ec2bba21c3..b4e83281e5 100644 --- a/sandbox/travelsample/contributions/fullapp-ui/pom.xml +++ b/sandbox/travelsample/contributions/fullapp-ui/pom.xml @@ -31,7 +31,7 @@ <dependencies> <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-host-embedded</artifactId> + <artifactId>tuscany-node-impl</artifactId> <version>1.6-SNAPSHOT</version> </dependency> diff --git a/sandbox/travelsample/contributions/help-pages/pom.xml b/sandbox/travelsample/contributions/help-pages/pom.xml index dde35814ed..359013c278 100644 --- a/sandbox/travelsample/contributions/help-pages/pom.xml +++ b/sandbox/travelsample/contributions/help-pages/pom.xml @@ -31,7 +31,7 @@ <dependencies>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-embedded</artifactId>
+ <artifactId>tuscany-node-impl</artifactId>
<version>1.6-SNAPSHOT</version>
</dependency>
diff --git a/sandbox/travelsample/contributions/notification-corba/pom.xml b/sandbox/travelsample/contributions/notification-corba/pom.xml index 3999cfc9de..ff161f8340 100644 --- a/sandbox/travelsample/contributions/notification-corba/pom.xml +++ b/sandbox/travelsample/contributions/notification-corba/pom.xml @@ -31,7 +31,7 @@ <dependencies>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-embedded</artifactId>
+ <artifactId>tuscany-node-impl</artifactId>
<version>1.6-SNAPSHOT</version>
</dependency>
diff --git a/sandbox/travelsample/contributions/notification-ejb/pom.xml b/sandbox/travelsample/contributions/notification-ejb/pom.xml index 9e1fd4d2d3..7a1a1a6b6f 100644 --- a/sandbox/travelsample/contributions/notification-ejb/pom.xml +++ b/sandbox/travelsample/contributions/notification-ejb/pom.xml @@ -31,7 +31,7 @@ <dependencies>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-embedded</artifactId>
+ <artifactId>tuscany-node-impl</artifactId>
<version>1.6-SNAPSHOT</version>
</dependency>
diff --git a/sandbox/travelsample/contributions/notification-jms/pom.xml b/sandbox/travelsample/contributions/notification-jms/pom.xml index 13d7a01b4a..ac041690c5 100644 --- a/sandbox/travelsample/contributions/notification-jms/pom.xml +++ b/sandbox/travelsample/contributions/notification-jms/pom.xml @@ -31,7 +31,7 @@ <dependencies>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-embedded</artifactId>
+ <artifactId>tuscany-node-impl</artifactId>
<version>1.6-SNAPSHOT</version>
</dependency>
diff --git a/sandbox/travelsample/contributions/notification-rmi/pom.xml b/sandbox/travelsample/contributions/notification-rmi/pom.xml index 3edec653fd..0b8044ab5a 100644 --- a/sandbox/travelsample/contributions/notification-rmi/pom.xml +++ b/sandbox/travelsample/contributions/notification-rmi/pom.xml @@ -31,7 +31,7 @@ <dependencies>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-embedded</artifactId>
+ <artifactId>tuscany-node-impl</artifactId>
<version>1.6-SNAPSHOT</version>
</dependency>
diff --git a/sandbox/travelsample/contributions/notification-ws/pom.xml b/sandbox/travelsample/contributions/notification-ws/pom.xml index 56edf8e712..4fbffa56c8 100644 --- a/sandbox/travelsample/contributions/notification-ws/pom.xml +++ b/sandbox/travelsample/contributions/notification-ws/pom.xml @@ -31,7 +31,7 @@ <dependencies>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-embedded</artifactId>
+ <artifactId>tuscany-node-impl</artifactId>
<version>1.6-SNAPSHOT</version>
</dependency>
diff --git a/sandbox/travelsample/contributions/notification/pom.xml b/sandbox/travelsample/contributions/notification/pom.xml index 804dc43729..9550a12d3c 100644 --- a/sandbox/travelsample/contributions/notification/pom.xml +++ b/sandbox/travelsample/contributions/notification/pom.xml @@ -31,7 +31,7 @@ <dependencies>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-embedded</artifactId>
+ <artifactId>tuscany-node-impl</artifactId>
<version>1.6-SNAPSHOT</version>
</dependency>
diff --git a/sandbox/travelsample/contributions/payment-groovy/pom.xml b/sandbox/travelsample/contributions/payment-groovy/pom.xml index e9823a01e2..3e6985d1a0 100644 --- a/sandbox/travelsample/contributions/payment-groovy/pom.xml +++ b/sandbox/travelsample/contributions/payment-groovy/pom.xml @@ -31,7 +31,7 @@ <dependencies> <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-host-embedded</artifactId> + <artifactId>tuscany-node-impl</artifactId> <version>1.6-SNAPSHOT</version> </dependency> diff --git a/sandbox/travelsample/contributions/payment-java-policy/pom.xml b/sandbox/travelsample/contributions/payment-java-policy/pom.xml index cf27ad8a57..138c8d945d 100644 --- a/sandbox/travelsample/contributions/payment-java-policy/pom.xml +++ b/sandbox/travelsample/contributions/payment-java-policy/pom.xml @@ -32,7 +32,7 @@ <dependencies> <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-host-embedded</artifactId> + <artifactId>tuscany-node-impl</artifactId> <version>1.6-SNAPSHOT</version> </dependency> diff --git a/sandbox/travelsample/contributions/payment-java/pom.xml b/sandbox/travelsample/contributions/payment-java/pom.xml index c3dca55e7c..9589f2eaf8 100644 --- a/sandbox/travelsample/contributions/payment-java/pom.xml +++ b/sandbox/travelsample/contributions/payment-java/pom.xml @@ -32,7 +32,7 @@ <dependencies>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-embedded</artifactId>
+ <artifactId>tuscany-node-impl</artifactId>
<version>1.6-SNAPSHOT</version>
</dependency>
diff --git a/sandbox/travelsample/contributions/payment-spring-policy/pom.xml b/sandbox/travelsample/contributions/payment-spring-policy/pom.xml index 321ea39227..57248b4ac7 100644 --- a/sandbox/travelsample/contributions/payment-spring-policy/pom.xml +++ b/sandbox/travelsample/contributions/payment-spring-policy/pom.xml @@ -32,7 +32,7 @@ <dependencies> <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-host-embedded</artifactId> + <artifactId>tuscany-node-impl</artifactId> <version>1.6-SNAPSHOT</version> </dependency> diff --git a/sandbox/travelsample/contributions/payment-spring-scatag/pom.xml b/sandbox/travelsample/contributions/payment-spring-scatag/pom.xml index c1038b32f4..4549d1b277 100644 --- a/sandbox/travelsample/contributions/payment-spring-scatag/pom.xml +++ b/sandbox/travelsample/contributions/payment-spring-scatag/pom.xml @@ -32,7 +32,7 @@ <dependencies> <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-host-embedded</artifactId> + <artifactId>tuscany-node-impl</artifactId> <version>1.6-SNAPSHOT</version> </dependency> diff --git a/sandbox/travelsample/contributions/payment-spring/pom.xml b/sandbox/travelsample/contributions/payment-spring/pom.xml index 505a54debb..c28cb4f637 100644 --- a/sandbox/travelsample/contributions/payment-spring/pom.xml +++ b/sandbox/travelsample/contributions/payment-spring/pom.xml @@ -32,7 +32,7 @@ <dependencies> <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-host-embedded</artifactId> + <artifactId>tuscany-node-impl</artifactId> <version>1.6-SNAPSHOT</version> </dependency> diff --git a/sandbox/travelsample/contributions/pom.xml b/sandbox/travelsample/contributions/pom.xml index d59199858e..17a18dea85 100644 --- a/sandbox/travelsample/contributions/pom.xml +++ b/sandbox/travelsample/contributions/pom.xml @@ -44,6 +44,7 @@ <module>creditcard-payment-jaxb</module>
<module>creditcard-payment-jaxb-policy</module>
<module>creditcard-payment-sdo</module>
+ <module>creditcard-payment-webapp</module>
<module>currency</module>
<module>currency-corba</module>
<module>currency-jms</module>
diff --git a/sandbox/travelsample/distribution/pom.xml b/sandbox/travelsample/distribution/pom.xml index ea466300f0..61e2549f1a 100644 --- a/sandbox/travelsample/distribution/pom.xml +++ b/sandbox/travelsample/distribution/pom.xml @@ -297,11 +297,6 @@ </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>scatours-fullapp-launcher</artifactId> - <version>1.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-launcher-blog-feed</artifactId> <version>1.0-SNAPSHOT</version> </dependency> diff --git a/sandbox/travelsample/launchers/blog-feed/pom.xml b/sandbox/travelsample/launchers/blog-feed/pom.xml index a1c022edae..c0970e3e22 100644 --- a/sandbox/travelsample/launchers/blog-feed/pom.xml +++ b/sandbox/travelsample/launchers/blog-feed/pom.xml @@ -22,7 +22,7 @@ <parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-sca</artifactId>
- <version>1.5</version>
+ <version>1.6-SNAPSHOT</version>
<!--relativePath>../../pom.xml</relativePath-->
</parent><version>1.0-SNAPSHOT</version>
<artifactId>scatours-launcher-blog-feed</artifactId>
@@ -31,7 +31,7 @@ <dependencies>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-embedded</artifactId>
+ <artifactId>tuscany-node-impl</artifactId>
<version>1.6-SNAPSHOT</version>
</dependency>
diff --git a/sandbox/travelsample/launchers/feed-logger/pom.xml b/sandbox/travelsample/launchers/feed-logger/pom.xml index 339ad7b975..1935d18f00 100644 --- a/sandbox/travelsample/launchers/feed-logger/pom.xml +++ b/sandbox/travelsample/launchers/feed-logger/pom.xml @@ -22,16 +22,17 @@ <parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-sca</artifactId>
- <version>1.5</version>
+ <version>1.6-SNAPSHOT</version>
<!--relativePath>../../pom.xml</relativePath-->
- </parent><version>1.0-SNAPSHOT</version>
+ </parent>
+ <version>1.0-SNAPSHOT</version>
<artifactId>scatours-launcher-feed-logger</artifactId>
<name>Apache Tuscany SCA Tours Feed Logger Launcher</name>
<dependencies>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-embedded</artifactId>
+ <artifactId>tuscany-node-impl</artifactId>
<version>1.6-SNAPSHOT</version>
</dependency>
|