Bommels05/maven-plugins
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MPJXR-18 : Remove hardcoded encoding in templates.

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@126213 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
evenisse 2005-01-23 15:38:05 +00:00
parent 3da5c2a00d
commit 7ca82f58b4
10 changed files with 35 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jxr/project.xml
View File

@ -23,7 +23,7 @@
<pomVersion>3</pomVersion>
<id>maven-jxr-plugin</id>
<name>Maven JXR Plug-in</name>
<currentVersion>1.4.2</currentVersion>
<currentVersion>1.4.3</currentVersion>
<description>Create cross reference.</description>
<shortDescription>Create cross reference</shortDescription>
<url>http://maven.apache.org/reference/plugins/jxr/</url>

24
jxr/src/main/org/apache/maven/jxr/DirectoryIndexer.java
View File

@ -57,7 +57,7 @@ import org.apache.commons.jelly.XMLOutput;
*
*
* @author <a href="mailto:brian@brainslug.org">Brian Leonard</a>
* @version $Id: DirectoryIndexer.java,v 1.3 2004/03/02 15:08:12 evenisse Exp $
* @version $Id$
*/
public class DirectoryIndexer
{
@ -80,6 +80,7 @@ public class DirectoryIndexer
/*
* see the getter/setter docs for these properties
*/
private String outputEncoding;
private String templateDir;
private String windowTitle;
private String docTitle;
@ -98,6 +99,26 @@ public class DirectoryIndexer
this.root = root;
}
/**
* OutputEncoding is the encoding of output files.
*
* @param outputEncoding output Encoding
*/
public void setOutputEncoding(String outputEncoding)
{
this.outputEncoding = outputEncoding;
}
/**
* see setOutputEncoding(String)
*
* @see setOutputEncoding(String)
*/
public String getOutputEncoding()
{
return outputEncoding;
}
/**
* TemplateDir is the location of the jelly template files used
* to generate the navigation pages.
@ -193,6 +214,7 @@ public class DirectoryIndexer
Map info = getPackageInfo();
JellyContext mainContext = new JellyContext();
mainContext.setVariable("outputEncoding", getOutputEncoding());
mainContext.setVariable("windowTitle", getWindowTitle());
mainContext.setVariable("docTitle", getDocTitle());
mainContext.setVariable("bottom", getBottom());

3
jxr/src/main/org/apache/maven/jxr/JxrBean.java
View File

@ -42,7 +42,7 @@ import org.apache.commons.logging.LogFactory;
* @author <a href="mailto:lucas@collab.net">Josh Lucas</a>
* @author <a href="mailto:jason@zenplex.com">Jason van Zyl</a>
* @author <a href="mailto:brian@brainslug.com">Brian Leonard</a>
* @version $Id: JxrBean.java,v 1.10 2004/08/23 13:12:44 evenisse Exp $
* @version $Id$
*/
public class JxrBean
{
@ -103,6 +103,7 @@ public class JxrBean
// once we have all the source files xref'd, create the index pages
DirectoryIndexer indexer = new DirectoryIndexer(pkgmgr, destDir);
indexer.setOutputEncoding(outputEncoding);
indexer.setTemplateDir(getTemplateDir());
indexer.setWindowTitle(getWindowTitle());
indexer.setDocTitle(getDocTitle());

2
jxr/src/plugin-resources/templates/allclasses-frame.jelly
View File

@ -22,7 +22,7 @@
<x:doctype name="html" publicId="-//W3C//DTD XHTML 1.0 Transitional//EN" systemId="DTD/xhtml1-transitional.dtd" />
<html xml:lang="en" lang="en">
<head>
<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1" />
<meta http-equiv="content-type" content="text/html; charset=${outputEncoding}" />
<title>All Classes</title>
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="style" />
</head>

2
jxr/src/plugin-resources/templates/index.jelly
View File

@ -21,7 +21,7 @@
<x:doctype name="html" publicId="-//W3C//DTD XHTML 1.0 Frameset//EN" systemId="DTD/xhtml1-frameset.dtd" />
<html xml:lang="en" lang="en">
<head>
<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1" />
<meta http-equiv="content-type" content="text/html; charset=${outputEncoding}" />
<title>${windowTitle}</title>
</head>
<frameset cols="20%,80%">

2
jxr/src/plugin-resources/templates/overview-frame.jelly
View File

@ -22,7 +22,7 @@
<x:doctype name="html" publicId="-//W3C//DTD XHTML 1.0 Transitional//EN" systemId="DTD/xhtml1-transitional.dtd" />
<html xml:lang="en" lang="en">
<head>
<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1" />
<meta http-equiv="content-type" content="text/html; charset=${outputEncoding}" />
<title>${windowTitle}</title>
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="style" />
</head>

2
jxr/src/plugin-resources/templates/overview-summary.jelly
View File

@ -32,7 +32,7 @@
<x:doctype name="html" publicId="-//W3C//DTD XHTML 1.0 Transitional//EN" systemId="DTD/xhtml1-transitional.dtd" />
<html xml:lang="en" lang="en">
<head>
<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1" />
<meta http-equiv="content-type" content="text/html; charset=${outputEncoding}" />
<title>${windowTitle}</title>
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="style" />
</head>

2
jxr/src/plugin-resources/templates/package-frame.jelly
View File

@ -22,7 +22,7 @@
<x:doctype name="html" publicId="-//W3C//DTD XHTML 1.0 Transitional//EN" systemId="DTD/xhtml1-transitional.dtd" />
<html xml:lang="en" lang="en">
<head>
<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1" />
<meta http-equiv="content-type" content="text/html; charset=${outputEncoding}" />
<title>${windowTitle} Package ${pkgInfo.name}</title>
<link rel="stylesheet" type="text/css" href="${pkgInfo.rootRef}stylesheet.css" title="style" />
</head>

2
jxr/src/plugin-resources/templates/package-summary.jelly
View File

@ -32,7 +32,7 @@
<x:doctype name="html" publicId="-//W3C//DTD XHTML 1.0 Transitional//EN" systemId="DTD/xhtml1-transitional.dtd" />
<html xml:lang="en" lang="en">
<head>
<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1" />
<meta http-equiv="content-type" content="text/html; charset=${outputEncoding}" />
<title>${windowTitle} Package ${name}</title>
<link rel="stylesheet" type="text/css" href="${pkgInfo.rootRef}stylesheet.css" title="style" />
</head>

3
jxr/xdocs/changes.xml
View File

@ -25,6 +25,9 @@
<author email="evenisse@ifrance.com">Emmanuel Venisse</author>
</properties>
<body>
<release version="1.4.3" date="In CVS">
<action dev="evenisse" type="fix" issue="MPJXR-18">Remove hardcoded encoding in templates.</action>
</release>
<release version="1.4.2" date="2004-10-23">
<action dev="brett" type="fix" issue="MPJXR-19" due-to="Stephen Scaringi">Support enum types in Java 5.0</action>
<action dev="evenisse" type="update" issue="MPJXR-14">Support encoding and lang.</action>