You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by xi...@apache.org on 2011/09/06 08:15:13 UTC
svn commit: r1165504 - in
/geronimo/server/trunk/testsuite/commands-testsuite: jaxws/pom.xml
jaxws/src/test/java/org/apache/geronimo/testsuite/jaxws/JAXWSToolsTest.java
pom.xml
Author: xiaming
Date: Tue Sep 6 06:15:13 2011
New Revision: 1165504
URL: http://svn.apache.org/viewvc?rev=1165504&view=rev
Log:
Enable jaxws tests
Modified:
geronimo/server/trunk/testsuite/commands-testsuite/jaxws/pom.xml
geronimo/server/trunk/testsuite/commands-testsuite/jaxws/src/test/java/org/apache/geronimo/testsuite/jaxws/JAXWSToolsTest.java
geronimo/server/trunk/testsuite/commands-testsuite/pom.xml
Modified: geronimo/server/trunk/testsuite/commands-testsuite/jaxws/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/commands-testsuite/jaxws/pom.xml?rev=1165504&r1=1165503&r2=1165504&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/commands-testsuite/jaxws/pom.xml (original)
+++ geronimo/server/trunk/testsuite/commands-testsuite/jaxws/pom.xml Tue Sep 6 06:15:13 2011
@@ -46,25 +46,33 @@
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <systemProperties>
- <property>
- <name>project.build.directory</name>
- <value>${project.build.directory}</value>
- </property>
- <property>
- <name>project.directory</name>
- <value>${basedir}</value>
- </property>
- </systemProperties>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <profiles>
+ <profile>
+ <id>it</id>
+ <activation>
+ <property>
+ <name>it</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <!-- Disable cxf-tools test since it's not enabled by G 3.0-Beta release-->
+ <exclude>**/CXFToolsTest.java</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.geronimo.buildsupport</groupId>
+ <artifactId>geronimo-maven-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
Modified: geronimo/server/trunk/testsuite/commands-testsuite/jaxws/src/test/java/org/apache/geronimo/testsuite/jaxws/JAXWSToolsTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/commands-testsuite/jaxws/src/test/java/org/apache/geronimo/testsuite/jaxws/JAXWSToolsTest.java?rev=1165504&r1=1165503&r2=1165504&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/commands-testsuite/jaxws/src/test/java/org/apache/geronimo/testsuite/jaxws/JAXWSToolsTest.java (original)
+++ geronimo/server/trunk/testsuite/commands-testsuite/jaxws/src/test/java/org/apache/geronimo/testsuite/jaxws/JAXWSToolsTest.java Tue Sep 6 06:15:13 2011
@@ -60,7 +60,7 @@ public class JAXWSToolsTest extends Comm
String targetDir = System.getProperty("project.build.directory");
File outputDir = createUniqueDirectory(targetDir, "wsgen-");
- File testClassesDir = new File(projectDir, "target/test-classes");
+ File testClassesDir = new File(projectDir, "test-classes");
String[] args = new String[]{ "-verbose", "-keep", "-d", outputDir.getAbsolutePath(), "-cp", testClassesDir.getAbsolutePath(), "org.apache.geronimo.testsuite.jaxws.Greeter" };
@@ -75,7 +75,7 @@ public class JAXWSToolsTest extends Comm
String targetDir = System.getProperty("project.build.directory");
File outputDir = createUniqueDirectory(targetDir, "wsimport-");
- File wsdlFile = new File(projectDir, "src/test/java/org/apache/geronimo/testsuite/jaxws/greeter_control.wsdl");
+ File wsdlFile = new File(projectDir, "../src/test/java/org/apache/geronimo/testsuite/jaxws/greeter_control.wsdl");
String[] args = new String[]{ "-verbose", "-keep", "-d", outputDir.getAbsolutePath(), wsdlFile.getAbsolutePath() };
Modified: geronimo/server/trunk/testsuite/commands-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/commands-testsuite/pom.xml?rev=1165504&r1=1165503&r2=1165504&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/commands-testsuite/pom.xml (original)
+++ geronimo/server/trunk/testsuite/commands-testsuite/pom.xml Tue Sep 6 06:15:13 2011
@@ -69,20 +69,11 @@
</pluginManagement>
</build>
</profile>
- <profile>
- <id>all-subprojects</id>
- <!-- use for things like versions:set and perhaps release when build has to run on all projects -->
- <modules>
- <module>jaxws</module>
- </modules>
- </profile>
</profiles>
<modules>
<module>deploy</module>
-<!--
<module>jaxws</module>
--->
<module>shutdown</module>
</modules>
</project>