You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2006/05/13 09:45:56 UTC
svn commit: r406037 - in /incubator/tuscany/java/testing/tomcat: build.xml
pom.xml
Author: jsdelfino
Date: Sat May 13 00:45:56 2006
New Revision: 406037
URL: http://svn.apache.org/viewcvs?rev=406037&view=rev
Log:
Fix for TUSCANY-362, applied patch from Raymond
Modified:
incubator/tuscany/java/testing/tomcat/build.xml
incubator/tuscany/java/testing/tomcat/pom.xml
Modified: incubator/tuscany/java/testing/tomcat/build.xml
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/testing/tomcat/build.xml?rev=406037&r1=406036&r2=406037&view=diff
==============================================================================
--- incubator/tuscany/java/testing/tomcat/build.xml (original)
+++ incubator/tuscany/java/testing/tomcat/build.xml Sat May 13 00:45:56 2006
@@ -14,7 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project name="setup tomcat " default="prepareTomcat" basedir='.'>
+<project name="setup tomcat" default="prepareTomcat" basedir='.'>
<property environment="env" />
<property file="${user.home}/tuscany/build.properties" />
<property file="${user.home}/build.properties" />
@@ -33,8 +33,9 @@
<condition property="ant.home" value="${env.ANT_HOME}">
<os family="unix"/>
</condition>
- <property name="tuscany.acceptance.tc.dir" value='target/apache-tomcat-${tuscany.acceptance.tomcat.version}' />
- <property name="tuscany.acceptance.target.dir" value='target' />
+
+ <property name="tuscany.acceptance.tc.dir" value='${target.dir}/apache-tomcat-${tuscany.acceptance.tomcat.version}' />
+ <property name="tuscany.acceptance.target.dir" value='${target.dir}' />
<property name="tuscany.acceptance.groupId" value='org/apache/tuscany' />
<property name="tuscany.acceptance.version" value='SNAPSHOT' />
@@ -53,9 +54,9 @@
<property name="tuscany.acceptance.bindings" value='org/apache/tuscany/sca/bindings' />
<property name="tuscany.acceptance.containers" value='org/apache/tuscany/sca/containers' />
<property name="tuscany.acceptance.databindings" value='org/apache/tuscany/databinding' />
- <property name="tuscany.acceptance.samples" value='../../samples' />
- <property name="tuscany.acceptance.sampleapps" value='../../sampleapps' />
- <property name="tuscany.acceptance.interop.dir" value='../interop' />
+ <property name="tuscany.acceptance.sca.samples.dir" value='../../samples' />
+ <property name="tuscany.acceptance.samples.dir" value='../../sampleapps' />
+ <property name="tuscany.acceptance.interop.dir" value='../../testing/interop' />
<!-- property name="tuscany.maven.repos.dir" value='${user.home}\.maven\repository' / -->
<!-- change for maven 2.0 -->
<property name="tuscany.maven.repos.dir" value='${user.home}\.m2\repository' />
@@ -70,6 +71,7 @@
</condition>
<patternset id="tuscany.acceptance.common.dependencies">
+ <include name="**/stax/stax-api/1.0/stax-api-1.0.jar"/>
<include name="**/woodstox/wstx-asl/2.9.3/wstx-asl-2.9.3.jar" />
</patternset>
@@ -95,14 +97,12 @@
<include name="**/${tuscany.acceptance.groupId}/tuscany-model/${tuscany.acceptance.version}/tuscany-model-${tuscany.acceptance.version}.jar" />
<include name="**/wsdl4j/wsdl4j/1.5.2/wsdl4j-1.5.2.jar"/>
- <include name="**/stax/stax-api/1.0/stax-api-1.0.jar" />
<include name="**/org/apache/geronimo/geronimo-connector/1.0/geronimo-connector-1.0.jar" />
<include name="**/org/apache/geronimo/specs/geronimo-j2ee-connector_1.5_spec/1.0/geronimo-j2ee-connector_1.5_spec-1.0.jar" />
<include name="**/org/apache/geronimo/specs/geronimo-jta_1.0.1B_spec/1.0/geronimo-jta_1.0.1B_spec-1.0.jar" />
<include name="**/org/apache/geronimo/geronimo-transaction/1.0/geronimo-transaction-1.0.jar" />
<include name="**/concurrent/concurrent/1.3.4/concurrent-1.3.4.jar" />
<include name="**/asm/asm/2.2/asm-2.2.jar" />
- <include name="**/stax/stax-api/1.0/stax-api-1.0.jar" />
<include name="**/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar" />
</patternset>
@@ -137,10 +137,8 @@
<include name="**/org/springframework/spring-beans/1.2.5/spring-beans-1.2.5.jar"/>
<include name="**/org/springframework/spring-core/1.2.5/spring-core-1.2.5.jar"/>
<include name="**/regexp/regexp/1.3/regexp-1.3.jar"/>
- <include name="**/stax/stax-api/1.0/stax-api-1.0.jar"/>
<include name="**/velocity/velocity-dep/1.4/velocity-dep-1.4.jar"/>
<include name="**/velocity/velocity/1.4/velocity-1.4.jar"/>
- <include name="**/woodstox/wstx-asl/2.9.3/wstx-asl-2.9.3.jar"/>
<include name="**/wsdl4j/wsdl4j/1.5.2/wsdl4j-1.5.2.jar"/>
<include name="**/org/apache/geronimo/specs/geronimo-activation_1.0.2_spec/1.0/geronimo-activation_1.0.2_spec-1.0.jar"/>
@@ -182,7 +180,6 @@
<target name="prepareTomcat" depends='tuscany.tomcat.unzipWindows,tuscany.tomcat.unzipUnix,tuscany.tomcat.unzipMac,tuscany.tomcat.fixup,tuscany.deploy.samples,tuscany.deploy.interop' description='Unzip tomcat, fix it up, and deploy samples'>
<dirname property='tuscany.acceptance.tc.dir.full' file="${tuscany.acceptance.tc.dir}/bin" />
<echo level="info" message="Tomcat fixed up here: ${tuscany.acceptance.tc.dir.full}" />
- <echo level="info" message="http://localhost:8080/helloworldweb-SNAPSHOT/" />
</target>
<target name="startTestServer" depends='prepareTomcat' description='start server prepared to run tests'>
@@ -208,7 +205,7 @@
<patternset refid="tuscany.acceptance.tc.specsdoimpl" />
</fileset>
<fileset dir="${tuscany.maven.repos.dir}">
- <patternset> <!-- for db2 and das support -->
+ <patternset> <!-- for Derby and DAS support -->
<include name="**/${tuscany.acceptance.groupId}/das/tuscany-das-rdb/${tuscany.acceptance.version}/tuscany-das-rdb-${tuscany.acceptance.version}.jar" />
<include name="**/org/apache/derby/derby/10.1.2.1/derby-10.1.2.1.jar" />
</patternset>
@@ -216,12 +213,12 @@
<include name="**/metaparadigm/jsonrpc/1.0/jsonrpc-1.0.jar" />
</patternset>
</fileset>
+ <fileset dir="${tuscany.maven.repos.dir}">
+ <patternset refid="tuscany.acceptance.common.dependencies" />
+ </fileset>
</copy>
<copy todir="${tuscany.acceptance.tc.dir}/server/lib" flatten='true'>
<fileset dir="${tuscany.maven.repos.dir}">
- <patternset refid="tuscany.acceptance.common.dependencies" />
- </fileset>
- <fileset dir="${tuscany.maven.repos.dir}">
<patternset refid="tuscany.acceptance.sca.core" />
<patternset>
<include name="**/${tuscany.acceptance.groupId}/tuscany-tomcat/${tuscany.acceptance.version}/tuscany-tomcat-${tuscany.acceptance.version}.jar" />
@@ -241,10 +238,10 @@
<target name="tuscany.deploy.samples" description='Deploy tuscany sample wars to tomcat webapps.'>
<copy todir="${tuscany.acceptance.tc.dir}/webapps" flatten='true'>
- <fileset dir="${tuscany.acceptance.samples}">
+ <fileset dir="${tuscany.acceptance.sca.samples.dir}">
<include name="**/*.war" />
</fileset>
- <fileset dir="${tuscany.acceptance.sampleapps}">
+ <fileset dir="${tuscany.acceptance.samples.dir}">
<include name="**/*.war" />
</fileset>
</copy>
@@ -303,7 +300,7 @@
<target name="tuscany.tomcat.fixserverxml" depends='init,backup.server.xml' unless='tuscany.acceptance.tomcat.serverxmlorg.available'>
<property name="tuscany.acceptance.tomcat.serverxmlorg.available" value='true' />
- <xslt
+ <xslt processor="trax"
in="${tuscany.acceptance.tc.dir}/conf/server.xml.original"
style="server.xsl" out="${tuscany.acceptance.tc.dir}/conf/server.xml"
>
@@ -330,13 +327,14 @@
</exec>
</target>
<target name="startTomcatUnix" if="isUnix" unless='tuscany.tomcat.alreadystarted'>
+ <echo level="info" message="Starting Tomcat"/>
<exec spawn='true' vmlauncher="false" failonerror='false' dir="${tuscany.acceptance.tc.dir}/bin" executable="xterm" >
- <env key='CATALINA_HOME' value='${env.PWD}/${tuscany.acceptance.tc.dir}'/>
+ <env key='CATALINA_HOME' value='${tuscany.acceptance.tc.dir}'/>
<arg line="-e ./catalina.sh run"/>
</exec>
</target>
<target name="startTomcatMac" if="isMac" unless='tuscany.tomcat.alreadystarted' >
- <antcall target="startTomcatUnix" /> <!--just use unix for now -->
+ <antcall target="startTomcatUnix" />
</target>
<target name="tuscany.tomcat.alreadystartedmsg" if="tuscany.tomcat.alreadystarted">
@@ -352,7 +350,7 @@
</target>
<target name="clean" description='Clean out all built artifacts'>
- <delete dir="${tuscany.acceptance.target.dir}" />
+ <delete dir="${tuscany.acceptance.tc.dir}" />
</target>
<target name='setup.TC.antscripts' depends='tuscany.tomcat.unzipWindows,tuscany.tomcat.unzipUnix,tuscany.tomcat.unzipMac'>
@@ -374,3 +372,5 @@
</target>
</project>
+
+
Modified: incubator/tuscany/java/testing/tomcat/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/testing/tomcat/pom.xml?rev=406037&r1=406036&r2=406037&view=diff
==============================================================================
--- incubator/tuscany/java/testing/tomcat/pom.xml (original)
+++ incubator/tuscany/java/testing/tomcat/pom.xml Sat May 13 00:45:56 2006
@@ -82,6 +82,8 @@
<tasks>
<ant inheritRefs='true' antfile="build.xml" dir="${basedir}/.." target="startTestServer">
<property name="user.home" value="${user.home}" />
+ <property name="target.dir" value="${basedir}/../target" />
+
<!-- property name="tuscany.maven.repos.dir" value="${maven.local.repo}"/ -->
</ant>
</tasks>
@@ -95,7 +97,9 @@
<phase>clean</phase>
<configuration>
<tasks>
- <ant inheritRefs='true' antfile="build.xml" dir="${basedir}/.." target="clean" />
+ <ant inheritRefs='true' antfile="build.xml" dir="${basedir}/.." target="clean">
+ <property name="target.dir" value="${basedir}/target" />
+ </ant>
</tasks>
</configuration>
<goals>