xdoclet-plugins-commits — Commit logs from CVS

[xdoclet-plugins-commits] xdoclet-plugins/plugin-spring/src/main/java/org/xdoclet/plugin/spring SpringConfigXMLPlugin.java, 1.1, 1.2 SpringConfigXMLPlugin.jelly, 1.1, 1.2

[Konstantin P. <ko...@us...>]

Update of /cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-spring/src/main/java/org/xdoclet/plugin/spring
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv9889/plugin-spring/src/main/java/org/xdoclet/plugin/spring

Modified Files:
	SpringConfigXMLPlugin.java SpringConfigXMLPlugin.jelly 
Log Message:
reworked jelly merge, moved taglib from web plugin to generama to provide standard 
merge capabilities


Index: SpringConfigXMLPlugin.jelly
===================================================================
RCS file: /cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-spring/src/main/java/org/xdoclet/plugin/spring/SpringConfigXMLPlugin.jelly,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SpringConfigXMLPlugin.jelly	9 Feb 2006 10:32:53 -0000	1.1
--- SpringConfigXMLPlugin.jelly	24 Sep 2006 11:58:57 -0000	1.2
***************
*** 1,4 ****
  <?xml version="1.0" encoding="UTF-8"?>
! <j:jelly xmlns:j="jelly:core" xmlns:x="jelly:xml" xmlns:jsl="jelly:jsl">
  	<x:doctype
  		name="beans"
--- 1,5 ----
  <?xml version="1.0" encoding="UTF-8"?>
! <j:jelly xmlns:j="jelly:core" xmlns:x="jelly:xml" xmlns:jsl="jelly:jsl"
!     xmlns:g='jelly:org.generama.jelly.GeneramaTaglib'>
  	<x:doctype
  		name="beans"

Index: SpringConfigXMLPlugin.java
===================================================================
RCS file: /cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-spring/src/main/java/org/xdoclet/plugin/spring/SpringConfigXMLPlugin.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SpringConfigXMLPlugin.java	9 Feb 2006 10:32:53 -0000	1.1
--- SpringConfigXMLPlugin.java	24 Sep 2006 11:58:57 -0000	1.2
***************
*** 36,68 ****
  	}
  
