Author: vsiveton
Date: Sun Oct 26 13:22:23 2008
New Revision: 708032
URL: http://svn.apache.org/viewvc?rev=708032&view=rev
Log:
o deprecated createSink( File outputDir, String outputName, String encoding )
to ensure that sink uses UTF-8
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptSinkFactory.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/ConfluenceSinkFactory.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocbookSinkFactory.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoSinkFactory.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextSinkFactory.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-latex/src/main/java/org/apache/maven/doxia/module/latex/LatexSinkFactory.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/TWikiSinkFactory.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSinkFactory.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlSinkFactory.java
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptSinkFactory.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptSinkFactory.java?rev=708032&r1=708031&r2=708032&view=diff
==============================================================================
---
maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptSinkFactory.java
(original)
+++
maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptSinkFactory.java
Sun Oct 26 13:22:23 2008
@@ -42,24 +42,24 @@
public Sink createSink( File outputDir, String outputName )
throws IOException
{
- return createSink( outputDir, outputName, WriterFactory.UTF_8 );
- }
-
- /** [EMAIL PROTECTED] */
- public Sink createSink( File outputDir, String outputName, String encoding
)
- throws IOException
- {
if ( !outputDir.isDirectory() )
{
throw new IllegalArgumentException( "The dir '" + outputDir + "'
is not a directory or not exist" );
}
- Writer writer = WriterFactory.newWriter( new File( outputDir,
outputName ), encoding );
+ Writer writer = WriterFactory.newWriter( new File( outputDir,
outputName ), WriterFactory.UTF_8 );
return new AptSink( writer );
}
/** [EMAIL PROTECTED] */
+ public Sink createSink( File outputDir, String outputName, String encoding
)
+ throws IOException
+ {
+ return createSink( outputDir, outputName );
+ }
+
+ /** [EMAIL PROTECTED] */
public Sink createSink( Writer writer )
{
return new AptSink( writer );
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/ConfluenceSinkFactory.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/ConfluenceSinkFactory.java?rev=708032&r1=708031&r2=708032&view=diff
==============================================================================
---
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/ConfluenceSinkFactory.java
(original)
+++
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/ConfluenceSinkFactory.java
Sun Oct 26 13:22:23 2008
@@ -42,24 +42,24 @@
public Sink createSink( File outputDir, String outputName )
throws IOException
{
- return createSink( outputDir, outputName, WriterFactory.UTF_8 );
- }
-
- /** [EMAIL PROTECTED] */
- public Sink createSink( File outputDir, String outputName, String encoding
)
- throws IOException
- {
if ( !outputDir.isDirectory() )
{
throw new IllegalArgumentException( "The dir '" + outputDir + "'
is not a directory or not exist" );
}
- Writer writer = WriterFactory.newWriter( new File( outputDir,
outputName ), encoding );
+ Writer writer = WriterFactory.newWriter( new File( outputDir,
outputName ), WriterFactory.UTF_8 );
return new ConfluenceSink( writer );
}
/** [EMAIL PROTECTED] */
+ public Sink createSink( File outputDir, String outputName, String encoding
)
+ throws IOException
+ {
+ return createSink( outputDir, outputName );
+ }
+
+ /** [EMAIL PROTECTED] */
public Sink createSink( Writer writer )
{
return new ConfluenceSink( writer );
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocbookSinkFactory.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocbookSinkFactory.java?rev=708032&r1=708031&r2=708032&view=diff
==============================================================================
---
maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocbookSinkFactory.java
(original)
+++
maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocbookSinkFactory.java
Sun Oct 26 13:22:23 2008
@@ -42,24 +42,24 @@
public Sink createSink( File outputDir, String outputName )
throws IOException
{
- return createSink( outputDir, outputName, WriterFactory.UTF_8 );
- }
-
- /** [EMAIL PROTECTED] */
- public Sink createSink( File outputDir, String outputName, String encoding
)
- throws IOException
- {
if ( !outputDir.isDirectory() )
{
throw new IllegalArgumentException( "The dir '" + outputDir + "'
is not a directory or not exist" );
}
- Writer writer = WriterFactory.newWriter( new File( outputDir,
outputName ), encoding );
+ Writer writer = WriterFactory.newXmlWriter( new File( outputDir,
outputName ) );
return new DocBookSink( writer );
}
/** [EMAIL PROTECTED] */
+ public Sink createSink( File outputDir, String outputName, String encoding
)
+ throws IOException
+ {
+ return createSink( outputDir, outputName );
+ }
+
+ /** [EMAIL PROTECTED] */
public Sink createSink( Writer writer )
{
return new DocBookSink( writer );
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoSinkFactory.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoSinkFactory.java?rev=708032&r1=708031&r2=708032&view=diff
==============================================================================
---
maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoSinkFactory.java
(original)
+++
maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoSinkFactory.java
Sun Oct 26 13:22:23 2008
@@ -42,24 +42,24 @@
public Sink createSink( File outputDir, String outputName )
throws IOException
{
- return createSink( outputDir, outputName, WriterFactory.UTF_8 );
- }
-
- /** [EMAIL PROTECTED] */
- public Sink createSink( File outputDir, String outputName, String encoding
)
- throws IOException
- {
if ( !outputDir.isDirectory() )
{
throw new IllegalArgumentException( "The dir '" + outputDir + "'
is not a directory or not exist" );
}
- Writer writer = WriterFactory.newWriter( new File( outputDir,
outputName ), encoding );
+ Writer writer = WriterFactory.newXmlWriter( new File( outputDir,
outputName ) );
return new FoSink( writer );
}
/** [EMAIL PROTECTED] */
+ public Sink createSink( File outputDir, String outputName, String encoding
)
+ throws IOException
+ {
+ return createSink( outputDir, outputName );
+ }
+
+ /** [EMAIL PROTECTED] */
public Sink createSink( Writer writer )
{
return new FoSink( writer );
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextSinkFactory.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextSinkFactory.java?rev=708032&r1=708031&r2=708032&view=diff
==============================================================================
---
maven/doxia/doxia/trunk/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextSinkFactory.java
(original)
+++
maven/doxia/doxia/trunk/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextSinkFactory.java
Sun Oct 26 13:22:23 2008
@@ -42,24 +42,24 @@
public Sink createSink( File outputDir, String outputName )
throws IOException
{
- return createSink( outputDir, outputName, WriterFactory.UTF_8 );
- }
-
- /** [EMAIL PROTECTED] */
- public Sink createSink( File outputDir, String outputName, String encoding
)
- throws IOException
- {
if ( !outputDir.isDirectory() )
{
throw new IllegalArgumentException( "The dir '" + outputDir + "'
is not a directory or not exist" );
}
- Writer writer = WriterFactory.newWriter( new File( outputDir,
outputName ), encoding );
+ Writer writer = WriterFactory.newXmlWriter( new File( outputDir,
outputName ) );
return new ITextSink( writer );
}
/** [EMAIL PROTECTED] */
+ public Sink createSink( File outputDir, String outputName, String encoding
)
+ throws IOException
+ {
+ return createSink( outputDir, outputName );
+ }
+
+ /** [EMAIL PROTECTED] */
public Sink createSink( Writer writer )
{
return new ITextSink( writer );
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-latex/src/main/java/org/apache/maven/doxia/module/latex/LatexSinkFactory.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-latex/src/main/java/org/apache/maven/doxia/module/latex/LatexSinkFactory.java?rev=708032&r1=708031&r2=708032&view=diff
==============================================================================
---
maven/doxia/doxia/trunk/doxia-modules/doxia-module-latex/src/main/java/org/apache/maven/doxia/module/latex/LatexSinkFactory.java
(original)
+++
maven/doxia/doxia/trunk/doxia-modules/doxia-module-latex/src/main/java/org/apache/maven/doxia/module/latex/LatexSinkFactory.java
Sun Oct 26 13:22:23 2008
@@ -42,24 +42,24 @@
public Sink createSink( File outputDir, String outputName )
throws IOException
{
- return createSink( outputDir, outputName, WriterFactory.UTF_8 );
- }
-
- /** [EMAIL PROTECTED] */
- public Sink createSink( File outputDir, String outputName, String encoding
)
- throws IOException
- {
if ( !outputDir.isDirectory() )
{
throw new IllegalArgumentException( "The dir '" + outputDir + "'
is not a directory or not exist" );
}
- Writer writer = WriterFactory.newWriter( new File( outputDir,
outputName ), encoding );
+ Writer writer = WriterFactory.newWriter( new File( outputDir,
outputName ), WriterFactory.UTF_8 );
return new LatexSink( writer );
}
/** [EMAIL PROTECTED] */
+ public Sink createSink( File outputDir, String outputName, String encoding
)
+ throws IOException
+ {
+ return createSink( outputDir, outputName );
+ }
+
+ /** [EMAIL PROTECTED] */
public Sink createSink( Writer writer )
{
return new LatexSink( writer );
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/TWikiSinkFactory.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/TWikiSinkFactory.java?rev=708032&r1=708031&r2=708032&view=diff
==============================================================================
---
maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/TWikiSinkFactory.java
(original)
+++
maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/TWikiSinkFactory.java
Sun Oct 26 13:22:23 2008
@@ -42,24 +42,24 @@
public Sink createSink( File outputDir, String outputName )
throws IOException
{
- return createSink( outputDir, outputName, WriterFactory.UTF_8 );
- }
-
- /** [EMAIL PROTECTED] */
- public Sink createSink( File outputDir, String outputName, String encoding
)
- throws IOException
- {
if ( !outputDir.isDirectory() )
{
throw new IllegalArgumentException( "The dir '" + outputDir + "'
is not a directory or not exist" );
}
- Writer writer = WriterFactory.newWriter( new File( outputDir,
outputName ), encoding );
+ Writer writer = WriterFactory.newWriter( new File( outputDir,
outputName ), WriterFactory.UTF_8 );
return new TWikiSink( writer );
}
/** [EMAIL PROTECTED] */
+ public Sink createSink( File outputDir, String outputName, String encoding
)
+ throws IOException
+ {
+ return createSink( outputDir, outputName );
+ }
+
+ /** [EMAIL PROTECTED] */
public Sink createSink( Writer writer )
{
return new TWikiSink( writer );
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSinkFactory.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSinkFactory.java?rev=708032&r1=708031&r2=708032&view=diff
==============================================================================
---
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSinkFactory.java
(original)
+++
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSinkFactory.java
Sun Oct 26 13:22:23 2008
@@ -42,24 +42,24 @@
public Sink createSink( File outputDir, String outputName )
throws IOException
{
- return createSink( outputDir, outputName, WriterFactory.UTF_8 );
- }
-
- /** [EMAIL PROTECTED] */
- public Sink createSink( File outputDir, String outputName, String encoding
)
- throws IOException
- {
if ( !outputDir.isDirectory() )
{
throw new IllegalArgumentException( "The dir '" + outputDir + "'
is not a directory or not exist" );
}
- Writer writer = WriterFactory.newWriter( new File( outputDir,
outputName ), encoding );
+ Writer writer = WriterFactory.newXmlWriter( new File( outputDir,
outputName ) );
return new XdocSink( writer );
}
/** [EMAIL PROTECTED] */
+ public Sink createSink( File outputDir, String outputName, String encoding
)
+ throws IOException
+ {
+ return createSink( outputDir, outputName );
+ }
+
+ /** [EMAIL PROTECTED] */
public Sink createSink( Writer writer )
{
return new XdocSink( writer );
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlSinkFactory.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlSinkFactory.java?rev=708032&r1=708031&r2=708032&view=diff
==============================================================================
---
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlSinkFactory.java
(original)
+++
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlSinkFactory.java
Sun Oct 26 13:22:23 2008
@@ -42,24 +42,24 @@
public Sink createSink( File outputDir, String outputName )
throws IOException
{
- return createSink( outputDir, outputName, WriterFactory.UTF_8 );
- }
-
- /** [EMAIL PROTECTED] */
- public Sink createSink( File outputDir, String outputName, String encoding
)
- throws IOException
- {
if ( !outputDir.isDirectory() )
{
throw new IllegalArgumentException( "The dir '" + outputDir + "'
is not a directory or not exist" );
}
- Writer writer = WriterFactory.newWriter( new File( outputDir,
outputName ), encoding );
+ Writer writer = WriterFactory.newXmlWriter( new File( outputDir,
outputName ) );
return new XhtmlSink( writer );
}
/** [EMAIL PROTECTED] */
+ public Sink createSink( File outputDir, String outputName, String encoding
)
+ throws IOException
+ {
+ return createSink( outputDir, outputName );
+ }
+
+ /** [EMAIL PROTECTED] */
public Sink createSink( Writer writer )
{
return new XhtmlSink( writer );
