You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by jb...@apache.org on 2006/02/08 21:57:59 UTC

svn commit: r376063 - in /incubator/tuscany/java/testing/tomcat: ./ bigbank/ build.xml helloworldaxis/ helloworldweb/ helloworldweb/pom.xml helloworldwebdas/ helloworldws/ pom.xml

Author: jboynes
Date: Wed Feb  8 12:57:44 2006
New Revision: 376063

URL: http://svn.apache.org/viewcvs?rev=376063&view=rev
Log:
root pom for acceptance plus pom for helloworldweb
tests do not currently pass due to failures in tomcat startup

Added:
    incubator/tuscany/java/testing/tomcat/helloworldweb/pom.xml   (with props)
    incubator/tuscany/java/testing/tomcat/pom.xml   (with props)
Modified:
    incubator/tuscany/java/testing/tomcat/   (props changed)
    incubator/tuscany/java/testing/tomcat/bigbank/   (props changed)
    incubator/tuscany/java/testing/tomcat/build.xml
    incubator/tuscany/java/testing/tomcat/helloworldaxis/   (props changed)
    incubator/tuscany/java/testing/tomcat/helloworldweb/   (props changed)
    incubator/tuscany/java/testing/tomcat/helloworldwebdas/   (props changed)
    incubator/tuscany/java/testing/tomcat/helloworldws/   (props changed)

Propchange: incubator/tuscany/java/testing/tomcat/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Feb  8 12:57:44 2006
@@ -0,0 +1,2 @@
+apache-tomcat-5.5.12.tar.gz
+target

Propchange: incubator/tuscany/java/testing/tomcat/bigbank/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Feb  8 12:57:44 2006
@@ -0,0 +1,13 @@
+target
+*.iws
+*.ipr
+*.iml
+.project
+.classpath
+maven.log
+velocity.log*
+junit*.properties
+.settings
+.deployables
+.wtpmodules
+

Modified: incubator/tuscany/java/testing/tomcat/build.xml
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/testing/tomcat/build.xml?rev=376063&r1=376062&r2=376063&view=diff
==============================================================================
--- incubator/tuscany/java/testing/tomcat/build.xml (original)
+++ incubator/tuscany/java/testing/tomcat/build.xml Wed Feb  8 12:57:44 2006
@@ -16,7 +16,6 @@
  -->
 <project name="setup tomcat " default="prepareTomcat" basedir='.'>
         <property environment="env" />
-        <property file="${user.home}/tuscany/build.properties" />
         <property file="${user.home}/build.properties" />
 
         <property name="tuscany.acceptance.tomcat.version" value='5.5.12' />
@@ -36,11 +35,11 @@
         <property name="tuscany.acceptance.target.dir" value='target' />
         <property name="tuscany.acceptance.scaspec.dir" value='../spec/sca' />
 
-        <property name="tuscany.acceptance.groupId" value='tuscany' />
+        <property name="tuscany.acceptance.groupId" value='osoa' />
         <property name="tuscany.acceptance.version" value='SNAPSHOT' />
 
-        <property name="tuscany.acceptance.samples.dir" value='../samples' />
-        <property name="tuscany.maven.repos.dir" value='${user.home}\.maven\repository' />
+        <property name="tuscany.acceptance.samples.dir" value='../../samples' />
+        <property name="tuscany.maven.repos.dir" value='${user.home}\.m2\repository' />
         <condition property="isWindows">
             <os family="windows"/>
         </condition>
@@ -52,6 +51,7 @@
         </condition>
 
         <target name="init">
+                <echo message="user.home = ${user.home}" />
                 <available property='tomcat.is.available' file='${tuscany.acceptance.tc.dir}/server/lib/catalina.jar' type='file' />
                 <available property='tuscany.acceptance.tomcat.zipped.available' file='${tuscany.acceptance.tomcat.zipped}' type='file' />
                 <available property='tuscany.acceptance.tomcat.serverxmlorg.available' file='${tuscany.acceptance.tc.dir}/conf/server.xml.original' />
@@ -68,39 +68,39 @@
         </target>
 
         <patternset id="tuscany.acceptance.tc.common">  <!--jars which need to go into tomcat common/lib  -->
