Remove copied files from svn

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@801422 13f79535-47bb-0310-9956-ffa450edef68

3 files changed, 108 insertions, 195 deletions

diff --git a/java/sca/otest/current/build.xml b/java/sca/otest/current/build.xml
index fd4de7107b..e281e91dad 100644
--- a/java/sca/otest/current/build.xml
+++ b/java/sca/otest/current/build.xml
@@ -17,106 +17,113 @@
  * under the License.    
 -->
 <project name="copy-files-from-svn"> 
-    <target name="copyDir"> 
+    <target name="copySourceDir"> 
         <copy todir="${to.dir}">
-            <fileset dir="${from.dir}"/>
+            <fileset dir="${from.dir}">
+                <include name="**/*.java"/>
+                <exclude name="**/.svn/**/*"/>
+            </fileset>
         </copy>
     </target>
 
+    <target name="copyResourceDir"> 
+        <copy todir="${to.dir}">
+            <fileset dir="${from.dir}">
+                <exclude name="**/*.java"/>
+                <exclude name="**/.svn/**/*"/>
+            </fileset>
+        </copy>
+    </target>
+
+
     <target name="copyFile"> 
         <copy file="${from.file}"
               tofile="${to.file}"/>
     </target>
 
     <target name="fixUpContributions"> 
