[gatein-commits] gatein SVN: r1182 - in portal/trunk: component/application-registry/src/main/java/org/exoplatform/application/gadget/impl and 12 other directories.

Author: julien_viet Date: 2010-01-06 11:10:25 -0500 (Wed, 06 Jan 2010) New Revision: 1182 Removed: portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/NodeAware.java Modified: portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/GadgetDefinition.java portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/GadgetRegistry.java portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/LocalGadgetData.java portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/RemoteGadgetData.java portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/CategoryDefinition.java portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/ContentDefinition.java portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/ContentRegistry.java portal/trunk/component/common/src/test/java/org/exoplatform/commons/chromattic/FooEntity.java portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/POMSession.java portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/ContentProviderHelper.java portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/gadget/GadgetState.java portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/portlet/PortletState.java portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/portlet/PreferenceState.java portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/wsrp/WSRPState.java portal/trunk/component/web/src/main/java/org/exoplatform/web/security/security/TokenContainer.java portal/trunk/component/web/src/main/java/org/exoplatform/web/security/security/TokenEntry.java portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/mapping/EndpointInfoMapping.java portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/mapping/ProducerInfoMapping.java portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/mapping/ProducerInfosMapping.java portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/mapping/RegistrationInfoMapping.java portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/mapping/RegistrationPropertyMapping.java portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/mapping/RegistrationPropertyDescriptionMapping.java portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/configuration/mapping/ProducerConfigurationMapping.java portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/configuration/mapping/RegistrationRequirementsMapping.java portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/mapping/ConsumerCapabilitiesMapping.java portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/mapping/ConsumerGroupMapping.java 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/ConsumersAndGroupsMapping.java 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/RegistrationPropertiesMapping.java portal/trunk/pom.xml Log: GTNPORTAL-444 : Integrate MOP 1.0.0-Beta13 GTNPORTAL-445 : Integrate Chromattic 1.0.0-beta13 release Modified: portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/GadgetDefinition.java =================================================================== --- portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/GadgetDefinition.java 2010-01-06 15:55:44 UTC (rev 1181) +++ portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/GadgetDefinition.java 2010-01-06 16:10:25 UTC (rev 1182) @@ -21,8 +21,9 @@ import org.chromattic.api.annotations.Create; import org.chromattic.api.annotations.MappedBy; import org.chromattic.api.annotations.Name; -import org.chromattic.api.annotations.NodeMapping; +import org.chromattic.api.annotations.PrimaryType; import org.chromattic.api.annotations.OneToOne; +import org.chromattic.api.annotations.PrimaryType; import org.chromattic.api.annotations.Property; import org.chromattic.ntdef.NTFolder; @@ -30,7 +31,7 @@ * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> * @version $Revision$ */ -@NodeMapping(name = "app:gadgetdefinition") +@PrimaryType(name = "app:gadgetdefinition") public abstract class GadgetDefinition { Modified: portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/GadgetRegistry.java =================================================================== --- portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/GadgetRegistry.java 2010-01-06 15:55:44 UTC (rev 1181) +++ portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/GadgetRegistry.java 2010-01-06 16:10:25 UTC (rev 1182) @@ -19,7 +19,7 @@ package org.exoplatform.application.gadget.impl; import org.chromattic.api.annotations.Create; -import org.chromattic.api.annotations.NodeMapping; +import org.chromattic.api.annotations.PrimaryType; import org.chromattic.api.annotations.OneToMany; import java.util.Collection; @@ -29,7 +29,7 @@ * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> * @version $Revision$ */ -@NodeMapping(name = "app:gadgetregistry") +@PrimaryType(name = "app:gadgetregistry") public abstract class GadgetRegistry { Modified: portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/LocalGadgetData.java =================================================================== --- portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/LocalGadgetData.java 2010-01-06 15:55:44 UTC (rev 1181) +++ portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/LocalGadgetData.java 2010-01-06 16:10:25 UTC (rev 1182) @@ -23,13 +23,13 @@ import org.apache.shindig.gadgets.spec.ModulePrefs; import org.chromattic.api.annotations.ManyToOne; import org.chromattic.api.annotations.MappedBy; -import org.chromattic.api.annotations.NodeMapping; +import org.chromattic.api.annotations.PrimaryType; import org.chromattic.api.annotations.OneToOne; +import org.chromattic.api.annotations.PrimaryType; import org.chromattic.api.annotations.Property; import org.chromattic.ntdef.NTFile; import org.chromattic.ntdef.Resource; import org.exoplatform.application.gadget.EncodingDetector; -import org.exoplatform.application.registry.impl.NodeAware; import org.chromattic.ntdef.NTFolder; @@ -41,8 +41,8 @@ * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> * @version $Revision$ */ -@NodeMapping(name = "app:localgadgetdata") -public abstract class LocalGadgetData extends GadgetData implements NodeAware +@PrimaryType(name = "app:localgadgetdata") +public abstract class LocalGadgetData extends GadgetData { @ManyToOne Modified: portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/RemoteGadgetData.java =================================================================== --- portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/RemoteGadgetData.java 2010-01-06 15:55:44 UTC (rev 1181) +++ portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/RemoteGadgetData.java 2010-01-06 16:10:25 UTC (rev 1182) @@ -18,14 +18,14 @@ */ package org.exoplatform.application.gadget.impl; -import org.chromattic.api.annotations.NodeMapping; +import org.chromattic.api.annotations.PrimaryType; import org.chromattic.api.annotations.Property; /** * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> * @version $Revision$ */ -@NodeMapping(name = "app:remotegadgetdata") +@PrimaryType(name = "app:remotegadgetdata") public abstract class RemoteGadgetData extends GadgetData { Modified: portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/CategoryDefinition.java =================================================================== --- portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/CategoryDefinition.java 2010-01-06 15:55:44 UTC (rev 1181) +++ portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/CategoryDefinition.java 2010-01-06 16:10:25 UTC (rev 1182) @@ -20,7 +20,7 @@ import org.chromattic.api.annotations.Create; import org.chromattic.api.annotations.Name; -import org.chromattic.api.annotations.NodeMapping; +import org.chromattic.api.annotations.PrimaryType; import org.chromattic.api.annotations.OneToMany; import org.chromattic.api.annotations.Property; import org.exoplatform.portal.pom.config.POMSession; @@ -36,7 +36,7 @@ * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> * @version $Revision$ */ -@NodeMapping(name = "app:contentcategory") +@PrimaryType(name = "app:contentcategory") public abstract class CategoryDefinition { Modified: portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/ContentDefinition.java =================================================================== --- portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/ContentDefinition.java 2010-01-06 15:55:44 UTC (rev 1181) +++ portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/ContentDefinition.java 2010-01-06 16:10:25 UTC (rev 1182) @@ -21,7 +21,7 @@ import org.chromattic.api.annotations.Id; import org.chromattic.api.annotations.ManyToOne; import org.chromattic.api.annotations.Name; -import org.chromattic.api.annotations.NodeMapping; +import org.chromattic.api.annotations.PrimaryType; import org.chromattic.api.annotations.Property; import org.exoplatform.portal.pom.config.POMSession; import org.gatein.mop.api.content.Customization; @@ -34,7 +34,7 @@ * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> * @version $Revision$ */ -@NodeMapping(name = "app:content") +@PrimaryType(name = "app:content") public abstract class ContentDefinition { Modified: portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/ContentRegistry.java =================================================================== --- portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/ContentRegistry.java 2010-01-06 15:55:44 UTC (rev 1181) +++ portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/ContentRegistry.java 2010-01-06 16:10:25 UTC (rev 1182) @@ -19,7 +19,7 @@ package org.exoplatform.application.registry.impl; import org.chromattic.api.annotations.Create; -import org.chromattic.api.annotations.NodeMapping; +import org.chromattic.api.annotations.PrimaryType; import org.chromattic.api.annotations.OneToMany; import java.util.List; @@ -29,7 +29,7 @@ * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> * @version $Revision$ */ -@NodeMapping(name = "app:contentregistry") +@PrimaryType(name = "app:contentregistry") public abstract class ContentRegistry { Deleted: portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/NodeAware.java =================================================================== --- portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/NodeAware.java 2010-01-06 15:55:44 UTC (rev 1181) +++ portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/NodeAware.java 2010-01-06 16:10:25 UTC (rev 1182) @@ -1,32 +0,0 @@ -/* - * Copyright (C) 2009 eXo Platform SAS. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.exoplatform.application.registry.impl; - -import javax.jcr.Node; - -/** - * Temporary hack. - * - * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> - * @version $Revision$ - */ -public interface NodeAware -{ - void setNode(Node node); -} Modified: portal/trunk/component/common/src/test/java/org/exoplatform/commons/chromattic/FooEntity.java =================================================================== --- portal/trunk/component/common/src/test/java/org/exoplatform/commons/chromattic/FooEntity.java 2010-01-06 15:55:44 UTC (rev 1181) +++ portal/trunk/component/common/src/test/java/org/exoplatform/commons/chromattic/FooEntity.java 2010-01-06 16:10:25 UTC (rev 1182) @@ -18,14 +18,14 @@ */ package org.exoplatform.commons.chromattic; -import org.chromattic.api.annotations.NodeMapping; +import org.chromattic.api.annotations.PrimaryType; import org.chromattic.api.annotations.WorkspaceName; /** * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> * @version $Revision$ */ -@NodeMapping(name = "nt:base") +@PrimaryType(name = "nt:base") public abstract class FooEntity { Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/POMSession.java =================================================================== --- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/POMSession.java 2010-01-06 15:55:44 UTC (rev 1181) +++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/POMSession.java 2010-01-06 16:10:25 UTC (rev 1182) @@ -242,15 +242,15 @@ { if (siteType == ObjectType.PORTAL_SITE) { - ownerTypeChunk = "portalsites"; + ownerTypeChunk = "mop:portalsites"; } else if (siteType == ObjectType.GROUP_SITE) { - ownerTypeChunk = "groupsites"; + ownerTypeChunk = "mop:groupsites"; } else { - ownerTypeChunk = "usersites"; + ownerTypeChunk = "mop:usersites"; } } else @@ -272,13 +272,13 @@ { statement = "jcr:path LIKE '" + workspaceChunk + "/" + ownerTypeChunk + "/" + ownerIdChunk - + "/rootpage/children/pages/children/%'"; + + "/mop:rootpage/mop:children/mop:pages/mop:children/%'"; } else { statement = "jcr:path LIKE '" + workspaceChunk + "/" + ownerTypeChunk + "/" + ownerIdChunk - + "/rootnavigation/children/default'"; + + "/mop:rootnavigation/mop:children/mop:default'"; } } catch (IllegalArgumentException e) @@ -301,7 +301,7 @@ { statement = "jcr:path LIKE '" + workspaceChunk + "/" + ownerTypeChunk + "/" + ownerIdChunk - + "/rootpage/children/pages/children/%' AND mop:title='" + title + "'"; + + "/mop:rootpage/mop:children/mop:pages/mop:children/%' AND mop:title='" + title + "'"; } else { @@ -314,13 +314,13 @@ { statement = "jcr:path LIKE '" + workspaceChunk + "/" + ownerTypeChunk + "/" + ownerIdChunk - + "/rootpage/children/pages/children/%'"; + + "/mop:rootpage/mop:children/mop:pages/mop:children/%'"; } else { statement = "jcr:path LIKE '" + workspaceChunk + "/" + ownerTypeChunk + "/" + ownerIdChunk - + "/rootnavigation/children/default'"; + + "/mop:rootnavigation/mop:children/mop:default'"; } } } Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/ContentProviderHelper.java =================================================================== --- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/ContentProviderHelper.java 2010-01-06 15:55:44 UTC (rev 1181) +++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/ContentProviderHelper.java 2010-01-06 16:10:25 UTC (rev 1182) @@ -33,7 +33,8 @@ */ public class ContentProviderHelper { - private static final String STATE = "state"; + /** . */ + private static final String STATE_NODE_NAME = "mop:state"; public static <InternalState, State> void setState(StateContainer container, State state, HelpableContentProvider<InternalState, State> provider) @@ -46,9 +47,9 @@ // InternalState internalState; - if (node.hasNode(STATE)) + if (node.hasNode(STATE_NODE_NAME)) { - Node stateNode = node.getNode(STATE); + Node stateNode = node.getNode(STATE_NODE_NAME); internalState = (InternalState)session.findById(Object.class, stateNode.getUUID()); if (state == null) { @@ -64,7 +65,7 @@ } else { - Node stateNode = node.addNode(STATE, provider.getNodeName()); + Node stateNode = node.addNode(STATE_NODE_NAME, provider.getNodeName()); internalState = (InternalState)session.findById(Object.class, stateNode.getUUID()); } } @@ -89,9 +90,9 @@ // InternalState prefs; - if (node.hasNode(STATE)) + if (node.hasNode(STATE_NODE_NAME)) { - Node stateNode = node.getNode(STATE); + Node stateNode = node.getNode(STATE_NODE_NAME); prefs = (InternalState)session.findById(Object.class, stateNode.getUUID()); return provider.getState(prefs); } Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/gadget/GadgetState.java =================================================================== --- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/gadget/GadgetState.java 2010-01-06 15:55:44 UTC (rev 1181) +++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/gadget/GadgetState.java 2010-01-06 16:10:25 UTC (rev 1182) @@ -19,14 +19,14 @@ package org.exoplatform.portal.pom.spi.gadget; -import org.chromattic.api.annotations.NodeMapping; +import org.chromattic.api.annotations.PrimaryType; import org.chromattic.api.annotations.Property; /** * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> * @version $Revision$ */ -@NodeMapping(name = GadgetState.MOP_NODE_NAME) +@PrimaryType(name = GadgetState.MOP_NODE_NAME) public abstract class GadgetState { static final String MOP_NODE_NAME = "mop:gadget"; Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/portlet/PortletState.java =================================================================== --- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/portlet/PortletState.java 2010-01-06 15:55:44 UTC (rev 1181) +++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/portlet/PortletState.java 2010-01-06 16:10:25 UTC (rev 1182) @@ -20,7 +20,7 @@ package org.exoplatform.portal.pom.spi.portlet; import org.chromattic.api.annotations.Create; -import org.chromattic.api.annotations.NodeMapping; +import org.chromattic.api.annotations.PrimaryType; import org.chromattic.api.annotations.OneToMany; import org.chromattic.api.annotations.OneToOne; import org.chromattic.api.annotations.RelatedMappedBy; @@ -32,7 +32,7 @@ * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> * @version $Revision$ */ -@NodeMapping(name = PortletState.MOP_NODE_NAME) +@PrimaryType(name = PortletState.MOP_NODE_NAME) public abstract class PortletState { Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/portlet/PreferenceState.java =================================================================== --- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/portlet/PreferenceState.java 2010-01-06 15:55:44 UTC (rev 1181) +++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/portlet/PreferenceState.java 2010-01-06 16:10:25 UTC (rev 1182) @@ -21,7 +21,7 @@ import org.chromattic.api.annotations.ManyToOne; import org.chromattic.api.annotations.Name; -import org.chromattic.api.annotations.NodeMapping; +import org.chromattic.api.annotations.PrimaryType; import org.chromattic.api.annotations.Property; import java.util.List; @@ -30,7 +30,7 @@ * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> * @version $Revision$ */ -@NodeMapping(name = "mop:portletpreference") +@PrimaryType(name = "mop:portletpreference") public abstract class PreferenceState { Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/wsrp/WSRPState.java =================================================================== --- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/wsrp/WSRPState.java 2010-01-06 15:55:44 UTC (rev 1181) +++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/wsrp/WSRPState.java 2010-01-06 16:10:25 UTC (rev 1182) @@ -22,7 +22,7 @@ package org.exoplatform.portal.pom.spi.wsrp; -import org.chromattic.api.annotations.NodeMapping; +import org.chromattic.api.annotations.PrimaryType; import org.chromattic.api.annotations.Property; import java.io.InputStream; @@ -31,7 +31,7 @@ * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> * @version $Revision$ */ -@NodeMapping(name = WSRPState.MOP_NODE_NAME) +@PrimaryType(name = WSRPState.MOP_NODE_NAME) public abstract class WSRPState { static final String MOP_NODE_NAME = "mop:wsrpstate"; Modified: portal/trunk/component/web/src/main/java/org/exoplatform/web/security/security/TokenContainer.java =================================================================== --- portal/trunk/component/web/src/main/java/org/exoplatform/web/security/security/TokenContainer.java 2010-01-06 15:55:44 UTC (rev 1181) +++ portal/trunk/component/web/src/main/java/org/exoplatform/web/security/security/TokenContainer.java 2010-01-06 16:10:25 UTC (rev 1182) @@ -19,7 +19,7 @@ package org.exoplatform.web.security.security; import org.chromattic.api.annotations.Create; -import org.chromattic.api.annotations.NodeMapping; +import org.chromattic.api.annotations.PrimaryType; import org.chromattic.api.annotations.OneToMany; import org.exoplatform.web.security.Credentials; import org.exoplatform.web.security.Token; @@ -32,7 +32,7 @@ * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> * @version $Revision$ */ -@NodeMapping(name = "lgn:tokencontainer") +@PrimaryType(name = "lgn:tokencontainer") public abstract class TokenContainer { Modified: portal/trunk/component/web/src/main/java/org/exoplatform/web/security/security/TokenEntry.java =================================================================== --- portal/trunk/component/web/src/main/java/org/exoplatform/web/security/security/TokenEntry.java 2010-01-06 15:55:44 UTC (rev 1181) +++ portal/trunk/component/web/src/main/java/org/exoplatform/web/security/security/TokenEntry.java 2010-01-06 16:10:25 UTC (rev 1182) @@ -20,7 +20,7 @@ import org.chromattic.api.annotations.Destroy; import org.chromattic.api.annotations.Name; -import org.chromattic.api.annotations.NodeMapping; +import org.chromattic.api.annotations.PrimaryType; import org.chromattic.api.annotations.Property; import org.exoplatform.web.security.Credentials; import org.exoplatform.web.security.Token; @@ -31,7 +31,7 @@ * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> * @version $Revision$ */ -@NodeMapping(name = "lgn:tokenentry") +@PrimaryType(name = "lgn:tokenentry") public abstract class TokenEntry { Modified: portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/mapping/EndpointInfoMapping.java =================================================================== --- portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/mapping/EndpointInfoMapping.java 2010-01-06 15:55:44 UTC (rev 1181) +++ portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/mapping/EndpointInfoMapping.java 2010-01-06 16:10:25 UTC (rev 1182) @@ -23,7 +23,7 @@ package org.gatein.portal.wsrp.state.consumer.mapping; -import org.chromattic.api.annotations.NodeMapping; +import org.chromattic.api.annotations.PrimaryType; import org.chromattic.api.annotations.Property; import org.gatein.wsrp.consumer.EndpointConfigurationInfo; @@ -31,7 +31,7 @@ * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> * @version $Revision$ */ -@NodeMapping(name = EndpointInfoMapping.NODE_NAME) +@PrimaryType(name = EndpointInfoMapping.NODE_NAME) public abstract class EndpointInfoMapping { public static final String NODE_NAME = "wsrp:endpointinfo"; Modified: portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/mapping/ProducerInfoMapping.java =================================================================== --- portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/mapping/ProducerInfoMapping.java 2010-01-06 15:55:44 UTC (rev 1181) +++ portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/mapping/ProducerInfoMapping.java 2010-01-06 16:10:25 UTC (rev 1182) @@ -26,7 +26,7 @@ import org.chromattic.api.annotations.DefaultValue; import org.chromattic.api.annotations.Id; import org.chromattic.api.annotations.MappedBy; -import org.chromattic.api.annotations.NodeMapping; +import org.chromattic.api.annotations.PrimaryType; import org.chromattic.api.annotations.OneToOne; import org.chromattic.api.annotations.Property; import org.gatein.wsrp.consumer.EndpointConfigurationInfo; @@ -37,7 +37,7 @@ * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> * @version $Revision$ */ -@NodeMapping(name = ProducerInfoMapping.NODE_NAME) +@PrimaryType(name = ProducerInfoMapping.NODE_NAME) public abstract class ProducerInfoMapping { public static final String NODE_NAME = "wsrp:producerinfo"; Modified: portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/mapping/ProducerInfosMapping.java =================================================================== --- portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/mapping/ProducerInfosMapping.java 2010-01-06 15:55:44 UTC (rev 1181) +++ portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/mapping/ProducerInfosMapping.java 2010-01-06 16:10:25 UTC (rev 1182) @@ -24,7 +24,7 @@ package org.gatein.portal.wsrp.state.consumer.mapping; import org.chromattic.api.annotations.Create; -import org.chromattic.api.annotations.NodeMapping; +import org.chromattic.api.annotations.PrimaryType; import org.chromattic.api.annotations.OneToMany; import java.util.List; @@ -33,7 +33,7 @@ * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> * @version $Revision$ */ -@NodeMapping(name = ProducerInfosMapping.NODE_NAME) +@PrimaryType(name = ProducerInfosMapping.NODE_NAME) public abstract class ProducerInfosMapping { public static final String NODE_NAME = "wsrp:producerinfos"; Modified: portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/mapping/RegistrationInfoMapping.java =================================================================== --- portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/mapping/RegistrationInfoMapping.java 2010-01-06 15:55:44 UTC (rev 1181) +++ portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/mapping/RegistrationInfoMapping.java 2010-01-06 16:10:25 UTC (rev 1182) @@ -25,7 +25,7 @@ import org.chromattic.api.annotations.Create; import org.chromattic.api.annotations.FormattedBy; -import org.chromattic.api.annotations.NodeMapping; +import org.chromattic.api.annotations.PrimaryType; import org.chromattic.api.annotations.OneToMany; import org.chromattic.api.annotations.Property; import org.exoplatform.commons.utils.Safe; @@ -43,7 +43,7 @@ * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> * @version $Revision$ */ -@NodeMapping(name = RegistrationInfoMapping.NODE_NAME) +@PrimaryType(name = RegistrationInfoMapping.NODE_NAME) @FormattedBy(JCRPersister.QNameFormatter.class) public abstract class RegistrationInfoMapping { Modified: portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/mapping/RegistrationPropertyMapping.java =================================================================== --- portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/mapping/RegistrationPropertyMapping.java 2010-01-06 15:55:44 UTC (rev 1181) +++ portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/mapping/RegistrationPropertyMapping.java 2010-01-06 16:10:25 UTC (rev 1182) @@ -25,7 +25,7 @@ import org.chromattic.api.annotations.Create; import org.chromattic.api.annotations.MappedBy; -import org.chromattic.api.annotations.NodeMapping; +import org.chromattic.api.annotations.PrimaryType; import org.chromattic.api.annotations.OneToOne; import org.chromattic.api.annotations.Property; import org.gatein.portal.wsrp.state.mapping.RegistrationPropertyDescriptionMapping; @@ -36,7 +36,7 @@ * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> * @version $Revision$ */ -@NodeMapping(name = RegistrationPropertyMapping.NODE_NAME) +@PrimaryType(name = RegistrationPropertyMapping.NODE_NAME) public abstract class RegistrationPropertyMapping { public static final String NODE_NAME = "wsrp:registrationproperty"; Modified: portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/mapping/RegistrationPropertyDescriptionMapping.java =================================================================== --- portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/mapping/RegistrationPropertyDescriptionMapping.java 2010-01-06 15:55:44 UTC (rev 1181) +++ portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/mapping/RegistrationPropertyDescriptionMapping.java 2010-01-06 16:10:25 UTC (rev 1182) @@ -23,7 +23,7 @@ package org.gatein.portal.wsrp.state.mapping; -import org.chromattic.api.annotations.NodeMapping; +import org.chromattic.api.annotations.PrimaryType; import org.chromattic.api.annotations.Property; import org.gatein.wsrp.registration.LocalizedString; import org.gatein.wsrp.registration.RegistrationPropertyDescription; @@ -34,7 +34,7 @@ * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> * @version $Revision$ */ -@NodeMapping(name = RegistrationPropertyDescriptionMapping.NODE_NAME) +@PrimaryType(name = RegistrationPropertyDescriptionMapping.NODE_NAME) public abstract class RegistrationPropertyDescriptionMapping { public static final String NODE_NAME = "wsrp:registrationpropertydescription"; Modified: portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/configuration/mapping/ProducerConfigurationMapping.java =================================================================== --- portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/configuration/mapping/ProducerConfigurationMapping.java 2010-01-06 15:55:44 UTC (rev 1181) +++ portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/configuration/mapping/ProducerConfigurationMapping.java 2010-01-06 16:10:25 UTC (rev 1182) @@ -23,7 +23,7 @@ package org.gatein.portal.wsrp.state.producer.configuration.mapping; import org.chromattic.api.annotations.MappedBy; -import org.chromattic.api.annotations.NodeMapping; +import org.chromattic.api.annotations.PrimaryType; import org.chromattic.api.annotations.OneToOne; import org.chromattic.api.annotations.Property; import org.gatein.wsrp.producer.config.ProducerConfiguration; @@ -34,7 +34,7 @@ * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> * @version $Revision$ */ -@NodeMapping(name = ProducerConfigurationMapping.NODE_NAME) +@PrimaryType(name = ProducerConfigurationMapping.NODE_NAME) public abstract class ProducerConfigurationMapping { public static final String NODE_NAME = "wsrp:producerconfiguration"; Modified: portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/configuration/mapping/RegistrationRequirementsMapping.java =================================================================== --- portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/configuration/mapping/RegistrationRequirementsMapping.java 2010-01-06 15:55:44 UTC (rev 1181) +++ portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/configuration/mapping/RegistrationRequirementsMapping.java 2010-01-06 16:10:25 UTC (rev 1182) @@ -23,7 +23,7 @@ package org.gatein.portal.wsrp.state.producer.configuration.mapping; import org.chromattic.api.annotations.Create; -import org.chromattic.api.annotations.NodeMapping; +import org.chromattic.api.annotations.PrimaryType; import org.chromattic.api.annotations.OneToMany; import org.chromattic.api.annotations.Property; import org.gatein.portal.wsrp.state.mapping.RegistrationPropertyDescriptionMapping; @@ -37,7 +37,7 @@ * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> * @version $Revision$ */ -@NodeMapping(name = RegistrationRequirementsMapping.NODE_NAME) +@PrimaryType(name = RegistrationRequirementsMapping.NODE_NAME) public abstract class RegistrationRequirementsMapping { public static final String NODE_NAME = "wsrp:registrationrequirements"; Modified: portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/mapping/ConsumerCapabilitiesMapping.java =================================================================== --- portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/mapping/ConsumerCapabilitiesMapping.java 2010-01-06 15:55:44 UTC (rev 1181) +++ portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/mapping/ConsumerCapabilitiesMapping.java 2010-01-06 16:10:25 UTC (rev 1182) @@ -23,7 +23,7 @@ package org.gatein.portal.wsrp.state.producer.registrations.mapping; -import org.chromattic.api.annotations.NodeMapping; +import org.chromattic.api.annotations.PrimaryType; import org.chromattic.api.annotations.Property; import org.gatein.common.util.ParameterValidation; import org.gatein.pc.api.Mode; @@ -38,7 +38,7 @@ * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> * @version $Revision$ */ -@NodeMapping(name = ConsumerCapabilitiesMapping.NODE_NAME) +@PrimaryType(name = ConsumerCapabilitiesMapping.NODE_NAME) public abstract class ConsumerCapabilitiesMapping { public static final String NODE_NAME = "wsrp:consumercapabilities"; Modified: portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/mapping/ConsumerGroupMapping.java =================================================================== --- portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/mapping/ConsumerGroupMapping.java 2010-01-06 15:55:44 UTC (rev 1181) +++ portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/mapping/ConsumerGroupMapping.java 2010-01-06 16:10:25 UTC (rev 1182) @@ -24,7 +24,7 @@ import org.chromattic.api.annotations.FindById; import org.chromattic.api.annotations.Id; -import org.chromattic.api.annotations.NodeMapping; +import org.chromattic.api.annotations.PrimaryType; import org.chromattic.api.annotations.OneToMany; import org.chromattic.api.annotations.Property; import org.chromattic.api.annotations.RelatedMappedBy; @@ -42,7 +42,7 @@ * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> * @version $Revision$ */ -@NodeMapping(name = ConsumerGroupMapping.NODE_NAME) +@PrimaryType(name = ConsumerGroupMapping.NODE_NAME) public abstract class ConsumerGroupMapping { public static final String NODE_NAME = "wsrp:consumergroup"; 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-01-06 15:55:44 UTC (rev 1181) +++ portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/mapping/ConsumerMapping.java 2010-01-06 16:10:25 UTC (rev 1182) @@ -28,7 +28,7 @@ import org.chromattic.api.annotations.Id; import org.chromattic.api.annotations.ManyToOne; import org.chromattic.api.annotations.MappedBy; -import org.chromattic.api.annotations.NodeMapping; +import org.chromattic.api.annotations.PrimaryType; import org.chromattic.api.annotations.OneToMany; import org.chromattic.api.annotations.OneToOne; import org.chromattic.api.annotations.Property; @@ -47,7 +47,7 @@ * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> * @version $Revision$ */ -@NodeMapping(name = ConsumerMapping.NODE_NAME) +@PrimaryType(name = ConsumerMapping.NODE_NAME) public abstract class ConsumerMapping { public static final String NODE_NAME = "wsrp:consumer"; Modified: portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/mapping/ConsumersAndGroupsMapping.java =================================================================== --- portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/mapping/ConsumersAndGroupsMapping.java 2010-01-06 15:55:44 UTC (rev 1181) +++ portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/mapping/ConsumersAndGroupsMapping.java 2010-01-06 16:10:25 UTC (rev 1182) @@ -23,7 +23,7 @@ package org.gatein.portal.wsrp.state.producer.registrations.mapping; import org.chromattic.api.annotations.Create; -import org.chromattic.api.annotations.NodeMapping; +import org.chromattic.api.annotations.PrimaryType; import org.chromattic.api.annotations.OneToMany; import java.util.List; @@ -32,7 +32,7 @@ * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> * @version $Revision$ */ -@NodeMapping(name = ConsumersAndGroupsMapping.NODE_NAME) +@PrimaryType(name = ConsumersAndGroupsMapping.NODE_NAME) public abstract class ConsumersAndGroupsMapping { public static final String NODE_NAME = "wsrp:consumersandgroups"; 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-01-06 15:55:44 UTC (rev 1181) +++ portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/mapping/RegistrationMapping.java 2010-01-06 16:10:25 UTC (rev 1182) @@ -26,7 +26,7 @@ import org.chromattic.api.annotations.Id; import org.chromattic.api.annotations.ManyToOne; import org.chromattic.api.annotations.MappedBy; -import org.chromattic.api.annotations.NodeMapping; +import org.chromattic.api.annotations.PrimaryType; import org.chromattic.api.annotations.OneToOne; import org.chromattic.api.annotations.Property; import org.gatein.common.util.ParameterValidation; @@ -45,7 +45,7 @@ * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> * @version $Revision$ */ -@NodeMapping(name = RegistrationMapping.NODE_NAME) +@PrimaryType(name = RegistrationMapping.NODE_NAME) public abstract class RegistrationMapping { public static final String NODE_NAME = "wsrp:registration"; Modified: portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/mapping/RegistrationPropertiesMapping.java =================================================================== --- portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/mapping/RegistrationPropertiesMapping.java 2010-01-06 15:55:44 UTC (rev 1181) +++ portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/mapping/RegistrationPropertiesMapping.java 2010-01-06 16:10:25 UTC (rev 1182) @@ -22,7 +22,7 @@ package org.gatein.portal.wsrp.state.producer.registrations.mapping; -import org.chromattic.api.annotations.NodeMapping; +import org.chromattic.api.annotations.PrimaryType; import org.chromattic.api.annotations.Properties; import javax.xml.namespace.QName; @@ -34,7 +34,7 @@ * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> * @version $Revision$ */ -@NodeMapping(name = RegistrationPropertiesMapping.NODE_NAME) +@PrimaryType(name = RegistrationPropertiesMapping.NODE_NAME) public abstract class RegistrationPropertiesMapping { public static final String NODE_NAME = "wsrp:registrationproperties"; Modified: portal/trunk/pom.xml =================================================================== --- portal/trunk/pom.xml 2010-01-06 15:55:44 UTC (rev 1181) +++ portal/trunk/pom.xml 2010-01-06 16:10:25 UTC (rev 1182) @@ -48,13 +48,13 @@ <org.gatein.pc.version>2.1.0-CR01</org.gatein.pc.version> <org.picketlink.idm>1.1.0.Beta1</org.picketlink.idm> <org.gatein.wsrp.version>1.0.0-Beta03</org.gatein.wsrp.version> - <org.gatein.mop.version>1.0.0-Beta12</org.gatein.mop.version> + <org.gatein.mop.version>1.0.0-Beta13</org.gatein.mop.version> <org.slf4j.version>1.5.6</org.slf4j.version> <rhino.version>1.6R5</rhino.version> <org.codehaus.groovy.version>1.6.5</org.codehaus.groovy.version> <javax.servlet.version>2.5</javax.servlet.version> - <version.chromattic>1.0.0-beta11</version.chromattic> - <version.reflect>1.0.0-beta4</version.reflect> + <version.chromattic>1.0.0-beta13</version.chromattic> + <version.reflect>1.0.0-beta5</version.reflect> <!-- ************** --> <!-- Build settings -->