Fixes for TUSCANY-2726

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

3 files changed, 140 insertions, 120 deletions

diff --git a/branches/sca-java-1.4/distribution/bundle/pom.xml b/branches/sca-java-1.4/distribution/bundle/pom.xml
index 1221266c4b..ffe18707a9 100644
--- a/branches/sca-java-1.4/distribution/bundle/pom.xml
+++ b/branches/sca-java-1.4/distribution/bundle/pom.xml
@@ -283,11 +283,16 @@
             <artifactId>tuscany-host-embedded</artifactId>
             <version>${pom.version}</version>
         </dependency>
-        <!-- dependency>
+        <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>tuscany-host-corba</artifactId>
             <version>${pom.version}</version>
-        </dependency -->
+        </dependency>
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>tuscany-host-corba-jse</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
         <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>tuscany-host-http</artifactId>
@@ -690,9 +695,9 @@
                                 <transformer implementation="org.codehaus.mojo.shade.resource.AppendingTransformer">
                                     <resource>META-INF/services/org.apache.tuscany.sca.extension.helper.ImplementationActivator</resource>
                                 </transformer>
-                                <!-- transformer implementation="org.codehaus.mojo.shade.resource.AppendingTransformer">
+                                <transformer implementation="org.codehaus.mojo.shade.resource.AppendingTransformer">
                                     <resource>META-INF/services/org.apache.tuscany.sca.host.corba.CorbaHostExtensionPoint</resource>
-                                </transformer -->
+                                </transformer>
                                 <transformer implementation="org.codehaus.mojo.shade.resource.AppendingTransformer">
                                     <resource>META-INF/services/org.apache.tuscany.sca.host.http.ServletHostExtensionPoint</resource>
                                 </transformer>
