commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nia...@apache.org
Subject svn commit: r889212 - in /commons/proper/jelly/branches/MAVEN-2-BRANCH: ./ jelly-tags/ant/ jelly-tags/antlr/ jelly-tags/avalon/ jelly-tags/bean/ jelly-tags/beanshell/ jelly-tags/betwixt/ jelly-tags/bsf/ jelly-tags/define/ jelly-tags/dynabean/ jelly-tag...
Date Thu, 10 Dec 2009 11:52:21 GMT
Author: niallp
Date: Thu Dec 10 11:51:24 2009
New Revision: 889212

URL: http://svn.apache.org/viewvc?rev=889212&view=rev
Log:
Jelly Tag Doc generation
 - use JavaDoc Doclet in maven-jellydoc-plugin (via m2 profile) to generate xml for tag libararies
 - add build-tagdoc.xml ant file to convert generated xml for tag libararies into xdocs
 - remove jelldoc module which was copy of maven-jellydoc-plugin

TODO: Any escaped HTML characters in the Tag's java class files currently causex xdoc generation to fail (but maven-jellydoc-plugin doesn't have this problem - we're using a copy of the same Jelly script so not sure why it works via m1  maven-jellydoc-plugin and not when calling Jelly directly with the same script

Added:
    commons/proper/jelly/branches/MAVEN-2-BRANCH/build-tagdoc.xml   (with props)
    commons/proper/jelly/branches/MAVEN-2-BRANCH/src/site/resources/commons-jellydoc.jelly
      - copied, changed from r887801, commons/proper/jelly/branches/MAVEN-2-BRANCH/jellydoc/src/main/resources/commons-jellydoc.jelly
Removed:
    commons/proper/jelly/branches/MAVEN-2-BRANCH/jellydoc/
Modified:
    commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/ant/pom.xml
    commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/antlr/pom.xml
    commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/avalon/pom.xml
    commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/bean/pom.xml
    commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/beanshell/pom.xml
    commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/betwixt/pom.xml
    commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/bsf/pom.xml
    commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/define/pom.xml
    commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/dynabean/pom.xml
    commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/email/pom.xml
    commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/fmt/pom.xml
    commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/fmt/project.xml
    commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/html/pom.xml
    commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/http/pom.xml
    commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/interaction/pom.xml
    commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/jaxme/pom.xml
    commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/jetty/pom.xml
    commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/jface/pom.xml
    commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/jms/pom.xml
    commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/jmx/pom.xml
    commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/jsl/pom.xml
    commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/junit/pom.xml
    commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/log/pom.xml
    commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/memory/pom.xml
    commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/ojb/pom.xml
    commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/quartz/pom.xml
    commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/regexp/pom.xml
    commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/soap/pom.xml
    commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/sql/pom.xml
    commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/swing/pom.xml
    commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/swt/pom.xml
    commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/threads/pom.xml
    commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/util/pom.xml
    commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/validate/pom.xml
    commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/velocity/pom.xml
    commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/xml/pom.xml
    commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/xmlunit/pom.xml
    commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly/pom.xml
    commons/proper/jelly/branches/MAVEN-2-BRANCH/pom.xml