-     public File getMergedir() {
-         return mergeDir;
-     }
- 
-     public void setMergedir(File mergeDir) {
-         this.mergeDir = mergeDir;
-     }
- 
-     /**
-      * utility method used in the template to resolved merge file reference
-      * 
-      * @param fileName
-      * @return
-      */
-     public File getMergeFile(String fileName) {
-         if (fileName != null && getMergedir() != null) {
-             if (getMergedir().isDirectory()) {
-                 File[] files = getMergedir().listFiles();
- 
-                 for (int i = 0; i < files.length; i++) {
-                     if (fileName.trim().equals(files[i].getName())) {
-                         return files[i];
-                     }
-                 }
-             }
-         }
  
-         return null;
-     }
  
  	/**
--- 36,40 ----

[xdoclet-plugins-commits] xdoclet-plugins/plugin-spring/src/test/java/org/xdoclet/plugin/spring SpringConfigTest.java, 1.1, 1.2

[Konstantin P. <ko...@us...>]

Update of /cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-spring/src/test/java/org/xdoclet/plugin/spring
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv9889/plugin-spring/src/test/java/org/xdoclet/plugin/spring

Modified Files:
	SpringConfigTest.java 
Log Message:
reworked jelly merge, moved taglib from web plugin to generama to provide standard 
merge capabilities


Index: SpringConfigTest.java
===================================================================
RCS file: /cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-spring/src/test/java/org/xdoclet/plugin/spring/SpringConfigTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SpringConfigTest.java	9 Feb 2006 10:32:54 -0000	1.1
--- SpringConfigTest.java	24 Sep 2006 11:58:57 -0000	1.2
***************
*** 28,32 ****
  		SpringConfigXMLPlugin plugin = new SpringConfigXMLPlugin(new JellyTemplateEngine(), (QDoxCapableMetadataProvider) provider, mapper);
          URL completeDirURL = getResourceRelativeToThisPackage("complete");
!         plugin.setMergedir(new File(completeDirURL.getPath(), "merge"));
          plugin.setValidate(true);
          // set these to non-default values
--- 28,32 ----
  		SpringConfigXMLPlugin plugin = new SpringConfigXMLPlugin(new JellyTemplateEngine(), (QDoxCapableMetadataProvider) provider, mapper);
          URL completeDirURL = getResourceRelativeToThisPackage("complete");
!         plugin.setMergedir("/org/xdoclet/spring/complete/merge/");
          plugin.setValidate(true);
          // set these to non-default values

[xdoclet-plugins-commits] xdoclet-plugins/plugin-ejb/src/main/java/org/xdoclet/plugin/ejb/descriptor EjbJarXmlPlugin.jelly, 1.5, 1.6 asm-descriptor.jelly, 1.5, 1.6 beans.jelly, 1.6, 1.7 ejb-ref.jelly, 1.4, 1.5 entity-beans.jelly, 1.2, 1.3 res-ref.jelly, 1.2, 1.3

[Konstantin P. <ko...@us...>]

Update of /cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-ejb/src/main/java/org/xdoclet/plugin/ejb/descriptor
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv9889/plugin-ejb/src/main/java/org/xdoclet/plugin/ejb/descriptor

Modified Files:
	EjbJarXmlPlugin.jelly asm-descriptor.jelly beans.jelly 
	ejb-ref.jelly entity-beans.jelly res-ref.jelly 
Log Message:
reworked jelly merge, moved taglib from web plugin to generama to provide standard 
merge capabilities


Index: entity-beans.jelly
===================================================================
RCS file: /cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-ejb/src/main/java/org/xdoclet/plugin/ejb/descriptor/entity-beans.jelly,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** entity-beans.jelly	13 Oct 2003 23:51:12 -0000	1.2
--- entity-beans.jelly	24 Sep 2006 11:58:56 -0000	1.3
***************
*** 1,2 ****
--- 1,3 ----
+ <?xml version="1.0" encoding="UTF-8"?>
  <j:jelly xmlns:j="jelly:core" xmlns:x="jelly:xml">
      <x:comment>merge point: org/xdoclet/plugin/ejb/descriptor/entity-beans.jelly</x:comment>

Index: beans.jelly
===================================================================
RCS file: /cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-ejb/src/main/java/org/xdoclet/plugin/ejb/descriptor/beans.jelly,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** beans.jelly	12 Jun 2006 06:44:07 -0000	1.6
--- beans.jelly	24 Sep 2006 11:58:56 -0000	1.7
***************
*** 1,4 ****
  <?xml version="1.0" encoding="UTF-8"?>
! <j:jelly xmlns:j="jelly:core" xmlns:x="jelly:xml" xmlns:jsl="jelly:jsl">
      <j:forEach var="class" items="${util.getBeans(metadata)}">
          <j:if test="${util.shouldGenerate(class)}">
--- 1,5 ----
  <?xml version="1.0" encoding="UTF-8"?>
! <j:jelly xmlns:j="jelly:core" xmlns:x="jelly:xml" xmlns:jsl="jelly:jsl"
!         xmlns:g="jelly:org.generama.jelly.GeneramaTaglib">
      <j:forEach var="class" items="${util.getBeans(metadata)}">
          <j:if test="${util.shouldGenerate(class)}">
***************
*** 57,61 ****
                          </j:forEach>
                          <j:if test="${!empty(plugin.primaryKeyClassPlugin.pkField(class))}">
!                           <primkey-field>${plugin.primaryKeyClassPlugin.pkField(class)}</primkey-field>
                          </j:if>
                      </j:if>
--- 58,62 ----
                          </j:forEach>
                          <j:if test="${!empty(plugin.primaryKeyClassPlugin.pkField(class))}">
!                             <primkey-field>${plugin.primaryKeyClassPlugin.pkField(class)}</primkey-field>
                          </j:if>
                      </j:if>
***************
*** 137,169 ****
                      </j:choose>
                  </j:if>
!                 <j:choose>
!                     <j:when test="${plugin.getMergeFile('ejb-env-entries-{0}.xml', class).exists()}">
!                         <j:import file="${plugin.getMergeFile('ejb-env-entries-{0}.xml', class).path}" inherit="true"/>
!                     </j:when>
!                     <j:otherwise>
!                         <x:comment>Define your Ejb env entries in a file called ${plugin.expandFileName('ejb-env-entries-{0}.xml', class)} and place it in your merge directory. Overrides @ejb.env-entry's</x:comment>
!                         <j:forEach var="reference" items="${util.findTagsByName(class,'ejb.env-entry')}">
!                             <j:set var="envEntryTag" value="${reference.tag}"/>
!                             <env-entry>
!                                 <j:if test="${!empty(envEntryTag.description)}">
!                                     <description>${envEntryTag.description}</description>
!                                 </j:if>
!                                 <env-entry-name>${envEntryTag.name_}</env-entry-name>
!                                 <env-entry-type>${envEntryTag.type}</env-entry-type>
!                                 <j:if test="${!empty(envEntryTag.value_)}">
!                                     <env-entry-value>${envEntryTag.value_}</env-entry-value>
!                                 </j:if>
!                             </env-entry>
!                         </j:forEach>
!                     </j:otherwise>
!                 </j:choose>
!                 <j:choose>
!                     <j:when test="${plugin.getMergeFile('ejb-ejbrefs-{0}.xml', class).exists()}">
!                         <j:import file="${plugin.getMergeFile('ejb-ejbrefs-{0}.xml', class).path}" inherit="true"/>
!                     </j:when>
!                     <j:otherwise>
!                         <x:comment>Define your Ejb refs entries in a file called ${plugin.expandFileName('ejb-ejbrefs-{0}.xml', class)} and place it in your merge directory.</x:comment>
!                     </j:otherwise>
!                 </j:choose>
  
                  <j:import uri="/ejb-ref.jelly" inherit="true"/>
--- 138,171 ----
                      </j:choose>
                  </j:if>
! 
!                 <g:merge file="ejb-env-entries-${util.getEjbName(class)}.xml">
!                     <x:comment>
!                         Define your Ejb env entries in a file called ${util.getEjbName(class)}.xml} 
!                         and place it in your merge directory. Overrides @ejb.env-entry's
!                         Define root element as &lt;j:jelly  xmlns:j=&quot;jelly:core&quot;&gt;
!                     </x:comment>
!                     <j:forEach var="reference" items="${util.findTagsByName(class,'ejb.env-entry')}">
!                         <j:set var="envEntryTag" value="${reference.tag}"/>
!                         <env-entry>
!                             <j:if test="${!empty(envEntryTag.description)}">
!                                 <description>${envEntryTag.description}</description>
!                             </j:if>
!                             <env-entry-name>${envEntryTag.name_}</env-entry-name>
!                             <env-entry-type>${envEntryTag.type}</env-entry-type>
!                             <j:if test="${!empty(envEntryTag.value_)}">
!                                 <env-entry-value>${envEntryTag.value_}</env-entry-value>
!                             </j:if>
!                         </env-entry>
!                     </j:forEach>
!                 </g:merge>
! 
!                 <g:merge file="ejb-ejbrefs-${util.getEjbName(class)}.xml">
!                     <x:comment>
!                         Define your Ejb refs entries in a file called 
!                         ${util.getEjbName(class)}.xml and place 
!                         it in your merge directory.
!                         Define root element as &lt;j:jelly  xmlns:j=&quot;jelly:core&quot;&gt;
!                     </x:comment>
!                 </g:merge>
  
                  <j:import uri="/ejb-ref.jelly" inherit="true"/>
***************
*** 171,213 ****
                  <j:if test="${version.greaterOrEquals(2.1)}">
                      <j:import uri="/res-ref.jelly" inherit="true"/>
!                     <j:choose>
!                         <j:when test="${plugin.getMergeFile('ejb-destinationrefs-{0}.xml', class).exists()}">
!                             <j:import file="${plugin.getMergeFile('ejb-destinationrefs-{0}.xml', class).path}" inherit="true"/>
!                         </j:when>
!                         <j:otherwise>
!                             <x:comment>Define your Ejb destination refs entries in a file called ${plugin.expandFileName('ejb-destinationrefs-{0}.xml', class)} and place it in your merge directory. Overrides @ejb.destination-ref's</x:comment>
!                             <j:forEach var="reference" items="${util.findTagsByName(class,'ejb.destination-ref')}">
!                                 <j:set var="destRefTag" value="${reference.tag}"/>
!                                 <message-destination-ref>
!                                     <j:if test="${!empty(destRefTag.description)}">
!                                         <description>${destRefTag.description}</description>
!                                     </j:if>
!                                     <message-destination-ref-name>${destRefTag.name_}</message-destination-ref-name>
!                                     <message-destination-type>${destRefTag.type}</message-destination-type>
!                                     <message-destination-usage>${destRefTag.usage}</message-destination-usage>
!                                     <j:if test="${!empty(destRefTag.link)}">
!                                         <message-destination-link>${destRefTag.link}</message-destination-link>
!                                     </j:if>
!                                 </message-destination-ref>
!                             </j:forEach>
!                         </j:otherwise>
!                     </j:choose>
                  </j:if>
  
                  <j:if test="${util.isEntityBean(class) or util.isSessionBean(class)}">
!                     <j:choose>
!                         <j:when test="${plugin.getMergeFile('ejb-sec-rolerefs-{0}.xml', class).exists()}">
!                             <j:import file="${plugin.getMergeFile('ejb-sec-rolerefs-{0}.xml', class).path}" inherit="true"/>
!                         </j:when>
!                         <j:otherwise>
!                             <x:comment>Define your Ejb security role refs entries in a file called ${plugin.expandFileName('ejb-sec-rolerefs-{0}.xml', class)} and place it in your merge directory. Overrides @ejb.security-role-ref's</x:comment>
!                             <j:forEach var="secRoleRefTag" items="${class.getTagsByName('ejb.security-role-ref')}">
!                                 <security-role-ref>
!                                     <role-name>${secRoleRefTag.roleName}</role-name>
!                                     <role-link>${secRoleRefTag.roleLink}</role-link>
!                                 </security-role-ref>
!                             </j:forEach>
!                         </j:otherwise>
!                     </j:choose>
                  </j:if>
  
--- 173,218 ----
                  <j:if test="${version.greaterOrEquals(2.1)}">
                      <j:import uri="/res-ref.jelly" inherit="true"/>
!                     <g:merge file="ejb-destinationrefs-${util.getEjbName(class)}.xml">
! 
!                         <x:comment>
!                             Define your Ejb destination refs entries in a file called 
!                             ejb-destinationrefs-${util.getEjbName(class)}.xml and place
!                             it in your merge directory. 
!                             Overrides @ejb.destination-ref's
!                             Define root element as &lt;j:jelly  xmlns:j=&quot;jelly:core&quot;&gt;
!                         </x:comment>
!                         <j:forEach var="reference" items="${util.findTagsByName(class,'ejb.destination-ref')}">
!                             <j:set var="destRefTag" value="${reference.tag}"/>
!                             <message-destination-ref>
!                                 <j:if test="${!empty(destRefTag.description)}">
!                                     <description>${destRefTag.description}</description>
!                                 </j:if>
!                                 <message-destination-ref-name>${destRefTag.name_}</message-destination-ref-name>
!                                 <message-destination-type>${destRefTag.type}</message-destination-type>
!                                 <message-destination-usage>${destRefTag.usage}</message-destination-usage>
!                                 <j:if test="${!empty(destRefTag.link)}">
!                                     <message-destination-link>${destRefTag.link}</message-destination-link>
!                                 </j:if>
!                             </message-destination-ref>
!                         </j:forEach>
!                     </g:merge>
                  </j:if>
  
                  <j:if test="${util.isEntityBean(class) or util.isSessionBean(class)}">
!                     <g:merge file="ejb-sec-rolerefs-${util.getEjbName(class)}.xml">
!                         <x:comment>
!                             Define your Ejb security role refs entries in a file called 
!                             ${plugin.expandFileName('ejb-sec-rolerefs-{0}.xml', class)} and
!                             place it in your merge directory. 
!                             Overrides @ejb.security-role-ref's
!                             Define root element as &lt;j:jelly  xmlns:j=&quot;jelly:core&quot;&gt;
!                         </x:comment>
!                         <j:forEach var="secRoleRefTag" items="${class.getTagsByName('ejb.security-role-ref')}">
!                             <security-role-ref>
!                                 <role-name>${secRoleRefTag.roleName}</role-name>
!                                 <role-link>${secRoleRefTag.roleLink}</role-link>
!                             </security-role-ref>
!                         </j:forEach>
!                     </g:merge>
                  </j:if>
  
***************
*** 283,294 ****
                      </j:forEach>
  
!                     <j:choose>
!                         <j:when test="${plugin.getMergeFile('ejb-finders-{0}.xml', class).exists()}">
!                             <j:import file="${plugin.getMergeFile('ejb-finders-{0}.xml', class).path}" inherit="true"/>
!                         </j:when>
!                         <j:otherwise>
!                             <x:comment>Define your extra finders in a file called ${plugin.expandFileName('ejb-finders-{0}.xml', class)} and place it in your merge directory.</x:comment>
!                         </j:otherwise>
!                     </j:choose>
                  </j:if>
              </x:element>
--- 288,299 ----
                      </j:forEach>
  
!                     <g:merge file="ejb-finders-${util.getEjbName(class)}.xml">
!                         <x:comment>
!                             Define your extra finders in a file called 
!                             ejb-finders-${util.getEjbName(class)}.xml 
!                             and place it in your merge directory.
!                             Define root element as &lt;j:jelly  xmlns:j=&quot;jelly:core&quot;&gt;
!                         </x:comment>
!                     </g:merge>
                  </j:if>
              </x:element>

Index: res-ref.jelly
===================================================================
RCS file: /cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-ejb/src/main/java/org/xdoclet/plugin/ejb/descriptor/res-ref.jelly,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** res-ref.jelly	6 Oct 2005 13:46:48 -0000	1.2
--- res-ref.jelly	24 Sep 2006 11:58:56 -0000	1.3
***************
*** 1,62 ****
! <j:jelly xmlns:j="jelly:core" xmlns:x="jelly:xml">
!     <j:choose>
!         <j:when test="${plugin.getMergeFile('ejb-resourcerefs-{0}.xml', class).exists()}">
!             <j:import file="${plugin.getMergeFile('ejb-resourcerefs-{0}.xml', class).path}" inherit="true"/>
!         </j:when>
!         <j:otherwise>
!             <x:comment>Define your resource references in a file called ${plugin.expandFileName('ejb-resourcerefs-{0}.xml', class)} and place it in your merge directory. Overrides @ejb.resource-ref's</x:comment>
!             <j:forEach var="reference" items="${util.findTagsByName(class,'ejb.resource-ref')}">
!                 <j:set var="resRefTag" value="${reference.tag}"/>
!                 <resource-ref id="${plugin.prefixedId('ResRef')}">
!                     <j:if test="${!empty(resRefTag.description)}">
!                         <description>${resRefTag.description}</description>
!                     </j:if>
!                     <res-ref-name>${util.refName(reference)}</res-ref-name>
!                     <res-type>${util.refType(reference)}</res-type>
!                     <res-auth>${resRefTag.resAuth}</res-auth>
!                     <res-sharing-scope>${resRefTag.resSharingScope}</res-sharing-scope>
!                 </resource-ref>
!             </j:forEach>
!         </j:otherwise>
!     </j:choose>
  
!     <j:choose>
!         <j:when test="${plugin.getMergeFile('ejb-resource-env-refs-{0}.xml', class).exists()}">
!             <j:import file="${plugin.getMergeFile('ejb-resource-env-refs-{0}.xml', class).path}" inherit="true"/>
!         </j:when>
!         <j:otherwise>
!             <x:comment>Define your resource env references in a file called ${plugin.expandFileName('ejb-resource-env-refs-{0}.xml', class)} and place it in your merge directory. Overrides @ejb.resource-env-ref's</x:comment>
!             <j:forEach var="reference" items="${util.findTagsByName(class,'ejb.resource-env-ref')}">
!                 <j:set var="resEnvRefTag" value="${reference.tag}"/>
                  <resource-env-ref id="${plugin.prefixedId('ResEnvRef')}">
!                     <j:if test="${!empty(resEnvRefTag.description)}">
!                         <description>${resEnvRefTag.description}</description>
                      </j:if>
!                     <resource-env-ref-name>${util.refName(reference)}</resource-env-ref-name>
!                     <resource-env-ref-type>${util.refType(reference)}</resource-env-ref-type>
                  </resource-env-ref>
              </j:forEach>
!         </j:otherwise>
!     </j:choose>
! 
!     <j:if test="${!version.greaterOrEquals(2.1)}">
!         <j:choose>
!             <j:when test="${plugin.getMergeFile('ejb-destinationrefs-{0}.xml', class).exists()}">
!                 <j:import file="${plugin.getMergeFile('ejb-destinationrefs-{0}.xml', class).path}" inherit="true"/>
!             </j:when>
!             <j:otherwise>
!                 <x:comment>Define your destination references in a file called ${plugin.expandFileName('ejb-destinationrefs-{0}.xml', class)} and place it in your merge directory. Overrides @ejb.destination-ref's</x:comment>
!                 <j:forEach var="reference" items="${util.findTagsByName(class,'ejb.destination-ref')}">
!                     <j:set var="destRefTag" value="${reference.tag}"/>
!                     <resource-env-ref id="${plugin.prefixedId('ResEnvRef')}">
!                         <j:if test="${!empty(destRefTag.description)}">
!                             <description>${destRefTag.description}</description>
!                         </j:if>
!                         <resource-env-ref-name>${destRefTag.name_}</resource-env-ref-name>
!                         <resource-env-ref-type>${destRefTag.type}</resource-env-ref-type>
!                     </resource-env-ref>
!                 </j:forEach>
!             </j:otherwise>
!         </j:choose>
      </j:if>
  </j:jelly>
\ No newline at end of file
--- 1,67 ----
! <?xml version="1.0" encoding="UTF-8"?>
! <j:jelly xmlns:j="jelly:core" xmlns:x="jelly:xml"
!         xmlns:g="jelly:org.generama.jelly.GeneramaTaglib">
!     <g:merge file="ejb-resourcerefs-${util.getEjbName(class)}.xml">
!         <x:comment>
!             Define your resource references in a file called 
!             ejb-resourcerefs-${util.getEjbName(class)}.xml
!             and place it in your merge directory. 
!             Overrides @ejb.resource-ref's
!             Define root element as &lt;j:jelly  xmlns:j=&quot;jelly:core&quot;&gt;
!         </x:comment>
!         <j:forEach var="reference" items="${util.findTagsByName(class,'ejb.resource-ref')}">
!             <j:set var="resRefTag" value="${reference.tag}"/>
!             <resource-ref id="${plugin.prefixedId('ResRef')}">
!                 <j:if test="${!empty(resRefTag.description)}">
!                     <description>${resRefTag.description}</description>
!                 </j:if>
!                 <res-ref-name>${util.refName(reference)}</res-ref-name>
!                 <res-type>${util.refType(reference)}</res-type>
!                 <res-auth>${resRefTag.resAuth}</res-auth>
!                 <res-sharing-scope>${resRefTag.resSharingScope}</res-sharing-scope>
!             </resource-ref>
!         </j:forEach>
!     </g:merge>
  
!     <g:merge file="ejb-resource-env-refs-${util.getEjbName(class)}.xml">
!         <x:comment>
!             Define your resource env references in a file called 
!             ejb-resource-env-refs-${util.getEjbName(class)}.xml
!             and place it in your merge directory. 
!             Overrides @ejb.resource-env-ref's
!             Define root element as &lt;j:jelly  xmlns:j=&quot;jelly:core&quot;&gt;
!         </x:comment>
!         <j:forEach var="reference" items="${util.findTagsByName(class,'ejb.resource-env-ref')}">
!             <j:set var="resEnvRefTag" value="${reference.tag}"/>
!             <resource-env-ref id="${plugin.prefixedId('ResEnvRef')}">
!                 <j:if test="${!empty(resEnvRefTag.description)}">
!                     <description>${resEnvRefTag.description}</description>
!                 </j:if>
!                 <resource-env-ref-name>${util.refName(reference)}</resource-env-ref-name>
!                 <resource-env-ref-type>${util.refType(reference)}</resource-env-ref-type>
!             </resource-env-ref>
!         </j:forEach>
!     </g:merge>
! 
!     <j:if test="${!version.greaterOrEquals(2.1)}">
!         <g:merge file="ejb-destinationrefs-${util.getEjbName(class)}.xml">
!             <x:comment>
!                 Define your destination references in a file called 
!                 ejb-destinationrefs-${util.getEjbName(class)}.xml
!                 and place it in your merge directory. 
!                 Overrides @ejb.destination-ref's
!                 Define root element as &lt;j:jelly  xmlns:j=&quot;jelly:core&quot;&gt;
!             </x:comment>
!             <j:forEach var="reference" items="${util.findTagsByName(class,'ejb.destination-ref')}">
!                 <j:set var="destRefTag" value="${reference.tag}"/>
                  <resource-env-ref id="${plugin.prefixedId('ResEnvRef')}">
!                     <j:if test="${!empty(destRefTag.description)}">
!                         <description>${destRefTag.description}</description>
                      </j:if>
!                     <resource-env-ref-name>${destRefTag.name_}</resource-env-ref-name>
!                     <resource-env-ref-type>${destRefTag.type}</resource-env-ref-type>
                  </resource-env-ref>
              </j:forEach>
!         </g:merge>
      </j:if>
  </j:jelly>
\ No newline at end of file

Index: asm-descriptor.jelly
===================================================================
RCS file: /cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-ejb/src/main/java/org/xdoclet/plugin/ejb/descriptor/asm-descriptor.jelly,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** asm-descriptor.jelly	7 Jun 2006 01:42:34 -0000	1.5
--- asm-descriptor.jelly	24 Sep 2006 11:58:56 -0000	1.6
***************
*** 1,150 ****
! <j:jelly xmlns:j="jelly:core" xmlns:x="jelly:xml">
!     <j:choose>
!         <j:when test="${plugin.getMergeFile('assembly-descriptor.xml', class).exists()}">
!             <j:import file="${plugin.getMergeFile('assembly-descriptor.xml', class).path}" inherit="true"/>
!         </j:when>
!         <j:otherwise>
!             <x:comment trim="false">To specify your own assembly descriptor info here, add a file to your XDoclet merge directory called assembly-descriptor.xml that contains the <assembly-descriptor></assembly-descriptor> markup. Overrides xdoclet generation.</x:comment>
!             <assembly-descriptor id="${plugin.prefixedId('AssemblyDescriptor')}">
!                 <j:choose>
!                     <j:when test="${plugin.getMergeFile('ejb-security-roles.xml', class).exists()}">
!                         <j:import file="${plugin.getMergeFile('ejb-security-roles.xml', class).path}" inherit="true"/>
!                     </j:when>
!                     <j:otherwise>
!                         <x:comment trim="false">To specify additional security-role elements, add a file in the merge directory called ejb-security-roles.xml that contains them.</x:comment>
!                     </j:otherwise>
!                 </j:choose>
!                 <j:forEach var="role" items="${util.getSecurityRoles(metadata)}">
!                     <security-role>
!                         <description>Description not supported yet</description>
!                         <role-name>${role}</role-name>
!                     </security-role>
!                 </j:forEach>
!                 <!-- Method permissions -->
!                 <j:choose>
!                     <j:when test="${plugin.getMergeFile('ejb-method-permissions.xml', class).exists()}">
!                         <j:import file="${plugin.getMergeFile('ejb-method-permissions.xml', class).path}" inherit="true"/>
!                     </j:when>
!                     <j:otherwise>
!                         <x:comment trim="false">To specify additional method-permission elements, add a file in the merge directory called ejb-method-permissions.xml that contains them.</x:comment>
!                     </j:otherwise>
!                 </j:choose>
  
!                 <j:forEach var="bean" items="${util.getBeans(metadata)}">
!                     <j:forEach var="methodPermission" items="${util.getMethodPermissions(bean)}">
!                         <method-permission id="${plugin.prefixedId('MethodPermission')}">
                              <description>Description not supported yet</description>
                              <j:choose>
!                                 <j:when test="${!empty(methodPermission.roles)}">
!                                     <j:forEach var="role" items="${methodPermission.roles}">
!                                         <role-name>${role}</role-name>
!                                     </j:forEach>
!                                 </j:when>
!                                 <j:when test="${version.greaterOrEquals(2.0)}">
!                                     <unchecked />
                                  </j:when>
                              </j:choose>
!                             <method id="${plugin.prefixedId('MethodElement')}">
!                                 <description>Description not supported yet</description>
!                                 <ejb-name>${util.getEjbName(bean)}</ejb-name>
!                                 <method-intf>${methodPermission.ifaceType}</method-intf>
!                                 <j:choose>
!                                     <j:when test="${methodPermission.method != null}">
!                                         <method-name>${methodPermission.method.name}</method-name>
!                                         <j:if test="${!empty(methodPermission.method.parameters)}">
!                                             <method-params>
!                                                 <j:forEach var="param" items="${methodPermission.method.parameters}">
!                                                     <method-param>${param.type}</method-param>
!                                                 </j:forEach>
!                                             </method-params>
!                                         </j:if>
!                                     </j:when>
!                                     <j:otherwise>
!                                         <method-name>*</method-name>
!                                     </j:otherwise>
!                                 </j:choose>
!                             </method>
!                         </method-permission>
!                     </j:forEach>
                  </j:forEach>
  
!                 <j:choose>
!                     <j:when test="${plugin.getMergeFile('ejb-container-transactions.xml', class).exists()}">
!                         <j:import file="${plugin.getMergeFile('ejb-container-transactions.xml', class).path}" inherit="true"/>
!                     </j:when>
!                     <j:otherwise>
!                         <x:comment trim="false">To specify additional container-transaction elements, add a file in the merge directory called ejb-container-transactions.xml that contains them.</x:comment>
!                     </j:otherwise>
!                 </j:choose>
! 
!                 <j:forEach var="bean" items="${util.getBeans(metadata)}">
!                     <j:forEach var="containerTransaction" items="${util.getContainerTransactions(bean)}">
!                         <container-transaction id="${plugin.prefixedId('MethodTransaction')}">
                              <description>Description not supported yet</description>
!                             <method id="${plugin.prefixedId('MethodElement')}">
!                                 <description>Description not supported yet</description>
!                                 <ejb-name>${util.getEjbName(bean)}</ejb-name>
!                                 <j:if test="${!empty(containerTransaction.ifaceType)}">
!                                 	<method-intf>${containerTransaction.ifaceType}</method-intf>
!                                 </j:if>
!                                 <j:choose>
!                                     <j:when test="${containerTransaction.method != null}">
!                                         <method-name>${containerTransaction.method.name}</method-name>
!                                         <j:if test="${!empty(containerTransaction.method.parameters)}">
!                                             <method-params>
!                                                 <j:forEach var="param" items="${containerTransaction.method.parameters}">
!                                                     <method-param>${param.type}</method-param>
!                                                 </j:forEach>
!                                             </method-params>
!                                         </j:if>
!                                     </j:when>
!                                     <j:otherwise>
!                                         <method-name>*</method-name>
!                                     </j:otherwise>
!                                 </j:choose>
!                             </method>
!                             <trans-attribute>${containerTransaction.transType}</trans-attribute>
!                         </container-transaction>
!                     </j:forEach>
                  </j:forEach>
  
!                 <j:choose>
!                     <j:when test="${plugin.getMergeFile('ejb-message-destinations.xml', class).exists()}">
!                         <j:import file="${plugin.getMergeFile('ejb-message-destinations.xml', class).path}" inherit="true"/>
!                     </j:when>
!                     <j:otherwise>
!                         <x:comment trim="false">To specify additional message-destination elements, add a file in the merge directory called ejb-message-destinations.xml that contains them.</x:comment>
!                     </j:otherwise>
!                 </j:choose>
! 
!                 <j:if test="${version.greaterOrEquals(2.1)}">
!                     <j:forEach var="bean" items="${util.getMessageDrivenBeans(metadata)}">
!                         <j:set var="ejbMessageDestinationTag" value="${bean.getTagByName('ejb.message-destination')}"/>
!                         <j:if test="${ejbMessageDestinationTag != null}">
!                             <message-destination>
!                                 <j:if test="${!empty(ejbMessageDestinationTag.description)}">
!                                     <description>${ejbMessageDestinationTag.description}</description>
!                                 </j:if>
!                                 <j:if test="${!empty(ejbMessageDestinationTag.displayName)}">
!                                     <display-name>${ejbMessageDestinationTag.displayName}</display-name>
!                                 </j:if>
!                                 <message-destination-name>${ejbMessageDestinationTag.name_}</message-destination-name>
!                             </message-destination>
!                         </j:if>
!                     </j:forEach>
!                 </j:if>
  
!                 <j:if test="${version.greaterOrEquals(2.0)}">
!                     <j:choose>
!                         <j:when test="${plugin.getMergeFile('ejb-exclude-list.xml', class).exists()}">
!                             <j:import file="${plugin.getMergeFile('ejb-exclude-list.xml', class).path}" inherit="true"/>
!                         </j:when>
!                         <j:otherwise>
!                             <x:comment trim="false">To specify an exclude-list element, add a file in the merge directory called ejb-exclude-list.xml that contains it.</x:comment>
!                         </j:otherwise>
!                     </j:choose>
!                 </j:if>
!             </assembly-descriptor>
!         </j:otherwise>
!     </j:choose>
  </j:jelly>
\ No newline at end of file
--- 1,151 ----
! <?xml version="1.0" encoding="UTF-8"?>
! <j:jelly xmlns:j="jelly:core" xmlns:x="jelly:xml"
!         xmlns:g="jelly:org.generama.jelly.GeneramaTaglib">
!     <g:merge file="assembly-descriptor.xml">
!         <x:comment trim="false">
!             To specify your own assembly descriptor info here, add a file to 
!             your XDoclet merge directory called assembly-descriptor.xml that
!             contains the <assembly-descriptor></assembly-descriptor> markup. 
!             Overrides xdoclet generation.
!             Define root element as &lt;j:jelly  xmlns:j=&quot;jelly:core&quot;&gt;
!         </x:comment>
  
!         <assembly-descriptor id="${plugin.prefixedId('AssemblyDescriptor')}">
!             <g:merge file="ejb-security-roles.xml">
!                 <x:comment trim="false">
!                     To specify additional security-role elements,
!                     add a file in the merge directory called ejb-security-roles.xml
!                     that contains them.
!                     Define root element as &lt;j:jelly  xmlns:j=&quot;jelly:core&quot;&gt;
!                 </x:comment>
!             </g:merge>
!             <j:forEach var="role" items="${util.getSecurityRoles(metadata)}">
!                 <security-role>
!                     <description>Description not supported yet</description>
!                     <role-name>${role}</role-name>
!                 </security-role>
!             </j:forEach>
!             <!-- Method permissions -->
!             <g:merge file="ejb-method-permissions.xml">
!                 <x:comment trim="false">
!                     To specify additional method-permission elements, add a file in
!                     the merge directory called ejb-method-permissions.xml that contains
!                     them.
!                     Define root element as &lt;j:jelly  xmlns:j=&quot;jelly:core&quot;&gt;
!                 </x:comment>
!             </g:merge>
! 
!             <j:forEach var="bean" items="${util.getBeans(metadata)}">
!                 <j:forEach var="methodPermission" items="${util.getMethodPermissions(bean)}">
!                     <method-permission id="${plugin.prefixedId('MethodPermission')}">
!                         <description>Description not supported yet</description>
!                         <j:choose>
!                             <j:when test="${!empty(methodPermission.roles)}">
!                                 <j:forEach var="role" items="${methodPermission.roles}">
!                                     <role-name>${role}</role-name>
!                                 </j:forEach>
!                             </j:when>
!                             <j:when test="${version.greaterOrEquals(2.0)}">
!                                 <unchecked />
!                             </j:when>
!                         </j:choose>
!                         <method id="${plugin.prefixedId('MethodElement')}">
                              <description>Description not supported yet</description>
+                             <ejb-name>${util.getEjbName(bean)}</ejb-name>
+                             <method-intf>${methodPermission.ifaceType}</method-intf>
                              <j:choose>
!                                 <j:when test="${methodPermission.method != null}">
!                                     <method-name>${methodPermission.method.name}</method-name>
!                                     <j:if test="${!empty(methodPermission.method.parameters)}">
!                                         <method-params>
!                                             <j:forEach var="param" items="${methodPermission.method.parameters}">
!                                                 <method-param>${param.type}</method-param>
!                                             </j:forEach>
!                                         </method-params>
!                                     </j:if>
                                  </j:when>
+                                 <j:otherwise>
+                                     <method-name>*</method-name>
+                                 </j:otherwise>
                              </j:choose>
!                         </method>
!                     </method-permission>
                  </j:forEach>
+             </j:forEach>
+             <g:merge file="ejb-container-transactions.xml">
+                 <x:comment trim="false">
+                     To specify additional container-transaction elements, add a file
+                     in the merge directory called ejb-container-transactions.xml that
+                     contains them.
+                     Define root element as &lt;j:jelly  xmlns:j=&quot;jelly:core&quot;&gt;
+                 </x:comment>
+             </g:merge>
  
!             <j:forEach var="bean" items="${util.getBeans(metadata)}">
!                 <j:forEach var="containerTransaction" items="${util.getContainerTransactions(bean)}">
!                     <container-transaction id="${plugin.prefixedId('MethodTransaction')}">
!                         <description>Description not supported yet</description>
!                         <method id="${plugin.prefixedId('MethodElement')}">
                              <description>Description not supported yet</description>
!                             <ejb-name>${util.getEjbName(bean)}</ejb-name>
!                             <j:if test="${!empty(containerTransaction.ifaceType)}">
!                                 <method-intf>${containerTransaction.ifaceType}</method-intf>
!                             </j:if>
!                             <j:choose>
!                                 <j:when test="${containerTransaction.method != null}">
!                                     <method-name>${containerTransaction.method.name}</method-name>
!                                     <j:if test="${!empty(containerTransaction.method.parameters)}">
!                                         <method-params>
!                                             <j:forEach var="param" items="${containerTransaction.method.parameters}">
!                                                 <method-param>${param.type}</method-param>
!                                             </j:forEach>
!                                         </method-params>
!                                     </j:if>
!                                 </j:when>
!                                 <j:otherwise>
!                                     <method-name>*</method-name>
!                                 </j:otherwise>
!                             </j:choose>
!                         </method>
!                         <trans-attribute>${containerTransaction.transType}</trans-attribute>
!                     </container-transaction>
                  </j:forEach>
+             </j:forEach>
+             <g:merge file="ejb-message-destinations.xml">
+                 <x:comment trim="false">
+                     To specify additional message-destination elements, add a file 
+                     in the merge directory called ejb-message-destinations.xml 
+                     that contains them.
+                     Define root element as &lt;j:jelly  xmlns:j=&quot;jelly:core&quot;&gt;
+                 </x:comment>
+             </g:merge>
  
!             <j:if test="${version.greaterOrEquals(2.1)}">
!                 <j:forEach var="bean" items="${util.getMessageDrivenBeans(metadata)}">
!                     <j:set var="ejbMessageDestinationTag" value="${bean.getTagByName('ejb.message-destination')}"/>
!                     <j:if test="${ejbMessageDestinationTag != null}">
!                         <message-destination>
!                             <j:if test="${!empty(ejbMessageDestinationTag.description)}">
!                                 <description>${ejbMessageDestinationTag.description}</description>
!                             </j:if>
!                             <j:if test="${!empty(ejbMessageDestinationTag.displayName)}">
!                                 <display-name>${ejbMessageDestinationTag.displayName}</display-name>
!                             </j:if>
!                             <message-destination-name>${ejbMessageDestinationTag.name_}</message-destination-name>
!                         </message-destination>
!                     </j:if>
!                 </j:forEach>
!             </j:if>
  
!             <j:if test="${version.greaterOrEquals(2.0)}">
!                 <g:merge file="ejb-exclude-list.xml">
!                     <x:comment trim="false">
!                         To specify an exclude-list element, add a file in the merge
!                         directory called ejb-exclude-list.xml that contains it.
!                         Define root element as &lt;j:jelly  xmlns:j=&quot;jelly:core&quot;&gt;
!                     </x:comment>
!                 </g:merge>
!             </j:if>
!         </assembly-descriptor>
!     </g:merge>
  </j:jelly>
\ No newline at end of file

Index: EjbJarXmlPlugin.jelly
===================================================================
RCS file: /cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-ejb/src/main/java/org/xdoclet/plugin/ejb/descriptor/EjbJarXmlPlugin.jelly,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** EjbJarXmlPlugin.jelly	6 Oct 2005 13:46:48 -0000	1.5
--- EjbJarXmlPlugin.jelly	24 Sep 2006 11:58:56 -0000	1.6
***************
*** 1,4 ****
  <?xml version="1.0" encoding="UTF-8"?>
! <j:jelly xmlns:j="jelly:core" xmlns:x="jelly:xml" xmlns:jsl="jelly:jsl">
      <j:if test="${plugin.version.isDtd()}">
          <x:doctype name="ejb-jar" publicId="${plugin.version.publicId}" systemId="${plugin.version.systemId}" trim="true" />
--- 1,5 ----
  <?xml version="1.0" encoding="UTF-8"?>
! <j:jelly xmlns:j="jelly:core" xmlns:x="jelly:xml" xmlns:jsl="jelly:jsl"
!         xmlns:g="jelly:org.generama.jelly.GeneramaTaglib">
      <j:if test="${plugin.version.isDtd()}">
          <x:doctype name="ejb-jar" publicId="${plugin.version.publicId}" systemId="${plugin.version.systemId}" trim="true" />
***************
*** 32,60 ****
  
                  <!-- Merge Points START -->
!                 <j:choose>
!                     <j:when test="${plugin.getMergeFile('session-beans.xml').exists()}">
!                         <j:import file="${plugin.getMergeFile('session-beans.xml').path}" inherit="true"/>
!                     </j:when>
!                     <j:otherwise>
!                         <x:comment trim="false">To add session beans that you have deployment descriptor info for, add a file to your XDoclet merge directory called session-beans.xml that contains the <session></session> markup for those beans.</x:comment>
!                     </j:otherwise>
!                 </j:choose>
!                 <j:choose>
!                     <j:when test="${plugin.getMergeFile('entity-beans.xml').exists()}">
!                         <j:import file="${plugin.getMergeFile('entity-beans.xml').path}" inherit="true"/>
!                     </j:when>
!                     <j:otherwise>
!                         <x:comment trim="false">To add entity beans that you have deployment descriptor info for, add a file to your XDoclet merge directory called entity-beans.xml that contains the <entity></entity> markup for those beans.</x:comment>
!                     </j:otherwise>
!                 </j:choose>
                  <j:if test="${version.greaterOrEquals(2.0)}">
!                     <j:choose>
!                         <j:when test="${plugin.getMergeFile('message-driven-beans.xml').exists()}">
!                             <j:import file="${plugin.getMergeFile('message-driven-beans.xml').path}" inherit="true"/>
!                         </j:when>
!                         <j:otherwise trim="false">
!                             <x:comment>To add message driven beans that you have deployment descriptor info for, add a file to your XDoclet merge directory called message-driven-beans.xml that contains the <message-driven></message-driven> markup for those beans.</x:comment>
!                         </j:otherwise>
!                     </j:choose>
                  </j:if>
                  <!-- Merge Points END -->
--- 33,61 ----
  
                  <!-- Merge Points START -->
!                 <g:merge file="session-beans.xml">
!                     <x:comment>
!                         To add session beans that you have deployment descriptor info for,
!                         add a file to your XDoclet merge directory called session-beans.xml
!                         that contains the <session></session> markup for those beans.
!                         Define root element as &lt;j:jelly  xmlns:j=&quot;jelly:core&quot;&gt;
!                     </x:comment>
!                 </g:merge>
!                 <g:merge file="entity-beans.xml">
!                     <x:comment>
!                         To add entity beans that you have deployment descriptor info for,
!                         add a file to your XDoclet merge directory called entity-beans.xml
!                         that contains the <entity></entity> markup for those beans.
!                         Define root element as &lt;j:jelly  xmlns:j=&quot;jelly:core&quot;&gt;
!                     </x:comment>
!                 </g:merge>
                  <j:if test="${version.greaterOrEquals(2.0)}">
!                     <g:merge file="message-driven-beans.xml">
!                         <x:comment> 
!                             To add message driven  beans that you have deployment descriptor info for,
!                             add a file to your XDoclet merge directory called session-beans.xml
!                             that contains the <message-driven></message-driven> markup for those beans.
!                             Define root element as &lt;j:jelly  xmlns:j=&quot;jelly:core&quot;&gt;
!                         </x:comment>
!                     </g:merge>
                  </j:if>
                  <!-- Merge Points END -->

Index: ejb-ref.jelly
===================================================================
RCS file: /cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-ejb/src/main/java/org/xdoclet/plugin/ejb/descriptor/ejb-ref.jelly,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ejb-ref.jelly	13 Dec 2005 03:35:32 -0000	1.4
--- ejb-ref.jelly	24 Sep 2006 11:58:56 -0000	1.5
***************
*** 1,2 ****
--- 1,3 ----
+ <?xml version="1.0" encoding="UTF-8"?>
  <j:jelly xmlns:j="jelly:core" xmlns:x="jelly:xml">
      <j:forEach var="reference" items="${util.findTagsByName(class,'ejb.ejb-ref')}">

[xdoclet-plugins-commits] xdoclet-plugins/plugin-web/src/main/java/org/xdoclet/plugin/web TaglibPlugin.jelly, 1.13, 1.14 WebPlugin.java, 1.24, 1.25 WebPlugin.jelly, 1.21, 1.22

[Konstantin P. <ko...@us...>]

Update of /cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-web/src/main/java/org/xdoclet/plugin/web
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv9889/plugin-web/src/main/java/org/xdoclet/plugin/web

Modified Files:
	TaglibPlugin.jelly WebPlugin.java WebPlugin.jelly 
Log Message:
reworked jelly merge, moved taglib from web plugin to generama to provide standard 
merge capabilities


Index: TaglibPlugin.jelly
===================================================================
RCS file: /cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-web/src/main/java/org/xdoclet/plugin/web/TaglibPlugin.jelly,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** TaglibPlugin.jelly	4 Dec 2005 18:25:16 -0000	1.13
--- TaglibPlugin.jelly	24 Sep 2006 11:58:57 -0000	1.14
***************
*** 2,6 ****
  
  <j:jelly xmlns:j="jelly:core" xmlns:jxml="jelly:xml"
!          xmlns:x="jelly:org.xdoclet.plugin.web.jelly.XdocletTaglib">
  
      <j:if test="${plugin.needsDoctype()}">
--- 2,6 ----
  
  <j:jelly xmlns:j="jelly:core" xmlns:jxml="jelly:xml"
!          xmlns:g="jelly:org.generama.jelly.GeneramaTaglib">
  
      <j:if test="${plugin.needsDoctype()}">
***************
*** 18,25 ****
  
          <j:if test="${plugin.isMinimumJspVersion('2.0')}">
!             <x:condelement tag="description" obj="${plugin}" property="description"/>
!             <x:condelement tag="display-name" obj="${plugin}" property="displayname"/>
!             <x:condelement tag="small-icon" obj="${plugin}" property="smallicon"/>
!             <x:condelement tag="large-icon" obj="${plugin}" property="largeicon"/>
          </j:if>
  
--- 18,25 ----
  
          <j:if test="${plugin.isMinimumJspVersion('2.0')}">
!             <g:condelement tag="description" obj="${plugin}" property="description"/>
!             <g:condelement tag="display-name" obj="${plugin}" property="displayname"/>
!             <g:condelement tag="small-icon" obj="${plugin}" property="smallicon"/>
!             <g:condelement tag="large-icon" obj="${plugin}" property="largeicon"/>
          </j:if>
  
***************
*** 30,41 ****
          <short-name>${plugin.shortname}</short-name>
  
!         <x:condelement tag="uri" obj="${plugin}" property="uri"/>
          <j:if test="${plugin.isMaximumJspVersion('1.2')}">
!             <x:condelement tag="display-name" obj="${plugin}" property="displayname"/>
!             <x:condelement tag="small-icon" obj="${plugin}" property="smallicon"/>
!             <x:condelement tag="large-icon" obj="${plugin}" property="largeicon"/>
!             <x:condelement tag="description" obj="${plugin}" property="description"/>
          </j:if>
!         <x:condelement tag="validator" obj="${plugin}" property="validator"/>
  
          <!-- listeners -->
--- 30,41 ----
          <short-name>${plugin.shortname}</short-name>
  
!         <g:condelement tag="uri" obj="${plugin}" property="uri"/>
          <j:if test="${plugin.isMaximumJspVersion('1.2')}">
!             <g:condelement tag="display-name" obj="${plugin}" property="displayname"/>
!             <g:condelement tag="small-icon" obj="${plugin}" property="smallicon"/>
!             <g:condelement tag="large-icon" obj="${plugin}" property="largeicon"/>
!             <g:condelement tag="description" obj="${plugin}" property="description"/>
          </j:if>
!         <g:condelement tag="validator" obj="${plugin}" property="validator"/>
  
          <!-- listeners -->
***************
*** 53,83 ****
  
                  <j:if test="${plugin.isMinimumJspVersion('2.0')}">
!                     <x:condelement tag="description" obj="${tagtag}" property="description"/>
!                     <x:condelement tag="display-name" obj="${tagtag}" property="display-name"/>
!                     <x:condelement tag="small-icon" obj="${tagtag}" property="small-icon"/>
!                     <x:condelement tag="large-icon" obj="${tagtag}" property="large-icon"/>
                  </j:if>
                  <name>${tagtag.getNamedParameter('name')}</name>
                  <tag-class>${tag.fullyQualifiedName}</tag-class>
!                 <x:condelement tag="tei-class" doclettag="${tagtag}" property="tei-class"/>
!                 <x:condelement tag="body-content" doclettag="${tagtag}" property="body-content"/>
                  <j:if test="${plugin.isMaximumJspVersion('1.2')}">
!                     <x:condelement tag="display-name" doclettag="${tagtag}" property="display-name"/>
!                     <x:condelement tag="small-icon" doclettag="${tagtag}" property="small-icon"/>
!                     <x:condelement tag="large-icon" doclettag="${tagtag}" property="large-icon"/>
!                     <x:condelement tag="description" doclettag="${tagtag}" property="description"/>
                  </j:if>
                  <j:forEach var="var" items="${tag.getTagsByName('jsp.variable')}">
                      <variable>
                          <j:if test="${plugin.isMinimumJspVersion('2.0')}">
!                             <x:condelement tag="description" doclettag="${var}" property="description"/>
                          </j:if>
!                         <x:condelement tag="name-given" doclettag="${var}" property="name-given"/>
!                         <x:condelement tag="name-from-attribute" doclettag="${var}" property="name-from-attribute"/>
!                         <x:condelement tag="variable-class" doclettag="${var}" property="class"/>
!                         <x:condelement tag="declare" doclettag="${var}" property="declare"/>
!                         <x:condelement tag="scope" doclettag="${var}" property="scope"/>
                          <j:if test="${plugin.isMaximumJspVersion('1.2')}">
!                             <x:condelement tag="description" doclettag="${var}" property="description"/>
                          </j:if>
                      </variable>
--- 53,83 ----
  
                  <j:if test="${plugin.isMinimumJspVersion('2.0')}">
!                     <g:condelement tag="description" obj="${tagtag}" property="description"/>
!                     <g:condelement tag="display-name" obj="${tagtag}" property="display-name"/>
!                     <g:condelement tag="small-icon" obj="${tagtag}" property="small-icon"/>
!                     <g:condelement tag="large-icon" obj="${tagtag}" property="large-icon"/>
                  </j:if>
                  <name>${tagtag.getNamedParameter('name')}</name>
                  <tag-class>${tag.fullyQualifiedName}</tag-class>
!                 <g:condelement tag="tei-class" doclettag="${tagtag}" property="tei-class"/>
!                 <g:condelement tag="body-content" doclettag="${tagtag}" property="body-content"/>
                  <j:if test="${plugin.isMaximumJspVersion('1.2')}">
!                     <g:condelement tag="display-name" doclettag="${tagtag}" property="display-name"/>
!                     <g:condelement tag="small-icon" doclettag="${tagtag}" property="small-icon"/>
!                     <g:condelement tag="large-icon" doclettag="${tagtag}" property="large-icon"/>
!                     <g:condelement tag="description" doclettag="${tagtag}" property="description"/>
                  </j:if>
                  <j:forEach var="var" items="${tag.getTagsByName('jsp.variable')}">
                      <variable>
                          <j:if test="${plugin.isMinimumJspVersion('2.0')}">
!                             <g:condelement tag="description" doclettag="${var}" property="description"/>
                          </j:if>
!                         <g:condelement tag="name-given" doclettag="${var}" property="name-given"/>
!                         <g:condelement tag="name-from-attribute" doclettag="${var}" property="name-from-attribute"/>
!                         <g:condelement tag="variable-class" doclettag="${var}" property="class"/>
!                         <g:condelement tag="declare" doclettag="${var}" property="declare"/>
!                         <g:condelement tag="scope" doclettag="${var}" property="scope"/>
                          <j:if test="${plugin.isMaximumJspVersion('1.2')}">
!                             <g:condelement tag="description" doclettag="${var}" property="description"/>
                          </j:if>
                      </variable>
***************
*** 87,98 ****
                      <attribute>
                          <j:if test="${plugin.isMinimumJspVersion('2.0')}">
!                             <x:condelement tag="description" doclettag="${attr}" property="description"/>
                          </j:if>
                          <name>${attrMethod.propertyName}</name>
!                         <x:condelement tag="required" doclettag="${attr}" property="required"/>
!                         <x:condelement tag="rtexprvalue" doclettag="${attr}" property="rtexprvalue"/>
!                         <x:condelement tag="type" doclettag="${attr}" property="type"/>
                          <j:if test="${plugin.isMaximumJspVersion('1.2')}">
!                             <x:condelement tag="description" doclettag="${attr}" property="description"/>
                          </j:if>
                      </attribute>
--- 87,98 ----
                      <attribute>
                          <j:if test="${plugin.isMinimumJspVersion('2.0')}">
!                             <g:condelement tag="description" doclettag="${attr}" property="description"/>
                          </j:if>
                          <name>${attrMethod.propertyName}</name>
!                         <g:condelement tag="required" doclettag="${attr}" property="required"/>
!                         <g:condelement tag="rtexprvalue" doclettag="${attr}" property="rtexprvalue"/>
!                         <g:condelement tag="type" doclettag="${attr}" property="type"/>
                          <j:if test="${plugin.isMaximumJspVersion('1.2')}">
!                             <g:condelement tag="description" doclettag="${attr}" property="description"/>
                          </j:if>
                      </attribute>

Index: WebPlugin.java
===================================================================
RCS file: /cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-web/src/main/java/org/xdoclet/plugin/web/WebPlugin.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** WebPlugin.java	19 Jan 2006 23:49:23 -0000	1.24
--- WebPlugin.java	24 Sep 2006 11:58:57 -0000	1.25
***************
*** 19,204 ****
  
  /**
!  *
   * TODO : check qtags, xtags
!  *
!  * TODO: add getMetadataProvider() to AbstractPlugin instead of keeping the allClass reference ?
!  *
   * TODO : validate generated XML ?
!  *
!  * TODO : mandatory tags/attributes? (filter-name, filter-class, filter-mapping, ...)
!  *
!  * TODO : filter-mapping: check that a mapping has only of one url-pattern or servlet-name
!  * TODO : filter-mapping: check that a servlet-name mapping points to an existing servlet? i wouldn't do it, because
!  *                        a servlet might be declared in a merge file.
!  *
!  * @author     Gr&eacute;gory Joseph
!  * @author     Aslak Helles&oslash;y
!  * @version    $Revision$
   */
  public class WebPlugin extends QDoxPlugin {
-     private String publicId = WebUtils.WEBXML_PUBLIC_ID_2_3;
-     private String systemId = WebUtils.WEBXML_SYSTEM_ID_2_3;
  
!     private static Map filterInterface = new HashMap();
  
!     static {
!         filterInterface.put(WebUtils.SERVLET_23, new String[]{"javax.servlet.Filter"});
!         filterInterface.put(WebUtils.SERVLET_24, new String[]{"javax.servlet.Filter"});
!     }
  
!     private static String servletInterface = "javax.servlet.Servlet";
!     private static String[] allWebInterfaces = {"javax.servlet.Filter", servletInterface,
!                                                 "javax.servlet.ServletContextAttributeListener", "javax.servlet.ServletContextListener",
!                                                 "javax.servlet.ServletRequestAttributeListener", "javax.servlet.ServletRequestListener",
!                                                 "javax.servlet.http.HttpSessionActivationListener", "javax.servlet.http.HttpSessionAttributeListener",
!                                                 "javax.servlet.http.HttpSessionBindingListener", "javax.servlet.http.HttpSessionListener"}; // TODO avoid repeating listenerInterfaces
  
!     private WebUtils webUtils;
!     private String servletversion = WebUtils.SERVLET_23;
!     protected File mergeDir;
  
!     public WebPlugin(JellyTemplateEngine jellyTemplateEngine, QDoxCapableMetadataProvider metadataProvider, WriterMapper writerMapper) {
!         super(jellyTemplateEngine, metadataProvider, writerMapper);
  
!         setMultioutput(false);
!         setFilereplace("web.xml");
  
!         setOutputValidator(new XMLOutputValidator(WebUtils.DTDs));
  
!         new TagLibrary(metadataProvider);
  
!     }
  
!     //== plugin attributes ==
!     public String getServletversion() {
!         return servletversion;
!     }
  
!     public void setServletversion(String servletversion) {
!         this.servletversion = servletversion;
!     }
  
!     //== util methods used by jelly script ==
!     public WebUtils getWebUtils() {
!         if (webUtils == null) {
!             webUtils = new WebUtils(servletversion);
!         }
!         return webUtils;
!     }
  
!     // TODO : this is to be replaced by an XmlDocVersion class
!     public boolean needsDoctype() {
!         return !getWebUtils().isMinimumServletVersion(WebUtils.SERVLET_24);
!     }
  
!     public boolean needsSchema() {
!         return getWebUtils().isMinimumServletVersion(WebUtils.SERVLET_24);
!     }
  
!     public String getSchemaXmlNs() {
!         return needsSchema() ? "http://java.sun.com/xml/ns/j2ee" : null;
!     }
  
!     public String getSchemaXmlNsXsi() {
!         return needsSchema() ? "http://www.w3.org/2001/XMLSchema-instance" : null;
!     }
  
!     public String getSchemaXsiSchemaLocation() {
!         return needsSchema() ? "http://java.sun.com/xml/ns/j2ee " + WebUtils.WEBXML_SCHEMA_2_4 : null;
!     }
  
!     /**
!      * Returns an ordered collection of all the filters passed to the plugin.
!      *
!      * TODO: document the "order" attribute.
!      * TODO: more test cases with order? maybe not xmltestcases then, but smaller units..
!      * TODO: use "before"&"after" attributes instead of "order" ?
!      *
!      * TODO : return empty collection if servlet-api-version < 2.3
!      *
!      * @return
!      * @see ClassTagPredicate used to filter out non-filters
!      * @see ClassAttributeComparator used to sort filters
!      */
!     public Collection getFilters() {
!         // filter out non-filter classes
!         ArrayList filters = new ArrayList();
!         String[] interfaces = (String[]) filterInterface.get(servletversion);
!         if (interfaces != null) {
!             Predicate predicate = new ClassTagPredicate(interfaces, "web.filter");
!             CollectionUtils.select(metadataProvider.getMetadata(), predicate, filters);
  
!             // sort filters by the order attribute of the @web.filter tag
!             Collections.sort(filters, new ClassAttributeComparator("web.filter", "order"));
!         }
!         return filters;
!     }
  
!     public Collection getServlets() {
!         ArrayList servlets = new ArrayList();
!         Predicate predicate = new ClassTagPredicate(servletInterface, "web.servlet");
!         CollectionUtils.select(metadataProvider.getMetadata(), predicate, servlets);
  
!         // sort servlets by the order attribute of the @web.servlet tag
!         Collections.sort(servlets, new ClassAttributeComparator("web.servlet", "order"));
  
!         return servlets;
!     }
  
!     /**
!      * TODO : cache the result of this? (maybe it's one of the reasons the plugin is slow??)
!      */
!     public Collection getAllWebClasses() {
!         ArrayList all = new ArrayList();
!         Predicate predicate = new ClassTagPredicate(allWebInterfaces);
!         CollectionUtils.select(metadataProvider.getMetadata(), predicate, all);
  
!         // TODO: any order for this? maybe by classname.
  
!         return metadataProvider.getMetadata();
!     }
  
!     public boolean needsServletRunAs(DocletTag tag) {
!         return (tag.getNamedParameter("run-as") != null)
!             && (servletversion.compareTo(WebUtils.SERVLET_23)>=0);
!     }
  
!     public String getPublicId() {
!         return publicId;
!     }
  
!     public String getSystemId() {
!         return systemId;
!     }
  
!     /**
!      * Setter for mergeDir property
!      *
!      * @param mergeDir The value for the property
!      */
!     public void setMergedir(File mergeDir) {
!         this.mergeDir = mergeDir;
!     }
  
!     /**
!      * Utility method called from jelly script to resolve a mergeFile reference
!      *
!      * @param mergeFile The mergeFile to look for
!      *
!      * @return A File for mergeFile
!      */
!     public File getMergeFile(String mergeFile) {
!         if ((mergeFile != null) && (mergeDir != null) && mergeDir.isDirectory()) {
!             // The listing of mergeDir's files avoid possibly security issues in path resolving (paranoid?)
!             File[] files = mergeDir.listFiles();
  
!             for (int i = 0; i < files.length; i++) {
!                 if (mergeFile.trim().equals(files[i].getName())) {
!                     return files[i];
!                 }
!             }
!         }
  
!         return null;
!     }
  }
