Author: veithen
Date: Sun Sep 5 12:34:06 2010
New Revision: 992769
URL: http://svn.apache.org/viewvc?rev=992769&view=rev
Log:
Moved the StAX dialect tests back into axiom-api so that we can use Cobertura
to determine the test coverage. Note that this is made possible by the
introduction of ParentLastURLClassLoader in r990637 (otherwise there would be a
conflict with the dependency of axiom-api on Woodstox).
Added:
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/
- copied from r992730,
webservices/commons/trunk/modules/axiom/modules/axiom-staxdialect-tests/src/test/java/org/apache/axiom/util/stax/dialect/
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/DialectTest.java
- copied unchanged from r992747,
webservices/commons/trunk/modules/axiom/modules/axiom-staxdialect-tests/src/test/java/org/apache/axiom/util/stax/dialect/DialectTest.java
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/DialectTestCase.java
- copied unchanged from r992747,
webservices/commons/trunk/modules/axiom/modules/axiom-staxdialect-tests/src/test/java/org/apache/axiom/util/stax/dialect/DialectTestCase.java
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/DialectTestSuite.java
- copied unchanged from r992762,
webservices/commons/trunk/modules/axiom/modules/axiom-staxdialect-tests/src/test/java/org/apache/axiom/util/stax/dialect/DialectTestSuite.java
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/GetEncodingFromDetectionTestCase.java
- copied unchanged from r992747,
webservices/commons/trunk/modules/axiom/modules/axiom-staxdialect-tests/src/test/java/org/apache/axiom/util/stax/dialect/GetEncodingFromDetectionTestCase.java
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/resources/org/
- copied from r992730,
webservices/commons/trunk/modules/axiom/modules/axiom-staxdialect-tests/src/test/resources/org/
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/resources/org/apache/axiom/util/stax/dialect/stax.properties
- copied unchanged from r992762,
webservices/commons/trunk/modules/axiom/modules/axiom-staxdialect-tests/src/test/resources/org/apache/axiom/util/stax/dialect/stax.properties
Removed:
webservices/commons/trunk/modules/axiom/modules/axiom-staxdialect-tests/
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-api/pom.xml
webservices/commons/trunk/modules/axiom/pom.xml
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-api/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/pom.xml?rev=992769&r1=992768&r2=992769&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-api/pom.xml (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-api/pom.xml Sun Sep
5 12:34:06 2010
@@ -128,6 +128,60 @@
</executions>
</plugin>
<plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-parsers</id>
+ <phase>generate-test-resources</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>wstx-asl</artifactId>
+ <version>3.2.7</version>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>wstx-asl</artifactId>
+ <version>3.2.8</version>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>wstx-asl</artifactId>
+ <version>3.2.9</version>
+ </artifactItem>
+ <artifactItem>
+ <groupId>com.sun.xml.stream</groupId>
+ <artifactId>sjsxp</artifactId>
+ <version>1.0.1</version>
+ </artifactItem>
+ <artifactItem>
+ <groupId>stax</groupId>
+ <artifactId>stax</artifactId>
+ <version>1.2.0</version>
+ </artifactItem>
+ </artifactItems>
+
<outputDirectory>${project.build.directory}/parsers</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <includes>
+ <include>**/*Test.java</include>
+
<include>org/apache/axiom/util/stax/dialect/DialectTestSuite.java</include>
+ </includes>
+ <excludes>
+
<exclude>org/apache/axiom/util/stax/dialect/*Test.java</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
@@ -157,6 +211,11 @@
<goals>
<goal>test-jar</goal>
</goals>
+ <configuration>
+ <excludes>
+
<exclude>org/apache/axiom/util/stax/dialect/**/*</exclude>
+ </excludes>
+ </configuration>
</execution>
</executions>
</plugin>
Modified: webservices/commons/trunk/modules/axiom/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/pom.xml?rev=992769&r1=992768&r2=992769&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/pom.xml (original)
+++ webservices/commons/trunk/modules/axiom/pom.xml Sun Sep 5 12:34:06 2010
@@ -520,7 +520,6 @@
<module>modules/axiom-testutils</module>
<module>modules/axiom-jaxen-testsuite</module>
<module>modules/axiom-api</module>
- <module>modules/axiom-staxdialect-tests</module>
<module>modules/axiom-impl</module>
<module>modules/axiom-dom</module>
<module>modules/axiom-c14n</module>