-                <include name="**/${tuscany.acceptance.groupId}/jars/tuscany-binding-axis-${tuscany.acceptance.version}.jar" />
-                <include name="**/${tuscany.acceptance.groupId}/jars/tuscany-common-${tuscany.acceptance.version}.jar" />
-                <include name="**/${tuscany.acceptance.groupId}/jars/tuscany-container-java-${tuscany.acceptance.version}.jar" />
-                <include name="**/${tuscany.acceptance.groupId}/jars/tuscany-core-${tuscany.acceptance.version}.jar" />
-                <include name="**/${tuscany.acceptance.groupId}/jars/tuscany-model-${tuscany.acceptance.version}.jar" />
+                <include name="**/${tuscany.acceptance.groupId}/tuscany-binding-axis/${tuscany.acceptance.version}/tuscany-binding-axis-${tuscany.acceptance.version}.jar" />
+                <include name="**/${tuscany.acceptance.groupId}/tuscany-common/${tuscany.acceptance.version}/tuscany-common-${tuscany.acceptance.version}.jar" />
+                <include name="**/${tuscany.acceptance.groupId}/tuscany-container-java/${tuscany.acceptance.version}/tuscany-container-java-${tuscany.acceptance.version}.jar" />
+                <include name="**/${tuscany.acceptance.groupId}/tuscany-core/${tuscany.acceptance.version}/tuscany-core-${tuscany.acceptance.version}.jar" />
+                <include name="**/${tuscany.acceptance.groupId}/tuscany-model/${tuscany.acceptance.version}/tuscany-model-${tuscany.acceptance.version}.jar" />
         	    <!-- Kevin's mod to include DAS jar -->
-        	    <include name="**/${tuscany.acceptance.groupId}/jars/tuscany-das-jdbc-${tuscany.acceptance.version}.jar" />
+        	    <include name="**/${tuscany.acceptance.groupId}/tuscany-das-jdbc/${tuscany.acceptance.version}/tuscany-das-jdbc-${tuscany.acceptance.version}.jar" />
         </patternset>
         <patternset id="tuscany.acceptance.tc.server"> <!--jars which need to go into tomcat server/lib  -->
-                <include name="**/${tuscany.acceptance.groupId}/jars/tuscany-tomcat-${tuscany.acceptance.version}.jar" />
+                <include name="**/${tuscany.acceptance.groupId}/tuscany-tomcat/${tuscany.acceptance.version}/tuscany-tomcat-${tuscany.acceptance.version}.jar" />
         </patternset>
         <patternset id="tuscany.acceptance.dependencies">
-                <include name="**/axis/jars/axis-1.2.1.jar" />
-                <include name="**/axis/jars/axis-jaxrpc-1.2.1.jar" />
-                <include name="**/axis/jars/axis-saaj-1.2.1.jar" />
-                <include name="**/axis/jars/axis-wsdl4j-1.5.1.jar" />
-
-                <include name="**/commonj/jars/commonj-sdo-2.1.0.jar" />
-                <include name="**/commons-discovery/jars/commons-discovery-0.2.jar" />
-
-                <include name="**/eclipse/jars/emf-common-2.1.0.jar" />
-                <include name="**/eclipse/jars/emf-ecore-2.1.0.jar" />
-                <include name="**/eclipse/jars/emf-ecore-change-2.1.0.jar" />
-                <include name="**/eclipse/jars/emf-ecore-sdo-2.1.1.jar" />
-                <include name="**/eclipse/jars/emf-ecore-xmi-2.1.0.jar" />
-                <include name="**/eclipse/jars/wsdl-1.0.0.jar" />
-                <include name="**/eclipse/jars/xsd-2.1.1.jar" />
+                <include name="**/axis/1.2.1/axis-1.2.1.jar" />
+                <include name="**/axis-jaxrpc/1.2.1/axis-jaxrpc-1.2.1.jar" />
+                <include name="**/axis-saaj/1.2.1/axis-saaj-1.2.1.jar" />
+                <include name="**/axis-wsdl4j/1.5.1/axis-wsdl4j-1.5.1.jar" />
+
+                <include name="**/eclipse/emf/commonj-sdo/2.1.0/commonj-sdo-2.1.0.jar" />
+                <include name="**/commons-discovery/0.2/commons-discovery-0.2.jar" />
+
+                <include name="**/eclipse/emf/common/2.1.0/common-2.1.0.jar" />
+                <include name="**/eclipse/emf/ecore/2.1.0/ecore-2.1.0.jar" />
+                <include name="**/eclipse/emf/ecore-change/2.1.0/ecore-change-2.1.0.jar" />
+                <include name="**/eclipse/emf/ecore-sdo/2.1.1/ecore-sdo-2.1.1.jar" />
+                <include name="**/eclipse/emf/ecore-xmi/2.1.0/ecore-xmi-2.1.0.jar" />
+                <include name="**/eclipse/wtp/wsdl/1.0.0/wsdl-1.0.0.jar" />
+                <include name="**/eclipse/xsd/xsd/2.1.1/xsd-2.1.1.jar" />
 