--- 19,245 ----
  
  /**
!  * 
   * TODO : check qtags, xtags
!  * 
!  * TODO: add getMetadataProvider() to AbstractPlugin instead of keeping the
!  * allClass reference ?
!  * 
   * TODO : validate generated XML ?
!  * 
!  * TODO : mandatory tags/attributes? (filter-name, filter-class, filter-mapping,
!  * ...)
!  * 
!  * TODO : filter-mapping: check that a mapping has only of one url-pattern or
!  * servlet-name TODO : filter-mapping: check that a servlet-name mapping points
!  * to an existing servlet? i wouldn't do it, because a servlet might be declared
!  * in a merge file.
!  * 
!  * @author Gr&eacute;gory Joseph
!  * @author Aslak Helles&oslash;y
!  * @version $Revision$
   */
  public class WebPlugin extends QDoxPlugin {
  
! 	private static String[] allWebInterfaces = { "javax.servlet.Filter",
! 		"javax.servlet.Servlet", "javax.servlet.ServletContextAttributeListener",
! 			"javax.servlet.ServletContextListener",
! 			"javax.servlet.ServletRequestAttributeListener",
! 			"javax.servlet.ServletRequestListener",
! 			"javax.servlet.http.HttpSessionActivationListener",
! 			"javax.servlet.http.HttpSessionAttributeListener",
! 			"javax.servlet.http.HttpSessionBindingListener",
! 			"javax.servlet.http.HttpSessionListener" }; // TODO avoid repeating
! 														// listenerInterfaces
  
! 	private static Map filterInterface = new HashMap();
  
! 	static {
! 		filterInterface.put(WebUtils.SERVLET_23,
! 				new String[] { "javax.servlet.Filter" });
! 		filterInterface.put(WebUtils.SERVLET_24,
! 				new String[] { "javax.servlet.Filter" });
! 	}
  
! 	protected String mergeDir;
  
! 	private String publicId = WebUtils.WEBXML_PUBLIC_ID_2_3;
  
! 	private String servletversion = WebUtils.SERVLET_23;
  
! 	private String systemId = WebUtils.WEBXML_SYSTEM_ID_2_3;
  
! 	private WebUtils webUtils;
  
! 	public WebPlugin(JellyTemplateEngine jellyTemplateEngine,
! 			QDoxCapableMetadataProvider metadataProvider,
! 			WriterMapper writerMapper) {
! 		super(jellyTemplateEngine, metadataProvider, writerMapper);
  
! 		setMultioutput(false);
! 		setFilereplace("web.xml");
  
! 		setOutputValidator(new XMLOutputValidator(WebUtils.DTDs));
  
! 		new TagLibrary(metadataProvider);
  
! 	}
  
! 	/**
! 	 * TODO : cache the result of this? (maybe it's one of the reasons the
! 	 * plugin is slow??)
! 	 */
! 	public Collection getAllWebClasses() {
! 		ArrayList all = new ArrayList();
! 		Predicate predicate = new ClassTagPredicate(allWebInterfaces);
! 		CollectionUtils.select(metadataProvider.getMetadata(), predicate, all);
  
! 		// TODO: any order for this? maybe by classname.
  
! 		return metadataProvider.getMetadata();
! 	}
  
! 	/**
! 	 * base path to resource directory containing resources to be merged they
! 	 * shall be made available on class path
! 	 * 
! 	 * @return
! 	 */
! 	public String getMergeDir() {
! 		return mergeDir;
! 	}
  
! 	public void setMergeDir(String mergeDir) {
! 		this.mergeDir = mergeDir;
! 	}
  
! 	/**
! 	 * Returns an ordered collection of all the filters passed to the plugin.
! 	 * 
! 	 * TODO: document the "order" attribute. TODO: more test cases with order?
! 	 * maybe not xmltestcases then, but smaller units.. TODO: use
! 	 * "before"&"after" attributes instead of "order" ?
! 	 * 
! 	 * TODO : return empty collection if servlet-api-version < 2.3
! 	 * 
! 	 * @return
! 	 * @see ClassTagPredicate used to filter out non-filters
! 	 * @see ClassAttributeComparator used to sort filters
! 	 */
! 	public Collection getFilters() {
! 		// filter out non-filter classes
! 		ArrayList filters = new ArrayList();
! 		String[] interfaces = (String[]) filterInterface.get(servletversion);
! 		if (interfaces != null) {
! 			Predicate predicate = new ClassTagPredicate(interfaces,
! 					"web.filter");
! 			CollectionUtils.select(metadataProvider.getMetadata(), predicate,
! 					filters);
  
! 			// sort filters by the order attribute of the @web.filter tag
! 			Collections.sort(filters, new ClassAttributeComparator(
! 					"web.filter", "order"));
! 		}
! 		return filters;
! 	}
  
! 	/**
! 	 * Utility method called from jelly script to resolve a mergeFile reference
! 	 * 
! 	 * @param mergeFile
! 	 *            The mergeFile to look for
! 	 * 
! 	 * @return A File for mergeFile
! 	 */
! //	public File getMergeFile(String mergeFile) {
! //		if ((mergeFile != null) && (mergeDir != null) && mergeDir.isDirectory()) {
! //			// The listing of mergeDir's files avoid possibly security issues in
! //			// path resolving (paranoid?)
! //			File[] files = mergeDir.listFiles();
! //
! //			for (int i = 0; i < files.length; i++) {
! //				if (mergeFile.trim().equals(files[i].getName())) {
! //					return files[i];
! //				}
! //			}
! //		}
! //
! //		return null;
! //	}
  
! 	public String getPublicId() {
! 		return publicId;
! 	}
  
! 	public String getSchemaXmlNs() {
! 		return needsSchema() ? "http://java.sun.com/xml/ns/j2ee" : null;
! 	}
  
! 	public String getSchemaXmlNsXsi() {
! 		return needsSchema() ? "http://www.w3.org/2001/XMLSchema-instance"
! 				: null;
! 	}
  
! 	public String getSchemaXsiSchemaLocation() {
! 		return needsSchema() ? "http://java.sun.com/xml/ns/j2ee "
! 				+ WebUtils.WEBXML_SCHEMA_2_4 : null;
! 	}
  
! 	public Collection getServlets() {
! 		ArrayList servlets = new ArrayList();
! 		Predicate predicate = new ClassTagPredicate("javax.servlet.Servlet",
! 				"web.servlet");
! 		CollectionUtils.select(metadataProvider.getMetadata(), predicate,
! 				servlets);
  
! 		// sort servlets by the order attribute of the @web.servlet tag
! 		Collections.sort(servlets, new ClassAttributeComparator("web.servlet",
! 				"order"));
  
! 		return servlets;
! 	}
  
! 	// == plugin attributes ==
! 	public String getServletversion() {
! 		return servletversion;
! 	}
  
! 	public String getSystemId() {
! 		return systemId;
! 	}
  
! 	// == util methods used by jelly script ==
! 	public WebUtils getWebUtils() {
! 		if (webUtils == null) {
! 			webUtils = new WebUtils(servletversion);
! 		}
! 		return webUtils;
! 	}
  
! 	// TODO : this is to be replaced by an XmlDocVersion class
! 	public boolean needsDoctype() {
! 		return !getWebUtils().isMinimumServletVersion(WebUtils.SERVLET_24);
! 	}
! 
! 	public boolean needsSchema() {
! 		return getWebUtils().isMinimumServletVersion(WebUtils.SERVLET_24);
! 	}
! 
! 	public boolean needsServletRunAs(DocletTag tag) {
! 		return (tag.getNamedParameter("run-as") != null)
! 				&& (servletversion.compareTo(WebUtils.SERVLET_23) >= 0);
! 	}
! 
! 	/**
! 	 * Setter for mergeDir property
! 	 * 
! 	 * @param mergeDir
! 	 *            The value for the property
! 	 */
! 	public void setMergedir(String mergeDir) {
! 		this.mergeDir = mergeDir;
! 	}
! 
! 	public void setServletversion(String servletversion) {
! 		this.servletversion = servletversion;
! 	}
  }

Index: WebPlugin.jelly
===================================================================
RCS file: /cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-web/src/main/java/org/xdoclet/plugin/web/WebPlugin.jelly,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** WebPlugin.jelly	19 Jan 2006 23:49:23 -0000	1.21
--- WebPlugin.jelly	24 Sep 2006 11:58:57 -0000	1.22
***************
*** 1,6 ****
  <?xml version="1.0" encoding="UTF-8"?>
  
! <j:jelly xmlns:j="jelly:core" xmlns:jxml="jelly:xml" xmlns:d="jelly:define"
!     xmlns:x="jelly:org.xdoclet.plugin.web.jelly.XdocletTaglib">
  
      <!--macros-->
--- 1,6 ----
  <?xml version="1.0" encoding="UTF-8"?>
  
! <j:jelly xmlns:j="jelly:core" xmlns:x="jelly:xml" xmlns:d="jelly:define"
!         xmlns:g="jelly:org.generama.jelly.GeneramaTaglib">
  
      <!--macros-->
***************
*** 8,17 ****
          <init-param>
              <j:if test="${plugin.webUtils.isMinimumServletVersion('2.4')}">
!             <x:condelement tag="description" doclettag="${param}" property="description"/>
              </j:if>
              <param-name>${param.getNamedParameter("name")}</param-name>
              <param-value>${param.getNamedParameter("value")}</param-value>
              <j:if test="${plugin.webUtils.isMaximumServletVersion('2.3')}">
!             <x:condelement tag="description" doclettag="${param}" property="description"/>
              </j:if>
          </init-param>
--- 8,17 ----
          <init-param>
              <j:if test="${plugin.webUtils.isMinimumServletVersion('2.4')}">