Added: commons/proper/jelly/branches/MAVEN-2-BRANCH/build-tagdoc.xml
URL: http://svn.apache.org/viewvc/commons/proper/jelly/branches/MAVEN-2-BRANCH/build-tagdoc.xml?rev=889212&view=auto
==============================================================================
--- commons/proper/jelly/branches/MAVEN-2-BRANCH/build-tagdoc.xml (added)
+++ commons/proper/jelly/branches/MAVEN-2-BRANCH/build-tagdoc.xml Thu Dec 10 11:51:24 2009
@@ -0,0 +1,302 @@
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You 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.
+-->
+<project name="Jelly Tag XDOC Generation" default="generate-xdoc" basedir=".">
+  
+  <property name="download.repo"           value="http://repo1.maven.org/maven2"/>
+  <property name="download.lib.dir"        value="lib"/>
+
+  <!-- Dependency versions -->
+  <property name="beanutils.version"       value="1.8.2"/>
+  <property name="cli.version"             value="1.0"/>
+  <property name="collections.version"     value="3.2.1"/>
+  <property name="discovery.version"       value="0.2"/>
+  <property name="lang.version"            value="2.0"/>
+  <property name="jelly.version"           value="1.0"/>
+  <property name="jelly-tags-jsl.version"  value="1.0"/>
+  <property name="jelly-tags-xml.version"  value="1.1"/>
+  <property name="jexl.version"            value="1.1"/>
+  <property name="logging.version"         value="1.1.1"/>
+  <property name="jaxen.version"           value="1.1-beta-8"/>
+  <property name="dom4j.version"           value="1.6.1"/>
+  <property name="jdom.version"            value="1.0"/>
+  <property name="xmlParserAPIs.version"   value="2.6.2"/>
+  <property name="xercesImpl.version"      value="${xmlParserAPIs.version}"/>
+  <property name="xom.version"             value="1.0b3"/>
+
+  <!-- Dependency jars -->
+  <property name="beanutils.jar"           value="${download.lib.dir}/commons-beanutils-${beanutils.version}.jar"/>
+  <property name="cli.jar"                 value="${download.lib.dir}/commons-cli-${cli.version}.jar"/>
+  <property name="collections.jar"         value="${download.lib.dir}/commons-collections-${collections.version}.jar"/>
+  <property name="discovery.jar"           value="${download.lib.dir}/commons-discovery-${discovery.version}.jar"/>
+  <property name="lang.jar"                value="${download.lib.dir}/commons-lang-${lang.version}.jar"/>
+  <property name="jelly.jar"               value="${download.lib.dir}/commons-jelly-${jelly.version}.jar"/>
+  <property name="jelly-tags-jsl.jar"      value="${download.lib.dir}/commons-jelly-tags-jsl-${jelly-tags-jsl.version}.jar"/>
+  <property name="jelly-tags-xml.jar"      value="${download.lib.dir}/commons-jelly-tags-xml-${jelly-tags-xml.version}.jar"/>
+  <property name="jexl.jar"                value="${download.lib.dir}/commons-jexl-${jexl.version}.jar"/>
+  <property name="logging.jar"             value="${download.lib.dir}/commons-logging-${logging.version}.jar"/>
+  <property name="jaxen.jar"               value="${download.lib.dir}/jaxen-${jaxen.version}.jar"/>
+  <property name="dom4j.jar"               value="${download.lib.dir}/dom4j-${dom4j.version}.jar"/>
+  <property name="jdom.jar"                value="${download.lib.dir}/jdom-${jdom.version}.jar"/>
+  <property name="xmlParserAPIs.jar"       value="${download.lib.dir}/xmlParserAPIs-${xmlParserAPIs.version}.jar"/>
+  <property name="xercesImpl.jar"          value="${download.lib.dir}/xercesImpl-${xercesImpl.version}.jar"/>
+  <property name="xom.jar"                 value="${download.lib.dir}/xom-${xom.version}.jar"/>
+
+  <!-- Jelly Classpath -->
+  <path id="jelly.classpath">
+    <pathelement location="${beanutils.jar}"/>
+    <pathelement location="${cli.jar}"/>
+    <pathelement location="${collections.jar}"/>
+    <pathelement location="${discovery.jar}"/>
+    <pathelement location="${lang.jar}"/>
+    <pathelement location="${jelly.jar}"/>
+    <pathelement location="${jelly-tags-jsl.jar}"/>
+    <pathelement location="${jelly-tags-xml.jar}"/>
+    <pathelement location="${jexl.jar}"/>
+    <pathelement location="${logging.jar}"/>
+    <pathelement location="${jaxen.jar}"/>
+    <pathelement location="${dom4j.jar}"/>
+    <pathelement location="${jdom.jar}"/>
+    <pathelement location="${xmlParserAPIs.jar}"/>
+    <pathelement location="${xercesImpl.jar}"/>
+  </path>
+
+  <target name="generate-xdoc" description="Jelly Tag xdoc geneneration" depends="download">
+
+      <antcall target="generate-xdoc-internal">
+          <param name="tag.id"   value="core"/>
+          <param name="tag.dir"  value="jelly"/>
+          <param name="xdoc.dir" value="src/site/xdoc"/>
+      </antcall>
+
+       <antcall target="generate-xdoc-jelly-tags"><param name="tag.id" value="ant"/></antcall>
+       <antcall target="generate-xdoc-jelly-tags"><param name="tag.id" value="antlr"/></antcall>
+       <!--antcall target="generate-xdoc-jelly-tags"><param name="tag.id" value="avalon"/></antcall-->
+       <antcall target="generate-xdoc-jelly-tags"><param name="tag.id" value="bean"/></antcall>
+       <antcall target="generate-xdoc-jelly-tags"><param name="tag.id" value="beanshell"/></antcall>
+       <antcall target="generate-xdoc-jelly-tags"><param name="tag.id" value="betwixt"/></antcall>
+       <antcall target="generate-xdoc-jelly-tags"><param name="tag.id" value="bsf"/></antcall>
+       <antcall target="generate-xdoc-jelly-tags"><param name="tag.id" value="define"/></antcall>
+       <antcall target="generate-xdoc-jelly-tags"><param name="tag.id" value="dynabean"/></antcall>
+       <antcall target="generate-xdoc-jelly-tags"><param name="tag.id" value="email"/></antcall>
+       <antcall target="generate-xdoc-jelly-tags"><param name="tag.id" value="fmt"/></antcall>
+       <antcall target="generate-xdoc-jelly-tags"><param name="tag.id" value="html"/></antcall>
+       <antcall target="generate-xdoc-jelly-tags"><param name="tag.id" value="http"/></antcall>
+       <antcall target="generate-xdoc-jelly-tags"><param name="tag.id" value="interaction"/></antcall>
+       <antcall target="generate-xdoc-jelly-tags"><param name="tag.id" value="jaxme"/></antcall>
+       <antcall target="generate-xdoc-jelly-tags"><param name="tag.id" value="jetty"/></antcall>
+       <antcall target="generate-xdoc-jelly-tags"><param name="tag.id" value="jface"/></antcall>
+       <antcall target="generate-xdoc-jelly-tags"><param name="tag.id" value="jms"/></antcall>
+       <antcall target="generate-xdoc-jelly-tags"><param name="tag.id" value="jmx"/></antcall>
+       <antcall target="generate-xdoc-jelly-tags"><param name="tag.id" value="jsl"/></antcall>
+       <antcall target="generate-xdoc-jelly-tags"><param name="tag.id" value="junit"/></antcall>
+       <antcall target="generate-xdoc-jelly-tags"><param name="tag.id" value="log"/></antcall>
+       <antcall target="generate-xdoc-jelly-tags"><param name="tag.id" value="memory"/></antcall>
+       <antcall target="generate-xdoc-jelly-tags"><param name="tag.id" value="ojb"/></antcall>
+       <antcall target="generate-xdoc-jelly-tags"><param name="tag.id" value="quartz"/></antcall>
+       <antcall target="generate-xdoc-jelly-tags"><param name="tag.id" value="regexp"/></antcall>
+       <antcall target="generate-xdoc-jelly-tags"><param name="tag.id" value="soap"/></antcall>
+       <antcall target="generate-xdoc-jelly-tags"><param name="tag.id" value="sql"/></antcall>
+       <antcall target="generate-xdoc-jelly-tags"><param name="tag.id" value="swing"/></antcall>
+       <antcall target="generate-xdoc-jelly-tags"><param name="tag.id" value="swt"/></antcall>
+       <antcall target="generate-xdoc-jelly-tags"><param name="tag.id" value="threads"/></antcall>
+       <antcall target="generate-xdoc-jelly-tags"><param name="tag.id" value="util"/></antcall>
+       <antcall target="generate-xdoc-jelly-tags"><param name="tag.id" value="validate"/></antcall>
+       <antcall target="generate-xdoc-jelly-tags"><param name="tag.id" value="velocity"/></antcall>
+       <antcall target="generate-xdoc-jelly-tags"><param name="tag.id" value="xml"/></antcall>
+       <antcall target="generate-xdoc-jelly-tags"><param name="tag.id" value="xmlunit"/></antcall>
+  </target>
+
+  <target name="generate-xdoc-jelly-tags">
+
+      <antcall target="generate-xdoc-internal">
+          <param name="tag.dir"  value="jelly-tags/${tag.id}"/>
+          <param name="xdoc.dir" value="xdocs"/>
+      </antcall>
+
+  </target>
+
+  <target name="generate-xdoc-internal">
+
+      <echo message="Generating ${tag.dir}/${xdoc.dir}/${tag.id}-taglib.xml"/>
+
+      <!-- Run Jelly script to generate doc -->
+      <java classname="org.apache.commons.jelly.Jelly">
+        <arg value="${basedir}/src/site/resources/commons-jellydoc.jelly"/>
+        <arg value="-o"/>
+        <arg value="${tag.dir}/${xdoc.dir}/${tag.id}-taglib.xml"/>
+        <arg value="-Dinput.file=${tag.dir}/target/taglib.xml"/>
+        <classpath refid="jelly.classpath"/>
+      </java>
+
+  </target>
+
+<!-- ========== Download Dependencies =========================================== -->
+    <target name="download" description="Download Dependencies"
+           depends="check-availability" unless="skip.download">
+        <echo message="doing download-dependencies..." />
+        <antcall target="download-beanutils" />
+        <antcall target="download-cli" />
+        <antcall target="download-collections" />
+        <antcall target="download-discovery" />
+        <antcall target="download-lang" />
+        <antcall target="download-jelly" />
+        <antcall target="download-jelly-tags-jsl" />
+        <antcall target="download-jelly-tags-xml" />
+        <antcall target="download-jexl" />
+        <antcall target="download-logging" />
+        <antcall target="download-jaxen" />
+        <antcall target="download-dom4j" />
+        <antcall target="download-jdom" />
+        <antcall target="download-xmlParserAPIs" />
+        <antcall target="download-xercesImpl" />
+        <antcall target="download-xom" />
+    </target>
+
+    <!-- Check if jars have already been downloaded -->
+    <target name="check-availability">
+        <echo message="doing check-availability..." />
+        <mkdir dir="${download.lib.dir}" />
+        <available file="${beanutils.jar}"      property="beanutils.found"/> 
+        <available file="${cli.jar}"            property="cli.found"/> 
+        <available file="${collections.jar}"    property="collections.found"/> 
+        <available file="${discovery.jar}"      property="discovery.found"/> 
+        <available file="${lang.jar}"           property="lang.found"/> 
+        <available file="${jelly.jar}"          property="jelly.found"/> 
+        <available file="${jelly-tags-jsl.jar}" property="jelly-tags-jsl.found"/> 
+        <available file="${jelly-tags-xml.jar}" property="jelly-tags-xml.found"/> 
+        <available file="${jexl.jar}"           property="jexl.found"/> 
+        <available file="${logging.jar}"        property="logging.found"/> 
+        <available file="${jaxen.jar}"          property="jaxen.found"/> 
+        <available file="${dom4j.jar}"          property="dom4j.found"/> 
+        <available file="${jdom.jar}"           property="jdom.found"/> 
+        <available file="${xmlParserAPIs.jar}"  property="xmlParserAPIs.found"/> 
+        <available file="${xercesImpl.jar}"     property="xercesImpl.found"/> 
+        <available file="${xom.jar}"            property="xom.found"/> 
+    </target>
+
+    <target name="download-beanutils" unless="beanutils.found">
+        <echo message="Downloading beanutils ${beanutils.version} ..."/>
+        <get dest="${beanutils.jar}"
+            usetimestamp="true" ignoreerrors="true"
+            src="${download.repo}/commons-beanutils/commons-beanutils/${beanutils.version}/commons-beanutils-${beanutils.version}.jar"/>
+    </target>
+
+    <target name="download-cli" unless="cli.found">
+        <echo message="Downloading cli ${cli.version} ..."/>
+        <get dest="${cli.jar}"
+            usetimestamp="true" ignoreerrors="true"
+            src="${download.repo}/commons-cli/commons-cli/${cli.version}/commons-cli-${cli.version}.jar"/>
+    </target>
+
+    <target name="download-collections" unless="collections.found">
+        <echo message="Downloading collections ${collections.version} ..."/>
+        <get dest="${collections.jar}"
+            usetimestamp="true" ignoreerrors="true"
+            src="${download.repo}/commons-collections/commons-collections/${collections.version}/commons-collections-${collections.version}.jar"/>
+    </target>
+
+    <target name="download-discovery" unless="discovery.found">
+        <echo message="Downloading discovery ${discovery.version} ..."/>
+        <get dest="${discovery.jar}"
+            usetimestamp="true" ignoreerrors="true"
+            src="${download.repo}/commons-discovery/commons-discovery/${discovery.version}/commons-discovery-${discovery.version}.jar"/>
+    </target>
+
+    <target name="download-lang" unless="lang.found">
+        <echo message="Downloading lang ${lang.version} ..."/>
+        <get dest="${lang.jar}"
+            usetimestamp="true" ignoreerrors="true"
+            src="${download.repo}/commons-lang/commons-lang/${lang.version}/commons-lang-${lang.version}.jar"/>
+    </target>
+
+    <target name="download-jelly" unless="jelly.found">
+        <echo message="Downloading jelly ${jelly.version} ..."/>
+        <get dest="${jelly.jar}"
+            usetimestamp="true" ignoreerrors="true"
+            src="${download.repo}/commons-jelly/commons-jelly/${jelly.version}/commons-jelly-${jelly.version}.jar"/>
+    </target>
+
+    <target name="download-jelly-tags-jsl" unless="jelly-tags-jsl.found">
+        <echo message="Downloading jelly-tags-jsl ${jelly-tags-jsl.version} ..."/>
+        <get dest="${jelly-tags-jsl.jar}"
+            usetimestamp="true" ignoreerrors="true"
+            src="${download.repo}/commons-jelly/commons-jelly-tags-jsl/${jelly-tags-jsl.version}/commons-jelly-tags-jsl-${jelly-tags-jsl.version}.jar"/>
+    </target>
+
+    <target name="download-jelly-tags-xml" unless="jelly-tags-xml.found">
+        <echo message="Downloading jelly-tags-xml ${jelly-tags-xml.version} ..."/>
+        <get dest="${jelly-tags-xml.jar}"
+            usetimestamp="true" ignoreerrors="true"
+            src="${download.repo}/commons-jelly/commons-jelly-tags-xml/${jelly-tags-xml.version}/commons-jelly-tags-xml-${jelly-tags-xml.version}.jar"/>
+    </target>
+    <target name="download-jexl" unless="jexl.found">
+        <echo message="Downloading jexl ${jexl.version} ..."/>
+        <get dest="${jexl.jar}"
+            usetimestamp="true" ignoreerrors="true"
+            src="${download.repo}/commons-jexl/commons-jexl/${jexl.version}/commons-jexl-${jexl.version}.jar"/>
+    </target>
+
+    <target name="download-logging" unless="logging.found">
+        <echo message="Downloading logging ${logging.version} ..."/>
+        <get dest="${logging.jar}"
+            usetimestamp="true" ignoreerrors="true"
+            src="${download.repo}/commons-logging/commons-logging/${logging.version}/commons-logging-${logging.version}.jar"/>
+    </target>
+
+    <target name="download-jaxen" unless="jaxen.found">
+        <echo message="Downloading jaxen ${jaxen.version} ..."/>
+        <get dest="${jaxen.jar}"
+            usetimestamp="true" ignoreerrors="true"
+            src="${download.repo}/jaxen/jaxen/${jaxen.version}/jaxen-${jaxen.version}.jar"/>
+    </target>
+
+    <target name="download-dom4j" unless="dom4j.found">
+        <echo message="Downloading dom4j ${dom4j.version} ..."/>
+        <get dest="${dom4j.jar}"
+            usetimestamp="true" ignoreerrors="true"
+            src="${download.repo}/dom4j/dom4j/${dom4j.version}/dom4j-${dom4j.version}.jar"/>
+    </target>
+
+    <target name="download-jdom" unless="jdom.found">
+        <echo message="Downloading jdom ${jdom.version} ..."/>
+        <get dest="${jdom.jar}"
+            usetimestamp="true" ignoreerrors="true"
+            src="${download.repo}/jdom/jdom/${jdom.version}/jdom-${jdom.version}.jar"/>
+    </target>
+
+    <target name="download-xmlParserAPIs" unless="xmlParserAPIs.found">
+        <echo message="Downloading xmlParserAPIs ${xmlParserAPIs.version} ..."/>
+        <get dest="${xmlParserAPIs.jar}"
+            usetimestamp="true" ignoreerrors="true"
+            src="${download.repo}/xerces/xmlParserAPIs/${xmlParserAPIs.version}/xmlParserAPIs-${xmlParserAPIs.version}.jar"/>
+    </target>
+
+    <target name="download-xercesImpl" unless="xercesImpl.found">
+        <echo message="Downloading xercesImpl ${xercesImpl.version} ..."/>
+        <get dest="${xercesImpl.jar}"
+            usetimestamp="true" ignoreerrors="true"
+            src="${download.repo}/xerces/xercesImpl/${xercesImpl.version}/xercesImpl-${xercesImpl.version}.jar"/>
+    </target>
+
+    <target name="download-xom" unless="xom.found">
+        <echo message="Downloading xom ${xom.version} ..."/>
+        <get dest="${xom.jar}"
+            usetimestamp="true" ignoreerrors="true"
+            src="${download.repo}/xom/xom/${xom.version}/xom-${xom.version}.jar"/>
+    </target>
+
+</project>

