You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by cl...@apache.org on 2007/10/10 23:47:06 UTC
svn commit: r583627 -
/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/mapper/impl/annotation/AnnotationDescriptorReader.java
Author: clombart
Date: Wed Oct 10 14:47:05 2007
New Revision: 583627
URL: http://svn.apache.org/viewvc?rev=583627&view=rev
Log:
Bug fix : the class descriptor was build without checking the implemented interfaces.
Modified:
jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/mapper/impl/annotation/AnnotationDescriptorReader.java
Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/mapper/impl/annotation/AnnotationDescriptorReader.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/mapper/impl/annotation/AnnotationDescriptorReader.java?rev=583627&r1=583626&r2=583627&view=diff
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/mapper/impl/annotation/AnnotationDescriptorReader.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/mapper/impl/annotation/AnnotationDescriptorReader.java Wed Oct 10 14:47:05 2007
@@ -70,7 +70,8 @@
Node nodeAnnotation = (Node) clazz.getAnnotation(Node.class);
if (nodeAnnotation != null)
{
- classDescriptor = createClassDescriptor(clazz, nodeAnnotation);
+ classDescriptor = createClassDescriptor(clazz, nodeAnnotation);
+ addImplementDescriptor(classDescriptor, clazz);
addAttributeDescriptors(mappingDescriptor, classDescriptor, clazz);
return classDescriptor;
}
@@ -88,6 +89,7 @@
ClassDescriptor classDescriptor = new ClassDescriptor();
classDescriptor.setClassName(clazz.getName());
classDescriptor.setJcrType(nodeAnnotation.jcrType());
+ classDescriptor.setDiscriminator(nodeAnnotation.discriminator());
if (nodeAnnotation.jcrSuperTypes() != null && ! nodeAnnotation.jcrSuperTypes().equals(""))
{
classDescriptor.setJcrSuperTypes(nodeAnnotation.jcrSuperTypes());