archive/apache-tuscany
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge revision r945180 from 1.0 release branch

Browse source 
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@946421 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
nash 2010-05-19 21:45:48 +00:00
commit ad8fc97438
30 changed files with 38 additions and 111 deletions
Download patch file Download diff file Expand all files Collapse all files

33
sca-java-1.x/trunk/tutorials/travelsample/antdefs.xml
View file

@ -65,7 +65,7 @@
"package" Creates a jar file containing the compiled Java class
files (excluding unit test code) and any files in or under the
resource directory, unless the jar file is already up to date.
If the build.xml file defines a path with id "package-path", this
If the build.xml file defines a property named "package-path", this
path is used for the Class-Path manifest entry.
"clean" Deletes all the files produced by the build.
@ -613,43 +613,28 @@
</war>
</target>
<!-- build a jar file if there are no files in the webapp directory -->
<target name="#package-jar" unless="#webapp">
<antcall target="#create-jar"/>
</target>
<!-- check whether a dependency path for the package target was specified -->
<target name="#check-package-path">
<condition property="#package-path">
<isreference refid="package-path"/>
</condition>
</target>
<!-- create a jar file with a Class-Path attribute -->
<target name="#create-jar-path" if="#package-path">
<property name="#parentdir" location=".."/>
<pathconvert property="#package-classpath" refid="package-path" pathsep=" " dirsep="/">
<map from="${#parentdir}" to=".."/>
</pathconvert>
<target name="#package-jar-path" unless="#webapp" if="package-path">
<jar destfile="target/${ant.project.name}.jar" basedir="target/classes"
excludes="**/*.cbp">
<manifest>
<attribute name="Class-Path" value="${#package-classpath}"/>
<attribute name="Class-Path" value="${package-path}"/>
</manifest>
</jar>
</target>
<target name="#not-package-path" unless="package-path">
<property name="#no-package-path" value=""/>
</target>
<!-- create a jar file without a Class-Path attribute -->
<target name="#create-jar-nopath" unless="#package-path">
<target name="#package-jar-nopath" unless="#webapp" if="#no-package-path">
<jar destfile="target/${ant.project.name}.jar" basedir="target/classes"
excludes="**/*.cbp"/>
</target>
<!-- create a jar file with or without a Class-Path attribute -->
<target name="#create-jar" depends="#check-package-path, #create-jar-path, #create-jar-nopath"/>
<!-- build a packaged jar file or war file -->
<target name="#build-package" depends="#check-webapp, #package-war, #package-jar"/>
<target name="#build-package" depends="#check-webapp, #package-war, #package-jar-path, #not-package-path, #package-jar-nopath"/>
<!-- If running from a downloaded distribution, the OpenEJB jars are in lib/openejb -->
<target name="#lib-openejb">

4
sca-java-1.x/trunk/tutorials/travelsample/launchers/blog-feed/build.xml
View file

@ -22,9 +22,7 @@
<path id="compile-path">
<pathelement path="../../util/launcher-common/target/scatours-util-launcher-common.jar"/>
</path>
<path id="package-path">
<pathelement path="../util/scatours-util-launcher-common.jar"/>
</path>
<property name="package-path" value="../util/scatours-util-launcher-common.jar"/>
<target name="run">
<java classname="scatours.BlogFeedLauncher" fork="true" failonerror="true">

4
sca-java-1.x/trunk/tutorials/travelsample/launchers/buildingblocks/build.xml
View file

@ -22,9 +22,7 @@
<path id="compile-path">
<pathelement path="../../util/launcher-common/target/scatours-util-launcher-common.jar"/>
</path>
<path id="package-path">
<pathelement path="../util/scatours-util-launcher-common.jar"/>
</path>
<property name="package-path" value="../util/scatours-util-launcher-common.jar"/>
<target name="run">
<java classname="scatours.BuildingBlocksLauncher" fork="true" failonerror="true">

4
sca-java-1.x/trunk/tutorials/travelsample/launchers/currency-converter-corba/build.xml
View file

@ -22,9 +22,7 @@
<path id="compile-path">
<pathelement path="../../util/launcher-common/target/scatours-util-launcher-common.jar"/>
</path>
<path id="package-path">
<pathelement path="../util/scatours-util-launcher-common.jar"/>
</path>
<property name="package-path" value="../util/scatours-util-launcher-common.jar"/>
<!-- After starting the SCA CORBA service by invoking the "run" target below,
the CORBA Java implementation of the currency converter client should be

