You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by br...@apache.org on 2005/05/21 17:10:42 UTC

svn commit: r171222 [2/4] - in /maven/maven-1/plugins/trunk/xdoc: ./ src/main/org/apache/maven/xdoc/ src/main/org/apache/maven/xdoc/util/ src/plugin-resources/ src/plugin-resources/templates/ src/plugin-resources/templates/scm/ src/plugin-test/ src/plugin-test/test01/xdocs/ src/plugin-test/test03/ src/plugin-test/test03/xdocs/ src/plugin-test/test03/xdocs/images/ src/plugin-test/test03/xdocs/subdir/ src/plugin-test/test03/xdocs/subdir/subdir2/ src/plugin-test/test04/ src/plugin-test/test04/xdocs/ src/plugin-test/test04/xdocs/images/ src/plugin-test/test04/xdocs/subdir/ src/plugin-test/test04/xdocs/subdir/subdir2/ src/plugin-test/testDependenciesComment/ src/test/org/apache/maven/xdoc/ src/test/org/apache/maven/xdoc/util/ xdocs/

Modified: maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/site.jsl
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/site.jsl?rev=171222&r1=171221&r2=171222&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/site.jsl (original)
+++ maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/site.jsl Sat May 21 08:10:41 2005
@@ -27,6 +27,7 @@
   xmlns:log="jelly:log"
   xmlns:util="jelly:util"
   xmlns:x="jelly:xml"
+  xmlns:fmt="jelly:fmt"
   xmlns:doc="doc"
   xmlns:maven="jelly:maven"
   xmlns="dummy">
@@ -42,40 +43,104 @@
     <j:setProperties object="${navbean}" document="${doc}" location="${location}"/>
     <x:set var="templateContext" select="." />
 
+    <!-- Format the build date depending the current locale if no pattern is defined -->
+    <j:if test="${currentLocale.equals(defaultLocale)}">
+      <j:if test="${now == null}">
+        <j:useBean var="now" class="java.util.Date"/>
+      </j:if>
+      <fmt:formatDate value="${now}" type="both" dateStyle="long" timeStyle="long" var="build.date"/>
+    </j:if>
+      
     <html>
       <head>
         <j:set var="docTitle"><x:expr select="./properties/title"/></j:set>
+
+        <!-- Key is more important than message... -->
+        <!-- From doc -->
+        <j:set var="_docKey">
+          <x:expr select="./properties/title/@key" />
+        </j:set>
+        <j:set var="_docBundle">
+          <x:expr select="./properties/title/@bundle" />
+        </j:set>
+        <j:if test="${empty(_docKey)}">
+          <j:set var="_docTitle">
+            <x:expr select="./properties/title" />
+          </j:set>
+        </j:if>
+        <j:if test="${!empty(_docKey)}">
+          <!-- Shortcut for the user bundle -->
+          <j:if test="${empty(_docBundle)}">
+            <fmt:message key="${_docKey}" bundle="${myMsg}" var="_docTitle"/>
+          </j:if>
+          <j:if test="${!empty(_docBundle)}">
+            <fmt:bundle basename="${_docBundle}">
+              <fmt:message key="${_docKey}" var="_docTitle"/>
+            </fmt:bundle>
+          </j:if>
+        </j:if>
+
+        <!-- From nav -->
+        <j:set var="_navKey">
+          <x:expr select="$nav/title/@key" />
+        </j:set>
+        <j:set var="_navBundle">
+          <x:expr select="$nav/title/@bundle" />
+        </j:set>
+        <j:if test="${empty(_navKey)}">
+          <j:set var="_navTitle">
+            <x:expr select="$nav/title" />
+          </j:set>
+        </j:if>
+        <j:if test="${!empty(_navKey)}">
+          <!-- Shortcut for the user bundle -->
+          <j:if test="${empty(_navBundle)}">
+            <fmt:message key="${_navKey}" bundle="${myMsg}" var="_navTitle"/>
+          </j:if>
+          <j:if test="${!empty(_navBundle)}">
+            <fmt:bundle basename="${_navBundle}">
+              <fmt:message key="${_navKey}" var="_navTitle"/>
+            </fmt:bundle>
+          </j:if>
+        </j:if>
+
+        <j:set var="titleSeparator" value=" - "/>
+        
         <x:if select="$nav/title">
-          <title><x:expr select="$nav/title"/> - ${docTitle}</title>
+          <title>
+            ${_docTitle}${titleSeparator}${_navTitle}
+          </title>
         </x:if>
         <x:if select="not($nav/title)">
-          <title>${pom.name} - ${docTitle}</title>
+          <title>
+            ${pom.name}${titleSeparator}${_navTitle}
+          </title>
         </x:if>
-
+        
         <j:set var="themeUrl" value="${maven.xdoc.theme.url}"/>
         <util:file var="projectCssFile" name="${maven.docs.src}/style/project.css"/>
         
         <style type="text/css" media="all"><![CDATA[
-          @import url("${relativePath}/style/maven-base.css");
+          @import url("${relativePathForLocale}style/maven-base.css");
           ]]>
           <j:if test="${!empty(themeUrl)}"><![CDATA[
             @import url("${maven.xdoc.theme.url}");
           ]]></j:if>
           <j:if test="${empty(themeUrl)}"><![CDATA[
-            @import url("${relativePath}/style/maven-${maven.xdoc.theme}.css");
+            @import url("${relativePathForLocale}style/maven-${maven.xdoc.theme}.css");
           ]]></j:if>
           <j:if test="${projectCssFile.exists()}"><![CDATA[
-            @import url("${relativePath}/style/project.css");
+            @import url("${relativePathForLocale}style/project.css");
           ]]></j:if>
         </style>
-        
-        <link rel="stylesheet" type="text/css" href="${relativePath}/style/print.css" media="print"/>
+
+        <link rel="stylesheet" type="text/css" href="${relativePathForLocale}style/print.css" media="print"/>
         <meta http-equiv="Content-Type" content="text/html; charset=${outputencoding}"/>
-        <x:forEach var="author" select="$templateContext/properties/author">
+        <x:forEach var="author" select="./properties/author">
           <meta name="author" content="${author.text}"/>
           <meta name="email" content="${author.attribute('email').value}"/>
         </x:forEach>
-
+        
         <jsl:applyTemplates select="$templateContext/head/*" />
       </head>
       <jsl:applyTemplates select="$templateContext/*" />
@@ -90,202 +155,314 @@
 
   <jsl:template match="body" trim="true">
     <x:set var="templateContext" select="." />
-    <x:element name="body"><j:whitespace trim="true">
-      <x:attribute name="class">composite</x:attribute>
+      <x:element name="body"><j:whitespace trim="true">
+        <x:attribute name="class">composite</x:attribute>
       <x:forEach var="attr" select="@*">
-        <x:attribute name="${attr.name}">${attr.value}</x:attribute>
-      </x:forEach>
-      </j:whitespace>
-      <div id="banner">
-        <!-- organization logo -->
-        <j:set var="logo" value="${pom.organization.logo}"/>
-        <j:if test="${!empty(logo)}">
-          <!-- set url to org or project url -->
-          <j:set var="url" value="${pom.organization.url}"/>
-          <j:if test="${!empty(url)}">
-            <j:set var="home" value="${pom.organization.url}"/>
-          </j:if>
-          <j:if test="${empty(url)}">
-            <j:set var="home" value="${pom.url}"/>
+          <x:attribute name="${attr.name}">${attr.value}</x:attribute>
+        </x:forEach>
+        </j:whitespace>
+
+        <div id="banner">
+          <!-- organization logo -->
+          <j:set var="logo" value="${pom.organization.logo}"/>
+          <j:if test="${!empty(logo)}">
+            <!-- set url to org or project url -->
+            <j:set var="url" value="${pom.organization.url}"/>
+            <j:if test="${!empty(url)}">
+              <j:set var="home" value="${pom.organization.url}"/>
+            </j:if>
+            <j:if test="${empty(url)}">
+              <j:set var="home" value="${pom.url}"/>
+            </j:if>
+            <!-- set home to relative or complete -->
+            <j:if test="${!home.startsWith('http://') and !home.startsWith('https://')}">
+              <j:set var="home" value="${relativePath}${home}"/>
+            </j:if>
+
+            <!-- set image to relative or complete -->
+            <j:set var="image" value="${pom.organization.logo}"/>
+            <j:if test="${!image.startsWith('http://') and !image.startsWith('https://')}">
+              <j:if test="${!image.startsWith('/')}" trim="yes">
+                <j:set var="image" value="${relativePathForLocale}${image}"/>
+              </j:if>
+              <j:if test="${image.startsWith('/')}" trim="yes">
+                <j:set var="image" value="${relativePathForLocale}${image.substring(1)}"/>
+              </j:if>
+            </j:if>
+            <a href="${home}" id="organizationLogo">
+              <img src="${image}" alt="${pom.organization.name}" />
+            </a>
           </j:if>