diff --git a/branches/sca-java-1.4/tools/maven/maven-ant-generator/src/main/java/org/apache/tuscany/sca/tools/ant/generator/plugin/AntGeneratorMojo.java b/branches/sca-java-1.4/tools/maven/maven-ant-generator/src/main/java/org/apache/tuscany/sca/tools/ant/generator/plugin/AntGeneratorMojo.java
index b44dd16a91..202b3c3cec 100644
--- a/branches/sca-java-1.4/tools/maven/maven-ant-generator/src/main/java/org/apache/tuscany/sca/tools/ant/generator/plugin/AntGeneratorMojo.java
+++ b/branches/sca-java-1.4/tools/maven/maven-ant-generator/src/main/java/org/apache/tuscany/sca/tools/ant/generator/plugin/AntGeneratorMojo.java
@@ -131,7 +131,14 @@ public class AntGeneratorMojo extends AbstractMojo {
      * in the distribution hierarchy
      * @parameter expression="../.."
      */
-    private String pathToRootDir; 
+    private String pathToRootDir;
+    
+    /**
+     * The path to the webapp dir so that build.xml files can be generated at any level 
+     * in the distribution hierarchy
+     * @parameter expression="src/main/webapp"
+     */
+    private String pathToWebappDir;
     
     public void execute() throws MojoExecutionException {
         if ((buildDependencyFileOnly != null) &&
@@ -249,8 +256,8 @@ public class AntGeneratorMojo extends AbstractMojo {
         } else if (packaging.equals("war")) {
             
             // Build a WAR
-            pw.println("        <war destfile=\"target/" + project.getArtifactId() + ".war\" webxml=\"src/main/webapp/WEB-INF/web.xml\">");
-            pw.println("            <fileset dir=\"src/main/webapp\"/>");
+            pw.println("        <war destfile=\"target/" + project.getArtifactId() + ".war\" webxml=\"" + pathToWebappDir + "/WEB-INF/web.xml\">");
+            pw.println("            <fileset dir=\"" + pathToWebappDir + "\"/>");
             pw.println("            <lib refid=\"tuscany.jars\"/>");
             pw.println("            <lib refid=\"3rdparty.jars\"/>");
             pw.println("            <classes dir=\"target/classes\"/>");
diff --git a/branches/sca-java-1.4/tutorials/store/catalog-webapp/pom.xml b/branches/sca-java-1.4/tutorials/store/catalog-webapp/pom.xml
index 0bb69bd4e5..ec9757e37c 100644
--- a/branches/sca-java-1.4/tutorials/store/catalog-webapp/pom.xml
+++ b/branches/sca-java-1.4/tutorials/store/catalog-webapp/pom.xml
@@ -1,113 +1,121 @@
-<?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-tutorial-store</artifactId>
-        <version>1.4</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tutorial-catalog-webapp</artifactId>
-    <name>Apache Tuscany SCA Store Tutorial Catalog WAR Contribution</name>
-    <packaging>war</packaging>
-
-    <repositories>
-       <repository>
-          <id>apache.incubator</id>
-          <url>http://people.apache.org/repo/m2-incubating-repository</url>
-       </repository>
-    </repositories>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-sca-api</artifactId>
-            <version>1.4</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-api</artifactId>
-            <version>1.4</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tutorial-assets</artifactId>
-            <version>1.4</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-launcher</artifactId>
-            <version>1.4</version>
-            <scope>runtime</scope>
-        </dependency>
-        
-    </dependencies>
-    
-    <build>
-       <finalName>${artifactId}</finalName>
-       <sourceDirectory>${basedir}</sourceDirectory>
-       <resources>
-          <resource>
-              <directory>${basedir}</directory>
-              <excludes>
-                  <exclude>**/*.java</exclude>
-                  <exclude>**/.*/**</exclude>
-                  <exclude>pom.xml</exclude>
-                  <exclude>build.xml</exclude>
-                  <exclude>target/**</exclude>
-                  <exclude>webapp/**</exclude>
-                  <exclude>target/**</exclude>
-              </excludes>
-          </resource>
-       </resources>
-       
-       <plugins>
-             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-war-plugin</artifactId>
-                <configuration>
-                  <warSourceDirectory>webapp</warSourceDirectory>  
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>1.4</version>
-                <executions>
-                    <execution>
-                        <configuration>
-                            <pathToRootDir>../../..</pathToRootDir>
-                        </configuration>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-       </plugins>
-    </build>
-
-</project>
+<?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-tutorial-store</artifactId>

+        <version>1.4</version>

+        <relativePath>../pom.xml</relativePath>

+    </parent>

+    <artifactId>tutorial-catalog-webapp</artifactId>

+    <name>Apache Tuscany SCA Store Tutorial Catalog WAR Contribution</name>

+    <packaging>war</packaging>

+

+    <repositories>

+       <repository>

+          <id>apache.incubator</id>

+          <url>http://people.apache.org/repo/m2-incubating-repository</url>

+       </repository>

+    </repositories>

+

+    <dependencies>

+        <dependency>

+            <groupId>org.apache.tuscany.sca</groupId>

+            <artifactId>tuscany-sca-api</artifactId>

+            <version>1.4</version>

+            <scope>runtime</scope>

+        </dependency>

+

+        <dependency>

+            <groupId>org.apache.tuscany.sca</groupId>

+            <artifactId>tuscany-node-api</artifactId>

+            <version>1.4</version>

+            <scope>runtime</scope>

+        </dependency>

+

+        <dependency>

+            <groupId>org.apache.tuscany.sca</groupId>

+            <artifactId>tutorial-assets</artifactId>

+            <version>1.4</version>

+        </dependency>

+

+        <dependency>

+            <groupId>org.apache.tuscany.sca</groupId>

+            <artifactId>tuscany-implementation-node-runtime</artifactId>

+            <version>1.4</version>

+            <scope>runtime</scope>

+        </dependency>

+        

+        <dependency>

+            <groupId>org.apache.tuscany.sca</groupId>

+            <artifactId>tuscany-node-launcher</artifactId>

+            <version>1.4</version>

+            <scope>runtime</scope>

+        </dependency>

+        

+    </dependencies>

+    

+    <build>

+       <finalName>${artifactId}</finalName>

+       <sourceDirectory>${basedir}</sourceDirectory>

+       <resources>

+          <resource>

+              <directory>${basedir}</directory>

+              <excludes>

+                  <exclude>**/*.java</exclude>

+                  <exclude>**/.*/**</exclude>

+                  <exclude>pom.xml</exclude>

+                  <exclude>build.xml</exclude>

+                  <exclude>target/**</exclude>

+                  <exclude>webapp/**</exclude>

+                  <exclude>target/**</exclude>

+              </excludes>

+          </resource>

+       </resources>

+       

+       <plugins>

+             <plugin>

+                <groupId>org.apache.maven.plugins</groupId>

+                <artifactId>maven-war-plugin</artifactId>

+                <configuration>

+                  <warSourceDirectory>webapp</warSourceDirectory>  

+                </configuration>

+            </plugin>

+            <plugin>

+                <groupId>org.apache.tuscany.sca</groupId>

+                <artifactId>tuscany-maven-ant-generator</artifactId>

+                <version>1.4</version>

+                <executions>

+                    <execution>

+                        <configuration>

+				    <pathToWebappDir>webapp</pathToWebappDir>

+                            <pathToRootDir>../../..</pathToRootDir>

+                        </configuration>

+                        <goals>

+                            <goal>generate</goal>

+                        </goals>

+                    </execution>

+                </executions>

+            </plugin>

+       </plugins>

+    </build>

+

+</project>