!                 <g:condelement tag="description" doclettag="${param}" property="description"/>
              </j:if>
              <param-name>${param.getNamedParameter("name")}</param-name>
              <param-value>${param.getNamedParameter("value")}</param-value>
              <j:if test="${plugin.webUtils.isMaximumServletVersion('2.3')}">
!                 <g:condelement tag="description" doclettag="${param}" property="description"/>
              </j:if>
          </init-param>
***************
*** 24,30 ****
  
      <j:if test="${plugin.needsDoctype()}">
!     <jxml:doctype name="web-app"
!         publicId="${plugin.publicId}"
!         systemId="${plugin.systemId}"/>
      </j:if>
  
--- 24,30 ----
  
      <j:if test="${plugin.needsDoctype()}">
!         <x:doctype name="web-app"
!                 publicId="${plugin.publicId}"
!                 systemId="${plugin.systemId}"/>
      </j:if>
  
***************
*** 32,259 ****
      <!-- TODO : check exactly what parameters are mandatory or not, esp. with ejb-reb and such -->
  
!     <jxml:element URI="${plugin.schemaXmlNs}" name="web-app">
          <j:if test="${plugin.needsSchema()}">
!             <jxml:attribute URI="${plugin.schemaXmlNsXsi}" name="xsi:schemaLocation" trim="true">${plugin.schemaXsiSchemaLocation}</jxml:attribute>
!             <jxml:attribute name="version" trim="true">${plugin.servletversion}</jxml:attribute>
          </j:if>
  
!         <jxml:replaceNamespace toURI="${plugin.schemaXmlNs}">
  
          <!--TODO : distributable : add this tag conditionaly/-->
  
          <!-- filters -->
!         <j:forEach var="filter" items="${plugin.filters}">
!             <filter>
!                 <j:set var="item" value="${filter.getTagByName('web.filter')}"/>
!                 <j:if test="${plugin.webUtils.isMinimumServletVersion('2.4')}">
!                     <x:condelement tag="description" doclettag="${item}" property="description"/>
!                     <x:condelement tag="display-name" doclettag="${item}" property="display-name"/>
!                 </j:if>
!                 <j:if test="${item.getNamedParameter('icon') != null}">
!                     <icon>
!                         <small-icon>${item.getNamedParameter('icon')}</small-icon>
!                     </icon>
!                 </j:if>
!                 <filter-name>${item.getNamedParameter('name')}</filter-name>
!                 <j:if test="${plugin.webUtils.isMaximumServletVersion('2.3')}">
!                     <x:condelement tag="display-name" doclettag="${item}" property="display-name"/>
!                     <x:condelement tag="description" doclettag="${item}" property="description"/>
!                 </j:if>
!                 <filter-class>${filter.fullyQualifiedName}</filter-class>
!                 <j:forEach var="param" items="${filter.getTagsByName('web.filter-init-param')}">
!                     <d:invoke script="${init_param}"/>
!                 </j:forEach>
!             </filter>
!         </j:forEach>
!         <j:choose>
!             <j:when test="${plugin.getMergeFile('filters.xml').exists()}">
!                 <j:import file="${plugin.getMergeFile('filters.xml').path}" inherit="true"/>
!             </j:when>
!             <j:otherwise>
!                 <jxml:comment trim="false">To add filters that you have deployment descriptor info for, add a file to your XDoclet merge directory called filters.xml that contains the <filter></filter> markup for those beans.</jxml:comment>
!             </j:otherwise>
!         </j:choose>
! 
          <!-- filter-mappings -->
!         <j:forEach var="filter" items="${plugin.filters}">
!             <j:forEach var="mapping" items="${filter.getTagsByName('web.filter-mapping')}">
!                 <filter-mapping>
!                     <filter-name>${filter.getNamedParameter("web.filter","name")}</filter-name>
!                     <x:condelement tag="url-pattern" doclettag="${mapping}" property="url-pattern"/>
!                     <x:condelement tag="servlet-name" doclettag="${mapping}" property="servlet-name"/>
!                 </filter-mapping>
              </j:forEach>
!         </j:forEach>
!         <j:choose>
!             <j:when test="${plugin.getMergeFile('filter-mappings.xml').exists()}">
!                 <j:import file="${plugin.getMergeFile('filter-mappings.xml').path}" inherit="true"/>
!             </j:when>
!             <j:otherwise>
!                 <jxml:comment trim="false">To add filters that you have deployment descriptor info for, add a file to your XDoclet merge directory called filter-mappings.xml that contains the <filter-mappings></filter-mappings> markup for those beans.</jxml:comment>
!             </j:otherwise>
!         </j:choose>
  
          <!-- listeners -->
!         <j:forEach var="listener" items="${plugin.webUtils.getListeners(metadata)}">
!             <listener>
!                 <listener-class>${listener.fullyQualifiedName}</listener-class>
!             </listener>
!         </j:forEach>
  
          <!-- servlets -->
!         <j:forEach var="servlet" items="${plugin.servlets}">
!             <j:set var="item" value="${servlet.getTagByName('web.servlet')}"/>
!             <servlet>
!                 <j:if test="${plugin.webUtils.isMinimumServletVersion('2.4')}">
!                 <x:condelement tag="description" doclettag="${item}" property="description"/>
!                 <x:condelement tag="display-name" doclettag="${item}" property="display-name"/>
!                 </j:if>
!                 <servlet-name>${servlet.getNamedParameter("web.servlet","name")}</servlet-name>
!                 <j:if test="${plugin.webUtils.isMaximumServletVersion('2.3')}">
!                 <x:condelement tag="display-name" doclettag="${item}" property="display-name"/>
!                 <x:condelement tag="description" doclettag="${item}" property="description"/>
!                 </j:if>
!                 <servlet-class>${servlet.fullyQualifiedName}</servlet-class>
!                 <j:forEach var="param" items="${servlet.getTagsByName('web.servlet-init-param')}">
!                     <d:invoke script="${init_param}"/>
!                 </j:forEach>
!                 <x:condelement tag="load-on-startup" doclettag="${item}" property="load-on-startup"/>
!                 <j:if test="${plugin.needsServletRunAs(item)}">
!                     <run-as>
!                         <role-name>${item.getNamedParameter('run-as')}</role-name>
!                     </run-as>
!                 </j:if>
                  <!-- security-roles references -->
!                 <j:forEach var="class" items="${plugin.allWebClasses}">
!                     <j:forEach var="item" items="${class.getTagsByName('web.security-role-ref')}">
!                         <security-role-ref>
!                             <x:condelement tag="description" doclettag="${item}" property="description"/>
!                             <role-name>${item.getNamedParameter('role-name')}</role-name>
!                             <role-link>${item.getNamedParameter('role-link')}</role-link>
!                         </security-role-ref>
                      </j:forEach>
!                 </j:forEach>
!             </servlet>
!         </j:forEach>
!         <j:choose>
!             <j:when test="${plugin.getMergeFile('servlets.xml').exists()}">
!                 <j:import file="${plugin.getMergeFile('servlets.xml').path}" inherit="true"/>
!             </j:when>
!             <j:otherwise>
!                 <jxml:comment trim="false">To add filters that you have deployment descriptor info for, add a file to your XDoclet merge directory called servlets.xml that contains the <servlet></servlet> markup for those beans.</jxml:comment>
!             </j:otherwise>
!         </j:choose>
  
          <!-- servlet-mappings -->
!         <j:forEach var="servlet" items="${plugin.servlets}">
!             <j:forEach var="mapping" items="${servlet.getTagsByName('web.servlet-mapping')}">
!                 <servlet-mapping>
!                     <servlet-name>${servlet.getNamedParameter("web.servlet","name")}</servlet-name>
!                     <x:condelement tag="url-pattern" doclettag="${mapping}" property="url-pattern"/>
!                 </servlet-mapping>
              </j:forEach>
!         </j:forEach>
!         <j:choose>
!             <j:when test="${plugin.getMergeFile('servlet-mappings.xml').exists()}">
!                 <j:import file="${plugin.getMergeFile('servlet-mappings.xml').path}" inherit="true"/>
!             </j:when>
!             <j:otherwise>
!                 <jxml:comment trim="false">To add filters that you have deployment descriptor info for, add a file to your XDoclet merge directory called servlet-mappings.xml that contains the <servlet-mappings></servlet-mappings> markup for those beans.</jxml:comment>
!             </j:otherwise>
!         </j:choose>
  
          <!-- resource env references -->
!         <j:if test="${plugin.webUtils.isMinimumServletVersion('2.3')}">
!             <j:forEach var="class" items="${plugin.allWebClasses}">
!                 <j:forEach var="item" items="${class.getTagsByName('web.resource-env-ref')}">
!                     <resource-env-ref>
!                         <x:condelement tag="description" doclettag="${item}" property="description"/>
!                         <resource-env-ref-name>${item.getNamedParameter('name')}</resource-env-ref-name>
!                         <resource-env-ref-type>${item.getNamedParameter('type')}</resource-env-ref-type>
!                     </resource-env-ref>
                  </j:forEach>
!             </j:forEach>
!         </j:if>
  
          <!-- resource references -->
!         <j:forEach var="class" items="${plugin.allWebClasses}">
!             <j:forEach var="item" items="${class.getTagsByName('web.resource-ref')}">
!                 <resource-ref>
!                     <x:condelement tag="description" doclettag="${item}" property="description"/>
!                     <res-ref-name>${item.getNamedParameter('name')}</res-ref-name>
!                     <res-type>${item.getNamedParameter('type')}</res-type>
!                     <res-auth>${item.getNamedParameter('auth')}</res-auth>
!                     <j:if test="${plugin.webUtils.isMinimumServletVersion('2.3')}">
!                         <x:condelement tag="res-sharing-scope" doclettag="${item}" property="scope"/>
!                     </j:if>
!                 </resource-ref>
              </j:forEach>
!         </j:forEach>
  
          <!-- security-roles -->
!         <j:forEach var="class" items="${plugin.allWebClasses}">
!             <j:forEach var="item" items="${class.getTagsByName('web.security-role')}">
!                 <security-role>
!                     <x:condelement tag="description" doclettag="${item}" property="description"/>
!                     <role-name>${item.getNamedParameter('role-name')}</role-name>
!                 </security-role>
              </j:forEach>
!         </j:forEach>
!         <j:choose>
!             <j:when test="${plugin.getMergeFile('web-security.xml').exists()}">
!                 <j:import file="${plugin.getMergeFile('web-security.xml').path}" inherit="true"/>
!             </j:when>
!             <j:otherwise>
!                 <jxml:comment trim="false">To add filters that you have deployment descriptor info for, add a file to your XDoclet merge directory called web-security.xml that contains the <web-security></web-security> markup for those beans.</jxml:comment>
!             </j:otherwise>
!         </j:choose>
  
          <!-- env entries -->
!         <j:forEach var="class" items="${plugin.allWebClasses}">
!             <j:forEach var="item" items="${class.getTagsByName('web.env-entry')}">
!                 <env-entry>
!                     <x:condelement tag="description" doclettag="${item}" property="description"/>
!                     <env-entry-name>${item.getNamedParameter('name')}</env-entry-name>
!                     <j:if test="${plugin.webUtils.isMaximumServletVersion('2.3')}">
!                     <env-entry-value>${item.getNamedParameter('value')}</env-entry-value>
!                     </j:if>
!                     <env-entry-type>${item.getNamedParameter('type')}</env-entry-type>
!                     <j:if test="${plugin.webUtils.isMinimumServletVersion('2.4')}">
!                     <env-entry-value>${item.getNamedParameter('value')}</env-entry-value>
!                     </j:if>
!                 </env-entry>
              </j:forEach>
!         </j:forEach>
  
          <!-- ejb refs -->
-         <j:forEach var="class" items="${plugin.allWebClasses}">
-             <j:forEach var="item" items="${class.getTagsByName('web.ejb-ref')}">
-                 <ejb-ref>
-                     <x:condelement tag="description" doclettag="${item}" property="description"/>
-                     <ejb-ref-name>${item.getNamedParameter('name')}</ejb-ref-name>
-                     <ejb-ref-type>${item.getNamedParameter('type')}</ejb-ref-type>
-                     <home>${item.getNamedParameter('home')}</home>
-                     <remote>${item.getNamedParameter('remote')}</remote>
-                     <ejb-link>${item.getNamedParameter('link')}</ejb-link>
-                 </ejb-ref>
-             </j:forEach>
-         </j:forEach>
- 
-         <!-- ejb local refs -->
-         <j:if test="${plugin.webUtils.isMinimumServletVersion('2.3')}">
              <j:forEach var="class" items="${plugin.allWebClasses}">
!                 <j:forEach var="item" items="${class.getTagsByName('web.ejb-local-ref')}">
!                     <ejb-local-ref>
!                         <x:condelement tag="description" doclettag="${item}" property="description"/>
                          <ejb-ref-name>${item.getNamedParameter('name')}</ejb-ref-name>
                          <ejb-ref-type>${item.getNamedParameter('type')}</ejb-ref-type>
!                         <local-home>${item.getNamedParameter('home')}</local-home>
!                         <local>${item.getNamedParameter('local')}</local>
!                         <x:condelement tag="ejb-link" doclettag="${item}" property="link"/>
!                     </ejb-local-ref>
                  </j:forEach>
              </j:forEach>
!         </j:if>
!         </jxml:replaceNamespace>
!     </jxml:element>
  </j:jelly>
--- 32,308 ----
      <!-- TODO : check exactly what parameters are mandatory or not, esp. with ejb-reb and such -->
  
!     <x:element URI="${plugin.schemaXmlNs}" name="web-app">
          <j:if test="${plugin.needsSchema()}">
!             <x:attribute URI="${plugin.schemaXmlNsXsi}" name="xsi:schemaLocation" trim="true">${plugin.schemaXsiSchemaLocation}</x:attribute>
!             <x:attribute name="version" trim="true">${plugin.servletversion}</x:attribute>
          </j:if>
  
!         <x:replaceNamespace toURI="${plugin.schemaXmlNs}">
  
          <!--TODO : distributable : add this tag conditionaly/-->
  
          <!-- filters -->
!             <j:forEach var="filter" items="${plugin.filters}">
!                 <filter>
!                     <j:set var="item" value="${filter.getTagByName('web.filter')}"/>
!                     <j:if test="${plugin.webUtils.isMinimumServletVersion('2.4')}">
!                         <g:condelement tag="description" doclettag="${item}" property="description"/>
!                         <g:condelement tag="display-name" doclettag="${item}" property="display-name"/>
!                     </j:if>
!                     <j:if test="${item.getNamedParameter('icon') != null}">
!                         <icon>
!                             <small-icon>${item.getNamedParameter('icon')}</small-icon>
!                         </icon>
!                     </j:if>
!                     <filter-name>${item.getNamedParameter('name')}</filter-name>
!                     <j:if test="${plugin.webUtils.isMaximumServletVersion('2.3')}">
!                         <g:condelement tag="display-name" doclettag="${item}" property="display-name"/>
!                         <g:condelement tag="description" doclettag="${item}" property="description"/>
!                     </j:if>
!                     <filter-class>${filter.fullyQualifiedName}</filter-class>
!                     <j:forEach var="param" items="${filter.getTagsByName('web.filter-init-param')}">
!                         <d:invoke script="${init_param}"/>
!                     </j:forEach>
!                 </filter>
!             </j:forEach>
!             <g:merge file="filters.xml">
!                 <x:comment>
!                     To add filters that you have deployment descriptor info for, 
!                     add a file to your XDoclet merge directory called filters.xml 
!                     that contains the <filter></filter> markup for those beans.
!                     Define root element as &lt;j:jelly xmlns:j=&quot;jelly:core&quot;/&gt;
!                 </x:comment>
!             </g:merge>
!  
          <!-- filter-mappings -->
!             <j:forEach var="filter" items="${plugin.filters}">
!                 <j:forEach var="mapping" items="${filter.getTagsByName('web.filter-mapping')}">
!                     <filter-mapping>
!                         <filter-name>${filter.getNamedParameter("web.filter","name")}</filter-name>
!                         <g:condelement tag="url-pattern" doclettag="${mapping}" property="url-pattern"/>
!                         <g:condelement tag="servlet-name" doclettag="${mapping}" property="servlet-name"/>
!                     </filter-mapping>
!                 </j:forEach>
              </j:forEach>
!             <g:merge file="filter-mappings.xml">
!                 <x:comment>
!                     To add filter mappings that you have deployment descriptor info for, 
!                     add a file to your XDoclet merge directory called filter-mappings.xml 
!                     that contains the <filter-mapping></filter-mapping> markup for those beans.
!                     Define root element as &lt;j:jelly  xmlns:j=&quot;jelly:core&quot;&gt;
!                 </x:comment>
!             </g:merge>
  
          <!-- listeners -->
!             <j:forEach var="listener" items="${plugin.webUtils.getListeners(metadata)}">
!                 <listener>
!                     <listener-class>${listener.fullyQualifiedName}</listener-class>
!                 </listener>
!             </j:forEach>
!             <g:merge file="listeners.xml">
!                 <x:comment>
!                     To add listener definitions that you have deployment descriptor info for, 
!                     add a file to your XDoclet merge directory called listeners.xml 
!                     that contains the <listener></listener> markup for those beans.
!                     Define root element as &lt;j:jelly  xmlns:j=&quot;jelly:core&quot;&gt;
!                 </x:comment>
!             </g:merge>
  
          <!-- servlets -->
!             <j:forEach var="servlet" items="${plugin.servlets}">
!                 <j:set var="item" value="${servlet.getTagByName('web.servlet')}"/>
!                 <servlet>
!                     <j:if test="${plugin.webUtils.isMinimumServletVersion('2.4')}">
!                         <g:condelement tag="description" doclettag="${item}" property="description"/>
!                         <g:condelement tag="display-name" doclettag="${item}" property="display-name"/>
!                     </j:if>
!                     <servlet-name>${servlet.getNamedParameter("web.servlet","name")}</servlet-name>
!                     <j:if test="${plugin.webUtils.isMaximumServletVersion('2.3')}">
!                         <g:condelement tag="display-name" doclettag="${item}" property="display-name"/>
!                         <g:condelement tag="description" doclettag="${item}" property="description"/>
!                     </j:if>
!                     <servlet-class>${servlet.fullyQualifiedName}</servlet-class>
!                     <j:forEach var="param" items="${servlet.getTagsByName('web.servlet-init-param')}">
!                         <d:invoke script="${init_param}"/>
!                     </j:forEach>
!                     <g:condelement tag="load-on-startup" doclettag="${item}" property="load-on-startup"/>
!                     <j:if test="${plugin.needsServletRunAs(item)}">
!                         <run-as>
!                             <role-name>${item.getNamedParameter('run-as')}</role-name>
!                         </run-as>
!                     </j:if>
                  <!-- security-roles references -->
!                     <j:forEach var="class" items="${plugin.allWebClasses}">
!                         <j:forEach var="item" items="${class.getTagsByName('web.security-role-ref')}">
!                             <security-role-ref>
!                                 <g:condelement tag="description" doclettag="${item}" property="description"/>
!                                 <role-name>${item.getNamedParameter('role-name')}</role-name>
!                                 <role-link>${item.getNamedParameter('role-link')}</role-link>
!                             </security-role-ref>
!                         </j:forEach>
                      </j:forEach>
!                 </servlet>
!             </j:forEach>
!             <g:merge file="servlets.xml">
!                 <x:comment>        
!                     To add servlets that you have deployment descriptor info for, 
!                     add a file to your XDoclet merge directory called servlets.xml 
!                     that contains the <servlet></servlet> markup for those beans.
!                     Define root element as &lt;j:jelly  xmlns:j=&quot;jelly:core&quot;&gt;
!                 </x:comment>
!             </g:merge>
  
          <!-- servlet-mappings -->
!             <j:forEach var="servlet" items="${plugin.servlets}">
!                 <j:forEach var="mapping" items="${servlet.getTagsByName('web.servlet-mapping')}">
!                     <servlet-mapping>
!                         <servlet-name>${servlet.getNamedParameter("web.servlet","name")}</servlet-name>
!                         <g:condelement tag="url-pattern" doclettag="${mapping}" property="url-pattern"/>
!                     </servlet-mapping>
!                 </j:forEach>
              </j:forEach>
!             <g:merge file="servlet-mapings.xml">
!                 <x:comment>
!                     To add filters that you have deployment descriptor info for, 
!                     add a file to your XDoclet merge directory called filters.xml 
!                     that contains the <servlet-mapping></servlet-mapping> markup for 
!                     those beans. Define root element as &lt;j:jelly  xmlns:j=&quot;jelly:core&quot;&gt;
!                 </x:comment>
!             </g:merge>
  
          <!-- resource env references -->
!             <j:if test="${plugin.webUtils.isMinimumServletVersion('2.3')}">
!                 <j:forEach var="class" items="${plugin.allWebClasses}">
!                     <j:forEach var="item" items="${class.getTagsByName('web.resource-env-ref')}">
!                         <resource-env-ref>
!                             <g:condelement tag="description" doclettag="${item}" property="description"/>
!                             <resource-env-ref-name>${item.getNamedParameter('name')}</resource-env-ref-name>
!                             <resource-env-ref-type>${item.getNamedParameter('type')}</resource-env-ref-type>
!                         </resource-env-ref>
!                     </j:forEach>
                  </j:forEach>
!             </j:if>
!             <g:merge file="resource-env-ref.xml">
!                 <x:comment>
!                     To add resource env refenrences that you have deployment descriptor info for, 
!                     add a file to your XDoclet merge directory called resource-env-ref.xml 
!                     that contains the <resource-env-ref></resource-env-ref> markup.
!                     Define root element as &lt;j:jelly  xmlns:j=&quot;jelly:core&quot;&gt;
!                 </x:comment>
!             </g:merge>
  
          <!-- resource references -->
!             <j:forEach var="class" items="${plugin.allWebClasses}">
!                 <j:forEach var="item" items="${class.getTagsByName('web.resource-ref')}">
!                     <resource-ref>
!                         <g:condelement tag="description" doclettag="${item}" property="description"/>
!                         <res-ref-name>${item.getNamedParameter('name')}</res-ref-name>
!                         <res-type>${item.getNamedParameter('type')}</res-type>
!                         <res-auth>${item.getNamedParameter('auth')}</res-auth>
!                         <j:if test="${plugin.webUtils.isMinimumServletVersion('2.3')}">
!                             <g:condelement tag="res-sharing-scope" doclettag="${item}" property="scope"/>
!                         </j:if>
!                     </resource-ref>
!                 </j:forEach>
              </j:forEach>
!             <g:merge file="resource-ref.xml">
!                 <x:comment>
!                     To add filter mappings that you have deployment descriptor info for, 
!                     add a file to your XDoclet merge directory called filter-mappings.xml 
!                     that contains the <resource-ref></resource-ref> markup for those beans.
!                     Define root element as &lt;j:jelly  xmlns:j=&quot;jelly:core&quot;&gt;
!                 </x:comment>
!             </g:merge>
  
          <!-- security-roles -->
!             <j:forEach var="class" items="${plugin.allWebClasses}">
!                 <j:forEach var="item" items="${class.getTagsByName('web.security-role')}">
!                     <security-role>
!                         <g:condelement tag="description" doclettag="${item}" property="description"/>
!                         <role-name>${item.getNamedParameter('role-name')}</role-name>
!                     </security-role>
!                 </j:forEach>
              </j:forEach>
!             <g:merge file="web-security.xml">
!                 <x:comment>
!                     To add information about security roles that you have deployment descriptor info for, 
!                     add a file to your XDoclet merge directory called web-security.xml 
!                     that contains the <security-role></security-role> markup.
!                     Define root element as &lt;j:jelly  xmlns:j=&quot;jelly:core&quot;&gt;
!                 </x:comment>
!             </g:merge>
  
          <!-- env entries -->