Propchange: commons/proper/jelly/branches/MAVEN-2-BRANCH/build-tagdoc.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: commons/proper/jelly/branches/MAVEN-2-BRANCH/build-tagdoc.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Modified: commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/ant/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/ant/pom.xml?rev=889212&r1=889211&r2=889212&view=diff
==============================================================================
--- commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/ant/pom.xml (original)
+++ commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/ant/pom.xml Thu Dec 10 11:51:24 2009
@@ -73,6 +73,7 @@
 
   <properties>
     <commons.componentid>jelly-tags-ant</commons.componentid>
+    <jelly.tag.doclet>true</jelly.tag.doclet>
   </properties>
 
   <build>

Modified: commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/antlr/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/antlr/pom.xml?rev=889212&r1=889211&r2=889212&view=diff
==============================================================================
--- commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/antlr/pom.xml (original)
+++ commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/antlr/pom.xml Thu Dec 10 11:51:24 2009
@@ -51,6 +51,7 @@
 
   <properties>
     <commons.componentid>jelly-tags-antlr</commons.componentid>
+    <jelly.tag.doclet>true</jelly.tag.doclet>
   </properties>
 
   <build>

Modified: commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/avalon/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/avalon/pom.xml?rev=889212&r1=889211&r2=889212&view=diff
==============================================================================
--- commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/avalon/pom.xml (original)
+++ commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/avalon/pom.xml Thu Dec 10 11:51:24 2009
@@ -59,6 +59,7 @@
   
   <properties>
     <commons.componentid>jelly-tags-avalon</commons.componentid>
