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 2007/05/25 16:40:30 UTC
svn commit: r541670 - in
/incubator/tuscany/java/sca/samples/helloworld-jsonrpc: build-dojo.xml
build.xml
Author: slaws
Date: Fri May 25 07:40:30 2007
New Revision: 541670
URL: http://svn.apache.org/viewvc?view=rev&rev=541670
Log:
apply changes from r0.90 branch
Modified:
incubator/tuscany/java/sca/samples/helloworld-jsonrpc/build-dojo.xml
incubator/tuscany/java/sca/samples/helloworld-jsonrpc/build.xml
Modified: incubator/tuscany/java/sca/samples/helloworld-jsonrpc/build-dojo.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/helloworld-jsonrpc/build-dojo.xml?view=diff&rev=541670&r1=541669&r2=541670
==============================================================================
--- incubator/tuscany/java/sca/samples/helloworld-jsonrpc/build-dojo.xml (original)
+++ incubator/tuscany/java/sca/samples/helloworld-jsonrpc/build-dojo.xml Fri May 25 07:40:30 2007
@@ -54,10 +54,20 @@
<arg line="install:install-file -DgroupId=dojo -DartifactId=dojo-${dojo.distro} -Dversion=${dojo.version} -Dpackaging=zip -DgeneratePom=true -Dfile=${basedir}/target/dojo-download/dojo-${dojo.version}-${dojo.distro}.zip"/>
</exec>
</target>
+
+ <target name="install-dojo-nomaven" depends="check-dojo-installed" unless="already.installed">
+ <mkdir dir="${basedir}/target/dojo-download/"/>
+ <get src="http://download.dojotoolkit.org/release-${dojo.version}/dojo-${dojo.version}-${dojo.distro}.zip"
+ dest="${basedir}/target/dojo-download/dojo-${dojo.version}-${dojo.distro}.zip"
+ verbose="true"
+ usetimestamp="true"/>
+ <copy file="${basedir}/target/dojo-download/dojo-${dojo.version}-${dojo.distro}.zip"
+ tofile="${localRepository}/dojo/dojo-${dojo.distro}/${dojo.version}/dojo-${dojo.distro}-${dojo.version}.zip"/>
+ </target>
<target name="unpack-dojo-files" depends="check-dojo-installed, check-dojo-unpacked" unless="already.unpacked">
- <fail message="dojo zip file not installed in local repository" unless="already.installed"/>
+ <fail message="dojo zip file not installed in local repository: ${localRepository}" unless="already.installed"/>
<mkdir dir="${basedir}/target/dojo-unpack-temp/"/>
<unzip src="${localRepository}/dojo/dojo-${dojo.distro}/${dojo.version}/dojo-${dojo.distro}-${dojo.version}.zip"
dest="${basedir}/target/dojo-unpack-temp/"
Modified: incubator/tuscany/java/sca/samples/helloworld-jsonrpc/build.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/helloworld-jsonrpc/build.xml?view=diff&rev=541670&r1=541669&r2=541670
==============================================================================
--- incubator/tuscany/java/sca/samples/helloworld-jsonrpc/build.xml (original)
+++ incubator/tuscany/java/sca/samples/helloworld-jsonrpc/build.xml Fri May 25 07:40:30 2007
@@ -17,7 +17,7 @@
* under the License.
-->
<project name="helloworld-jsonrpc" default="package">
- <property name="settings.localRepository" value="./repo" />
+ <property name="settings.localRepository" value="./target/repo" />
<property name="artifactId" value="sample-helloworld-jsonrpc" />
<target name="init">
@@ -40,51 +40,46 @@
</target>
<target name="package" depends="compile">
- <ant antfile="./build.xml" target="install-dojo">
+ <ant antfile="./build-dojo.xml" target="install-dojo-nomaven">
<property name="localRepository" value="${settings.localRepository}"/>
</ant>
- <ant antfile="./build.xml" target="unpack-dojo-files">
+ <ant antfile="./build-dojo.xml" target="unpack-dojo-files">
<property name="localRepository" value="${settings.localRepository}"/>
<property name="artifactId" value="${artifactId}"/>
</ant>
- <ant antfile="./build.xml" target="clean-dojo-files">
- <property name="localRepository" value="/repo"/>
- <property name="artifactId" value="${artifactId}"/>
- </ant>
-
- <war destfile="target/sample-calculator-web.war"
+ <war destfile="target/sample-helloworldjsonrpc.war"
webxml="src/main/webapp/WEB-INF/web.xml">
<fileset dir="src/main/webapp"/>
<zipfileset dir="../../modules" prefix="WEB-INF/lib">
<include name="sca-api-0.90-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-assembly-1.0-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-assembly-xml-1.0-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-binding-jsonrpc-1.0-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-contribution-1.0-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-contribution-impl-1.0-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-core-1.0-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-core-databinding-1.0-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-core-spi-1.0-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-databinding-1.0-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-host-embedded-1.0-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-host-http-1.0-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-host-webapp-1.0-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-implementation-java-1.0-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-implementation-java-runtime-1.0-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-implementation-java-xml-1.0-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-interface-1.0-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-interface-java-1.0-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-interface-java-runtime-1.0-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-interface-java-xml-1.0-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-interface-wsdl-1.0-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-interface-wsdl-runtime-1.0-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-interface-wsdl-xml-1.0-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-policy-1.0-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-assembly-0.90-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-assembly-xml-0.90-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-binding-jsonrpc-0.90-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-contribution-0.90-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-contribution-impl-0.90-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-core-0.90-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-core-databinding-0.90-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-core-spi-0.90-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-databinding-0.90-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-host-embedded-0.90-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-host-http-0.90-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-host-webapp-0.90-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-implementation-java-0.90-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-implementation-java-runtime-0.90-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-implementation-java-xml-0.90-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-interface-0.90-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-interface-java-0.90-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-interface-java-runtime-0.90-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-interface-java-xml-0.90-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-interface-wsdl-0.90-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-interface-wsdl-runtime-0.90-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-interface-wsdl-xml-0.90-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-policy-0.90-incubating-SNAPSHOT.jar"/>
</zipfileset>
<lib dir="../../lib">
- <include name="commonj-api-1.0-incubating-SNAPSHOT.jar"/>
+ <include name="commonj-api-0.90-incubating-SNAPSHOT.jar"/>
<include name="json-rpc-1.0.jar"/>
<include name="stax-api-1.0.1.jar"/>
<include name="wsdl4j-1.6.2.jar"/>
@@ -94,7 +89,14 @@
</lib>
<classes dir="target/classes"/>
</war>
+
+ <ant antfile="./build-dojo.xml" target="clean-dojo-files">
+ <property name="localRepository" value="${settings.localRepository}"/>
+ <property name="artifactId" value="${artifactId}"/>
+ </ant>
</target>
+
+
<target name="clean">
<delete quiet="true" includeemptydirs="true">
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org