extend pom generation tool to support contributions that have java content

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

3 files changed, 89 insertions, 5 deletions

diff --git a/java/sca/otest/current/README b/java/sca/otest/current/README
index 6a86c9200e..769a0e242e 100644
--- a/java/sca/otest/current/README
+++ b/java/sca/otest/current/README
@@ -50,3 +50,8 @@ is an ant script that sets up the contribution modules.
 otest/current/ant fixUpContributions
 
 Creates the src/main/resource directory and copies in the pom from the template-pom.xml file
+
+
+Extra dependencies that are required
+
+ASM_8004 -> ASM_8005
diff --git a/java/sca/otest/current/build.xml b/java/sca/otest/current/build.xml
index d05d4f1d0b..e91533d044 100644
--- a/java/sca/otest/current/build.xml
+++ b/java/sca/otest/current/build.xml
@@ -70,13 +70,12 @@
         <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-Resource"><param name="contrib" value="ASM_8001_Java"/></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-Resource"><param name="contrib" value="ASM_8004"/></antcall>
-        <antcall target="fixUpContribution-Resource"><param name="contrib" value="ASM_8005"/></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>
diff --git a/java/sca/otest/current/template-pom-java.xml b/java/sca/otest/current/template-pom-java.xml
new file mode 100644
index 0000000000..b24e322669
--- /dev/null
+++ b/java/sca/otest/current/template-pom-java.xml
@@ -0,0 +1,80 @@
+<?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>