Author: niclas
Date: Thu Aug 19 10:53:56 2004
New Revision: 36618
Modified:
avalon/trunk/tools/magic/etc/deliverables/themes/modern/html/transform.xsl
avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/XdocTask.java
Log:
Trying to solve the encoding problem.
Modified: avalon/trunk/tools/magic/etc/deliverables/themes/modern/html/transform.xsl
==============================================================================
--- avalon/trunk/tools/magic/etc/deliverables/themes/modern/html/transform.xsl
(original)
+++ avalon/trunk/tools/magic/etc/deliverables/themes/modern/html/transform.xsl Thu
Aug 19 10:53:56 2004
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="ISO-8859-1" ?>
<xsl:stylesheet
version="1.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform";
@@ -7,7 +7,10 @@
>
<xsl:output doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN"
doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";
- method="xml" />
+ method="xml"
+ encoding="UTF-8"
+
+ />
<xsl:param name="directory" />
<xsl:param name="file" />
@@ -38,6 +41,7 @@
<link rel="stylesheet" type="text/css">
<xsl:attribute name="href"><xsl:value-of select="$relativepath[position() =
last()]" />styles/style.css</xsl:attribute>
</link>
+ <meta http-equiv="Content-type" content="text/html; charset=UTF-8" />
</head>
<xsl:apply-templates select="body" />
</html>
Modified: avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/XdocTask.java
==============================================================================
--- avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/XdocTask.java
(original)
+++ avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/XdocTask.java
Thu Aug 19 10:53:56 2004
@@ -27,8 +27,14 @@
import javax.xml.transform.TransformerFactory;
import javax.xml.transform.stream.StreamResult;
import javax.xml.transform.stream.StreamSource;
+
import java.io.File;
import java.io.FileFilter;
+import java.io.FileOutputStream;
+import java.io.OutputStreamWriter;
+
+import java.util.Calendar;
+
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -77,7 +83,14 @@
private String m_theme;
private File m_BaseToDir;
- private File m_BaseSrcDir;
+ private File m_BaseSrcDir;
+
+ public String getTheme()
+ {
+ if( m_theme != null )
+ return m_theme;
+ return getProject().getProperty( XDOC_THEME_KEY );
+ }
public void setTheme( final String theme )
{
@@ -117,12 +130,6 @@
return getProject().getProperty( XDOC_FORMAT_KEY );
}
- private String getTheme()
- {
- if( m_theme != null ) return m_theme;
- return getProject().getProperty( XDOC_THEME_KEY );
- }
-
public void execute()
{
final Project project = getProject();
@@ -299,17 +306,18 @@
{
final String svnRoot = getProject().getProperty( XDOC_ANCHOR_URL_KEY
);
final String svnSource = svnRoot + getRelSrcPath( srcDir ) + "/" +
base;
-
+
final int pos = base.lastIndexOf( '.' );
if( pos > 0 )
base = base.substring( 0, pos );
base = base + extension;
-
+
final File newDest = new File( toDir, base );
final StreamSource xml = new StreamSource( content[i] );
final StreamResult out = new StreamResult( newDest );
- transformer.clearParameters();
+ transformer.clearParameters();
+
transformer.setParameter( "directory", getRelToPath( toDir ) );
transformer.setParameter( "fullpath", getRelToPath( newDest ) );
transformer.setParameter( "file", base );
@@ -317,27 +325,26 @@
transformer.setParameter( "copyright", copyright );
transformer.setParameter(
- "logoright_file",
- getProject().getProperty( XDOC_LOGO_RIGHT_FILE_KEY ).trim() );
+ "logoright_file",
+ getProject().getProperty( XDOC_LOGO_RIGHT_FILE_KEY ).trim() );
transformer.setParameter(
- "logoright_url",
- getProject().getProperty( XDOC_LOGO_RIGHT_URL_KEY).trim() );
+ "logoright_url",
+ getProject().getProperty( XDOC_LOGO_RIGHT_URL_KEY).trim() );
transformer.setParameter(
- "logoleft_file",
- getProject().getProperty( XDOC_LOGO_LEFT_FILE_KEY ).trim() );
+ "logoleft_file",
+ getProject().getProperty( XDOC_LOGO_LEFT_FILE_KEY ).trim() );
transformer.setParameter(
- "logoleft_url",
- getProject().getProperty( XDOC_LOGO_LEFT_URL_KEY ).trim() );
+ "logoleft_url",
+ getProject().getProperty( XDOC_LOGO_LEFT_URL_KEY ).trim() );
transformer.setParameter(
- "logomiddle_file",
- getProject().getProperty( XDOC_LOGO_MIDDLE_FILE_KEY ).trim() );
+ "logomiddle_file",
+ getProject().getProperty( XDOC_LOGO_MIDDLE_FILE_KEY ).trim() );
transformer.setParameter(
- "logomiddle_url",
- getProject().getProperty( XDOC_LOGO_MIDDLE_URL_KEY ).trim() );
+ "logomiddle_url",
+ getProject().getProperty( XDOC_LOGO_MIDDLE_URL_KEY ).trim() );
transformer.setParameter(
- "brand_name",
- getProject().getProperty( XDOC_BRAND_NAME_KEY ).trim() );
-
+ "brand_name",
+ getProject().getProperty( XDOC_BRAND_NAME_KEY ).trim() );
try
{
transformer.transform( xml, out );
@@ -412,7 +419,8 @@
}
else
{
- return "2004"; // 6 months to fix this
+ Calendar cal = Calendar.getInstance();
+ return Integer.toString( cal.get( Calendar.YEAR ) );
}
}
@@ -420,4 +428,4 @@
{
return getProject().getProperty( ORG_NAME_KEY );
}
-}
\ No newline at end of file
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
