From a71b61d9849faab265b9d0e6c1c1f92da6196528 Mon Sep 17 00:00:00 2001 From: nash Date: Wed, 16 Sep 2009 06:56:33 +0000 Subject: Add ant scripts and adjust packages for RMI and CORBA interop git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@815634 13f79535-47bb-0310-9956-ffa450edef68 --- .../currency-converter-corba-client/build.xml | 44 ++++++++++++++++++ .../scatours/CurrencyConverterCORBAClient.java | 4 +- .../src/main/resources/currency-converter.idl | 12 ++--- .../currency-converter-jms-client/build.xml | 45 +++++++++++++++++++ .../currency-converter-rmi-client/build.xml | 44 ++++++++++++++++++ .../currencyconverter/CurrencyConverter.java | 33 ++++++++++++++ .../java/scatours/CurrencyConverterRMIClient.java | 2 +- .../currencyconverter/CurrencyConverter.java | 33 -------------- .../currency-converter-ws-jaxws-client/build.xml | 52 ++++++++++++++++++++++ .../src/main/resources/wsdl/CurrencyConverter.wsdl | 8 ++-- 10 files changed, 232 insertions(+), 45 deletions(-) create mode 100644 sandbox/travelsample/clients/currency-converter-corba-client/build.xml create mode 100644 sandbox/travelsample/clients/currency-converter-jms-client/build.xml create mode 100644 sandbox/travelsample/clients/currency-converter-rmi-client/build.xml create mode 100644 sandbox/travelsample/clients/currency-converter-rmi-client/src/main/java/com/tuscanyscatours/currencyconverter/CurrencyConverter.java delete mode 100644 sandbox/travelsample/clients/currency-converter-rmi-client/src/main/java/scatours/currencyconverter/CurrencyConverter.java create mode 100644 sandbox/travelsample/clients/currency-converter-ws-jaxws-client/build.xml (limited to 'sandbox/travelsample/clients') diff --git a/sandbox/travelsample/clients/currency-converter-corba-client/build.xml b/sandbox/travelsample/clients/currency-converter-corba-client/build.xml new file mode 100644 index 0000000000..84fc3bf1d3 --- /dev/null +++ b/sandbox/travelsample/clients/currency-converter-corba-client/build.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sandbox/travelsample/clients/currency-converter-corba-client/src/main/java/scatours/CurrencyConverterCORBAClient.java b/sandbox/travelsample/clients/currency-converter-corba-client/src/main/java/scatours/CurrencyConverterCORBAClient.java index 295d6856fe..8581c09d5f 100644 --- a/sandbox/travelsample/clients/currency-converter-corba-client/src/main/java/scatours/CurrencyConverterCORBAClient.java +++ b/sandbox/travelsample/clients/currency-converter-corba-client/src/main/java/scatours/CurrencyConverterCORBAClient.java @@ -21,8 +21,8 @@ package scatours; import org.omg.CORBA.ORB; import org.omg.CORBA.Object; -import scatours.currencyconverter.CurrencyConverter; -import scatours.currencyconverter.CurrencyConverterHelper; +import com.tuscanyscatours.currencyconverter.CurrencyConverter; +import com.tuscanyscatours.currencyconverter.CurrencyConverterHelper; public class CurrencyConverterCORBAClient { diff --git a/sandbox/travelsample/clients/currency-converter-corba-client/src/main/resources/currency-converter.idl b/sandbox/travelsample/clients/currency-converter-corba-client/src/main/resources/currency-converter.idl index 18c2ade028..1ff24291f5 100644 --- a/sandbox/travelsample/clients/currency-converter-corba-client/src/main/resources/currency-converter.idl +++ b/sandbox/travelsample/clients/currency-converter-corba-client/src/main/resources/currency-converter.idl @@ -17,11 +17,13 @@ * under the License. */ -module scatours { - module currencyconverter { - interface CurrencyConverter { - double getExchangeRate(in string fromCurrencyCode, in string toCurrencyCode); - double convert(in string fromCurrencyCode, in string toCurrencyCode, in double amount); +module com { + module tuscanyscatours { + module currencyconverter { + interface CurrencyConverter { + double getExchangeRate(in string fromCurrencyCode, in string toCurrencyCode); + double convert(in string fromCurrencyCode, in string toCurrencyCode, in double amount); + }; }; }; }; diff --git a/sandbox/travelsample/clients/currency-converter-jms-client/build.xml b/sandbox/travelsample/clients/currency-converter-jms-client/build.xml new file mode 100644 index 0000000000..0014765a4c --- /dev/null +++ b/sandbox/travelsample/clients/currency-converter-jms-client/build.xml @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sandbox/travelsample/clients/currency-converter-rmi-client/build.xml b/sandbox/travelsample/clients/currency-converter-rmi-client/build.xml new file mode 100644 index 0000000000..0a7a607fda --- /dev/null +++ b/sandbox/travelsample/clients/currency-converter-rmi-client/build.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sandbox/travelsample/clients/currency-converter-rmi-client/src/main/java/com/tuscanyscatours/currencyconverter/CurrencyConverter.java b/sandbox/travelsample/clients/currency-converter-rmi-client/src/main/java/com/tuscanyscatours/currencyconverter/CurrencyConverter.java new file mode 100644 index 0000000000..68753adc3a --- /dev/null +++ b/sandbox/travelsample/clients/currency-converter-rmi-client/src/main/java/com/tuscanyscatours/currencyconverter/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 com.tuscanyscatours.currencyconverter; + +/** + * The CurrencyConverter service interface + */ +public interface CurrencyConverter { + + double getExchangeRate(String fromCurrencyCode, + String toCurrencyCode); + + double convert(String fromCurrencyCode, + String toCurrencyCode, + double amount); + +} diff --git a/sandbox/travelsample/clients/currency-converter-rmi-client/src/main/java/scatours/CurrencyConverterRMIClient.java b/sandbox/travelsample/clients/currency-converter-rmi-client/src/main/java/scatours/CurrencyConverterRMIClient.java index 18c255e261..c825ecc64f 100644 --- a/sandbox/travelsample/clients/currency-converter-rmi-client/src/main/java/scatours/CurrencyConverterRMIClient.java +++ b/sandbox/travelsample/clients/currency-converter-rmi-client/src/main/java/scatours/CurrencyConverterRMIClient.java @@ -21,7 +21,7 @@ package scatours; import java.rmi.registry.LocateRegistry; import java.rmi.registry.Registry; -import scatours.currencyconverter.CurrencyConverter; +import com.tuscanyscatours.currencyconverter.CurrencyConverter; public class CurrencyConverterRMIClient { diff --git a/sandbox/travelsample/clients/currency-converter-rmi-client/src/main/java/scatours/currencyconverter/CurrencyConverter.java b/sandbox/travelsample/clients/currency-converter-rmi-client/src/main/java/scatours/currencyconverter/CurrencyConverter.java deleted file mode 100644 index defca47ee5..0000000000 --- a/sandbox/travelsample/clients/currency-converter-rmi-client/src/main/java/scatours/currencyconverter/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.currencyconverter; - -/** - * The CurrencyConverter service interface - */ -public interface CurrencyConverter { - - double getExchangeRate(String fromCurrencyCode, - String toCurrencyCode); - - double convert(String fromCurrencyCode, - String toCurrencyCode, - double amount); - -} diff --git a/sandbox/travelsample/clients/currency-converter-ws-jaxws-client/build.xml b/sandbox/travelsample/clients/currency-converter-ws-jaxws-client/build.xml new file mode 100644 index 0000000000..8b866698ff --- /dev/null +++ b/sandbox/travelsample/clients/currency-converter-ws-jaxws-client/build.xml @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sandbox/travelsample/clients/currency-converter-ws-jaxws-client/src/main/resources/wsdl/CurrencyConverter.wsdl b/sandbox/travelsample/clients/currency-converter-ws-jaxws-client/src/main/resources/wsdl/CurrencyConverter.wsdl index 1498ed0008..055431bbf2 100644 --- a/sandbox/travelsample/clients/currency-converter-ws-jaxws-client/src/main/resources/wsdl/CurrencyConverter.wsdl +++ b/sandbox/travelsample/clients/currency-converter-ws-jaxws-client/src/main/resources/wsdl/CurrencyConverter.wsdl @@ -17,12 +17,12 @@ * specific language governing permissions and limitations * under the License. --> - - + @@ -109,7 +109,7 @@ - + -- cgit v1.2.3