-          <!-- set home to relative or complete -->
+
+          <!-- set project to relative or complete -->
+          <j:set var="home" value="${pom.url}"/>
           <j:if test="${!home.startsWith('http://') and !home.startsWith('https://')}">
             <j:set var="home" value="${relativePath}${home}"/>
           </j:if>
 
-          <!-- set image to relative or complete -->
-          <j:set var="image" value="${pom.organization.logo}"/>
-          <j:if test="${!image.startsWith('http://') and !image.startsWith('https://')}">
-            <j:set var="image" value="${relativePath}${image}"/>
+          <!-- project logo and link -->
+          <j:set var="logo" value="${pom.logo}"/>
+          <j:if test="${logo != null and logo != ''}">
+            <!-- set image to relative or complete -->
+            <j:set var="image" value="${pom.logo}"/>
+            <j:if test="${!image.startsWith('http://') and !image.startsWith('https://')}">
+              <j:if test="${!image.startsWith('/')}" trim="yes">
+                <j:set var="image" value="${relativePathForLocale}${image}"/>
+              </j:if>
+              <j:if test="${image.startsWith('/')}" trim="yes">
+                <j:set var="image" value="${relativePathForLocale}${image.substring(1)}"/>
+              </j:if>
+            </j:if>
+
+            <a href="${home}" id="projectLogo">
+              <img src="${image}" alt="${pom.name}"/>
+            </a>
           </j:if>
-          <a href="${home}" id="organizationLogo">
-            <img src="${image}" alt="${pom.organization.name}" />
-          </a>
-        </j:if>
-
-        <!-- set project to relative or complete -->
-        <j:set var="home" value="${pom.url}"/>
-        <j:if test="${!home.startsWith('http://') and !home.startsWith('https://')}">
-          <j:set var="home" value="${relativePath}${home}"/>
-        </j:if>
-
-        <!-- project logo and link -->
-        <j:set var="logo" value="${pom.logo}"/>
-        <j:if test="${logo != null and logo != ''}">
-          <!-- set image to relative or complete -->
-          <j:set var="image" value="${pom.logo}"/>
-          <j:if test="${!image.startsWith('http://') and !image.startsWith('https://')}">
-            <j:set var="image" value="${relativePath}${image}"/>
+          <j:if test="${logo == null or logo == ''}">
+            <a href="${home}" id="projectLogo">
+              <span>${pom.name}</span>
+            </a>
           </j:if>
+          <div class="clear"><hr /></div>
+        </div>
 
-          <a href="${home}" id="projectLogo">
-            <img src="${image}" alt="${pom.name}"/>
-          </a>
-        </j:if>
-        <j:if test="${logo == null or logo == ''}">
-          <a href="${home}" id="projectLogo">
-            <span>${pom.name}</span>
-          </a>
-        </j:if>
-        <div class="clear"><hr /></div>
-      </div>
-
-      <div id="breadcrumbs">
-        <maven:property var="version" name="maven.xdoc.version" defaultValue="${pom.currentVersion}"/>                
+        <div id="breadcrumbs">
+          <maven:property var="version" name="maven.xdoc.version" defaultValue="${pom.currentVersion}"/>
                 
-        <j:set var="breadcrumbsUsed" value=""/>  
-        <x:if select="$nav/body/breadcrumbs">
-          <j:set var="breadcrumbsUsed" value="'true'"/>  
-        </x:if>
+          <j:set var="breadcrumbsUsed" value=""/>  
+          <x:if select="$nav/body/breadcrumbs">
+            <j:set var="breadcrumbsUsed" value="'true'"/>  
+          </x:if>
                       
-        <div class="xleft">
-	        <j:if test="${empty(breadcrumbsUsed)}">	        	          
-	          <j:if test="${date == 'left'}">	      
-	              Last published: ${build.date}
-	              <j:if test="${!empty(version)}">
-	                <j:if test="${!(maven.xdoc.crumb.separator == '')}">
-	                  <span class="separator">${maven.xdoc.crumb.separator}</span>
-	                </j:if>
-	                Doc for ${version}
-	              </j:if>	          
-	          </j:if>
-	        </j:if>  	        
-	        <j:if test="${!empty( breadcrumbsUsed )}">	        
-             <jsl:applyTemplates select="$nav/body/breadcrumbs" />
-             ${pom.name}&#160;<span class="separator">&gt;</span>&#160;${docTitle}   
-          </j:if>             
-        </div>
-                             
-        <div class="xright">
-          <j:if test="${empty(breadcrumbsUsed)}">	
-            <j:if test="${date == 'right'}">
-              Last published: ${build.date}
-              <j:if test="${!empty(version)}">
-                <j:if test="${!(maven.xdoc.crumb.separator == '')}">
-                  <span class="separator">${maven.xdoc.crumb.separator}</span>
+          <div class="xleft">
+            <j:if test="${empty(breadcrumbsUsed)}">
+              <j:if test="${date == 'left'}">
+                <fmt:message key="site.last_published" bundle="${msg}"/>: ${build.date}
+                <j:if test="${!empty(version)}">
+                  <j:if test="${!(maven.xdoc.crumb.separator == '')}">
+                    <span class="separator">${maven.xdoc.crumb.separator}</span>
+                  </j:if>
+                  <fmt:message key="site.doc_for" bundle="${msg}"/> ${version}
                 </j:if>
-                Doc for ${version}
-             </j:if>
-            </j:if> 
-          </j:if>	
-          <!-- render links -->
-          <x:if select="$nav/body/links">
-            <jsl:applyTemplates select="$nav/body/links" />
-          </x:if>
+              </j:if>
+            </j:if>
+            <j:if test="${!empty( breadcrumbsUsed )}">
+              <jsl:applyTemplates select="$nav/body/breadcrumbs" />
+              ${pom.name}&#160;<span class="separator">&gt;</span>&#160;${docTitle}
+            </j:if>             
+          </div>
+
+          <div class="xright">
+            <j:if test="${empty(breadcrumbsUsed)}">
+              <j:if test="${date == 'right'}">
+                <fmt:message key="site.last_published" bundle="${msg}"/>: ${build.date}
+                <j:if test="${!empty(version)}">
+                  <j:if test="${!(maven.xdoc.crumb.separator == '')}">
+                    <span class="separator">${maven.xdoc.crumb.separator}</span>
+                  </j:if>
+                  <fmt:message key="site.doc_for" bundle="${msg}"/> ${version}
+                </j:if>
+              </j:if>
+            </j:if>
+            <!-- render links -->
+            <x:if select="$nav/body/links">
+              <jsl:applyTemplates select="$nav/body/links"/>
+            </x:if>
+          </div>
+          <div class="clear"><hr /></div>
         </div>