+    <jelly.tag.doclet>false</jelly.tag.doclet>
   </properties>
 
   <build>

Modified: commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/bean/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/bean/pom.xml?rev=889212&r1=889211&r2=889212&view=diff
==============================================================================
--- commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/bean/pom.xml (original)
+++ commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/bean/pom.xml Thu Dec 10 11:51:24 2009
@@ -60,6 +60,7 @@
 
   <properties>
     <commons.componentid>jelly-tags-bean</commons.componentid>
+    <jelly.tag.doclet>true</jelly.tag.doclet>
   </properties>
 
   <build>

Modified: commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/beanshell/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/beanshell/pom.xml?rev=889212&r1=889211&r2=889212&view=diff
==============================================================================
--- commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/beanshell/pom.xml (original)
+++ commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/beanshell/pom.xml Thu Dec 10 11:51:24 2009
@@ -62,6 +62,7 @@
 
   <properties>
     <commons.componentid>jelly-tags-beanshell</commons.componentid>
+    <jelly.tag.doclet>true</jelly.tag.doclet>
   </properties>
 
   <build>

Modified: commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/betwixt/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/betwixt/pom.xml?rev=889212&r1=889211&r2=889212&view=diff
==============================================================================
--- commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/betwixt/pom.xml (original)
+++ commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/betwixt/pom.xml Thu Dec 10 11:51:24 2009
@@ -75,6 +75,7 @@
   
   <properties>
     <commons.componentid>jelly-tags-betwixt</commons.componentid>
