You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by sl...@apache.org on 2008/05/31 15:20:53 UTC
svn commit: r662024 - in /incubator/tuscany/sandbox/travelsample: ./
calendar/ currencyconverter/ gettingstarted/ gettingstarted/src/client/
gettingstarted/src/currencyconverter/ gettingstarted/src/main/
gettingstarted/src/test/ gettingstarted/src/trip/
Author: slaws
Date: Sat May 31 06:20:53 2008
New Revision: 662024
URL: http://svn.apache.org/viewvc?rev=662024&view=rev
Log:
add some ignores and simplify gettingstarted project structure
Added:
incubator/tuscany/sandbox/travelsample/gettingstarted/build.xml (with props)
incubator/tuscany/sandbox/travelsample/gettingstarted/src/client/
- copied from r657535, incubator/tuscany/sandbox/travelsample/gettingstarted/src/main/java/client/
incubator/tuscany/sandbox/travelsample/gettingstarted/src/client/TripWsClient.java (with props)
incubator/tuscany/sandbox/travelsample/gettingstarted/src/currencyconverter/
- copied from r657535, incubator/tuscany/sandbox/travelsample/gettingstarted/src/main/java/currencyconverter/
incubator/tuscany/sandbox/travelsample/gettingstarted/src/trip/
- copied from r657535, incubator/tuscany/sandbox/travelsample/gettingstarted/src/main/java/trip/
Removed:
incubator/tuscany/sandbox/travelsample/calculator.svg
incubator/tuscany/sandbox/travelsample/gettingstarted/src/main/
incubator/tuscany/sandbox/travelsample/gettingstarted/src/test/
Modified:
incubator/tuscany/sandbox/travelsample/calendar/ (props changed)
incubator/tuscany/sandbox/travelsample/currencyconverter/ (props changed)
incubator/tuscany/sandbox/travelsample/gettingstarted/ (props changed)
incubator/tuscany/sandbox/travelsample/gettingstarted/pom.xml
incubator/tuscany/sandbox/travelsample/gettingstarted/src/client/CurrencyConverterClient.java
incubator/tuscany/sandbox/travelsample/gettingstarted/src/currencyconverter/CurrencyConverter.java
Propchange: incubator/tuscany/sandbox/travelsample/calendar/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat May 31 06:20:53 2008
@@ -0,0 +1,4 @@
+.classpath
+.project
+.settings
+target
Propchange: incubator/tuscany/sandbox/travelsample/currencyconverter/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat May 31 06:20:53 2008
@@ -0,0 +1,4 @@
+.classpath
+.project
+.settings
+target
Propchange: incubator/tuscany/sandbox/travelsample/gettingstarted/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat May 31 06:20:53 2008
@@ -0,0 +1,5 @@
+.classpath
+.project
+.settings
+work
+target
Added: incubator/tuscany/sandbox/travelsample/gettingstarted/build.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/travelsample/gettingstarted/build.xml?rev=662024&view=auto
==============================================================================
--- incubator/tuscany/sandbox/travelsample/gettingstarted/build.xml (added)
+++ incubator/tuscany/sandbox/travelsample/gettingstarted/build.xml Sat May 31 06:20:53 2008
@@ -0,0 +1,61 @@
+<!--
+ * 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 name="gettingstarted" default="compile">
+ <property environment="env"/>
+
+ <target name="compile">
+ <mkdir dir="target/classes"/>
+ <javac srcdir="src" destdir="target/classes"
+ debug="on" source="1.5" target="1.5">
+ <classpath>
+ <pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>
+ </classpath>
+ </javac>
+ </target>
+
+ <target name="run">
+ <java classname="client.CurrencyConverterClient" fork="true">
+ <classpath>
+ <pathelement path="resources"/>
+ <pathelement path="target/classes"/>
+ <pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>
+ </classpath>
+ </java>
+ </target>
+
+ <target name="runtrip">
+ <java classname="client.TripClient" fork="true">
+ <classpath>
+ <pathelement path="resources"/>
+ <pathelement path="target/classes"/>
+ <pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>
+ </classpath>
+ </java>
+ </target>
+
+ <target name="runtripws">
+ <java classname="client.TripWsClient" fork="true">
+ <classpath>
+ <pathelement path="resources"/>
+ <pathelement path="target/classes"/>
+ <pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>
+ </classpath>
+ </java>
+ </target>
+</project>
Propchange: incubator/tuscany/sandbox/travelsample/gettingstarted/build.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/sandbox/travelsample/gettingstarted/build.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: incubator/tuscany/sandbox/travelsample/gettingstarted/build.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: incubator/tuscany/sandbox/travelsample/gettingstarted/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/travelsample/gettingstarted/pom.xml?rev=662024&r1=662023&r2=662024&view=diff
==============================================================================
--- incubator/tuscany/sandbox/travelsample/gettingstarted/pom.xml (original)
+++ incubator/tuscany/sandbox/travelsample/gettingstarted/pom.xml Sat May 31 06:20:53 2008
@@ -39,8 +39,22 @@
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-implementation-java-runtime</artifactId>
<version>2.0-incubating-SNAPSHOT</version>
- <scope>runtime</scope>
+ <scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-binding-ws-axis2</artifactId>
+ <version>2.0-incubating-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-host-tomcat</artifactId>
+ <version>2.0-incubating-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>junit</groupId>
@@ -53,5 +67,11 @@
<build>
<finalName>${artifactId}</finalName>
+ <sourceDirectory>${basedir}/src</sourceDirectory>
+ <resources>
+ <resource>
+ <directory>${basedir}/resources</directory>
+ </resource>
+ </resources>
</build>
</project>
Modified: incubator/tuscany/sandbox/travelsample/gettingstarted/src/client/CurrencyConverterClient.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/travelsample/gettingstarted/src/client/CurrencyConverterClient.java?rev=662024&r1=657535&r2=662024&view=diff
==============================================================================
--- incubator/tuscany/sandbox/travelsample/gettingstarted/src/client/CurrencyConverterClient.java (original)
+++ incubator/tuscany/sandbox/travelsample/gettingstarted/src/client/CurrencyConverterClient.java Sat May 31 06:20:53 2008
@@ -32,7 +32,7 @@
CurrencyConverter currencyConverter =
scaDomain.getService(CurrencyConverter.class,
"CurrencyConverterComponent");
- System.out.println(currencyConverter.convert("GBP", "USD", 27.65));
+ System.out.println(currencyConverter.convert("GBP", "USD", 10.00));
scaDomain.close();
}
}
Added: incubator/tuscany/sandbox/travelsample/gettingstarted/src/client/TripWsClient.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/travelsample/gettingstarted/src/client/TripWsClient.java?rev=662024&view=auto
==============================================================================
--- incubator/tuscany/sandbox/travelsample/gettingstarted/src/client/TripWsClient.java (added)
+++ incubator/tuscany/sandbox/travelsample/gettingstarted/src/client/TripWsClient.java Sat May 31 06:20:53 2008
@@ -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 client;
+
+import org.apache.tuscany.sca.host.embedded.SCADomain;
+
+import trip.Trip;
+
+/**
+ * This shows how to run the CurrencyConverter component.
+ */
+public class TripWsClient {
+
+ public final static void main(String[] args) throws Exception {
+ SCADomain scaDomain = SCADomain.newInstance("tripws.composite");
+ Trip trip = scaDomain.getService(Trip.class, "TripComponent");
+ System.out.println(trip.getTotalPrice());
+
+ System.out.println("press enter to continue");
+ System.in.read();
+
+ scaDomain.close();
+ }
+}
Propchange: incubator/tuscany/sandbox/travelsample/gettingstarted/src/client/TripWsClient.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/sandbox/travelsample/gettingstarted/src/client/TripWsClient.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/sandbox/travelsample/gettingstarted/src/currencyconverter/CurrencyConverter.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/travelsample/gettingstarted/src/currencyconverter/CurrencyConverter.java?rev=662024&r1=657535&r2=662024&view=diff
==============================================================================
--- incubator/tuscany/sandbox/travelsample/gettingstarted/src/currencyconverter/CurrencyConverter.java (original)
+++ incubator/tuscany/sandbox/travelsample/gettingstarted/src/currencyconverter/CurrencyConverter.java Sat May 31 06:20:53 2008
@@ -23,6 +23,7 @@
/**
* The CurrencyConverter service interface
*/
+@Remotable
public interface CurrencyConverter {
double convert(String fromCurrencyCode,
String toCurrencyCode,