[gatein-commits] gatein SVN: r2203 - in portal/trunk: web/portal/src/main/webapp/WEB-INF/conf/wsrp and 1 other directory.

[do-not-reply at jboss.org]

Author: julien_viet
Date: 2010-03-12 04:50:24 -0500 (Fri, 12 Mar 2010)
New Revision: 2203

Modified:
   portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/mapping/ConsumerMapping.java
   portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/mapping/RegistrationMapping.java
   portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/wsrp/producer-registrations-nodetypes.xml
Log:
fix bug


Modified: portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/mapping/ConsumerMapping.java
===================================================================
--- portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/mapping/ConsumerMapping.java	2010-03-12 09:29:05 UTC (rev 2202)
+++ portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/mapping/ConsumerMapping.java	2010-03-12 09:50:24 UTC (rev 2203)
@@ -60,8 +60,7 @@
 
    public abstract void setConsumerAgent(String consumerAgent);
 
-   @OneToMany(type = RelationshipType.PATH)
-   @MappedBy("consumer")
+   @OneToMany
    public abstract List<RegistrationMapping> getRegistrations();
 
    @Create

Modified: portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/mapping/RegistrationMapping.java
===================================================================
--- portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/mapping/RegistrationMapping.java	2010-03-12 09:29:05 UTC (rev 2202)
+++ portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/mapping/RegistrationMapping.java	2010-03-12 09:50:24 UTC (rev 2203)
@@ -23,7 +23,6 @@
 
 package org.gatein.portal.wsrp.state.producer.registrations.mapping;
 
-import org.chromattic.api.RelationshipType;
 import org.chromattic.api.annotations.*;
 import org.gatein.common.util.ParameterValidation;
 import org.gatein.portal.wsrp.state.producer.registrations.JCRRegistrationPersistenceManager;
@@ -49,8 +48,7 @@
    @Id
    public abstract String getPersistentKey();
 
-   @ManyToOne(type = RelationshipType.PATH)
-   @MappedBy("consumer")
+   @ManyToOne
    public abstract ConsumerMapping getConsumer();
 
    @Property(name = "status")

Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/wsrp/producer-registrations-nodetypes.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/wsrp/producer-registrations-nodetypes.xml	2010-03-12 09:29:05 UTC (rev 2202)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/wsrp/producer-registrations-nodetypes.xml	2010-03-12 09:50:24 UTC (rev 2203)
@@ -111,10 +111,6 @@
                              onParentVersion="COPY" protected="false" multiple="false">
             <valueConstraints/>
          </propertyDefinition>
-         <propertyDefinition name="consumer" requiredType="Path" autoCreated="false" mandatory="false"
-                             onParentVersion="COPY" protected="false" multiple="false">
-            <valueConstraints/>
-         </propertyDefinition>
       </propertyDefinitions>
       <childNodeDefinitions>
          <childNodeDefinition name="properties" defaultPrimaryType="wsrp:registrationproperties" autoCreated="false"