+    <jelly.tag.doclet>true</jelly.tag.doclet>
   </properties>
 
   <build>

Modified: commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/bsf/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/bsf/pom.xml?rev=889212&r1=889211&r2=889212&view=diff
==============================================================================
--- commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/bsf/pom.xml (original)
+++ commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/bsf/pom.xml Thu Dec 10 11:51:24 2009
@@ -53,6 +53,7 @@
   
   <properties>
     <commons.componentid>jelly-tags-bsf</commons.componentid>
+    <jelly.tag.doclet>true</jelly.tag.doclet>
   </properties>
 
   <build>

Modified: commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/define/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/define/pom.xml?rev=889212&r1=889211&r2=889212&view=diff
==============================================================================
--- commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/define/pom.xml (original)
+++ commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/define/pom.xml Thu Dec 10 11:51:24 2009
@@ -84,6 +84,7 @@
   
   <properties>
     <commons.componentid>jelly-tags-define</commons.componentid>
+    <jelly.tag.doclet>true</jelly.tag.doclet>
   </properties>
 
   <build>

Modified: commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/dynabean/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/dynabean/pom.xml?rev=889212&r1=889211&r2=889212&view=diff
==============================================================================
--- commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/dynabean/pom.xml (original)
+++ commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/dynabean/pom.xml Thu Dec 10 11:51:24 2009
@@ -52,6 +52,7 @@
   
   <properties>
     <commons.componentid>jelly-tags-dynabean</commons.componentid>
+    <jelly.tag.doclet>true</jelly.tag.doclet>
   </properties>
 
   <build>

Modified: commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/email/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/email/pom.xml?rev=889212&r1=889211&r2=889212&view=diff
==============================================================================
--- commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/email/pom.xml (original)
+++ commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/email/pom.xml Thu Dec 10 11:51:24 2009
@@ -70,6 +70,7 @@
   
   <properties>
     <commons.componentid>jelly-tags-email</commons.componentid>
+    <jelly.tag.doclet>true</jelly.tag.doclet>
   </properties>
 
   <build>

Modified: commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/fmt/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/fmt/pom.xml?rev=889212&r1=889211&r2=889212&view=diff
==============================================================================
--- commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/fmt/pom.xml (original)
+++ commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/fmt/pom.xml Thu Dec 10 11:51:24 2009
@@ -64,6 +64,7 @@
   
   <properties>
     <commons.componentid>jelly-tags-fmt</commons.componentid>
+    <jelly.tag.doclet>true</jelly.tag.doclet>
   </properties>
 
   <build>

Modified: commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/fmt/project.xml
URL: http://svn.apache.org/viewvc/commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/fmt/project.xml?rev=889212&r1=889211&r2=889212&view=diff
==============================================================================
--- commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/fmt/project.xml (original)
+++ commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/fmt/project.xml Thu Dec 10 11:51:24 2009
@@ -42,6 +42,14 @@
 
     <dependency>
       <groupId>commons-jelly</groupId>
+      <artifactId>commons-jelly</artifactId>
+      <version>1.0</version>
+      <properties>
+        <scope>test</scope>
+      </properties>
+    </dependency>
+    <dependency>
+      <groupId>commons-jelly</groupId>
       <artifactId>commons-jelly-tags-ant</artifactId>
       <version>1.1</version>
       <properties>

Modified: commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/html/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/html/pom.xml?rev=889212&r1=889211&r2=889212&view=diff
==============================================================================
--- commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/html/pom.xml (original)
+++ commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/html/pom.xml Thu Dec 10 11:51:24 2009
@@ -81,6 +81,7 @@
   </dependencies>
   <properties>
     <commons.componentid>jelly-tags-html</commons.componentid>
+    <jelly.tag.doclet>true</jelly.tag.doclet>
   </properties>
 
   <build>

Modified: commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/http/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/http/pom.xml?rev=889212&r1=889211&r2=889212&view=diff
==============================================================================
--- commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/http/pom.xml (original)
+++ commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/http/pom.xml Thu Dec 10 11:51:24 2009
@@ -53,6 +53,7 @@
 
   <properties>
     <commons.componentid>jelly-tags-http</commons.componentid>
+    <jelly.tag.doclet>true</jelly.tag.doclet>
   </properties>
 
   <build>