-                <include name="**/commons-logging/jars/commons-logging-1.0.4.jar" />
-                <include name="**/commons-discovery/jars/commons-discovery-0.2.jar" />
+                <include name="**/commons-logging/1.0.4/commons-logging-1.0.4.jar" />
+                <include name="**/commons-discovery/0.2/commons-discovery-0.2.jar" />
 
                 <!-- Kevin's mod to include Derby jar -->
-        	    <include name="**/org.apache.derby/jars/derby-10.1.1.0.jar" />
+        	    <include name="**/org/apache/derby/10.1.2.1/derby-10.1.2.1.jar" />
         </patternset>
 
         <target name="tuscany.tomcat.unzipWindows" if="isWindows" depends='init,check.for.zip' description='Just unzip tomcat' unless='tomcat.is.available'>
@@ -133,7 +133,7 @@
                 <antcall target="startTomcat" />
                 <echo level="info" message="Tomcat fixed up here:  ${tuscany.acceptance.tc.dir.full}" />
                 <echo level="info" message="http://localhost:8080/tuscany-samples-helloworldWEB/" />
-                
+
         </target>
         <target name="tuscany.tomcat.fixup" depends='tuscany.tomcat.fixserverconfig' description='Fix up tomcat for tuscany.'>
                 <mkdir dir="${tuscany.acceptance.target.dir}" />
@@ -144,7 +144,7 @@
                         </fileset>
                         <fileset dir="${tuscany.maven.repos.dir}">
                                 <patternset>
-                                  <include name="**/org.osoa/jars/sca-api-${tuscany.acceptance.version}.jar" />
+                                  <include name="**/org/osoa/sca-api/${tuscany.acceptance.version}/sca-api-${tuscany.acceptance.version}.jar" />
                                 </patternset>
                         </fileset>
                         <fileset dir="${tuscany.maven.repos.dir}">
@@ -159,7 +159,14 @@
         </target>
 
         <target name="tuscany.deploy.samples" description='Deploy tuscany example wars to tomcat webapps.'>
-                <copy todir="${tuscany.acceptance.tc.dir}/webapps" flatten='true'>
+                <copy todir="${tuscany.acceptance.tc.dir}/webapps" flatten="true">
+                        <!--
+                            rename the destination war files to avoid Tomcat deployer
+                            expanding the wars into directories that include the version
+                            string
+                        -->
+                        <mapper type="regexp" from="^(.*)tuscany-samples-(.+)-SNAPSHOT\.war" to="tuscany-samples-\2\.war" />
+
                         <fileset dir="${tuscany.acceptance.samples.dir}">
                                 <include name="**/*.war" />
                         </fileset>
@@ -174,7 +181,7 @@
         <target name="tuscany.tomcat.fixserverconfig" depends='tuscany.tomcat.fixserverxml,tuscany.tomcat.fixcontextxml' description='Add listeners' />
         <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
                   in="${tuscany.acceptance.tc.dir}/conf/server.xml.original"
                       style="server.xsl" out="${tuscany.acceptance.tc.dir}/conf/server.xml"
@@ -184,7 +191,7 @@
         </target>
         <target name="tuscany.tomcat.fixcontextxml" depends='init,backup.context.xml'  unless='tuscany.acceptance.tomcat.contextxmlorg.available'>
                 <property name="tuscany.acceptance.tomcat.contextxmlorg.available" value='true' />
-                
+
                 <xslt
                   in="${tuscany.acceptance.tc.dir}/conf/context.xml.original"
                       style="context.xsl" out="${tuscany.acceptance.tc.dir}/conf/context.xml"
@@ -192,7 +199,7 @@
 
                  </xslt>
         </target>
-        
+
         <target name="startTomcatWindows" if="isWindows" unless='tuscany.tomcat.alreadystarted' >
                 <exec spawn='true' vmlauncher="false" failonerror='false' dir="${tuscany.acceptance.tc.dir}\bin" executable="cmd.exe" >
                         <arg line="/C start &quot; Tomcat running ${tuscany.acceptance.tc.dir}&quot;  catalina run &amp;&amp;   exit" />
