You are viewing a plain text version of this content. The canonical link for it is here.
Posted to graffito-commits@incubator.apache.org by cl...@apache.org on 2005/09/06 22:00:53 UTC
svn commit: r279141 - in
/incubator/graffito/trunk/jcr-mapping/src/java/org/apache/portals/graffito/jcr/mapper:
impl/DisgesterDescriptorReader.java model/ClassDescriptor.java
model/CollectionDescriptor.java model/FieldDescriptor.java
Author: clombart
Date: Tue Sep 6 15:00:48 2005
New Revision: 279141
URL: http://svn.apache.org/viewcvs?rev=279141&view=rev
Log:
* Review Mapper model (minor changes)
* Add the collectionConverter attribute in the CollectionDescriptor. By this way, it is possible to change the collection mapping strategy and to support all kind of Collections & Maps
Modified:
incubator/graffito/trunk/jcr-mapping/src/java/org/apache/portals/graffito/jcr/mapper/impl/DisgesterDescriptorReader.java
incubator/graffito/trunk/jcr-mapping/src/java/org/apache/portals/graffito/jcr/mapper/model/ClassDescriptor.java
incubator/graffito/trunk/jcr-mapping/src/java/org/apache/portals/graffito/jcr/mapper/model/CollectionDescriptor.java
incubator/graffito/trunk/jcr-mapping/src/java/org/apache/portals/graffito/jcr/mapper/model/FieldDescriptor.java
Modified: incubator/graffito/trunk/jcr-mapping/src/java/org/apache/portals/graffito/jcr/mapper/impl/DisgesterDescriptorReader.java
URL: http://svn.apache.org/viewcvs/incubator/graffito/trunk/jcr-mapping/src/java/org/apache/portals/graffito/jcr/mapper/impl/DisgesterDescriptorReader.java?rev=279141&r1=279140&r2=279141&view=diff
==============================================================================
--- incubator/graffito/trunk/jcr-mapping/src/java/org/apache/portals/graffito/jcr/mapper/impl/DisgesterDescriptorReader.java (original)
+++ incubator/graffito/trunk/jcr-mapping/src/java/org/apache/portals/graffito/jcr/mapper/impl/DisgesterDescriptorReader.java Tue Sep 6 15:00:48 2005
@@ -89,6 +89,7 @@
digester.addSetProperties("graffito-jcr/class-descriptor/collection-descriptor", "proxy", "proxy");
digester.addSetProperties("graffito-jcr/class-descriptor/collection-descriptor", "fieldId", "fieldId");
digester.addSetProperties("graffito-jcr/class-descriptor/collection-descriptor", "className", "className");
+ digester.addSetProperties("graffito-jcr/class-descriptor/collection-descriptor", "collectionConverter", "collectionConverterClassName");
digester.addSetNext("graffito-jcr/class-descriptor/collection-descriptor", "addCollectionDescriptor");
Modified: incubator/graffito/trunk/jcr-mapping/src/java/org/apache/portals/graffito/jcr/mapper/model/ClassDescriptor.java
URL: http://svn.apache.org/viewcvs/incubator/graffito/trunk/jcr-mapping/src/java/org/apache/portals/graffito/jcr/mapper/model/ClassDescriptor.java?rev=279141&r1=279140&r2=279141&view=diff
==============================================================================
--- incubator/graffito/trunk/jcr-mapping/src/java/org/apache/portals/graffito/jcr/mapper/model/ClassDescriptor.java (original)
+++ incubator/graffito/trunk/jcr-mapping/src/java/org/apache/portals/graffito/jcr/mapper/model/ClassDescriptor.java Tue Sep 6 15:00:48 2005
@@ -73,6 +73,7 @@
*/
public void addFieldDescriptor(FieldDescriptor fieldDescriptor )
{
+ fieldDescriptor.setClassDescriptor(this);
fieldDescriptors.put(fieldDescriptor.getFieldName(), fieldDescriptor);
}
Modified: incubator/graffito/trunk/jcr-mapping/src/java/org/apache/portals/graffito/jcr/mapper/model/CollectionDescriptor.java
URL: http://svn.apache.org/viewcvs/incubator/graffito/trunk/jcr-mapping/src/java/org/apache/portals/graffito/jcr/mapper/model/CollectionDescriptor.java?rev=279141&r1=279140&r2=279141&view=diff
==============================================================================
--- incubator/graffito/trunk/jcr-mapping/src/java/org/apache/portals/graffito/jcr/mapper/model/CollectionDescriptor.java (original)
+++ incubator/graffito/trunk/jcr-mapping/src/java/org/apache/portals/graffito/jcr/mapper/model/CollectionDescriptor.java Tue Sep 6 15:00:48 2005
@@ -30,6 +30,7 @@
private String jcrName;
private String fieldId;
private String className;
+ private String collectionConverterClassName;
private boolean proxy;
/**
@@ -104,4 +105,16 @@
{
this.proxy = proxy;
}
+
+ public String getCollectionConverterClassName()
+ {
+ return collectionConverterClassName;
+ }
+
+ public void setCollectionConverterClassName(String collectionConverterClassName)
+ {
+ this.collectionConverterClassName = collectionConverterClassName;
+ }
+
+
}
Modified: incubator/graffito/trunk/jcr-mapping/src/java/org/apache/portals/graffito/jcr/mapper/model/FieldDescriptor.java
URL: http://svn.apache.org/viewcvs/incubator/graffito/trunk/jcr-mapping/src/java/org/apache/portals/graffito/jcr/mapper/model/FieldDescriptor.java?rev=279141&r1=279140&r2=279141&view=diff
==============================================================================
--- incubator/graffito/trunk/jcr-mapping/src/java/org/apache/portals/graffito/jcr/mapper/model/FieldDescriptor.java (original)
+++ incubator/graffito/trunk/jcr-mapping/src/java/org/apache/portals/graffito/jcr/mapper/model/FieldDescriptor.java Tue Sep 6 15:00:48 2005
@@ -28,6 +28,7 @@
private String fieldName;
private String jcrName;
+ private ClassDescriptor classDescriptor;
/**
@@ -58,4 +59,16 @@
{
this.jcrName = jcrName;
}
+
+ public ClassDescriptor getClassDescriptor()
+ {
+ return classDescriptor;
+ }
+
+ public void setClassDescriptor(ClassDescriptor classDescriptor)
+ {
+ this.classDescriptor = classDescriptor;
+ }
+
+
}