You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jaxme-dev@ws.apache.org by ma...@apache.org on 2005/08/19 10:38:51 UTC

svn commit: r233455 [1/2] - in /webservices/jaxme/branches/MAVEN: ./ common-build/ projects/jm/ projects/jm/xdocs/ projects/js/ projects/js/xdocs/ projects/js/xdocs/apps/ projects/js/xdocs/patterns/ projects/pm/xdocs/ projects/xs/xdocs/

Author: mac
Date: Fri Aug 19 01:38:28 2005
New Revision: 233455

URL: http://svn.apache.org/viewcvs?rev=233455&view=rev
Log:
transformed docs to anakia format to be able to attain goal site with maven
some strange behaviours when trying to sync with subclipse...

Added:
    webservices/jaxme/branches/MAVEN/common-build/site.jsl
    webservices/jaxme/branches/MAVEN/common-build/xdocs.properties
Removed:
    webservices/jaxme/branches/MAVEN/projects/js/xdocs/apps/book.xml
    webservices/jaxme/branches/MAVEN/projects/js/xdocs/book.xml
    webservices/jaxme/branches/MAVEN/projects/js/xdocs/patterns/book.xml
    webservices/jaxme/branches/MAVEN/projects/pm/xdocs/book.xml
    webservices/jaxme/branches/MAVEN/projects/xs/xdocs/book.xml
Modified:
    webservices/jaxme/branches/MAVEN/common-build/maven.xml
    webservices/jaxme/branches/MAVEN/common-build/project.properties
    webservices/jaxme/branches/MAVEN/maven.xml
    webservices/jaxme/branches/MAVEN/project.properties
    webservices/jaxme/branches/MAVEN/project.xml
    webservices/jaxme/branches/MAVEN/projects/jm/maven.xml
    webservices/jaxme/branches/MAVEN/projects/jm/xdocs/navigation.xml
    webservices/jaxme/branches/MAVEN/projects/js/maven.xml
    webservices/jaxme/branches/MAVEN/projects/js/xdocs/apps/xmlrpc.xml
    webservices/jaxme/branches/MAVEN/projects/js/xdocs/factory.xml
    webservices/jaxme/branches/MAVEN/projects/js/xdocs/index.xml
    webservices/jaxme/branches/MAVEN/projects/js/xdocs/jparser.xml
    webservices/jaxme/branches/MAVEN/projects/js/xdocs/methods.xml
    webservices/jaxme/branches/MAVEN/projects/js/xdocs/optimizations.xml
    webservices/jaxme/branches/MAVEN/projects/js/xdocs/patterns/chains.xml
    webservices/jaxme/branches/MAVEN/projects/js/xdocs/patterns/proxy.xml
    webservices/jaxme/branches/MAVEN/projects/js/xdocs/patterns/typesafeenum.xml
    webservices/jaxme/branches/MAVEN/projects/js/xdocs/patterns/versioning.xml
    webservices/jaxme/branches/MAVEN/projects/js/xdocs/placeholders.xml
    webservices/jaxme/branches/MAVEN/projects/js/xdocs/sql.xml
    webservices/jaxme/branches/MAVEN/projects/xs/xdocs/generic.xml
    webservices/jaxme/branches/MAVEN/projects/xs/xdocs/index.xml
    webservices/jaxme/branches/MAVEN/projects/xs/xdocs/logical.xml
    webservices/jaxme/branches/MAVEN/projects/xs/xdocs/syntax.xml

Modified: webservices/jaxme/branches/MAVEN/common-build/maven.xml
URL: http://svn.apache.org/viewcvs/webservices/jaxme/branches/MAVEN/common-build/maven.xml?rev=233455&r1=233454&r2=233455&view=diff
==============================================================================
--- webservices/jaxme/branches/MAVEN/common-build/maven.xml (original)
+++ webservices/jaxme/branches/MAVEN/common-build/maven.xml Fri Aug 19 01:38:28 2005
@@ -5,12 +5,13 @@
 <goal name="build">
 	<ant:property name="version" value="${pom.currentVersion}"/>
 	<attainGoal name="clean"/>
-	<attainGoal name="site"/>
 <!--
+	<attainGoal name="site"/>
 	<attainGoal name="fo:fo"/>	
 	<attainGoal name="pdf:pdf"/>
 -->	
-	<attainGoal name="jar:install"/>	
+
+	<attainGoal name="site"/>
 </goal>
 
 </project>

Modified: webservices/jaxme/branches/MAVEN/common-build/project.properties
URL: http://svn.apache.org/viewcvs/webservices/jaxme/branches/MAVEN/common-build/project.properties?rev=233455&r1=233454&r2=233455&view=diff
==============================================================================
--- webservices/jaxme/branches/MAVEN/common-build/project.properties (original)
+++ webservices/jaxme/branches/MAVEN/common-build/project.properties Fri Aug 19 01:38:28 2005
@@ -17,9 +17,10 @@
 # -------------------------------------------------------------------
 # P R O J E C T  P R O P E R T I E S
 # -------------------------------------------------------------------
-#maven.xdoc.bundle=resources
-#maven.xdoc.bundle.src=${basedir}/resources
-#maven.xdoc.locale.default=en
+maven.xdoc.jsl=../../common-build/site.jsl
+maven.xdoc.bundle.src=${basedir}/../../common-build/
+maven.xdoc.bundle=xdocs
+maven.xdoc.locale.default=en
 maven.changelog.factory = org.apache.maven.svnlib.SvnChangeLogFactory
 maven.multiproject.type=jar
 # We are targetting the 1.3 JVM and above