!             <j:forEach var="class" items="${plugin.allWebClasses}">
!                 <j:forEach var="item" items="${class.getTagsByName('web.env-entry')}">
!                     <env-entry>
!                         <g:condelement tag="description" doclettag="${item}" property="description"/>
!                         <env-entry-name>${item.getNamedParameter('name')}</env-entry-name>
!                         <j:if test="${plugin.webUtils.isMaximumServletVersion('2.3')}">
!                             <env-entry-value>${item.getNamedParameter('value')}</env-entry-value>
!                         </j:if>
!                         <env-entry-type>${item.getNamedParameter('type')}</env-entry-type>
!                         <j:if test="${plugin.webUtils.isMinimumServletVersion('2.4')}">
!                             <env-entry-value>${item.getNamedParameter('value')}</env-entry-value>
!                         </j:if>
!                     </env-entry>
!                 </j:forEach>
              </j:forEach>
!             <g:merge file="env-entries.xml">
!                 <x:comment>
!                     To add environment entries that you have deployment descriptor info for, 
!                     add a file to your XDoclet merge directory called env-entries.xml 
!                     that contains the <env-entry></env-entry> markup for those beans.
!                     Define root element as &lt;j:jelly  xmlns:j=&quot;jelly:core&quot;&gt;
!                 </x:comment>
!             </g:merge>
  
          <!-- ejb refs -->
              <j:forEach var="class" items="${plugin.allWebClasses}">
!                 <j:forEach var="item" items="${class.getTagsByName('web.ejb-ref')}">
!                     <ejb-ref>
!                         <g:condelement tag="description" doclettag="${item}" property="description"/>
                          <ejb-ref-name>${item.getNamedParameter('name')}</ejb-ref-name>
                          <ejb-ref-type>${item.getNamedParameter('type')}</ejb-ref-type>
!                         <home>${item.getNamedParameter('home')}</home>
!                         <remote>${item.getNamedParameter('remote')}</remote>
!                         <ejb-link>${item.getNamedParameter('link')}</ejb-link>
!                     </ejb-ref>
                  </j:forEach>
              </j:forEach>
!             <g:merge file="ejb-refs.xml">
!                 <x:comment>
!                     To add EJB references that you have deployment descriptor info for, 
!                     add a file to your XDoclet merge directory called fejb-refs.xml 
!                     that contains the <ejb-ref></ejb-ref> markup for those beans.
!                     Define root element as &lt;j:jelly  xmlns:j=&quot;jelly:core&quot;&gt;
!                 </x:comment>
!             </g:merge>
! 
!         <!-- ejb local refs -->
!             <j:if test="${plugin.webUtils.isMinimumServletVersion('2.3')}">
!                 <j:forEach var="class" items="${plugin.allWebClasses}">
!                     <j:forEach var="item" items="${class.getTagsByName('web.ejb-local-ref')}">
!                         <ejb-local-ref>
!                             <g:condelement tag="description" doclettag="${item}" property="description"/>
!                             <ejb-ref-name>${item.getNamedParameter('name')}</ejb-ref-name>
!                             <ejb-ref-type>${item.getNamedParameter('type')}</ejb-ref-type>
!                             <local-home>${item.getNamedParameter('home')}</local-home>
!                             <local>${item.getNamedParameter('local')}</local>
!                             <g:condelement tag="ejb-link" doclettag="${item}" property="link"/>
!                         </ejb-local-ref>
!                     </j:forEach>
!                 </j:forEach>
!             </j:if>
!             <g:merge file="ejb-local-refs.xml">
!                 <x:comment>
!                     To add local EJB references that you have deployment descriptor info for, 
!                     add a file to your XDoclet merge directory called filter-mappings.xml 
!                     that contains the <ejb-local-ref></ejb-local-ref> markup for those beans.
!                     Define root element as &lt;j:jelly  xmlns:j=&quot;jelly:core&quot;&gt;
!                 </x:comment>
!             </g:merge>
! 
!         </x:replaceNamespace>
!     </x:element>
  </j:jelly>

[xdoclet-plugins-commits] xdoclet-plugins/plugin-plugin/src/test/java/org/xdoclet/plugin/plugin ExamplePlugin.confluence, 1.6, 1.7

[Konstantin P. <ko...@us...>]

Update of /cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-plugin/src/test/java/org/xdoclet/plugin/plugin
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv9889/plugin-plugin/src/test/java/org/xdoclet/plugin/plugin

Modified Files:
	ExamplePlugin.confluence 
Log Message:
reworked jelly merge, moved taglib from web plugin to generama to provide standard 
merge capabilities


Index: ExamplePlugin.confluence
===================================================================
RCS file: /cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-plugin/src/test/java/org/xdoclet/plugin/plugin/ExamplePlugin.confluence,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** ExamplePlugin.confluence	11 Dec 2005 15:04:23 -0000	1.6
--- ExamplePlugin.confluence	24 Sep 2006 11:58:56 -0000	1.7
***************
*** 12,20 ****
  |encoding |false | | | |
  |multioutput |false | | | |
  |outputValidator |false | | | |
  |fileregex |false | | | |
  |filereplace |false | | | |
  |packageregex |false | | | |
  |packagereplace |false | | | |
- |destdir |false | | | |
- |validate |false | | | |
--- 12,21 ----
  |encoding |false | | | |
  |multioutput |false | | | |
+ |mergedir |false | | | |
  |outputValidator |false | | | |
+ |validate |false | | | |
+ |destdir |false | | | |
  |fileregex |false | | | |
  |filereplace |false | | | |
  |packageregex |false | | | |
  |packagereplace |false | | | |

[xdoclet-plugins-commits] xdoclet-plugins/plugin-web/src/test/java/org/xdoclet/testapp/web/expected web-2_2.xml, 1.1, 1.2 web-2_3.xml, 1.1, 1.2 web-2_4.xml, 1.1, 1.2

[Konstantin P. <ko...@us...>]

Update of /cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-web/src/test/java/org/xdoclet/testapp/web/expected
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv9889/plugin-web/src/test/java/org/xdoclet/testapp/web/expected

Modified Files:
	web-2_2.xml web-2_3.xml web-2_4.xml 
Log Message:
reworked jelly merge, moved taglib from web plugin to generama to provide standard 
merge capabilities


Index: web-2_4.xml
===================================================================
RCS file: /cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-web/src/test/java/org/xdoclet/testapp/web/expected/web-2_4.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** web-2_4.xml	4 Dec 2005 18:25:17 -0000	1.1
--- web-2_4.xml	24 Sep 2006 11:58:57 -0000	1.2
***************
*** 40,44 ****
          <filter-class>org.xdoclet.testapp.web.ThirdFilter</filter-class>
      </filter>
! 
      <!-- TODO : mergedir/filter-mappings.xml -->
      <filter-mapping>
--- 40,49 ----
          <filter-class>org.xdoclet.testapp.web.ThirdFilter</filter-class>
      </filter>
!     <filter>
!         <filter-name>glum</filter-name>
!         <display-name>Glum</display-name>
!         <filter-class>org.xdoclet.testapp.web.BlaBla</filter-class>
!     </filter>
!  
      <!-- TODO : mergedir/filter-mappings.xml -->
      <filter-mapping>

Index: web-2_2.xml
===================================================================
RCS file: /cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-web/src/test/java/org/xdoclet/testapp/web/expected/web-2_2.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** web-2_2.xml	4 Dec 2005 18:25:17 -0000	1.1
--- web-2_2.xml	24 Sep 2006 11:58:57 -0000	1.2
***************
*** 1,6 ****
  <?xml version="1.0" encoding="UTF-8"?>
  <!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN" "http://java.sun.com/dtd/web-app_2_2.dtd">
- 
  <web-app>
      <!-- TODO : <distributable/>-->
  
--- 1,10 ----
  <?xml version="1.0" encoding="UTF-8"?>
  <!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN" "http://java.sun.com/dtd/web-app_2_2.dtd">
  <web-app>
+     <filter>
+         <filter-name>glum</filter-name>
+         <display-name>Glum</display-name>
+         <filter-class>org.xdoclet.testapp.web.BlaBla</filter-class>
+     </filter>
      <!-- TODO : <distributable/>-->
  
***************
*** 50,56 ****
      <resource-ref>
          <description>Test resource reference</description>
! 	<res-ref-name>jdbc/EmployeeAppDB</res-ref-name>
! 	<res-type>javax.sql.DataSource</res-type>
! 	<res-auth>Container</res-auth>
      </resource-ref>
  
--- 54,60 ----
      <resource-ref>
          <description>Test resource reference</description>
!         <res-ref-name>jdbc/EmployeeAppDB</res-ref-name>
!         <res-type>javax.sql.DataSource</res-type>
!         <res-auth>Container</res-auth>
      </resource-ref>
  

Index: web-2_3.xml
===================================================================
RCS file: /cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-web/src/test/java/org/xdoclet/testapp/web/expected/web-2_3.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** web-2_3.xml	4 Dec 2005 18:25:17 -0000	1.1
--- web-2_3.xml	24 Sep 2006 11:58:57 -0000	1.2
***************
*** 33,37 ****
          <filter-class>org.xdoclet.testapp.web.ThirdFilter</filter-class>
      </filter>
! 
      <!-- TODO : mergedir/filter-mappings.xml -->
      <filter-mapping>
--- 33,42 ----
          <filter-class>org.xdoclet.testapp.web.ThirdFilter</filter-class>
      </filter>
!     <filter>
!         <filter-name>glum</filter-name>
!         <display-name>Glum</display-name>
!         <filter-class>org.xdoclet.testapp.web.BlaBla</filter-class>
!     </filter>
!  
      <!-- TODO : mergedir/filter-mappings.xml -->
      <filter-mapping>

[xdoclet-plugins-commits] xdoclet-plugins/plugin-struts/src/test/java/org/xdoclet/plugin/struts StrutsConfigTest.java, 1.5, 1.6 StrutsTilesTest.java, 1.2, 1.3

[Konstantin P. <ko...@us...>]

Update of /cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-struts/src/test/java/org/xdoclet/plugin/struts
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv9889/plugin-struts/src/test/java/org/xdoclet/plugin/struts

Modified Files:
	StrutsConfigTest.java StrutsTilesTest.java 
Log Message:
reworked jelly merge, moved taglib from web plugin to generama to provide standard 
merge capabilities


Index: StrutsConfigTest.java
===================================================================
RCS file: /cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-struts/src/test/java/org/xdoclet/plugin/struts/StrutsConfigTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** StrutsConfigTest.java	10 Aug 2005 15:21:11 -0000	1.5
--- StrutsConfigTest.java	24 Sep 2006 11:58:57 -0000	1.6
***************
*** 31,36 ****
      protected Plugin createPlugin(MetadataProvider metadataProvider, WriterMapper writerMapper) {
          StrutsConfigXMLPlugin plugin = (StrutsConfigXMLPlugin) super.createPlugin(metadataProvider, writerMapper);
!         URL completeDirURL = getResourceRelativeToThisPackage("complete");
!         plugin.setMergedir(new File(completeDirURL.getPath(), "merge"));
          plugin.setValidate(false); // due to complete/struts-config.xml is not valid
          return plugin;
--- 31,35 ----
      protected Plugin createPlugin(MetadataProvider metadataProvider, WriterMapper writerMapper) {
          StrutsConfigXMLPlugin plugin = (StrutsConfigXMLPlugin) super.createPlugin(metadataProvider, writerMapper);
!         plugin.setMergedir("/org/xdoclet/plugin/struts/complete/merge/");
          plugin.setValidate(false); // due to complete/struts-config.xml is not valid
          return plugin;

Index: StrutsTilesTest.java
===================================================================
RCS file: /cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-struts/src/test/java/org/xdoclet/plugin/struts/StrutsTilesTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** StrutsTilesTest.java	10 Aug 2005 15:21:11 -0000	1.2
--- StrutsTilesTest.java	24 Sep 2006 11:58:57 -0000	1.3
***************
*** 31,36 ****
      protected Plugin createPlugin(MetadataProvider metadataProvider, WriterMapper writerMapper) {
          StrutsTilesPlugin plugin = (StrutsTilesPlugin) super.createPlugin(metadataProvider, writerMapper);
!         URL completeDirURL = getResourceRelativeToThisPackage("complete/merge");
!         plugin.setMergedir(new File(completeDirURL.getPath()));
          return plugin;
      }
--- 31,35 ----
      protected Plugin createPlugin(MetadataProvider metadataProvider, WriterMapper writerMapper) {
          StrutsTilesPlugin plugin = (StrutsTilesPlugin) super.createPlugin(metadataProvider, writerMapper);
!         plugin.setMergedir("/org/xdoclet/plugin/struts/complete/merge");
          return plugin;
      }

[xdoclet-plugins-commits] xdoclet-plugins/plugin-web pom.xml, 1.3, 1.4

[Konstantin P. <ko...@us...>]

Update of /cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-web
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv9889/plugin-web

Modified Files:
	pom.xml 
Log Message:
reworked jelly merge, moved taglib from web plugin to generama to provide standard 
merge capabilities


Index: pom.xml
===================================================================
RCS file: /cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-web/pom.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** pom.xml	16 Sep 2006 15:09:10 -0000	1.3
--- pom.xml	24 Sep 2006 11:58:57 -0000	1.4
***************
*** 38,41 ****
--- 38,46 ----
              <version>2.0</version>
          </dependency>
+         <dependency>
+             <groupId>commons-jelly</groupId>
+             <artifactId>commons-jelly-tags-define</artifactId>
+             <version>1.0</version>
+         </dependency>
  
      </dependencies>

[xdoclet-plugins-commits] xdoclet-plugins/taglib pom.xml,1.5,1.6

[Konstantin P. <ko...@us...>]

Update of /cvsroot/xdoclet-plugins/xdoclet-plugins/taglib
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv9889/taglib

Modified Files:
	pom.xml 
Log Message:
reworked jelly merge, moved taglib from web plugin to generama to provide standard 
merge capabilities


Index: pom.xml
===================================================================
RCS file: /cvsroot/xdoclet-plugins/xdoclet-plugins/taglib/pom.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** pom.xml	6 Sep 2006 09:28:16 -0000	1.5
--- pom.xml	24 Sep 2006 11:58:57 -0000	1.6
***************
*** 27,31 ****
                      </executions>
                      <!--
!                         since maven plusgin does not specify dependencies
                          on concrete xdoclet-2 plugins, you must specify them 
                          explicitely. as well as dependencies which may be needed by 
--- 27,31 ----
                      </executions>
                      <!--
!                         since maven plugin does not specify dependencies
                          on concrete xdoclet-2 plugins, you must specify them 
                          explicitely. as well as dependencies which may be needed by 

[xdoclet-plugins-commits] xdoclet-plugins LICENSE.txt, 1.1, 1.2 pom.xml, 1.11, 1.12

[Konstantin P. <ko...@us...>]

Update of /cvsroot/xdoclet-plugins/xdoclet-plugins
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv9889

Modified Files:
	LICENSE.txt pom.xml 
Log Message:
reworked jelly merge, moved taglib from web plugin to generama to provide standard 
merge capabilities


Index: pom.xml
===================================================================
RCS file: /cvsroot/xdoclet-plugins/xdoclet-plugins/pom.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** pom.xml	30 Aug 2006 10:09:39 -0000	1.11
--- pom.xml	24 Sep 2006 11:58:56 -0000	1.12
***************
*** 183,188 ****
              <groupId>xdoclet</groupId>
              <artifactId>xdoclet</artifactId>
!             <version>2.0.5</version>
          </dependency>
          <dependency>
              <groupId>xerces</groupId>
--- 183,194 ----
              <groupId>xdoclet</groupId>
              <artifactId>xdoclet</artifactId>
!             <version>2.0.6-SNAPSHOT</version>
!         </dependency>
!         <dependency>
!             <groupId>commons-jelly</groupId>
!             <artifactId>commons-jelly-tags-xml</artifactId>
!             <version>20050823.222913</version>
          </dependency>
+         <!--
          <dependency>
              <groupId>xerces</groupId>
***************
*** 217,225 ****
          <dependency>
              <groupId>commons-jelly</groupId>
-             <artifactId>commons-jelly-tags-xml</artifactId>
-             <version>20050823.222913</version>
-         </dependency>
-         <dependency>
-             <groupId>commons-jelly</groupId>
              <artifactId>commons-jelly-tags-jsl</artifactId>
              <version>1.0</version>
--- 223,226 ----
***************
*** 250,253 ****
--- 251,256 ----
              <version>3.8.1</version>
          </dependency>
+                 -->
+ 
      </dependencies>
      <repositories>

Index: LICENSE.txt
===================================================================
RCS file: /cvsroot/xdoclet-plugins/xdoclet-plugins/LICENSE.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** LICENSE.txt	21 Sep 2003 13:59:24 -0000	1.1
--- LICENSE.txt	24 Sep 2006 11:58:56 -0000	1.2
***************
*** 1,3 ****
! Copyright (c) 2003, XDoclet Plugins Team
  All rights reserved.
  
--- 1,3 ----
! Copyright (c) 2003-2006, XDoclet Plugins Team
  All rights reserved.
  

[xdoclet-plugins-commits] xdoclet-plugins/plugin-castor/src/main/java/org/xdoclet/plugin/castor CastorMappingXMLPlugin.java, 1.5, 1.6 CastorMappingXMLPlugin.jelly, 1.3, 1.4

[Konstantin P. <ko...@us...>]

Update of /cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-castor/src/main/java/org/xdoclet/plugin/castor
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv9889/plugin-castor/src/main/java/org/xdoclet/plugin/castor

Modified Files:
	CastorMappingXMLPlugin.java CastorMappingXMLPlugin.jelly 
Log Message:
reworked jelly merge, moved taglib from web plugin to generama to provide standard 
merge capabilities


Index: CastorMappingXMLPlugin.java
===================================================================
RCS file: /cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-castor/src/main/java/org/xdoclet/plugin/castor/CastorMappingXMLPlugin.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** CastorMappingXMLPlugin.java	14 Mar 2006 10:42:14 -0000	1.5
--- CastorMappingXMLPlugin.java	24 Sep 2006 11:58:56 -0000	1.6
***************
*** 149,162 ****
      }
  
!     /**
!      * Add properties to Jelly context
!      *
!      * @param map The context map
!      */
!     protected void populateContextMap(Map map) {
!         super.populateContextMap(map);
!         map.put("mappingmergefile", CLASS_MAPPING_MERGE);
!     }
! 
      /**
       * Setter for an include file list separated by ','
--- 149,153 ----
      }
  
!  
      /**
       * Setter for an include file list separated by ','
***************
*** 238,249 ****
      }
  
-     /**
-      * Getter for mergerDir property
-      *
-      * @return The value of the property
-      */
-     public File getMergedir() {
-         return mergeDir;
-     }
  
      private void dumpClzListAndHierarchy(Collection metadata) {
--- 229,232 ----

Index: CastorMappingXMLPlugin.jelly
===================================================================
RCS file: /cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-castor/src/main/java/org/xdoclet/plugin/castor/CastorMappingXMLPlugin.jelly,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** CastorMappingXMLPlugin.jelly	23 Jun 2005 01:17:16 -0000	1.3
--- CastorMappingXMLPlugin.jelly	24 Sep 2006 11:58:56 -0000	1.4
***************
*** 1,4 ****
  <?xml version="1.0" encoding="UTF-8"?>
! <j:jelly xmlns:j="jelly:core" xmlns:x="jelly:xml" xmlns:jsl="jelly:jsl">
  	<x:doctype name="mapping" publicId="${plugin.publicId}" systemId="${plugin.systemId}" trim="true" />
  	<x:comment>${dontedit}</x:comment>
--- 1,5 ----
  <?xml version="1.0" encoding="UTF-8"?>
! <j:jelly xmlns:j="jelly:core" xmlns:x="jelly:xml" xmlns:jsl="jelly:jsl"
!     xmlns:g='jelly:org.generama.jelly.GeneramaTaglib'>
  	<x:doctype name="mapping" publicId="${plugin.publicId}" systemId="${plugin.systemId}" trim="true" />
  	<x:comment>${dontedit}</x:comment>
***************
*** 11,41 ****
  	    </j:forEach>
  		<j:import uri="org/xdoclet/plugin/castor/mappingxml/Classes.jelly" inherit="true"/>
! 		<!-- class-mappings.xml merge contents... START -->
! 		<j:if test="${plugin.getMergeFile(mappingmergefile).exists()}">
! 			<x:parse var="extraMappings" xml="${plugin.getMergeFile(mappingmergefile)}"/>
! 		</j:if>
! 		<jsl:stylesheet select="$extraMappings">
! 			<!-- Matches all nodes -->
! 			<jsl:template match="*" trim="false">
! 				<jsl:copy>
! 					<jsl:applyTemplates/>
! 				</jsl:copy>
! 			</jsl:template>
! 			<!--  Bypass top element; "/" select document node, parent of top node  -->
! 			<jsl:template match="/" trim="false">
! 				<jsl:applyTemplates select="child::*/child::*" />
! 			</jsl:template>
!             <!-- If we want to make constant top node name, we could use
!             <jsl:template match="/mapping" trim="false">
! 				<jsl:applyTemplates select="child::*" />
! 			</jsl:template>
! 			<jsl:template match="*" trim="false">
! 				<jsl:copy>
! 					<jsl:applyTemplates/>
! 				</jsl:copy>
! 			</jsl:template>            			
! 			-->
! 		</jsl:stylesheet>
! 		<!-- class-mappings.xml merge contents... END -->
  	</mapping>
  </j:jelly>
--- 12,20 ----
  	    </j:forEach>
  		<j:import uri="org/xdoclet/plugin/castor/mappingxml/Classes.jelly" inherit="true"/>
!         <g:merge file="class-mappings.xml">
!             to specify aditional class mappings put file "class-mappings.xml" into
!             merge directory.
!             Define root element as &lt;j:jelly  xmlns:j=&quot;jelly:core&quot;&gt;
!         </g:merge>
  	</mapping>
  </j:jelly>

[xdoclet-plugins-commits] xdoclet-plugins/plugin-struts/src/main/java/org/xdoclet/plugin/struts StrutsConfigXMLPlugin.java, 1.6, 1.7 StrutsTilesPlugin.java, 1.2, 1.3

[Konstantin P. <ko...@us...>]

Update of /cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-struts/src/main/java/org/xdoclet/plugin/struts
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv9889/plugin-struts/src/main/java/org/xdoclet/plugin/struts

Modified Files:
	StrutsConfigXMLPlugin.java StrutsTilesPlugin.java 
Log Message:
reworked jelly merge, moved taglib from web plugin to generama to provide standard 
merge capabilities


Index: StrutsTilesPlugin.java
===================================================================
RCS file: /cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-struts/src/main/java/org/xdoclet/plugin/struts/StrutsTilesPlugin.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** StrutsTilesPlugin.java	10 Aug 2005 15:21:10 -0000	1.2
--- StrutsTilesPlugin.java	24 Sep 2006 11:58:57 -0000	1.3
***************
*** 56,82 ****
      }
  
-     public File getMergedir() {
-         return mergedir;
-     }
- 
-     public void setMergedir(File mergefile) {
-         this.mergedir = mergefile;
-     }
- 
-     public File getMergeFile(String fileName) {
-         if (fileName != null && getMergedir() != null) {
-             if (getMergedir().isDirectory()) {
-                 File[] files = getMergedir().listFiles();
  
-                 for (int i = 0; i < files.length; i++) {
-                     if (fileName.trim().equals(files[i].getName())) {
-                         return files[i];
-                     }
-                 }
-             }
-         }
- 
-         return null;
-     }
  
      public void start() {
--- 56,60 ----

Index: StrutsConfigXMLPlugin.java
===================================================================
RCS file: /cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-struts/src/main/java/org/xdoclet/plugin/struts/StrutsConfigXMLPlugin.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** StrutsConfigXMLPlugin.java	10 Aug 2005 15:21:10 -0000	1.6
--- StrutsConfigXMLPlugin.java	24 Sep 2006 11:58:57 -0000	1.7
***************
*** 37,41 ****
      private Collection actionClasses;
      private Collection actionFormClasses;
-     private File mergeDir;
      private String fileName = "struts-config.xml";
      private String mappingType;
--- 37,40 ----
***************
*** 99,126 ****
      }
  
-     public File getMergedir() {
-         return mergeDir;
-     }
- 
-     public void setMergedir(File mergeDir) {
-         this.mergeDir = mergeDir;
-     }
- 
-     public File getMergeFile(String fileName) {
-         if (fileName != null && getMergedir() != null) {
-             if (getMergedir().isDirectory()) {
-                 File[] files = getMergedir().listFiles();
- 
-                 for (int i = 0; i < files.length; i++) {
-                     if (fileName.trim().equals(files[i].getName())) {
-                         return files[i];
-                     }
-                 }
-             }
-         }
- 
-         return null;
-     }
- 
      public void start() {
          this.setFilereplace(this.getFilename());
--- 98,101 ----

[xdoclet-plugins-commits] xdoclet-plugins/plugin-castor/src/test/java/org/xdoclet/plugin/castor MergeFileTest.java, 1.1, 1.2

[Konstantin P. <ko...@us...>]

Update of /cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-castor/src/test/java/org/xdoclet/plugin/castor
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv9889/plugin-castor/src/test/java/org/xdoclet/plugin/castor

Modified Files:
	MergeFileTest.java 
Log Message:
reworked jelly merge, moved taglib from web plugin to generama to provide standard 
merge capabilities


Index: MergeFileTest.java
===================================================================
RCS file: /cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-castor/src/test/java/org/xdoclet/plugin/castor/MergeFileTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MergeFileTest.java	22 Jun 2005 08:19:25 -0000	1.1
--- MergeFileTest.java	24 Sep 2006 11:58:56 -0000	1.2
***************
*** 33,38 ****
      protected Plugin createPlugin(MetadataProvider metadataProvider, WriterMapper writerMapper) {
          CastorMappingXMLPlugin retPlugin = (CastorMappingXMLPlugin) super.createPlugin(metadataProvider, writerMapper);
!         URL reader = getResourceRelativeToThisPackage("simple/merge");
!         retPlugin.setMergedir(new File(reader.getPath()));
          return retPlugin;
      }
--- 33,37 ----
      protected Plugin createPlugin(MetadataProvider metadataProvider, WriterMapper writerMapper) {
          CastorMappingXMLPlugin retPlugin = (CastorMappingXMLPlugin) super.createPlugin(metadataProvider, writerMapper);
!         retPlugin.setMergedir("/org/xdoclet/plugin/castor/simple/merge/");
          return retPlugin;
      }

[xdoclet-plugins-commits] xdoclet-plugins/plugin-web/src/test/java/org/xdoclet/testapp/web/mergedir - New directory

[Konstantin P. <ko...@us...>]

Update of /cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-web/src/test/java/org/xdoclet/testapp/web/mergedir
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv9861/src/test/java/org/xdoclet/testapp/web/mergedir

Log Message:
Directory /cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-web/src/test/java/org/xdoclet/testapp/web/mergedir added to the repository

[xdoclet-plugins-commits] xdoclet-plugins/plugin-web/src/test/java/org/xdoclet/plugin/web AbstractTaglibPluginTestCase.java, 1.2, 1.3

[Konstantin P. <ko...@us...>]

Update of /cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-web/src/test/java/org/xdoclet/plugin/web
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv9417/src/test/java/org/xdoclet/plugin/web

Modified Files:
	AbstractTaglibPluginTestCase.java 
Log Message:
fix for XDP-184 ( Thanks Ulrich ) 
test coverage for this improvement m, as well reworking 
of test classes to get rid of dependency to testapp-web


Index: AbstractTaglibPluginTestCase.java
===================================================================
RCS file: /cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-web/src/test/java/org/xdoclet/plugin/web/AbstractTaglibPluginTestCase.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** AbstractTaglibPluginTestCase.java	29 Jun 2006 19:36:04 -0000	1.2
--- AbstractTaglibPluginTestCase.java	16 Sep 2006 15:09:11 -0000	1.3
***************
*** 29,34 ****
  
      protected MetadataProvider createMetadataProvider() throws IOException {
!         URL basedir = getClass().getClassLoader().getResource(".");
!         return new QDoxMetadataProvider(new File(basedir.getPath(), "../../../testapp-web/src/main/java/org/xdoclet/testapp/web"));
      }
  
--- 29,34 ----
  
      protected MetadataProvider createMetadataProvider() throws IOException {
!        	URL reader = getClass().getResource("/org/xdoclet/testapp/web");
!         return new QDoxMetadataProvider(new File(reader.getPath()));
      }
  

[xdoclet-plugins-commits] xdoclet-plugins/plugin-web/src/main/java/org/xdoclet/plugin/web TaglibPlugin.java, 1.20, 1.21

[Konstantin P. <ko...@us...>]

Update of /cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-web/src/main/java/org/xdoclet/plugin/web
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv9417/src/main/java/org/xdoclet/plugin/web

Modified Files:
	TaglibPlugin.java 
Log Message:
fix for XDP-184 ( Thanks Ulrich ) 
test coverage for this improvement m, as well reworking 
of test classes to get rid of dependency to testapp-web


Index: TaglibPlugin.java
===================================================================
RCS file: /cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-web/src/main/java/org/xdoclet/plugin/web/TaglibPlugin.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** TaglibPlugin.java	15 Jan 2006 18:22:58 -0000	1.20
--- TaglibPlugin.java	16 Sep 2006 15:09:11 -0000	1.21
***************
*** 118,127 ****
      }
  
!     /**
!      * @return a collection of JavaMethod from a  given class,
!      * which have a jsp.attribute tag.
       */
      public Collection getAttributeMethods(JavaClass clazz) {
          Collection attributeMethods = new ArrayList();
          JavaMethod[] meths = clazz.getMethods();
          for (int i = 0; i < meths.length; i++) {
--- 118,141 ----
      }
  
!      /**
!      * This method returns a collection of JavaMethod from a given class, which have a jsp.attribute tag recursively
!      * up to java.kang.Object.
!      * @param clazz the java class to inspect.
!      * @param attributeMethods a collection of attributes methods
!      * @return a collection of JavaMethod from a given class, which have a jsp.attribute tag.
       */
      public Collection getAttributeMethods(JavaClass clazz) {
          Collection attributeMethods = new ArrayList();
+         getAllAttributeMethods(clazz, attributeMethods);
+         return attributeMethods;
+     }
+ 
+     /**
+      * This method returns a collection of JavaMethod from a given class, which have a jsp.attribute tag.
+      * @param clazz the java class to inspect.
+      * @param attributeMethods a collection of attributes methods
+      * @return a collection of JavaMethod from a given class, which have a jsp.attribute tag.
+      */
+     private Collection getAllAttributeMethods(JavaClass clazz, Collection attributeMethods) {
          JavaMethod[] meths = clazz.getMethods();
          for (int i = 0; i < meths.length; i++) {
***************
*** 131,137 ****
              }
          }
          return attributeMethods;
      }
! 
      public WebUtils getWebUtils() throws ClassNotFoundException {
          String servletVersion = (String) servletVersions.get(jspversion);
--- 145,154 ----
              }
          }
