From 82e0fe38a39caeafe1532d1d0f7168bf25e8ba20 Mon Sep 17 00:00:00 2001
From: brett <brett@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 7 Jun 2004 12:10:09 +0000
Subject: [PATCH] PR: MPJXR-9 remove xmlns on html element as jsl handles it
 wrong

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@115437 13f79535-47bb-0310-9956-ffa450edef68
---
 jxr/project.xml                                           | 2 +-
 jxr/src/plugin-resources/templates/allclasses-frame.jelly | 2 +-
 jxr/src/plugin-resources/templates/index.jelly            | 2 +-
 jxr/src/plugin-resources/templates/overview-frame.jelly   | 2 +-
 jxr/src/plugin-resources/templates/overview-summary.jelly | 2 +-
 jxr/src/plugin-resources/templates/package-frame.jelly    | 2 +-
 jxr/src/plugin-resources/templates/package-summary.jelly  | 2 +-
 jxr/xdocs/changes.xml                                     | 3 +++
 8 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/jxr/project.xml b/jxr/project.xml
index cd7fb73f..3e053a70 100644
--- a/jxr/project.xml
+++ b/jxr/project.xml
@@ -23,7 +23,7 @@
   <pomVersion>3</pomVersion>
   <id>maven-jxr-plugin</id>
   <name>Maven JXR Plug-in</name>
-  <currentVersion>1.4</currentVersion>
+  <currentVersion>1.5-SNAPSHOT</currentVersion>
   <description>Create cross reference. Requires Maven 1.0 RC2.</description>
   <shortDescription>Create cross reference</shortDescription>
   <url>http://maven.apache.org/reference/plugins/jxr/</url>
diff --git a/jxr/src/plugin-resources/templates/allclasses-frame.jelly b/jxr/src/plugin-resources/templates/allclasses-frame.jelly
index f6593c20..19b58f95 100644
--- a/jxr/src/plugin-resources/templates/allclasses-frame.jelly
+++ b/jxr/src/plugin-resources/templates/allclasses-frame.jelly
@@ -20,7 +20,7 @@
 <j:jelly trim="false" xmlns:j="jelly:core" xmlns:x="jelly:xml" xmlns:jsl="jelly:jsl">
 
   <x:doctype name="html" publicId="-//W3C//DTD XHTML 1.0 Transitional//EN" systemId="DTD/xhtml1-transitional.dtd" />
-  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+  <html xml:lang="en" lang="en">
     <head>
       <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1" />
       <title>All Classes</title>
diff --git a/jxr/src/plugin-resources/templates/index.jelly b/jxr/src/plugin-resources/templates/index.jelly
index 910a716e..aae28666 100644
--- a/jxr/src/plugin-resources/templates/index.jelly
+++ b/jxr/src/plugin-resources/templates/index.jelly
@@ -19,7 +19,7 @@
 
 <j:jelly trim="false" xmlns:j="jelly:core" xmlns:x="jelly:xml">
   <x:doctype name="html" publicId="-//W3C//DTD XHTML 1.0 Frameset//EN" systemId="DTD/xhtml1-frameset.dtd" />
-  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+  <html xml:lang="en" lang="en">
     <head>
       <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1" />
       <title>${windowTitle}</title>
diff --git a/jxr/src/plugin-resources/templates/overview-frame.jelly b/jxr/src/plugin-resources/templates/overview-frame.jelly
index a4a1a06c..898997ce 100644
--- a/jxr/src/plugin-resources/templates/overview-frame.jelly
+++ b/jxr/src/plugin-resources/templates/overview-frame.jelly
@@ -20,7 +20,7 @@
 <j:jelly trim="false" xmlns:j="jelly:core" xmlns:x="jelly:xml" xmlns:jsl="jelly:jsl">
 
   <x:doctype name="html" publicId="-//W3C//DTD XHTML 1.0 Transitional//EN" systemId="DTD/xhtml1-transitional.dtd" />
-  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+  <html xml:lang="en" lang="en">
     <head>
       <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1" />
       <title>${windowTitle}</title>
diff --git a/jxr/src/plugin-resources/templates/overview-summary.jelly b/jxr/src/plugin-resources/templates/overview-summary.jelly
index 31eeda44..d5a97cc7 100644
--- a/jxr/src/plugin-resources/templates/overview-summary.jelly
+++ b/jxr/src/plugin-resources/templates/overview-summary.jelly
@@ -30,7 +30,7 @@
   <jsl:stylesheet select="$doc">
     <jsl:template match="overview">
       <x:doctype name="html" publicId="-//W3C//DTD XHTML 1.0 Transitional//EN" systemId="DTD/xhtml1-transitional.dtd" />
-      <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+      <html xml:lang="en" lang="en">
         <head>
           <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1" />
           <title>${windowTitle}</title>
diff --git a/jxr/src/plugin-resources/templates/package-frame.jelly b/jxr/src/plugin-resources/templates/package-frame.jelly
index 97710e71..64973c50 100644
--- a/jxr/src/plugin-resources/templates/package-frame.jelly
+++ b/jxr/src/plugin-resources/templates/package-frame.jelly
@@ -20,7 +20,7 @@
 <j:jelly trim="false" xmlns:j="jelly:core" xmlns:x="jelly:xml" xmlns:jsl="jelly:jsl">
 
   <x:doctype name="html" publicId="-//W3C//DTD XHTML 1.0 Transitional//EN" systemId="DTD/xhtml1-transitional.dtd" />
-  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+  <html xml:lang="en" lang="en">
     <head>
       <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1" />
       <title>${windowTitle} Package ${pkgInfo.name}</title>
diff --git a/jxr/src/plugin-resources/templates/package-summary.jelly b/jxr/src/plugin-resources/templates/package-summary.jelly
index 94cf5c92..c3899ae6 100644
--- a/jxr/src/plugin-resources/templates/package-summary.jelly
+++ b/jxr/src/plugin-resources/templates/package-summary.jelly
@@ -30,7 +30,7 @@
   <jsl:stylesheet select="$doc">
     <jsl:template match="package-summary">
       <x:doctype name="html" publicId="-//W3C//DTD XHTML 1.0 Transitional//EN" systemId="DTD/xhtml1-transitional.dtd" />
-      <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+      <html xml:lang="en" lang="en">
         <head>
           <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1" />
           <title>${windowTitle} Package ${name}</title>
diff --git a/jxr/xdocs/changes.xml b/jxr/xdocs/changes.xml
index 77c8a058..6eae9c0f 100644
--- a/jxr/xdocs/changes.xml
+++ b/jxr/xdocs/changes.xml
@@ -25,6 +25,9 @@
     <author email="evenisse@ifrance.com">Emmanuel Venisse</author>
   </properties>
   <body>
+    <release version="1.5-SNAPSHOT" date="in CVS">
+      <action dev="brett" type="fix" issue="MPJXR-9">Remove xmlns on html elements as JSL messes it up</action>
+    </release>
     <release version="1.3" date="2004-03-07">
       <action dev="dion" type="update" issue="MPJXR-8">Apply MPJXR-8</action>
       <action dev="evenisse" type="fix">Apply patch from Nicolas De Loof for reduce open files during jxr process.</action>