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-serv28082/plugin-hibernate/src/main/java/org/xdoclet/plugin/hibernate
Modified Files:
AbstractHibernatePlugin.java Any.jelly Array.jelly Bag.jelly
Class.jelly Component.jelly CompositeId.jelly
HibernateMappingPlugin.java HibernateMappingPlugin.jelly
Id.jelly Idbag.jelly KeyManyToOne.jelly KeyProperty.jelly
List.jelly ManyToOne.jelly Map.jelly OneToOne.jelly
PrimitiveArray.jelly Property.jelly Set.jelly
Log Message:
improvements in access setting ( implicit by tag placement, can be overriden )
also fox for XDP-103 ( missing node parameter )
Index: Idbag.jelly
===================================================================
RCS file:
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-hibernate/src/main/java/org/xdoclet/plugin/hibernate/Idbag.jelly,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Idbag.jelly 2 Sep 2005 09:14:01 -0000 1.5
--- Idbag.jelly 17 Sep 2005 15:57:41 -0000 1.6
***************
*** 4,8 ****
<idbag
name="${property.name}"
! access="${idBagTag.access}"
table="${idBagTag.table}"
schema="${idBagTag.schema}"
--- 4,8 ----
<idbag
name="${property.name}"
! access="${property.access}"
table="${idBagTag.table}"
schema="${idBagTag.schema}"
Index: ManyToOne.jelly
===================================================================
RCS file:
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-hibernate/src/main/java/org/xdoclet/plugin/hibernate/ManyToOne.jelly,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** ManyToOne.jelly 25 Jul 2005 16:02:51 -0000 1.11
--- ManyToOne.jelly 17 Sep 2005 15:57:41 -0000 1.12
***************
*** 5,9 ****
name="${property.name}"
class="${manyToOneTag.class_}"
! access="${manyToOneTag.access}"
entity-name="${manyToOneTag.entityName}"
column="${plugin.buildComponentColumnName(manyToOneTag.column)}"
--- 5,9 ----
name="${property.name}"
class="${manyToOneTag.class_}"
! access="${property.access}"
entity-name="${manyToOneTag.entityName}"
column="${plugin.buildComponentColumnName(manyToOneTag.column)}"
Index: List.jelly
===================================================================
RCS file:
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-hibernate/src/main/java/org/xdoclet/plugin/hibernate/List.jelly,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** List.jelly 2 Sep 2005 09:14:01 -0000 1.12
--- List.jelly 17 Sep 2005 15:57:41 -0000 1.13
***************
*** 4,8 ****
<list
name="${property.name}"
! access="${listTag.access}"
table="${listTag.table}"
schema="${listTag.schema}"
--- 4,8 ----
<list
name="${property.name}"
! access="${property.access}"
table="${listTag.table}"
schema="${listTag.schema}"
Index: OneToOne.jelly
===================================================================
RCS file:
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-hibernate/src/main/java/org/xdoclet/plugin/hibernate/OneToOne.jelly,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** OneToOne.jelly 31 May 2005 11:24:36 -0000 1.6
--- OneToOne.jelly 17 Sep 2005 15:57:41 -0000 1.7
***************
*** 5,9 ****
name="${property.name}"
formula="${oneToOneTag.formula}"
! access="${oneToOneTag.access}"
class="${oneToOneTag.class_}"
entity-name="${oneToOneTag.entityName}"
--- 5,9 ----
name="${property.name}"
formula="${oneToOneTag.formula}"
! access="${property.access}"
class="${oneToOneTag.class_}"
entity-name="${oneToOneTag.entityName}"
Index: Property.jelly
===================================================================
RCS file:
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-hibernate/src/main/java/org/xdoclet/plugin/hibernate/Property.jelly,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** Property.jelly 22 Jun 2005 15:54:03 -0000 1.13
--- Property.jelly 17 Sep 2005 15:57:41 -0000 1.14
***************
*** 5,9 ****
<property
name="${property.name}"
! access="${propertyTag.access}"
type="${propertyTag.type}"
column="${plugin.buildComponentColumnName(propertyTag.column)}"
--- 5,9 ----
<property
name="${property.name}"
! access="${property.access}"
type="${propertyTag.type}"
column="${plugin.buildComponentColumnName(propertyTag.column)}"
Index: Map.jelly
===================================================================
RCS file:
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-hibernate/src/main/java/org/xdoclet/plugin/hibernate/Map.jelly,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** Map.jelly 2 Sep 2005 09:14:01 -0000 1.14
--- Map.jelly 17 Sep 2005 15:57:41 -0000 1.15
***************
*** 4,8 ****
<map
name="${property.name}"
! access="${mapTag.access}"
table="${mapTag.table}"
schema="${mapTag.schema}"
--- 4,8 ----
<map
name="${property.name}"
! access="${property.access}"
table="${mapTag.table}"
schema="${mapTag.schema}"
Index: Bag.jelly
===================================================================
RCS file:
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-hibernate/src/main/java/org/xdoclet/plugin/hibernate/Bag.jelly,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** Bag.jelly 2 Sep 2005 09:14:00 -0000 1.12
--- Bag.jelly 17 Sep 2005 15:57:41 -0000 1.13
***************
*** 4,8 ****
<bag
name="${property.name}"
! access="${bagTag.access}"
table="${bagTag.table}"
schema="${bagTag.schema}"
--- 4,8 ----
<bag
name="${property.name}"
! access="${property.access}"
table="${bagTag.table}"
schema="${bagTag.schema}"
Index: AbstractHibernatePlugin.java
===================================================================
RCS file:
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-hibernate/src/main/java/org/xdoclet/plugin/hibernate/AbstractHibernatePlugin.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** AbstractHibernatePlugin.java 10 Aug 2005 15:42:03 -0000 1.4
--- AbstractHibernatePlugin.java 17 Sep 2005 15:57:41 -0000 1.5
***************
*** 6,19 ****
package org.xdoclet.plugin.hibernate;
- import java.io.File;
-
- import java.net.URL;
-
import org.generama.JellyTemplateEngine;
import org.generama.QDoxCapableMetadataProvider;
import org.generama.WriterMapper;
-
import org.generama.defaults.QDoxPlugin;
- import org.generama.defaults.XMLOutputValidator;
/**
--- 6,13 ----
Index: KeyManyToOne.jelly
===================================================================
RCS file:
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-hibernate/src/main/java/org/xdoclet/plugin/hibernate/KeyManyToOne.jelly,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** KeyManyToOne.jelly 31 May 2005 11:24:36 -0000 1.2
--- KeyManyToOne.jelly 17 Sep 2005 15:57:41 -0000 1.3
***************
*** 3,7 ****
<key-many-to-one name="${keyProperty.name}"
! access="${keyManyToOneTag.access}"
type="${keyManyToOneTag.type}"
column="${keyManyToOneTag.column}"
--- 3,7 ----
<key-many-to-one name="${keyProperty.name}"
! access="${property.access}"
type="${keyManyToOneTag.type}"
column="${keyManyToOneTag.column}"
Index: HibernateMappingPlugin.jelly
===================================================================
RCS file:
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-hibernate/src/main/java/org/xdoclet/plugin/hibernate/HibernateMappingPlugin.jelly,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** HibernateMappingPlugin.jelly 2 Sep 2005 09:14:01 -0000 1.15
--- HibernateMappingPlugin.jelly 17 Sep 2005 15:57:41 -0000 1.16
***************
*** 13,17 ****
catalog="${hibernateMapping.catalog}"
default-cascade="${hibernateMapping.defaultCascade}"
! default-access="${hibernateMapping.defaultAccess}"
default-lazy="${hibernateMapping.defaultLazy}"
auto-import="${hibernateMapping.autoImport}"
--- 13,17 ----
catalog="${hibernateMapping.catalog}"
default-cascade="${hibernateMapping.defaultCascade}"
! default-access="${property.access}"
default-lazy="${hibernateMapping.defaultLazy}"
auto-import="${hibernateMapping.autoImport}"
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.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** Class.jelly 2 Sep 2005 09:14:01 -0000 1.23
--- Class.jelly 17 Sep 2005 15:57:41 -0000 1.24
***************
*** 91,95 ****
</j:if>
<j:set var="versionTimestampDeclared" value="true"/>
! <version name="${property.name}"
access="${versionTag.access}" type="${versionTag.type}"
column="${versionTag.column}" unsaved-value="${versionTag.unsavedValue}">
<j:forEach var="metaTag"
items="${property.entity.getTagsByName('hibernate.meta')}">
<j:import uri="/Meta.jelly" inherit="true"/>
--- 91,95 ----
</j:if>
<j:set var="versionTimestampDeclared" value="true"/>
! <version name="${property.name}" access="${property.access}"
type="${versionTag.type}" column="${versionTag.column}"
unsaved-value="${versionTag.unsavedValue}">
<j:forEach var="metaTag"
items="${property.entity.getTagsByName('hibernate.meta')}">
<j:import uri="/Meta.jelly" inherit="true"/>
***************
*** 105,109 ****
</j:if>
<j:set var="versionTimestampDeclared" value="true"/>
! <timestamp name="${property.name}"
column="${timestampTag.column}" access="${timestampTag.access}"
unsaved-value="${timestampTag.unsavedValue}">
<j:forEach var="metaTag"
items="${property.entity.getTagsByName('hibernate.meta')}">
<j:import uri="/Meta.jelly" inherit="true"/>
--- 105,109 ----
</j:if>
<j:set var="versionTimestampDeclared" value="true"/>
! <timestamp name="${property.name}"
column="${timestampTag.column}" access="${property.access}"
unsaved-value="${timestampTag.unsavedValue}">
<j:forEach var="metaTag"
items="${property.entity.getTagsByName('hibernate.meta')}">
<j:import uri="/Meta.jelly" inherit="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.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** HibernateMappingPlugin.java 2 Sep 2005 09:14:01 -0000 1.50
--- HibernateMappingPlugin.java 17 Sep 2005 15:57:41 -0000 1.51
***************
*** 25,29 ****
import org.xdoclet.plugin.hibernate.qtags.TagLibrary;
! import com.thoughtworks.qdox.model.*;
/**
--- 25,34 ----
import org.xdoclet.plugin.hibernate.qtags.TagLibrary;
! import com.thoughtworks.qdox.model.AbstractJavaEntity;
! import com.thoughtworks.qdox.model.BeanProperty;
! import com.thoughtworks.qdox.model.DocletTag;
! import com.thoughtworks.qdox.model.JavaClass;
! import com.thoughtworks.qdox.model.JavaField;
! import com.thoughtworks.qdox.model.JavaMethod;
/**
***************
*** 428,432 ****
property.setName(beanProperties[i].getName());
property.setEntity(beanProperties[i].getAccessor());
!
if (!accumulate.contains(property)) {
accumulate.add(property);
--- 433,441 ----
property.setName(beanProperties[i].getName());
property.setEntity(beanProperties[i].getAccessor());
!
if("field".equals(((DocletTag)getTags(beanProperties[i].getAccessor(),requieredTags).get(0)).getNamedParameter("access")))
{
! property.setAccess("field");
! } else {
! property.setAccess("method");
! }
if (!accumulate.contains(property)) {
accumulate.add(property);
***************
*** 442,446 ****
property.setName(fields[i].getName());
property.setEntity(fields[i]);
! property.setAccess("field");
if (!accumulate.contains(property)) {
--- 451,459 ----
property.setName(fields[i].getName());
property.setEntity(fields[i]);
! if("method".equals(((DocletTag)getTags(fields[i],
requieredTags).get(0)).getNamedParameter("access"))) {
! property.setAccess("method");
! } else {
! property.setAccess("field");
! }
if (!accumulate.contains(property)) {
Index: KeyProperty.jelly
===================================================================
RCS file:
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-hibernate/src/main/java/org/xdoclet/plugin/hibernate/KeyProperty.jelly,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** KeyProperty.jelly 22 Jun 2005 15:54:03 -0000 1.3
--- KeyProperty.jelly 17 Sep 2005 15:57:41 -0000 1.4
***************
*** 3,7 ****
<key-property name="${keyProperty.name}"
! access="${keyPropertyTag.access}"
type="${keyPropertyTag.type}"
column="${keyPropertyTag.column}"
--- 3,7 ----
<key-property name="${keyProperty.name}"
! access="${property.access}"
type="${keyPropertyTag.type}"
column="${keyPropertyTag.column}"
Index: PrimitiveArray.jelly
===================================================================
RCS file:
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-hibernate/src/main/java/org/xdoclet/plugin/hibernate/PrimitiveArray.jelly,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** PrimitiveArray.jelly 24 Aug 2005 09:42:35 -0000 1.9
--- PrimitiveArray.jelly 17 Sep 2005 15:57:41 -0000 1.10
***************
*** 4,8 ****
<primitive-array
name="${property.name}"
! access="${primitiveArrayTag.access}"
table="${primitiveArrayTag.table}"
schema="${primitiveArrayTag.schema}"
--- 4,8 ----
<primitive-array
name="${property.name}"
! access="${property.access}"
table="${primitiveArrayTag.table}"
schema="${primitiveArrayTag.schema}"
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.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** CompositeId.jelly 22 Jun 2005 15:54:03 -0000 1.10
--- CompositeId.jelly 17 Sep 2005 15:57:41 -0000 1.11
***************
*** 3,7 ****
<composite-id
name="${property.name}"
! access="${compositeIdTag.access}"
class="${property.entity.returns.value}"
unsaved-value="${compositeIdTag.unsavedValue}"
--- 3,7 ----
<composite-id
name="${property.name}"
! access="${property.access}"
class="${property.entity.returns.value}"
unsaved-value="${compositeIdTag.unsavedValue}"
Index: Any.jelly
===================================================================
RCS file:
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-hibernate/src/main/java/org/xdoclet/plugin/hibernate/Any.jelly,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** Any.jelly 22 Jun 2005 15:54:03 -0000 1.11
--- Any.jelly 17 Sep 2005 15:57:41 -0000 1.12
***************
*** 4,8 ****
<any
name="${property.name}"
! access="${anyTag.access}"
id-type="${anyTag.idType}"
meta-type="${anyTag.metaType}"
--- 4,8 ----
<any
name="${property.name}"
! access="${property.access}"
id-type="${anyTag.idType}"
meta-type="${anyTag.metaType}"
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.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** Component.jelly 4 Jul 2005 12:34:15 -0000 1.14
--- Component.jelly 17 Sep 2005 15:57:41 -0000 1.15
***************
*** 6,10 ****
class="${componentTag.class_}"
name="${property.name}"
! access="${componentTag.access}"
unique="${componentTag.unique}"
update="${componentTag.update}"
--- 6,10 ----
class="${componentTag.class_}"
name="${property.name}"
! access="${property.access}"
unique="${componentTag.unique}"
update="${componentTag.update}"
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.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Id.jelly 22 Jun 2005 15:54:03 -0000 1.6
--- Id.jelly 17 Sep 2005 15:57:41 -0000 1.7
***************
*** 4,8 ****
<id name="${property.name}"
node="${idTag.node}"
! access="${idTag.access}"
column="${idTag.column}"
type="${idTag.type}"
--- 4,8 ----
<id name="${property.name}"
node="${idTag.node}"
! access="${property.access}"
column="${idTag.column}"
type="${idTag.type}"
Index: Array.jelly
===================================================================
RCS file:
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-hibernate/src/main/java/org/xdoclet/plugin/hibernate/Array.jelly,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Array.jelly 24 Aug 2005 09:42:35 -0000 1.9
--- Array.jelly 17 Sep 2005 15:57:41 -0000 1.10
***************
*** 4,8 ****
<array
name="${property.name}"
! access="${arrayTag.access}"
table="${arrayTag.table}"
schema="${arrayTag.schema}"
--- 4,8 ----
<array
name="${property.name}"
! access="${property.access}"
table="${arrayTag.table}"
schema="${arrayTag.schema}"
Index: Set.jelly
===================================================================
RCS file:
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-hibernate/src/main/java/org/xdoclet/plugin/hibernate/Set.jelly,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** Set.jelly 2 Sep 2005 09:14:01 -0000 1.12
--- Set.jelly 17 Sep 2005 15:57:41 -0000 1.13
***************
*** 4,8 ****
<set
name="${property.name}"
! access="${setTag.access}"
table="${setTag.table}"
schema="${setTag.schema}"
--- 4,8 ----
<set
name="${property.name}"
! access="${property.access}"
table="${setTag.table}"
schema="${setTag.schema}"
-------------------------------------------------------
SF.Net email is sponsored by:
Tame your development challenges with Apache's Geronimo App Server.
Download it for free - -and be entered to win a 42" plasma tv or your very
own Sony(tm)PSP. Click here to play: http://sourceforge.net/geronimo.php
_______________________________________________
xdoclet-plugins-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xdoclet-plugins-commits