Added: webservices/jaxme/branches/MAVEN/common-build/site.jsl
URL: http://svn.apache.org/viewcvs/webservices/jaxme/branches/MAVEN/common-build/site.jsl?rev=233455&view=auto
==============================================================================
--- webservices/jaxme/branches/MAVEN/common-build/site.jsl (added)
+++ webservices/jaxme/branches/MAVEN/common-build/site.jsl Fri Aug 19 01:38:28 2005
@@ -0,0 +1,848 @@
+<?xml version="1.0"?>
+
+<!--
+ * ========================================================================
+ * 
+ * Copyright 2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * 
+ * ========================================================================
+-->
+<!-- stylesheet to be used -->
+<jsl:stylesheet select="$doc"
+  xmlns:define="jelly:define"
+  xmlns:j="jelly:core"
+  xmlns:jsl="jelly:jsl"
+  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">
+
+  <jsl:template match="document" trim="true">
+    <x:doctype name="html" publicId="-//W3C//DTD XHTML 1.0 Transitional//EN" systemId="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"/>
+
+    <j:useBean var="navbean" class="org.apache.maven.NavBean"/>
+    <j:set var="location" value="${outFile.substring(destdir.length())}"/>
+    <util:replace var="location" oldChar="\" newChar="/" value="${location}"/>
+    <!-- Stores location for publish date / version -->
+    <j:set var="date">${maven.xdoc.date}</j:set>
+    <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>
+            ${_docTitle}${titleSeparator}${_navTitle}
+          </title>
+        </x:if>
+        <x:if select="not($nav/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("${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("${relativePathForLocale}style/maven-${maven.xdoc.theme}.css");
+          ]]></j:if>
+          <j:if test="${projectCssFile.exists()}"><![CDATA[
+            @import url("${relativePathForLocale}style/project.css");
+          ]]></j:if>
+        </style>
+
+        <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="./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/*" />
+    </html>
+  </jsl:template>
+
+  <!-- Skip properties -->
+  <jsl:template match="properties" />
+
+  <!-- Skip head repeat -->
+  <jsl:template match="head" />
+
+  <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: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}"/>
+            </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 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: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>
+          <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}"/>
+                
+          <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'}">
+                <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>
+            <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>
+
+        <!-- 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"><fmt:message key="site.last_published" bundle="${msg}"/>: ${build.date}</div>
+            </j:if>
+          </j:if>  
+          </div>
+        </div>
+        <!-- left column end -->
+              
+        <!-- body start -->
+        <div id="bodyColumn">
+          <div class="contentBox">
+          <jsl:applyTemplates select="$templateContext/*" />
+          </div>
+        </div>
+        <div class="clear"><hr /></div>
+        <!-- body end -->
+              
+        <!-- footer start -->    
+        <div id="footer">  
+          <jsl:applyTemplates select="$nav/body/footer"/>
+       
+          <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>
+            </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>
+  
+          </j:if>                      
+          </div>
+          <div class="clear"><hr /></div>
+        </div>
+        <!-- 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)}">
+          <a name="${_anchorName}"/><h2>${_sectionName}</h2>
+      </j:if>
+      <jsl:applyTemplates />
+    </div>
+  </jsl:template>
+
+  <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)}">
+          <a name="${_anchorName}"/><h3>${_sectionName}</h3>
+      </j:if>
+      <jsl:applyTemplates />
+    </div>
+  </jsl:template>
+  
+  <jsl:template match="source" trim="false">
+    <div class="source"><pre><jsl:applyTemplates /></pre></div>
+  </jsl:template>
+  
+  <jsl:template match="escapeXml" trim="false"><j:set var="escapedChunk"><jsl:applyTemplates/></j:set>${escapedChunk}</jsl:template>
+  
+  <jsl:template match="a" trim="true">
+    <x:element name="a" trim="true">
+      <x:forEach var="attr" select="@*">
+        <j:choose>
+          <j:set var="attr_name" value="${attr.name}"/>
+          <j:set var="attr_value" value="${attr.value}"/>
+          <j:if test="${attr_name == 'hrefkey'}">        
+              <j:set var="_bundle">
+        		<x:expr select="@bundle" />
+      		  </j:set>
+		      <j:if test="${!empty(attr_value)}">
+		      	<!-- If there is hrefkey, then change attr_name to href -->
+		      	<!-- and attr_value to the formatted message -->
+		        <j:set var="attr_name" value="href"/>
+		        <!-- Default bundle is the user one in ${maven.xdoc.bundle} -->
+		        <j:if test="${empty(_bundle)}">
+		          <fmt:message key="${attr_value}" bundle="${myMsg}" var="attr_value"/>
+		        </j:if>
+		        <j:if test="${!empty(_bundle)}">
+		          <fmt:bundle basename="${_bundle}">
+		            <fmt:message key="${attr_value}" var="attr_value"/>
+		          </fmt:bundle>
+		        </j:if>		        
+		      </j:if>
+          </j:if>        
+          <j:when test="${attr_name == 'href'}">
+            <j:set var="href" value="${attr_value}" />
+            <j:choose>                 
+              <j:when test="${href.startsWith('#')}">
+                <x:attribute name="href">
+                  <doc:escapeNameToken value="${href}"/>
+                </x:attribute>
+              </j:when>
+              <j:when test="${href.startsWith('http://') or href.startsWith('https://')}">
+                <x:attribute name="href">${href}</x:attribute>
+                <x:attribute name="class">externalLink</x:attribute>
+                <x:attribute name="title">External Link</x:attribute>
+              </j:when>                  
+              <j:otherwise>
+                <x:attribute name="href">${href}</x:attribute>
+              </j:otherwise>
+            </j:choose>
+          </j:when>
+          <j:when test="${attr_name == 'target'}">
+            <j:set var="target">${attr_value}</j:set>
+            <j:if test="${!empty(target) and target.equals('_blank')}">
+              <x:attribute name="class">newWindow</x:attribute>
+              <x:attribute name="title">New Window</x:attribute>
+            </j:if>              
+            <x:attribute name="target">${target}</x:attribute>
+          </j:when>
+          <j:when test="${attr_name == 'name'}">
+            <x:attribute name="name">
+              <doc:escapeNameToken value="${attr_value}"/>
+            </x:attribute>
+          </j:when>
+          <j:when test="${attr.name == 'bundle'}"/>
+          <j:otherwise>
+            <x:attribute name="${attr_name}">${attr_value}</x:attribute>
+          </j:otherwise>
+        </j:choose>
+      </x:forEach>
+      <jsl:applyTemplates/>
+    </x:element>
+  </jsl:template>
+
+  <!-- Process the breadcrumb navbar -->
+  <jsl:template match="links" trim="true">
+    <j:set var="linkCount" value="1"/>
+    <x:forEach var="link" select="item">
+      <j:set var="_img"><x:expr select="@img"/></j:set>
+      <j:set var="_name"><x:expr select="@name"/></j:set>
+      <j:set var="_link"><x:expr select="@href"/></j:set>
+      <j:set var="_target"><x:expr select="@target"/></j:set>
+      <j:whitespace trim="false">
+        <j:if test="${linkCount != 1}">
+          <j:if test="${!(maven.xdoc.crumb.separator == '')}">
+            <span class="separator">${maven.xdoc.crumb.separator}</span>
+          </j:if>
+        </j:if>
+        <doc:itemLink name="${_name}" link="${_link}" img="${_img}" target="${_target}"/>
+      </j:whitespace>
+      <j:set var="linkCount" value="${1+linkCount}"/>
+    </x:forEach>
+  </jsl:template>
+  
+  <!-- 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>
+      <j:set var="_link"><x:expr select="@href"/></j:set>     
+      <a href="${_link}">${_name}</a>
+      &#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>
+          <ul><jsl:applyTemplates select="item"/></ul>
+        </div>
+      </j:when>
+      <j:otherwise>
+        <div>
+          <ul><jsl:applyTemplates select="item"/></ul>
+        </div>
+      </j:otherwise>
+    </j:choose>
+  </jsl:template>
+
+  <jsl:template match="item" trim="true">
+    <x:set var="item" select="."/>
+    <x:set var="_name" select="string(@name)"/>
+    <x:set var="_link" select="string(@href)"/>
+    <x:set var="_img" select="string(@img)"/>
+    <x:set var="_target" select="string(@target)"/>
+    <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>
+    </j:if>
+    <li class="${_state}">
+      <j:if test="${navbean.isSelected(item.get(0))}">
+        <strong><doc:itemLink name="${_name}" link="${_link}" img="${_img}" state="${_state}" target="${_target}"/></strong>
+      </j:if>
+      <j:if test="${!navbean.isSelected(item.get(0))}">
+        <doc:itemLink name="${_name}" link="${_link}" img="${_img}" state="${_state}" target="${_target}"/>
+      </j:if>
+      <j:if test="${_state == 'expanded'}">
+        <ul>
+          <jsl:applyTemplates select="item"/>
+        </ul>
+      </j:if>
+    </li>
+  </jsl:template>
+
+  <!-- Google site search -->
+  <jsl:template match="search" trim="true">
+    <!-- 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="search">
+      <h5>Search ${pom.name}</h5>
+      <form method="get" action="http://www.google.com/search">
+        <a class="navlink" href="http://www.google.com">
+          <img src="http://www.google.com/logos/Logo_25wht.gif" width="75" height="32" alt="Google" />
+        </a>
+        <j:set var="siteURL" value="${pom.url}"/>
+        <!-- google fails on urls that end with / -->
+        <j:if test="${siteURL.endsWith('/')}">
+          <j:set var="URLLength" value="${siteURL.length() - 1}"/>
+          <j:set var="siteURL" value="${siteURL.substring(0, URLLength.intValue())}"/>
+        </j:if>
+        <input type="text" id="q" size="15" name="q" maxlength="255" value=""/>
+        <input type="submit" id="btnG" value="Go" name="btnG"/>
+        <input type="hidden" name="domains" value="${siteURL}"/>
+        <input type="hidden" id="search" name="sitesearch" value="${siteURL}"/>
+      </form>
+    </div>
+  </jsl:template>
+
+  <!-- preserve whitespace in the following elements -->
+  <jsl:template match="pre | script | style" trim="true">
+    <x:set var="nodename" select="name()"/>
+    <x:element name="${nodename}">
+      <x:forEach var="attr" select="@*">
+        <x:attribute name="${attr.name}">${attr.value}</x:attribute>
+      </x:forEach>
+      <j:whitespace trim="false"><jsl:applyTemplates /></j:whitespace>
+    </x:element>
+  </jsl:template>
+  
+  <!-- xhtml fixup: add missing alt attribute for images -->
+  <jsl:template match="img" trim="true">
+    <x:element name="img">
+      <x:forEach var="attr" select="@*">
+        <x:attribute name="${attr.name}">${attr.value}</x:attribute>
+      </x:forEach>
+      <x:set var="noalt" select="count(./@alt) = 0" />
+      <j:if test="${noalt}" >
+        <x:attribute name="alt"></x:attribute>
+      </j:if>
+    </x:element>
+  </jsl:template>
+
+  <jsl:template match="footer" trim="true">
+    <div class="xleft">
+      <jsl:applyTemplates />
+    </div>
+  </jsl:template>
+
+  <jsl:template match="table" trim="true">
+    <j:set var="rowcount" value="0"/>
+    <table class="bodyTable">
+      <jsl:applyTemplates />
+    </table>
+  </jsl:template>
+
+  <jsl:template match="tr" 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>
+      <x:forEach var="attr" select="@*">
+        <x:attribute name="${attr.name}">${attr.value}</x:attribute>
+      </x:forEach>
+      <jsl:applyTemplates />
+       </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><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>
+        
+        <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"/>
+  </jsl:template>
+
+  <!-- element values don't pass through as text -->
+  <jsl:template match="@*"/>
+
+  <!-- CDATA and text nodes pass-thru -->
+  <jsl:template match="text()"><x:expr select="."/></jsl:template>
+
+  <!-- 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>

