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 /sandbox/travelsample/contributions | |
| 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
Diffstat (limited to 'sandbox/travelsample/contributions')
44 files changed, 28 insertions, 1364 deletions
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-dosgi-contribution/META-INF/MANIFEST.MF b/sandbox/travelsample/contributions/creditcard-payment-dosgi-contribution/META-INF/MANIFEST.MF deleted file mode 100644 index cdf9a9df05..0000000000 --- a/sandbox/travelsample/contributions/creditcard-payment-dosgi-contribution/META-INF/MANIFEST.MF +++ /dev/null @@ -1,28 +0,0 @@ -Manifest-Version: 1.0
-Private-Package: calculator;version="2.0.0"
-Tool: Bnd-0.0.255
-Bundle-Name: SCATours CreditCard Payment
-Created-By: 1.6.0_07 (Sun Microsystems Inc.)
-Bundle-Vendor: The Apache Software Foundation
-Eclipse-LazyStart: false
-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: javax.jws,
- javax.xml.bind,
- javax.xml.bind.annotation,
- javax.xml.namespace,
- 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",
- 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/travelsample/contributions/creditcard-payment-dosgi-contribution/pom.xml b/sandbox/travelsample/contributions/creditcard-payment-dosgi-contribution/pom.xml deleted file mode 100644 index 083a158c7e..0000000000 --- a/sandbox/travelsample/contributions/creditcard-payment-dosgi-contribution/pom.xml +++ /dev/null @@ -1,240 +0,0 @@ -<?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-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>
- <artifactId>tuscany-feature-ejava</artifactId>
- <version>2.0-SNAPSHOT</version>
- <type>pom</type>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-feature-webservice</artifactId>
- <version>2.0-SNAPSHOT</version>
- <type>pom</type>
- <scope>runtime</scope>
- </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.1.200-v20071203</version>
- </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>
- <scope>test</scope>
- </dependency>
-
- <!-- Equinox Declarative Services -->
- <dependency>
- <groupId>org.eclipse.equinox</groupId>
- <artifactId>ds</artifactId>
- <version>1.0.0-v20080427-0830</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.eclipse.equinox</groupId>
- <artifactId>util</artifactId>
- <version>1.0.0-v20080414</version>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
- <build>
- <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>
- <artifactItem>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <version>2.1.11</version>
- <type>jar</type>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-activation_1.1_spec</artifactId>
- <version>1.0.1</version>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-stax-api_1.0_spec</artifactId>
- <version>1.0.1</version>
- </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>
- <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>
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>1.0</version>
- <executions>
- <execution>
- <id>add-source</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>add-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>target/jaxws-source</source>
- </sources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jaxws-maven-plugin</artifactId>
- <version>1.12</version>
- <executions>
- <execution>
- <id>wsimport</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>wsimport</goal>
- </goals>
- <configuration>
- <packageName>scatours.payment.creditcard</packageName>
- <wsdlDirectory>${basedir}/src/main/resources
- </wsdlDirectory>
- <wsdlFiles>
- <wsdlFile>CreditCardPayment.wsdl</wsdlFile>
- </wsdlFiles>
- <sourceDestDir>${project.build.directory}/jaxws-source
- </sourceDestDir>
- <verbose>false</verbose>
- <xnocompile>true</xnocompile>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/sandbox/travelsample/contributions/creditcard-payment-dosgi-contribution/src/main/java/scatours/currency/CurrencyConverter.java b/sandbox/travelsample/contributions/creditcard-payment-dosgi-contribution/src/main/java/scatours/currency/CurrencyConverter.java deleted file mode 100644 index 49e1f6a119..0000000000 --- a/sandbox/travelsample/contributions/creditcard-payment-dosgi-contribution/src/main/java/scatours/currency/CurrencyConverter.java +++ /dev/null @@ -1,33 +0,0 @@ -/*
- * 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/contributions/creditcard-payment-dosgi-contribution/src/main/java/scatours/currency/impl/CurrencyConverterImpl.java b/sandbox/travelsample/contributions/creditcard-payment-dosgi-contribution/src/main/java/scatours/currency/impl/CurrencyConverterImpl.java deleted file mode 100644 index 2a3ffc1a1e..0000000000 --- a/sandbox/travelsample/contributions/creditcard-payment-dosgi-contribution/src/main/java/scatours/currency/impl/CurrencyConverterImpl.java +++ /dev/null @@ -1,55 +0,0 @@ -/*
- * 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/creditcard-payment-dosgi-contribution/src/main/java/scatours/payment/creditcard/impl/CreditCardPaymentActivator.java b/sandbox/travelsample/contributions/creditcard-payment-dosgi-contribution/src/main/java/scatours/payment/creditcard/impl/CreditCardPaymentActivator.java deleted file mode 100644 index 9c7364d4d5..0000000000 --- a/sandbox/travelsample/contributions/creditcard-payment-dosgi-contribution/src/main/java/scatours/payment/creditcard/impl/CreditCardPaymentActivator.java +++ /dev/null @@ -1,40 +0,0 @@ -/*
- * 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.payment.creditcard.impl;
-
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-
-import scatours.payment.creditcard.CreditCardPayment;
-
-/**
- *
- */
-public class CreditCardPaymentActivator implements BundleActivator {
-
- public void start(BundleContext context) throws Exception {
- System.out.println("[" + context.getBundle().getSymbolicName() + "]: Registering CreditCardPayment service...");
- context.registerService(CreditCardPayment.class.getName(), new CreditCardPaymentImpl(context), null);
- }
-
- public void stop(BundleContext context) throws Exception {
- }
-
-}
diff --git a/sandbox/travelsample/contributions/creditcard-payment-dosgi-contribution/src/main/java/scatours/payment/creditcard/impl/CreditCardPaymentImpl.java b/sandbox/travelsample/contributions/creditcard-payment-dosgi-contribution/src/main/java/scatours/payment/creditcard/impl/CreditCardPaymentImpl.java deleted file mode 100644 index 6605c23bcd..0000000000 --- a/sandbox/travelsample/contributions/creditcard-payment-dosgi-contribution/src/main/java/scatours/payment/creditcard/impl/CreditCardPaymentImpl.java +++ /dev/null @@ -1,97 +0,0 @@ -/*
- * 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.payment.creditcard.impl;
-
-import java.io.StringWriter;
-import java.util.UUID;
-
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Marshaller;
-import javax.xml.bind.PropertyException;
-import javax.xml.namespace.QName;
-
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceReference;
-
-import scatours.currency.CurrencyConverter;
-import scatours.payment.creditcard.CreditCardDetailsType;
-import scatours.payment.creditcard.CreditCardPayment;
-
-public class CreditCardPaymentImpl implements CreditCardPayment {
- private BundleContext context;
-
- public CreditCardPaymentImpl(BundleContext context) {
- super();
- this.context = context;
- }
-
- public String authorize(CreditCardDetailsType creditCard, float amount) {
- float charge = amount;
- if (creditCard != null) {
- try {
- print(creditCard);
- } catch (Exception e) {
- e.printStackTrace();
- }
-
- System.out.println("Credit card: name = " + creditCard.getCardOwner().getName()
- + " number = "
- + creditCard.getCreditCardNumber()
- + " for amount "
- + amount
- + " EUR");
- charge = convertCurrency(amount);
- } else {
- System.out.println("Credit card is null");
- return "FAILURE: Invalid Credit Card Number";
- }
-
- return "SUCCESS: Auth Code=" + UUID.randomUUID() + " (EUR"+amount+"->USD" + charge + ")";
- }
-
- private void print(CreditCardDetailsType creditCard) throws JAXBException, PropertyException {
- JAXBContext context = JAXBContext.newInstance(CreditCardDetailsType.class);
- QName name = new QName("http://ns1", "creditCard");
- JAXBElement<Object> element = new JAXBElement<Object>(name, Object.class, creditCard);
- StringWriter writer = new StringWriter();
- Marshaller marshaller = context.createMarshaller();
- marshaller.setProperty(Marshaller.JAXB_FRAGMENT, true);
- marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true);
- context.createMarshaller().marshal(element, writer);
- writer.flush();
- System.out.println("[CreditCard]: ");
- System.out.println(writer.toString());
- }
-
- 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");
- }
-}
diff --git a/sandbox/travelsample/contributions/creditcard-payment-dosgi-contribution/src/main/resources/CreditCardPayment.wsdl b/sandbox/travelsample/contributions/creditcard-payment-dosgi-contribution/src/main/resources/CreditCardPayment.wsdl deleted file mode 100644 index d50a63ac42..0000000000 --- a/sandbox/travelsample/contributions/creditcard-payment-dosgi-contribution/src/main/resources/CreditCardPayment.wsdl +++ /dev/null @@ -1,118 +0,0 @@ -<?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.
--->
-<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: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"
- targetNamespace="http://www.tuscanyscatours.com/CreditCardPayment/"
- xmlns:tns="http://www.tuscanyscatours.com/CreditCardPayment/">
-
- <xsd:element name="authorize">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="CreditCard" type="tns:CreditCardDetailsType"></xsd:element>
- <xsd:element name="Amount" type="xsd:float"></xsd:element>
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
-
- <xsd:element name="authorizeResponse">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="Status" type="xsd:string"></xsd:element>
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
-
- <xsd:complexType name="CreditCardDetailsType">
- <xsd:sequence>
- <xsd:element name="CreditCardType" type="tns:CreditCardTypeType" minOccurs="0" />
- <xsd:element name="CreditCardNumber" type="xsd:string" minOccurs="0" />
- <xsd:element name="ExpMonth" type="xsd:int" minOccurs="0" />
- <xsd:element name="ExpYear" type="xsd:int" minOccurs="0" />
- <xsd:element name="CardOwner" type="tns:PayerType" minOccurs="0" />
- <xsd:element name="CVV2" type="xsd:string" minOccurs="0" />
- </xsd:sequence>
- </xsd:complexType>
- <xsd:simpleType name="CreditCardTypeType">
- <xsd:restriction base="xsd:token">
- <xsd:enumeration value="Visa" />
- <xsd:enumeration value="MasterCard" />
- <xsd:enumeration value="Discover" />
- <xsd:enumeration value="Amex" />
- </xsd:restriction>
- </xsd:simpleType>
- <xsd:complexType name="PayerType">
- <xsd:sequence>
- <xsd:element name="Name" type="xsd:string" />
- <xsd:element name="Address" type="tns:AddressType" />
- </xsd:sequence>
- </xsd:complexType>
- <xsd:complexType name="AddressType">
- <xsd:sequence>
- <xsd:element name="Street" type="xsd:string" />
- <xsd:element name="City" type="xsd:string" />
- <xsd:element name="State" type="xsd:string" />
- <xsd:element name="ZipCode" type="xsd:string" />
- <xsd:element name="HomePhone" type="xsd:string" />
- </xsd:sequence>
- </xsd:complexType>
- </xsd:schema>
- </wsdl:types>
- <wsdl:message name="AuthorizeRequest">
- <wsdl:part name="parameters" element="tns:authorize"></wsdl:part>
- </wsdl:message>
- <wsdl:message name="AuthorizeResponse">
- <wsdl:part name="parameters" element="tns:authorizeResponse"></wsdl:part>
- </wsdl:message>
- <wsdl:portType name="CreditCardPayment">
- <wsdl:operation name="authorize">
- <wsdl:input message="tns:AuthorizeRequest"></wsdl:input>
- <wsdl:output message="tns:AuthorizeResponse"></wsdl:output>
- </wsdl:operation>
- </wsdl:portType>
- <wsdl:binding name="CreditCardPaymentBinding" type="tns:CreditCardPayment">
- <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
- <wsdl:operation name="authorize">
- <soap:operation soapAction="http://www.tuscanyscatours.com/CreditCardPayment/authorize" />
- <wsdl:input>
- <soap:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
- </wsdl:binding>
- <wsdl:service name="CreditCardPaymentService">
- <wsdl:port name="CreditCardPaymentPort" binding="tns:CreditCardPaymentBinding">
- <soap:address location="http://localhost:8082/CreditCardPayment" />
- </wsdl:port>
- </wsdl:service>
-
- <plnk:partnerLinkType name="CreditCardPaymentLinkType">
- <plnk:role name="forward" portType="tns:CreditCardPayment"/>
- </plnk:partnerLinkType>
-</wsdl:definitions>
\ No newline at end of file diff --git a/sandbox/travelsample/contributions/creditcard-payment-dosgi-contribution/src/main/resources/OSGI-INF/sca/bundle.componentType b/sandbox/travelsample/contributions/creditcard-payment-dosgi-contribution/src/main/resources/OSGI-INF/sca/bundle.componentType deleted file mode 100644 index 847213af37..0000000000 --- a/sandbox/travelsample/contributions/creditcard-payment-dosgi-contribution/src/main/resources/OSGI-INF/sca/bundle.componentType +++ /dev/null @@ -1,34 +0,0 @@ -<?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"
- xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1">
-
- <!-- The service elment defines an SCA view of the OSGi service -->
- <service name="CreditCardPayment">
- <!-- The interface will be mapped into the OSGi service class -->
- <interface.java interface="scatours.payment.creditcard.CreditCardPayment"/>
- </service>
-
- <!-- The reference elment defines an SCA proxy to a remote OSGi service -->
- <reference name="currencyConverter">
- <interface.java interface="scatours.currency.CurrencyConverter"/>
- </reference>
-
-</componentType>
diff --git a/sandbox/travelsample/contributions/creditcard-payment-dosgi-contribution/src/main/resources/OSGI-INF/sca/bundle.composite b/sandbox/travelsample/contributions/creditcard-payment-dosgi-contribution/src/main/resources/OSGI-INF/sca/bundle.composite deleted file mode 100644 index 7b12b36368..0000000000 --- a/sandbox/travelsample/contributions/creditcard-payment-dosgi-contribution/src/main/resources/OSGI-INF/sca/bundle.composite +++ /dev/null @@ -1,46 +0,0 @@ -<?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"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://creditcard"
- name="CreditCardPaymentComposite">
-
- <component name="CreditCardPaymentComponent">
- <tuscany:implementation.osgi bundleSymbolicName="scatours.creditcard.payment" bundleVersion="1.0.0" />
- <service name="CreditCardPayment">
- <binding.ws uri="http://localhost:8082/CreditCardPayment"/>
- </service>
- <reference name="currencyConverter">
- <tuscany:binding.rmi uri="rmi://localhost:8089/CurrencyConverter"/>
- </reference>
- </component>
-
-<!-- Other components can be declared here too -->
-<!--
- <component name="CurrencyConverterComponent">
- <implementation.java class="scatours.currency.impl.CurrencyConverterImpl" />
- <service name="CurrencyConverter">
- <tuscany:binding.rmi uri="rmi://localhost:8089/CurrencyConverter" />
- </service>
- </component>
--->
-
-</composite>
diff --git a/sandbox/travelsample/contributions/creditcard-payment-dosgi-contribution/src/test/java/scatours/payment/creditcard/test/CreditCardPaymentClient.java b/sandbox/travelsample/contributions/creditcard-payment-dosgi-contribution/src/test/java/scatours/payment/creditcard/test/CreditCardPaymentClient.java deleted file mode 100644 index d41571f679..0000000000 --- a/sandbox/travelsample/contributions/creditcard-payment-dosgi-contribution/src/test/java/scatours/payment/creditcard/test/CreditCardPaymentClient.java +++ /dev/null @@ -1,54 +0,0 @@ -/*
- * 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.payment.creditcard.test;
-
-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;
-
-/**
- *
- */
-public class CreditCardPaymentClient {
- static String invoke() {
- CreditCardPaymentService service = new CreditCardPaymentService();
- ObjectFactory objectFactory = new ObjectFactory();
- CreditCardDetailsType ccDetails = objectFactory.createCreditCardDetailsType();
- ccDetails.setCreditCardType(CreditCardTypeType.fromValue("Visa"));
- ccDetails.setCreditCardNumber("1234-5678-1234-5678");
- ccDetails.setCVV2("123");
- ccDetails.setExpMonth(12);
- ccDetails.setExpYear(2011);
- PayerType ccOwner = objectFactory.createPayerType();
- ccOwner.setName("Fred");
- ccDetails.setCardOwner(ccOwner);
- CreditCardPayment cc = service.getCreditCardPaymentPort();
- String status = cc.authorize(ccDetails, 100.00f);
- System.out.println("Status of the transaction: " + status);
- return status;
- }
-
- public static void main(String[] args) {
- invoke();
- }
-}
diff --git a/sandbox/travelsample/contributions/creditcard-payment-dosgi-contribution/src/test/java/scatours/payment/creditcard/test/CreditCardPaymentOSGiTestCase.java b/sandbox/travelsample/contributions/creditcard-payment-dosgi-contribution/src/test/java/scatours/payment/creditcard/test/CreditCardPaymentOSGiTestCase.java deleted file mode 100644 index 98c1fced9d..0000000000 --- a/sandbox/travelsample/contributions/creditcard-payment-dosgi-contribution/src/test/java/scatours/payment/creditcard/test/CreditCardPaymentOSGiTestCase.java +++ /dev/null @@ -1,127 +0,0 @@ -/*
- * 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.payment.creditcard.test;
-
-import static scatours.payment.creditcard.test.OSGiTestUtils.bundleStatus;
-
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.net.URL;
-
-import org.apache.tuscany.sca.node.equinox.launcher.EquinoxHost;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.Constants;
-
-/**
- *
- */
-public class CreditCardPaymentOSGiTestCase {
- private static EquinoxHost host;
- private static BundleContext context;
- private static Bundle ccBundle;
-
- /**
- * @throws java.lang.Exception
- */
- @BeforeClass
- public static void setUpBeforeClass() throws Exception {
- try {
- host = new EquinoxHost();
- context = host.start();
-
- for (Bundle b : context.getBundles()) {
- System.out.println(b);
- if (b.getSymbolicName().equals("org.eclipse.equinox.ds") || b.getSymbolicName()
- .startsWith("org.apache.tuscany.sca.")) {
- try {
- if (b.getHeaders().get(Constants.FRAGMENT_HOST) == null) {
- // Start the non-fragment bundle
- b.start();
- }
- } catch (Exception e) {
- e.printStackTrace();
- }
- System.out.println(bundleStatus(b, false));
- }
- if ("scatours.creditcard.payment".equals(b.getSymbolicName())) {
- ccBundle = b;
- }
- }
-
- if (ccBundle != null) {
- ccBundle.start();
- System.out.println(bundleStatus(ccBundle, false));
- }
-
- } catch (Exception e) {
- e.printStackTrace();
- throw e;
- }
- }
-
- @Test
- // @Ignore("Now we use the testClient")
- public void testWS() throws Exception {
- URL url = new URL("http://localhost:8082/CreditCardPayment?wsdl");
- InputStream is = url.openStream();
- Reader reader = new InputStreamReader(is);
- char[] content = new char[10240]; // 10k
- int len = 0;
- while (true) {
- int size = reader.read(content, len, content.length - len);
- if (size < 0) {
- break;
- }
- len += size;
- }
- Assert.assertTrue(len > 0);
- String str = new String(content, 0, len);
- System.out.println(str);
- Assert.assertTrue(str.indexOf("<wsdl:definitions") != -1);
- }
-
- /**
- * Test the Web service exposed by the Calculator
- */
- @Test
- public void testClient() {
- String status = CreditCardPaymentClient.invoke();
- Assert.assertTrue(status.startsWith("SUCCESS"));
- }
-
- /**
- * @throws java.lang.Exception
- */
- @AfterClass
- public static void tearDownAfterClass() throws Exception {
- if (host != null) {
- host.stop();
- host = null;
- context = null;
- }
- }
-
-}
diff --git a/sandbox/travelsample/contributions/creditcard-payment-dosgi-contribution/src/test/java/scatours/payment/creditcard/test/OSGiTestUtils.java b/sandbox/travelsample/contributions/creditcard-payment-dosgi-contribution/src/test/java/scatours/payment/creditcard/test/OSGiTestUtils.java deleted file mode 100644 index de8a77a818..0000000000 --- a/sandbox/travelsample/contributions/creditcard-payment-dosgi-contribution/src/test/java/scatours/payment/creditcard/test/OSGiTestUtils.java +++ /dev/null @@ -1,105 +0,0 @@ -/*
- * 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.payment.creditcard.test;
-
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Method;
-import java.lang.reflect.Proxy;
-
-import org.osgi.framework.Bundle;
-
-/**
- *
- * Utility class to create OSGi bundles
- *
- * @version $Rev: 758877 $ $Date: 2009-03-26 14:51:19 -0700 (Thu, 26 Mar 2009) $
- */
-public class OSGiTestUtils {
- private static class InvocationHandlerImpl implements InvocationHandler {
- private Object instance;
-
- public InvocationHandlerImpl(Object instance) {
- super();
- this.instance = instance;
- }
-
- public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
- Method m = instance.getClass().getMethod(method.getName(), method.getParameterTypes());
- return m.invoke(instance, args);
- }
-
- }
-
- /**
- * Returns a string representation of the given bundle.
- *
- * @param b
- * @param verbose
- * @return
- */
- public static String bundleStatus(Bundle bundle, boolean verbose) {
- StringBuffer sb = new StringBuffer();
- sb.append(bundle.getBundleId()).append(" ").append(bundle.getSymbolicName());
- int s = bundle.getState();
- if ((s & Bundle.UNINSTALLED) != 0) {
- sb.append(" UNINSTALLED");
- }
- if ((s & Bundle.INSTALLED) != 0) {
- sb.append(" INSTALLED");
- }
- if ((s & Bundle.RESOLVED) != 0) {
- sb.append(" RESOLVED");
- }
- if ((s & Bundle.STARTING) != 0) {
- sb.append(" STARTING");
- }
- if ((s & Bundle.STOPPING) != 0) {
- sb.append(" STOPPING");
- }
- if ((s & Bundle.ACTIVE) != 0) {
- sb.append(" ACTIVE");
- }
-
- if (verbose) {
- sb.append(" ").append(bundle.getLocation());
- sb.append(" ").append(bundle.getHeaders());
- }
- return sb.toString();
- }
-
- /**
- * A utility to cast the object to the given interface. If the class for the object
- * is loaded by a different classloader, a proxy will be created.
- *
- * @param <T>
- * @param obj
- * @param cls
- * @return
- */
- public static <T> T cast(Object obj, Class<T> cls) {
- if (cls.isInstance(obj)) {
- return cls.cast(obj);
- } else {
- return cls.cast(Proxy.newProxyInstance(cls.getClassLoader(),
- new Class<?>[] {cls},
- new InvocationHandlerImpl(obj)));
- }
- }
-}
diff --git a/sandbox/travelsample/contributions/creditcard-payment-web-contribution/pom.xml b/sandbox/travelsample/contributions/creditcard-payment-web-contribution/pom.xml deleted file mode 100644 index a7fa84ae74..0000000000 --- a/sandbox/travelsample/contributions/creditcard-payment-web-contribution/pom.xml +++ /dev/null @@ -1,100 +0,0 @@ -<?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-creditcard-payment-web</artifactId>
- <packaging>war</packaging>
- <name>SCATours Credit Card Payment Web</name>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca-api</artifactId>
- <version>2.0-SNAPSHOT</version>
- <scope>provided</scope>
- </dependency>
-
- </dependencies>
- <pluginRepositories>
- <pluginRepository>
- <id>java.net2</id>
- <name>java.net Maven 2.x Repository</name>
- <url>http://download.java.net/maven/2</url>
- </pluginRepository>
- </pluginRepositories>
- <build>
- <finalName>${artifactId}</finalName>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>1.0</version>
- <executions>
- <execution>
- <id>add-source</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>add-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>target/jaxws-source</source>
- </sources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jaxws-maven-plugin</artifactId>
- <version>1.12</version>
- <executions>
- <execution>
- <id>wsimport</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>wsimport</goal>
- </goals>
- <configuration>
- <packageName>scatours.payment.creditcard</packageName>
- <wsdlDirectory>${basedir}/src/main/resources
- </wsdlDirectory>
- <wsdlFiles>
- <wsdlFile>CreditCardPayment.wsdl</wsdlFile>
- </wsdlFiles>
- <sourceDestDir>${project.build.directory}/jaxws-source
- </sourceDestDir>
- <verbose>false</verbose>
- <xnocompile>true</xnocompile>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-</project>
diff --git a/sandbox/travelsample/contributions/creditcard-payment-web-contribution/src/main/resources/CreditCardPayment.wsdl b/sandbox/travelsample/contributions/creditcard-payment-web-contribution/src/main/resources/CreditCardPayment.wsdl deleted file mode 100644 index c8660c4ffe..0000000000 --- a/sandbox/travelsample/contributions/creditcard-payment-web-contribution/src/main/resources/CreditCardPayment.wsdl +++ /dev/null @@ -1,116 +0,0 @@ -<?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.
--->
-<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: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"
- 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>
- <xsd:element name="CreditCard" type="tns:CreditCardDetailsType"></xsd:element>
- <xsd:element name="Amount" type="xsd:float"></xsd:element>
- </xsd:sequence>
- </xsd:complexType>
-
- <xsd:element name="authorizeResponse" type="tns:AuthorizeResponseType"/>
- <xsd:complexType name="AuthorizeResponseType">
- <xsd:sequence>
- <xsd:element name="Status" type="xsd:string"></xsd:element>
- </xsd:sequence>
- </xsd:complexType>
-
- <xsd:complexType name="CreditCardDetailsType">
- <xsd:sequence>
- <xsd:element name="CreditCardType" type="tns:CreditCardTypeType" minOccurs="0" />
- <xsd:element name="CreditCardNumber" type="xsd:string" minOccurs="0" />
- <xsd:element name="ExpMonth" type="xsd:int" minOccurs="0" />
- <xsd:element name="ExpYear" type="xsd:int" minOccurs="0" />
- <xsd:element name="CardOwner" type="tns:PayerType" minOccurs="0" />
- <xsd:element name="CVV2" type="xsd:string" minOccurs="0" />
- </xsd:sequence>
- </xsd:complexType>
- <xsd:simpleType name="CreditCardTypeType">
- <xsd:restriction base="xsd:token">
- <xsd:enumeration value="Visa" />
- <xsd:enumeration value="MasterCard" />
- <xsd:enumeration value="Discover" />
- <xsd:enumeration value="Amex" />
- </xsd:restriction>
- </xsd:simpleType>
- <xsd:complexType name="PayerType">
- <xsd:sequence>
- <xsd:element name="Name" type="xsd:string" />
- <xsd:element name="Address" type="tns:AddressType" />
- </xsd:sequence>
- </xsd:complexType>
- <xsd:complexType name="AddressType">
- <xsd:sequence>
- <xsd:element name="Street" type="xsd:string" />
- <xsd:element name="City" type="xsd:string" />
- <xsd:element name="State" type="xsd:string" />
- <xsd:element name="ZipCode" type="xsd:string" />
- <xsd:element name="HomePhone" type="xsd:string" />
- </xsd:sequence>
- </xsd:complexType>
- </xsd:schema>
- </wsdl:types>
- <wsdl:message name="AuthorizeRequest">
- <wsdl:part name="parameters" element="tns:authorize"></wsdl:part>
- </wsdl:message>
- <wsdl:message name="AuthorizeResponse">
- <wsdl:part name="parameters" element="tns:authorizeResponse"></wsdl:part>
- </wsdl:message>
- <wsdl:portType name="CreditCardPayment">
- <wsdl:operation name="authorize">
- <wsdl:input message="tns:AuthorizeRequest"></wsdl:input>
- <wsdl:output message="tns:AuthorizeResponse"></wsdl:output>
- </wsdl:operation>
- </wsdl:portType>
- <wsdl:binding name="CreditCardPaymentBinding" type="tns:CreditCardPayment">
- <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
- <wsdl:operation name="authorize">
- <soap:operation soapAction="http://www.tuscanyscatours.com/CreditCardPayment/authorize" />
- <wsdl:input>
- <soap:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
- </wsdl:binding>
- <wsdl:service name="CreditCardPaymentService">
- <wsdl:port name="CreditCardPaymentPort" binding="tns:CreditCardPaymentBinding">
- <soap:address location="http://localhost:8082/CreditCardPayment" />
- </wsdl:port>
- </wsdl:service>
-
- <plnk:partnerLinkType name="CreditCardPaymentLinkType">
- <plnk:role name="forward" portType="tns:CreditCardPayment"/>
- </plnk:partnerLinkType>
-</wsdl:definitions>
\ No newline at end of file diff --git a/sandbox/travelsample/contributions/creditcard-payment-web-contribution/src/main/webapp/WEB-INF/web.composite b/sandbox/travelsample/contributions/creditcard-payment-web-contribution/src/main/webapp/WEB-INF/web.composite deleted file mode 100644 index 188c9937f7..0000000000 --- a/sandbox/travelsample/contributions/creditcard-payment-web-contribution/src/main/webapp/WEB-INF/web.composite +++ /dev/null @@ -1,33 +0,0 @@ -<?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://creditcard"
- name="CreditCardPaymentWeb">
-
- <component name="CreditCardPaymentWeb">
- <implementation.web web-uri="" />
- <reference name="service">
- <interface.java interface="scatours.payment.creditcard.CreditCardPayment"/>
- <binding.ws uri="http://localhost:8082/CreditCardPayment" />
- </reference>
- </component>
-
-</composite>
diff --git a/sandbox/travelsample/contributions/creditcard-payment-web-contribution/src/main/webapp/WEB-INF/web.xml b/sandbox/travelsample/contributions/creditcard-payment-web-contribution/src/main/webapp/WEB-INF/web.xml deleted file mode 100644 index 33332936b3..0000000000 --- a/sandbox/travelsample/contributions/creditcard-payment-web-contribution/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,41 +0,0 @@ -<?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.
--->
-<web-app version="2.4"
- xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" >
-
- <display-name>Apache Tuscany CreditCard Payment</display-name>
-
- <filter>
- <filter-name>tuscany</filter-name>
- <filter-class>org.apache.tuscany.sca.host.webapp.TuscanyServletFilter</filter-class>
- </filter>
-
- <filter-mapping>
- <filter-name>tuscany</filter-name>
- <url-pattern>/*</url-pattern>
- </filter-mapping>
-
- <welcome-file-list id="WelcomeFileList">
- <welcome-file>creditcard.jsp</welcome-file>
- </welcome-file-list>
-
-</web-app>
diff --git a/sandbox/travelsample/contributions/creditcard-payment-web-contribution/src/main/webapp/creditcard.jsp b/sandbox/travelsample/contributions/creditcard-payment-web-contribution/src/main/webapp/creditcard.jsp deleted file mode 100644 index d40f91eabf..0000000000 --- a/sandbox/travelsample/contributions/creditcard-payment-web-contribution/src/main/webapp/creditcard.jsp +++ /dev/null @@ -1,71 +0,0 @@ -<!--
- * 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.
--->
-
-<%@ page contentType="text/html;charset=UTF-8" language="java"%>
-<%@ taglib uri="http://www.osoa.org/sca/sca_jsp.tld" prefix="sca"%>
-
-<sca:reference name="service"
- type="scatours.payment.creditcard.CreditCardPayment" />
-
-
-<%@page import="scatours.payment.creditcard.CreditCardPaymentService"%>
-<%@page import="scatours.payment.creditcard.ObjectFactory"%>
-<%@page import="scatours.payment.creditcard.CreditCardDetailsType"%>
-<%@page import="scatours.payment.creditcard.CreditCardTypeType"%>
-<%@page import="scatours.payment.creditcard.PayerType"%><html>
-<body>
-
-<h2>SCATours Credit Card Payment Web Application</h2>
-
-<p>
-<form action="creditcard.jsp" method="get">Card Type: <select
- name="type">
- <option value="Visa" selected="selected">Visa</option>
- <option value="MasterCard">MasterCard</option>
- <option value="Amex">Amex</option>
- <option value="Discover">Discover</option>
-</select> <br />
-Card Number: <input type="text" name="cardNumber" /><br />
-Card Holder: <input type="text" name="cardHolder" /><br />
-Amount (EUR): <input type="text" name="amount" /><br />
-<p>
-<input type="submit" name="charge" value="Submit" /></form>
-
-<%
- String c = request.getParameter("charge");
- if (c != null) {
- ObjectFactory objectFactory = new ObjectFactory();
- CreditCardDetailsType ccDetails = objectFactory.createCreditCardDetailsType();
- ccDetails.setCreditCardType(CreditCardTypeType.fromValue(request.getParameter("type")));
- ccDetails.setCreditCardNumber(request.getParameter("cardNumber"));
- ccDetails.setCVV2("123");
- ccDetails.setExpMonth(12);
- ccDetails.setExpYear(2011);
- PayerType ccOwner = objectFactory.createPayerType();
- ccOwner.setName(request.getParameter("cardHolder"));
- ccDetails.setCardOwner(ccOwner);
- float amount = Float.parseFloat(request.getParameter("amount"));
-%>
-<%=service.authorize(ccDetails, amount)%>
-<%
- }
-%>
-
-</body>
-</html>
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>
|