4
sca-java-1.x/trunk/tutorials/travelsample/launchers/currency-converter-jms/build.xml
View file

@ -22,9 +22,7 @@
<path id="compile-path">
<pathelement path="../../util/launcher-common/target/scatours-util-launcher-common.jar"/>
</path>
<path id="package-path">
<pathelement path="../util/scatours-util-launcher-common.jar"/>
</path>
<property name="package-path" value="../util/scatours-util-launcher-common.jar"/>
<!-- After starting the SCA JMS service by invoking the "run" target below,
the ActiveMQ JMS implementation of the currency converter client should be

4
sca-java-1.x/trunk/tutorials/travelsample/launchers/currency-converter-rmi/build.xml
View file

@ -22,9 +22,7 @@
<path id="compile-path">
<pathelement path="../../util/launcher-common/target/scatours-util-launcher-common.jar"/>
</path>
<path id="package-path">
<pathelement path="../util/scatours-util-launcher-common.jar"/>
</path>
<property name="package-path" value="../util/scatours-util-launcher-common.jar"/>
<!-- After starting the SCA RMI service by invoking the "run" target below,
the RMI Java implementation of the currency converter client should be

4
sca-java-1.x/trunk/tutorials/travelsample/launchers/currency-converter-ws/build.xml
View file

@ -22,9 +22,7 @@
<path id="compile-path">
<pathelement path="../../util/launcher-common/target/scatours-util-launcher-common.jar"/>
</path>
<path id="package-path">
<pathelement path="../util/scatours-util-launcher-common.jar"/>
</path>
<property name="package-path" value="../util/scatours-util-launcher-common.jar"/>
<!-- After starting the SCA Web service by invoking the "run" target below,
the JAX-WS implementation of the currency converter client should be

4
sca-java-1.x/trunk/tutorials/travelsample/launchers/currency-converter/build.xml
View file

@ -22,9 +22,7 @@
<path id="compile-path">
<pathelement path="../../util/launcher-common/target/scatours-util-launcher-common.jar"/>
</path>
<path id="package-path">
<pathelement path="../util/scatours-util-launcher-common.jar"/>
</path>
<property name="package-path" value="../util/scatours-util-launcher-common.jar"/>
<target name="run">
<java classname="scatours.CurrencyConverterLauncher" fork="true" failonerror="true">

4
sca-java-1.x/trunk/tutorials/travelsample/launchers/databinding/build.xml
View file

@ -22,9 +22,7 @@
<path id="compile-path">
<pathelement path="../../util/launcher-common/target/scatours-util-launcher-common.jar"/>
</path>
<path id="package-path">
<pathelement path="../util/scatours-util-launcher-common.jar"/>
</path>
<property name="package-path" value="../util/scatours-util-launcher-common.jar"/>
<target name="run">
<java classname="scatours.DatabindingLauncher" fork="true" failonerror="true">

4
sca-java-1.x/trunk/tutorials/travelsample/launchers/feed-logger/build.xml
View file

@ -22,9 +22,7 @@
<path id="compile-path">
<pathelement path="../../util/launcher-common/target/scatours-util-launcher-common.jar"/>
</path>
<path id="package-path">
<pathelement path="../util/scatours-util-launcher-common.jar"/>
</path>
<property name="package-path" value="../util/scatours-util-launcher-common.jar"/>
<target name="run">
<java classname="scatours.FeedLoggerLauncher" fork="true" failonerror="true">

4
sca-java-1.x/trunk/tutorials/travelsample/launchers/fullapp/build.xml
View file

@ -22,9 +22,7 @@
<path id="compile-path">
<pathelement path="../../util/launcher-common/target/scatours-util-launcher-common.jar"/>
</path>
<path id="package-path">
<pathelement path="../util/scatours-util-launcher-common.jar"/>
</path>
<property name="package-path" value="../util/scatours-util-launcher-common.jar"/>
<target name="run">
<java classname="scatours.FullAppLauncher" fork="true" failonerror="true">

4
sca-java-1.x/trunk/tutorials/travelsample/launchers/help-pages/build.xml
View file

@ -22,9 +22,7 @@
<path id="compile-path">
<pathelement path="../../util/launcher-common/target/scatours-util-launcher-common.jar"/>
</path>
<path id="package-path">
<pathelement path="../util/scatours-util-launcher-common.jar"/>
</path>
<property name="package-path" value="../util/scatours-util-launcher-common.jar"/>
<target name="run">
<java classname="scatours.HelpPagesLauncher" fork="true" failonerror="true">

4
sca-java-1.x/trunk/tutorials/travelsample/launchers/interaction/build.xml
View file