-        <div class="clear"><hr /></div>
-      </div>
-        
-      <!-- left column start -->
-      <div id="leftColumn">
-        <div id="navcolumn">          
-          <x:if select="$nav">
-            <jsl:applyTemplates select="$nav/body/menu[not(@type) | @type='header'] | $nav/body/search"/>
-          </x:if>
-          <jsl:applyTemplates select="$projectNav/body/menu"/>
-          <!-- allows user to put menu items after standard reports -->
-          <x:if select="$nav">
-            <jsl:applyTemplates select="$nav/body/menu[@type='footer']"/>
-          </x:if>
-          <j:if test="${context.getVariable('maven.xdoc.legend') == 'true'}">
-            <div id="legend">
-              <h5>Legend</h5>
-              <ul>
-                <li class="externalLink">External Link</li>
-                <li class="newWindow">Opens in a new window</li>
-              </ul>
-            </div>
-          </j:if>
-          <!-- Standard Maven Navigation -->
-          <j:set var="fileName">${file}</j:set>
-          <j:set var="poweredbyimage">${maven.xdoc.poweredby.image}</j:set>
-          <j:set var="poweredbytitle">${maven.xdoc.poweredby.title}</j:set>
-          <j:set var="poweredbyurl" value="${maven.xdoc.poweredby.url}" />
-          <j:if test="${!empty(poweredbyimage)}">
-            <a id="poweredBy" href="${poweredbyurl}" title="${poweredbytitle}">
-              <img alt="${maven.xdoc.poweredby.title}" src="${relativePath}/images/logos/${poweredbyimage}" />
-            </a>
-          </j:if> 
-          <j:if test="${empty( breadcrumbsUsed )}">	    
+
+        <!-- left column start -->
+        <div id="leftColumn">
+          <div id="navcolumn">
+            <x:if select="$nav">
+              <jsl:applyTemplates select="$nav/body/menu[not(@type) | @type='header'] | $nav/body/search"/>
+            </x:if>
+            <jsl:applyTemplates select="$projectNav/body/menu"/>
+            <!-- allows user to put menu items after standard reports -->
+            <x:if select="$nav">
+              <jsl:applyTemplates select="$nav/body/menu[@type='footer']"/>
+            </x:if>
+            <j:if test="${context.getVariable('maven.xdoc.legend') == 'true'}">
+              <div id="legend">
+                <h5><fmt:message key="site.legend" bundle="${msg}"/></h5>
+                <ul>
+                  <li class="externalLink"><fmt:message key="site.external_link" bundle="${msg}"/></li>
+                  <li class="newWindow"><fmt:message key="site.opens_new_window" bundle="${msg}"/></li>
+                </ul>
+              </div>
+            </j:if>
+            
+            <!-- Display all availables locales depending :
+                * the user preferences 
+                * the size of the maven.xdoc.locale.supported property -->
+            <j:if test="${locales != null}">
+              <j:if test="${size(locales) gt 0}">
+                <j:set var="displaySelect" value="${maven.xdoc.ui.localeList.asSelect}" />
+                <j:set var="displayMaxElt" value="${maven.xdoc.ui.localeList.max}"/>
+                <j:useBean var="mavenTool" class="org.apache.maven.util.MavenTool"/>
+                <j:set var="displayMaxEltAsInteger" value="${mavenTool.toInteger(displayMaxElt)}"/>
+
+                <div id="language">
+                  <h5><fmt:message key="site.language" bundle="${msg}"/></h5>
+                  <ul>
+                    <!--  Display language in a form with select tag -->
+                    <j:if test="${displaySelect == 'true' or size(locales) gt displayMaxEltAsInteger}">
+                      <form name="languageForm" method="GET">
+                        <select size="1" name="languageSelect" 
+                          onChange="javascript:window.location=this.options[this.selectedIndex].value;">
+                          <!-- Default language -->
+                          <j:invokeStatic className="org.apache.maven.xdoc.util.LocaleUtil" method="displayName" var="displayLocale">
+                            <j:arg value="${defaultLocale}" type="java.util.Locale"/>
+                            <j:arg value="${defaultLocale}" type="java.util.Locale"/>
+                          </j:invokeStatic>
+                          <j:if test="${maven.xdoc.ui.displayByDefault == 'true'}">
+                            <j:set var="displayLocale">${displayLocale} <fmt:message key="defaultLocale.byDefault" bundle="${msg}"/></j:set>
+                          </j:if>
+                          <option value="${relativePathForLocale}${location}">${displayLocale}</option>
+
+                          <!-- Supported language -->
+                          <j:forEach var="locale" items="${locales}">
+                            <j:invokeStatic className="org.apache.maven.xdoc.util.LocaleUtil" method="displayName" var="displayLocale">
+                              <j:arg value="${locale}" type="java.util.Locale"/>
+                              <j:arg value="${locale}" type="java.util.Locale"/>
+                            </j:invokeStatic>
+                            <j:if test="${currentLocale.equals(defaultLocale)}">
+                              <option value="${relativePathForLocale}${locale}${location}">${displayLocale}</option>
+                            </j:if>
+                            <j:if test="${!currentLocale.equals(defaultLocale)}">
+                              <j:if test="${locale.equals(currentLocale)}">
+                                <option value="${relativePathForLocale}${locale}${location}" selected="true">${displayLocale}</option>
+                              </j:if>
+                              <j:if test="${!locale.equals(currentLocale)}">
+                                <option value="${relativePathForLocale}${locale}${location}">${displayLocale}</option>
+                              </j:if>
+                            </j:if>
+                          </j:forEach>
+                        </select>
+                      </form>
+                    </j:if>
+
+                    <!--  Display language as listing -->
+                    <j:if test="${!(displaySelect == 'true' or size(locales) gt displayMaxEltAsInteger)}">
+                      <!-- Default language -->
+                      <j:invokeStatic className="org.apache.maven.xdoc.util.LocaleUtil" method="displayName" var="displayLocale">
+                        <j:arg value="${defaultLocale}" type="java.util.Locale"/>
+                        <j:arg value="${defaultLocale}" type="java.util.Locale"/>
+                      </j:invokeStatic>
+                      <j:if test="${maven.xdoc.ui.displayByDefault == 'true'}">
+                        <j:set var="displayLocale">${displayLocale} <fmt:message key="defaultLocale.byDefault" bundle="${msg}"/></j:set>
+                      </j:if>
+                      <li><doc:itemLink name="${displayLocale}" link="/${location}" relativePath="${relativePathForLocale}"/></li>
+
+                      <!-- Supported language -->
+                      <j:forEach var="locale" items="${locales}">
+                      <j:invokeStatic className="org.apache.maven.xdoc.util.LocaleUtil" method="displayName" var="displayLocale">
+                        <j:arg value="${locale}" type="java.util.Locale"/>
+                        <j:arg value="${locale}" type="java.util.Locale"/>
+                      </j:invokeStatic>
+                        <li><doc:itemLink name="${displayLocale}" link="${locale}${location}" relativePath="${relativePathForLocale}"/></li>
+                      </j:forEach>
+                    </j:if>
+                  </ul>
+                </div>
+              </j:if>
+            </j:if>
+
+            <!-- Standard Maven Navigation -->
+            <j:set var="fileName">${file}</j:set>
+            <j:set var="poweredbyimage">${maven.xdoc.poweredby.image}</j:set>
+            <j:set var="poweredbytitle">${maven.xdoc.poweredby.title}</j:set>
+            <j:set var="poweredbyurl" value="${maven.xdoc.poweredby.url}" />
+            <j:if test="${!empty(poweredbyimage)}">
+              <a id="poweredBy" href="${poweredbyurl}" title="${poweredbytitle}">
+                <img alt="${maven.xdoc.poweredby.title}" src="${relativePathForLocale}images/logos/${poweredbyimage}" />
+              </a>
+            </j:if>
+          <j:if test="${empty( breadcrumbsUsed )}">
             <j:if test="${date == 'navigation-bottom'}">
-               <div id="lastPublished">Last published: ${build.date}</div>
-            </j:if>       
+              <div id="lastPublished"><fmt:message key="site.last_published" bundle="${msg}"/>: ${build.date}</div>
+            </j:if>
           </j:if>  
+          </div>
         </div>
-      </div>
-      <!-- left column end -->
+        <!-- left column end -->
               
-      <!-- body start -->
-      <div id="bodyColumn">
-        <div class="contentBox">
+        <!-- body start -->
+        <div id="bodyColumn">
+          <div class="contentBox">
           <jsl:applyTemplates select="$templateContext/*" />
+          </div>
         </div>
-      </div>
-      <div class="clear"><hr /></div>
-      <!-- body end -->
+        <div class="clear"><hr /></div>
+        <!-- body end -->
               
-      <!-- footer start -->    
-      <div id="footer">  
-        <jsl:applyTemplates select="$nav/body/footer"/>
-        
+        <!-- footer start -->    
+        <div id="footer">  
+          <jsl:applyTemplates select="$nav/body/footer"/>
        
-       
-       <j:if test="${!empty(breadcrumbsUsed)}">	                  
-          <div class="xleft">          
-             <div id="lastPublished">Last published: ${build.date} Doc for ${pom.currentVersion}</div>                      
-          </div>
-        </j:if>
-        <div class="xright">
-          <j:if test="${!empty(pom.organization.name)}">
-            <j:if test="${!empty(pom.inceptionYear)}">
-              <j:if test="${pom.inceptionYear == mavenCurrentYear}">
-                &#169; ${mavenCurrentYear}, ${pom.organization.name}
+          <j:if test="${!empty(breadcrumbsUsed)}">
+            <div class="xleft">
+              <fmt:message key="site.last_published" bundle="${msg}"/>: ${build.date}
+              <j:if test="${!empty(version)}">
+                <j:if test="${!(maven.xdoc.crumb.separator == '')}">
+                  <span class="separator">${maven.xdoc.crumb.separator}</span>
+                </j:if>
+                <fmt:message key="site.doc_for" bundle="${msg}"/> ${version}
               </j:if>
-              <j:if test="${pom.inceptionYear != mavenCurrentYear}">
-                &#169; ${pom.inceptionYear}-${mavenCurrentYear}, ${pom.organization.name}
+            </div>
+          </j:if>
+          <div class="xright">
+            <j:if test="${!empty(pom.organization.name)}">
+              <j:if test="${!empty(pom.inceptionYear)}">
+                <j:if test="${pom.inceptionYear == mavenCurrentYear}">
+                  &#169; ${mavenCurrentYear}, ${pom.organization.name}
+                </j:if>
+                <j:if test="${pom.inceptionYear != mavenCurrentYear}">
+                  &#169; ${pom.inceptionYear}-${mavenCurrentYear}, ${pom.organization.name}
+                </j:if>
+              </j:if>
+              <j:if test="${empty(pom.inceptionYear)}">
+                &#169; ${mavenCurrentYear}, ${pom.organization.name}
               </j:if>
+            <j:if test="${empty(breadcrumbsUsed)}">
+            <j:if test="${date == 'bottom'}">
+              &#169; - <fmt:message key="site.last_published" bundle="${msg}"/>: ${build.date}
             </j:if>
