Author: rfeng
Date: Tue Feb 12 16:52:16 2008
New Revision: 627206
URL: http://svn.apache.org/viewvc?rev=627206&view=rev
Log:
Copy src/main/resources/META-INF/sca-contribution.xml into the WAR
META-INF/sca-contribution.xml
Modified:
incubator/tuscany/java/sca/itest/pom.xml
incubator/tuscany/java/sca/tools/maven/maven-web-junit/src/main/java/org/apache/tuscany/tools/sca/web/junit/plugin/WebJUnitGeneratorMojo.java
Modified: incubator/tuscany/java/sca/itest/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/pom.xml?rev=627206&r1=627205&r2=627206&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/pom.xml (original)
+++ incubator/tuscany/java/sca/itest/pom.xml Tue Feb 12 16:52:16 2008
@@ -215,7 +215,7 @@
</plugin>
-->
- <!-- Create war and include jUnit test jar -->
+ <!-- Create war and include jUnit test classes -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
@@ -223,7 +223,7 @@
<configuration>
<primaryArtifact>false</primaryArtifact>
<!-- Exclude a few jars to avoid conflicts -->
-
<warSourceExcludes>WEB-INF/lib/tuscany-host-tomcat-*.jar,WEB-INF/lib/tuscany-host-jetty-*.jar,servlet-api-*.jar</warSourceExcludes>
+
<warSourceExcludes>WEB-INF/lib/tuscany-host-tomcat-*.jar,WEB-INF/lib/tuscany-host-jetty-*.jar,servlet-api-*.jar,
WEB-INF/classes/META-INF/sca-contribution*.xml</warSourceExcludes>
<webResources>
<!-- Add the tests jar into the WAR -->
<!--
@@ -241,6 +241,13 @@
<targetPath>WEB-INF/classes</targetPath>
</resource>
+ <resource>
+
<directory>${project.build.directory}/classes/META-INF</directory>
+ <includes>
+
<include>sca-contribution*.xml</include>
+ </includes>
+ <targetPath>META-INF</targetPath>
+ </resource>
<!-- Add the junit -->
<resource>
Modified:
incubator/tuscany/java/sca/tools/maven/maven-web-junit/src/main/java/org/apache/tuscany/tools/sca/web/junit/plugin/WebJUnitGeneratorMojo.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tools/maven/maven-web-junit/src/main/java/org/apache/tuscany/tools/sca/web/junit/plugin/WebJUnitGeneratorMojo.java?rev=627206&r1=627205&r2=627206&view=diff
==============================================================================
---
incubator/tuscany/java/sca/tools/maven/maven-web-junit/src/main/java/org/apache/tuscany/tools/sca/web/junit/plugin/WebJUnitGeneratorMojo.java
(original)
+++
incubator/tuscany/java/sca/tools/maven/maven-web-junit/src/main/java/org/apache/tuscany/tools/sca/web/junit/plugin/WebJUnitGeneratorMojo.java
Tue Feb 12 16:52:16 2008
@@ -92,7 +92,7 @@
+ "\n <filter-mapping>"
+ "\n <filter-name>junit</filter-name>"
+ "\n <url-pattern>/junit/*</url-pattern>"
- + "\n </filter-mapping>"
+ + "\n </filter-mapping>"
+ "\n</web-app>\n";
/**
@@ -121,6 +121,8 @@
+ File.separator
+ "WEB-INF");
base.mkdirs();
+ // Create the dir to work around the complaint from maven-war-plugin
on non-existent folders
+ new File(project.getBasedir(), "target/classes/META-INF".replace('/',
File.separatorChar)).mkdirs();
File webxml = new File(base, "web.xml");
getLog().info("Generating " + webxml.toString());
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
