4:13 a.m.
Author: alex.guizar(a)jboss.com
Date: 2009-11-05 05:13:45 -0500 (Thu, 05 Nov 2009)
New Revision: 228
Modified:
trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_atm/build.xml
trunk/samples/quickstart/atm/build.xml
Log:
RIFTSAW-34 fork javac and fix newlines in build files
Modified:
trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_atm/build.xml
===================================================================
---
trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_atm/build.xml 2009-11-05
09:17:48 UTC (rev 227)
+++
trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_atm/build.xml 2009-11-05
10:13:45 UTC (rev 228)
@@ -1,49 +1,49 @@
<project name="Quickstart_bpel_atm" default="deploy"
basedir=".">
-
- <description>
- ${ant.project.name}
- </description>
-
- <property name="version" value="1" />
-
- <property name="deploy.dir" value="${basedir}/target/tests"
/>
- <property name="test.dir"
value="${basedir}/src/test/resources/samples/${ant.project.name}" />
-
- <property name="sample.jar.name"
value="${ant.project.name}-${version}.jar" />
-
- <property name="war.build.dir"
location="${deploy.dir}/${ant.project.name}/build/war/classes" />
-
- <path id="compile-classpath">
- <!-- Required for JMS Client Code. -->
- <fileset dir="${org.jboss.esb.server.home}/client"
includes="*.jar" />
- </path>
-
- <target name="deploywar" description="make war">
- <!-- Compile... -->
- <mkdir dir="${war.build.dir}" />
-
- <javac srcdir="${test.dir}/war/src" destdir="${war.build.dir}"
target="1.5" debug="true">
- <classpath refid="compile-classpath" />
- </javac>
-
- <!-- War... -->
- <war warfile="${deploy.dir}/${ant.project.name}/${ant.project.name}.war"
webxml="${test.dir}/war/resources/WEB-INF/web.xml">
- <classes dir="${war.build.dir}" />
- </war>
+
+ <description>
+ ${ant.project.name}
+ </description>
+
+ <property name="version" value="1" />
+
+ <property name="deploy.dir" value="${basedir}/target/tests"
/>
+ <property name="test.dir"
value="${basedir}/src/test/resources/samples/${ant.project.name}" />
+
+ <property name="sample.jar.name"
value="${ant.project.name}-${version}.jar" />
+
+ <property name="war.build.dir"
location="${deploy.dir}/${ant.project.name}/build/war/classes" />
+
+ <path id="compile-classpath">
+ <!-- Required for JMS Client Code. -->
+ <fileset dir="${org.jboss.esb.server.home}/client"
includes="*.jar" />
+ </path>
+
+ <target name="deploywar" description="make war">
+ <!-- Compile... -->
+ <mkdir dir="${war.build.dir}" />
+
+ <javac fork="yes" srcdir="${test.dir}/war/src"
destdir="${war.build.dir}" target="1.5" debug="true">
+ <classpath refid="compile-classpath" />
+ </javac>
+
+ <!-- War... -->
+ <war warfile="${deploy.dir}/${ant.project.name}/${ant.project.name}.war"
webxml="${test.dir}/war/resources/WEB-INF/web.xml">
+ <classes dir="${war.build.dir}" />
+ </war>
</target>
-
- <target name="undeploywar">
- <delete file="${deploy.dir}/${ant.project.name}/${ant.project.name}.war"
/>
- </target>
-
- <target name="deploy" depends="deploywar">
- <echo>Deploy ${ant.project.name}</echo>
- <jar basedir="${test.dir}/bpel"
destfile="${deploy.dir}/${ant.project.name}/${sample.jar.name}" />
- </target>
-
- <target name="undeploy" depends="undeploywar">
- <echo>Undeploy ${ant.project.name}</echo>
- <delete file="${deploy.dir}/${ant.project.name}/${sample.jar.name}" />
- </target>
-
-</project>
+
+ <target name="undeploywar">
+ <delete file="${deploy.dir}/${ant.project.name}/${ant.project.name}.war"
/>
+ </target>
+
+ <target name="deploy" depends="deploywar">
+ <echo>Deploy ${ant.project.name}</echo>
+ <jar basedir="${test.dir}/bpel"
destfile="${deploy.dir}/${ant.project.name}/${sample.jar.name}" />
+ </target>
+
+ <target name="undeploy" depends="undeploywar">
+ <echo>Undeploy ${ant.project.name}</echo>
+ <delete file="${deploy.dir}/${ant.project.name}/${sample.jar.name}" />
+ </target>
+
+</project>
Modified: trunk/samples/quickstart/atm/build.xml
===================================================================
--- trunk/samples/quickstart/atm/build.xml 2009-11-05 09:17:48 UTC (rev 227)
+++ trunk/samples/quickstart/atm/build.xml 2009-11-05 10:13:45 UTC (rev 228)
@@ -1,60 +1,60 @@
-<project name="Quickstart_bpel_atm" default="deploy"
basedir=".">
-
- <description>
- ${ant.project.name}
- </description>
-
- <!-- Import the base Ant build script... -->
- <property file="../../../install/deployment.properties" />
-
- <property name="version" value="1" />
-
- <property name="server.dir"
value="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}"
/>
- <property name="conf.dir" value="${server.dir}/conf" />
- <property name="deploy.dir" value="${server.dir}/deploy" />
- <property name="server.lib.dir" value="${server.dir}/lib" />
-
- <property name="sample.jar.name"
value="${ant.project.name}-${version}.jar" />
- <property name="war.build.dir" location="build/war/classes"
/>
-
- <path id="compile-classpath">
- <!-- Required for JMS Client Code. -->
- <fileset dir="${org.jboss.esb.server.home}/client"
includes="*.jar" />
- </path>
- <property name="compile-classpath" refid="compile-classpath"
/>
-
- <target name="makewar" description="make war">
- <!-- Compile... -->
- <mkdir dir="${war.build.dir}" />
- <javac srcdir="war/src" destdir="${war.build.dir}"
target="1.5" debug="true">
- <classpath refid="compile-classpath" />
- </javac>
- <copy todir="${war.build.dir}">
- <fileset dir="war/src" includes="**/*.xml" />
- </copy>
-
- <!-- War... -->
- <war warfile="build/${ant.project.name}.war"
webxml="${basedir}/war/resources/WEB-INF/web.xml">
- <classes dir="${war.build.dir}" />
- </war>
- </target>
-
- <target name="deploywar" depends="makewar">
- <copy todir="${deploy.dir}" file="build/${ant.project.name}.war"
/>
+<project name="Quickstart_bpel_atm" default="deploy"
basedir=".">
+
+ <description>
+ ${ant.project.name}
+ </description>
+
+ <!-- Import the base Ant build script... -->
+ <property file="../../../install/deployment.properties" />
+
+ <property name="version" value="1" />
+
+ <property name="server.dir"
value="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}"
/>
+ <property name="conf.dir" value="${server.dir}/conf" />
+ <property name="deploy.dir" value="${server.dir}/deploy" />
+ <property name="server.lib.dir" value="${server.dir}/lib" />
+
+ <property name="sample.jar.name"
value="${ant.project.name}-${version}.jar" />
+ <property name="war.build.dir" location="build/war/classes"
/>
+
+ <path id="compile-classpath">
+ <!-- Required for JMS Client Code. -->
+ <fileset dir="${org.jboss.esb.server.home}/client"
includes="*.jar" />
+ </path>
+ <property name="compile-classpath" refid="compile-classpath"
/>
+
+ <target name="makewar" description="make war">
+ <!-- Compile... -->
+ <mkdir dir="${war.build.dir}" />
+ <javac srcdir="war/src" destdir="${war.build.dir}"
target="1.5" debug="true">
+ <classpath refid="compile-classpath" />
+ </javac>
+ <copy todir="${war.build.dir}">
+ <fileset dir="war/src" includes="**/*.xml" />
+ </copy>
+
+ <!-- War... -->
+ <war warfile="build/${ant.project.name}.war"
webxml="${basedir}/war/resources/WEB-INF/web.xml">
+ <classes dir="${war.build.dir}" />
+ </war>
</target>
-
- <target name="undeploywar">
- <delete file="${deploy.dir}/${ant.project.name}.war" />
- </target>
-
- <target name="deploy" depends="deploywar">
- <echo>Deploy ${ant.project.name}</echo>
- <jar basedir="bpel" destfile="${deploy.dir}/${sample.jar.name}"
/>
- </target>
-
- <target name="undeploy" depends="undeploywar">
- <echo>Undeploy ${ant.project.name}</echo>
- <delete file="${deploy.dir}/${sample.jar.name}" />
- </target>
-
-</project>
+
+ <target name="deploywar" depends="makewar">
+ <copy todir="${deploy.dir}" file="build/${ant.project.name}.war"
/>
+ </target>
+
+ <target name="undeploywar">
+ <delete file="${deploy.dir}/${ant.project.name}.war" />
+ </target>
+
+ <target name="deploy" depends="deploywar">
+ <echo>Deploy ${ant.project.name}</echo>
+ <jar basedir="bpel" destfile="${deploy.dir}/${sample.jar.name}"
/>
+ </target>
+
+ <target name="undeploy" depends="undeploywar">
+ <echo>Undeploy ${ant.project.name}</echo>
+ <delete file="${deploy.dir}/${sample.jar.name}" />
+ </target>
+
+</project>