-        <antcall target="fixUpContribution-Resource"><param name="contrib" value="General"/></antcall>
-<!--
-        <antcall target="fixUpContribution-Resource"><param name="contrib" value="General_Java"/></antcall>
--->
-        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_4002"/></antcall>
-        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_4003"/></antcall>
-        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_4004"/></antcall>
-        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_4005"/></antcall>
-        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_4007"/></antcall>
-
-        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_5004"/></antcall>
-        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_5005"/></antcall>
-        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_5007"/></antcall>
-        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_5009"/></antcall>
-        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_5023"/></antcall>
-        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_5024"/></antcall>
-        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_5027"/></antcall>
-        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_5030"/></antcall>
-        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_5035"/></antcall>
-
-        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_6001"/></antcall>
-        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_6002"/></antcall>
-        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_6003"/></antcall>
-        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_6005"/></antcall>
-        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_6006"/></antcall>
-        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_6008"/></antcall>
-        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_6012"/></antcall>
-        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_6021"/></antcall>
-        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_6022"/></antcall>
-        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_6025"/></antcall>
-        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_6028"/></antcall>
-        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_6029"/></antcall>
-        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_6031"/></antcall>
-        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_6032"/></antcall>
-        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_6033"/></antcall>
-
-        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_7001"/></antcall>
-        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_7007"/></antcall>
-        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_7008"/></antcall>
-        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_7009"/></antcall>
-        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_7010"/></antcall>
-
-        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_8001"/></antcall>
-        <antcall target="fixUpContribution-Java"><param name="contrib" value="ASM_8001_Java"/></antcall>
-        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_8003"/></antcall>
-        <antcall target="fixUpContribution-Java"><param name="contrib" value="ASM_8004"/></antcall>
-        <antcall target="fixUpContribution-Java"><param name="contrib" value="ASM_8005"/></antcall>
-        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_8010"/></antcall>
-        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_8011"/></antcall>
-        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_8012"/></antcall>
-        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_8017"/></antcall>
-        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_8019"/></antcall>
-
-        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_9002"/></antcall>
-
-        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_10001"/></antcall>
-        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_10003"/></antcall>
-
-        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_12001"/></antcall>
-        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_12002"/></antcall>
-        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_12003"/></antcall>
-        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_12005"/></antcall>
-        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_12007"/></antcall>
-        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_12008"/></antcall>
-        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_12009"/></antcall>
-        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_12010"/></antcall>
-        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_12012"/></antcall>
-        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_12013"/></antcall>
-
-        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_13001"/></antcall>
-        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_13002"/></antcall>
-        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_13003"/></antcall>
-        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_13004"/></antcall>
-        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_13005"/></antcall>
-        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_13006"/></antcall>
-        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_13007"/></antcall>
-        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_13008"/></antcall>
-
-        <antcall target="fixUpContribution-Resource"><param name="contrib" value="Contribution1"/></antcall>
-        <antcall target="fixUpContribution-Resource"><param name="contrib" value="Contribution2"/></antcall>
+        <antcall target="fixUpContribution"><param name="contrib" value="General"/></antcall>
+        <antcall target="fixUpContribution"><param name="contrib" value="General_Java"/></antcall>
+        <antcall target="fixUpContribution"><param name="contrib" value="ASM_4002"/></antcall>
+        <antcall target="fixUpContribution"><param name="contrib" value="ASM_4003"/></antcall>
+        <antcall target="fixUpContribution"><param name="contrib" value="ASM_4004"/></antcall>
+        <antcall target="fixUpContribution"><param name="contrib" value="ASM_4005"/></antcall>
+        <antcall target="fixUpContribution"><param name="contrib" value="ASM_4007"/></antcall>
+
+        <antcall target="fixUpContribution"><param name="contrib" value="ASM_5004"/></antcall>
+        <antcall target="fixUpContribution"><param name="contrib" value="ASM_5005"/></antcall>
+        <antcall target="fixUpContribution"><param name="contrib" value="ASM_5007"/></antcall>
+        <antcall target="fixUpContribution"><param name="contrib" value="ASM_5009"/></antcall>
+        <antcall target="fixUpContribution"><param name="contrib" value="ASM_5023"/></antcall>
+        <antcall target="fixUpContribution"><param name="contrib" value="ASM_5024"/></antcall>
+        <antcall target="fixUpContribution"><param name="contrib" value="ASM_5027"/></antcall>
+        <antcall target="fixUpContribution"><param name="contrib" value="ASM_5030"/></antcall>
+        <antcall target="fixUpContribution"><param name="contrib" value="ASM_5035"/></antcall>
+
+        <antcall target="fixUpContribution"><param name="contrib" value="ASM_6001"/></antcall>
+        <antcall target="fixUpContribution"><param name="contrib" value="ASM_6002"/></antcall>
+        <antcall target="fixUpContribution"><param name="contrib" value="ASM_6003"/></antcall>
+        <antcall target="fixUpContribution"><param name="contrib" value="ASM_6005"/></antcall>
+        <antcall target="fixUpContribution"><param name="contrib" value="ASM_6006"/></antcall>
+        <antcall target="fixUpContribution"><param name="contrib" value="ASM_6008"/></antcall>
+        <antcall target="fixUpContribution"><param name="contrib" value="ASM_6012"/></antcall>
+        <antcall target="fixUpContribution"><param name="contrib" value="ASM_6021"/></antcall>
+        <antcall target="fixUpContribution"><param name="contrib" value="ASM_6022"/></antcall>
+        <antcall target="fixUpContribution"><param name="contrib" value="ASM_6025"/></antcall>
+        <antcall target="fixUpContribution"><param name="contrib" value="ASM_6028"/></antcall>
+        <antcall target="fixUpContribution"><param name="contrib" value="ASM_6029"/></antcall>
+        <antcall target="fixUpContribution"><param name="contrib" value="ASM_6031"/></antcall>
+        <antcall target="fixUpContribution"><param name="contrib" value="ASM_6032"/></antcall>
+        <antcall target="fixUpContribution"><param name="contrib" value="ASM_6033"/></antcall>
+
+        <antcall target="fixUpContribution"><param name="contrib" value="ASM_7001"/></antcall>
+        <antcall target="fixUpContribution"><param name="contrib" value="ASM_7007"/></antcall>
+        <antcall target="fixUpContribution"><param name="contrib" value="ASM_7008"/></antcall>
+        <antcall target="fixUpContribution"><param name="contrib" value="ASM_7009"/></antcall>
+        <antcall target="fixUpContribution"><param name="contrib" value="ASM_7010"/></antcall>
+
+        <antcall target="fixUpContribution"><param name="contrib" value="ASM_8001"/></antcall>
+        <antcall target="fixUpContribution"><param name="contrib" value="ASM_8001_Java"/></antcall>
+        <antcall target="fixUpContribution"><param name="contrib" value="ASM_8003"/></antcall>
+        <antcall target="fixUpContribution"><param name="contrib" value="ASM_8004"/></antcall>
+        <antcall target="fixUpContribution"><param name="contrib" value="ASM_8005"/></antcall>
+        <antcall target="fixUpContribution"><param name="contrib" value="ASM_8010"/></antcall>
+        <antcall target="fixUpContribution"><param name="contrib" value="ASM_8011"/></antcall>
+        <antcall target="fixUpContribution"><param name="contrib" value="ASM_8012"/></antcall>
+        <antcall target="fixUpContribution"><param name="contrib" value="ASM_8017"/></antcall>
+        <antcall target="fixUpContribution"><param name="contrib" value="ASM_8019"/></antcall>
+
+        <antcall target="fixUpContribution"><param name="contrib" value="ASM_9002"/></antcall>
+
+        <antcall target="fixUpContribution"><param name="contrib" value="ASM_10001"/></antcall>
+        <antcall target="fixUpContribution"><param name="contrib" value="ASM_10003"/></antcall>
+
+        <antcall target="fixUpContribution"><param name="contrib" value="ASM_12001"/></antcall>
+        <antcall target="fixUpContribution"><param name="contrib" value="ASM_12002"/></antcall>
+        <antcall target="fixUpContribution"><param name="contrib" value="ASM_12003"/></antcall>
+        <antcall target="fixUpContribution"><param name="contrib" value="ASM_12005"/></antcall>
+        <antcall target="fixUpContribution"><param name="contrib" value="ASM_12007"/></antcall>
+        <antcall target="fixUpContribution"><param name="contrib" value="ASM_12008"/></antcall>
+        <antcall target="fixUpContribution"><param name="contrib" value="ASM_12009"/></antcall>
+        <antcall target="fixUpContribution"><param name="contrib" value="ASM_12010"/></antcall>
+        <antcall target="fixUpContribution"><param name="contrib" value="ASM_12012"/></antcall>
+        <antcall target="fixUpContribution"><param name="contrib" value="ASM_12013"/></antcall>
+
+        <antcall target="fixUpContribution"><param name="contrib" value="ASM_13001"/></antcall>
+        <antcall target="fixUpContribution"><param name="contrib" value="ASM_13002"/></antcall>
+        <antcall target="fixUpContribution"><param name="contrib" value="ASM_13003"/></antcall>
+        <antcall target="fixUpContribution"><param name="contrib" value="ASM_13004"/></antcall>
+        <antcall target="fixUpContribution"><param name="contrib" value="ASM_13005"/></antcall>
+        <antcall target="fixUpContribution"><param name="contrib" value="ASM_13006"/></antcall>
+        <antcall target="fixUpContribution"><param name="contrib" value="ASM_13007"/></antcall>
+        <antcall target="fixUpContribution"><param name="contrib" value="ASM_13008"/></antcall>
+
+        <antcall target="fixUpContribution"><param name="contrib" value="Contribution1"/></antcall>
+        <antcall target="fixUpContribution"><param name="contrib" value="Contribution2"/></antcall>
     </target>
 
 
