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

Modified Files:
        BaseCollectionTail.jelly Class.jelly Component.jelly 
        CompositeElement.jelly CompositeId.jelly 
        DynamicComponent.jelly HibernateMappingPlugin.java Id.jelly 
        ManyToAny.jelly MapKeyManyToMany.jelly OneToMany.jelly 
Added Files:
        Parent.jelly 
Log Message:
(XDP-54) Implemented 'composite-element' support. Also added @hibernate.parent 
support

Index: BaseCollectionTail.jelly
===================================================================
RCS file: 
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-hibernate/src/main/java/org/xdoclet/plugin/hibernate/BaseCollectionTail.jelly,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** BaseCollectionTail.jelly    26 Apr 2005 07:00:07 -0000      1.1
--- BaseCollectionTail.jelly    13 May 2005 07:50:36 -0000      1.2
***************
*** 2,6 ****
      <j:set var="elementTags" 
value="${plugin.getTags(property.entity,'hibernate.element|hibernate.one-to-many|hibernate.composite-element|hibernate.many-to-many|hibernate.many-to-any')}"/>
      <!-- check that no more than one element tag is present on set -->
!     <j:if test="${size(elementTags) >1}">
          <j:set var="message" value="more than one element tag deined in class 
${class.name} for ${property.name} "/>
        ${plugin.assertTrue(message,false)}
--- 2,6 ----
      <j:set var="elementTags" 
value="${plugin.getTags(property.entity,'hibernate.element|hibernate.one-to-many|hibernate.composite-element|hibernate.many-to-many|hibernate.many-to-any')}"/>
      <!-- check that no more than one element tag is present on set -->
!     <j:if test="${size(elementTags) > 1}">
          <j:set var="message" value="more than one element tag deined in class 
${class.name} for ${property.name} "/>
        ${plugin.assertTrue(message,false)}
***************
*** 10,14 ****
       ${plugin.assertTrue(message,false)}
      </j:if>
!     <j:if test="${size(elementTags) ==1}">
          <j:import uri="${plugin.dispatchTag(elementTags[0].name)}" 
inherit="true"/>
      </j:if>
--- 10,14 ----
       ${plugin.assertTrue(message,false)}
      </j:if>
!     <j:if test="${size(elementTags) == 1}">
          <j:import uri="${plugin.dispatchTag(elementTags[0].name)}" 
inherit="true"/>
      </j:if>

Index: MapKeyManyToMany.jelly
===================================================================
RCS file: 
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-hibernate/src/main/java/org/xdoclet/plugin/hibernate/MapKeyManyToMany.jelly,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MapKeyManyToMany.jelly      2 May 2005 10:25:22 -0000       1.2
--- MapKeyManyToMany.jelly      13 May 2005 07:50:38 -0000      1.3
***************
*** 9,13 ****
              foreign-key="${mapKeyManyToManyTag.foreignKey}">
  
- 
              <j:forEach var="columnTag" 
items="${property.entity.getTagsByName('hibernate.index-column')}">
                  <j:import uri="org/xdoclet/plugin/hibernate/Column.jelly" 
inherit="true"/>
--- 9,12 ----

Index: DynamicComponent.jelly
===================================================================
RCS file: 
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-hibernate/src/main/java/org/xdoclet/plugin/hibernate/DynamicComponent.jelly,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** DynamicComponent.jelly      26 Apr 2005 07:00:07 -0000      1.6
--- DynamicComponent.jelly      13 May 2005 07:50:37 -0000      1.7
***************
*** 2,6 ****
      <j:set var="dynamicComponentTag" 
value="${property.entity.getTagByName('hibernate.dynamic-component')}"/>
      <j:if test="${dynamicComponentTag != null}">
