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/01/01 19:02:28 UTC
svn commit: r607882 [1/2] - in /incubator/tuscany/java/sca/samples:
calculator-rmi-reference/ calculator-webapp/ calculator-ws-webapp/
callback-ws-client/ chat-webapp/ feed-aggregator-webapp/
helloworld-dojo-webapp/ helloworld-jsonrpc-webapp/ helloworl...
Author: slaws
Date: Tue Jan 1 10:02:27 2008
New Revision: 607882
URL: http://svn.apache.org/viewvc?rev=607882&view=rev
Log:
Change sample ant builds where appropriate to rely on automatically generated ant files
Modified:
incubator/tuscany/java/sca/samples/calculator-rmi-reference/build.xml
incubator/tuscany/java/sca/samples/calculator-rmi-reference/pom.xml
incubator/tuscany/java/sca/samples/calculator-webapp/build.xml
incubator/tuscany/java/sca/samples/calculator-webapp/pom.xml
incubator/tuscany/java/sca/samples/calculator-ws-webapp/build.xml
incubator/tuscany/java/sca/samples/calculator-ws-webapp/pom.xml
incubator/tuscany/java/sca/samples/callback-ws-client/build.xml
incubator/tuscany/java/sca/samples/callback-ws-client/pom.xml
incubator/tuscany/java/sca/samples/chat-webapp/build.xml
incubator/tuscany/java/sca/samples/chat-webapp/pom.xml
incubator/tuscany/java/sca/samples/feed-aggregator-webapp/build.xml
incubator/tuscany/java/sca/samples/feed-aggregator-webapp/pom.xml
incubator/tuscany/java/sca/samples/helloworld-dojo-webapp/build.xml
incubator/tuscany/java/sca/samples/helloworld-dojo-webapp/pom.xml
incubator/tuscany/java/sca/samples/helloworld-jsonrpc-webapp/build.xml
incubator/tuscany/java/sca/samples/helloworld-jsonrpc-webapp/pom.xml
incubator/tuscany/java/sca/samples/helloworld-ws-sdo-webapp/build.xml
incubator/tuscany/java/sca/samples/helloworld-ws-sdo-webapp/pom.xml
Modified: incubator/tuscany/java/sca/samples/calculator-rmi-reference/build.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/calculator-rmi-reference/build.xml?rev=607882&r1=607881&r2=607882&view=diff
==============================================================================
--- incubator/tuscany/java/sca/samples/calculator-rmi-reference/build.xml (original)
+++ incubator/tuscany/java/sca/samples/calculator-rmi-reference/build.xml Tue Jan 1 10:02:27 2008
@@ -14,59 +14,109 @@
* "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.
+ * under the License.
-->
-<project name="calculator-rmi-reference-client" default="compile">
- <property name="test.class" value="calculator.CalculatorClient" />
- <property name="test.jar" value="sample-calculator-rmi-reference.jar" />
-
- <target name="init">
+<project name="sample-calculator-rmi-reference" default="compile">
+
+ <target name="compile">
<mkdir dir="target/classes"/>
- </target>
-
- <target name="compile" depends="init">
- <javac srcdir="src/main/java"
- destdir="target/classes"
- debug="on"
- source="1.5"
- target="1.5">
+ <javac destdir="target/classes" debug="on" source="1.5" target="1.5">
+ <src path="src\main\java"/>
<classpath>
- <pathelement location="../../lib/tuscany-sca-manifest.jar"/>
+ <fileset refid="tuscany.jars"/>
+ <fileset refid="3rdparty.jars"/>
</classpath>
- </javac>
+ </javac>
<copy todir="target/classes">
- <fileset dir="src/main/resources"/>
+ <fileset dir="src\main\resources"/>
+ <fileset dir="." includes="*" excludes="src, target, pom.xml, build.xml"/>
</copy>
- <jar destfile="target/${test.jar}" basedir="target/classes">
+ <jar destfile="target/sample-calculator-rmi-reference.jar" basedir="target/classes">
<manifest>
- <attribute name="Main-Class" value="${test.class}" />
+ <attribute name="Main-Class" value="calculator.CalculatorClient"/>
</manifest>
- </jar>
- </target>
-
- <target name="run-classes">
- <java classname="${test.class}"
- fork="true">
- <classpath>
- <pathelement path="target/classes"/>
- <pathelement location="../../lib/tuscany-sca-manifest.jar"/>
- </classpath>
- </java>
+ </jar>
</target>
-
+
<target name="run">
- <java classname="${test.class}"
- fork="true">
+ <java classname="calculator.CalculatorClient" fork="true">
<classpath>
- <pathelement path="target/${test.jar}"/>
- <pathelement location="../../lib/tuscany-sca-manifest.jar"/>
+ <pathelement location="target/sample-calculator-rmi-reference.jar"/>
+ <fileset refid="tuscany.jars"/>
+ <fileset refid="3rdparty.jars"/>
</classpath>
- </java>
- </target>
-
+ </java>
+ </target>
+
<target name="clean">
- <delete quiet="true" includeemptydirs="true">
+ <delete includeemptydirs="true">
<fileset dir="target"/>
</delete>
</target>
+
+ <fileset id="tuscany.jars" dir="../../modules">
+ <include name="tuscany-core-spi-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-policy-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-implementation-java-runtime-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-node-api-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-contribution-namespace-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-assembly-xsd-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-binding-rmi-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-assembly-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-core-databinding-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-policy-xml-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-sca-api-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-policy-logging-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-definitions-xml-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-contribution-java-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-databinding-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-policy-security-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-assembly-xml-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-domain-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-interface-java-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-contribution-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-implementation-java-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-domain-api-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-binding-sca-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-implementation-java-xml-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-binding-sca-xml-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-host-rmi-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-core-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-databinding-jaxb-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-contribution-impl-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-node-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-definitions-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-extension-helper-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-host-embedded-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-interface-java-xml-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-interface-1.1-incubating-SNAPSHOT.jar"/>
+ </fileset>
+ <fileset id="3rdparty.jars" dir="../../lib">
+ <include name="xercesImpl-2.8.1.jar"/>
+ <include name="xml-apis-1.3.03.jar"/>
+ <include name="jaxb-impl-2.1.5.jar"/>
+ <include name="axiom-api-1.2.5.jar"/>
+ <include name="servlet-api-2.3.jar"/>
+ <include name="jaxb-api-2.1.jar"/>
+ <include name="cglib-nodep-2.1_3.jar"/>
+ <include name="commons-logging-1.1.jar"/>
+ <include name="logkit-1.0.1.jar"/>
+ <include name="saaj-api-1.3.jar"/>
+ <include name="jsr250-api-1.0.jar"/>
+ <include name="xalan-2.7.0.jar"/>
+ <include name="geronimo-commonj_1.1_spec-1.0.jar"/>
+ <include name="jaxws-api-2.1.jar"/>
+ <include name="stax-api-1.0-2.jar"/>
+ <include name="jaxen-1.1-beta-9.jar"/>
+ <include name="jaxb2-reflection-2.1.4.jar"/>
+ <include name="axiom-impl-1.2.5.jar"/>
+ <include name="neethi-2.0.2.jar"/>
+ <include name="activation-1.1.jar"/>
+ <include name="avalon-framework-4.1.3.jar"/>
+ <include name="log4j-1.2.12.jar"/>
+ <include name="jsr181-api-1.0-MR1.jar"/>
+ <include name="wstx-asl-3.2.1.jar"/>
+ <include name="stax-api-1.0.1.jar"/>
+ </fileset>
+
</project>
Modified: incubator/tuscany/java/sca/samples/calculator-rmi-reference/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/calculator-rmi-reference/pom.xml?rev=607882&r1=607881&r2=607882&view=diff
==============================================================================
--- incubator/tuscany/java/sca/samples/calculator-rmi-reference/pom.xml (original)
+++ incubator/tuscany/java/sca/samples/calculator-rmi-reference/pom.xml Tue Jan 1 10:02:27 2008
@@ -63,6 +63,23 @@
<build>
<finalName>${artifactId}</finalName>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-maven-ant-generator</artifactId>
+ <version>1.1-incubating-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <configuration>
+ <mainClass>calculator.CalculatorClient</mainClass>
+ </configuration>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
</build>
</project>
Modified: incubator/tuscany/java/sca/samples/calculator-webapp/build.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/calculator-webapp/build.xml?rev=607882&r1=607881&r2=607882&view=diff
==============================================================================
--- incubator/tuscany/java/sca/samples/calculator-webapp/build.xml (original)
+++ incubator/tuscany/java/sca/samples/calculator-webapp/build.xml Tue Jan 1 10:02:27 2008
@@ -14,73 +14,100 @@
* "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.
+ * under the License.
-->
-<project name="calculator-web" default="package">
-
- <target name="init">
+<project name="sample-calculator-webapp" default="compile">
+
+ <target name="compile">
<mkdir dir="target/classes"/>
- </target>
-
- <target name="compile" depends="init">
- <javac srcdir="src/main/java"
- destdir="target/classes"
- debug="on"
- source="1.5"
- target="1.5">
+ <javac destdir="target/classes" debug="on" source="1.5" target="1.5">
+ <src path="src\main\java"/>
<classpath>
- <pathelement location="../../lib/tuscany-sca-manifest.jar"/>
+ <fileset refid="tuscany.jars"/>
+ <fileset refid="3rdparty.jars"/>
</classpath>
- </javac>
+ </javac>
<copy todir="target/classes">
- <fileset dir="src/main/resources"/>
+ <fileset dir="src\main\resources"/>
+ <fileset dir="." includes="*" excludes="src, target, pom.xml, build.xml"/>
</copy>
- </target>
-
- <target name="package" depends="compile">
- <war destfile="target/sample-calculator-webapp.war"
- webxml="src/main/webapp/WEB-INF/web.xml">
+ <war destfile="target/sample-calculator-webapp.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-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-assembly-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-assembly-xml-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-binding-sca-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-binding-sca-xml-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-contribution-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-contribution-impl-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-contribution-java-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-contribution-namespace-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-core-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-core-databinding-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-core-spi-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-databinding-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-distributed-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-host-embedded-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-host-http-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-host-webapp-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-implementation-java-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-implementation-java-runtime-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-implementation-java-xml-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-interface-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-interface-java-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-interface-java-xml-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-policy-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-policy-xml-1.1-incubating-SNAPSHOT.jar"/>
- </zipfileset>
- <lib dir="../../lib">
- <include name="cglib-nodep-2.1_3.jar"/>
- <include name="geronimo-commonj_1.1_spec-1.0.jar"/>
- <include name="stax-api-1.0.1.jar"/>
- <include name="wstx-asl-3.2.1.jar"/>
- </lib>
+ <lib refid="tuscany.jars"/>
+ <lib refid="3rdparty.jars"/>
<classes dir="target/classes"/>
</war>
- </target>
-
+ </target>
+
<target name="clean">
- <delete quiet="true" includeemptydirs="true">
+ <delete includeemptydirs="true">
<fileset dir="target"/>
</delete>
</target>
+
+ <fileset id="tuscany.jars" dir="../../modules">
+ <include name="tuscany-core-spi-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-host-http-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-policy-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-implementation-java-runtime-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-node-api-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-contribution-namespace-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-assembly-xsd-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-assembly-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-core-databinding-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-policy-xml-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-sca-api-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-policy-logging-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-definitions-xml-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-contribution-java-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-databinding-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-policy-security-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-assembly-xml-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-domain-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-interface-java-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-contribution-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-implementation-java-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-domain-api-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-binding-sca-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-host-webapp-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-implementation-java-xml-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-binding-sca-xml-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-databinding-jaxb-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-core-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-contribution-impl-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-node-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-definitions-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-host-embedded-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-interface-java-xml-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-interface-1.1-incubating-SNAPSHOT.jar"/>
+ </fileset>
+ <fileset id="3rdparty.jars" dir="../../lib">
+ <include name="xercesImpl-2.8.1.jar"/>
+ <include name="xml-apis-1.3.03.jar"/>
+ <include name="jaxb-impl-2.1.5.jar"/>
+ <include name="axiom-api-1.2.5.jar"/>
+ <include name="servlet-api-2.3.jar"/>
+ <include name="jaxb-api-2.1.jar"/>
+ <include name="cglib-nodep-2.1_3.jar"/>
+ <include name="commons-logging-1.1.jar"/>
+ <include name="logkit-1.0.1.jar"/>
+ <include name="saaj-api-1.3.jar"/>
+ <include name="jsr250-api-1.0.jar"/>
+ <include name="xalan-2.7.0.jar"/>
+ <include name="geronimo-commonj_1.1_spec-1.0.jar"/>
+ <include name="jaxws-api-2.1.jar"/>
+ <include name="stax-api-1.0-2.jar"/>
+ <include name="jaxen-1.1-beta-9.jar"/>
+ <include name="jaxb2-reflection-2.1.4.jar"/>
+ <include name="axiom-impl-1.2.5.jar"/>
+ <include name="neethi-2.0.2.jar"/>
+ <include name="activation-1.1.jar"/>
+ <include name="avalon-framework-4.1.3.jar"/>
+ <include name="log4j-1.2.12.jar"/>
+ <include name="mail-1.4.jar"/>
+ <include name="jsr181-api-1.0-MR1.jar"/>
+ <include name="wstx-asl-3.2.1.jar"/>
+ <include name="stax-api-1.0.1.jar"/>
+ </fileset>
+
</project>
Modified: incubator/tuscany/java/sca/samples/calculator-webapp/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/calculator-webapp/pom.xml?rev=607882&r1=607881&r2=607882&view=diff
==============================================================================
--- incubator/tuscany/java/sca/samples/calculator-webapp/pom.xml (original)
+++ incubator/tuscany/java/sca/samples/calculator-webapp/pom.xml Tue Jan 1 10:02:27 2008
@@ -61,5 +61,19 @@
<build>
<finalName>${artifactId}</finalName>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-maven-ant-generator</artifactId>
+ <version>1.1-incubating-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
</build>
</project>
Modified: incubator/tuscany/java/sca/samples/calculator-ws-webapp/build.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/calculator-ws-webapp/build.xml?rev=607882&r1=607881&r2=607882&view=diff
==============================================================================
--- incubator/tuscany/java/sca/samples/calculator-ws-webapp/build.xml (original)
+++ incubator/tuscany/java/sca/samples/calculator-ws-webapp/build.xml Tue Jan 1 10:02:27 2008
@@ -14,135 +14,141 @@
* "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.
+ * under the License.
-->
-<project name="calculator-webap-ws" default="package">
-
- <target name="init">
+<project name="sample-calculator-ws-webapp" default="compile">
+
+ <target name="compile">
<mkdir dir="target/classes"/>
- </target>
-
- <target name="compile" depends="init">
- <javac srcdir="src/main/java"
- destdir="target/classes"
- debug="on"
- source="1.5"
- target="1.5">
+ <javac destdir="target/classes" debug="on" source="1.5" target="1.5">
+ <src path="src\main\java"/>
<classpath>
- <pathelement location="../../lib/tuscany-sca-manifest.jar"/>
- <pathelement path="target/classes"/>
+ <fileset refid="tuscany.jars"/>
+ <fileset refid="3rdparty.jars"/>
</classpath>
- </javac>
+ </javac>
<copy todir="target/classes">
- <fileset dir="src/main/resources"/>
-
+ <fileset dir="src\main\resources"/>
+ <fileset dir="." includes="*" excludes="src, target, pom.xml, build.xml"/>
</copy>
- </target>
-
- <target name="package" depends="compile">
- <war destfile="target/sample-calculator-ws-webapp.war"
- webxml="src/main/webapp/WEB-INF/web.xml">
+ <war destfile="target/sample-calculator-ws-webapp.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-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-assembly-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-assembly-xml-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-binding-feed-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-binding-jsonrpc-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-binding-sca-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-binding-sca-xml-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-binding-ws-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-binding-ws-axis2-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-binding-ws-xml-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-contribution-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-contribution-impl-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-contribution-java-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-contribution-namespace-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-core-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-core-databinding-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-core-spi-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-databinding-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-databinding-axiom-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-databinding-jaxb-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-databinding-sdo-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-distributed-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-extension-helper-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-host-embedded-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-host-http-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-host-webapp-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-implementation-java-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-implementation-java-runtime-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-implementation-java-xml-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-interface-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-interface-java-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-interface-java-xml-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-interface-wsdl-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-interface-wsdl-runtime-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-interface-wsdl-xml-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-policy-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-policy-xml-1.1-incubating-SNAPSHOT.jar"/>
- </zipfileset>
- <lib dir="../../lib">
- <include name="activation-1.1.jar"/>
- <include name="annogen-0.1.0.jar"/>
- <include name="ant-1.7.0.jar"/>
- <include name="ant-launcher-1.7.0.jar"/>
- <include name="avalon-framework-4.1.3.jar"/>
- <include name="axiom-api-1.2.4.jar"/>
- <include name="axiom-dom-1.2.4.jar"/>
- <include name="axiom-impl-1.2.4.jar"/>
- <include name="axis2-java2wsdl-1.2.jar"/>
- <include name="axis2-kernel-1.2.jar"/>
- <include name="backport-util-concurrent-2.2.jar"/>
- <include name="backport-util-concurrent-3.0.jar"/>
- <include name="cglib-nodep-2.1_3.jar"/>
- <include name="common-2.2.3.jar"/>
- <include name="commons-codec-1.3.jar"/>
- <include name="commons-fileupload-1.1.1.jar"/>
- <include name="commons-httpclient-3.0.1.jar"/>
- <include name="commons-io-1.1.jar"/>
- <include name="commons-logging-1.1.jar"/>
- <include name="ecore-2.2.3.jar"/>
- <include name="ecore-change-2.2.3.jar"/>
- <include name="ecore-xmi-2.2.3.jar"/>
- <include name="geronimo-commonj_1.1_spec-1.0.jar"/>
- <include name="geronimo-jms_1.1_spec-1.1.jar"/>
- <include name="jakarta-httpcore-4.0-alpha4.jar"/>
- <include name="jaxb-api-2.1.jar"/>
- <include name="jaxb-impl-2.1.4.jar"/>
- <include name="jaxen-1.1-beta-9.jar"/>
- <include name="jaxws-api-2.1.jar"/>
- <include name="jdom-1.0.jar"/>
- <include name="json-rpc-1.0.jar"/>
- <include name="jsr181-api-1.0-MR1.jar"/>
- <include name="jsr250-api-1.0.jar"/>
- <include name="log4j-1.2.12.jar"/>
- <include name="logkit-1.0.1.jar"/>
- <include name="mail-1.4.jar"/>
- <include name="neethi-2.0.1.jar"/>
- <include name="rome-0.9.jar"/>
- <include name="saaj-api-1.3.jar"/>
- <include name="sca-api-1.1-incubating-SNAPSHOT.jar"/>
- <include name="stax-api-1.0-2.jar"/>
- <include name="stax-api-1.0.1.jar"/>
- <include name="woden-1.0-incubating-M7a.jar"/>
- <include name="wsdl4j-1.6.2.jar"/>
- <include name="wstx-asl-3.2.1.jar"/>
- <include name="xercesImpl-2.8.1.jar"/>
- <include name="xml-apis-1.3.03.jar"/>
- <include name="XmlSchema-1.3.1.jar"/>
- <include name="xsd-2.2.3.jar"/>
- <include name="tuscany-sdo-api-r2.1-1.0-incubating.jar"/>
- <include name="tuscany-sdo-impl-1.0-incubating.jar"/>
- <include name="tuscany-sdo-lib-1.0-incubating.jar"/>
- </lib>
+ <lib refid="tuscany.jars"/>
+ <lib refid="3rdparty.jars"/>
<classes dir="target/classes"/>
</war>
- </target>
-
+ </target>
+
<target name="clean">
- <delete quiet="true" includeemptydirs="true">
+ <delete includeemptydirs="true">
<fileset dir="target"/>
</delete>
</target>
+
+ <fileset id="tuscany.jars" dir="../../modules">
+ <include name="tuscany-core-spi-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-assembly-xsd-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-assembly-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-interface-wsdl-java2wsdl-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-sca-api-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-policy-security-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-assembly-xml-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-domain-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-interface-java-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-contribution-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-implementation-java-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-domain-api-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-implementation-java-xml-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-binding-sca-xml-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-interface-wsdl-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-node-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-contribution-impl-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-definitions-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-host-embedded-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-interface-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-host-http-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-binding-ws-axis2-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-policy-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-implementation-java-runtime-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-node-api-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-contribution-namespace-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-core-databinding-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-policy-xml-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-policy-logging-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-definitions-xml-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-contribution-java-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-databinding-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-binding-ws-xml-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-binding-sca-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-host-webapp-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-binding-ws-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-databinding-axiom-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-databinding-jaxb-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-core-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-interface-wsdl-xml-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-interface-java-xml-1.1-incubating-SNAPSHOT.jar"/>
+ </fileset>
+ <fileset id="3rdparty.jars" dir="../../lib">
+ <include name="wsdl4j-1.6.2.jar"/>
+ <include name="jaxb-impl-2.1.5.jar"/>
+ <include name="jdom-1.0.jar"/>
+ <include name="rampart-trust-1.3.jar"/>
+ <include name="axiom-api-1.2.5.jar"/>
+ <include name="servlet-api-2.3.jar"/>
+ <include name="cglib-nodep-2.1_3.jar"/>
+ <include name="geronimo-activation_1.1_spec-1.0-M1.jar"/>
+ <include name="opensaml-1.1.jar"/>
+ <include name="logkit-1.0.1.jar"/>
+ <include name="annogen-0.1.0.jar"/>
+ <include name="axis2-adb-1.3.jar"/>
+ <include name="axis2-mtompolicy-1.3.jar"/>
+ <include name="axis2-java2wsdl-1.3.jar"/>
+ <include name="httpcore-nio-4.0-alpha5.jar"/>
+ <include name="rampart-core-1.3.jar"/>
+ <include name="geronimo-commonj_1.1_spec-1.0.jar"/>
+ <include name="jaxws-api-2.1.jar"/>
+ <include name="rampart-policy-1.3.jar"/>
+ <include name="httpcore-niossl-4.0-alpha5.jar"/>
+ <include name="jaxb2-reflection-2.1.4.jar"/>
+ <include name="activation-1.1.jar"/>
+ <include name="geronimo-javamail_1.4_spec-1.0-M1.jar"/>
+ <include name="avalon-framework-4.1.3.jar"/>
+ <include name="commons-io-1.2.jar"/>
+ <include name="axiom-dom-1.2.5.jar"/>
+ <include name="jsr181-api-1.0-MR1.jar"/>
+ <include name="XmlSchema-1.3.2.jar"/>
+ <include name="woden-1.0-incubating-M7b.jar"/>
+ <include name="xercesImpl-2.8.1.jar"/>
+ <include name="geronimo-jms_1.1_spec-1.1.jar"/>
+ <include name="commons-codec-1.3.jar"/>
+ <include name="xml-apis-1.3.03.jar"/>
+ <include name="xbean-2.1.0.jar"/>
+ <include name="wss4j-1.5.3.jar"/>
+ <include name="bcprov-jdk15-132.jar"/>
+ <include name="dom4j-1.6.1.jar"/>
+ <include name="axis2-kernel-1.3.jar"/>
+ <include name="jaxb-api-2.1.jar"/>
+ <include name="backport-util-concurrent-2.2.jar"/>
+ <include name="httpcore-4.0-alpha5.jar"/>
+ <include name="commons-logging-1.1.jar"/>
+ <include name="commons-fileupload-1.1.1.jar"/>
+ <include name="saaj-api-1.3.jar"/>
+ <include name="commons-httpclient-3.0.1.jar"/>
+ <include name="commons-collections-3.1.jar"/>
+ <include name="jsr250-api-1.0.jar"/>
+ <include name="xalan-2.7.0.jar"/>
+ <include name="stax-api-1.0-2.jar"/>
+ <include name="axis2-adb-codegen-1.3.jar"/>
+ <include name="axiom-impl-1.2.5.jar"/>
+ <include name="commons-discovery-0.2.jar"/>
+ <include name="neethi-2.0.2.jar"/>
+ <include name="xmlsec-1.4.0.jar"/>
+ <include name="jaxen-1.1.1.jar"/>
+ <include name="log4j-1.2.12.jar"/>
+ <include name="mail-1.4.jar"/>
+ <include name="axis2-codegen-1.3.jar"/>
+ <include name="wstx-asl-3.2.1.jar"/>
+ <include name="stax-api-1.0.1.jar"/>
+ </fileset>
+
</project>
Modified: incubator/tuscany/java/sca/samples/calculator-ws-webapp/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/calculator-ws-webapp/pom.xml?rev=607882&r1=607881&r2=607882&view=diff
==============================================================================
--- incubator/tuscany/java/sca/samples/calculator-ws-webapp/pom.xml (original)
+++ incubator/tuscany/java/sca/samples/calculator-ws-webapp/pom.xml Tue Jan 1 10:02:27 2008
@@ -68,5 +68,19 @@
<build>
<finalName>${artifactId}</finalName>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-maven-ant-generator</artifactId>
+ <version>1.1-incubating-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
</build>
</project>
Modified: incubator/tuscany/java/sca/samples/callback-ws-client/build.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/callback-ws-client/build.xml?rev=607882&r1=607881&r2=607882&view=diff
==============================================================================
--- incubator/tuscany/java/sca/samples/callback-ws-client/build.xml (original)
+++ incubator/tuscany/java/sca/samples/callback-ws-client/build.xml Tue Jan 1 10:02:27 2008
@@ -14,60 +14,163 @@
* "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.
+ * under the License.
-->
-<project name="callback-ws-client" default="compile">
- <property name="test.class" value="myapp.MyClientImpl" />
- <property name="test.jar" value="sample-callback-ws-client.jar" />
- <property name="manifest.jar" value="../../lib/tuscany-sca-manifest.jar" />
-
- <target name="init">
+<project name="sample-callback-ws-client" default="compile">
+
+ <target name="compile">
<mkdir dir="target/classes"/>
- </target>
-
- <target name="compile" depends="init">
- <javac srcdir="src/main/java"
- destdir="target/classes"
- debug="on"
- source="1.5"
- target="1.5">
+ <javac destdir="target/classes" debug="on" source="1.5" target="1.5">
+ <src path="src\main\java"/>
<classpath>
- <pathelement location="${manifest.jar}"/>
+ <fileset refid="tuscany.jars"/>
+ <fileset refid="3rdparty.jars"/>
</classpath>
- </javac>
+ </javac>
<copy todir="target/classes">
- <fileset dir="src/main/resources"/>
+ <fileset dir="src\main\resources"/>
+ <fileset dir="." includes="*" excludes="src, target, pom.xml, build.xml"/>
</copy>
- <jar destfile="target/${test.jar}" basedir="target/classes">
+ <jar destfile="target/sample-callback-ws-client.jar" basedir="target/classes">
<manifest>
- <attribute name="Main-Class" value="${test.class}" />
+ <attribute name="Main-Class" value="myapp.MyClientImpl"/>
</manifest>
- </jar>
- </target>
-
- <target name="run-classes">
- <java classname="${test.class}"
- fork="true">
- <classpath>
- <pathelement path="target/classes"/>
- <pathelement location="${manifest.jar}"/>
- </classpath>
- </java>
+ </jar>
</target>
-
+
<target name="run">
- <java classname="${test.class}"
- fork="true">
+ <java classname="myapp.MyClientImpl" fork="true">
<classpath>
- <pathelement path="target/${test.jar}"/>
- <pathelement location="${manifest.jar}"/>
+ <pathelement location="target/sample-callback-ws-client.jar"/>
+ <fileset refid="tuscany.jars"/>
+ <fileset refid="3rdparty.jars"/>
</classpath>
- </java>
+ </java>
</target>
-
+
<target name="clean">
- <delete quiet="true" includeemptydirs="true">
+ <delete includeemptydirs="true">
<fileset dir="target"/>
</delete>
</target>
+
+ <fileset id="tuscany.jars" dir="../../modules">
+ <include name="tuscany-core-spi-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-assembly-xsd-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-assembly-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-interface-wsdl-java2wsdl-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-sca-api-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-binding-http-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-policy-security-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-assembly-xml-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-domain-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-interface-java-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-contribution-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-implementation-java-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-domain-api-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-binding-jsonrpc-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-implementation-java-xml-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-binding-sca-xml-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-interface-wsdl-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-implementation-resource-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-contribution-impl-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-node-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-definitions-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-host-embedded-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-node-impl-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-interface-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-host-http-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-policy-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-binding-ws-axis2-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-implementation-java-runtime-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-node-api-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-contribution-namespace-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-core-databinding-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-policy-xml-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-policy-logging-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-definitions-xml-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-contribution-java-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-databinding-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-binding-ws-xml-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-binding-sca-axis2-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-databinding-json-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-binding-sca-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-domain-impl-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-binding-ws-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-databinding-axiom-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-databinding-jaxb-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-core-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-interface-wsdl-xml-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-interface-java-xml-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-host-tomcat-1.1-incubating-SNAPSHOT.jar"/>
+ </fileset>
+ <fileset id="3rdparty.jars" dir="../../lib">
+ <include name="wsdl4j-1.6.2.jar"/>
+ <include name="jaxb-impl-2.1.5.jar"/>
+ <include name="jdom-1.0.jar"/>
+ <include name="rampart-trust-1.3.jar"/>
+ <include name="axiom-api-1.2.5.jar"/>
+ <include name="cglib-nodep-2.1_3.jar"/>
+ <include name="geronimo-activation_1.1_spec-1.0-M1.jar"/>
+ <include name="opensaml-1.1.jar"/>
+ <include name="logkit-1.0.1.jar"/>
+ <include name="annogen-0.1.0.jar"/>
+ <include name="axis2-adb-1.3.jar"/>
+ <include name="axis2-mtompolicy-1.3.jar"/>
+ <include name="axis2-java2wsdl-1.3.jar"/>
+ <include name="httpcore-nio-4.0-alpha5.jar"/>
+ <include name="rampart-core-1.3.jar"/>
+ <include name="geronimo-commonj_1.1_spec-1.0.jar"/>
+ <include name="catalina-6.0.10.jar"/>
+ <include name="jaxws-api-2.1.jar"/>
+ <include name="rampart-policy-1.3.jar"/>
+ <include name="httpcore-niossl-4.0-alpha5.jar"/>
+ <include name="jaxb2-reflection-2.1.4.jar"/>
+ <include name="activation-1.1.jar"/>
+ <include name="geronimo-javamail_1.4_spec-1.0-M1.jar"/>
+ <include name="avalon-framework-4.1.3.jar"/>
+ <include name="commons-io-1.2.jar"/>
+ <include name="axiom-dom-1.2.5.jar"/>
+ <include name="jsr181-api-1.0-MR1.jar"/>
+ <include name="XmlSchema-1.3.2.jar"/>
+ <include name="woden-1.0-incubating-M7b.jar"/>
+ <include name="xercesImpl-2.8.1.jar"/>
+ <include name="jettison-1.0-RC2.jar"/>
+ <include name="geronimo-jms_1.1_spec-1.1.jar"/>
+ <include name="commons-codec-1.3.jar"/>
+ <include name="xml-apis-1.3.03.jar"/>
+ <include name="xbean-2.1.0.jar"/>
+ <include name="wss4j-1.5.3.jar"/>
+ <include name="bcprov-jdk15-132.jar"/>
+ <include name="dom4j-1.6.1.jar"/>
+ <include name="axis2-kernel-1.3.jar"/>
+ <include name="jaxb-api-2.1.jar"/>
+ <include name="backport-util-concurrent-2.2.jar"/>
+ <include name="httpcore-4.0-alpha5.jar"/>
+ <include name="commons-logging-1.1.jar"/>
+ <include name="commons-fileupload-1.1.1.jar"/>
+ <include name="servlet-api-2.5.jar"/>
+ <include name="saaj-api-1.3.jar"/>
+ <include name="commons-httpclient-3.0.1.jar"/>
+ <include name="commons-collections-3.1.jar"/>
+ <include name="jsr250-api-1.0.jar"/>
+ <include name="xalan-2.7.0.jar"/>
+ <include name="stax-api-1.0-2.jar"/>
+ <include name="axis2-adb-codegen-1.3.jar"/>
+ <include name="coyote-6.0.10.jar"/>
+ <include name="json-rpc-1.0.jar"/>
+ <include name="axiom-impl-1.2.5.jar"/>
+ <include name="commons-discovery-0.2.jar"/>
+ <include name="neethi-2.0.2.jar"/>
+ <include name="annotations-api-6.0.10.jar"/>
+ <include name="xmlsec-1.4.0.jar"/>
+ <include name="juli-6.0.10.jar"/>
+ <include name="jaxen-1.1.1.jar"/>
+ <include name="log4j-1.2.12.jar"/>
+ <include name="mail-1.4.jar"/>
+ <include name="axis2-codegen-1.3.jar"/>
+ <include name="wstx-asl-3.2.1.jar"/>
+ <include name="stax-api-1.0.1.jar"/>
+ </fileset>
+
</project>
Modified: incubator/tuscany/java/sca/samples/callback-ws-client/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/callback-ws-client/pom.xml?rev=607882&r1=607881&r2=607882&view=diff
==============================================================================
--- incubator/tuscany/java/sca/samples/callback-ws-client/pom.xml (original)
+++ incubator/tuscany/java/sca/samples/callback-ws-client/pom.xml Tue Jan 1 10:02:27 2008
@@ -88,6 +88,23 @@
<build>
<finalName>${artifactId}</finalName>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-maven-ant-generator</artifactId>
+ <version>1.1-incubating-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <configuration>
+ <mainClass>myapp.MyClientImpl</mainClass>
+ </configuration>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
</build>
</project>
Modified: incubator/tuscany/java/sca/samples/chat-webapp/build.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/chat-webapp/build.xml?rev=607882&r1=607881&r2=607882&view=diff
==============================================================================
--- incubator/tuscany/java/sca/samples/chat-webapp/build.xml (original)
+++ incubator/tuscany/java/sca/samples/chat-webapp/build.xml Tue Jan 1 10:02:27 2008
@@ -14,91 +14,103 @@
* "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.
+ * under the License.
-->
-<project name="sample-chat-webapp" default="package">
- <property file="${user.home}/tuscany/build.properties" />
- <property file="${user.home}/build.properties" />
+<project name="sample-chat-webapp" default="compile">
- <property name="tuscany.sca.manifest.location" value="../../lib/tuscany-sca-manifest.jar"/>
- <property name="tuscany.sca.lib.location" value="../../lib"/>
- <property name="tuscany.sca.modules.location" value="../../modules"/>
-
- <path id="project.classpath">
- <pathelement path="target/classes"/>
- <pathelement path="target/sdo-source"/>
- <pathelement location="${tuscany.sca.manifest.location}"/>
- </path>
-
- <target name="init">
+ <target name="compile">
<mkdir dir="target/classes"/>
- <mkdir dir="target/sdo-source"/>
- </target>
-
-
- <target name="compile" depends="init">
- <javac destdir="target/classes"
- debug="on"
- source="1.5"
- target="1.5">
- <src location="src/main/java"/>
- <src location="target/sdo-source"/>
- <classpath refid="project.classpath"/>
- </javac>
+ <javac destdir="target/classes" debug="on" source="1.5" target="1.5">
+ <src path="src\main\java"/>
+ <classpath>
+ <fileset refid="tuscany.jars"/>
+ <fileset refid="3rdparty.jars"/>
+ </classpath>
+ </javac>
<copy todir="target/classes">
- <fileset dir="src/main/resources"/>
- <fileset dir="target/sdo-source"/>
+ <fileset dir="src\main\resources"/>
+ <fileset dir="." includes="*" excludes="src, target, pom.xml, build.xml"/>
</copy>
- </target>
-
- <target name="package" depends="compile">
- <war destfile="target/sample-chat-webapp.war"
- webxml="src/main/webapp/WEB-INF/web.xml">
- <fileset dir="src/main/webapp"/>
- <zipfileset dir="${tuscany.sca.modules.location}" prefix="WEB-INF/lib">
- <include name="sca-api-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-assembly-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-assembly-xml-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-binding-dwr-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-binding-sca-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-binding-sca-xml-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-contribution-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-contribution-impl-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-contribution-java-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-contribution-namespace-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-core-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-core-databinding-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-core-spi-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-databinding-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-distributed-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-extension-helper-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-host-embedded-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-host-http-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-host-webapp-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-implementation-java-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-implementation-java-runtime-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-implementation-java-xml-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-interface-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-interface-java-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-interface-java-xml-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-policy-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-policy-xml-1.1-incubating-SNAPSHOT.jar"/>
- </zipfileset>
- <lib dir="${tuscany.sca.lib.location}">
- <include name="cglib-nodep-2.1_3.jar"/>
- <include name="dwr-2.0.1.jar"/>
- <include name="geronimo-commonj_1.1_spec-1.0.jar"/>
- <include name="wstx-asl-3.2.1.jar"/>
- <include name="stax-api-1.0.1.jar"/>
- </lib>
+ <war destfile="target/sample-chat-webapp.war" webxml="src/main/webapp/WEB-INF/web.xml">
+ <fileset dir="src/main/webapp"/>
+ <lib refid="tuscany.jars"/>
+ <lib refid="3rdparty.jars"/>
<classes dir="target/classes"/>
- <classes dir="target/sdo-source"/>
</war>
- </target>
-
+ </target>
+
<target name="clean">
- <delete quiet="true" includeemptydirs="true">
+ <delete includeemptydirs="true">
<fileset dir="target"/>
</delete>
</target>
+
+ <fileset id="tuscany.jars" dir="../../modules">
+ <include name="tuscany-core-spi-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-host-http-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-policy-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-implementation-java-runtime-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-node-api-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-contribution-namespace-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-assembly-xsd-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-assembly-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-core-databinding-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-policy-xml-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-sca-api-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-policy-logging-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-definitions-xml-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-contribution-java-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-databinding-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-policy-security-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-assembly-xml-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-domain-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-interface-java-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-contribution-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-implementation-java-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-domain-api-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-binding-sca-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-binding-dwr-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-host-webapp-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-implementation-java-xml-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-binding-sca-xml-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-core-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-databinding-jaxb-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-node-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-contribution-impl-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-definitions-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-extension-helper-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-host-embedded-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-interface-java-xml-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-interface-1.1-incubating-SNAPSHOT.jar"/>
+ </fileset>
+ <fileset id="3rdparty.jars" dir="../../lib">
+ <include name="xercesImpl-2.8.1.jar"/>
+ <include name="xml-apis-1.3.03.jar"/>
+ <include name="jaxb-impl-2.1.5.jar"/>
+ <include name="dwr-2.0.1.jar"/>
+ <include name="axiom-api-1.2.5.jar"/>
+ <include name="servlet-api-2.3.jar"/>
+ <include name="cglib-nodep-2.1_3.jar"/>
+ <include name="jaxb-api-2.1.jar"/>
+ <include name="commons-logging-1.1.jar"/>
+ <include name="logkit-1.0.1.jar"/>
+ <include name="saaj-api-1.3.jar"/>
+ <include name="jsr250-api-1.0.jar"/>
+ <include name="xalan-2.7.0.jar"/>
+ <include name="geronimo-commonj_1.1_spec-1.0.jar"/>
+ <include name="jaxws-api-2.1.jar"/>
+ <include name="stax-api-1.0-2.jar"/>
+ <include name="jaxen-1.1-beta-9.jar"/>
+ <include name="jaxb2-reflection-2.1.4.jar"/>
+ <include name="axiom-impl-1.2.5.jar"/>
+ <include name="neethi-2.0.2.jar"/>
+ <include name="activation-1.1.jar"/>
+ <include name="avalon-framework-4.1.3.jar"/>
+ <include name="log4j-1.2.12.jar"/>
+ <include name="mail-1.4.jar"/>
+ <include name="jsr181-api-1.0-MR1.jar"/>
+ <include name="wstx-asl-3.2.1.jar"/>
+ <include name="stax-api-1.0.1.jar"/>
+ </fileset>
+
</project>
Modified: incubator/tuscany/java/sca/samples/chat-webapp/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/chat-webapp/pom.xml?rev=607882&r1=607881&r2=607882&view=diff
==============================================================================
--- incubator/tuscany/java/sca/samples/chat-webapp/pom.xml (original)
+++ incubator/tuscany/java/sca/samples/chat-webapp/pom.xml Tue Jan 1 10:02:27 2008
@@ -62,6 +62,20 @@
<build>
<finalName>${artifactId}</finalName>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-maven-ant-generator</artifactId>
+ <version>1.1-incubating-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
</build>
</project>
Modified: incubator/tuscany/java/sca/samples/feed-aggregator-webapp/build.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/feed-aggregator-webapp/build.xml?rev=607882&r1=607881&r2=607882&view=diff
==============================================================================
--- incubator/tuscany/java/sca/samples/feed-aggregator-webapp/build.xml (original)
+++ incubator/tuscany/java/sca/samples/feed-aggregator-webapp/build.xml Tue Jan 1 10:02:27 2008
@@ -14,101 +14,105 @@
* "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.
+ * under the License.
-->
-<project name="sample-feed-aggregator-webapp" default="package">
- <property file="${user.home}/tuscany/build.properties" />
- <property file="${user.home}/build.properties" />
+<project name="sample-feed-aggregator-webapp" default="compile">
- <property name="tuscany.sca.manifest.location" value="../../lib/tuscany-sca-manifest.jar"/>
- <property name="tuscany.sca.lib.location" value="../../lib"/>
- <property name="tuscany.sca.modules.location" value="../../modules"/>
-
- <path id="project.classpath">
- <pathelement path="target/classes"/>
- <pathelement location="${tuscany.sca.manifest.location}"/>
- </path>
-
- <target name="init">
+ <target name="compile">
<mkdir dir="target/classes"/>
- </target>
-
-
- <target name="compile" depends="init">
- <javac destdir="target/classes"
- debug="on"
- source="1.5"
- target="1.5">
- <src location="src/main/java"/>
- <classpath refid="project.classpath"/>
- </javac>
+ <javac destdir="target/classes" debug="on" source="1.5" target="1.5">
+ <src path="src\main\java"/>
+ <classpath>
+ <fileset refid="tuscany.jars"/>
+ <fileset refid="3rdparty.jars"/>
+ </classpath>
+ </javac>
<copy todir="target/classes">
- <fileset dir="src/main/resources"/>
+ <fileset dir="src\main\resources"/>
+ <fileset dir="." includes="*" excludes="src, target, pom.xml, build.xml"/>
</copy>
- </target>
-
- <target name="package" depends="compile">
- <war destfile="target/sample-feed-aggregator-webapp.war"
- webxml="src/main/webapp/WEB-INF/web.xml">
- <fileset dir="src/main/webapp"/>
- <zipfileset dir="${tuscany.sca.modules.location}" prefix="WEB-INF/lib">
- <include name="tuscany-interface-java-xml-1.0-incubating.jar"/>
- <include name="tuscany-policy-1.0-incubating.jar"/>
- <include name="tuscany-implementation-java-xml-1.0-incubating.jar"/>
- <include name="tuscany-domain-api-1.0-incubating.jar"/>
- <include name="tuscany-interface-java-1.0-incubating.jar"/>
- <include name="tuscany-contribution-java-1.0-incubating.jar"/>
- <include name="tuscany-core-spi-1.0-incubating.jar"/>
- <include name="tuscany-core-databinding-1.0-incubating.jar"/>
- <include name="tuscany-binding-sca-1.0-incubating.jar"/>
- <include name="tuscany-host-webapp-1.0-incubating.jar"/>
- <include name="tuscany-contribution-impl-1.0-incubating.jar"/>
- <include name="tuscany-assembly-xsd-1.0-incubating.jar"/>
- <include name="tuscany-definitions-1.0-incubating.jar"/>
- <include name="tuscany-databinding-1.0-incubating.jar"/>
- <include name="tuscany-contribution-namespace-1.0-incubating.jar"/>
- <include name="tuscany-binding-sca-xml-1.0-incubating.jar"/>
- <include name="tuscany-implementation-java-1.0-incubating.jar"/>
- <include name="tuscany-policy-xml-1.0-incubating.jar"/>
- <include name="tuscany-node-api-1.0-incubating.jar"/>
- <include name="tuscany-node-1.0-incubating.jar"/>
- <include name="tuscany-host-embedded-1.0-incubating.jar"/>
- <include name="tuscany-contribution-1.0-incubating.jar"/>
- <include name="tuscany-core-1.0-incubating.jar"/>
- <include name="tuscany-domain-1.0-incubating.jar"/>
- <include name="tuscany-sca-api-1.0-incubating.jar"/>
- <include name="tuscany-host-http-1.0-incubating.jar"/>
- <include name="tuscany-interface-1.0-incubating.jar"/>
-
- </zipfileset>
- <lib dir="${tuscany.sca.lib.location}">
- <include name="geronimo-commonj_1.1_spec-1.0.jar"/>
- <include name="sca-api-1.0-incubating.jar"/>
- <include name="axiom-impl-1.2.5.jar"/>
- <include name="xml-apis-1.0.b2.jar"/>
- <include name="stax-api-1.0.1.jar"/>
- <include name="xalan-2.7.0.jar"/>
- <include name="commons-httpclient-3.0.1.jar"/>
- <include name="axiom-api-1.2.5.jar"/>
- <include name="neethi-2.0.2.jar"/>
- <include name="sca-definitions-1.0-incubating.jar"/>
- <include name="rome-0.9.jar"/>
- <include name="cglib-nodep-2.1_3.jar"/>
- <include name="commons-logging-1.0.3.jar"/>
- <include name="xercesImpl-2.6.2.jar"/>
- <include name="wstx-asl-3.2.1.jar"/>
- <include name="commons-codec-1.2.jar"/>
- <include name="jaxen-1.1-beta-9.jar"/>
- <include name="jdom-1.0.jar"/>
-
- </lib>
+ <war destfile="target/sample-feed-aggregator-webapp.war" webxml="src/main/webapp/WEB-INF/web.xml">
+ <fileset dir="src/main/webapp"/>
+ <lib refid="tuscany.jars"/>
+ <lib refid="3rdparty.jars"/>
<classes dir="target/classes"/>
</war>
- </target>
-
+ </target>
+
<target name="clean">
- <delete quiet="true" includeemptydirs="true">
+ <delete includeemptydirs="true">
<fileset dir="target"/>
</delete>
</target>
+
+ <fileset id="tuscany.jars" dir="../../modules">
+ <include name="tuscany-core-spi-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-host-http-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-policy-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-implementation-java-runtime-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-node-api-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-contribution-namespace-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-assembly-xsd-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-assembly-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-core-databinding-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-policy-xml-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-sca-api-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-policy-logging-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-definitions-xml-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-contribution-java-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-databinding-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-policy-security-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-assembly-xml-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-domain-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-interface-java-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-contribution-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-implementation-java-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-domain-api-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-binding-sca-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-binding-feed-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-implementation-java-xml-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-host-webapp-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-binding-sca-xml-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-core-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-databinding-jaxb-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-node-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-contribution-impl-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-definitions-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-host-embedded-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-interface-java-xml-1.1-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-interface-1.1-incubating-SNAPSHOT.jar"/>
+ </fileset>
+ <fileset id="3rdparty.jars" dir="../../lib">
+ <include name="xercesImpl-2.8.1.jar"/>
+ <include name="commons-codec-1.3.jar"/>
+ <include name="xml-apis-1.3.03.jar"/>
+ <include name="jaxb-impl-2.1.5.jar"/>
+ <include name="jdom-1.0.jar"/>
+ <include name="axiom-api-1.2.5.jar"/>
+ <include name="servlet-api-2.3.jar"/>
+ <include name="jaxb-api-2.1.jar"/>
+ <include name="cglib-nodep-2.1_3.jar"/>
+ <include name="commons-logging-1.1.jar"/>
+ <include name="logkit-1.0.1.jar"/>
+ <include name="saaj-api-1.3.jar"/>
+ <include name="commons-httpclient-3.0.1.jar"/>
+ <include name="jsr250-api-1.0.jar"/>
+ <include name="xalan-2.7.0.jar"/>
+ <include name="geronimo-commonj_1.1_spec-1.0.jar"/>
+ <include name="jaxws-api-2.1.jar"/>
+ <include name="stax-api-1.0-2.jar"/>
+ <include name="jaxen-1.1-beta-9.jar"/>
+ <include name="rome-0.9.jar"/>
+ <include name="jaxb2-reflection-2.1.4.jar"/>
+ <include name="axiom-impl-1.2.5.jar"/>
+ <include name="neethi-2.0.2.jar"/>
+ <include name="activation-1.1.jar"/>
+ <include name="avalon-framework-4.1.3.jar"/>
+ <include name="log4j-1.2.12.jar"/>
+ <include name="mail-1.4.jar"/>
+ <include name="jsr181-api-1.0-MR1.jar"/>
+ <include name="wstx-asl-3.2.1.jar"/>
+ <include name="stax-api-1.0.1.jar"/>
+ </fileset>
+
</project>
Modified: incubator/tuscany/java/sca/samples/feed-aggregator-webapp/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/feed-aggregator-webapp/pom.xml?rev=607882&r1=607881&r2=607882&view=diff
==============================================================================
--- incubator/tuscany/java/sca/samples/feed-aggregator-webapp/pom.xml (original)
+++ incubator/tuscany/java/sca/samples/feed-aggregator-webapp/pom.xml Tue Jan 1 10:02:27 2008
@@ -23,7 +23,7 @@
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-sca</artifactId>
<version>1.1-incubating-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>sample-feed-aggregator-webapp</artifactId>
<packaging>war</packaging>
@@ -55,7 +55,7 @@
<artifactId>tuscany-binding-feed</artifactId>
<version>1.1-incubating-SNAPSHOT</version>
<scope>compile</scope>
- </dependency>
+ </dependency>
<dependency>
<groupId>junit</groupId>
@@ -68,6 +68,20 @@
<build>
<finalName>${artifactId}</finalName>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-maven-ant-generator</artifactId>
+ <version>1.1-incubating-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
</build>
</project>
Modified: incubator/tuscany/java/sca/samples/helloworld-dojo-webapp/build.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/helloworld-dojo-webapp/build.xml?rev=607882&r1=607881&r2=607882&view=diff
==============================================================================
--- incubator/tuscany/java/sca/samples/helloworld-dojo-webapp/build.xml (original)
+++ incubator/tuscany/java/sca/samples/helloworld-dojo-webapp/build.xml Tue Jan 1 10:02:27 2008
@@ -16,89 +16,53 @@
* specific language governing permissions and limitations
* under the License.
-->
-<project name="helloworld-dojo-webapp" default="package">
- <property name="settings.localRepository" value="./target/repo" />
- <property name="artifactId" value="sample-helloworld-dojo-webapp" />
+<!DOCTYPE project [
+<!ENTITY buildDependency SYSTEM "build-dependency.xml">
+]>
+
+<project name="sample-helloworld-dojo-webapp" default="compile">
- <target name="init">
- <mkdir dir="target/classes"/>
- </target>
+ &buildDependency;
- <target name="compile" depends="init">
- <javac srcdir="src/main/java"
- destdir="target/classes"
- debug="on"
- source="1.5"
- target="1.5">
+ <target name="compile">
+ <mkdir dir="target/classes"/>
+ <javac destdir="target/classes" debug="on" source="1.5" target="1.5">
+ <src path="src\main\java"/>
<classpath>
- <pathelement location="../../lib/tuscany-sca-manifest.jar"/>
+ <fileset refid="tuscany.jars"/>
+ <fileset refid="3rdparty.jars"/>
</classpath>
- </javac>
+ </javac>
<copy todir="target/classes">
- <fileset dir="src/main/resources"/>
+ <fileset dir="src\main\resources"/>
+ <fileset dir="src\main\resources"/>
</copy>
- </target>
-
- <target name="package" depends="compile">
+
<ant antfile="./build-dojo.xml" target="install-dojo-nomaven">
- <property name="localRepository" value="${settings.localRepository}"/>
+ <property name="localRepository" value="./target/repo"/>
</ant>
<ant antfile="./build-dojo.xml" target="unpack-dojo-files">
- <property name="localRepository" value="${settings.localRepository}"/>
- <property name="artifactId" value="${artifactId}"/>
- </ant>
-
- <war destfile="target/sample-helloworld-dojo-webapp.war"
- webxml="src/main/webapp/WEB-INF/web.xml">
+ <property name="localRepository" value="./target/repo"/>
+ </ant>
+
+ <war destfile="target/sample-helloworld-dojo-webapp.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.91-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-assembly-0.91-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-assembly-xml-0.91-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-binding-jsonrpc-0.91-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-contribution-0.91-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-contribution-impl-0.91-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-core-0.91-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-core-databinding-0.91-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-core-spi-0.91-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-databinding-0.91-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-extension-helper-0.91-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-host-embedded-0.91-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-host-http-0.91-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-host-webapp-0.91-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-implementation-java-0.91-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-implementation-java-runtime-0.91-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-implementation-java-xml-0.91-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-interface-0.91-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-interface-java-0.91-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-interface-java-xml-0.91-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-interface-wsdl-0.91-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-interface-wsdl-xml-0.91-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-policy-0.91-incubating-SNAPSHOT.jar"/>
- </zipfileset>
- <lib dir="../../lib">
- <include name="json-rpc-1.0.jar"/>
- <include name="stax-api-1.0.1.jar"/>
- <include name="wsdl4j-1.6.2.jar"/>
- <include name="wstx-asl-3.2.0.jar"/>
- <include name="XmlSchema-1.3.1.jar"/>
- <include name="**/../../modules/*.jar"/>
- </lib>
+ <lib refid="tuscany.jars"/>
+ <lib refid="3rdparty.jars"/>
<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>
-
+ <property name="localRepository" value="./target/repo"/>
+ </ant>
+ </target>
-
<target name="clean">
- <delete quiet="true" includeemptydirs="true">
+ <delete includeemptydirs="true">
<fileset dir="target"/>
</delete>
</target>
+
+
</project>
Modified: incubator/tuscany/java/sca/samples/helloworld-dojo-webapp/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/helloworld-dojo-webapp/pom.xml?rev=607882&r1=607881&r2=607882&view=diff
==============================================================================
--- incubator/tuscany/java/sca/samples/helloworld-dojo-webapp/pom.xml (original)
+++ incubator/tuscany/java/sca/samples/helloworld-dojo-webapp/pom.xml Tue Jan 1 10:02:27 2008
@@ -67,68 +67,81 @@
</dependencies>
<build>
- <finalName>${artifactId}</finalName>
- <plugins>
+ <finalName>${artifactId}</finalName>
+ <plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <!-- version>1.1</version -->
-
- <dependencies>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant-trax</artifactId>
- <version>1.6.5</version>
- </dependency>
- </dependencies>
-
- <executions>
- <execution>
- <id>install-dojo</id>
- <phase>validate</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <ant antfile="./build-dojo.xml" target="install-dojo">
- <property name="localRepository" value="${settings.localRepository}"/>
- </ant>
- </tasks>
- </configuration>
- </execution>
- <execution>
- <id>copy-dojo-files</id>
- <phase>generate-resources</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <ant antfile="./build-dojo.xml" target="unpack-dojo-files">
- <property name="localRepository" value="${settings.localRepository}"/>
- <property name="artifactId" value="${artifactId}"/>
- </ant>
- </tasks>
- </configuration>
- </execution>
- <execution>
- <id>clean-dojo-files</id>
- <phase>clean</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <ant antfile="./build-dojo.xml" target="clean-dojo-files">
- <property name="localRepository" value="${settings.localRepository}"/>
- <property name="artifactId" value="${artifactId}"/>
- </ant>
- </tasks>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <!-- version>1.1</version -->
+ <dependencies>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant-trax</artifactId>
+ <version>1.6.5</version>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>install-dojo</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <ant antfile="./build-dojo.xml" target="install-dojo">
+ <property name="localRepository" value="${settings.localRepository}"/>
+ </ant>
+ </tasks>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-dojo-files</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <ant antfile="./build-dojo.xml" target="unpack-dojo-files">
+ <property name="localRepository" value="${settings.localRepository}"/>
+ <property name="artifactId" value="${artifactId}"/>
+ </ant>
+ </tasks>
+ </configuration>
+ </execution>
+ <execution>
+ <id>clean-dojo-files</id>
+ <phase>clean</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <ant antfile="./build-dojo.xml" target="clean-dojo-files">
+ <property name="localRepository" value="${settings.localRepository}"/>
+ <property name="artifactId" value="${artifactId}"/>
+ </ant>
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-maven-ant-generator</artifactId>
+ <version>1.1-incubating-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <configuration>
+ <buildDependencyFileOnly>true</buildDependencyFileOnly>
+ </configuration>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
</build>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org