-            <j:if test="${empty(pom.inceptionYear)}">
-              &#169; ${mavenCurrentYear}, ${pom.organization.name}
-            </j:if> 
-           <j:if test="${empty(breadcrumbsUsed)}">	
-             <j:if test="${date == 'bottom'}">
-               - Last published: ${build.date}
-             </j:if>
            </j:if>
   
           </j:if>                      
+          </div>
+          <div class="clear"><hr /></div>
         </div>
-        <div class="clear"><hr /></div>
-      </div>
-      <!-- footer end --> 
-    </x:element>
+        <!-- footer end --> 
+      </x:element>
   </jsl:template>
-        
+
   <!-- process a documentation section -->
   <jsl:template match="section" trim="true">
     <div class="section">
       <j:set var="_sectionName"><x:expr select="@name"/></j:set>
+      
+      <!-- Key is more important than message... -->
+      <j:set var="_key">
+        <x:expr select="@key" />
+      </j:set>
+      <j:set var="_bundle">
+        <x:expr select="@bundle" />
+      </j:set>
+      <j:if test="${!empty(_key)}">
+        <!-- Default bundle is the user one in ${maven.xdoc.bundle} -->
+        <j:if test="${empty(_bundle)}">
+          <fmt:message key="${_key}" bundle="${myMsg}" var="_sectionName"/>
+        </j:if>
+        <j:if test="${!empty(_bundle)}">
+          <fmt:bundle basename="${_bundle}">
+            <fmt:message key="${_key}" var="_sectionName"/>
+          </fmt:bundle>
+        </j:if>
+      </j:if>
+
       <!-- named anchors can't contain whitespaces -->
       <j:set var="_anchorName"><doc:escapeNameToken value="${_sectionName}"/></j:set>
       <j:if test="${!empty(_sectionName)}">
@@ -298,6 +475,26 @@
   <jsl:template match="subsection" trim="true">
     <div class="subsection">
       <j:set var="_sectionName"><x:expr select="@name"/></j:set>
+      
+      <!-- Key is more important than message... -->
+      <j:set var="_key">
+        <x:expr select="@key" />
+      </j:set>
+      <j:set var="_bundle">
+        <x:expr select="@bundle" />
+      </j:set>
+      <j:if test="${!empty(_key)}">
+        <!-- Default bundle is the user one in ${maven.xdoc.bundle} -->
+        <j:if test="${empty(_bundle)}">
+          <fmt:message key="${_key}" bundle="${myMsg}" var="_sectionName"/>
+        </j:if>
+        <j:if test="${!empty(_bundle)}">
+          <fmt:bundle basename="${_bundle}">
+            <fmt:message key="${_key}" var="_sectionName"/>
+          </fmt:bundle>
+        </j:if>
+      </j:if>
+      
       <!-- named anchors can't contain whitespaces -->
       <j:set var="_anchorName"><doc:escapeNameToken value="${_sectionName}"/></j:set>
       <j:if test="${!empty(_sectionName)}">
@@ -306,7 +503,7 @@
       <jsl:applyTemplates />
     </div>
   </jsl:template>
-
+  
   <jsl:template match="source" trim="false">
     <div class="source"><pre><jsl:applyTemplates /></pre></div>
   </jsl:template>
@@ -356,7 +553,7 @@
       <jsl:applyTemplates/>
     </x:element>
   </jsl:template>
-   
+
   <!-- Process the breadcrumb navbar -->
   <jsl:template match="links" trim="true">
     <j:set var="linkCount" value="1"/>
@@ -377,8 +574,7 @@
     </x:forEach>
   </jsl:template>
   
-  
-    <!-- Process the breadcrumb navbar -->
+  <!-- Process the breadcrumb navbar -->
   <jsl:template match="breadcrumbs" trim="true">    
     <x:forEach var="link" select="item">
       <j:set var="_name"><x:expr select="@name"/></j:set>
@@ -387,16 +583,35 @@
       &#160;<span class="separator">&gt;</span>&#160;
     </x:forEach>
   </jsl:template>
-  
 
   <!-- Process a menu for the navigation bar -->
   <jsl:template match="menu" trim="true">
     <j:set var="_menuName"><x:expr select="@name"/></j:set>
     <j:set var="_menuName"><doc:escapeNameToken value="${_menuName}"/></j:set>
+
+    <!-- Key is more important than message... -->
+    <j:set var="_key">
+        <x:expr select="@key" />
+    </j:set>
+    <j:set var="_bundle">
+        <x:expr select="@bundle" />
+    </j:set>
+    <j:if test="${!empty(_key)}">
+        <!-- Default bundle is the user one in ${maven.xdoc.bundle} -->
+        <j:if test="${empty(_bundle)}">
+            <fmt:message key="${_key}" bundle="${myMsg}" var="_menuName"/>
+        </j:if>
+        <j:if test="${!empty(_bundle)}">
+            <fmt:bundle basename="${_bundle}">
+                <fmt:message key="${_key}" var="_menuName"/>
+            </fmt:bundle>
+        </j:if>
+    </j:if>
+
     <j:choose>
       <j:when test="${!empty(_menuName)}">
         <div id="menu${_menuName}">
-          <h5><x:expr select="@name"/></h5>
+          <h5>${_menuName}</h5>
           <ul><jsl:applyTemplates select="item"/></ul>
         </div>
       </j:when>
@@ -417,6 +632,23 @@
     <x:set var="_childCount" select="count(./item)"/>
     <j:set var="_isCollapsed" value="${navbean.isCollapsed(item.get(0))}"/>
     <j:set var="_state" value="none"/>
+    
+    <!-- Key is more important than message... -->
+    <j:set var="_key">
+        <x:expr select="@key" />
+    </j:set>
+    <j:if test="${!empty(_key)}">
+        <!-- Default bundle is the user one in ${maven.xdoc.bundle} -->
+        <j:if test="${empty(_bundle)}">
+            <fmt:message key="${_key}" bundle="${myMsg}" var="_name"/>
+        </j:if>
+        <j:if test="${!empty(_bundle)}">
+            <fmt:bundle basename="${_bundle}">
+                <fmt:message key="${_key}" var="_name"/>
+            </fmt:bundle>
+        </j:if>
+    </j:if>
+    
     <j:if test="${_childCount.intValue() gt 0}">
       <j:if test="${!_isCollapsed}"><j:set var="_state" value="expanded"/></j:if>
       <j:if test="${_isCollapsed}"><j:set var="_state" value="collapsed"/></j:if>
@@ -441,7 +673,7 @@
     <!-- Search code: http://www.google.com/searchcode.html -->
     <!-- Google logos: http://www.google.com/stickers.html -->
     <!-- Terms: http://www.google.com./services/terms_free.html -->
-    <div id="searchbar">
+    <div id="search">
       <h5>Search ${pom.name}</h5>
       <form method="get" action="http://www.google.com/search">
         <a class="navlink" href="http://www.google.com">
@@ -513,44 +745,46 @@
         <x:attribute name="${attr.name}">${attr.value}</x:attribute>
       </x:forEach>
       <jsl:applyTemplates />
-</j:whitespace></x:element>
-  </jsl:template>
+       </j:whitespace></x:element>
+      </jsl:template>
 
-  <!-- goals documentation    -->
-  <jsl:template match="goals" trim="true">
-    <!-- reset row alternation -->
-    <j:set var="rowMode" value="" />
-    <div class="h3">
-      <a name="Goals"/><h3>Goals</h3>
-      <table class="bodyTable">
-        <thead>
-          <tr><th>Goal</th><th>Description</th></tr>
-        </thead>
-        <tbody>
-          <jsl:applyTemplates select="goal"/>
-        </tbody>
-      </table>
-    </div>
-  </jsl:template>
+      <!-- goals documentation    -->
+      <jsl:template match="goals" trim="true">
+        <!-- reset row alternation -->
+        <j:set var="rowMode" value="" />
+        <div class="h3">
+          <a name="Goals"/><h3><fmt:message key="site.goals" bundle="${msg}"/></h3>
+          <table class="bodyTable">
+            <thead>
+              <tr><th><fmt:message key="site.goal" bundle="${msg}"/></th><th><fmt:message key="site.description" bundle="${msg}"/></th></tr>
+            </thead>
+            <tbody>
+              <jsl:applyTemplates select="goal"/>
+            </tbody>
+          </table>
+        </div>
+      </jsl:template>
       
-  <!-- a goal -->
-  <jsl:template match="goal" trim="true">
-    <j:choose>
-      <j:when test="${rowMode == 'a'}">
-        <j:set var="rowMode" value="b"/>
-      </j:when>
-      <j:otherwise>
-        <j:set var="rowMode" value="a"/>
-      </j:otherwise>
-    </j:choose>
+      <!-- a goal -->
+      <jsl:template match="goal" trim="true">
+        <j:choose>
+          <j:when test="${rowMode == 'a'}">
+            <j:set var="rowMode" value="b"/>
+          </j:when>
+          <j:otherwise>
+            <j:set var="rowMode" value="a"/>
+          </j:otherwise>
+        </j:choose>
         
