svn commit: r521118 - in /incubator/cxf/trunk/tools: common/ common/src/main/java/org/apache/cxf/tools/common/ common/src/test/java/org/apache/cxf/tools/common/ javato/src/test/java/org/apache/cxf/tools/common/ validator/src/test/java/org/apache/cxf/to...

[mm...@apache.org]

Author: mmao
Date: Wed Mar 21 21:54:42 2007
New Revision: 521118

URL: http://svn.apache.org/viewvc?view=rev&rev=521118
Log:
Remove duplicated ToolTestBase

Added:
    incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/ToolTestBase.java
      - copied, changed from r521106, incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/common/ToolTestBase.java
Removed:
    incubator/cxf/trunk/tools/common/src/test/java/org/apache/cxf/tools/common/ToolTestBase.java
    incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/common/ToolTestBase.java
    incubator/cxf/trunk/tools/validator/src/test/java/org/apache/cxf/tools/common/
Modified:
    incubator/cxf/trunk/tools/common/pom.xml
    incubator/cxf/trunk/tools/validator/src/test/java/org/apache/cxf/tools/validator/WSDLValidationTest.java

Modified: incubator/cxf/trunk/tools/common/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/common/pom.xml?view=diff&rev=521118&r1=521117&r2=521118
==============================================================================
--- incubator/cxf/trunk/tools/common/pom.xml (original)
+++ incubator/cxf/trunk/tools/common/pom.xml Wed Mar 21 21:54:42 2007
@@ -36,7 +36,7 @@
 	<dependency>
 	    <groupId>junit</groupId>
 	    <artifactId>junit</artifactId>
-	    <scope>test</scope>
+	    <scope>provided</scope>
 	</dependency>
 	<dependency>
 	    <groupId>org.easymock</groupId>

Copied: incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/ToolTestBase.java (from r521106, incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/common/ToolTestBase.java)
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/ToolTestBase.java?view=diff&rev=521118&p1=incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/common/ToolTestBase.java&r1=521106&p2=incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/ToolTestBase.java&r2=521118
==============================================================================
--- incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/common/ToolTestBase.java (original)
+++ incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/ToolTestBase.java Wed Mar 21 21:54:42 2007
@@ -22,9 +22,6 @@
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.PrintStream;
-import java.net.URISyntaxException;
-import java.net.URL;
-
 import junit.framework.TestCase;
 
 import org.apache.cxf.helpers.FileUtils;
@@ -33,20 +30,16 @@
 
     protected PrintStream oldStdErr; 
     protected PrintStream oldStdOut; 
-    protected URL wsdlLocation; 
     
     protected ByteArrayOutputStream errOut = new ByteArrayOutputStream(); 
     protected ByteArrayOutputStream stdOut = new ByteArrayOutputStream(); 
 
     public void setUp() { 
-        
         oldStdErr = System.err; 
         oldStdOut = System.out;
         
         System.setErr(new PrintStream(errOut));
         System.setOut(new PrintStream(stdOut));
-        
-        wsdlLocation = ToolTestBase.class.getResource("/java2wsdl_wsdl/hello_world.wsdl");
     }
     
     public void tearDown() { 
@@ -62,7 +55,7 @@
         return new String(errOut.toByteArray());
     }
 
-    protected String getLocation(String wsdlFile) throws URISyntaxException {
+    protected String getLocation(String wsdlFile) throws Exception {
         File output = new File(getClass().getResource(".").toURI());
         output = new File(output, "resources");
         

Modified: incubator/cxf/trunk/tools/validator/src/test/java/org/apache/cxf/tools/validator/WSDLValidationTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/validator/src/test/java/org/apache/cxf/tools/validator/WSDLValidationTest.java?view=diff&rev=521118&r1=521117&r2=521118
==============================================================================
--- incubator/cxf/trunk/tools/validator/src/test/java/org/apache/cxf/tools/validator/WSDLValidationTest.java (original)
+++ incubator/cxf/trunk/tools/validator/src/test/java/org/apache/cxf/tools/validator/WSDLValidationTest.java Wed Mar 21 21:54:42 2007
@@ -19,8 +19,6 @@
 package org.apache.cxf.tools.validator;
 
 import java.io.File;
-import java.io.IOException;
-import java.net.URISyntaxException;
 import java.net.URL;
 import java.util.Enumeration;
 
@@ -142,7 +140,7 @@
 
     }
 
-    private String getLocation(String wsdlFile) throws IOException, URISyntaxException {
+    protected String getLocation(String wsdlFile) throws Exception {
         Enumeration<URL> e = WSDLValidationTest.class.getClassLoader().getResources(wsdlFile);
         while (e.hasMoreElements()) {
             URL u = e.nextElement();