Author: rfeng
Date: Mon Oct 23 15:38:45 2006
New Revision: 467155
URL: http://svn.apache.org/viewvc?view=rev&rev=467155
Log:
Change the way to add test source folders so that it works with the SNAPSHOT
version of maven-eclipse-plugin
Modified:
incubator/tuscany/java/sca/services/databinding/databinding-castor/pom.xml
incubator/tuscany/java/sca/services/databinding/databinding-jaxb/pom.xml
incubator/tuscany/java/sca/services/databinding/databinding-sdo/pom.xml
incubator/tuscany/java/sca/services/databinding/databinding-test/pom.xml
incubator/tuscany/java/sca/services/databinding/databinding-xmlbeans/pom.xml
Modified:
incubator/tuscany/java/sca/services/databinding/databinding-castor/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/databinding/databinding-castor/pom.xml?view=diff&rev=467155&r1=467154&r2=467155
==============================================================================
--- incubator/tuscany/java/sca/services/databinding/databinding-castor/pom.xml
(original)
+++ incubator/tuscany/java/sca/services/databinding/databinding-castor/pom.xml
Mon Oct 23 15:38:45 2006
@@ -65,18 +65,26 @@
</dependencies>
<build>
- <testResources>
- <testResource>
- <directory>src/test/resources</directory>
- <filtering>true</filtering>
- </testResource>
- <testResource>
- <directory>target/castor-source</directory>
- <filtering>true</filtering>
- </testResource>
- </testResources>
-
<plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.0</version>
+ <executions>
+ <execution>
+ <id>add-test-source</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>add-test-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+ <source>target/castor-source</source>
+ </sources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
Modified:
incubator/tuscany/java/sca/services/databinding/databinding-jaxb/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/databinding/databinding-jaxb/pom.xml?view=diff&rev=467155&r1=467154&r2=467155
==============================================================================
--- incubator/tuscany/java/sca/services/databinding/databinding-jaxb/pom.xml
(original)
+++ incubator/tuscany/java/sca/services/databinding/databinding-jaxb/pom.xml
Mon Oct 23 15:38:45 2006
@@ -83,35 +83,24 @@
</dependencies>
<build>
- <testResources>
- <testResource>
- <directory>src/test/resources</directory>
- <filtering>true</filtering>
- </testResource>
- <testResource>
- <directory>target/jaxb-source</directory>
- <filtering>true</filtering>
- </testResource>
- <testResource>
- <directory>src/test/java</directory>
- <filtering>true</filtering>
- </testResource>
- </testResources>
<plugins>
- <!-- A hack to add target/jaxb-source to testCompileSourceRoots -->
<plugin>
- <artifactId>maven-antrun-plugin</artifactId>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.0</version>
<executions>
<execution>
- <id>set-test-source</id>
- <phase>generate-test-sources</phase>
- <configuration>
- <testSourceRoot>target/jaxb-source</testSourceRoot>
- </configuration>
+ <id>add-test-source</id>
+ <phase>generate-sources</phase>
<goals>
- <goal>run</goal>
+ <goal>add-test-source</goal>
</goals>
+ <configuration>
+ <sources>
+ <source>target/jaxb-source</source>
+ </sources>
+ </configuration>
</execution>
</executions>
</plugin>
Modified:
incubator/tuscany/java/sca/services/databinding/databinding-sdo/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/databinding/databinding-sdo/pom.xml?view=diff&rev=467155&r1=467154&r2=467155
==============================================================================
--- incubator/tuscany/java/sca/services/databinding/databinding-sdo/pom.xml
(original)
+++ incubator/tuscany/java/sca/services/databinding/databinding-sdo/pom.xml Mon
Oct 23 15:38:45 2006
@@ -57,17 +57,26 @@
</dependencies>
<build>
- <!-- A maven hack to have eclipse recognize target/sdo-source as a
source folder -->
- <testResources>
- <testResource>
- <directory>src/test/resources</directory>
- </testResource>
- <testResource>
- <directory>target/sdo-source</directory>
- </testResource>
- </testResources>
-
<plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.0</version>
+ <executions>
+ <execution>
+ <id>add-test-source</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>add-test-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+ <source>target/sdo-source</source>
+ </sources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<groupId>org.apache.tuscany.sdo</groupId>
<artifactId>tuscany-sdo-plugin</artifactId>
Modified:
incubator/tuscany/java/sca/services/databinding/databinding-test/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/databinding/databinding-test/pom.xml?view=diff&rev=467155&r1=467154&r2=467155
==============================================================================
--- incubator/tuscany/java/sca/services/databinding/databinding-test/pom.xml
(original)
+++ incubator/tuscany/java/sca/services/databinding/databinding-test/pom.xml
Mon Oct 23 15:38:45 2006
@@ -105,23 +105,29 @@
</dependencies>
<build>
- <testResources>
- <testResource>
- <directory>src/test/resources</directory>
- <filtering>true</filtering>
- </testResource>
- <testResource>
- <directory>target/xmlbeans-source</directory>
- <filtering>true</filtering>
- </testResource>
- <testResource>
- <directory>target/jaxb-source</directory>
- <filtering>true</filtering>
- </testResource>
- </testResources>
-
<plugins>
- <plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.0</version>
+ <executions>
+ <execution>
+ <id>add-test-source</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>add-test-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+ <source>target/jaxb-source</source>
+ <source>target/sdo-source</source>
+ <source>target/xmlbeans-source</source>
+ </sources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.apache.tuscany.sdo</groupId>
<artifactId>tuscany-sdo-plugin</artifactId>
<executions>
Modified:
incubator/tuscany/java/sca/services/databinding/databinding-xmlbeans/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/databinding/databinding-xmlbeans/pom.xml?view=diff&rev=467155&r1=467154&r2=467155
==============================================================================
---
incubator/tuscany/java/sca/services/databinding/databinding-xmlbeans/pom.xml
(original)
+++
incubator/tuscany/java/sca/services/databinding/databinding-xmlbeans/pom.xml
Mon Oct 23 15:38:45 2006
@@ -49,18 +49,27 @@
</dependencies>
<build>
- <testResources>
- <testResource>
- <directory>src/test/resources</directory>
- <filtering>true</filtering>
- </testResource>
- <testResource>
- <directory>target/xmlbeans-source</directory>
- <filtering>true</filtering>
- </testResource>
- </testResources>
<plugins>
<plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.0</version>
+ <executions>
+ <execution>
+ <id>add-test-source</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>add-test-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+ <source>target/xmlbeans-source</source>
+ </sources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
@@ -75,7 +84,6 @@
srcgendir="${project.build.directory}/xmlbeans-source" javasource="1.5"
classgendir="${project.build.directory}/test-classes" />
</tasks>
-
<testSourceRoot>${project.build.directory}/xmlbeans-source</testSourceRoot>
</configuration>
<goals>
<goal>run</goal>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