-    <x:element name="tr"><j:whitespace trim="true">
-      <x:attribute name="class">${rowMode}</x:attribute>
-      <j:set var="_goalName"><x:expr select="./name" /></j:set>
-      <td style="width:20%"><a name="${_goalName}"/>${_goalName}</td>
-      <td ><jsl:applyTemplates select="description" /></td>
-</j:whitespace></x:element>
-  </jsl:template>   
+        <x:element name="tr">
+          <j:whitespace trim="true">
+            <x:attribute name="class">${rowMode}</x:attribute>
+            <j:set var="_goalName"><x:expr select="./name" /></j:set>
+            <td style="width:20%"><a name="${_goalName}"/>${_goalName}</td>
+            <td ><jsl:applyTemplates select="description" /></td>
+          </j:whitespace>
+        </x:element>
+      </jsl:template>   
       
   <jsl:template match="description">
     <jsl:applyTemplates trim="false"/>
@@ -565,4 +799,28 @@
   <!-- copy any other elements through -->
   <jsl:template match="*" trim="false"><jsl:copy trim="false"><jsl:applyTemplates trim="false"/></jsl:copy></jsl:template>
    
+  <!-- process a message -->
+  <!-- Key is more important than message... -->
+  <jsl:template match="message" trim="true">
+    <j:set var="_key">
+      <x:expr select="@key" />
+    </j:set>
+    <j:set var="_bundle">
+      <x:expr select="@bundle" />
+    </j:set>
+    <j:if test="${!empty(_key)}">
+      <!-- Default bundle is the user one in ${maven.xdoc.bundle} -->
+      <j:if test="${empty(_bundle)}">
+        <fmt:message key="${_key}" bundle="${myMsg}" />
+      </j:if>
+      <j:if test="${!empty(_bundle)}">
+        <fmt:bundle basename="${_bundle}">
+          <fmt:message key="${_key}" />
+        </fmt:bundle>
+      </j:if>
+    </j:if>
+
+    <jsl:applyTemplates />
+  </jsl:template>
+
 </jsl:stylesheet>

Modified: maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/templates/cvs-usage.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/templates/cvs-usage.xml?rev=171222&r1=171221&r2=171222&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/templates/cvs-usage.xml (original)
+++ maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/templates/cvs-usage.xml Sat May 21 08:10:41 2005
@@ -17,143 +17,155 @@
  */
  -->
 
-<document>
-  
-  
-  <properties>
-    <title>CVS</title>
-  </properties>
-
-  <body>
-    #set ($repository = $project.repository)
-    
-    #if (!$repository)
-      <section name="Repository">
-        <p>
-          No SCM repository is defined.
-        </p>
-      </section>
-    #else
-     
-      #if ($repository.url && $repository.url != '')
-      #set ($url = $escape.getText($repository.url))
-      <section name="Web Access">
-        <p>
-          <a href="$url">$url</a>
-        </p>
-      </section>
-      #end
-    
-      #if ($repository.connection && $repository.connection != '')
-        #set ($connscm = $repository.getScmType())
-        #if ($connscm == 'cvs')
-        #set ($conn = $repository.getCvsRoot($repository.connection, ''))
-        #set ($module = $repository.getCvsModule($repository.connection))
-      <section name="Anonymous Access with Maven">
-        <p>
-          This project's CVS repository can be checked out through anonymous (pserver)
-          CVS with the following instruction on a single line.
-        </p>
-      
-        <source><![CDATA[
-          maven scm:checkout-project
-            -Dmaven.scm.method=$connscm
-            -Dmaven.scm.cvs.module=$module
-            -Dmaven.scm.cvs.root=$conn
-            -Dmaven.scm.checkout.dir=.
-        ]]></source>
-        
-      </section>
-      
-      <section name="Anonymous CVS Access">
-        <p>
-          This project's CVS repository can be checked out through anonymous (pserver)
-          CVS with the following instruction set.
-          When prompted for a password for anonymous, simply press the Enter key.
-        </p>
-      
-        <p>
-          cvs -d $conn login
-          <br/>
-          cvs -z3 -d $conn co $module
-        </p>
-
-        <p>
-          Updates from within the module's directory do not need the -d parameter.
-        </p>
-      </section>
-        #end
-      #end
-
-      #if ($repository.developerConnection && $repository.developerConnection != '')
-        #set ($connscm = $repository.getScmType())
-        #if ($connscm == 'cvs')
-
-        #set ($conn = $repository.getCvsRoot($repository.developerConnection, 'username'))
-        #set ($module = $repository.getCvsModule($repository.developerConnection))
-        #set ($server = $repository.getCvsServer($repository.developerConnection))
-  
-      <section name="Developer Access with Maven">
-        <p>
-          Only project developers can access the CVS tree via this method.
-          Substitute <b>username</b> with the proper value.
-        </p>
-      
-        <source><![CDATA[
-          maven scm:checkout-project
-            -Dmaven.scm.method=$connscm
-            -Dmaven.scm.cvs.module=$module
-            -Dmaven.scm.cvs.root=$conn
-            -Dmaven.scm.checkout.dir=.
-            -Dmaven.scm.cvs.rsh=ssh
-        ]]></source>
-
-        <p>
-          Remember to replace 'username' with your actual username on $server.<br/>
-          Also change <code>ssh</code> in <code>maven.scm.cvs.rsh=ssh</code> 
-          to the name of your ssh executable.
-        </p>
-      </section>
-
-      <section name="Developer CVS Access via SSH">
-
-        <p>
-          Only project developers can access the CVS tree via this method.
-          SSH1 must be installed on your client machine. Substitute   
-          <b>username</b> with the proper value. Enter your site password when prompted.
-        </p>
-
-        <p>
-          export CVS_RSH=ssh
-          <br/>
-          cvs -z3 -d $conn co $module
-        </p>
-      
-        <p>
-          Remember to replace 'username' with your actual username on $server.
-        </p>
 
-      </section>
-        #end
-      #end
-
-      #if ($repository.url && $repository.url != '')
-        #set ($connscm = $repository.getScmType())
-        #if ($connscm == 'cvs')
-          <section name="CVS Access behind a firewall">
- 
+<document>
+    <properties>
+        <title key="template.cvs_usage.title"
+            bundle="plugin-resources\templates\templates" />
+    </properties>
+
+    <body>
+        #set ($repository = $project.repository)
+
+        #if (!$repository)
+        <section key="template.cvs_usage.section1.title"
+            bundle="plugin-resources\templates\templates">
             <p>
-              For those developers who are stuck behind a corporate
-              firewall, <a href="http://cvsgrab.sourceforge.net/">CVSGrab</a>
-              can use the viewcvs web interface to checkout the source code.
+                <message key="template.cvs_usage.section1.no_repository"
+                    bundle="plugin-resources\templates\templates" />
             </p>
-
+        </section>
+        #else
+            #set ($url = $escape.getText($repository.url))
+
+          #if ($repository.url && $repository.url != '')
+          <section key="template.cvs_usage.section2.title"
+              bundle="plugin-resources\templates\templates">
+              <p>
+                  <a href="$url">$url</a>
+              </p>
           </section>
-        #end
-      #end
-
-    #end
-  </body>
+          #end
 