Modified: commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/interaction/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/interaction/pom.xml?rev=889212&r1=889211&r2=889212&view=diff
==============================================================================
--- commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/interaction/pom.xml (original)
+++ commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/interaction/pom.xml Thu Dec 10 11:51:24 2009
@@ -57,6 +57,7 @@
 
   <properties>
     <commons.componentid>jelly-tags-interaction</commons.componentid>
+    <jelly.tag.doclet>true</jelly.tag.doclet>
   </properties>
 
   <build>

Modified: commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/jaxme/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/jaxme/pom.xml?rev=889212&r1=889211&r2=889212&view=diff
==============================================================================
--- commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/jaxme/pom.xml (original)
+++ commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/jaxme/pom.xml Thu Dec 10 11:51:24 2009
@@ -85,6 +85,7 @@
 
   <properties>
     <commons.componentid>jelly-tags-jaxme</commons.componentid>
+    <jelly.tag.doclet>true</jelly.tag.doclet>
   </properties>
 
   <build>

Modified: commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/jetty/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/jetty/pom.xml?rev=889212&r1=889211&r2=889212&view=diff
==============================================================================
--- commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/jetty/pom.xml (original)
+++ commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/jetty/pom.xml Thu Dec 10 11:51:24 2009
@@ -92,6 +92,7 @@
   </dependencies>
   <properties>
     <commons.componentid>jelly-tags-jetty</commons.componentid>
+    <jelly.tag.doclet>true</jelly.tag.doclet>
   </properties>
 
   <build>

Modified: commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/jface/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/jface/pom.xml?rev=889212&r1=889211&r2=889212&view=diff
==============================================================================
--- commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/jface/pom.xml (original)
+++ commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/jface/pom.xml Thu Dec 10 11:51:24 2009
@@ -85,6 +85,7 @@
 
   <properties>
     <commons.componentid>jelly-tags-jface</commons.componentid>
+    <jelly.tag.doclet>true</jelly.tag.doclet>
   </properties>
 
   <build>

Modified: commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/jms/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/jms/pom.xml?rev=889212&r1=889211&r2=889212&view=diff
==============================================================================
--- commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/jms/pom.xml (original)
+++ commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/jms/pom.xml Thu Dec 10 11:51:24 2009
@@ -62,6 +62,7 @@
   
   <properties>
     <commons.componentid>jelly-tags-jms</commons.componentid>
+    <jelly.tag.doclet>true</jelly.tag.doclet>
   </properties>
 
   <build>

Modified: commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/jmx/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/jmx/pom.xml?rev=889212&r1=889211&r2=889212&view=diff
==============================================================================
--- commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/jmx/pom.xml (original)
+++ commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/jmx/pom.xml Thu Dec 10 11:51:24 2009
@@ -89,6 +89,7 @@
   
   <properties>
     <commons.componentid>jelly-tags-jmx</commons.componentid>
+    <jelly.tag.doclet>true</jelly.tag.doclet>
   </properties>
 
   <build>

Modified: commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/jsl/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/jsl/pom.xml?rev=889212&r1=889211&r2=889212&view=diff
==============================================================================
--- commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/jsl/pom.xml (original)
+++ commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/jsl/pom.xml Thu Dec 10 11:51:24 2009
@@ -84,6 +84,7 @@
   
   <properties>
     <commons.componentid>jelly-tags-jsl</commons.componentid>
+    <jelly.tag.doclet>true</jelly.tag.doclet>
   </properties>
 
   <build>

Modified: commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/junit/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/junit/pom.xml?rev=889212&r1=889211&r2=889212&view=diff
==============================================================================
--- commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/junit/pom.xml (original)
+++ commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/junit/pom.xml Thu Dec 10 11:51:24 2009
@@ -46,6 +46,7 @@
 
   <properties>
     <commons.componentid>jelly-tags-junit</commons.componentid>
+    <jelly.tag.doclet>true</jelly.tag.doclet>
   </properties>
 
   <build>

Modified: commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/log/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/log/pom.xml?rev=889212&r1=889211&r2=889212&view=diff
==============================================================================
--- commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/log/pom.xml (original)
+++ commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/log/pom.xml Thu Dec 10 11:51:24 2009
@@ -48,6 +48,7 @@
   
   <properties>
     <commons.componentid>jelly-tags-log</commons.componentid>
+    <jelly.tag.doclet>true</jelly.tag.doclet>
   </properties>
 
   <build>

Modified: commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/memory/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/memory/pom.xml?rev=889212&r1=889211&r2=889212&view=diff
==============================================================================
--- commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/memory/pom.xml (original)
+++ commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/memory/pom.xml Thu Dec 10 11:51:24 2009
@@ -45,6 +45,7 @@
 
   <properties>
     <commons.componentid>jelly-tags-memory</commons.componentid>
+    <jelly.tag.doclet>true</jelly.tag.doclet>
   </properties>
 
   <build>

Modified: commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/ojb/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/ojb/pom.xml?rev=889212&r1=889211&r2=889212&view=diff
==============================================================================
--- commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/ojb/pom.xml (original)
+++ commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/ojb/pom.xml Thu Dec 10 11:51:24 2009
@@ -53,6 +53,7 @@
   
   <properties>
     <commons.componentid>jelly-tags-ojb</commons.componentid>
+    <jelly.tag.doclet>true</jelly.tag.doclet>
   </properties>
 
   <build>

Modified: commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/quartz/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/quartz/pom.xml?rev=889212&r1=889211&r2=889212&view=diff
==============================================================================
--- commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/quartz/pom.xml (original)
+++ commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/quartz/pom.xml Thu Dec 10 11:51:24 2009
@@ -62,6 +62,7 @@
 
   <properties>
     <commons.componentid>jelly-tags-quartz</commons.componentid>
+    <jelly.tag.doclet>true</jelly.tag.doclet>
   </properties>
 
   <build>

