axis-java-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From veit...@apache.org
Subject svn commit: r922941 - in /axis/axis2/java/core/trunk/modules: codegen/pom.xml parent/pom.xml
Date Sun, 14 Mar 2010 20:18:17 GMT
Author: veithen
Date: Sun Mar 14 20:18:17 2010
New Revision: 922941

URL: http://svn.apache.org/viewvc?rev=922941&view=rev
Log:
Codegen tests: use a staging approach to copy the templates from the other projects. This
allows the maven-eclipse-plugin to work properly (Eclipse doesn't support source folders located
outside of the project directory).

Modified:
    axis/axis2/java/core/trunk/modules/codegen/pom.xml
    axis/axis2/java/core/trunk/modules/parent/pom.xml

Modified: axis/axis2/java/core/trunk/modules/codegen/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/codegen/pom.xml?rev=922941&r1=922940&r2=922941&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/codegen/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/codegen/pom.xml Sun Mar 14 20:18:17 2010
@@ -81,28 +81,7 @@
                 </includes>
             </testResource>
             <testResource>
-                <directory>../adb-codegen/src</directory>
-                <includes>
-                    <include>**/*.xsl</include>
-                </includes>
-            </testResource>
-            <testResource>
-                <directory>../xmlbeans/src</directory>
-                <includes>
-                    <include>**/*.xsl</include>
-                </includes>
-            </testResource>
-            <testResource>
-                <directory>../jaxbri/src</directory>
-                <includes>
-                    <include>**/*.xsl</include>
-                </includes>
-            </testResource>
-            <testResource>
-                <directory>../jibx/src</directory>
-                <includes>
-                    <include>**/*.xsl</include>
-                </includes>
+                <directory>${project.build.directory}/templates</directory>
             </testResource>
         </testResources>
         <plugins>
@@ -181,6 +160,53 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <artifactId>maven-resources-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <!-- This execution is used to copy test resources from other
modules
+                             to a temporary area inside the codegen module (which is then
included
+                             as a testResource). This is necessary to allow maven-eclipe-plugin
to
+                             work properly, because Eclipse doesn't support source folders
located
+                             outside of the project directory. Note that for Maven, it would
be
+                             sufficient to simply include these folders as testResources.
-->
+                        <id>copy-templates</id>
+                        <phase>generate-test-resources</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}/templates</outputDirectory>
+                            <resources>          
+                                <resource>
+                                    <directory>../adb-codegen/src</directory>
+                                    <includes>
+                                        <include>**/*.xsl</include>
+                                    </includes>
+                                </resource>
+                                <resource>
+                                    <directory>../xmlbeans/src</directory>
+                                    <includes>
+                                        <include>**/*.xsl</include>
+                                    </includes>
+                                </resource>
+                                <resource>
+                                    <directory>../jaxbri/src</directory>
+                                    <includes>
+                                        <include>**/*.xsl</include>
+                                    </includes>
+                                </resource>
+                                <resource>
+                                    <directory>../jibx/src</directory>
+                                    <includes>
+                                        <include>**/*.xsl</include>
+                                    </includes>
+                                </resource>
+                            </resources>              
+                        </configuration>            
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 </project>

Modified: axis/axis2/java/core/trunk/modules/parent/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/parent/pom.xml?rev=922941&r1=922940&r2=922941&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/parent/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/parent/pom.xml Sun Mar 14 20:18:17 2010
@@ -1254,7 +1254,7 @@
                 </plugin>
                 <plugin>
                     <artifactId>maven-resources-plugin</artifactId>
-                    <version>2.2</version>
+                    <version>2.4.2</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-site-plugin</artifactId>



Mime
View raw message