You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by ra...@apache.org on 2008/12/11 07:00:01 UTC
svn commit: r725590 - in /tuscany/branches/sca-java-1.4:
distribution/bundle/pom.xml
tools/maven/maven-ant-generator/src/main/java/org/apache/tuscany/sca/tools/ant/generator/plugin/AntGeneratorMojo.java
tutorials/store/catalog-webapp/pom.xml
Author: ramkumar
Date: Wed Dec 10 22:00:01 2008
New Revision: 725590
URL: http://svn.apache.org/viewvc?rev=725590&view=rev
Log:
Fixes for TUSCANY-2726
Modified:
tuscany/branches/sca-java-1.4/distribution/bundle/pom.xml
tuscany/branches/sca-java-1.4/tools/maven/maven-ant-generator/src/main/java/org/apache/tuscany/sca/tools/ant/generator/plugin/AntGeneratorMojo.java
tuscany/branches/sca-java-1.4/tutorials/store/catalog-webapp/pom.xml
Modified: tuscany/branches/sca-java-1.4/distribution/bundle/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.4/distribution/bundle/pom.xml?rev=725590&r1=725589&r2=725590&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.4/distribution/bundle/pom.xml (original)
+++ tuscany/branches/sca-java-1.4/distribution/bundle/pom.xml Wed Dec 10 22:00:01 2008
@@ -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>
Modified: tuscany/branches/sca-java-1.4/tools/maven/maven-ant-generator/src/main/java/org/apache/tuscany/sca/tools/ant/generator/plugin/AntGeneratorMojo.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.4/tools/maven/maven-ant-generator/src/main/java/org/apache/tuscany/sca/tools/ant/generator/plugin/AntGeneratorMojo.java?rev=725590&r1=725589&r2=725590&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.4/tools/maven/maven-ant-generator/src/main/java/org/apache/tuscany/sca/tools/ant/generator/plugin/AntGeneratorMojo.java (original)
+++ tuscany/branches/sca-java-1.4/tools/maven/maven-ant-generator/src/main/java/org/apache/tuscany/sca/tools/ant/generator/plugin/AntGeneratorMojo.java Wed Dec 10 22:00:01 2008
@@ -131,7 +131,14 @@
* 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 @@
} 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\"/>");
Modified: tuscany/branches/sca-java-1.4/tutorials/store/catalog-webapp/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.4/tutorials/store/catalog-webapp/pom.xml?rev=725590&r1=725589&r2=725590&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.4/tutorials/store/catalog-webapp/pom.xml (original)
+++ tuscany/branches/sca-java-1.4/tutorials/store/catalog-webapp/pom.xml Wed Dec 10 22:00:01 2008
@@ -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>