Modified: commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/regexp/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/regexp/pom.xml?rev=889212&r1=889211&r2=889212&view=diff
==============================================================================
--- commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/regexp/pom.xml (original)
+++ commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/regexp/pom.xml Thu Dec 10 11:51:24 2009
@@ -45,6 +45,7 @@
   
   <properties>
     <commons.componentid>jelly-tags-regexp</commons.componentid>
+    <jelly.tag.doclet>true</jelly.tag.doclet>
   </properties>
 
   <build>

Modified: commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/soap/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/soap/pom.xml?rev=889212&r1=889211&r2=889212&view=diff
==============================================================================
--- commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/soap/pom.xml (original)
+++ commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/soap/pom.xml Thu Dec 10 11:51:24 2009
@@ -110,6 +110,7 @@
   
   <properties>
     <commons.componentid>jelly-tags-soap</commons.componentid>
+    <jelly.tag.doclet>true</jelly.tag.doclet>
   </properties>
 
   <build>

Modified: commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/sql/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/sql/pom.xml?rev=889212&r1=889211&r2=889212&view=diff
==============================================================================
--- commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/sql/pom.xml (original)
+++ commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/sql/pom.xml Thu Dec 10 11:51:24 2009
@@ -82,6 +82,7 @@
     <maven.compile.source>1.5</maven.compile.source>
     <maven.compile.target>1.5</maven.compile.target>
     <commons.componentid>jelly-tags-sql</commons.componentid>
+    <jelly.tag.doclet>true</jelly.tag.doclet>
   </properties>
 
   <build>

Modified: commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/swing/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/swing/pom.xml?rev=889212&r1=889211&r2=889212&view=diff
==============================================================================
--- commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/swing/pom.xml (original)
+++ commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/swing/pom.xml Thu Dec 10 11:51:24 2009
@@ -86,6 +86,7 @@
   
   <properties>
     <commons.componentid>jelly-tags-swing</commons.componentid>
+    <jelly.tag.doclet>true</jelly.tag.doclet>
   </properties>
 
   <build>

Modified: commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/swt/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/swt/pom.xml?rev=889212&r1=889211&r2=889212&view=diff
==============================================================================
--- commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/swt/pom.xml (original)
+++ commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/swt/pom.xml Thu Dec 10 11:51:24 2009
@@ -57,6 +57,7 @@
 
   <properties>
     <commons.componentid>jelly-tags-swt</commons.componentid>
+    <jelly.tag.doclet>true</jelly.tag.doclet>
   </properties>
 
   <build>

Modified: commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/threads/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/threads/pom.xml?rev=889212&r1=889211&r2=889212&view=diff
==============================================================================
--- commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/threads/pom.xml (original)
+++ commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/threads/pom.xml Thu Dec 10 11:51:24 2009
@@ -52,6 +52,7 @@
   
   <properties>
     <commons.componentid>jelly-tags-threads</commons.componentid>
+    <jelly.tag.doclet>true</jelly.tag.doclet>
   </properties>
 
   <build>

Modified: commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/util/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/util/pom.xml?rev=889212&r1=889211&r2=889212&view=diff
==============================================================================
--- commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/util/pom.xml (original)
+++ commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/util/pom.xml Thu Dec 10 11:51:24 2009
@@ -46,6 +46,7 @@
 
   <properties>
     <commons.componentid>jelly-tags-util</commons.componentid>
+    <jelly.tag.doclet>true</jelly.tag.doclet>
   </properties>
 
   <build>

Modified: commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/validate/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/validate/pom.xml?rev=889212&r1=889211&r2=889212&view=diff
==============================================================================
--- commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/validate/pom.xml (original)
+++ commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/validate/pom.xml Thu Dec 10 11:51:24 2009
@@ -80,6 +80,7 @@
 
   <properties>
     <commons.componentid>jelly-tags-validate</commons.componentid>
+    <jelly.tag.doclet>true</jelly.tag.doclet>
   </properties>
 
   <build>

Modified: commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/velocity/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/velocity/pom.xml?rev=889212&r1=889211&r2=889212&view=diff
==============================================================================
--- commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/velocity/pom.xml (original)
+++ commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/velocity/pom.xml Thu Dec 10 11:51:24 2009
@@ -50,6 +50,7 @@
   
   <properties>
     <commons.componentid>jelly-tags-velocity</commons.componentid>
+    <jelly.tag.doclet>true</jelly.tag.doclet>
   </properties>
 
   <build>

Modified: commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/xml/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/xml/pom.xml?rev=889212&r1=889211&r2=889212&view=diff
==============================================================================
--- commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/xml/pom.xml (original)
+++ commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/xml/pom.xml Thu Dec 10 11:51:24 2009
@@ -51,6 +51,7 @@
 
   <properties>
     <commons.componentid>jelly-tags-xml</commons.componentid>
+    <jelly.tag.doclet>true</jelly.tag.doclet>
   </properties>
 
   <build>

Modified: commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/xmlunit/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/xmlunit/pom.xml?rev=889212&r1=889211&r2=889212&view=diff
==============================================================================
--- commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/xmlunit/pom.xml (original)
+++ commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly-tags/xmlunit/pom.xml Thu Dec 10 11:51:24 2009
@@ -66,6 +66,7 @@
 
   <properties>
     <commons.componentid>jelly-tags-xmlunit</commons.componentid>
+    <jelly.tag.doclet>true</jelly.tag.doclet>
   </properties>
 
   <build>

Modified: commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly/pom.xml?rev=889212&r1=889211&r2=889212&view=diff
==============================================================================
--- commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly/pom.xml (original)
+++ commons/proper/jelly/branches/MAVEN-2-BRANCH/jelly/pom.xml Thu Dec 10 11:51:24 2009
@@ -31,6 +31,8 @@
   </description>
   <properties>
       <commons.componentid>jelly-core</commons.componentid>
+    <jelly.tag.doclet>true</jelly.tag.doclet>
+    <jelly.doc.location>src/site/xdoc</jelly.doc.location>
   </properties>
 
   <dependencies>