+            #if ($repository.connection && $repository.connection != '')
+                #set ($connscm = $repository.getScmType()) 
+                
+                #if ($connscm == 'cvs') 
+                    #set ($conn = $repository.getCvsRoot($repository.connection, '')) 
+                    #set ($module = $repository.getCvsModule($repository.connection))
+
+              <section key="template.cvs_usage.section3.title"
+                  bundle="plugin-resources\templates\templates">
+                  <p>
+                      <message key="template.cvs_usage.section3.description"
+                          bundle="plugin-resources\templates\templates" />
+                  </p>
+
+                  <source>
+                      <![CDATA[
+                maven scm:checkout-project
+                  -Dmaven.scm.method=$connscm
+                  -Dmaven.scm.cvs.module=$module
+                  -Dmaven.scm.cvs.root=$conn
+                  -Dmaven.scm.checkout.dir=.
+              ]]>
+                  </source>
+              </section>
+
+              <section key="template.cvs_usage.section4.title"
+                  bundle="plugin-resources\templates\templates">
+                  <p>
+                      <message key="template.cvs_usage.section4.description"
+                          bundle="plugin-resources\templates\templates" />
+                  </p>
+
+                  <p>
+                      cvs -d $conn login
+                      <br />
+                      cvs -z3 -d $conn co $module
+                  </p>
+
+                  <p>
+                      <message key="template.cvs_usage.section4.updates"
+                          bundle="plugin-resources\templates\templates" />
+                  </p>
+              </section>
+                #end 
+            #end
+
+            #if ($repository.developerConnection && $repository.developerConnection != '') 
+                #set ($connscm = $repository.getScmType()) 
+                
+                #if ($connscm == 'cvs')
+                    #set ($conn = $repository.getCvsRoot($repository.developerConnection, 'username')) 
+                    #set ($module = $repository.getCvsModule($repository.developerConnection)) 
+                    #set ($server = $repository.getCvsServer($repository.developerConnection))
+
+              <section key="template.cvs_usage.section5.title"
+                  bundle="plugin-resources\templates\templates">
+                  <p>
+                      <message key="template.cvs_usage.section5.description"
+                          bundle="plugin-resources\templates\templates" />
+                  </p>
+
+                  <source>
+                      <![CDATA[
+                maven scm:checkout-project
+                  -Dmaven.scm.method=$connscm
+                  -Dmaven.scm.cvs.module=$module
+                  -Dmaven.scm.cvs.root=$conn
+                  -Dmaven.scm.checkout.dir=.
+                  -Dmaven.scm.cvs.rsh=ssh
+              ]]>
+                  </source>
+
+                  <p>
+                      <message key="template.cvs_usage.section5.remember"
+                          bundle="plugin-resources\templates\templates" />
+                  </p>
+              </section>
+
+              <section key="template.cvs_usage.section6.title"
+                  bundle="plugin-resources\templates\templates">
+
+                  <p>
+                      <message key="template.cvs_usage.section6.description"
+                          bundle="plugin-resources\templates\templates" />
+                  </p>
+
+                  <p>
+                      export CVS_RSH=ssh
+                      <br />
+                      cvs -z3 -d $conn co $module
+                  </p>
+
+                  <p>
+                      <message key="template.cvs_usage.section6.remember"
+                          bundle="plugin-resources\templates\templates" />
+                  </p>
+
+              </section>
+                #end 
+            #end
+
+            #if ($repository.url && $repository.url != '') 
+                #set ($connscm = $repository.getScmType()) 
+                
+                #if ($connscm == 'cvs')
+              <section key="template.cvs_usage.section7.title"
+                  bundle="plugin-resources\templates\templates">
+
+                  <p>
+                      <message key="template.cvs_usage.section7.description1"
+                          bundle="plugin-resources\templates\templates" />
+                      <a href="http://cvsgrab.sourceforge.net/">CVSGrab</a>
+                      <message key="template.cvs_usage.section7.description2"
+                          bundle="plugin-resources\templates\templates" />
+                  </p>
+
+              </section>
+                #end 
+            #end
+        #end
+    </body>
 </document>
-

Modified: maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/templates/dependencies.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/templates/dependencies.xml?rev=171222&r1=171221&r2=171222&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/templates/dependencies.xml (original)
+++ maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/templates/dependencies.xml Sat May 21 08:10:41 2005
@@ -17,55 +17,63 @@
  */
  -->
 
-<document>
 
-  <properties>
-    <title>Dependencies</title>
-  </properties>
+<document>
+    <properties>
+        <title key="template.dependencies.title"
+            bundle="plugin-resources\templates\templates" />
+    </properties>
 
-  <body>
-    <section name="Dependencies">
-    #if ($project.dependencies.size() == 0)
-      <p> 
-        There are no dependencies for this project.  It is a standalone
-        application that does not depend on any other project.
-      </p>
-    #else
-      <p> 
-        The following is a list of dependencies for this project.  These
-        dependencies are required to compile and run the application:
-      </p>
-      <table>
-        <thead>
-        <tr>
-          <th>Artifact ID</th> 
-          <th>Type</th>              
-          <th>Version</th>
-          <th>URL</th>
-          <th>Comment</th>
-        </tr>
-        </thead>
-        <tbody>
-        #foreach ($dep in $dependencyDescriber.Dependencies)
-        <tr>
-          <td>${dep.ArtifactId}</td>
-          <td>${dep.Type}</td>
-          <td>${dep.Version}</td>
-          <td>
-          #if ($dep.Url)          
-          <a href="${dep.Url}">${dep.Url}</a>
-          #end 
-          </td>
-          <td>
-          #if(${dep.comment})
-          ${dep.comment}
-          #end
-          </td>
-         </tr>
-        #end     
-        </tbody>
-      </table> 
-    #end 
-  </section>
- </body>
+    <body>
+        <section key="template.dependencies.section.title"
+            bundle="plugin-resources\templates\templates">
+            #if ($project.dependencies.size() == 0)
+            <p>
+                <message key="template.dependencies.section.no_dependency"
+                    bundle="plugin-resources\templates\templates" />
+            </p>
+            #else
+            <p>
+                <message key="template.dependencies.section.dependencies"
+                    bundle="plugin-resources\templates\templates" />
+            </p>
+            <table>
+                <thead>
+                    <tr>
+                        <th>
+                            <message key="template.dependencies.section.artifactID"
+                                bundle="plugin-resources\templates\templates" />
+                        </th>
+                        <th>
+                            <message key="template.dependencies.section.type"
+                                bundle="plugin-resources\templates\templates" />
+                        </th>
+                        <th>
+                            <message key="template.dependencies.section.version"
+                                bundle="plugin-resources\templates\templates" />
+                        </th>
+                        <th>
+                            <message key="template.dependencies.section.url"
+                                bundle="plugin-resources\templates\templates" />
+                        </th>
+                    </tr>
+                </thead>
+                <tbody>
+                    #foreach ($dep in $dependencyDescriber.Dependencies)
+                    <tr>
+                        <td>${dep.ArtifactId}</td>
+                        <td>${dep.Type}</td>
+                        <td>${dep.Version}</td>
+                        <td>
+                            #if ($dep.Url)
+                            <a href="${dep.Url}">${dep.Url}</a>
+                            #end
+                        </td>
+                    </tr>
+                    #end
+                </tbody>
+            </table>
+            #end
+        </section>
+    </body>
 </document>

Modified: maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/templates/issue-tracking.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/templates/issue-tracking.xml?rev=171222&r1=171221&r2=171222&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/templates/issue-tracking.xml (original)
+++ maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/templates/issue-tracking.xml Sat May 21 08:10:41 2005
@@ -17,21 +17,20 @@
  */
  -->
 
+
 <document>
-  
-  <properties>
-    <title>Issue Tracking</title>
-  </properties>
+    <properties>
+        <title key="template.issue_tracking.title"
+            bundle="plugin-resources\templates\templates" />
+    </properties>
 
-  <body>
-    <section name="Issue Tracking">
-      <p>
-      #if ($project.issueTrackingUrl && $project.issueTrackingUrl != '')
-        #set ($url = $escape.getText($project.issueTrackingUrl))
-        <a href="$url">$url</a>
-      #end
-      </p>
-    </section>
-  </body>
+    <body>
+        <section key="template.issue_tracking.section.title"
+            bundle="plugin-resources\templates\templates">
+            <p>
+                #set ($url = $escape.getText($project.issueTrackingUrl))
+                <a href="$url">$url</a>
+            </p>
+        </section>
+    </body>
 </document>
-

Modified: maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/templates/mail-lists.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/templates/mail-lists.xml?rev=171222&r1=171221&r2=171222&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/templates/mail-lists.xml (original)
+++ maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/templates/mail-lists.xml Sat May 21 08:10:41 2005
@@ -20,58 +20,71 @@
 
 #macro (displayLink $label $link)
 <td>
-  #if ($link && $link.length() != 0)
-    #if ($link.trim().startsWith("http"))
-      <a href="$escape.getText($link)">$label</a>
+    #if ($link && $link.length() != 0) 
+        #if ($link.trim().startsWith("http"))
+            <a href="$escape.getText($link)">$label</a>
+        #else
+            <a href="mailto:$link">$label</a>
+        #end 
     #else
-      <a href="mailto:$link">$label</a>
+        <message key="template.mail_lists.not_available"
+            bundle="plugin-resources\templates\templates" />
     #end
-  #else
-    Not Available
-  #end
 </td>
 #end
 
 <document>
+    <properties>
+        <title key="template.mail_lists.title"
+            bundle="plugin-resources\templates\templates" />
+    </properties>
 
