svn commit: r1060799 - /maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/xsd/AbstractXmlValidatorTest.java

2011-01-19 Thread brett
Author: brett
Date: Wed Jan 19 12:59:25 2011
New Revision: 1060799

URL: http://svn.apache.org/viewvc?rev=1060799&view=rev
Log:
trying an alternate way of getting the path to get it working in Hudson. Note 
this is a Java 5 API - but it's only for testing.

Modified:

maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/xsd/AbstractXmlValidatorTest.java

Modified: 
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/xsd/AbstractXmlValidatorTest.java
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/xsd/AbstractXmlValidatorTest.java?rev=1060799&r1=1060798&r2=1060799&view=diff
==
--- 
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/xsd/AbstractXmlValidatorTest.java
 (original)
+++ 
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/xsd/AbstractXmlValidatorTest.java
 Wed Jan 19 12:59:25 2011
@@ -26,6 +26,7 @@ import java.io.Reader;
 import java.io.StringReader;
 import java.net.JarURLConnection;
 import java.net.URL;
+import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Enumeration;
@@ -246,8 +247,16 @@ public abstract class AbstractXmlValidat
 }
 else
 {
-// IDE projects
-File testDocsDir = FileUtils.toFile( testJar ).getParentFile();
+// IDE projects - get parent directory of "doxia-site"
+File testDocsDir;
+try
+{
+testDocsDir = new File( testJar.toURI() ).getParentFile();
+}
+catch ( URISyntaxException e )
+{
+testDocsDir = new File( testJar.getPath() ).getParentFile();
+}
 
 List files = FileUtils.getFiles( testDocsDir, "**/*.*", 
FileUtils.getDefaultExcludesAsString(), true );
 for ( Iterator it = files.iterator(); it.hasNext();)




svn commit: r1060800 - /maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/xsd/AbstractXmlValidatorTest.java

2011-01-19 Thread brett
Author: brett
Date: Wed Jan 19 13:03:40 2011
New Revision: 1060800

URL: http://svn.apache.org/viewvc?rev=1060800&view=rev
Log:
revert last change, and add S.o.println to check what Hudson expects

Modified:

maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/xsd/AbstractXmlValidatorTest.java

Modified: 
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/xsd/AbstractXmlValidatorTest.java
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/xsd/AbstractXmlValidatorTest.java?rev=1060800&r1=1060799&r2=1060800&view=diff
==
--- 
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/xsd/AbstractXmlValidatorTest.java
 (original)
+++ 
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/xsd/AbstractXmlValidatorTest.java
 Wed Jan 19 13:03:40 2011
@@ -26,7 +26,6 @@ import java.io.Reader;
 import java.io.StringReader;
 import java.net.JarURLConnection;
 import java.net.URL;
-import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Enumeration;
@@ -247,16 +246,9 @@ public abstract class AbstractXmlValidat
 }
 else
 {
-// IDE projects - get parent directory of "doxia-site"
-File testDocsDir;
-try
-{
-testDocsDir = new File( testJar.toURI() ).getParentFile();
-}
-catch ( URISyntaxException e )
-{
-testDocsDir = new File( testJar.getPath() ).getParentFile();
-}
+// IDE projects
+System.out.println( testJar );
+File testDocsDir = FileUtils.toFile( testJar ).getParentFile();
 
 List files = FileUtils.getFiles( testDocsDir, "**/*.*", 
FileUtils.getDefaultExcludesAsString(), true );
 for ( Iterator it = files.iterator(); it.hasNext();)




svn commit: r1060808 - /maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/xsd/AbstractXmlValidatorTest.java

2011-01-19 Thread brett
Author: brett
Date: Wed Jan 19 13:18:48 2011
New Revision: 1060808

URL: http://svn.apache.org/viewvc?rev=1060808&view=rev
Log:
force replace to test a theory

Modified:

maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/xsd/AbstractXmlValidatorTest.java

Modified: 
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/xsd/AbstractXmlValidatorTest.java
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/xsd/AbstractXmlValidatorTest.java?rev=1060808&r1=1060807&r2=1060808&view=diff
==
--- 
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/xsd/AbstractXmlValidatorTest.java
 (original)
+++ 
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/xsd/AbstractXmlValidatorTest.java
 Wed Jan 19 13:18:48 2011
@@ -45,6 +45,7 @@ import org.codehaus.plexus.util.FileUtil
 import org.codehaus.plexus.util.IOUtil;
 import org.codehaus.plexus.util.ReaderFactory;
 import org.codehaus.plexus.util.SelectorUtils;
+import org.codehaus.plexus.util.StringUtils;
 import org.codehaus.plexus.util.xml.XmlUtil;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
@@ -247,8 +248,7 @@ public abstract class AbstractXmlValidat
 else
 {
 // IDE projects
-System.out.println( testJar );
-File testDocsDir = FileUtils.toFile( testJar ).getParentFile();
+File testDocsDir = new File( StringUtils.replace( 
testJar.getPath(), "%20", " " ) ).getParentFile();
 
 List files = FileUtils.getFiles( testDocsDir, "**/*.*", 
FileUtils.getDefaultExcludesAsString(), true );
 for ( Iterator it = files.iterator(); it.hasNext();)




svn commit: r1060812 - /maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/xsd/AbstractXmlValidatorTest.java

2011-01-19 Thread brett
Author: brett
Date: Wed Jan 19 13:44:54 2011
New Revision: 1060812

URL: http://svn.apache.org/viewvc?rev=1060812&view=rev
Log:
back to -r1060355, it was working, Maven just wasn't picking up the test-jar 
changes due to the way it was used

Modified:

maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/xsd/AbstractXmlValidatorTest.java

Modified: 
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/xsd/AbstractXmlValidatorTest.java
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/xsd/AbstractXmlValidatorTest.java?rev=1060812&r1=1060811&r2=1060812&view=diff
==
--- 
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/xsd/AbstractXmlValidatorTest.java
 (original)
+++ 
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/xsd/AbstractXmlValidatorTest.java
 Wed Jan 19 13:44:54 2011
@@ -45,7 +45,6 @@ import org.codehaus.plexus.util.FileUtil
 import org.codehaus.plexus.util.IOUtil;
 import org.codehaus.plexus.util.ReaderFactory;
 import org.codehaus.plexus.util.SelectorUtils;
-import org.codehaus.plexus.util.StringUtils;
 import org.codehaus.plexus.util.xml.XmlUtil;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
@@ -248,7 +247,7 @@ public abstract class AbstractXmlValidat
 else
 {
 // IDE projects
-File testDocsDir = new File( StringUtils.replace( 
testJar.getPath(), "%20", " " ) ).getParentFile();
+File testDocsDir = FileUtils.toFile( testJar ).getParentFile();
 
 List files = FileUtils.getFiles( testDocsDir, "**/*.*", 
FileUtils.getDefaultExcludesAsString(), true );
 for ( Iterator it = files.iterator(); it.hasNext();)