-    <target name="fixUpContribution-Resource"> 
-       <!-- create dir -->
-
-       <!-- create resources dir -->
-       <mkdir dir="${contrib}/src/main/resources"/>
+    <target name="fixUpContribution"> 
 
        <!-- copy in pom -->
        <antcall target="copyTemplatePom">
@@ -124,32 +131,6 @@
            <param name="to.file" value="${contrib}/pom.xml"/>
        </antcall>
 
-       <!-- could use texen to set up the pom -->
-
-       <!-- clear resources dir - so that updated contrib structure can be easily checked in -->
-       <delete quiet="true" includeemptydirs="true"> 
-           <fileset dir="${contrib}/src/main/resources" includes="**/*"/> 
-       </delete> 
-    </target>
-
-    <target name="fixUpContribution-Java"> 
-       <!-- create dir -->
-
-       <!-- create resources dir -->
-       <mkdir dir="${contrib}/src/main/java"/>
-
-       <!-- copy in pom -->
-       <antcall target="copyTemplatePom">
-           <param name="from.file" value="./template-pom-java.xml"/>
-           <param name="to.file" value="${contrib}/pom.xml"/>
-       </antcall>
-
-       <!-- could use texen to set up the pom -->
-
-       <!-- clear java dir - so that updated contrib structure can be easily checked in -->
-       <delete quiet="true" includeemptydirs="true"> 
-           <fileset dir="${contrib}/src/main/java" includes="**/*"/> 
-       </delete> 
     </target>
 
     <target name="copyTemplatePom"> 
diff --git a/java/sca/otest/current/template-pom-java.xml b/java/sca/otest/current/template-pom-java.xml
deleted file mode 100644
index b24e322669..0000000000
--- a/java/sca/otest/current/template-pom-java.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-otests</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tuscany-otests-asm-@ASM@</artifactId>
-    <name>Apache Tuscany SCA Specification Tests @ASM@</name> 
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-otests-asm-General_Java</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-    </dependencies>
-
-    <build>
-       <finalName>${artifactId}</finalName>
-        <resources>
-          <resource>
-            <directory>src/main/java</directory>
-          </resource>
-        </resources>
-       <plugins>
-           <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <version>1.3</version>
-
-                <dependencies>
-                    <dependency>
-                        <groupId>ant</groupId>
-                        <artifactId>ant-trax</artifactId>
-                        <version>1.6.5</version>
-                    </dependency>
-                </dependencies>
-
-                <executions>
-                    <execution>
-                        <id>copy-files-from-svn</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <property name="from.dir" value="../src/main/resources/@ASM@"/>
-                                <property name="to.dir" value="src/main/java"/>
-                                <ant antfile="../build.xml">
-                                    <target name="copyDir"/>
-                                </ant>
-                            </tasks>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>            
-        </plugins>
-    </build>
-</project>
diff --git a/java/sca/otest/current/template-pom.xml b/java/sca/otest/current/template-pom.xml
index fb436ef884..115cb4576a 100644
--- a/java/sca/otest/current/template-pom.xml
+++ b/java/sca/otest/current/template-pom.xml
@@ -27,6 +27,14 @@
     <artifactId>tuscany-otests-asm-@ASM@</artifactId>
     <name>Apache Tuscany SCA Specification Tests @ASM@</name> 
 
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-otests-asm-General_Java</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+
     <build>
        <finalName>${artifactId}</finalName>
        <plugins>
@@ -53,9 +61,13 @@
                         <configuration>
                             <tasks>
                                 <property name="from.dir" value="../src/main/resources/@ASM@"/>
-                                <property name="to.dir" value="src/main/resources"/>
                                 <ant antfile="../build.xml">
-                                    <target name="copyDir"/>
+                                    <property name="to.dir" value="src/main/resources"/>
+                                    <target name="copyResourceDir"/>
+                                </ant>
+                                <ant antfile="../build.xml">
+                                    <property name="to.dir" value="src/main/java"/>
+                                    <target name="copySourceDir"/>
                                 </ant>
                             </tasks>
                         </configuration>