-  <properties>
-    <title>Mailing Lists</title>
-  </properties>
-
-  <body>
-    <section name="Mailing Lists">
-    #if ($project.mailingLists.size() == 0)
-      <p> 
-        There are no mailing lists established for this project.  Please
-        check back at a later date.
-      </p>
-    #else
-      <p> 
-        These are the mailing lists that have been established for this
-        project.  For each list, there is a subscribe, unsubscribe, and an
-        archive link.
-      </p>
-      <table>
-        <thead>
-        <tr>
-          <th>List Name</th>
-          <th>Subscribe</th>
-          <th>Unsubscribe</th>
-          <th>Archive</th>
-        </tr>
-        </thead>
-        <tbody>
-        #foreach ($list in $project.mailingLists)
-        <tr>
-          <td>$list.name</td>
-          #displayLink("Subscribe" $list.subscribe)
-          #displayLink("Unsubscribe" $list.unsubscribe)
-          #displayLink("Archive" $list.archive)
-        </tr>
-        #end
-        </tbody>
-      </table>
-    #end
-    </section>
-  </body>
+    <body>
+        <section key="template.mail_lists.section.title"
+            bundle="plugin-resources\templates\templates">
+            #if ($project.mailingLists.size() == 0)
+            <p>
+                <message key="template.mail_lists.section.no_mail_list"
+                    bundle="plugin-resources\templates\templates" />
+            </p>
+            #else
+            <p>
+                <message key="template.mail_lists.section.mail_lists"
+                    bundle="plugin-resources\templates\templates" />
+            </p>
+            <table>
+                <thead>
+                    <tr>
+                        <th>
+                            <message key="template.mail_lists.section.list_name"
+                                bundle="plugin-resources\templates\templates" />
+                        </th>
+                        <th>
+                            <message key="template.mail_lists.section.subscribe"
+                                bundle="plugin-resources\templates\templates" />
+                        </th>
+                        <th>
+                            <message key="template.mail_lists.section.unsubscribe"
+                                bundle="plugin-resources\templates\templates" />
+                        </th>
+                        <th>
+                            <message key="template.mail_lists.section.archive"
+                                bundle="plugin-resources\templates\templates" />
+                        </th>
+                    </tr>
+                </thead>
+                <tbody>
+                    #foreach ($list in $project.mailingLists)
+                    <tr>
+                        <td>$list.name</td>
+                        #displayLink("Subscribe" $list.subscribe)
+                        #displayLink("Unsubscribe" $list.unsubscribe)
+                        #displayLink("Archive" $list.archive)
+                    </tr>
+                    #end
+                </tbody>
+            </table>
+            #end
+        </section>
+    </body>
 </document>

Modified: maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/templates/maven-reports.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/templates/maven-reports.xml?rev=171222&r1=171221&r2=171222&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/templates/maven-reports.xml (original)
+++ maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/templates/maven-reports.xml Sat May 21 08:10:41 2005
@@ -17,49 +17,84 @@
  */
  -->
 
+
 <document>
+    <properties>
+        <title key="template.maven_reports.title"
+            bundle="plugin-resources\templates\templates" />
+    </properties>
 
-  <properties>
-    <title>Project Reports</title>
-  </properties>
+    <body>
+        <section key="template.maven_reports.section.title"
+            bundle="plugin-resources\templates\templates">
+            <p>
+                <message key="template.maven_reports.section.maven_reports1"
+                    bundle="plugin-resources\templates\templates" />
+                <a href="http://maven.apache.org/">Maven</a>
+                <message key="template.maven_reports.section.maven_reports2"
+                    bundle="plugin-resources\templates\templates" />
+            </p>
 
-  <body>
-    <section name="Maven Generated Reports">
-      <p>
-        This document provides an overview of the various reports that
-        are automatically generated by 
-        <a href="http://maven.apache.org/">Maven</a>.
-        Each report is briefly described below.
-      </p>
+            #set ($reports = $project.getPluginContext('maven-xdoc-plugin').getVariable('reports'))
+            #set ($currentLocale = $project.getPluginContext('maven-xdoc-plugin').getVariable('currentLocale'))
 
-	  #set ($reports = $project.getPluginContext('maven-xdoc-plugin').getVariable('reports'))
-	  <subsection name="Overview">
-        <table>
-          <tr><th>Document</th><th>Description</th></tr>
-          #foreach ($report in $reports)
-            #if ($report.link && $report.link.length() != 0)
-            <tr>
-              #if($report.target && $report.target.length() != 0)
-              <td><a href="${report.link}.html" target="${report.target}">$report.name</a></td>
-              #else
-              <td><a href="${report.link}.html">$report.name</a></td>
-              #end
-              <td>$report.description</td>
-            </tr>
-            #end
-            #if ($report.externalLink && $report.externalLink.length() != 0)
-            <tr>
-              #if($report.target && $report.target.length() != 0)
-              <td><a href="${report.externalLink}" class="externalLink" target="${report.target}">$report.name</a></td>
-              #else
-              <td><a href="${report.externalLink}" class="externalLink">$report.name</a></td>
-              #end
-              <td>$report.description</td>
-            </tr>
-            #end
-          #end
-        </table>
-      </subsection>
-    </section>
- </body>
+            <subsection key="template.maven_reports.section.subsection.title"
+                bundle="plugin-resources\templates\templates">
+                <table>
+                    <tr>
+                        <th>
+                            <message key="template.maven_reports.section.subsection.document"
+                                bundle="plugin-resources\templates\templates" />
+                        </th>
+                        <th>
+                            <message key="template.maven_reports.section.subsection.description"
+                                bundle="plugin-resources\templates\templates" />
+                        </th>
+                    </tr>
+                    #foreach ($report in $reports) 
+                        #if ($report.link && $report.link.length() != 0)
+                            <tr>
+                                #if($report.target && $report.target.length() != 0)
+                                    <td>
+                                        <a href="${report.link}.html"
+                                            target="${report.target}">
+                                            $report.name
+                                        </a>
+                                    </td>
+                                #else
+                                    <td>
+                                        <a href="${report.link}.html">
+                                            $report.name
+                                        </a>
+                                    </td>
+                                #end
+                                <td>$report.description</td>
+                            </tr>
+                        #end 
+                        #if ($report.externalLink && $report.externalLink.length() != 0)
+                            <tr>
+                                #if($report.target && $report.target.length() != 0)
+                                    <td>
+                                        <a href="${report.externalLink}"
+                                            class="externalLink"
+                                            target="${report.target}">
+                                            $report.name
+                                        </a>
+                                    </td>
+                                #else
+                                    <td>
+                                        <a href="${report.externalLink}"
+                                            class="externalLink">
+                                            $report.name
+                                        </a>
+                                    </td>
+                                #end
+                                <td>$report.description</td>
+                            </tr>
+                        #end
+                    #end
+                </table>
+            </subsection>
+        </section>
+    </body>
 </document>

Modified: maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/templates/project-info.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/templates/project-info.xml?rev=171222&r1=171221&r2=171222&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/templates/project-info.xml (original)
+++ maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/templates/project-info.xml Sat May 21 08:10:41 2005
@@ -17,71 +17,109 @@
  */
  -->
 
+
 <document>
+    <properties>
+        <title key="template.project_info.title"
+            bundle="plugin-resources\templates\templates" />
+    </properties>
+
+    <body>
+        <section key="template.project_info.section.title"
+            bundle="plugin-resources\templates\templates">
+            <p>
+                <message key="template.project_info.section.project_information1"
+                    bundle="plugin-resources\templates\templates" />
+                <a href="http://maven.apache.org/">Maven</a>
+                <message key="template.project_info.section.project_information2"
+                    bundle="plugin-resources\templates\templates" />
+            </p>
 
-  <properties>
-    <title>Project Information</title>
-  </properties>
+            <subsection key="template.project_info.section.subsection.title"
+                bundle="plugin-resources\templates\templates">
+                <table>
+                    <tr>
+                        <th>
+                            <message key="template.project_info.section.subsection.document"
+                                bundle="plugin-resources\templates\templates" />
+                        </th>
+                        <th>
+                            <message key="template.project_info.section.subsection.description"
+                                bundle="plugin-resources\templates\templates" />
+                        </th>
+                    </tr>
+                    <tr>
+                        <td>
+                            <a href="mail-lists.html">
+                                <message key="template.project_info.section.subsection.document.mailing_lists"
+                                    bundle="plugin-resources\templates\templates" />
+                            </a>
+                        </td>
+                        <td>
+                            <message key="template.project_info.section.subsection.description.mailing_lists"
+                                bundle="plugin-resources\templates\templates" />
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>
+                            <a href="team-list.html">
+                                <message key="template.project_info.section.subsection.document.project_team"
+                                    bundle="plugin-resources\templates\templates" />
+                            </a>
+                        </td>
+                        <td>
+                            <message key="template.project_info.section.subsection.description.project_team"
+                                bundle="plugin-resources\templates\templates" />
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>
+                            <a href="dependencies.html">
+                                <message key="template.project_info.section.subsection.document.dependencies"
+                                    bundle="plugin-resources\templates\templates" />
+                            </a>
+                        </td>
+                        <td>
+                            <message key="template.project_info.section.subsection.description.dependencies"
+                                bundle="plugin-resources\templates\templates" />
+                        </td>
+                    </tr>
 
-  <body>
-    <section name="General Project Information">
-      <p>
-        This document provides an overview of the various documents and
-        links that are part of this project's general information.  All
-        of this content is automatically generated by 
-        <a href="http://maven.apache.org/">Maven</a> on
-        behalf of the project.
-      </p>
+                    <!-- 
+                        This is really bad that the url requires specification in two
+                        places. Makes pluggable reporting impossible. FIX
+                    -->
 