+         if (!(clazz.getSuperClass().getJavaClass().getName().equals("Object"))) {
+             getAllAttributeMethods(clazz.getSuperClass().getJavaClass(), attributeMethods);
+         }
          return attributeMethods;
      }
!     
      public WebUtils getWebUtils() throws ClassNotFoundException {
          String servletVersion = (String) servletVersions.get(jspversion);

[xdoclet-plugins-commits] xdoclet-plugins/plugin-web/src/test/java/org/xdoclet/testapp/web/expected taglib-1_2.tld, 1.2, 1.3 taglib-2_0.tld, 1.2, 1.3

[Konstantin P. <ko...@us...>]

Update of /cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-web/src/test/java/org/xdoclet/testapp/web/expected
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv9417/src/test/java/org/xdoclet/testapp/web/expected

Modified Files:
	taglib-1_2.tld taglib-2_0.tld 
Log Message:
fix for XDP-184 ( Thanks Ulrich ) 
test coverage for this improvement m, as well reworking 
of test classes to get rid of dependency to testapp-web


Index: taglib-1_2.tld
===================================================================
RCS file: /cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-web/src/test/java/org/xdoclet/testapp/web/expected/taglib-1_2.tld,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** taglib-1_2.tld	29 Jun 2006 19:36:04 -0000	1.2
--- taglib-1_2.tld	16 Sep 2006 15:09:13 -0000	1.3
***************
*** 1,5 ****
  <?xml version="1.0" encoding="UTF-8"?>
  <!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN" "http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd">
- 
  <taglib>
      <tlib-version>1.0</tlib-version>
--- 1,4 ----
***************
*** 9,19 ****
  
      <listener>
!        <listener-class>org.xdoclet.testapp.web.TestSessionListener</listener-class>
      </listener>
      <listener>
!        <listener-class>org.xdoclet.testapp.web.TestServletContextListener</listener-class>
      </listener>
      <listener>
!        <listener-class>org.xdoclet.testapp.web.SimpleListener</listener-class>
      </listener>
  
--- 8,18 ----
  
      <listener>
!         <listener-class>org.xdoclet.testapp.web.TestSessionListener</listener-class>
      </listener>
      <listener>
!         <listener-class>org.xdoclet.testapp.web.TestServletContextListener</listener-class>
      </listener>
      <listener>
!         <listener-class>org.xdoclet.testapp.web.SimpleListener</listener-class>
      </listener>
  
***************
*** 46,50 ****
              <required>false</required>
              <rtexprvalue>false</rtexprvalue>
!             <type>java.lang.Integer</type>           
          </attribute>
  
--- 45,54 ----
              <required>false</required>
              <rtexprvalue>false</rtexprvalue>
!             <type>java.lang.Integer</type>
!         </attribute>
!         <attribute>
!             <name>blam</name>
!             <required>false</required>
!             <rtexprvalue>false</rtexprvalue>
          </attribute>
  

Index: taglib-2_0.tld
===================================================================
RCS file: /cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-web/src/test/java/org/xdoclet/testapp/web/expected/taglib-2_0.tld,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** taglib-2_0.tld	29 Jun 2006 19:36:04 -0000	1.2
--- taglib-2_0.tld	16 Sep 2006 15:09:13 -0000	1.3
***************
*** 2,24 ****
  
  <taglib version="2.0"
!     xmlns="http://java.sun.com/xml/ns/j2ee"
!     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
!     xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd">
  
      <tlib-version>1.0</tlib-version>
      <short-name>taglib</short-name>
      <uri>http://someDummyUri</uri>
!     
      <listener>
!        <listener-class>org.xdoclet.testapp.web.TestSessionListener</listener-class>
      </listener>
      <listener>
!        <listener-class>org.xdoclet.testapp.web.TestServletContextListener</listener-class>
      </listener>
      <listener>
!        <listener-class>org.xdoclet.testapp.web.DummyServletRequestListener</listener-class>
      </listener>
      <listener>
!        <listener-class>org.xdoclet.testapp.web.SimpleListener</listener-class>
      </listener>
  
--- 2,24 ----
  
  <taglib version="2.0"
!         xmlns="http://java.sun.com/xml/ns/j2ee"
!         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
!         xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd">
  
      <tlib-version>1.0</tlib-version>
      <short-name>taglib</short-name>
      <uri>http://someDummyUri</uri>
! 
      <listener>
!         <listener-class>org.xdoclet.testapp.web.TestSessionListener</listener-class>
      </listener>
      <listener>
!         <listener-class>org.xdoclet.testapp.web.TestServletContextListener</listener-class>
      </listener>
      <listener>
!         <listener-class>org.xdoclet.testapp.web.DummyServletRequestListener</listener-class>
      </listener>
      <listener>
!         <listener-class>org.xdoclet.testapp.web.SimpleListener</listener-class>
      </listener>
  
***************
*** 52,56 ****
              <rtexprvalue>false</rtexprvalue>
              <type>java.lang.Integer</type>
!        </attribute>
      </tag>
  
--- 52,61 ----
              <rtexprvalue>false</rtexprvalue>
              <type>java.lang.Integer</type>
!         </attribute>
!         <attribute>
!             <name>blam</name>
!             <required>false</required>
!             <rtexprvalue>false</rtexprvalue>
!         </attribute>
      </tag>
  

[xdoclet-plugins-commits] xdoclet-plugins/plugin-web/src/test/java/org/xdoclet/testapp/web AbstractBaseTag.java, NONE, 1.1 AbstractFilter.java, NONE, 1.1 DummyServletRequestListener.java, NONE, 1.1 FakeFilter.java, NONE, 1.1 FakeListener.java, NONE, 1.1 FakeServlet.java, NONE, 1.1 SecondFilter.java, NONE, 1.1 SimpleListener.java, NONE, 1.1 SimpleTag.java, NONE, 1.1 SimpleVelocityServlet.java, NONE, 1.1 SuperFilter.java, NONE, 1.1 TaglessFilter.java, NONE, 1.1 TaglessListener.java, NONE, 1.1 TestServletContextListener.java, NONE, 1.1 TestSessionListener.java, NONE, 1.1 ThirdFilter.java, NONE, 1.1 TimerFilter.java, NONE, 1.1

[Konstantin P. <ko...@us...>]

Update of /cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-web/src/test/java/org/xdoclet/testapp/web
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv9417/src/test/java/org/xdoclet/testapp/web

Added Files:
	AbstractBaseTag.java AbstractFilter.java 
	DummyServletRequestListener.java FakeFilter.java 
	FakeListener.java FakeServlet.java SecondFilter.java 
	SimpleListener.java SimpleTag.java SimpleVelocityServlet.java 
	SuperFilter.java TaglessFilter.java TaglessListener.java 
	TestServletContextListener.java TestSessionListener.java 
	ThirdFilter.java TimerFilter.java 
Log Message:
fix for XDP-184 ( Thanks Ulrich ) 
test coverage for this improvement m, as well reworking 
of test classes to get rid of dependency to testapp-web


--- NEW FILE: AbstractBaseTag.java ---
package org.xdoclet.testapp.web;

import javax.servlet.jsp.tagext.TagSupport;

public class AbstractBaseTag extends TagSupport {
	String blam;

	/**
	 * @jsp.attribute
	 * @return
	 */
	public String getBlam() {
		return blam;
	}

	public void setBlam(String blam) {
		this.blam = blam;
	}
	
}

--- NEW FILE: ThirdFilter.java ---
package org.xdoclet.testapp.web;

import javax.servlet.Filter;
import javax.servlet.FilterChain;
import javax.servlet.FilterConfig;
import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import java.io.IOException;

/**
 * A third filter class, to test order of the filters.
 * This one has no name nor order attribute, it will be sorted last.
 *
 * @web.filter
 *     name="ThirdFilter"
 *     display-name="Third Filter"
 *     description="My 3rd filter is really cool"
 *
 * @web.filter-mapping
 *     servlet-name="/third"
 *
 * @author     <a href="mailto:gre...@fr...">Grégory Joseph</a>
 * @author     $Author: ko5tik $ (last edit)
 * @version    $Revision: 1.1 $
 */
public class ThirdFilter implements Filter {
    public void destroy() {
    }

    public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException {
    }

    public void init(FilterConfig filterConfig) throws ServletException {
    }


}

--- NEW FILE: SimpleVelocityServlet.java ---
package org.xdoclet.testapp.web;

import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpServlet;
import java.io.IOException;

/**
 * Simple Velocity Servlet. This servlet illustrates that your servlet can be any
 * subclass of HttpServlet, as long as all the classes
 * in the hierarchy (and any classes they depend on) are on the classpath.
 *
 * @web.servlet
 *     display-name="Simple Velocity Servlet"
 *     load-on-startup="1"
 *     run-as="TestRole"
 *     name="SimpleVelocityServlet"
 *     description="This is a description for the simple Velocity servlet"
 *
 * @web.servlet-init-param
 *     name="param1"
 *     value="value1"
 *     description="This is a description for the 1st init-param of the simple Velocity servlet"
 *
 * @web.servlet-init-param
 *     name="param2"
 *     value="value2"
 *
 * @web.servlet-mapping
 *     url-pattern="/simple/*"
 *
 * @web.resource-ref
 *     name="jdbc/EmployeeAppDB"
 *     auth="Container"
 *     description="Test resource reference"
 *     type="javax.sql.DataSource"
 *     scope="Shareable"
 *     jndi-name="test jndi??"
 *
 * @web.resource-env-ref
 *     name="jms/StockQueue"
 *     type="javax.jms.Queue"
 *     description="Test resource env ref"
 *
 * @web.env-entry
 *     name="TestEnvName"
 *     type="java.lang.String"
 *     value="testString"
 *     description="a test string for env entry!?"
 *
 * @web.security-role
 *     role-name="TestRole"
 *     description="A description for the test role"
 *
 * @web.security-role
 *     role-name="AnotherRole"
 *
 * @web.security-role-ref
 *     role-name="LinkedTestRole"
 *     role-link="TestRole"
 *     description="A description for the test link role"
 *
 * @web.security-role-ref
 *     role-name="YetAnotherRole"
 *     role-link="AnotherRole"
 *
 * @web.ejb-ref
 *     name="Account"
 *     description="A test reference to the Account EJB"
 *     home="test.interfaces.AccountHome"
 *     link="Account"
 *     remote="test.interfaces.Account"
 *     type="Entity"
 *
 * @web.ejb-local-ref
 *     name="Dummy"
 *     description="A test ref to the local Dummy Session Bean"
 *     home="test.interfaces.DummyLocalHome"
 *     link="Dummy"
 *     local="test.interfaces.DummyLocal"
 *     type="Session"
 * 
 * @jboss.resource-ref
 *     jndi-name="queue/A"
 *     res-ref-name="Queue"
 *
 * @jboss.ejb-ref-jndi
 *     jndi-name="ejb/bank/Account"
 *     ref-name="Account"
 *
 */
public class SimpleVelocityServlet extends HttpServlet {

    /**
     * Called by the server (via the service method) to allow a servlet to handle a POST request.
     * The HTTP POST method allows the client to send data of unlimited length to the Web server
     * a single time and is useful when posting information such as credit card numbers.
     */
    public void doPost(HttpServletRequest request, HttpServletResponse response)
            throws IOException, ServletException {
        // just print Hi!
        response.getWriter().println("Hi!");
    }
}
--- NEW FILE: SimpleTag.java ---
package org.xdoclet.testapp.web;

import javax.servlet.jsp.JspTagException;
import javax.servlet.jsp.JspWriter;
import javax.servlet.jsp.tagext.TagSupport;
import java.io.IOException;
import java.util.Date;

/**
 * Simple JSP tag.
 *
 * @jsp.tag name="simple" 
 *          display-name="SimpleTag" 
 *          body-content="empty" 
 *          description="Simple JSP tag."
 * @jsp.variable name-given="date"
 *               class="java.util.Date"
 *               declare="true"
 *               scope="AT_BEGIN"
 * @jsp.variable name-given="var"
 */
public class SimpleTag extends AbstractBaseTag {
    private String action = null;
    private Integer thingy = new Integer(-1);

    /**
     * Sets the action attribute. This is included in the tld file.
     *
     * TODO : check if the @jsp could be on get method or how it was handled in xdoclet1
     *
     * @jsp.attribute
     *     description="The action attribute defines the dummy action to take with this dummy tag."
     *     required="true"
     *     rtexprvalue="true"
     */
    public void setAction(String action) {
        this.action = action;
    }

    /**
     * Just another dummy example that will use default values
     * @jsp.attribute
     *     type=java.lang.Integer
     */
    public void setThingy(Integer thingy) {
        this.thingy = thingy;
    }

    /**
     * Process the start tag for this instance.
     */
    public int doStartTag() throws JspTagException {
        try {
            JspWriter out = pageContext.getOut();
            out.print("Simple tag started with action: " + action);
            pageContext.setAttribute("date", new Date());
            pageContext.setAttribute("var", "<" + thingy + ">");
        } catch (IOException ex) {
            throw new JspTagException("Could not write tag content: " + ex.getMessage());
        }

        return EVAL_BODY_INCLUDE;
    }

    /**
     * Process the end tag. This method will be called on all Tag objects.
     */
    public int doEndTag() throws JspTagException {
        try {
            JspWriter out = pageContext.getOut();
            out.print("Simple tag ended.");
        } catch (IOException ex) {
            throw new JspTagException("Could not write at end tag: " + ex.getMessage());
        }

        return EVAL_PAGE;
    }
}
--- NEW FILE: AbstractFilter.java ---
package org.xdoclet.testapp.web;

import javax.servlet.Filter;
import javax.servlet.FilterConfig;
import javax.servlet.ServletException;

/**
 * Just like the SuperFilter, we don't want an abstract filter to be in the
 * generated web.xml
 * (This one doesn't implemented the doFilter method.
 *
 * @web.filter
 *     display-name="Abstract Filter"
 *     name="AbstractFilter"
 *
 * @author     <a href="mailto:gre...@fr...">Grégory Joseph</a>
 * @author     $Author: ko5tik $ (last edit)
 * @version    $Revision: 1.1 $
 */
public abstract class AbstractFilter implements Filter {
    public void destroy() {
        // do some stuff
    }

    public void init(FilterConfig filterConfig) throws ServletException {
        // do some other stuff
    }
}

--- NEW FILE: SecondFilter.java ---
package org.xdoclet.testapp.web;

import javax.servlet.Filter;
import javax.servlet.FilterChain;
import javax.servlet.FilterConfig;
import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import java.io.IOException;

/**
 * A second filter class, to test order of the filters.
 * This one has no order parameter, it will be sorted with it's name attribute.
 *
 * @web.filter
 *     display-name="Second Filter"
 *     name="SecondFilter"
 *     order="2"
 *     icon="icon2.gif"
 *
 * @web.filter-mapping
 *     url-pattern="/second"
 *
 * @web.filter-mapping
 *     url-pattern="/other/mapping"
 *
 * @author     <a href="mailto:gre...@fr...">Grégory Joseph</a>
 * @author     $Author: ko5tik $ (last edit)
 * @version    $Revision: 1.1 $
 */
public class SecondFilter implements Filter {
    public void destroy() {
    }

    public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException {
    }

    public void init(FilterConfig filterConfig) throws ServletException {
    }


}

--- NEW FILE: SuperFilter.java ---
package org.xdoclet.testapp.web;

import javax.servlet.Filter;

/**
 * An interface extending the Filter interface.
 * This is probably most useless, but anyway, just in case someone puts web.filter
 * tags in an interface, we wouldn't we it to appear in the generated web.xml
 *
 * @web.filter
 *     display-name="Super Filter"
 *     name="SuperFilter"
 *
 * @author     <a href="mailto:gre...@fr...">Grégory Joseph</a>
 * @author     $Author: ko5tik $ (last edit)
 * @version    $Revision: 1.1 $
 */
public interface SuperFilter extends Filter {

}

--- NEW FILE: FakeServlet.java ---
package org.xdoclet.testapp.web;

/**
 * This fake servlet serves as testcase to make sure the WebPlugin doesn't generate anything
 * if a class containing @web tags is not an implementation of Servlet
 *
 * @web.servlet
 *     name="FakeServlet"
 *     display-name="Fake Servlet"
 *
 * @author     <a href="mailto:gre...@fr...">Grégory Joseph</a>
 * @author     $Author: ko5tik $ (last edit)
 * @version    $Revision: 1.1 $
 */
public class FakeServlet {


}

--- NEW FILE: TestServletContextListener.java ---
package org.xdoclet.testapp.web;

import javax.servlet.ServletContextAttributeEvent;
import javax.servlet.ServletContextAttributeListener;
import javax.servlet.ServletContextEvent;
import javax.servlet.ServletContextListener;

/**
 * Implements all the 2.3 listeners not related to sessions.
 *
 * TODO: implement ServletRequestAttributeListener & ServletRequestListener when we get servlet-2.4.jar
 *
 * @web.listener
 *      order="2"
 *
 * @author     <a href="mailto:gre...@fr...">Grégory Joseph</a>
 * @author     $Author: ko5tik $ (last edit)
 * @version    $Revision: 1.1 $
 */
public class TestServletContextListener implements ServletContextAttributeListener,
        ServletContextListener {

    public void attributeAdded(ServletContextAttributeEvent event) {
    }

    public void attributeRemoved(ServletContextAttributeEvent event) {
    }

    public void attributeReplaced(ServletContextAttributeEvent event) {
    }

    public void contextDestroyed(ServletContextEvent event) {
    }

    public void contextInitialized(ServletContextEvent event) {
    }

}

--- NEW FILE: TaglessFilter.java ---
package org.xdoclet.testapp.web;

import javax.servlet.Filter;
import javax.servlet.FilterChain;
import javax.servlet.FilterConfig;
import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import java.io.IOException;

/**
 * Let's make sure nothing is generated for filters that are not tagged.
 *
 * @author     <a href="mailto:gre...@fr...">Grégory Joseph</a>
 * @author     $Author: ko5tik $ (last edit)
 * @version    $Revision: 1.1 $
 */
public class TaglessFilter implements Filter {

    public void destroy() {

    }

    public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain)
            throws IOException, ServletException {
    }

    public void init(FilterConfig filterConfig)
            throws ServletException {
    }


}