@ -22,9 +22,7 @@
<path id="compile-path">
<pathelement path="../../util/launcher-common/target/scatours-util-launcher-common.jar"/>
</path>
<path id="package-path">
<pathelement path="../util/scatours-util-launcher-common.jar"/>
</path>
<property name="package-path" value="../util/scatours-util-launcher-common.jar"/>
<target name="run">
<java classname="scatours.InteractionLauncher" fork="true" failonerror="true">

4
sca-java-1.x/trunk/tutorials/travelsample/launchers/introducing/build.xml
View file

@ -22,9 +22,7 @@
<path id="compile-path">
<pathelement path="../../util/launcher-common/target/scatours-util-launcher-common.jar"/>
</path>
<path id="package-path">
<pathelement path="../util/scatours-util-launcher-common.jar"/>
</path>
<property name="package-path" value="../util/scatours-util-launcher-common.jar"/>
<target name="run">
<java classname="scatours.IntroducingLauncher" fork="true" failonerror="true">

4
sca-java-1.x/trunk/tutorials/travelsample/launchers/notification-corba/build.xml
View file

@ -22,9 +22,7 @@
<path id="compile-path">
<pathelement path="../../util/launcher-common/target/scatours-util-launcher-common.jar"/>
</path>
<path id="package-path">
<pathelement path="../util/scatours-util-launcher-common.jar"/>
</path>
<property name="package-path" value="../util/scatours-util-launcher-common.jar"/>
<!-- Before invoking the "run" target, the CORBA SMS Gateway service
needs to be started and running in a different process. -->

4
sca-java-1.x/trunk/tutorials/travelsample/launchers/notification-ejb/build.xml
View file

@ -22,9 +22,7 @@
<path id="compile-path">
<pathelement path="../../util/launcher-common/target/scatours-util-launcher-common.jar"/>
</path>
<path id="package-path">
<pathelement path="../util/scatours-util-launcher-common.jar"/>
</path>
<property name="package-path" value="../util/scatours-util-launcher-common.jar"/>
<!-- Before invoking the "run" target, the EJB server for the SMS Gateway EJB
needs to be started and running in a different process. -->

4
sca-java-1.x/trunk/tutorials/travelsample/launchers/notification-jms/build.xml
View file

@ -22,9 +22,7 @@
<path id="compile-path">
<pathelement path="../../util/launcher-common/target/scatours-util-launcher-common.jar"/>
</path>
<path id="package-path">
<pathelement path="../util/scatours-util-launcher-common.jar"/>
</path>
<property name="package-path" value="../util/scatours-util-launcher-common.jar"/>
<!-- Before invoking the "run" target, the JMS implementation of the
SMS gateway needs to be started and running in a different process. -->

4
sca-java-1.x/trunk/tutorials/travelsample/launchers/notification-rmi/build.xml
View file

@ -22,9 +22,7 @@
<path id="compile-path">
<pathelement path="../../util/launcher-common/target/scatours-util-launcher-common.jar"/>
</path>
<path id="package-path">
<pathelement path="../util/scatours-util-launcher-common.jar"/>
</path>
<property name="package-path" value="../util/scatours-util-launcher-common.jar"/>
<!-- Before invoking the "run" target, the RMI server for the SMS Gateway
remote object needs to be started and running in a different process. -->

4
sca-java-1.x/trunk/tutorials/travelsample/launchers/notification-ws/build.xml
View file

@ -22,9 +22,7 @@
<path id="compile-path">
<pathelement path="../../util/launcher-common/target/scatours-util-launcher-common.jar"/>
</path>
<path id="package-path">
<pathelement path="../util/scatours-util-launcher-common.jar"/>
</path>
<property name="package-path" value="../util/scatours-util-launcher-common.jar"/>
<!-- Before invoking the "run" target, the JAX-WS server for the SMS Gateway
remote object needs to be started and running in a different process. -->

4
sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-bpel/build.xml
View file

@ -22,9 +22,7 @@
<path id="compile-path">
<pathelement path="../../util/launcher-common/target/scatours-util-launcher-common.jar"/>
</path>
<path id="package-path">
<pathelement path="../util/scatours-util-launcher-common.jar"/>
</path>
<property name="package-path" value="../util/scatours-util-launcher-common.jar ../ode/"/>
<target name="wsdljava">
<antcall target="wsimport">

4
sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-groovy/build.xml
View file

