Author: slaws
Date: Fri Aug 24 13:19:25 2007
New Revision: 569506
URL: http://svn.apache.org/viewvc?rev=569506&view=rev
Log:
Fix ant build
Added:
incubator/tuscany/branches/sca-java-0.99/demos/bigbank-account/build-dojo.xml
Removed:
incubator/tuscany/branches/sca-java-0.99/demos/bigbank-account/pom-runapp.xml
incubator/tuscany/branches/sca-java-0.99/demos/bigbank-account/runapp.xml
Modified:
incubator/tuscany/branches/sca-java-0.99/demos/bigbank-account/README
incubator/tuscany/branches/sca-java-0.99/demos/bigbank-account/build.xml
incubator/tuscany/branches/sca-java-0.99/demos/bigbank-account/pom.xml
Modified: incubator/tuscany/branches/sca-java-0.99/demos/bigbank-account/README
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-0.99/demos/bigbank-account/README?rev=569506&r1=569505&r2=569506&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-0.99/demos/bigbank-account/README
(original)
+++ incubator/tuscany/branches/sca-java-0.99/demos/bigbank-account/README Fri
Aug 24 13:19:25 2007
@@ -8,23 +8,26 @@
ant and maven installed to run these applications.
Bigbank-calculator
+------------------
A calculator application, based on the calculator-script sample that uses a
variety of languages to implement a calculator, which the banking application
uses for simple value multiplication. To run the service do the following:
cd bigbank-calculator
-Ant run
+ant run
Bigbank-stockquote
+------------------
A very simple web services based stock quote application which returns random
stock quotes on request.
cd bigbank-stockquote
-Ant run
+ant run
Bigbank-account
+---------------
The front end of this demo application this module provides a web app for
retrieving account information. It makes calls out to the stockquote and
@@ -32,18 +35,16 @@
module for further instructions.
cd bigbank-account
-mvn -f pom-runapp.xml
-
-Maven is used in this last step as there are unresolved issues with running
-this app from the provided ant file.
+ant run
To try the app out point you browser at:
-http://localhost:8082/WebResourceComponent/AccountJSON.html
+http://localhost:8080/AccountJSON.html
This should display an interface with a single button that goes and retrieves
a single set of account details exercising services across the three running
SCA applications.
+
Added:
incubator/tuscany/branches/sca-java-0.99/demos/bigbank-account/build-dojo.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-0.99/demos/bigbank-account/build-dojo.xml?rev=569506&view=auto
==============================================================================
---
incubator/tuscany/branches/sca-java-0.99/demos/bigbank-account/build-dojo.xml
(added)
+++
incubator/tuscany/branches/sca-java-0.99/demos/bigbank-account/build-dojo.xml
Fri Aug 24 13:19:25 2007
@@ -0,0 +1,91 @@
+<?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 name="DojoZipInstaller">
+
+
+ <property name="dojo.version" value="0.4.0"/>
+ <property name="dojo.distro" value="ajax"/>
+ <property name="unpack.location" value="${basedir}/src/main/webapp/dojo"/>
+
+
+ <target name="check-dojo-installed">
+ <condition property="already.installed" >
+ <available
file="${localRepository}/dojo/dojo-${dojo.distro}/${dojo.version}/dojo-${dojo.distro}-${dojo.version}.zip"/>
+ </condition>
+ <condition property="maven.suffix" value="">
+ <os family="unix"/>
+ </condition>
+ <condition property="maven.suffix" value=".bat">
+ <os family="windows"/>
+ </condition>
+ </target>
+
+
+ <target name="check-dojo-unpacked">
+ <condition property="already.unpacked" >
+ <available file="${unpack.location}"/>
+ </condition>
+ </target>
+
+ <target name="install-dojo" 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"/>
+ <exec executable="mvn${maven.suffix}" dir="${basedir}"
failonerror="false">
+ <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:
${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/"
+ overwrite="false">
+ <patternset>
+ <include name="dojo-${dojo.version}-${dojo.distro}/**"/>
+ <exclude name="dojo-${dojo.version}-${dojo.distro}/demos/**"/>
+ <exclude name="dojo-${dojo.version}-${dojo.distro}/tests/**"/>
+ </patternset>
+ </unzip>
+ <move
file="${basedir}/target/dojo-unpack-temp/dojo-${dojo.version}-${dojo.distro}"
+ tofile="${unpack.location}"
+ verbose="true"/>
+ <delete dir="${basedir}/target/dojo-unpack-temp/"/>
+ </target>
+
+
+ <target name="clean-dojo-files">
+ <delete dir="${unpack.location}"/>
+ </target>
+</project>
Modified:
incubator/tuscany/branches/sca-java-0.99/demos/bigbank-account/build.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-0.99/demos/bigbank-account/build.xml?rev=569506&r1=569505&r2=569506&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-0.99/demos/bigbank-account/build.xml
(original)
+++ incubator/tuscany/branches/sca-java-0.99/demos/bigbank-account/build.xml
Fri Aug 24 13:19:25 2007
@@ -17,65 +17,56 @@
* specific language governing permissions and limitations
* under the License.
-->
-<project name="DojoZipInstaller">
+<project name="demo-alert-aggregator" default="run">
+ <property name="localRepository" value="./target/repo" />
+ <property name="artifactId" value="sample-feed-aggregator" />
+ <property name="test.class" value="bigbank.demo.BigBankServer" />
-
- <property name="dojo.version" value="0.4.0"/>
- <property name="dojo.distro" value="ajax"/>
- <property name="unpack.location"
value="${basedir}/src/main/resources/web/dojo"/>
+ <path id="test.classpath">
+ <pathelement location="target/classes"/>
+ <pathelement
location="../../modules/tuscany-http-jetty-1.0-incubating-SNAPSHOT.jar"/>
+ <pathelement
location="../../modules/tuscany-binding-jsonrpc-1.0-incubating-SNAPSHOT.jar"/>
+ <pathelement
location="../../modules/tuscany-binding-rmi-1.0-incubating-SNAPSHOT.jar"/>
+ <pathelement location="../../lib/tuscany-sca-manifest.jar"/>
+ <pathelement location="target/demo-bigbank-account.jar"/>
+ </path>
-
- <target name="check-dojo-installed">
- <condition property="already.installed" >
- <available
file="${localRepository}/dojo/dojo-${dojo.distro}/${dojo.version}/dojo-${dojo.distro}-${dojo.version}.zip"/>
- </condition>
- <condition property="maven.suffix" value="">
- <os family="unix"/>
- </condition>
- <condition property="maven.suffix" value=".bat">
- <os family="windows"/>
- </condition>
+ <target name="init">
+ <mkdir dir="target/classes"/>
+ <mkdir dir="target/classes/web"/>
+ <mkdir dir="target/repo"/>
</target>
-
- <target name="check-dojo-unpacked">
- <condition property="already.unpacked" >
- <available file="${unpack.location}"/>
- </condition>
- </target>
-
- <target name="install-dojo" 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"/>
- <exec executable="mvn${maven.suffix}" dir="${basedir}"
failonerror="false">
- <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="compile" depends="init">
+ <javac srcdir="src/main/java"
+ destdir="target/classes"
+ debug="on"
+ source="1.5"
+ target="1.5">
+ <classpath>
+ <pathelement location="../../lib/tuscany-sca-manifest.jar"/>
+ </classpath>
+ </javac>
+ <copy todir="target/classes">
+ <fileset dir="src/main/resources"/>
+ </copy>
+ <copy todir="target/classes/web">
+ <fileset dir="src/main/webapp"/>
+ </copy>
+ <jar destfile="target/demo-bigbank-account.jar"
basedir="target/classes">
+ <manifest>
+ <attribute name="Main-Class" value="${test.class}" />
+ </manifest>
+ </jar>
+ </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"/>
- <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/"
- overwrite="false">
- <patternset>
- <include name="dojo-${dojo.version}-${dojo.distro}/**"/>
- <exclude name="dojo-${dojo.version}-${dojo.distro}/demos/**"/>
- <exclude name="dojo-${dojo.version}-${dojo.distro}/tests/**"/>
- </patternset>
- </unzip>
- <move
file="${basedir}/target/dojo-unpack-temp/dojo-${dojo.version}-${dojo.distro}"
- tofile="${unpack.location}"
- verbose="true"/>
- <delete dir="${basedir}/target/dojo-unpack-temp/"/>
+ <target name="run" depends="compile">
+ <java classname="${test.class}"
+ fork="true">
+ <classpath>
+ <path refid="test.classpath"/>
+ </classpath>
+ </java>
</target>
-
- <target name="clean-dojo-files">
- <delete dir="${unpack.location}"/>
- </target>
</project>
Modified: incubator/tuscany/branches/sca-java-0.99/demos/bigbank-account/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-0.99/demos/bigbank-account/pom.xml?rev=569506&r1=569505&r2=569506&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-0.99/demos/bigbank-account/pom.xml
(original)
+++ incubator/tuscany/branches/sca-java-0.99/demos/bigbank-account/pom.xml Fri
Aug 24 13:19:25 2007
@@ -131,7 +131,7 @@
</goals>
<configuration>
<tasks>
- <ant target="install-dojo">
+ <ant antfile="./build-dojo.xml"
target="install-dojo">
<property name="localRepository"
value="${settings.localRepository}"/>
</ant>
</tasks>
@@ -145,7 +145,7 @@
</goals>
<configuration>
<tasks>
- <ant 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>
@@ -160,7 +160,7 @@
</goals>
<configuration>
<tasks>
- <ant target="clean-dojo-files">
+ <ant antfile="./build-dojo.xml"
target="clean-dojo-files">
<property name="localRepository"
value="${settings.localRepository}"/>
<property name="artifactId"
value="${artifactId}"/>
</ant>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