--- NEW FILE: DummyServletRequestListener.java ---
package org.xdoclet.testapp.web;

import javax.servlet.ServletRequestEvent;
import javax.servlet.ServletRequestListener;

/**
 * @web.listener
 *
 * @author greg
 * @author $Author: ko5tik $ (last edit)
 * @version $Revision: 1.1 $ 
 */
public class DummyServletRequestListener implements ServletRequestListener {
    public void requestInitialized(ServletRequestEvent servletRequestEvent) {
        System.out.println("requestInitialized");
    }

    public void requestDestroyed(ServletRequestEvent servletRequestEvent) {
        System.out.println("requestDestroyed");
    }
}

--- NEW FILE: FakeFilter.java ---
package org.xdoclet.testapp.web;

/**
 *
 * Let's make sure nothing is generated for classes that have filter tags but
 * are not implementations of javax.servlet.filter
 *
 * @web.filter
 *     display-name="Fake Filter"
 *     name="FakeFilter"
 *
 * @author     <a href="mailto:gre...@fr...">Grégory Joseph</a>
 * @author     $Author: ko5tik $ (last edit)
 * @version    $Revision: 1.1 $
 */
public class FakeFilter {
    public void someDummyMethod() {
        System.out.println("oh no!");
    }

}

--- NEW FILE: FakeListener.java ---
package org.xdoclet.testapp.web;

/**
 * A fake class that has a web.listener tag but is not actually implementing
 * the Filter interface
 *
 * @web.listener
 *
 * @author     <a href="mailto:gre...@fr...">Grégory Joseph</a>
 * @author     $Author: ko5tik $ (last edit)
 * @version    $Revision: 1.1 $
 */
public class FakeListener {
}

--- NEW FILE: SimpleListener.java ---
package org.xdoclet.testapp.web;

import javax.servlet.ServletContextEvent;
import javax.servlet.ServletContextListener;
import javax.servlet.http.HttpSession;
import javax.servlet.http.HttpSessionEvent;
import javax.servlet.http.HttpSessionListener;

/**
 * Simple context listener, prints changes to the console.
 *
 * <p>A ServletContextListener recieves notifications about changes to the servlet context of the web
 * application they are part of. NOTE: this is a Servlet 2.3 only feature.</p>
 *
 * <p>A HttpSessionListener receives notifications about changes to the list of active sessions in
 * a web application. NOTE: this is a Servlet 2.3 only feature.</p>
 *
 * @web.listener
 *
 * @author  <a href="mailto:you...@yo...">you...@yo...</a>
 */
public final class SimpleListener implements ServletContextListener, HttpSessionListener {
    /** Constructs a new SimpleListener. */
    public SimpleListener() {
    }

    /** Notification that the web application is ready to process requests. */
    public void contextInitialized(ServletContextEvent sce) {
        sce.getServletContext().log("The servlet context has been initialized, the web application is ready to process requests.");
    }

    /** Notification that the servlet context is about to be shut down. */
    public void contextDestroyed(ServletContextEvent sce) {
        sce.getServletContext().log("The servlet context is about to be shut down.");
    }

    /** Notification that a session was created. */
    public void sessionCreated(HttpSessionEvent hse) {
        HttpSession session = hse.getSession();
//        session.getServletContext().log("A session was created, id: " + session.getId());
    }

    /** Notification that a session was invalidated. */
    public void sessionDestroyed(HttpSessionEvent hse) {
        HttpSession session = hse.getSession();
//        session.getServletContext().log("A session was invalidated, id: " + session.getId());
    }
}
--- NEW FILE: TimerFilter.java ---
package org.xdoclet.testapp.web;

import javax.servlet.Filter;
import javax.servlet.FilterChain;
import javax.servlet.FilterConfig;
import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
import java.io.IOException;

/**
 * Timer filter that logs the request processing time in milliseconds to the console.
 *
 * <p>A filter is an object that performs filtering tasks on either the request to a resource
 * (a servlet or static content), or on the response from a resource, or both.</p>
 *
 * <p>For more information on filters, check the <a href="http://java.sun.com/products/servlet/2.3/javadoc/">javadoc</a>
 * or read the <a href="http://www.javaworld.com/javaworld/jw-06-2001/jw-0622-filters_p.html">Filter code with Servlet 2.3 model</a>
 * article at <a href="http://www.javaworld.com">JavaWorld</a>.</p>
 *
 * @web.filter
 *     display-name="Timer Filter"
 *     name="TimerFilter"
 *     order="1"
 *     icon="iconOne.gif"
 *     description="The description of the TimerFilter"
 *
 * @web.filter-init-param
 *     name="param1"
 *     value="value1"
 *
 * @web.filter-init-param
 *     name="param2"
 *     value="value2"
 *     description="the second parameter to the Timer Filter"
 *
 * @web.filter-mapping
 *     url-pattern="*.xml"
 *
 * @author  <a href="mailto:you...@yo...">you...@yo...</a>
 */
public class TimerFilter implements Filter {
    /**
     * A filter configuration object used by a servlet container used to pass information to
     * a filter during initialization. This is set in the <code>init(FilterConfig config)</code> method.
     */
    private FilterConfig config = null;

    /** Called by the web container to indicate to a filter that it is being placed into service. */
    public void init(FilterConfig config) throws ServletException {
        this.config = config;
    }

    /** Called by the web container to indicate to a filter that it is being taken out of service. */
    public void destroy() {
        config = null;
    }

    /**
     * Logs the time it took in milliseconds to process the request.
     *
     * <p>The <code>doFilter</code> method of the Filter is called by the container each time a
     * request/response pair is passed through the chain due to a client request for a
     * resource at the end of the chain.
     */
    public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain)
            throws IOException, ServletException {
        long before = System.currentTimeMillis();

        // pass the request and response to the filter chain
        chain.doFilter(req, res);

        long after = System.currentTimeMillis();

        String name = "";
        if (req instanceof HttpServletRequest)
            name = ((HttpServletRequest) req).getRequestURI();

        // log the difference in time, check the console for output
        config.getServletContext().log(name + ": " + (after - before) + "ms");
    }
}
--- NEW FILE: TestSessionListener.java ---
package org.xdoclet.testapp.web;

import javax.servlet.http.HttpSessionActivationListener;
import javax.servlet.http.HttpSessionAttributeListener;
import javax.servlet.http.HttpSessionBindingEvent;
import javax.servlet.http.HttpSessionBindingListener;
import javax.servlet.http.HttpSessionEvent;
import javax.servlet.http.HttpSessionListener;

/**
 * Implements all the servlet 2.3 listeners related to sessions.
 *
 * @web.listener
 *          order=1
 *
 * @author     <a href="mailto:gre...@fr...">Grégory Joseph</a>
 * @author     $Author: ko5tik $ (last edit)
 * @version    $Revision: 1.1 $
 */
public class TestSessionListener implements HttpSessionActivationListener,
        HttpSessionAttributeListener,
        HttpSessionBindingListener,
        HttpSessionListener {
    public void sessionDidActivate(HttpSessionEvent event) {
    }

    public void sessionWillPassivate(HttpSessionEvent event) {
    }

    public void attributeAdded(HttpSessionBindingEvent event) {
    }

    public void attributeRemoved(HttpSessionBindingEvent event) {
    }

    public void attributeReplaced(HttpSessionBindingEvent event) {
    }

    public void valueBound(HttpSessionBindingEvent event) {
    }

    public void valueUnbound(HttpSessionBindingEvent event) {
    }

    public void sessionCreated(HttpSessionEvent event) {
    }

    public void sessionDestroyed(HttpSessionEvent event) {
    }


}

--- NEW FILE: TaglessListener.java ---
package org.xdoclet.testapp.web;

import javax.servlet.ServletContextEvent;
import javax.servlet.ServletContextListener;

/**
 * A listener that actually implements ServletContextListener
 * but has no web.listener tag. Should appear in the generated web.xml
 *
 * @author     <a href="mailto:gre...@fr...">Grégory Joseph</a>
 * @author     $Author: ko5tik $ (last edit)
 * @version    $Revision: 1.1 $
 */
public class TaglessListener implements ServletContextListener {
    public void contextDestroyed(ServletContextEvent event) {
    }

    public void contextInitialized(ServletContextEvent event) {
    }
}

[xdoclet-plugins-commits] xdoclet-plugins/plugin-web pom.xml, 1.2, 1.3

[Konstantin P. <ko...@us...>]

Update of /cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-web
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv9417

Modified Files:
	pom.xml 
Log Message:
fix for XDP-184 ( Thanks Ulrich ) 
test coverage for this improvement m, as well reworking 
of test classes to get rid of dependency to testapp-web


Index: pom.xml
===================================================================
RCS file: /cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-web/pom.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** pom.xml	25 Aug 2006 16:13:58 -0000	1.2
--- pom.xml	16 Sep 2006 15:09:10 -0000	1.3
***************
*** 10,13 ****
--- 10,20 ----
      <artifactId>xdoclet-plugin-web</artifactId>
      <name>xdoclet-plugin-web</name>
+     <contributors>
+         <contributor>
+             <name>
+                Ulrich Vachon
+             </name>
+         </contributor>
+     </contributors>
      <build>
          <plugins>
***************
*** 19,28 ****
      </build>
      <dependencies>
          <dependency>
              <groupId>javax.servlet</groupId>
              <artifactId>servlet-api</artifactId>
!             <version>2.3</version>
!             <scope>test</scope>
          </dependency>
      </dependencies>
      <properties>
--- 26,42 ----
      </build>
      <dependencies>
+ 
          <dependency>
              <groupId>javax.servlet</groupId>
              <artifactId>servlet-api</artifactId>
!             <version>2.4</version>
          </dependency>
+ 
+         <dependency>
+             <groupId>javax.servlet</groupId>
+             <artifactId>jsp-api</artifactId>
+             <version>2.0</version>
+         </dependency>
+ 
      </dependencies>
      <properties>

[xdoclet-plugins-commits] xdoclet-plugins/plugin-hibernate pom.xml, 1.4, 1.5

[Konstantin P. <ko...@us...>]

Update of /cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-hibernate
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv1889

Modified Files:
	pom.xml 
Log Message:
fix for XDP-192


Index: pom.xml
===================================================================
RCS file: /cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-hibernate/pom.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** pom.xml	6 Sep 2006 09:28:16 -0000	1.4
--- pom.xml	10 Sep 2006 11:02:05 -0000	1.5
***************
*** 17,20 ****
--- 17,30 ----
              </name>
          </contributor>
+         <contributor>
+             <name>
+                Carsten Madsen
+             </name>
+         </contributor>
+         <contributor>
+             <name>
+                Daniel Mitterdorfer
+             </name>
+         </contributor>
      </contributors>
  

[xdoclet-plugins-commits] xdoclet-plugins/plugin-hibernate/src/main/java/org/xdoclet/plugin/hibernate SqlOperations.jelly, 1.1, 1.2

[Konstantin P. <ko...@us...>]

Update of /cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-hibernate/src/main/java/org/xdoclet/plugin/hibernate
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv1889/src/main/java/org/xdoclet/plugin/hibernate

Modified Files:
	SqlOperations.jelly 
Log Message:
fix for XDP-192


Index: SqlOperations.jelly
===================================================================
RCS file: /cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-hibernate/src/main/java/org/xdoclet/plugin/hibernate/SqlOperations.jelly,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SqlOperations.jelly	26 Apr 2005 07:00:08 -0000	1.1
--- SqlOperations.jelly	10 Sep 2006 11:02:05 -0000	1.2
***************
*** 8,12 ****
      </j:if>
      <!-- process sql-update -->
!     <j:set var="sqlInsertTag" value="${sqlOperationEntity.getTagByName('hibernate.sql-update')}"/>
      <j:if test="${sqlUpdateTag != null}">
          <sql-update callable="${sqlUpdateTag.callable}">
--- 8,12 ----
      </j:if>
      <!-- process sql-update -->
!     <j:set var="sqlUpdateTag" value="${sqlOperationEntity.getTagByName('hibernate.sql-update')}"/>
      <j:if test="${sqlUpdateTag != null}">
          <sql-update callable="${sqlUpdateTag.callable}">

[xdoclet-plugins-commits] xdoclet-plugins/plugin-hibernate/src/test/java/org/xdoclet/plugin/hibernate FullHibernateConfigTestCase.java, 1.5, 1.6

[Konstantin P. <ko...@us...>]

Update of /cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-hibernate/src/test/java/org/xdoclet/plugin/hibernate
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv26483/src/test/java/org/xdoclet/plugin/hibernate

Modified Files:
	FullHibernateConfigTestCase.java 
Log Message:
fix for XDP-169


Index: FullHibernateConfigTestCase.java
===================================================================
RCS file: /cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-hibernate/src/test/java/org/xdoclet/plugin/hibernate/FullHibernateConfigTestCase.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** FullHibernateConfigTestCase.java	17 Sep 2005 15:57:41 -0000	1.5
--- FullHibernateConfigTestCase.java	10 Sep 2006 10:43:08 -0000	1.6
***************
*** 65,68 ****
--- 65,69 ----
          plugin.setC3p0idletestperiod("60");
          plugin.setC3p0acquireincrement("1");
+         plugin.setCurrentsessioncontextclass("jta");
          return plugin;
      }

[xdoclet-plugins-commits] xdoclet-plugins/plugin-hibernate/src/main/java/org/xdoclet/plugin/hibernate HibernateConfigPlugin.java, 1.13, 1.14 HibernateConfigPlugin.jelly, 1.8, 1.9

[Konstantin P. <ko...@us...>]

Update of /cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-hibernate/src/main/java/org/xdoclet/plugin/hibernate
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv26483/src/main/java/org/xdoclet/plugin/hibernate

Modified Files:
	HibernateConfigPlugin.java HibernateConfigPlugin.jelly 
Log Message:
fix for XDP-169


Index: HibernateConfigPlugin.jelly
===================================================================
RCS file: /cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-hibernate/src/main/java/org/xdoclet/plugin/hibernate/HibernateConfigPlugin.jelly,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** HibernateConfigPlugin.jelly	17 May 2005 13:42:39 -0000	1.8
--- HibernateConfigPlugin.jelly	10 Sep 2006 10:43:04 -0000	1.9
***************
*** 186,189 ****
--- 186,193 ----
                  <property name="hibernate.c3p0.acquire_increment">${plugin.C3p0acquireincrement}</property>
              </j:if>
+             
+             <j:if test="${!empty(plugin.Currentsessioncontextclass)}">
+                 <property name="hibernate.current_session_context_class">${plugin.Currentsessioncontextclass}</property>
+             </j:if>
  
              <j:forEach var="property" items="${plugin.PropertyMap.entrySet()}">

Index: HibernateConfigPlugin.java
===================================================================
RCS file: /cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-hibernate/src/main/java/org/xdoclet/plugin/hibernate/HibernateConfigPlugin.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** HibernateConfigPlugin.java	10 Aug 2005 15:42:03 -0000	1.13
--- HibernateConfigPlugin.java	10 Sep 2006 10:43:04 -0000	1.14
***************
*** 36,40 ****
  public class HibernateConfigPlugin extends AbstractHibernatePlugin {
      private Collection allClasses;
-     private Properties props;
      private String c3p0acquireincrement;
      private String c3p0idletestperiod;
--- 36,39 ----
***************
*** 49,52 ****
--- 48,52 ----
      private String cacheusequerycache;
      private String connectionprovider;
+     private String currentsessioncontextclass;
      private String defaultentitymode;
      private String defaultschema;
***************
*** 76,79 ****
--- 76,80 ----
      private String mappingExtension;
      private String maxfetchdepth;
+     private Properties props;
      private String querysubstitutions;
      private String showsql;
***************
*** 99,102 ****
--- 100,310 ----
      }
  
+ 	public String getC3p0acquireincrement() {
+         return c3p0acquireincrement;
+     }
+ 
+ 	public String getC3p0idletestperiod() {
+         return c3p0idletestperiod;
+     }
+ 
+     public String getC3p0maxsize() {
+         return c3p0maxsize;
+     }
+ 
+     public String getC3p0maxstatements() {
+         return c3p0maxstatements;
+     }
+ 
+     public String getC3p0minsize() {
+         return c3p0minsize;
+     }
+ 
+     public String getC3p0timeout() {
+         return c3p0timeout;
+     }
+ 
+     public String getCacheprovider() {
+         return cacheprovider;
+     }
+ 
+     public String getCachequerycachefactory() {
+         return cachequerycachefactory;
+     }
+ 
+     public String getCacheregionprefix() {
+         return cacheregionprefix;
+     }
+ 
+     public String getCacheuseminimalputs() {
+         return cacheuseminimalputs;
+     }
+ 
+     public String getCacheusequerycache() {
+         return cacheusequerycache;
+     }
+ 
+     public String getConnectionprovider() {
+         return connectionprovider;
+     }
+     /**
+      * defines property hibernate.current_session_context_class
+      * @return
+      */
+     public String getCurrentsessioncontextclass() {
+ 		return currentsessioncontextclass;
+ 	}
+     /**
+      * defined 
+      * @return
+      */
+     public String getDefaultentitymode() {
+         return defaultentitymode;
+     }
+ 
+     public String getDefaultschema() {
+         return defaultschema;
+     }
+ 
+     public String getDialect() {
+         return dialect;
+     }
+ 
+     public String getHbm2ddlauto() {
+         return hbm2ddlauto;
+     }
+ 
+     public String getJdbcautocommit() {
+         return jdbcautocommit;
+     }
+ 
+     public String getJdbcautoreconnect() {
+         return jdbcautoreconnect;
+     }
+ 
+     public String getJdbcautoreconnectforpools() {
+         return jdbcautoreconnectforpools;
+     }
+ 
+     public String getJdbcbatchsize() {
+         return jdbcbatchsize;
+     }
+ 
+     public String getJdbcbatchversioneddata() {
+         return jdbcbatchversioneddata;
+     }
+ 
+     public String getJdbcdriver() {
+         return jdbcdriver;
+     }
+ 
+     public String getJdbcfetchsize() {
+         return jdbcfetchsize;
+     }
+ 
+     public String getJdbcisconnectionvalidationrequired() {
+         return jdbcisconnectionvalidationrequired;
+     }
+ 
+     public String getJdbcisolation() {
+         return jdbcisolation;
+     }
+ 
+     public String getJdbcpassword() {
+         return jdbcpassword;
+     }
+ 
+     public String getJdbcpoolsize() {
+         return jdbcpoolsize;
+     }
+ 
+     public String getJdbcurl() {
+         return jdbcurl;
+     }
+ 
+     public String getJdbcusegetgeneratedkeys() {
+         return jdbcusegetgeneratedkeys;
+     }
+ 
+     public String getJdbcusername() {
+         return jdbcusername;
+     }
+ 
+     /**
+      * configure usage of scrolable result set
+      *
+      * @return
+      */
+     public String getJdbcusescrollableresultset() {
+         return jdbcusescrollableresultset;
+     }
+ 
+     public String getJdbcusestreamsforbinary() {
+         return jdbcusestreamsforbinary;
+     }
+ 
+     public String getJndiclass() {
+         return jndiclass;
+     }
+ 
+     public String getJndidatasource() {
+         return jndidatasource;
+     }
+ 
+     public String getJndisessionfactoryname() {
+         return jndisessionfactoryname;
+     }
+ 
+     public String getJndiurl() {
+         return jndiurl;
+     }
+ 
+     public String getJtausertransaction() {
+         return jtausertransaction;
+     }
+ 
+     public Collection getMappedClasses() {
+         if (allClasses == null) {
+             allClasses = metadataProvider.getMetadata();
+         }
+ 
+         return CollectionUtils.select(allClasses, new HasTag("hibernate.class", null, null, false));
+     }
+ 
+     public String getMappingPath(JavaClass clazz) {
+         return clazz.getFullyQualifiedName().replace('.', '/') + mappingExtension;
+     }
+ 
+     public String getMaxfetchdepth() {
+         return maxfetchdepth;
+     }
+ 
+     public Map getPropertyMap() {
+         return props;
+     }
+ 
+     public String getQuerysubstitutions() {
+         return querysubstitutions;
+     }
+ 
+     public String getShowsql() {
+         return showsql;
+     }
+ 
+     public String getTransactionfactory() {
+         return transactionfactory;
+     }
+ 
+     public String getTransactionmanagerlookup() {
+         return transactionmanagerlookup;
+     }
+ 
+     public String getUseouterjoin() {
+         return useouterjoin;
+     }
+ 
+     public String getUsereflectionoptimizer() {
+         return usereflectionoptimizer;
+     }
+ 
      /**
       * hibernate.c3p0.acquire_increment
***************
*** 106,113 ****
      }
  
-     public String getC3p0acquireincrement() {
-         return c3p0acquireincrement;
-     }
- 
      /**
       * hibernate.c3p0.idle_test_period
--- 314,317 ----
***************
*** 117,124 ****
      }
  
-     public String getC3p0idletestperiod() {
-         return c3p0idletestperiod;
-     }
- 
      /**
       * hibernate.c3p0.max_size
--- 321,324 ----
***************
*** 128,135 ****
      }
  
-     public String getC3p0maxsize() {
-         return c3p0maxsize;
-     }
- 
      /**
       * hibernate.c3p0.max_statements
--- 328,331 ----
***************
*** 139,146 ****
      }
  
-     public String getC3p0maxstatements() {
-         return c3p0maxstatements;
-     }
- 
      /**
       * hibernate.c3p0.min_size
--- 335,338 ----
***************
*** 150,157 ****
      }
  
-     public String getC3p0minsize() {
-         return c3p0minsize;
-     }
- 
      /**
       * hibernate.c3p0.timeout
--- 342,345 ----
***************
*** 161,168 ****
      }
  
-     public String getC3p0timeout() {
-         return c3p0timeout;
-     }
- 
      /**
       * hibernate.cache.provider_class
--- 349,352 ----
***************
*** 172,179 ****
      }
  
-     public String getCacheprovider() {
-         return cacheprovider;
-     }
- 
      /**
       * hibernate.cache.query_cache_factory
--- 356,359 ----
***************
*** 183,190 ****
      }
  
-     public String getCachequerycachefactory() {
-         return cachequerycachefactory;
-     }
- 
      /**
       * hibernate.cache.region_prefix
--- 363,366 ----
***************
*** 194,201 ****
      }
  
-     public String getCacheregionprefix() {
-         return cacheregionprefix;
-     }
- 
      /**
       * hibernate.cache.use_minimal_puts
--- 370,373 ----
***************
*** 205,212 ****
      }
  
-     public String getCacheuseminimalputs() {
-         return cacheuseminimalputs;
-     }
- 
      /**
       * hibernate.cache.use_query_cache
--- 377,380 ----
***************
*** 216,223 ****
      }
  
-     public String getCacheusequerycache() {
-         return cacheusequerycache;
-     }
- 
      /**
       * hibernate.connection.provider_class
--- 384,387 ----
***************
*** 227,233 ****
      }
  
!     public String getConnectionprovider() {
!         return connectionprovider;
!     }
  
      /**
--- 391,397 ----
      }
  
!     public void setCurrentsessioncontextclass(String currentSessionContextClass) {
! 		this.currentsessioncontextclass = currentSessionContextClass;
! 	}
  
      /**
***************
*** 238,245 ****
      }
  
-     public String getDefaultentitymode() {
-         return defaultentitymode;
-     }
- 
      /**
       * hibernate.default_schema
--- 402,405 ----
***************
*** 249,256 ****
      }
  
-     public String getDefaultschema() {
-         return defaultschema;
-     }
- 
      /**
       * hibernate.dialect
--- 409,412 ----
***************
*** 260,267 ****
      }
  
-     public String getDialect() {
-         return dialect;
-     }
- 
      /**
       * hibernate.hbm2ddl.auto
--- 416,419 ----
***************
*** 271,278 ****
      }
  
-     public String getHbm2ddlauto() {
-         return hbm2ddlauto;
-     }
- 
      /**
       * hibernate.connection.autocommit
--- 423,426 ----
***************
*** 282,289 ****
      }
  
-     public String getJdbcautocommit() {
-         return jdbcautocommit;
-     }
- 
      /**
       * hibernate.connection.autoReconnect
--- 430,433 ----
***************
*** 293,300 ****
      }
  
-     public String getJdbcautoreconnect() {
-         return jdbcautoreconnect;
-     }
- 
      /**
       * hibernate.connection.autoReconnectForPools
--- 437,440 ----
***************
*** 304,311 ****
      }
  
-     public String getJdbcautoreconnectforpools() {
-         return jdbcautoreconnectforpools;
-     }
- 
      /**
       * hibernate.jdbc.batch_size
--- 444,447 ----
***************
*** 315,322 ****
      }
  
-     public String getJdbcbatchsize() {
-         return jdbcbatchsize;
-     }
- 
      /**
       * hibernate.jdbc.batch_versioned_data
--- 451,454 ----
***************
*** 326,333 ****
      }
  
-     public String getJdbcbatchversioneddata() {
-         return jdbcbatchversioneddata;
-     }
- 
      /**
       * hibernate.connection.driver_class
--- 458,461 ----
***************
*** 337,344 ****
      }
  
-     public String getJdbcdriver() {
-         return jdbcdriver;
-     }
- 
      /**
       * hibernate.jdbc.fetch_size
--- 465,468 ----
***************
*** 348,355 ****
      }
  
-     public String getJdbcfetchsize() {
-         return jdbcfetchsize;
-     }
- 
      /**
       * hibernate.connection.is-connection-validation-required
--- 472,475 ----
***************
*** 359,366 ****
      }
  
-     public String getJdbcisconnectionvalidationrequired() {
-         return jdbcisconnectionvalidationrequired;
-     }
- 
      /**
       * hibernate.connection.isolation
--- 479,482 ----
***************
*** 370,377 ****
      }
  
-     public String getJdbcisolation() {
-         return jdbcisolation;
-     }
- 
      /**
       * hibernate.connection.password
--- 486,489 ----
***************
*** 381,388 ****
      }
  
-     public String getJdbcpassword() {
-         return jdbcpassword;
-     }
- 
      /**
       * hibernate.connection.pool_size
--- 493,496 ----
***************
*** 392,399 ****
      }
  
-     public String getJdbcpoolsize() {
-         return jdbcpoolsize;
-     }
- 
      /**
       * hibernate.connection.url
--- 500,503 ----
***************
*** 403,410 ****
      }
  
-     public String getJdbcurl() {
-         return jdbcurl;
-     }
- 
      /**
       * hibernate.jdbc.use_get_generated_keys
--- 507,510 ----
***************
*** 414,421 ****
      }
  
-     public String getJdbcusegetgeneratedkeys() {
-         return jdbcusegetgeneratedkeys;
-     }
- 
      /**
       * hibernate.connection.username
--- 514,517 ----
***************
*** 425,432 ****
      }
  
-     public String getJdbcusername() {
-         return jdbcusername;
-     }
- 
      /**
       * hibernate.jdbc.use_scrollable_resultset
--- 521,524 ----
***************
*** 437,449 ****
  
      /**
-      * configure usage of scrolable result set
-      *
-      * @return
-      */
-     public String getJdbcusescrollableresultset() {
-         return jdbcusescrollableresultset;
-     }
- 
-     /**
       * hibernate.jdbc.use_streams_for_binary
       */