Added: webservices/jaxme/branches/MAVEN/common-build/xdocs.properties
URL: http://svn.apache.org/viewcvs/webservices/jaxme/branches/MAVEN/common-build/xdocs.properties?rev=233455&view=auto
==============================================================================
--- webservices/jaxme/branches/MAVEN/common-build/xdocs.properties (added)
+++ webservices/jaxme/branches/MAVEN/common-build/xdocs.properties Fri Aug 19 01:38:28 2005
@@ -0,0 +1,17 @@
+# -------------------------------------------------------------------
+# Copyright 2001-2004 The Apache Software Foundation.
+# 
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#      http://www.apache.org/licenses/LICENSE-2.0
+#  
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# -------------------------------------------------------------------
+
+link.ext-ri=http://java.sun.com/webservices/downloads/webservicespack.html

Modified: webservices/jaxme/branches/MAVEN/maven.xml
URL: http://svn.apache.org/viewcvs/webservices/jaxme/branches/MAVEN/maven.xml?rev=233455&r1=233454&r2=233455&view=diff
==============================================================================
--- webservices/jaxme/branches/MAVEN/maven.xml (original)
+++ webservices/jaxme/branches/MAVEN/maven.xml Fri Aug 19 01:38:28 2005
@@ -23,10 +23,11 @@
   includes="**/api/project.xml,**/xs/project.xml,**/js/project.xml"
   excludes="**/pm/project.xml"
   banner="Building"
-  goals="site"
+  goals="build"
   ignoreFailures="true"
-  sort="false"
+  sort="true"
 />
+
 </goal>
 </project>
 

Modified: webservices/jaxme/branches/MAVEN/project.properties
URL: http://svn.apache.org/viewcvs/webservices/jaxme/branches/MAVEN/project.properties?rev=233455&r1=233454&r2=233455&view=diff
==============================================================================
--- webservices/jaxme/branches/MAVEN/project.properties (original)
+++ webservices/jaxme/branches/MAVEN/project.properties Fri Aug 19 01:38:28 2005
@@ -3,9 +3,11 @@
 maven.proxy.port=80
 maven.docbook.dtd=D:\eclipse\workspace\ws-jaxme\src\docbook\sdocbook.dtd
 
-maven.subprojects.pom=projects/api/project.xml,projects/xs/project.xml,projects/js/project.xml,projects/jm/project.xml
+maven.subprojects.pom=projects/api/project.xml,projects/xs/project.xml,projects/js/project.xml
+#,projects/jm/project.xml
 maven.multiproject.aggregateDir=projects/
-maven.multiproject.includes=projects/api/project.xml,projects/xs/project.xml,projects/js/project.xml,projects/jm/project.xml
+maven.multiproject.includes=projects/api/project.xml,projects/xs/project.xml,projects/js/project.xml
+#,projects/jm/project.xml
 maven.multiproject.navigation=aggregate
 maven.multiproject.site.goals=clean,jar
 

Modified: webservices/jaxme/branches/MAVEN/project.xml
URL: http://svn.apache.org/viewcvs/webservices/jaxme/branches/MAVEN/project.xml?rev=233455&r1=233454&r2=233455&view=diff
==============================================================================
--- webservices/jaxme/branches/MAVEN/project.xml (original)
+++ webservices/jaxme/branches/MAVEN/project.xml Fri Aug 19 01:38:28 2005
@@ -119,21 +119,16 @@
             <distribution>repo</distribution>
         </license>
     </licenses>
-    <build>
-        <nagEmailAddress>jaxme</nagEmailAddress>
-        <sourceDirectory>src/main/java</sourceDirectory>
-        <unitTestSourceDirectory>src/test/java</unitTestSourceDirectory>
-    </build>
+    <build />
     <reports>
         <report>maven-license-plugin</report>
         <report>maven-changes-plugin</report>
-        <report>maven-junit-report-plugin</report>
-<report>maven-multiproject-plugin</report>        
-<!--
-        <report>maven-jcoverage-plugin</report>
-        <report>maven-changelog-plugin</report>
-        <report>maven-file-activity-plugin</report>
-        <report>maven-developer-activity-plugin</report>
+        <report>maven-multiproject-plugin</report>
+        <!--
+        <report>maven-jcoverage-plugin</report>
+        <report>maven-changelog-plugin</report>
+        <report>maven-file-activity-plugin</report>
+        <report>maven-developer-activity-plugin</report>
         <report>maven-checkstyle-plugin</report>
         <report>maven-findbugs-plugin</report>
         <report>maven-javadoc-plugin</report>

Modified: webservices/jaxme/branches/MAVEN/projects/jm/maven.xml
URL: http://svn.apache.org/viewcvs/webservices/jaxme/branches/MAVEN/projects/jm/maven.xml?rev=233455&r1=233454&r2=233455&view=diff
==============================================================================
--- webservices/jaxme/branches/MAVEN/projects/jm/maven.xml (original)
+++ webservices/jaxme/branches/MAVEN/projects/jm/maven.xml Fri Aug 19 01:38:28 2005
@@ -24,7 +24,6 @@
     
 	<ant:path id="jm.class.path">
 	  <ant:pathelement path="${maven.build.dest}"/>
-      <ant:pathelement location="${basedir}/../js/target/classes"/>
 	  <ant:path refid="maven.dependency.classpath"/>
 	</ant:path>
 

Modified: webservices/jaxme/branches/MAVEN/projects/jm/xdocs/navigation.xml
URL: http://svn.apache.org/viewcvs/webservices/jaxme/branches/MAVEN/projects/jm/xdocs/navigation.xml?rev=233455&r1=233454&r2=233455&view=diff
==============================================================================
--- webservices/jaxme/branches/MAVEN/projects/jm/xdocs/navigation.xml (original)
+++ webservices/jaxme/branches/MAVEN/projects/jm/xdocs/navigation.xml Fri Aug 19 01:38:28 2005
@@ -25,13 +25,10 @@
 	      <item name="JaxMe" href="http://ws.apache.org/jaxme/"/>
 	    </breadcrumbs>	
 		<links>
-			<item name="JaxMe2" href="http://ws.apache.org/jaxme/" />
 			<item name="JAXB RI"
 				href="http://java.sun.com/webservices/downloads/webservicespack.html"
 				target="_blank" />
 			<item name="JAXB" href="http://java.sun.com/xml/jaxb/"
-				target="_blank" />
-			<item name="Apache" href="http://apache.org/"
 				target="_blank" />
 		</links>
 	</body>

Modified: webservices/jaxme/branches/MAVEN/projects/js/maven.xml
URL: http://svn.apache.org/viewcvs/webservices/jaxme/branches/MAVEN/projects/js/maven.xml?rev=233455&r1=233454&r2=233455&view=diff
==============================================================================
--- webservices/jaxme/branches/MAVEN/projects/js/maven.xml (original)
+++ webservices/jaxme/branches/MAVEN/projects/js/maven.xml Fri Aug 19 01:38:28 2005
@@ -18,8 +18,8 @@
 -->
 <project xmlns:ant="jelly:ant" xmlns:maven="jelly:maven">
 