-      <subsection name="Overview">
-        <table>
-          <tr><th>Document</th><th>Description</th></tr>
-          <tr><td><a href="mail-lists.html">Mailing Lists</a></td>
-            <td>
-              This document provides subscription and archive
-              information for this project's mailing lists.
-            </td>
-          </tr>
-          <tr><td><a href="team-list.html">Project Team</a></td>
-            <td>
-              This document provides information on the members of
-              this project.  These are the individuals who have
-              contributed to the project in one form or another.
-            </td>
-          </tr>
-          <tr><td><a href="dependencies.html">Dependencies</a></td>
-            <td>
-              This document lists the projects dependencies and provides
-              information on each dependency.
-            </td>
-          </tr>
-          
-          <!-- 
-          
-          This is really bad that the url requires specification in two
-          places. Makes pluggable reporting impossible. FIX
-          
-          -->
-          
-          #if ($project.repository.url && $project.repository.url != '')
-          <tr><td><a href="cvs-usage.html">Source Repository</a></td>
-            <td>
-              This is a link to the online source repository that can be
-              viewed via a web browser.
-            </td>
-          </tr>
-          #end
-          #if ($project.issueTrackingUrl && $project.issueTrackingUrl != '')
-          <tr><td><a href="issue-tracking.html">Issue Tracking</a></td>
-            <td>
-              This is a link to the issue tracking system for this
-              project.  Issues (bugs, features, change requests) can be
-              created and queried using this link.
-            </td>
-          </tr>
-          #end
-        </table>
-      </subsection>
-    </section>
- </body>
+                    #if ($project.repository.url && $project.repository.url != '')
+                    <tr>
+                        <td>
+                            <a href="cvs-usage.html">
+                                <message key="template.project_info.section.subsection.document.source_repository"
+                                    bundle="plugin-resources\templates\templates" />
+                            </a>
+                        </td>
+                        <td>
+                            <message key="template.project_info.section.subsection.description.source_repository"
+                                bundle="plugin-resources\templates\templates" />
+                        </td>
+                    </tr>
+                    #end 
+                    #if ($project.issueTrackingUrl && $project.issueTrackingUrl != '')
+                    <tr>
+                        <td>
+                            <a href="issue-tracking.html">
+                                <message key="template.project_info.section.subsection.document.issue_tracking"
+                                    bundle="plugin-resources\templates\templates" />
+                            </a>
+                        </td>
+                        <td>
+                            <message key="template.project_info.section.subsection.description.issue_tracking"
+                                bundle="plugin-resources\templates\templates" />
+                        </td>
+                    </tr>
+                    #end
+                </table>
+            </subsection>
+        </section>
+    </body>
 </document>

Modified: maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/templates/scm/cvs.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/templates/scm/cvs.xml?rev=171222&r1=171221&r2=171222&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/templates/scm/cvs.xml (original)
+++ maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/templates/scm/cvs.xml Sat May 21 08:10:41 2005
@@ -17,102 +17,106 @@
  */
  -->
 
-<document>
-  
-  
-  <properties>
-    <title>CVS</title>
-  </properties>
-
-  <body>
-    #set ($repository = $project.repository)
-    
-    #if (!$repository)
-      <section name="Repository">
-        <p>
-          No SCM repository is defined.
-        </p>
-      </section>
-    #else
- 
-      #if ($repository.url && $repository.url != '')
-      #set ($url = $escape.getText($repository.url))
-      <section name="Web Access">
-        <p>
-          <a href="$url">$url</a>
-        </p>
-      </section>
-      #end
-    
-      #if ($repository.connection && $repository.connection != '')
-        #set ($connscm = $repository.getScmType())
-        #if ($connscm == 'cvs')
-        #set ($conn = $repository.getCvsRoot($repository.connection, ''))
-        #set ($module = $repository.getCvsModule($repository.connection))
-      <section name="Anonymous CVS Access">
-        <p>
-          This project's CVS repository can be checked out through anonymous (pserver)
-          CVS with the following instruction set.
-          When prompted for a password for anonymous, simply press the Enter key.
-        </p>
-      
-        <p>
-          cvs -d $conn login
-          <br/>
-          cvs -z3 -d $conn co $module
-        </p>
-
-        <p>
-          Updates from within the module's directory do not need the -d parameter.
-        </p>
-      </section>
-        #end
-      #end
-
-      #if ($repository.developerConnection && $repository.developerConnection != '')
-        #set ($connscm = $repository.getScmType())
-        #if ($connscm == 'cvs')
-
-        #set ($conn = $repository.getCvsRoot($repository.developerConnection, 'username'))
-        #set ($module = $repository.getCvsModule($repository.developerConnection))
-        #set ($server = $repository.getCvsServer($repository.developerConnection))
-  
-      <section name="Developer CVS Access via SSH">
-
-        <p>
-          Only project developers can access the CVS tree via this method.
-          SSH1 must be installed on your client machine. Substitute   
-          <b>name</b> with the proper value. Enter your site password when prompted.
-        </p>
-
-        <p>
-          export CVS_RSH=ssh
-          <br/>
-          cvs -z3 -d $conn co $module
-        </p>
-      
-        <p>
-          Remember to replace 'username' with your actual username on $server.
-        </p>
 
-      </section>
+<document>
+    <properties>
+        <title key="template.cvs.title"
+            bundle="plugin-resources\templates\templates" />
+    </properties>
+
+    <body>
+        #set ($repository = $project.repository)
+
+        #if (!$repository)
+          <section key="template.cvs.section1.title"
+              bundle="plugin-resources\templates\templates">
+              <p>
+                  <message key="template.cvs.section1.no_repository"
+                      bundle="plugin-resources\templates\templates" />
+              </p>
+          </section>
+        #else
+            #set ($url = $escape.getText($repository.url))
+
+            #if ($repository.url && $repository.url != '')
+            <section key="template.cvs.section2.title"
+                bundle="plugin-resources\templates\templates">
+                <p>
+                    <a href="$url">$url</a>
+                </p>
+            </section>
+            #end
+
+            #if ($repository.connection && $repository.connection != '')
+                #set ($connscm = $repository.getScmType()) 
+                
+                #if ($connscm == 'cvs') 
+                    #set ($conn = $repository.getCvsRoot($repository.connection, '')) 
+                    #set ($module = $repository.getCvsModule($repository.connection))
+              <section key="template.cvs.section3.title"
+                  bundle="plugin-resources\templates\templates">
+                  <p>
+                      <message key="template.cvs.section3.description"
+                          bundle="plugin-resources\templates\templates" />
+                  </p>
+
+                  <p>
+                      cvs -d $conn login
+                      <br />
+                      cvs -z3 -d $conn co $module
+                  </p>
+
+                  <p>
+                      <message key="template.cvs.section3.updates"
+                          bundle="plugin-resources\templates\templates" />
+                  </p>
+              </section>
+                #end 
+            #end
+
+            #if ($repository.developerConnection && $repository.developerConnection != '') 
+                #set ($connscm = $repository.getScmType()) 
+                
+                #if ($connscm == 'cvs')
+                    #set ($conn = $repository.getCvsRoot($repository.developerConnection, 'username')) 
+                    #set ($module = $repository.getCvsModule($repository.developerConnection)) 
+                    #set ($server = $repository.getCvsServer($repository.developerConnection))
+
+              <section key="template.cvs.section4.title"
+                  bundle="plugin-resources\templates\templates">
+
+                  <p>
+                      <message key="template.cvs.section4.description"
+                          bundle="plugin-resources\templates\templates" />
+                  </p>
+
+                  <p>
+                      export CVS_RSH=ssh
+                      <br />
+                      cvs -z3 -d $conn co $module
+                  </p>
+
+                  <p>
+                      <message key="template.cvs.section4.remember"
+                          bundle="plugin-resources\templates\templates" />
+                  </p>
+
+              </section>
+                #end 
+            #end
+
+          #if ($repository.url && $repository.url != '')
+            <section key="template.cvs.section5.title"
+                bundle="plugin-resources\templates\templates">
+                <p>
+                    <message key="template.cvs.section5.description1"
+                        bundle="plugin-resources\templates\templates" />
+                    <a href="http://cvsgrab.sourceforge.net/">CVSGrab</a>
+                    <message key="template.cvs.section5.description2"
+                        bundle="plugin-resources\templates\templates" />
+                </p>
+            </section>
+          #end
         #end
-      #end
-
-      #if ($repository.url && $repository.url != '')
-      <section name="CVS Access behind a firewall">
- 
-        <p>
-          For those developers who are stuck behind a corporate
-          firewall, <a href="http://cvsgrab.sourceforge.net/">CVSGrab</a>
-          can use the viewcvs web interface to checkout the source code.
-        </p>
-
-      </section>
-      #end
-
-    #end
-  </body>
-
+    </body>
 </document>
-



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org