--- 529,532 ----
***************
*** 452,459 ****
      }
  
-     public String getJdbcusestreamsforbinary() {
-         return jdbcusestreamsforbinary;
-     }
- 
      /**
       * hibernate.jndi.class
--- 535,538 ----
***************
*** 463,470 ****
      }
  
-     public String getJndiclass() {
-         return jndiclass;
-     }
- 
      /**
       * hibernate.connection.datasource
--- 542,545 ----
***************
*** 474,481 ****
      }
  
-     public String getJndidatasource() {
-         return jndidatasource;
-     }
- 
      /**
       * hibernate.session_factory_name
--- 549,552 ----
***************
*** 485,492 ****
      }
  
-     public String getJndisessionfactoryname() {
-         return jndisessionfactoryname;
-     }
- 
      /**
       * hibernate.jndi.url
--- 556,559 ----
***************
*** 496,503 ****
      }
  
-     public String getJndiurl() {
-         return jndiurl;
-     }
- 
      /**
       * jta.UserTransaction
--- 563,566 ----
***************
*** 507,526 ****
      }
  
-     public String getJtausertransaction() {
-         return jtausertransaction;
-     }
- 
-     public Collection getMappedClasses() {
-         if (allClasses == null) {
-             allClasses = metadataProvider.getMetadata();
-         }
- 
-         return CollectionUtils.select(allClasses, new HasTag("hibernate.class", null, null, false));
-     }
- 
-     public String getMappingPath(JavaClass clazz) {
-         return clazz.getFullyQualifiedName().replace('.', '/') + mappingExtension;
-     }
- 
      public void setMappingextension(String mappingExtension) {
          this.mappingExtension = mappingExtension;
--- 570,573 ----
***************
*** 534,541 ****
      }
  
-     public String getMaxfetchdepth() {
-         return maxfetchdepth;
-     }
- 
      /**
       * file name of properties file containing hibernate properties
--- 581,584 ----
***************
*** 559,566 ****
      }
  
-     public Map getPropertyMap() {
-         return props;
-     }
- 
      /**
       * hibernate.query.substitutions
--- 602,605 ----
***************
*** 570,577 ****
      }
  
-     public String getQuerysubstitutions() {
-         return querysubstitutions;
-     }
- 
      /**
       * hibernate.show_sql
--- 609,612 ----
***************
*** 581,588 ****
      }
  
-     public String getShowsql() {
-         return showsql;
-     }
- 
      /**
       * hibernate.transaction.factory_class
--- 616,619 ----
***************
*** 592,599 ****
      }
  
-     public String getTransactionfactory() {
-         return transactionfactory;
-     }
- 
      /**
       * hibernate.transaction.manager_lookup_class
--- 623,626 ----
***************
*** 603,610 ****
      }
  
-     public String getTransactionmanagerlookup() {
-         return transactionmanagerlookup;
-     }
- 
      /**
       * hibernate.use_outer_join
--- 630,633 ----
***************
*** 614,621 ****
      }
  
-     public String getUseouterjoin() {
-         return useouterjoin;
-     }
- 
      /**
       * hibernate.cglib.use_reflection_optimizer
--- 637,640 ----
***************
*** 624,630 ****
          this.usereflectionoptimizer = usereflectionoptimizer;
      }
- 
-     public String getUsereflectionoptimizer() {
-         return usereflectionoptimizer;
-     }
  }
\ No newline at end of file
--- 643,645 ----

[xdoclet-plugins-commits] xdoclet-plugins/plugin-hibernate/src/test/java/org/xdoclet/plugin/hibernate/config full.cfg.xml, 1.3, 1.4

[Konstantin P. <ko...@us...>]

Update of /cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-hibernate/src/test/java/org/xdoclet/plugin/hibernate/config
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv26483/src/test/java/org/xdoclet/plugin/hibernate/config

Modified Files:
	full.cfg.xml 
Log Message:
fix for XDP-169


Index: full.cfg.xml
===================================================================
RCS file: /cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-hibernate/src/test/java/org/xdoclet/plugin/hibernate/config/full.cfg.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** full.cfg.xml	17 May 2005 13:42:40 -0000	1.3
--- full.cfg.xml	10 Sep 2006 10:43:08 -0000	1.4
***************
*** 47,50 ****
--- 47,51 ----
          <property name="hibernate.c3p0.idle_test_period">60</property>
          <property name="hibernate.c3p0.acquire_increment">1</property>
+         <property name="hibernate.current_session_context_class">jta</property>
          <mapping resource="org/xdoclet/plugin/hibernate/subclass/Root.hbm.xml"/>
      </session-factory>

[xdoclet-plugins-commits] xdoclet-plugins/plugin-hibernate/src/main/java/org/xdoclet/plugin/hibernate/qtags HibernateCommentTag.java, NONE, 1.1 HibernateArrayTag.java, 1.12, 1.13 HibernateBagTag.java, 1.15, 1.16 HibernateClassTag.java, 1.16, 1.17 HibernateColumnTag.java, 1.10, 1.11 HibernateIdbagTag.java, 1.3, 1.4 HibernateJoinTag.java, 1.3, 1.4 HibernateJoinedSubclassTag.java, 1.14, 1.15 HibernateListTag.java, 1.11, 1.12 HibernateMapTag.java, 1.13, 1.14 HibernatePrimitiveArrayTag.java, 1.10, 1.11 HibernateSetTag.java, 1.11, 1.12 HibernateUnionSubclassTag.java, 1.3, 1.4

[Konstantin P. <ko...@us...>]

Update of /cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-hibernate/src/main/java/org/xdoclet/plugin/hibernate/qtags
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv19076/src/main/java/org/xdoclet/plugin/hibernate/qtags

Modified Files:
	HibernateArrayTag.java HibernateBagTag.java 
	HibernateClassTag.java HibernateColumnTag.java 
	HibernateIdbagTag.java HibernateJoinTag.java 
	HibernateJoinedSubclassTag.java HibernateListTag.java 
	HibernateMapTag.java HibernatePrimitiveArrayTag.java 
	HibernateSetTag.java HibernateUnionSubclassTag.java 
Added Files:
	HibernateCommentTag.java 
Log Message:
fix for XDP-141 problem, tag parameters are changed!!!


Index: HibernateListTag.java
===================================================================
RCS file: /cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-hibernate/src/main/java/org/xdoclet/plugin/hibernate/qtags/HibernateListTag.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** HibernateListTag.java	24 Aug 2005 09:42:36 -0000	1.11
--- HibernateListTag.java	9 Sep 2006 13:16:05 -0000	1.12
***************
*** 6,10 ****
  package org.xdoclet.plugin.hibernate.qtags;
  
! import org.xdoclet.plugin.hibernate.qtags.parameter.Comment;
  import org.xdoclet.plugin.hibernate.qtags.parameter.Lazy;
  import org.xdoclet.plugin.hibernate.qtags.parameter.OrderBy;
--- 6,10 ----
  package org.xdoclet.plugin.hibernate.qtags;
  
! 
  import org.xdoclet.plugin.hibernate.qtags.parameter.Lazy;
  import org.xdoclet.plugin.hibernate.qtags.parameter.OrderBy;
***************
*** 17,20 ****
   * @qtags.once
   */
! public interface HibernateListTag extends InvertibleCollectionTag, Lazy, OrderBy, Comment {
  }
\ No newline at end of file
--- 17,20 ----
   * @qtags.once
   */
! public interface HibernateListTag extends InvertibleCollectionTag, Lazy, OrderBy {
  }
\ No newline at end of file

Index: HibernateBagTag.java
===================================================================
RCS file: /cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-hibernate/src/main/java/org/xdoclet/plugin/hibernate/qtags/HibernateBagTag.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** HibernateBagTag.java	24 Aug 2005 09:42:36 -0000	1.15
--- HibernateBagTag.java	9 Sep 2006 13:16:05 -0000	1.16
***************
*** 6,10 ****
  package org.xdoclet.plugin.hibernate.qtags;
  
! import org.xdoclet.plugin.hibernate.qtags.parameter.Comment;
  import org.xdoclet.plugin.hibernate.qtags.parameter.Lazy;
  import org.xdoclet.plugin.hibernate.qtags.parameter.OrderBy;
--- 6,10 ----
  package org.xdoclet.plugin.hibernate.qtags;
  
! 
  import org.xdoclet.plugin.hibernate.qtags.parameter.Lazy;
  import org.xdoclet.plugin.hibernate.qtags.parameter.OrderBy;
***************
*** 18,21 ****
   * @qtags.once
   */
! public interface HibernateBagTag extends InvertibleCollectionTag, Lazy, OrderBy, Comment {
  }
\ No newline at end of file
--- 18,21 ----
   * @qtags.once
   */
! public interface HibernateBagTag extends InvertibleCollectionTag, Lazy, OrderBy {
  }
\ No newline at end of file

Index: HibernateClassTag.java
===================================================================
RCS file: /cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-hibernate/src/main/java/org/xdoclet/plugin/hibernate/qtags/HibernateClassTag.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** HibernateClassTag.java	24 Aug 2005 09:42:36 -0000	1.16
--- HibernateClassTag.java	9 Sep 2006 13:16:05 -0000	1.17
***************
*** 16,20 ****
  public interface HibernateClassTag extends com.thoughtworks.qdox.model.DocletTag, Lazy, BatchSize, DiscriminatorValue,
      DynamicInsert, DynamicUpdate, Proxy, Schema, Table, Where, Name, Subselect, EntityName, Catalog, Abstract, Node,
!     Check, Rowid, SelectBeforeUpdate, Persister, Comment {
      /**
       * Specifies that instances of the class are (not) mutable
--- 16,20 ----
  public interface HibernateClassTag extends com.thoughtworks.qdox.model.DocletTag, Lazy, BatchSize, DiscriminatorValue,
      DynamicInsert, DynamicUpdate, Proxy, Schema, Table, Where, Name, Subselect, EntityName, Catalog, Abstract, Node,
!     Check, Rowid, SelectBeforeUpdate, Persister {
      /**
       * Specifies that instances of the class are (not) mutable

Index: HibernateJoinTag.java
===================================================================
RCS file: /cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-hibernate/src/main/java/org/xdoclet/plugin/hibernate/qtags/HibernateJoinTag.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** HibernateJoinTag.java	24 Aug 2005 09:42:36 -0000	1.3
--- HibernateJoinTag.java	9 Sep 2006 13:16:05 -0000	1.4
***************
*** 15,19 ****
   */
  public interface HibernateJoinTag extends com.thoughtworks.qdox.model.DocletTag, Schema, Catalog, Subselect, Fetch,
!     Inverse, Comment {
      /**
       * If enabled, Hibernate will insert a row only if the properties defined by this join are non-null
--- 15,19 ----
   */
  public interface HibernateJoinTag extends com.thoughtworks.qdox.model.DocletTag, Schema, Catalog, Subselect, Fetch,
!     Inverse {
      /**
       * If enabled, Hibernate will insert a row only if the properties defined by this join are non-null

Index: HibernateIdbagTag.java
===================================================================
RCS file: /cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-hibernate/src/main/java/org/xdoclet/plugin/hibernate/qtags/HibernateIdbagTag.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** HibernateIdbagTag.java	24 Aug 2005 09:42:36 -0000	1.3
--- HibernateIdbagTag.java	9 Sep 2006 13:16:05 -0000	1.4
***************
*** 7,11 ****
  
  import org.xdoclet.plugin.hibernate.qtags.parameter.Cascade;
- import org.xdoclet.plugin.hibernate.qtags.parameter.Comment;
  import org.xdoclet.plugin.hibernate.qtags.parameter.Lazy;
  import org.xdoclet.plugin.hibernate.qtags.parameter.OrderBy;
--- 7,10 ----
***************
*** 16,19 ****
   * @author Anatol Pomozov
   */
! public interface HibernateIdbagTag extends BaseCollectionTag, Lazy, Cascade, OrderBy, Comment {
  }
\ No newline at end of file
--- 15,18 ----
   * @author Anatol Pomozov
   */
! public interface HibernateIdbagTag extends BaseCollectionTag, Lazy, Cascade, OrderBy {
  }
\ No newline at end of file

--- NEW FILE: HibernateCommentTag.java ---
package org.xdoclet.plugin.hibernate.qtags;

import com.thoughtworks.qdox.model.DocletTag;

/**
 * represents comment which can be placed in various places into mapping this
 * tag does not define any parameters and contens will be used verbatim. this
 * tag replaces comment parameters found in various tags
 * 
 * @qtags.once
 * @author ko5tik
 * @version $Revision: 1.1 $
 */
public interface HibernateCommentTag extends DocletTag {

}

Index: HibernateUnionSubclassTag.java
===================================================================
RCS file: /cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-hibernate/src/main/java/org/xdoclet/plugin/hibernate/qtags/HibernateUnionSubclassTag.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** HibernateUnionSubclassTag.java	24 Aug 2005 09:42:36 -0000	1.3
--- HibernateUnionSubclassTag.java	9 Sep 2006 13:16:05 -0000	1.4
***************
*** 14,17 ****
   * @author Anatol Pomozov
   */
! public interface HibernateUnionSubclassTag extends BaseSubclassTag, Table, Schema, Catalog, Subselect, Check, Comment {
  }
\ No newline at end of file
--- 14,17 ----
   * @author Anatol Pomozov
   */
! public interface HibernateUnionSubclassTag extends BaseSubclassTag, Table, Schema, Catalog, Subselect, Check {
  }
\ No newline at end of file

Index: HibernateJoinedSubclassTag.java
===================================================================
RCS file: /cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-hibernate/src/main/java/org/xdoclet/plugin/hibernate/qtags/HibernateJoinedSubclassTag.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** HibernateJoinedSubclassTag.java	24 Aug 2005 09:42:36 -0000	1.14
--- HibernateJoinedSubclassTag.java	9 Sep 2006 13:16:05 -0000	1.15
***************
*** 13,16 ****
   * @qtags.location class
   */
! public interface HibernateJoinedSubclassTag extends BaseSubclassTag, Table, Check, Schema, Catalog, Subselect, Comment {
  }
\ No newline at end of file
--- 13,16 ----
   * @qtags.location class
   */
! public interface HibernateJoinedSubclassTag extends BaseSubclassTag, Table, Check, Schema, Catalog, Subselect {
  }
\ No newline at end of file

Index: HibernateArrayTag.java
===================================================================
RCS file: /cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-hibernate/src/main/java/org/xdoclet/plugin/hibernate/qtags/HibernateArrayTag.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** HibernateArrayTag.java	24 Aug 2005 09:42:36 -0000	1.12
--- HibernateArrayTag.java	9 Sep 2006 13:16:05 -0000	1.13
***************
*** 6,10 ****
  package org.xdoclet.plugin.hibernate.qtags;
  
! import org.xdoclet.plugin.hibernate.qtags.parameter.Comment;
  
  /**
--- 6,10 ----
  package org.xdoclet.plugin.hibernate.qtags;
  
! 
  
  /**
***************
*** 15,19 ****
   * @qtags.once
   */
! public interface HibernateArrayTag extends InvertibleCollectionTag, Comment {
      /**
       * specifies element class ( implied by type )
--- 15,19 ----
   * @qtags.once
   */
! public interface HibernateArrayTag extends InvertibleCollectionTag {
      /**
       * specifies element class ( implied by type )

Index: HibernateMapTag.java
===================================================================
RCS file: /cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-hibernate/src/main/java/org/xdoclet/plugin/hibernate/qtags/HibernateMapTag.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** HibernateMapTag.java	24 Aug 2005 09:42:36 -0000	1.13
--- HibernateMapTag.java	9 Sep 2006 13:16:05 -0000	1.14
***************
*** 6,10 ****
  package org.xdoclet.plugin.hibernate.qtags;
  
! import org.xdoclet.plugin.hibernate.qtags.parameter.Comment;
  import org.xdoclet.plugin.hibernate.qtags.parameter.Lazy;
  import org.xdoclet.plugin.hibernate.qtags.parameter.OrderBy;
--- 6,10 ----
  package org.xdoclet.plugin.hibernate.qtags;
  
! 
  import org.xdoclet.plugin.hibernate.qtags.parameter.Lazy;
  import org.xdoclet.plugin.hibernate.qtags.parameter.OrderBy;
***************
*** 17,20 ****
   * @qtags.once
   */
! public interface HibernateMapTag extends SortedCollectionTag, Lazy, OrderBy, Comment {
  }
\ No newline at end of file
--- 17,20 ----
   * @qtags.once
   */
! public interface HibernateMapTag extends SortedCollectionTag, Lazy, OrderBy {
  }
\ No newline at end of file

Index: HibernatePrimitiveArrayTag.java
===================================================================
RCS file: /cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-hibernate/src/main/java/org/xdoclet/plugin/hibernate/qtags/HibernatePrimitiveArrayTag.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** HibernatePrimitiveArrayTag.java	24 Aug 2005 09:42:36 -0000	1.10
--- HibernatePrimitiveArrayTag.java	9 Sep 2006 13:16:05 -0000	1.11
***************
*** 6,10 ****
  package org.xdoclet.plugin.hibernate.qtags;
  
- import org.xdoclet.plugin.hibernate.qtags.parameter.Comment;
  
  /**
--- 6,9 ----
***************
*** 14,17 ****
   * @qtags.location method
   */
! public interface HibernatePrimitiveArrayTag extends BaseCollectionTag, Comment {
  }
\ No newline at end of file
--- 13,16 ----
   * @qtags.location method
   */
! public interface HibernatePrimitiveArrayTag extends BaseCollectionTag {
  }
\ No newline at end of file

Index: HibernateSetTag.java
===================================================================
RCS file: /cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-hibernate/src/main/java/org/xdoclet/plugin/hibernate/qtags/HibernateSetTag.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** HibernateSetTag.java	24 Aug 2005 09:42:36 -0000	1.11
--- HibernateSetTag.java	9 Sep 2006 13:16:05 -0000	1.12
***************
*** 6,10 ****
  package org.xdoclet.plugin.hibernate.qtags;
  
! import org.xdoclet.plugin.hibernate.qtags.parameter.Comment;
  import org.xdoclet.plugin.hibernate.qtags.parameter.Lazy;
  import org.xdoclet.plugin.hibernate.qtags.parameter.OrderBy;
--- 6,10 ----
  package org.xdoclet.plugin.hibernate.qtags;
  
! 
  import org.xdoclet.plugin.hibernate.qtags.parameter.Lazy;
  import org.xdoclet.plugin.hibernate.qtags.parameter.OrderBy;
***************
*** 17,20 ****
   * @qtags.once
   */
! public interface HibernateSetTag extends SortedCollectionTag, Lazy, OrderBy, Comment {
  }
\ No newline at end of file
--- 17,20 ----
   * @qtags.once
   */
! public interface HibernateSetTag extends SortedCollectionTag, Lazy, OrderBy {
  }
\ No newline at end of file

Index: HibernateColumnTag.java
===================================================================
RCS file: /cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-hibernate/src/main/java/org/xdoclet/plugin/hibernate/qtags/HibernateColumnTag.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** HibernateColumnTag.java	24 Aug 2005 09:42:36 -0000	1.10
--- HibernateColumnTag.java	9 Sep 2006 13:16:05 -0000	1.11
***************
*** 18,22 ****
   */
  public interface HibernateColumnTag extends com.thoughtworks.qdox.model.DocletTag, Index, Length, NotNull, SqlType,
!     Unique, Scale, Precision, Check, Comment {
      /**
       * The column name
--- 18,22 ----
   */
  public interface HibernateColumnTag extends com.thoughtworks.qdox.model.DocletTag, Index, Length, NotNull, SqlType,
!     Unique, Scale, Precision, Check {
      /**
       * The column name
***************
*** 30,32 ****
--- 30,38 ----
       */
      String getUniqueKey();
+     
+     /**
+      * comment for this column
+      * @return
+      */
+     String getComment();
  }
\ No newline at end of file