geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r670019 - in /geronimo/server/branches/2.1/testsuite/commands-testsuite/jaxws: pom.xml src/test/java/org/apache/geronimo/testsuite/jaxws/JAXWSToolsTest.java
Date Fri, 20 Jun 2008 18:22:53 GMT
Author: gawor
Date: Fri Jun 20 11:22:52 2008
New Revision: 670019

URL: http://svn.apache.org/viewvc?rev=670019&view=rev
Log:
workaround for some maven versions that do not expose ${project.build.directory} property

Modified:
    geronimo/server/branches/2.1/testsuite/commands-testsuite/jaxws/pom.xml
    geronimo/server/branches/2.1/testsuite/commands-testsuite/jaxws/src/test/java/org/apache/geronimo/testsuite/jaxws/JAXWSToolsTest.java

Modified: geronimo/server/branches/2.1/testsuite/commands-testsuite/jaxws/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/commands-testsuite/jaxws/pom.xml?rev=670019&r1=670018&r2=670019&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/commands-testsuite/jaxws/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/commands-testsuite/jaxws/pom.xml Fri Jun 20 11:22:52
2008
@@ -66,10 +66,6 @@
                             </suiteXmlFiles>
                             <systemProperties>
                                <property>
-                                   <name>project.build.directory</name>
-                                   <value>${project.build.directory}</value>
-                               </property>
-                               <property>
                                    <name>project.directory</name>
                                    <value>${basedir}</value>
                                </property>

Modified: geronimo/server/branches/2.1/testsuite/commands-testsuite/jaxws/src/test/java/org/apache/geronimo/testsuite/jaxws/JAXWSToolsTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/commands-testsuite/jaxws/src/test/java/org/apache/geronimo/testsuite/jaxws/JAXWSToolsTest.java?rev=670019&r1=670018&r2=670019&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/commands-testsuite/jaxws/src/test/java/org/apache/geronimo/testsuite/jaxws/JAXWSToolsTest.java
(original)
+++ geronimo/server/branches/2.1/testsuite/commands-testsuite/jaxws/src/test/java/org/apache/geronimo/testsuite/jaxws/JAXWSToolsTest.java
Fri Jun 20 11:22:52 2008
@@ -57,10 +57,10 @@
     @Test
     public void testWsGen() throws Exception {
         String projectDir = System.getProperty("project.directory");
-        String targetDir = System.getProperty("project.build.directory");
+        File targetDir = new File(projectDir, "target");
         
         File outputDir = createUniqueDirectory(targetDir, "wsgen-");
-        File testClassesDir = new File(projectDir, "target/test-classes");
+        File testClassesDir = new File(targetDir, "test-classes");
         
         String[] args = new String[]{ "-verbose", "-keep", "-d", outputDir.getAbsolutePath(),
"-cp", testClassesDir.getAbsolutePath(), "org.apache.geronimo.testsuite.jaxws.Greeter" };
  
@@ -72,7 +72,7 @@
     @Test
     public void testWsImport() throws Exception {
         String projectDir = System.getProperty("project.directory");
-        String targetDir = System.getProperty("project.build.directory");
+        File targetDir = new File(projectDir, "target");
         
         File outputDir = createUniqueDirectory(targetDir, "wsimport-");        
         File wsdlFile = new File(projectDir, "src/test/java/org/apache/geronimo/testsuite/jaxws/greeter_control.wsdl");
@@ -97,7 +97,7 @@
         }
     }
     
-    private File createUniqueDirectory(String targetDir, String prefix) {
+    private File createUniqueDirectory(File targetDir, String prefix) {
         File dir = new File(targetDir, prefix + System.currentTimeMillis());
         if (!dir.mkdir()) {
             throw new RuntimeException("Failed to create unqiue directory " + dir);



Mime
View raw message