Author: vsiveton
Date: Sun May 31 10:52:26 2009
New Revision: 780406
URL: http://svn.apache.org/viewvc?rev=780406&view=rev
Log:
o restored jdk 1.4 compatibility
Modified:
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/HtmlTools.java
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/xsd/AbstractXmlValidatorTest.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/pom.xml
Modified:
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/HtmlTools.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/HtmlTools.java?rev=780406&r1=780405&r2=780406&view=diff
==============================================================================
---
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/HtmlTools.java
(original)
+++
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/HtmlTools.java
Sun May 31 10:52:26 2009
@@ -305,7 +305,7 @@
StringBuffer encoded = new StringBuffer();
int length = url.length();
- int[] unicode = new int[1];
+ char[] unicode = new char[1];
for ( int i = 0; i < length; ++i )
{
@@ -350,13 +350,15 @@
{
if ( isHighSurrogate( c ) )
{
- unicode[0] = toCodePoint( c, url.charAt( ++i )
);
+ int codePoint = toCodePoint( c, url.charAt(
++i ) );
+ unicode = toChars( codePoint );
+ bytes = ( new String( unicode, 0,
unicode.length ) ).getBytes( "UTF8" );
}
else
{
unicode[0] = c;
+ bytes = ( new String( unicode, 0, 1 )
).getBytes( "UTF8" );
}
- bytes = ( new String( unicode, 0, 1 ) ).getBytes(
"UTF8" );
}
catch ( UnsupportedEncodingException cannotHappen )
{
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=780406&r1=780405&r2=780406&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
Sun May 31 10:52:26 2009
@@ -248,15 +248,7 @@
else
{
// IDE projects
- File testDocsDir;
- try
- {
- testDocsDir = new File( testJar.toURI() ).getParentFile();
- }
- catch ( URISyntaxException e )
- {
- throw new IOException( "URISyntaxException: " + e.getMessage()
);
- }
+ File testDocsDir = new File( testJar.getFile() ).getParentFile();
List files = FileUtils.getFiles( testDocsDir, "**/*.*",
FileUtils.getDefaultExcludesAsString(), true );
for ( Iterator it = files.iterator(); it.hasNext();)
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/pom.xml
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/pom.xml?rev=780406&r1=780405&r2=780406&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/pom.xml (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/pom.xml Sun May 31
10:52:26 2009
@@ -79,14 +79,9 @@
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- <version>1.0.b2</version>
- </dependency>
- <dependency>
- <groupId>xml-apis</groupId>
- <artifactId>xmlParserAPIs</artifactId>
- <version>2.0.2</version>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.9.1</version>
</dependency>
</dependencies>