@@ -206,15 +213,15 @@
         </target>
         <target name="startTomcatMac" if="isMac" unless='tuscany.tomcat.alreadystarted' >
                 <antcall target="startTomcatUnix" /> <!--just use unix for now -->
-<!--                
+<!--
                  <java classname="org.apache.catalina.startup.Bootstrap" fork="true" spawn='true' failonerror="false" maxmemory="65m" dir='E:\dev\beajanus\trunk\acceptance\target\apache-tomcat-5.5.12\bin'>
-                <jvmarg value="-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager" /> 
-                <jvmarg value="-Djava.util.logging.config.file=${catalina.base}\conf\logging.properties" /> 
-                <jvmarg value="-Djava.endorsed.dirs=E:\dev\beajanus\trunk\acceptance\target\apache-tomcat-5.5.12\common\endorsed" /> 
-                <jvmarg value="-Dcatalina.base=E:\dev\beajanus\trunk\acceptance\target\apache-tomcat-5.5.12" /> 
-                <jvmarg value="-Djava.io.tmpdir=E:\dev\beajanus\trunk\acceptance\target\apache-tomcat-5.5.12\temp" /> 
-                <jvmarg value="-D-Dcatalina.home=E:\dev\beajanus\trunk\acceptance\target\apache-tomcat-5.5.12" /> 
-                <arg value="start"/> 
+                <jvmarg value="-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager" />
+                <jvmarg value="-Djava.util.logging.config.file=${catalina.base}\conf\logging.properties" />
+                <jvmarg value="-Djava.endorsed.dirs=E:\dev\beajanus\trunk\acceptance\target\apache-tomcat-5.5.12\common\endorsed" />
+                <jvmarg value="-Dcatalina.base=E:\dev\beajanus\trunk\acceptance\target\apache-tomcat-5.5.12" />
+                <jvmarg value="-Djava.io.tmpdir=E:\dev\beajanus\trunk\acceptance\target\apache-tomcat-5.5.12\temp" />
+                <jvmarg value="-D-Dcatalina.home=E:\dev\beajanus\trunk\acceptance\target\apache-tomcat-5.5.12" />
+                <arg value="start"/>
 
                  <classpath>
                    <pathelement path="E:/bin/jdk1.5.0_05/lib/tools.jar:E:/dev/beajanus/trunk/acceptance/target/apache-tomcat-5.5.12\bin/bootstrap.jar"/>
@@ -232,7 +239,7 @@
                 <waitfor maxwait="12" maxwaitunit="second" checkevery="200">
                         <http url="http://localhost:8080"/>
                 </waitfor>
-                
+
         </target>
 
         <target name="clean" description='Clean out all built artifacts'>

Propchange: incubator/tuscany/java/testing/tomcat/helloworldaxis/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Feb  8 12:57:44 2006
@@ -0,0 +1,13 @@
+target
+*.iws
+*.ipr
+*.iml
+.project
+.classpath
+maven.log
+velocity.log*
+junit*.properties
+.settings
+.deployables
+.wtpmodules
+

Propchange: incubator/tuscany/java/testing/tomcat/helloworldweb/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Feb  8 12:57:44 2006
@@ -0,0 +1,13 @@
+target
+*.iws
+*.ipr
+*.iml
+.project
+.classpath
+maven.log
+velocity.log*
+junit*.properties
+.settings
+.deployables
+.wtpmodules
+

Added: incubator/tuscany/java/testing/tomcat/helloworldweb/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/testing/tomcat/helloworldweb/pom.xml?rev=376063&view=auto
==============================================================================
--- incubator/tuscany/java/testing/tomcat/helloworldweb/pom.xml (added)
+++ incubator/tuscany/java/testing/tomcat/helloworldweb/pom.xml Wed Feb  8 12:57:44 2006
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ *  Copyright (c) 2005-2006 The Apache Software Foundation or its licensors, as applicable.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ -->
+<project>
+    <parent>
+        <groupId>org.apache.tuscany</groupId>
+        <artifactId>tuscany-testing-tomcat</artifactId>
+        <version>SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>tuscany-testing-tomcat-helloworldweb</artifactId>
+    <packaging>jar</packaging>
+    <name>Tuscany Testing Tomcat HelloWorld WEB acceptance</name>
+    <description>Acceptance test for Helloworld web</description>
+    <version>SNAPSHOT</version>
+
+
+    <dependencies>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>3.8.1</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>htmlunit</groupId>
+            <artifactId>htmlunit</artifactId>
+            <version>1.7</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <dependencies>
+                    <dependency>
+                        <groupId>jakarta-regexp</groupId>
+                        <artifactId>jakarta-regexp</artifactId>
+                        <version>1.4</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>ant</groupId>
+                        <artifactId>ant-jakarta-regexp</artifactId>
+                        <version>1.6.1</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>ant</groupId>
+                        <artifactId>ant-xslp</artifactId>
+                        <version>1.6.5</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>ant</groupId>
+                        <artifactId>ant-trax</artifactId>
+                        <version>1.6.5</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
+        </plugins>
+    </build>
+</project>

