diff --git a/jxr/project.xml b/jxr/project.xml index 0fe1e8b3..7b1cc7cd 100644 --- a/jxr/project.xml +++ b/jxr/project.xml @@ -23,7 +23,7 @@ 3 maven-jxr-plugin Maven JXR Plug-in - 1.4.2 + 1.4.3 Create cross reference. Create cross reference http://maven.apache.org/reference/plugins/jxr/ diff --git a/jxr/src/main/org/apache/maven/jxr/DirectoryIndexer.java b/jxr/src/main/org/apache/maven/jxr/DirectoryIndexer.java index 2e401632..4efeb816 100644 --- a/jxr/src/main/org/apache/maven/jxr/DirectoryIndexer.java +++ b/jxr/src/main/org/apache/maven/jxr/DirectoryIndexer.java @@ -57,7 +57,7 @@ import org.apache.commons.jelly.XMLOutput; * * * @author Brian Leonard - * @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()); diff --git a/jxr/src/main/org/apache/maven/jxr/JxrBean.java b/jxr/src/main/org/apache/maven/jxr/JxrBean.java index 43a2acdf..e3df87f8 100644 --- a/jxr/src/main/org/apache/maven/jxr/JxrBean.java +++ b/jxr/src/main/org/apache/maven/jxr/JxrBean.java @@ -42,7 +42,7 @@ import org.apache.commons.logging.LogFactory; * @author Josh Lucas * @author Jason van Zyl * @author Brian Leonard - * @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()); diff --git a/jxr/src/plugin-resources/templates/allclasses-frame.jelly b/jxr/src/plugin-resources/templates/allclasses-frame.jelly index 19b58f95..4c5c03ae 100644 --- a/jxr/src/plugin-resources/templates/allclasses-frame.jelly +++ b/jxr/src/plugin-resources/templates/allclasses-frame.jelly @@ -22,7 +22,7 @@ - + All Classes diff --git a/jxr/src/plugin-resources/templates/index.jelly b/jxr/src/plugin-resources/templates/index.jelly index aae28666..23ae56fc 100644 --- a/jxr/src/plugin-resources/templates/index.jelly +++ b/jxr/src/plugin-resources/templates/index.jelly @@ -21,7 +21,7 @@ - + ${windowTitle} diff --git a/jxr/src/plugin-resources/templates/overview-frame.jelly b/jxr/src/plugin-resources/templates/overview-frame.jelly index 898997ce..7e2d11c2 100644 --- a/jxr/src/plugin-resources/templates/overview-frame.jelly +++ b/jxr/src/plugin-resources/templates/overview-frame.jelly @@ -22,7 +22,7 @@ - + ${windowTitle} diff --git a/jxr/src/plugin-resources/templates/overview-summary.jelly b/jxr/src/plugin-resources/templates/overview-summary.jelly index d5a97cc7..0d4b0fc7 100644 --- a/jxr/src/plugin-resources/templates/overview-summary.jelly +++ b/jxr/src/plugin-resources/templates/overview-summary.jelly @@ -32,7 +32,7 @@ - + ${windowTitle} diff --git a/jxr/src/plugin-resources/templates/package-frame.jelly b/jxr/src/plugin-resources/templates/package-frame.jelly index 64973c50..d2b9d2e5 100644 --- a/jxr/src/plugin-resources/templates/package-frame.jelly +++ b/jxr/src/plugin-resources/templates/package-frame.jelly @@ -22,7 +22,7 @@ - + ${windowTitle} Package ${pkgInfo.name} diff --git a/jxr/src/plugin-resources/templates/package-summary.jelly b/jxr/src/plugin-resources/templates/package-summary.jelly index c3899ae6..d20f867f 100644 --- a/jxr/src/plugin-resources/templates/package-summary.jelly +++ b/jxr/src/plugin-resources/templates/package-summary.jelly @@ -32,7 +32,7 @@ - + ${windowTitle} Package ${name} diff --git a/jxr/xdocs/changes.xml b/jxr/xdocs/changes.xml index 84e12277..bb13da25 100644 --- a/jxr/xdocs/changes.xml +++ b/jxr/xdocs/changes.xml @@ -25,6 +25,9 @@ Emmanuel Venisse + + Remove hardcoded encoding in templates. + Support enum types in Java 5.0 Support encoding and lang.