!             ${plugin.assertTrue('@hibernate.dynamic-component is not yet 
implemented',false)}
      </j:if>
  </j:jelly>
--- 2,6 ----
      <j:set var="dynamicComponentTag" 
value="${property.entity.getTagByName('hibernate.dynamic-component')}"/>
      <j:if test="${dynamicComponentTag != null}">
!         <g:fail>@hibernate.dynamic-component is not yet implemented</g:fail>
      </j:if>
  </j:jelly>

Index: Id.jelly
===================================================================
RCS file: 
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-hibernate/src/main/java/org/xdoclet/plugin/hibernate/Id.jelly,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Id.jelly    26 Apr 2005 07:00:08 -0000      1.1
--- Id.jelly    13 May 2005 07:50:37 -0000      1.2
***************
*** 6,10 ****
          access="${property.access}"
          column="${primitiveId.column}"
!         type="${plugin.getIdType(property.entity)}"
          length="${primitiveId.length}"
          unsaved-value="${primitiveId.unsavedValue}">
--- 6,10 ----
          access="${property.access}"
          column="${primitiveId.column}"
!         type="${primitiveId.type}"
          length="${primitiveId.length}"
          unsaved-value="${primitiveId.unsavedValue}">

Index: OneToMany.jelly
===================================================================
RCS file: 
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-hibernate/src/main/java/org/xdoclet/plugin/hibernate/OneToMany.jelly,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** OneToMany.jelly     26 Apr 2005 07:00:08 -0000      1.5
--- OneToMany.jelly     13 May 2005 07:50:38 -0000      1.6
***************
*** 1,3 ****
! <j:jelly xmlns:j="jelly:core" xmlns:g="generama:core">
      <j:set var="oneToManyTag" 
value="${property.entity.getTagByName('hibernate.one-to-many')}"/>
      <j:if test="${oneToManyTag != null}">
--- 1,3 ----
! <j:jelly xmlns:j="jelly:core">
      <j:set var="oneToManyTag" 
value="${property.entity.getTagByName('hibernate.one-to-many')}"/>
      <j:if test="${oneToManyTag != null}">

Index: Class.jelly
===================================================================
RCS file: 
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-hibernate/src/main/java/org/xdoclet/plugin/hibernate/Class.jelly,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** Class.jelly 6 May 2005 16:07:52 -0000       1.16
--- Class.jelly 13 May 2005 07:50:37 -0000      1.17
***************
*** 1,4 ****
  <?xml version="1.0" encoding="UTF-8"?>
! <j:jelly xmlns:j="jelly:core" xmlns:x="jelly:xml">
      <j:set var="classTag" value="${class.getTagByName('hibernate.class')}"/>
  
--- 1,4 ----
  <?xml version="1.0" encoding="UTF-8"?>
! <j:jelly xmlns:j="jelly:core" xmlns:x="jelly:xml" xmlns:g="generama:core">
      <j:set var="classTag" value="${class.getTagByName('hibernate.class')}"/>
  
***************
*** 60,65 ****
                  <!-- id is allowed only once -->
                  <j:if test="${idWasDeclared == true}">
!                     <j:set var="message" value="attempt to define id twice in 
class ${class.name} at line ${primitiveId.lineNumber}"/>
!                                       ${plugin.assertTrue(message,false)}
                  </j:if>
                  <j:set var="idWasDeclared" value="true"/>
--- 60,64 ----
                  <!-- id is allowed only once -->
                  <j:if test="${idWasDeclared == true}">
!                     <g:fail>attempt to define id twice in class ${class.name} 
at line ${primitiveId.lineNumber}</g:fail>
                  </j:if>
                  <j:set var="idWasDeclared" value="true"/>
***************
*** 72,77 ****
                  <!-- id is allowed only once -->
                  <j:if test="${idWasDeclared == true}">
!                     <j:set var="message" value="attempt to define id twice in 
class ${class.name} at line ${compositeId.lineNumber}"/>
!                     ${plugin.assertTrue(message,false)}
                  </j:if>
                  <j:set var="idWasDeclared" value="true"/>
--- 71,75 ----
                  <!-- id is allowed only once -->
                  <j:if test="${idWasDeclared == true}">
!                     <g:fail>attempt to define id twice in class ${class.name} 
at line ${compositeId.lineNumber}</g:fail>
                  </j:if>
                  <j:set var="idWasDeclared" value="true"/>
***************
*** 91,96 ****
              <j:if test="${versionTag != null}">
                  <j:if test="${versionTimestampDeclared}">
!                     <j:set var="message" value="version or timestamp are 
allowed only once ${class.name} at line ${versionTag.lineNumber}"/>
!                     ${plugin.assertTrue(message,false)}
                  </j:if>
                  <j:set var="versionTimestampDeclared" value="true"/>
--- 89,93 ----
              <j:if test="${versionTag != null}">
                  <j:if test="${versionTimestampDeclared}">
!                     <g:fail>version or timestamp are allowed only once 
${class.name} at line ${versionTag.lineNumber}</g:fail>
                  </j:if>
                  <j:set var="versionTimestampDeclared" value="true"/>
***************
*** 106,111 ****
              <j:if test="${timestampTag != null}">
                  <j:if test="${versionTimestampDeclared}">
!                     <j:set var="message" value="version or timestamp are 
allowed only once ${class.name} at line ${timestampTag.lineNumber}"/>
!                     ${plugin.assertTrue(message,false)}
                  </j:if>
                  <j:set var="versionTimestampDeclared" value="true"/>
--- 103,107 ----
              <j:if test="${timestampTag != null}">
                  <j:if test="${versionTimestampDeclared}">
!                     <g:fail>version or timestamp are allowed only once 
${class.name} at line ${timestampTag.lineNumber}</g:fail>
                  </j:if>
                  <j:set var="versionTimestampDeclared" value="true"/>

Index: HibernateMappingPlugin.java
===================================================================
RCS file: 
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-hibernate/src/main/java/org/xdoclet/plugin/hibernate/HibernateMappingPlugin.java,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** HibernateMappingPlugin.java 6 May 2005 16:07:59 -0000       1.36
--- HibernateMappingPlugin.java 13 May 2005 07:50:37 -0000      1.37
***************
*** 10,13 ****
--- 10,15 ----
  import java.util.*;
  
+ import org.apache.commons.collections.CollectionUtils;
+ import org.apache.commons.collections.Predicate;
  import org.apache.commons.logging.Log;
  import org.apache.commons.logging.LogFactory;
***************
*** 63,66 ****
--- 65,69 ----
          PROPERTY_TAGS.add("hibernate.primitive-array");
          PROPERTY_TAGS.add("hibernate.key-property");
+         PROPERTY_TAGS.add("hibernate.parent");
          HIERARCHY_STOP_TAGS.add("hibernate.class");
          HIERARCHY_STOP_TAGS.add("hibernate.subclass");
***************
*** 134,162 ****
  
      /**
!      * retrieve type of identificator. use (return) type of element if not
!      * specified explicitely, "type" parameter overrides
!      *
!      * @param metadata metadata to be checked
!      * @return type of ID element or null
       */
!     public String getIdType(AbstractJavaEntity metadata) {
!         DocletTag idTag = metadata.getTagByName("hibernate.id");
! 
!         // if id tag has named type parameter, use it as type of ID
!         if ((idTag != null) && (idTag.getNamedParameter("type") != null)) {
!             return idTag.getNamedParameter("type");
!         }
! 
!         // no tag information, use type of element
!         if (metadata instanceof JavaMethod) {
!             return ((JavaMethod) metadata).getReturns().getValue();
!         }
  
!         // return parameter off field
!         if (metadata instanceof JavaField) {
!             return ((JavaField) metadata).getType().getValue();
          }
  
!         return null;
      }
  
--- 137,156 ----
  
      /**
!      * Return the instance of JavaClass by it's name
       */
!     public JavaClass getMetadata(final String className) {
!         JavaClass javaClass = (JavaClass) CollectionUtils.find(getMetadata(),
!                 new Predicate() {
!                     public boolean evaluate(Object o) {
!                         JavaClass cl = (JavaClass) o;
!                         return cl.getFullyQualifiedName().equals(className);
!                     }
!                 });
  
!         if (javaClass == null) {
!             throw new IllegalArgumentException("Class metadata for " + 
className + " not found");
          }
  
!         return javaClass;
      }
  
***************
*** 331,335 ****
       * gather hibernate propertis from given class into list
       */
!     private void getProperties(JavaClass clazz, Collection requierdTags, List 
accumulate) {
          // walk through property getters
          BeanProperty[] beanProperties = clazz.getBeanProperties();
--- 325,329 ----
       * gather hibernate propertis from given class into list
       */
!     private void getProperties(JavaClass clazz, Collection requieredTags, 
List accumulate) {
          // walk through property getters
          BeanProperty[] beanProperties = clazz.getBeanProperties();
***************
*** 341,345 ****
              // and there is accessor
              if ((beanProperties[i] != null) && 
(beanProperties[i].getAccessor() != null) &&
!                     !getTags(beanProperties[i].getAccessor(), 
requierdTags).isEmpty()) {
                  property = new HibernateProperty();
                  property.setName(beanProperties[i].getName());
--- 335,339 ----
              // and there is accessor
              if ((beanProperties[i] != null) && 
(beanProperties[i].getAccessor() != null) &&
!                     !getTags(beanProperties[i].getAccessor(), 
requieredTags).isEmpty()) {
                  property = new HibernateProperty();
                  property.setName(beanProperties[i].getName());
***************
*** 355,359 ****
  
          for (int i = 0; i < fields.length; i++) {
!             if (!getTags(fields[i], requierdTags).isEmpty()) {
                  property = new HibernateProperty();
                  property.setName(fields[i].getName());
--- 349,353 ----
  
          for (int i = 0; i < fields.length; i++) {
!             if (!getTags(fields[i], requieredTags).isEmpty()) {
                  property = new HibernateProperty();
                  property.setName(fields[i].getName());

Index: CompositeId.jelly
===================================================================
RCS file: 
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-hibernate/src/main/java/org/xdoclet/plugin/hibernate/CompositeId.jelly,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** CompositeId.jelly   26 Apr 2005 12:32:53 -0000      1.6
--- CompositeId.jelly   13 May 2005 07:50:37 -0000      1.7
***************
*** 1,55 ****
! <j:jelly xmlns:j="jelly:core">
!     <j:set var="compositeIdTag" 
value="${property.entity.getTagByName('hibernate.composite-id')}"/>
!     <composite-id
!         name="${property.name}"
!         access="${property.access}"
!         class="${property.entity.returns.value}"
!         unsaved-value="${compositeIdTag.unsavedValue}"
!         node="${compositeIdTag.node}">
! 
!         <j:forEach var="metaTag" 
items="${property.entity.getTagsByName('hibernate.meta')}">
!             <j:import uri="org/xdoclet/plugin/hibernate/Meta.jelly" 
inherit="true"/>
!         </j:forEach>
! 
!         <j:set var="props" 
value="${plugin.getClassProperties(property.type.javaClass)}"/>
!         <j:forEach begin="1" end="${size(props)}" indexVar="propsI">
!             <j:forEach var="keyProperty" items="${props}">
!                 <j:set var="keyPropertyTag" 
value="${keyProperty.entity.getTagByName('hibernate.key-property')}"/>
!                 <j:set var="keyManyToOne" 
value="${keyProperty.entity.getTagByName('hibernate.key-many-to-one')}"/>
! 
!                 <j:if test="${size(keyPropertyTag) > 0}">
!                     <j:if test="${size(keyManyToOne) > 0}">
!                         <j:set var="message" value="key-property and 
key-many-to-one in class ${class.name} for property ${property.name}"/>
!                 ${plugin.assertTrue(message,false)}
!                     </j:if>
!                 </j:if>
! 
!                 <j:if test="${keyPropertyTag != null}">
!                     <j:if test="${keyPropertyTag.position == propsI}">
!                         <key-property name="${keyProperty.name}" 
access="${keyProperty.access}" type="${keyPropertyTag.type}" 
column="${keyPropertyTag.column}" length="${keyPropertyTag.length}">
!                             <j:forEach var="metaTag" 
items="${keyProperty.entity.getTagsByName('hibernate.meta')}">
!                                 <j:import 
uri="org/xdoclet/plugin/hibernate/Meta.jelly" inherit="true"/>
!                             </j:forEach>
!                             <j:forEach var="columnTag" 
items="${keyProperty.entity.getTagsByName('hibernate.column')}">
!                                 <j:import 
uri="org/xdoclet/plugin/hibernate/Column.jelly" inherit="true"/>
!                             </j:forEach>
!                         </key-property>
!                     </j:if>
!                 </j:if>
! 
!                 <j:if test="${keyManyToOne != null}">
!                     <j:if test="${keyManyToOne.position == propsI}">
!                         <key-many-to-one name="${keyManyToOne.name}" 
access="${keyManyToOne.access}" type="${keyManyToOne.type}" 
column="${keyManyToOne.column}" length="${keyManyToOne.length}" 
class="keyManyToOne.class">
!                             <j:forEach var="metaTag" 
items="${keyManyToOne.entity.getTagsByName('hibernate.meta')}">
!                                 <j:import 
uri="org/xdoclet/plugin/hibernate/Meta.jelly" inherit="true"/>
!                             </j:forEach>
!                             <j:forEach var="columnTag" 
items="${keyManyToOne.entity.getTagsByName('hibernate.column')}">
!                                 <j:import 
uri="org/xdoclet/plugin/hibernate/Column.jelly" inherit="true"/>
!                             </j:forEach>
!                         </key-many-to-one>
!                     </j:if>
!                 </j:if>
!             </j:forEach>
!         </j:forEach>
!     </composite-id>
  </j:jelly>
\ No newline at end of file
--- 1,55 ----
! <j:jelly xmlns:j="jelly:core">
!     <j:set var="compositeIdTag" 
value="${property.entity.getTagByName('hibernate.composite-id')}"/>
!     <composite-id
!         name="${property.name}"
!         access="${property.access}"
!         class="${property.entity.returns.value}"
!         unsaved-value="${compositeIdTag.unsavedValue}"
!         node="${compositeIdTag.node}">
! 
!         <j:forEach var="metaTag" 
items="${property.entity.getTagsByName('hibernate.meta')}">
!             <j:import uri="org/xdoclet/plugin/hibernate/Meta.jelly" 
inherit="true"/>
!         </j:forEach>
! 
!         <j:set var="props" 
value="${plugin.getClassProperties(property.type.javaClass)}"/>
!         <j:forEach begin="1" end="${size(props)}" indexVar="propsI">
!             <j:forEach var="keyProperty" items="${props}">
!                 <j:set var="keyPropertyTag" 
value="${keyProperty.entity.getTagByName('hibernate.key-property')}"/>
!                 <j:set var="keyManyToOne" 
value="${keyProperty.entity.getTagByName('hibernate.key-many-to-one')}"/>
! 
!                 <j:if test="${size(keyPropertyTag) > 0}">
!                     <j:if test="${size(keyManyToOne) > 0}">
!                         <j:set var="message" value="key-property and 
key-many-to-one in class ${class.name} for property ${property.name}"/>
!                 ${plugin.assertTrue(message,false)}
!                     </j:if>
!                 </j:if>
! 
!                 <j:if test="${keyPropertyTag != null}">
!                     <j:if test="${keyPropertyTag.position == propsI}">
!                         <key-property name="${keyProperty.name}" 
access="${keyProperty.access}" type="${keyPropertyTag.type}" 
column="${keyPropertyTag.column}" length="${keyPropertyTag.length}">
!                             <j:forEach var="metaTag" 
items="${keyProperty.entity.getTagsByName('hibernate.meta')}">
!                                 <j:import 
uri="org/xdoclet/plugin/hibernate/Meta.jelly" inherit="true"/>
!                             </j:forEach>
!                             <j:forEach var="columnTag" 
items="${keyProperty.entity.getTagsByName('hibernate.column')}">
!                                 <j:import 
uri="org/xdoclet/plugin/hibernate/Column.jelly" inherit="true"/>
!                             </j:forEach>
!                         </key-property>
!                     </j:if>
!                 </j:if>
! 
!                 <j:if test="${keyManyToOne != null}">
!                     <j:if test="${keyManyToOne.position == propsI}">
!                         <key-many-to-one name="${keyManyToOne.name}" 
access="${keyManyToOne.access}" type="${keyManyToOne.type}" 
column="${keyManyToOne.column}" length="${keyManyToOne.length}" 
class="keyManyToOne.class">
!                             <j:forEach var="metaTag" 
items="${keyManyToOne.entity.getTagsByName('hibernate.meta')}">
!                                 <j:import 
uri="org/xdoclet/plugin/hibernate/Meta.jelly" inherit="true"/>
!                             </j:forEach>
!                             <j:forEach var="columnTag" 
items="${keyManyToOne.entity.getTagsByName('hibernate.column')}">
!                                 <j:import 
uri="org/xdoclet/plugin/hibernate/Column.jelly" inherit="true"/>
!                             </j:forEach>
!                         </key-many-to-one>
!                     </j:if>
!                 </j:if>
!             </j:forEach>
!         </j:forEach>
!     </composite-id>
  </j:jelly>
\ No newline at end of file

--- NEW FILE: Parent.jelly ---
<j:jelly xmlns:j="jelly:core">
    <j:set var="parentTag" 
value="${property.entity.getTagByName('hibernate.parent')}"/>
    <j:if test="${parentTag != null}">
        <parent name="${property.name}"/>
    </j:if>
</j:jelly>
Index: CompositeElement.jelly
===================================================================
RCS file: 
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-hibernate/src/main/java/org/xdoclet/plugin/hibernate/CompositeElement.jelly,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CompositeElement.jelly      26 Apr 2005 07:00:07 -0000      1.1
--- CompositeElement.jelly      13 May 2005 07:50:37 -0000      1.2
***************
*** 4,10 ****
          <composite-element
              class="${compositeElementTag.class_}"
!             node="${compositeElementTag.node}"/>
!         <j:set var="message" value="composite element not inplemented in 
${class.name} at ${compositeElementTag.lineNumber}"/>
!     ${plugin.bomb(message)}
      </j:if>
  </j:jelly>
\ No newline at end of file
--- 4,30 ----
          <composite-element
              class="${compositeElementTag.class_}"
!             node="${compositeElementTag.node}">
! 
!             <j:set var="compositeClass" 
value="${plugin.getMetadata(compositeElementTag.class_)}"/>
! 
!             <j:forEach var="metaTag" 
items="${compositeClass.getTagsByName('hibernate.meta')}">
!                 <j:import uri="org/xdoclet/plugin/hibernate/Meta.jelly" 
inherit="true"/>
!             </j:forEach>
! 
!             <j:forEach var="property" 
items="${plugin.getClassProperties(compositeClass)}">
!                 <j:set var="elementTags" 
value="${plugin.getTags(property.entity,'hibernate.parent|hibernate.property|hibernate.many-to-one|hibernate.any')}"/>
! 
!                 <j:if test="${size(elementTags) > 1}">
!                     <g:fail>more than one element tag deined in class 
${class.name} for ${property.name}</g:fail>
!                 </j:if>
!                 <j:if test="${size(elementTags) == 0}">
!                     <g:fail>no element tag deined in class ${class.name} for 
${property.name}</g:fail>
!                 </j:if>
! 
!                 <j:if test="${size(elementTags) == 1}">
!                     <j:import 
uri="${plugin.dispatchTag(elementTags[0].name)}" inherit="true"/>
!                 </j:if>
!             </j:forEach>
!         </composite-element>
      </j:if>
  </j:jelly>
\ No newline at end of file

Index: Component.jelly
===================================================================
RCS file: 
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-hibernate/src/main/java/org/xdoclet/plugin/hibernate/Component.jelly,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Component.jelly     26 Apr 2005 07:00:07 -0000      1.8
--- Component.jelly     13 May 2005 07:50:37 -0000      1.9
***************
*** 16,22 ****
                  <j:import uri="org/xdoclet/plugin/hibernate/Meta.jelly" 
inherit="true"/>
              </j:forEach>
-             <j:if test="${componentTag.parent != null}">
-                 <parent name="${componentTag.parent}"/>
-             </j:if>
              <j:forEach var="property" 
items="${plugin.getClassProperties(property.type.javaClass)}">
                  <j:import 
uri="org/xdoclet/plugin/hibernate/HibernateProperties.jelly" inherit="true"/>
--- 16,19 ----

Index: ManyToAny.jelly
===================================================================
RCS file: 
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-hibernate/src/main/java/org/xdoclet/plugin/hibernate/ManyToAny.jelly,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ManyToAny.jelly     26 Apr 2005 07:00:08 -0000      1.1
--- ManyToAny.jelly     13 May 2005 07:50:38 -0000      1.2
***************
*** 1,3 ****
! <j:jelly xmlns:j="jelly:core" xmlns:g="generama:core">
      <j:set var="manyToAnyTag" 
value="${property.entity.getTagByName('hibernate.many-to-any')}"/>
      <j:if test="${manyToAnyTag != null}">
--- 1,3 ----
! <j:jelly xmlns:j="jelly:core">
      <j:set var="manyToAnyTag" 
value="${property.entity.getTagByName('hibernate.many-to-any')}"/>
      <j:if test="${manyToAnyTag != null}">



-------------------------------------------------------
This SF.Net email is sponsored by Oracle Space Sweepstakes
Want to be the first software developer in space?
Enter now for the Oracle Space Sweepstakes!
http://ads.osdn.com/?ad_id=7393&alloc_id=16281&op=click
_______________________________________________
xdoclet-plugins-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xdoclet-plugins-commits

Reply via email to