Propchange: incubator/tuscany/java/testing/tomcat/helloworldweb/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/java/testing/tomcat/helloworldweb/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Rev,Date

Propchange: incubator/tuscany/java/testing/tomcat/helloworldwebdas/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Feb  8 12:57:44 2006
@@ -0,0 +1,13 @@
+target
+*.iws
+*.ipr
+*.iml
+.project
+.classpath
+maven.log
+velocity.log*
+junit*.properties
+.settings
+.deployables
+.wtpmodules
+

Propchange: incubator/tuscany/java/testing/tomcat/helloworldws/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Feb  8 12:57:44 2006
@@ -0,0 +1,13 @@
+target
+*.iws
+*.ipr
+*.iml
+.project
+.classpath
+maven.log
+velocity.log*
+junit*.properties
+.settings
+.deployables
+.wtpmodules
+

Added: incubator/tuscany/java/testing/tomcat/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/testing/tomcat/pom.xml?rev=376063&view=auto
==============================================================================
--- incubator/tuscany/java/testing/tomcat/pom.xml (added)
+++ incubator/tuscany/java/testing/tomcat/pom.xml Wed Feb  8 12:57:44 2006
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ *  Copyright (c) 2005-2006 The Apache Software Foundation or its licensors, as applicable.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ -->
+<project>
+    <parent>
+        <groupId>org.apache.tuscany</groupId>
+        <artifactId>tuscany-project</artifactId>
+        <version>SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>tuscany-testing-tomcat</artifactId>
+    <packaging>pom</packaging>
+    <name>Tuscany Testing in Tomcat</name>
+    <version>SNAPSHOT</version>
+
+    <modules>
+        <module>helloworldweb</module>
+<!--
+        <module>bigbank</module>
+        <module>helloworldaxis</module>
+        <module>helloworldwebdas</module>
+        <module>helloworldws</module>
+-->
+    </modules>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <includes>
+                        <include>**/*TestCase.java</include>
+                    </includes>
+                </configuration>
+            </plugin>
+        </plugins>
+        <testResources>
+            <testResource>
+                <directory>src/test/java</directory>
+                <includes>
+                    <include>**/*.componentType</include>
+                </includes>
+            </testResource>
+            <testResource>
+                <directory>src/test/resources</directory>
+                <includes>
+                    <include>**/*</include>
+                </includes>
+            </testResource>
+        </testResources>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-antrun-plugin</artifactId>
+                    <version>1.1</version>
+                    <executions>
+                        <execution>
+                            <id>prepareTomcat</id>
+                            <phase>process-test-resources</phase>
+                            <configuration>
+                                <tasks>
+                                    <ant inheritRefs='true' antfile="build.xml" dir="${basedir}/.." target="prepareTomcat">
+                                    	<property name="user.home" value="${user.home}" />
+                                        <!-- property name="tuscany.maven.repos.dir" value="${maven.local.repo}"/ -->
+                                    </ant>
+                                </tasks>
+                            </configuration>
+                            <goals>
+                                <goal>run</goal>
+                            </goals>
+                        </execution>
+                        <execution>
+                            <id>cleanupTomcat</id>
+                            <phase>clean</phase>
+                            <configuration>
+                                <tasks>
+                                    <ant inheritRefs='true' antfile="build.xml" dir="${basedir}/.." target="clean" />
+                                </tasks>
+                            </configuration>
+                            <goals>
+                                <goal>run</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+        <defaultGoal>test</defaultGoal>
+    </build>
+</project>

Propchange: incubator/tuscany/java/testing/tomcat/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/java/testing/tomcat/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Rev,Date