Modified: commons/proper/jelly/branches/MAVEN-2-BRANCH/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/jelly/branches/MAVEN-2-BRANCH/pom.xml?rev=889212&r1=889211&r2=889212&view=diff
==============================================================================
--- commons/proper/jelly/branches/MAVEN-2-BRANCH/pom.xml (original)
+++ commons/proper/jelly/branches/MAVEN-2-BRANCH/pom.xml Thu Dec 10 11:51:24 2009
@@ -444,7 +444,7 @@
     -->
   <profiles>
     <profile>
-      <id>tagdoc</id>
+      <id>doclet</id>
       <build>
         <plugins>
           <plugin>
@@ -452,62 +452,51 @@
             <artifactId>maven-antrun-plugin</artifactId>
             <executions>
               <execution>
-                <id>javadoc.resources</id>
+                <id>tag.doclet</id>
                 <phase>generate-sources</phase>
                 <goals>
                   <goal>run</goal>
                 </goals>
                 <configuration>
-                  <tasks>
 
-                    <!-- Generate Tag Doc -->
+                  <tasks if="jelly.tag.doclet">
                     <javadoc sourcepath="${project.build.sourceDirectory}" 
                              classpathref="maven.compile.classpath"
                              docletpathref="maven.plugin.classpath">
-                        <doclet name="org.apache.commons.jellydoc.TagXMLDoclet">
+                        <doclet name="org.apache.maven.jellydoc.TagXMLDoclet">
                             <param name="-d" value="${project.build.directory}"/>
                         </doclet>
                     </javadoc>
-
-                    <!-- load jelly script & copy to "target" directory -->
-                    <loadresource property="jelly.script">
-                        <javaresource name="commons-jellydoc.jelly"/>
-                    </loadresource>
-                    <echo message="${jelly.script}" file="${project.build.directory}/commons-jellydoc.jelly" append="false" />
-
-                    <!-- Run Jelly script to generate doc -->
-                    <java classname="org.apache.commons.jelly.Jelly">
-                        <arg value="${project.build.directory}/commons-jellydoc.jelly"/>
-                        <arg value="-Dmaven.build.dir=${project.build.directory}"/>
-                        <arg value="-o"/>
-                        <arg value="${jelly.doc.location}/${commons.componentid}.xml"/>
-                        <classpath refid="maven.plugin.classpath"/>
-                    </java>
-
                   </tasks>
                 </configuration>
               </execution>
             </executions>
             <dependencies>
               <dependency>
-                <groupId>commons-jelly</groupId>
-                <artifactId>commons-jellydoc</artifactId>
-                <version>${project.version}</version>
-              </dependency>
-              <dependency>
-                <groupId>commons-jelly</groupId>
-                <artifactId>commons-jelly</artifactId>
-                <version>${project.version}</version>
-              </dependency>
-              <dependency>
-                <groupId>commons-jelly</groupId>
-                <artifactId>commons-jelly-tags-xml</artifactId>
-                <version>${project.version}</version>
+                <groupId>maven</groupId>
+                <artifactId>maven-jellydoc-plugin</artifactId>
+                <version>1.3.1</version>
+                <exclusions>
+                  <exclusion>
+                    <groupId>commons-jelly</groupId>
+                    <artifactId>commons-jelly-tags-jsl</artifactId>
+                  </exclusion>
+                  <exclusion>
+                    <groupId>commons-jelly</groupId>
+                    <artifactId>commons-jelly-tags-xml</artifactId>
+                  </exclusion>
+                  <exclusion>
+                    <groupId>javadoc</groupId>
+                    <artifactId>javadoc</artifactId>
+                  </exclusion>
+                </exclusions>
               </dependency>
               <dependency>
-                <groupId>commons-jelly</groupId>
-                <artifactId>commons-jelly-tags-jsl</artifactId>
-                <version>${project.version}</version>
+                <groupId>com.sun</groupId>
+                <artifactId>tools</artifactId>
+                <version>1.4.2</version>
+                <scope>system</scope>
+                <systemPath>${java.home}/../lib/tools.jar</systemPath>
               </dependency>
             </dependencies>
           </plugin>

Copied: commons/proper/jelly/branches/MAVEN-2-BRANCH/src/site/resources/commons-jellydoc.jelly (from r887801, commons/proper/jelly/branches/MAVEN-2-BRANCH/jellydoc/src/main/resources/commons-jellydoc.jelly)
URL: http://svn.apache.org/viewvc/commons/proper/jelly/branches/MAVEN-2-BRANCH/src/site/resources/commons-jellydoc.jelly?p2=commons/proper/jelly/branches/MAVEN-2-BRANCH/src/site/resources/commons-jellydoc.jelly&p1=commons/proper/jelly/branches/MAVEN-2-BRANCH/jellydoc/src/main/resources/commons-jellydoc.jelly&r1=887801&r2=889212&rev=889212&view=diff
==============================================================================
--- commons/proper/jelly/branches/MAVEN-2-BRANCH/jellydoc/src/main/resources/commons-jellydoc.jelly (original)
+++ commons/proper/jelly/branches/MAVEN-2-BRANCH/src/site/resources/commons-jellydoc.jelly Thu Dec 10 11:51:24 2009
@@ -23,7 +23,7 @@
   xmlns:jsl="jelly:jsl">
 
 <j:new var="file" className="java.io.File">
-  <j:arg value="${maven.build.dir}/taglib.xml"/>
+  <j:arg value="${input.file}"/>
 </j:new>
 
 <x:parse var="doc" xml="${file}"/>
@@ -70,7 +70,7 @@
       </p>
       <p>
         The following document contains a summary of all the
-        <a href="http://jakarta.apache.org/commons/jelly/">Jelly</a> tag libraries.
+        <a href="http://commons.apache.org/commons/jelly/">Jelly</a> tag libraries.
       </p>
       
     </section>



Mime
View raw message