-<preGoal name="test:compile">
-
+<postGoal name="test:prepare-filesystem">
+	<ant:echo>Generating tests for JS</ant:echo>
 	<ant:property name="JS.build.test" value="${maven.build.dir}/junit"/>
 	<ant:property name="build.js.db" value="${JS.build.test}/db"/>
 	<ant:property name="build.js.db.db" value="${build.js.db}/db"/>	
@@ -65,8 +65,9 @@
             driver="${jdbc.driver}"
             url="${jdbc.url}"
             userid="${jdbc.user}"
-            password="${jdbc.password}" 
-            classpathref="js.test.path"/>
+            password="${jdbc.password}"             
+            classpathref="js.test.path"
+            caching="false"/>
 
     <ant:versionGenerator driver="${jdbc.driver}"
                               url="${jdbc.url}"
@@ -84,7 +85,7 @@
     <maven:addPath id="maven.test.compile.src.set"
                    refid="generated.test.src"/>
 
-</preGoal>
+</postGoal>
 </project>
 
 

Modified: webservices/jaxme/branches/MAVEN/projects/js/xdocs/apps/xmlrpc.xml
URL: http://svn.apache.org/viewcvs/webservices/jaxme/branches/MAVEN/projects/js/xdocs/apps/xmlrpc.xml?rev=233455&r1=233454&r2=233455&view=diff
==============================================================================
--- webservices/jaxme/branches/MAVEN/projects/js/xdocs/apps/xmlrpc.xml (original)
+++ webservices/jaxme/branches/MAVEN/projects/js/xdocs/apps/xmlrpc.xml Fri Aug 19 01:38:28 2005
@@ -16,10 +16,12 @@
  limitations under the License.
 
 -->
-<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.2//EN" "document-v12.dtd">
 <document>
-  <header><title>Apache XML-RPC Clients</title></header>
+	<properties>
+		<title>Apache XML-RPC Clients</title>
+	</properties>
   <body>
+    <section name="Apache XML-RPC Clients">
     <p>Apache XML-RPC is an implementation of XML-RPC: Remote procedure
       calls are transmitted as XML documents and the results are returned
       in the same way.</p>
@@ -31,10 +33,10 @@
       for type safety and compiler control. But why take the disadvantage?
       The client generator allows you to have both flexibility and
       compiler control.</p>
-
-    <section><title>How it works</title>
+	</section>
+    <section name="How it works">
       <p>The client generator is roughly similar to the
-        <link href="../patterns/proxy.html">Proxy Generator</link>:
+        <a href="../patterns/proxy.html">Proxy Generator</a>:
         Assuming that you have classes A, B, and C on the server,
         which are being called via XML-RPC, the generator creates
         classes A', B', and C' with roughly the same set of public
@@ -81,8 +83,8 @@
       <p>In particular, note that the generated classes are
         automatically converting from or to primitive types.
         A basic implementation for the
