You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by ri...@apache.org on 2006/05/12 23:44:07 UTC
svn commit: r405891 -
/incubator/tuscany/java/distribution/tomcat-overlay/configureTomcat.xml
Author: rineholt
Date: Fri May 12 14:44:06 2006
New Revision: 405891
URL: http://svn.apache.org/viewcvs?rev=405891&view=rev
Log:
for raymond
Modified:
incubator/tuscany/java/distribution/tomcat-overlay/configureTomcat.xml
Modified: incubator/tuscany/java/distribution/tomcat-overlay/configureTomcat.xml
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/distribution/tomcat-overlay/configureTomcat.xml?rev=405891&r1=405890&r2=405891&view=diff
==============================================================================
--- incubator/tuscany/java/distribution/tomcat-overlay/configureTomcat.xml (original)
+++ incubator/tuscany/java/distribution/tomcat-overlay/configureTomcat.xml Fri May 12 14:44:06 2006
@@ -53,9 +53,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.sca.samples.dir" value='../../sca/samples' />
- <property name="tuscany.acceptance.samples.dir" value='../../samples' />
- <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 +70,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 +96,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 +136,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"/>
@@ -179,7 +176,7 @@
<antcall target="tuscany.tomcat.unzipUnix" /> <!-- just use unix for now -->
</target>
- <target name="prepareTomcat" depends='tuscany.tomcat.unzipWindows,tuscany.tomcat.unzipUnix,tuscany.tomcat.unzipMac,tuscany.tomcat.fixup,tuscany.deploy.samples' description='Unzip tomcat, fix it up, and deploy samples'>
+ <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/" />
@@ -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" />
@@ -374,5 +371,3 @@
</target>
</project>
-
-