@ -22,9 +22,7 @@
<path id="compile-path">
<pathelement path="../../util/launcher-common/target/scatours-util-launcher-common.jar"/>
</path>
<path id="package-path">
<pathelement path="../util/scatours-util-launcher-common.jar"/>
</path>
<property name="package-path" value="../util/scatours-util-launcher-common.jar"/>
<target name="wsdljava">
<antcall target="wsimport">

4
sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-java-callback/build.xml
View file

@ -22,9 +22,7 @@
<path id="compile-path">
<pathelement path="../../util/launcher-common/target/scatours-util-launcher-common.jar"/>
</path>
<path id="package-path">
<pathelement path="../util/scatours-util-launcher-common.jar"/>
</path>
<property name="package-path" value="../util/scatours-util-launcher-common.jar"/>
<target name="wsdljava">
<antcall target="wsimport">

4
sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-java-policy/build.xml
View file

@ -22,9 +22,7 @@
<path id="compile-path">
<pathelement path="../../util/launcher-common/target/scatours-util-launcher-common.jar"/>
</path>
<path id="package-path">
<pathelement path="../util/scatours-util-launcher-common.jar"/>
</path>
<property name="package-path" value="../util/scatours-util-launcher-common.jar"/>
<target name="wsdljava">
<antcall target="wsimport">

4
sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-java-reference-pass/build.xml
View file

@ -22,9 +22,7 @@
<path id="compile-path">
<pathelement path="../../util/launcher-common/target/scatours-util-launcher-common.jar"/>
</path>
<path id="package-path">
<pathelement path="../util/scatours-util-launcher-common.jar"/>
</path>
<property name="package-path" value="../util/scatours-util-launcher-common.jar"/>
<target name="wsdljava">
<antcall target="wsimport">

4
sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-java/build.xml
View file

@ -22,9 +22,7 @@
<path id="compile-path">
<pathelement path="../../util/launcher-common/target/scatours-util-launcher-common.jar"/>
</path>
<path id="package-path">
<pathelement path="../util/scatours-util-launcher-common.jar"/>
</path>
<property name="package-path" value="../util/scatours-util-launcher-common.jar"/>
<target name="wsdljava">
<antcall target="wsimport">

4
sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-python/build.xml
View file

@ -22,9 +22,7 @@
<path id="compile-path">
<pathelement path="../../util/launcher-common/target/scatours-util-launcher-common.jar"/>
</path>
<path id="package-path">
<pathelement path="../util/scatours-util-launcher-common.jar"/>
</path>
<property name="package-path" value="../util/scatours-util-launcher-common.jar"/>
<target name="wsdljava">
<antcall target="wsimport">

4
sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-spring-scatag/build.xml
View file

@ -22,9 +22,7 @@
<path id="compile-path">
<pathelement path="../../util/launcher-common/target/scatours-util-launcher-common.jar"/>
</path>
<path id="package-path">
<pathelement path="../util/scatours-util-launcher-common.jar"/>
</path>
<property name="package-path" value="../util/scatours-util-launcher-common.jar"/>
<target name="wsdljava">
<antcall target="wsimport">

4
sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-spring/build.xml
View file

@ -22,9 +22,7 @@
<path id="compile-path">
<pathelement path="../../util/launcher-common/target/scatours-util-launcher-common.jar"/>
</path>
<path id="package-path">
<pathelement path="../util/scatours-util-launcher-common.jar"/>
</path>
<property name="package-path" value="../util/scatours-util-launcher-common.jar"/>
<target name="wsdljava">
<antcall target="wsimport">

4
sca-java-1.x/trunk/tutorials/travelsample/launchers/policy/build.xml
View file

@ -22,9 +22,7 @@
<path id="compile-path">
<pathelement path="../../util/launcher-common/target/scatours-util-launcher-common.jar"/>
</path>
<path id="package-path">
<pathelement path="../util/scatours-util-launcher-common.jar"/>
</path>
<property name="package-path" value="../util/scatours-util-launcher-common.jar"/>
<target name="run">
<java classname="scatours.PolicyLauncher" fork="true">

4
sca-java-1.x/trunk/tutorials/travelsample/launchers/usingsca/build.xml
View file

@ -22,9 +22,7 @@
<path id="compile-path">
<pathelement path="../../util/launcher-common/target/scatours-util-launcher-common.jar"/>
</path>
<path id="package-path">
<pathelement path="../util/scatours-util-launcher-common.jar"/>
</path>
<property name="package-path" value="../util/scatours-util-launcher-common.jar"/>
<target name="run">
<java classname="scatours.UsingLauncher" fork="true" failonerror="true">