-        <link href="../../apidocs/org/apache/ws/jaxme/js/apps/XmlRpcCaller.html">
-        XmlRpcCaller</link> would be:</p>
+        <a href="../apidocs/org/apache/ws/jaxme/js/apps/XmlRpcCaller.html">
+        XmlRpcCaller</a> would be:</p>
       <source>
 public class MyCaller implements org.apache.ws.jaxme.js.apps.XmlRpcCaller {
 	private final URL url;
@@ -96,7 +98,7 @@
       </source>
     </section>
 
-    <section><title>The dispatcher</title>
+    <section name="The dispatcher">
       <p>The generator may create one additional class for you, which is
         dedicated for the server: The dispatcher. In the above example,
         a dispatcher would be:</p>
@@ -140,7 +142,7 @@
 </source>
     </section>
 
-    <section><title>Using the generator</title>
+    <section name="Using the generator">
       <p>The generator is implemented as an Ant task. A typical invocation will
         most probably look like this:</p>
 <source>
@@ -205,8 +207,8 @@
          <td>One or more file sets specifying the server side classes,
            for which clients are being generated. These classes may either
            be specified as sources (in which case the
-           <link href="../../apidocs/org/apache/ws/jaxme/js/util/JavaParser.html">
-             Java parser</link> is used for scanning them, or as compiled classes,
+           <a href="../apidocs/org/apache/ws/jaxme/js/util/JavaParser.html">
+             Java parser</a> is used for scanning them, or as compiled classes,
            in which case Java reflection is being used.</td>
          <td>Yes</td>
        </tr>

Modified: webservices/jaxme/branches/MAVEN/projects/js/xdocs/factory.xml
URL: http://svn.apache.org/viewcvs/webservices/jaxme/branches/MAVEN/projects/js/xdocs/factory.xml?rev=233455&r1=233454&r2=233455&view=diff
==============================================================================
--- webservices/jaxme/branches/MAVEN/projects/js/xdocs/factory.xml (original)
+++ webservices/jaxme/branches/MAVEN/projects/js/xdocs/factory.xml Fri Aug 19 01:38:28 2005
@@ -16,12 +16,12 @@
  limitations under the License.
 
 -->
-<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.2//EN" "document-v12.dtd">
 <document>
-  <header><title>Using the JavaSourceFactory</title></header>
+  <properties><title>Using the JavaSourceFactory</title></properties>
   <body>
+  <section name="Using the JavaSourceFactory">
       <p>Using the JavaSource framework is using a
-        <link href="../apidocs/org/apache/ws/jaxme/js/JavaSourceFactory.html">JavaSourceFactory</link>.
+        <a href="./apidocs/org/apache/ws/jaxme/js/JavaSourceFactory.html">JavaSourceFactory</a>.
         This class is (directly or indirectly) the single access point to all other classes.
         We demonstrate the basic use with the following example:</p>
       <source>
@@ -84,5 +84,6 @@
         imports and the like. You'll never have a chance to postprocess the generated
         source, unless you are actually parsing it. That's what the JavaSource framework
         gives you.</p>
+</section>        
   </body>
 </document>

Modified: webservices/jaxme/branches/MAVEN/projects/js/xdocs/index.xml
URL: http://svn.apache.org/viewcvs/webservices/jaxme/branches/MAVEN/projects/js/xdocs/index.xml?rev=233455&r1=233454&r2=233455&view=diff
==============================================================================
--- webservices/jaxme/branches/MAVEN/projects/js/xdocs/index.xml (original)
+++ webservices/jaxme/branches/MAVEN/projects/js/xdocs/index.xml Fri Aug 19 01:38:28 2005
@@ -16,17 +16,16 @@
  limitations under the License.
 
 -->
-<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.2//EN" "document-v12.dtd">
 <document>
-  <header><title>The JaxMe JavaSource framework</title></header>
+  <properties><title>The JaxMe JavaSource framework</title></properties>
   <body>
-    <section><title>The JaxMe JavaSource framework</title>
+    <section name="The JaxMe JavaSource framework">
       <p>This is a framework for generating Java sources. It is based on an
         abstraction of the Java sources. For instance, there is an object called
-        <link href="../apidocs/org/apache/ws/jaxme/js/JavaSource.html"><code>JavaSource</code></link>.
+        <a href="./apidocs/org/apache/ws/jaxme/js/JavaSource.html"><code>JavaSource</code></a>.
         This object can have embedded instances of
-        <link href="../apidocs/org/apache/ws/jaxme/js/JavaMethod.html"><code>JavaMethod</code></link> or
-        <link href="../apidocs/org/apache/ws/jaxme/js/JavaField.html"><code>JavaField</code></link>,
+        <a href="./apidocs/org/apache/ws/jaxme/js/JavaMethod.html"><code>JavaMethod</code></a> or
+        <a href="./apidocs/org/apache/ws/jaxme/js/JavaField.html"><code>JavaField</code></a>,
         it can have inner classes, constructors, and so on. You get the idea.
         Compared to a basic approach of just using <code>Writer.write(String)</code>,
         the framework has the obvious disadvantage of additional complexity and
@@ -69,7 +68,7 @@
     </section>
 
     <anchor id="history"/>
-    <section><title>History</title>
+    <section name="History">
     <p>The framework was originally part of the
       <link href="ext:jaxme1">JaxMe 1</link> generator, the predecessor of
       <link href="ext:jaxme2">JaxMe 2</link>.
@@ -79,7 +78,7 @@
       jar file and make JaxMe 2 based on it.</p>
     <p>In a way, the JavaSource framework is still a part of JaxMe, because it lives
       under the same Apache hat. The sources are located in the same
-      SVN server and the distribution comes from the same file server.
+      CVS server and the distribution comes from the same file server.
       The administrators and developers are typically the same. We'll see, what the
       future brings.</p>
     </section>

Modified: webservices/jaxme/branches/MAVEN/projects/js/xdocs/jparser.xml
URL: http://svn.apache.org/viewcvs/webservices/jaxme/branches/MAVEN/projects/js/xdocs/jparser.xml?rev=233455&r1=233454&r2=233455&view=diff
==============================================================================
--- webservices/jaxme/branches/MAVEN/projects/js/xdocs/jparser.xml (original)
+++ webservices/jaxme/branches/MAVEN/projects/js/xdocs/jparser.xml Fri Aug 19 01:38:28 2005
@@ -16,13 +16,12 @@
  limitations under the License.
 
 -->
-<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.2//EN" "document-v12.dtd">
 <document>
-  <header><title>Java Source Reflection</title></header>
+  <properties><title>Java Source Reflection</title></properties>
   <body>
-      <section><title>Why Source Reflection?</title>
+      <section name="Why Source Reflection?">
         <p>Java Source Generation is frequently based on reflection. For example,
-          the <link href="patterns/proxy.html">Proxy Generator</link> works
+          the <a href="patterns/proxy.html">Proxy Generator</a> works
           roughly like this: Class A is inspected using Java Reflection.
           A new class B is created. For any public method in A, a method
           in B is created, that invokes A.</p>
@@ -42,28 +41,28 @@
           source files, and not from the compiled classes.</p>
         </section>
 
-      <section><title>How it works</title>
+      <section name="How it works">
         <p>Java Source Reflection is implemented by the class
-          <link href="../apidocs/org/apache/ws/jaxme/js/util/JavaParser.html">
-          JavaParser</link>. This class takes as input a Java source file and
+          <a href="./apidocs/org/apache/ws/jaxme/js/util/JavaParser.html">
+          JavaParser</a>. This class takes as input a Java source file and
           converts it into an instance of
-          <link href="../apidocs/org/apache/ws/jaxme/js/JavaSource.html">
-          JavaSource</link>. The Java parser is internally based on an
+          <a href="./apidocs/org/apache/ws/jaxme/js/JavaSource.html">
+          JavaSource</a>. The Java parser is internally based on an
           <link href="ext:antlr">AntLR parser</link>. (AntLR is a public
           domain parser generator.)</p>
         <p>The created
-          <link href="../apidocs/org/apache/ws/jaxme/js/JavaSource.html">
-          JavaSource</link> instance contains instances of
-          <link href="../apidocs/org/apache/ws/jaxme/js/JavaMethod.html">
-          JavaMethod</link>,
-          <link href="../apidocs/org/apache/ws/jaxme/js/JavaField.html">
-          JavaField</link>,
-          <link href="../apidocs/org/apache/ws/jaxme/js/JavaInnerClass.html">
-          JavaInnerClass</link>, and so on. Obviously, these can be used to
+          <a href="./apidocs/org/apache/ws/jaxme/js/JavaSource.html">
+          JavaSource</a> instance contains instances of
+          <a href="./apidocs/org/apache/ws/jaxme/js/JavaMethod.html">
+          JavaMethod</a>,
+          <a href="./apidocs/org/apache/ws/jaxme/js/JavaField.html">
+          JavaField</a>,
+          <a href="./apidocs/org/apache/ws/jaxme/js/JavaInnerClass.html">
+          JavaInnerClass</a>, and so on. Obviously, these can be used to
           replace classical Java reflection.</p>
         </section>
 
-	  <section><title>Using the JavaParser</title>
+	  <section name="Using the JavaParser">
 	    <p>To use the Java parser, your classpath must obviously contain
 	      the file jaxmejs.jar. However, because the actual parser is
 	      generated by <link href="ext:antlr">AntLR</link>, you need the

Modified: webservices/jaxme/branches/MAVEN/projects/js/xdocs/methods.xml
URL: http://svn.apache.org/viewcvs/webservices/jaxme/branches/MAVEN/projects/js/xdocs/methods.xml?rev=233455&r1=233454&r2=233455&view=diff
==============================================================================
--- webservices/jaxme/branches/MAVEN/projects/js/xdocs/methods.xml (original)
+++ webservices/jaxme/branches/MAVEN/projects/js/xdocs/methods.xml Fri Aug 19 01:38:28 2005
@@ -16,17 +16,16 @@
  limitations under the License.
 
 -->
-<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.2//EN" "document-v12.dtd">
 <document>
-  <header><title>Writing methods</title></header>
+  <properties><title>Writing methods</title></properties>
   <body>
-    <section><title>Writing methods</title>
+    <section name="Writing methods">
       <p>Generating a method is supported through various shortcuts. These shortcuts and
         their value are probably best demonstrated by examples.</p>
     </section>
 
     <anchor id="throwingExceptions"/>
-    <section><title>Throwing exceptions</title>
+    <section name="Throwing exceptions">
       <p>Throwing exceptions using the standard method <code>addLine()</code>
         works roughly like this:</p>
       <source>
@@ -50,7 +49,7 @@
     </section>
 
     <anchor id="ifBlock"/>
-    <section><title>If .. elseif .. else .. blocks</title>
+    <section name="If .. elseif .. else .. blocks">
       <p>Suggest the following example:</p>
       <source>
   public JavaMethod getValueOfMethod(JavaSource pSource) {
@@ -93,7 +92,7 @@
     </section>
 
     <anchor id="catchBlock"/>
-    <section><title>Try .. catch .. finally .. blocks</title>
+    <section name="Try .. catch .. finally .. blocks">
       <p>A try .. catch block is typically written like this:</p>
       <source>
   public JavaMethod getAsIntMethod(JavaSource pSource) {

Modified: webservices/jaxme/branches/MAVEN/projects/js/xdocs/optimizations.xml
URL: http://svn.apache.org/viewcvs/webservices/jaxme/branches/MAVEN/projects/js/xdocs/optimizations.xml?rev=233455&r1=233454&r2=233455&view=diff
==============================================================================
--- webservices/jaxme/branches/MAVEN/projects/js/xdocs/optimizations.xml (original)
+++ webservices/jaxme/branches/MAVEN/projects/js/xdocs/optimizations.xml Fri Aug 19 01:38:28 2005
@@ -16,18 +16,17 @@
  limitations under the License.
 
 -->
-<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.2//EN" "document-v12.dtd">
 <document>
-  <header><title>Optimizations</title></header>
+  <properties><title>Optimizations</title></properties>
   <body>
-    <section><title>Optimizations</title>
+    <section name="Optimizations">
       <p>Automatically generated code tends to become unnecessarily
         complex and unreadable. This page summarizes some optimization
         concepts offered by JaxMeJS and possible strategies to use them.</p>
     </section>
 
     <anchor id="directAccessible"/>
-    <section><title>The DirectAccessible interface</title>
+    <section name="The DirectAccessible interface">
       <p>In general JaxMeJS deals with objects, in the most general sense.
         An object can be almost everything: An array or collection containing
         a piece of code, a variable, method, or class name or whatever else.
@@ -75,7 +74,7 @@
       </source>
       <p>Again, this is something we do not actually like to see. JaxMeJS suggests
         the use of the
-        <link href="../apidocs/org/apache/ws/jaxme/js/DirectAccessible.html">DirectAccessible</link>
+        <a href="./apidocs/org/apache/ws/jaxme/js/DirectAccessible.html">DirectAccessible</a>
         interface. This is an interface implemented by objects, which are accessible
         immediately and fast: Class and instance fields, method parameters, and
         local fields. This allows the following final example:</p>
@@ -93,9 +92,9 @@
     </section>
 
     <anchor id="nullChecks"/>
-    <section><title>Avoiding unnecessary checks for null</title>
+    <section name="Avoiding unnecessary checks for null">
       <p>The 
-        <link href="../apidocs/org/apache/ws/jaxme/js/DirectAccessible.html">DirectAccessible</link>
+        <a href="./apidocs/org/apache/ws/jaxme/js/DirectAccessible.html">DirectAccessible</a>
         interface can also be used to avoid situations like this:</p>
       <source>
   public void doThis(JavaMethod pMethod, Object pValue) {

Modified: webservices/jaxme/branches/MAVEN/projects/js/xdocs/patterns/chains.xml
URL: http://svn.apache.org/viewcvs/webservices/jaxme/branches/MAVEN/projects/js/xdocs/patterns/chains.xml?rev=233455&r1=233454&r2=233455&view=diff
==============================================================================
--- webservices/jaxme/branches/MAVEN/projects/js/xdocs/patterns/chains.xml (original)
+++ webservices/jaxme/branches/MAVEN/projects/js/xdocs/patterns/chains.xml Fri Aug 19 01:38:28 2005
@@ -16,10 +16,10 @@
  limitations under the License.
 
 -->
-<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.2//EN" "document-v12.dtd">
 <document>
-  <header><title>Proxy chains (also known as: Delegator pattern)</title></header>
+  <properties><title>Proxy chains (also known as: Delegator pattern)</title></properties>
   <body>
+  <section name="Proxy chains (also known as: Delegator pattern)">
     <anchor id="chains"/>
       <p>The proxy chain is best explained with the situation it was made for.
         Suggest a really complex source generator with varying options. For example,
@@ -77,7 +77,7 @@
       </source>
       <p>If you take this methods as events, then you might well write a default
         class A implementing the interface. The other classes are implemented as
-        subclasses of an automatically generated <link href="proxy.html">proxy class</link>.
+        subclasses of an automatically generated <a href="proxy.html">proxy class</a>.
         For example, the class B might just add another method to the <code>Foo</code>.
         This might look like the following:</p>
       <source>
@@ -137,7 +137,7 @@
     }
       </source>
       <p>The proxy chain pattern is implemented by the
-        <link href="../../apidocs/org/apache/ws/jaxme/js/pattern/ChainGenerator.html">ChainGenerator</link>.
+        <a href="../apidocs/org/apache/ws/jaxme/js/pattern/ChainGenerator.html">ChainGenerator</a>.
         From within Ant, it looks like the following:</p>
       <source>
     &lt;chainGenerator destDir="src"&gt;
@@ -163,5 +163,6 @@
         <code>implementationClassName</code> is an also automatically generated implementation
         of <code>controllerInterface</code>, that works internally by passing all events
         to the first element in the chain.</p>
+</section>        
   </body>
 </document>

Modified: webservices/jaxme/branches/MAVEN/projects/js/xdocs/patterns/proxy.xml
URL: http://svn.apache.org/viewcvs/webservices/jaxme/branches/MAVEN/projects/js/xdocs/patterns/proxy.xml?rev=233455&r1=233454&r2=233455&view=diff
==============================================================================
--- webservices/jaxme/branches/MAVEN/projects/js/xdocs/patterns/proxy.xml (original)
+++ webservices/jaxme/branches/MAVEN/projects/js/xdocs/patterns/proxy.xml Fri Aug 19 01:38:28 2005
@@ -16,13 +16,12 @@
  limitations under the License.
 
 -->
-<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.2//EN" "document-v12.dtd">
 <document>
-  <header><title>Proxy objects</title></header>
+  <properties><title>Proxy objects</title></properties>
 
   <body>
 	<anchor id="proxy_objects"/>
-    <section><title>Proxy objects</title>
+    <section name="Proxy objects">
       <p>A proxy class is a class that implements a list of interfaces specified at
         compile time. The proxy object typically holds a reference to an internal
         object that implements the same interfaces (or parts of them). The proxy
@@ -36,7 +35,7 @@
         the derivation of subclasses. In fact the derivation of a subclass is much
         more obvious, simple and faster than the use of an InvocationHandler.</p>
       <p>The proxy generator is implemented by the class
-        <link href="../../apidocs/org/apache/ws/jaxme/js/pattern/ProxyGenerator.html">ProxyGenerator</link>.
+        <a href="../apidocs/org/apache/ws/jaxme/js/pattern/ProxyGenerator.html">ProxyGenerator</a>.
         Use of the ProxyGenerator is demonstrated in the Ant target "generate.proxy".</p>
       <p>The proxy generator Ant task supports the following attributes:</p>
       <table>
@@ -112,12 +111,12 @@
     </section>
 
 	<anchor id="multiple_inheritance"/>
-    <section><title>Multiple Inheritance</title>
+    <section name="Multiple Inheritance">
       <p>Multiple inheritance is a design pattern which is not so easy to implement
         in Java - unless you use the
-        <link href="../../apidocs/org/apache/ws/jaxme/js/pattern/ProxyGenerator.html">ProxyGenerator</link>.
+        <a href="../apidocs/org/apache/ws/jaxme/js/pattern/ProxyGenerator.html">ProxyGenerator</a>.
         This is demonstrated by the JUnit test
-        <link href="../../apidocs/org/apache/ws/jaxme/js/junit/MultipleInheritanceTest.html">MultipleInheritanceTest</link>,
+        <a href="../apidocs/org/apache/ws/jaxme/js/junit/MultipleInheritanceTest.html">MultipleInheritanceTest</a>,
         which creates a subclass of <code>java.util.Observable</code>, that also inherits
         from <code>java.util.ArrayList</code>. The example implements a list, which
         notifies its observers whenever the <code>add()</code> method is invoked.</p>

Modified: webservices/jaxme/branches/MAVEN/projects/js/xdocs/patterns/typesafeenum.xml
URL: http://svn.apache.org/viewcvs/webservices/jaxme/branches/MAVEN/projects/js/xdocs/patterns/typesafeenum.xml?rev=233455&r1=233454&r2=233455&view=diff
==============================================================================
--- webservices/jaxme/branches/MAVEN/projects/js/xdocs/patterns/typesafeenum.xml (original)
+++ webservices/jaxme/branches/MAVEN/projects/js/xdocs/patterns/typesafeenum.xml Fri Aug 19 01:38:28 2005
@@ -16,11 +16,12 @@
  limitations under the License.
 
 -->
-<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.2//EN" "document-v12.dtd">
 <document>
-  <header><title>Typesafe enumerations</title></header>
+
+  <properties><title>Typesafe enumerations</title></properties>
 
   <body>
+  <section name="Typesafe enumerations">
       <p>Typesafe enumerations are classes with a private constructor and only
         a few defined instances. Each instance does have a name and a value. As
         of Java 1.5, they will be part of the Java language. For those of us,
@@ -52,5 +53,6 @@
       </source>
       <p>The important thing with this enumeration is that there cannot be other
         instances besides <code>JOE</code>, <code>POPEYE</code> and <code>DONALD</code>.</p>
+</section>        
   </body>
 </document>

Modified: webservices/jaxme/branches/MAVEN/projects/js/xdocs/patterns/versioning.xml
URL: http://svn.apache.org/viewcvs/webservices/jaxme/branches/MAVEN/projects/js/xdocs/patterns/versioning.xml?rev=233455&r1=233454&r2=233455&view=diff
==============================================================================
--- webservices/jaxme/branches/MAVEN/projects/js/xdocs/patterns/versioning.xml (original)
+++ webservices/jaxme/branches/MAVEN/projects/js/xdocs/patterns/versioning.xml Fri Aug 19 01:38:28 2005
@@ -16,13 +16,14 @@
  limitations under the License.
 
 -->
-<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.2//EN" "document-v12.dtd">
 <document>
-  <header><title>The version generator</title></header>
+	<properties>
+		<title>The version generator</title>
+	</properties>
   <body>
 
     <anchor id="introduction"/>
-    <section><title>The version generator</title>
+    <section name="The version generator">
       <p>A versioned object is an object with a composed primary key:
         We call the first part the version ID and the second part the version number.
         Objects with the same ID are called versions of the object. If the versioned
@@ -63,7 +64,7 @@
     </section>
 
     <anchor id="limitations"/>
-    <section><title>Limitations</title>
+    <section name="Limitations">
       <p>The current version of the version generator has some restrictions. In
         particular the following rules apply:</p>
       <ol>
@@ -86,13 +87,13 @@
     </section>
 
     <anchor id="columnUpdaters"/>
-    <section><title>Column updaters</title>
+    <section name="Column updaters">
       <p>Column updaters are used to perform the required modifications for the
         in-memory rows. For example, there is a column updater that updates a
         foreign keys value from an object that has already been cloned to its
         clone. Column updaters are implementing the interface
-        <link href="../../apidocs/org/apache/ws/jaxme/js/pattern/VersionGenerator.ColumnUpdater.html">
-          VersionGenerator.ColumnUpdater</link>.</p>
+        <a href="../apidocs/org/apache/ws/jaxme/js/pattern/VersionGenerator.ColumnUpdater.html">
+          VersionGenerator.ColumnUpdater</a>.</p>
       <p>The main thing to understand when writing a column updater is that it
         is not invoked at runtime, but as a part of the source generation stage.
         It emits Java code taking an object array as input and modifying the
@@ -117,7 +118,7 @@
         <dt>pTableInfo</dt><dd>Holds the generators view of the table being
           cloned by the method <code>pMethod</code>. The most important property
           is the <code>table</code> property, which returns an instance of
-          <link href="../../apidocs/org/apache/ws/jaxme/sqls/Table.html">Table</link> with the table name
+          <a href="../apidocs/org/apache/ws/jaxme/sqls/Table.html">Table</a> with the table name
           and column list.</dd>
         <dt>pConnection</dt><dd>A variable name which is holding an open
           database connection in the generated source.</dd>
@@ -134,9 +135,9 @@
     </section>
 
     <anchor id="use"/>
-    <section><title>Using the version generator</title>
+    <section name="Using the version generator">
       <p>To use the version generator, you need a set of tables (subject to the
-        limitations described <link href="#limitations">above</link>). For any table,
+        limitations described <a href="#limitations">above</a>). For any table,
         you also need a ColumnUpdater. If you have that, the generator is invoked
         like this:</p>
       <source><![CDATA[
@@ -162,8 +163,8 @@
 ]]>   </source>
       <p>You might replace the VersionGenerator with a subclass, because the above
         code would emit logging statements using the 
-        <link href="../../apidocs/org/apache/ws/jaxme/logging/package-summary.html">
-          org.apache.ws.jaxme.logging package</link>.
+        <a href="../apidocs/org/apache/ws/jaxme/logging/package-summary.html">
+          org.apache.ws.jaxme.logging package</a>.
         If you do not favour this, replace the methods <code>logEntering</code>,
         <code>logExiting</code>, <code>logFinest</code>, <code>logFinestEntering</code>,
         and <code>logFinestEntering</code> with your own implementations.</p>

Modified: webservices/jaxme/branches/MAVEN/projects/js/xdocs/placeholders.xml
URL: http://svn.apache.org/viewcvs/webservices/jaxme/branches/MAVEN/projects/js/xdocs/placeholders.xml?rev=233455&r1=233454&r2=233455&view=diff
==============================================================================
--- webservices/jaxme/branches/MAVEN/projects/js/xdocs/placeholders.xml (original)
+++ webservices/jaxme/branches/MAVEN/projects/js/xdocs/placeholders.xml Fri Aug 19 01:38:28 2005
@@ -16,11 +16,10 @@
  limitations under the License.
 
 -->
-<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.2//EN" "document-v12.dtd">
 <document>
-  <header><title>Placeholders</title></header>
+  <properties><title>Placeholders</title></properties>
   <body>
-    <section><title>Placeholders</title>
+    <section name="Placeholders">
       <p>Before describing what JaxMeJS placeholders are, we recall the use of
       placeholders in JDBC: By preparing a statement like</p>
       <source>
@@ -38,10 +37,10 @@
     </section>
 
     <anchor id="creating"/>
-    <section><title>Creating a placeholder</title>
+    <section name="Creating a placeholder">
       <p>A placeholder is created by invoking the method
-        <link href="../apidocs/org/apache/ws/jaxme/js/IndentationEngine.html#newPlaceHolder(String,boolean)">
-          newPlaceHolder(String,boolean)</link>. For example:</p>
+        <a href="./apidocs/org/apache/ws/jaxme/js/IndentationEngine.html#newPlaceHolder(String,boolean)">
+          newPlaceHolder(String,boolean)</a>. For example:</p>
       <source>
     JavaMethod jm;
     PlaceHolder p = jm.newPaceHolder("MyPlaceholder", true);
@@ -50,7 +49,7 @@
       <dl>
         <dt>pName</dt>
         <dd>Any placeholder has got a name. The name is the identifier by which you find the
-          placeholder. (See the <link href="#using">next section</link> for details.)</dd>
+          placeholder. (See the <a href="#using">next section</a> for details.)</dd>
         <dt>pAutoRemovable</dt>
         <dd>The boolean argument indicates whether you expect to use the placeholder in
           either case. If so, you set the "autoRemovable" argument to false. In that case,
@@ -62,7 +61,7 @@
     </section>
 
     <anchor id="using"/>
-    <section><title>Using the placeholder</title>
+    <section name="Using the placeholder">
       <p>To insert code after the placeholder, simply find it. For example:</p>
       <source>
     JavaMethod jm;

Modified: webservices/jaxme/branches/MAVEN/projects/js/xdocs/sql.xml
URL: http://svn.apache.org/viewcvs/webservices/jaxme/branches/MAVEN/projects/js/xdocs/sql.xml?rev=233455&r1=233454&r2=233455&view=diff
==============================================================================
--- webservices/jaxme/branches/MAVEN/projects/js/xdocs/sql.xml (original)
+++ webservices/jaxme/branches/MAVEN/projects/js/xdocs/sql.xml Fri Aug 19 01:38:28 2005
@@ -16,11 +16,10 @@
  limitations under the License.
 
 -->
-<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.2//EN" "document-v12.dtd">
 <document>
-  <header><title>Working with SQL</title></header>
+  <properties><title>Working with SQL</title></properties>
   <body>
-    <section><title>Working with SQL</title>
+    <section name="Working with SQL">
       <warning>As of this writing, the SQL support is in early stages.
         Some things described here are hardly more than planned and the API
         will probably change rapidly.</warning>
@@ -38,7 +37,7 @@
     </section>
 
 	<anchor id="schema"/>
-	<section><title>Creating a schema</title>
+	<section name="Creating a schema">
       <p>The SQL generator assumes that any table belongs to a schema.
       In other words, before creating a table, you have to create a schema:</p>
       <source>
@@ -62,7 +61,7 @@
 	</section>
 
     <anchor id="table"/>
-    <section><title>Creating a table</title>
+    <section name="Creating a table">
       <p>Now that we have a schema, we may populate it with tables
         and the tables with columns. Suggest the following statement:</p>
       <source>
@@ -90,7 +89,7 @@
     </section>
 
     <anchor id="insert"/>
-    <section><title>Creating an INSERT statement</title>
+    <section name="Creating an INSERT statement">
       <p>Now that we have our tables, we probably want to create an
         INSERT statement like</p>
       <source>
@@ -118,7 +117,7 @@
     </section>
 
     <anchor id="select"/>
-    <section><title>Creating a SELECT statement</title>
+    <section name="Creating a SELECT statement">
       <p>Quite similar to the above is the creation of a SELECT statement:</p>
       <source>
   SELECT id, name, price FROM mytable
@@ -159,7 +158,7 @@
     </section>
 
     <anchor id="update"/>
-    <section><title>Creating an UPDATE statement</title>
+    <section name="Creating an UPDATE statement">
       <p>A typical UPDATE statement for <code>mytable</code> would be</p>
       <source>
   UPDATE mytable SET name = 'foo', price = ? WHERE id = ?
@@ -189,7 +188,7 @@
     </section>
 
     <anchor id="delete"/>
-    <section><title>Creating a DELETE statement</title>
+    <section name="Creating a DELETE statement">
       <p>Most probably you already guess how to create the following
         <code>DELETE</code> statement:</p>
       <source>
@@ -217,7 +216,7 @@
     </section>
 
     <anchor id="create"/>
-    <section><title>Creating one or more CREATE TABLE statements</title>
+    <section name="Creating one or more CREATE TABLE statements">
       <p>Is it possible to recreate the above CREATE TABLE statement from
         the above <code>table</code> variable? Of course it is:</p>
         <source>
@@ -252,7 +251,7 @@
     </section>
 
     <anchor id="extensions"/>
-    <section><title>Vendor specific extensions</title>
+    <section name="Vendor specific extensions">
       <p>Vendor specific extensions and vendor specific SQL dialects are available
         through subclasses of <code>SQLFactoryImpl</code>. As of this writing, the
         only available subclass is <code>DB2SQLFactoryImpl</code>. To use it,

Modified: webservices/jaxme/branches/MAVEN/projects/xs/xdocs/generic.xml
URL: http://svn.apache.org/viewcvs/webservices/jaxme/branches/MAVEN/projects/xs/xdocs/generic.xml?rev=233455&r1=233454&r2=233455&view=diff
==============================================================================
--- webservices/jaxme/branches/MAVEN/projects/xs/xdocs/generic.xml (original)
+++ webservices/jaxme/branches/MAVEN/projects/xs/xdocs/generic.xml Fri Aug 19 01:38:28 2005
@@ -17,16 +17,18 @@
 
 -->
 <document>
-  <header><title>The generic parser</title></header>
+	<properties>
+		<title>The generic parser</title>
+	</properties>
   <body>
-    <section><title>The generic parser</title>
+    <section name="The generic parser">
       <p>The most basic part of JaxMeXS is its generic parser. This part is suited
         for arbitrary XML document types, for example configuration files and the
         like. The actual XML Schema parsers (the
-        <link href="syntax.html">syntax parser</link> and the
-        <link href="logical.html">logical parser</link>) are sitting on top of
+        <a href="syntax.html">syntax parser</a> and the
+        <a href="logical.html">logical parser</a>) are sitting on top of
         the generic parser. If you aren't interested in the generic part, you may
-        safely skip to the <link href="syntax.html">next section</link>, which is basically
+        safely skip to the <a href="syntax.html">next section</a>, which is basically
         self contained. However, some details are best described here.</p>
       <p>The generic parser follows an idea from the
         <link href="ext:ant">Ant</link> project: A SAX parser is responsible for the
@@ -36,24 +38,24 @@
         you know <link href="ext:antwritingowntask">how to write an Ant task</link>,
         you know how the generic parser works.</p>
       <p>The generic parser is specified by the interface
-        <link href="../apidocs/org/apache/ws/jaxme/xs/parser/XsSAXParser.html">XsSAXParser</link> and
+        <a href="./apidocs/org/apache/ws/jaxme/xs/parser/XsSAXParser.html">XsSAXParser</a> and
         implemented by the class
-        <link href="../apidocs/org/apache/ws/jaxme/xs/parser/XsSAXParserImpl.html">XsSAXParserImpl</link>.
+        <a href="./apidocs/org/apache/ws/jaxme/xs/parser/impl/XsSAXParserImpl.html">XsSAXParserImpl</a>.
         There's few things to know about that. The most important parts are some other
         interfaces and classes which you might like to implement or extend:</p>
       <ol>
-        <li>The <link href="#AttributeSetter">AttributeSetter</link>
+        <li>The <a href="#AttributeSetter">AttributeSetter</a>
           interface is responsible for mapping XML attributes to bean properties.</li>
-        <li>The <link href="#TextSetter">TextSetter</link> handles character data contained
+        <li>The <a href="#TextSetter">TextSetter</a> handles character data contained
           in elements.</li>
-        <li>And, finally, the <link href="#ChildSetter">ChildSetter</link> creates new beans
+        <li>And, finally, the <a href="#ChildSetter">ChildSetter</a> creates new beans
           for any child element.</li>
       </ol>
     </section>
 
     <anchor id="AttributeSetter"/>
-    <section><title>The AttributeSetter interface</title>
-      <p>The <link href="../apidocs/org/apache/ws/jaxme/xs/parser/AttributeSetter.html">AttributeSetter</link>
+    <section name="The AttributeSetter interface">
+      <p>The <a href="./apidocs/org/apache/ws/jaxme/xs/parser/AttributeSetter.html">AttributeSetter</a>
         interface consists of a single method:</p>
       <source>
   public void setAttribute(String pQName, String pNamespaceURI,
@@ -64,8 +66,8 @@
         name is <code>foo</code>. A method <code>setFoo(SomeClass pValue)</code> is searched.
         f such a method is found, the attribute value is converted into an instance of
         <code>SomeClass</code> and the method is invoked. More formally, the default
-        implementation <link href="../apidocs/org/apache/ws/jaxme/xs/parser/impl/AttributeSetterImpl.html">
-        AttributeSetterImpl</link> behaves as follows:</p>
+        implementation <a href="./apidocs/org/apache/ws/jaxme/xs/parser/impl/AttributeSetterImpl.html">
+        AttributeSetterImpl</a> behaves as follows:</p>
       <ol>
         <li>If the bean has a method <code>setAttribute(String, String, String, String)</code>,
           it is invoked with the same arguments <code>pQName</code>, <code>pNamespaceURI</code>,
@@ -119,8 +121,8 @@
     </section>
 
     <anchor id="TextSetter"/>
-    <section><title>The TextSetter interface</title>
-      <p>The <link href="../apidocs/org/apache/ws/jaxme/xs/parser/TextSetter.html">TextSetter</link>
+    <section name="The TextSetter interface">
+      <p>The <a href="./apidocs/org/apache/ws/jaxme/xs/parser/TextSetter.html">TextSetter</a>
         interface is invoked from within the SAX ContentHandlers method
         <code>characters(char[] pBuffer, int pOffset, int pLen)</code>.
         It's task is to fill the bean with character data. Note, that the latter
@@ -136,8 +138,8 @@
   public void addText(String pValue) throws SAXException;
       </source>
       <p>The default implementation is
-        <link href="../apidocs/org/apache/ws/jaxme/xs/parser/impl/TextSetterImpl.html">
-          TextSetterImpl</link>, which behaves as follows:</p>
+        <a href="./apidocs/org/apache/ws/jaxme/xs/parser/impl/TextSetterImpl.html">
+          TextSetterImpl</a>, which behaves as follows:</p>
       <ol>
         <li>If the bean has a method with the same signature
           <code>public void addText(String)</code>, then the method is invoked.</li>
@@ -148,11 +150,11 @@
     </section>
 
     <anchor id="ChildSetter"/>
-    <section><title>Handling child elements</title>
+    <section name="Handling child elements">
       <p>Embedded child elements are handled by the interface
-        <link href="../apidocs/org/apache/ws/jaxme/xs/parser/ChildSetter.html">ChildSetter</link> and
+        <a href="./apidocs/org/apache/ws/jaxme/xs/parser/ChildSetter.html">ChildSetter</a> and
         its default implementation
-        <link href="../apidocs/org/apache/ws/jaxme/xs/parser/impl/ChildSetterImpl.html">ChildSetterImpl</link>.
+        <a href="./apidocs/org/apache/ws/jaxme/xs/parser/impl/ChildSetterImpl.html">ChildSetterImpl</a>.
         The interface exposes a single method:</p>
       <source>
   public ContentHandler getChildHandler(String pQName, String pNamespaceURI,
@@ -170,7 +172,7 @@
           and the local name is <code>foo</code>, then a method
           <code>public T createFoo()</code> is searched, with an arbitrary result type T.
           If there is such a method it is invoked and a new instance of
-          <link href="../apidocs/org/apache/ws/jaxme/xs/parser/impl/XsSAXParserImpl.html">XsSAXParserImpl</link>
+          <a href="./apidocs/org/apache/ws/jaxme/xs/parser/impl/XsSAXParserImpl.html">XsSAXParserImpl</a>
           is created to configure the bean.</li>
         <li>An exception is thrown otherwise.</li>
       </ol>



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