Author: julien_viet Date: 2011-03-25 12:31:17 -0400 (Fri, 25 Mar 2011) New Revision: 6126 Removed: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/MOPFormatter.java components/mop/trunk/core/src/test/java/org/gatein/mop/core/api/POMFormatterTestCase.java Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/AttributesImpl.java components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/ModelImpl.java components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/NavigationContainer.java components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/PageContainer.java components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/SiteContainer.java components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/SiteImpl.java components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/WorkspaceObjectImpl.java components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/content/AbstractCustomization.java components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/content/ContextType.java components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/content/ContextTypeContainer.java components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/content/CustomizationContainer.java components/mop/trunk/core/src/test/java/org/gatein/mop/core/support/content/portlet/PortletPreferenceState.java components/mop/trunk/pom.xml Log: GTNMOP-35 : Update to Chromattic 1.1.0-beta2 and JCR 1.14-CR1 Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/AttributesImpl.java =================================================================== --- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/AttributesImpl.java 2011-03-25 15:33:48 UTC (rev 6125) +++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/AttributesImpl.java 2011-03-25 16:31:17 UTC (rev 6126) @@ -23,9 +23,10 @@ import org.chromattic.api.annotations.Create; import org.chromattic.api.annotations.FormattedBy; import org.chromattic.api.annotations.NamingPolicy; +import org.chromattic.api.annotations.NamingPrefix; import org.chromattic.api.annotations.OneToMany; import org.chromattic.api.annotations.PrimaryType; -import org.gatein.mop.core.api.MOPFormatter; +import org.chromattic.ext.format.BaseEncodingObjectFormatter; import org.gatein.mop.core.util.AbstractAttributes; import java.util.Date; @@ -37,7 +38,8 @@ * @version $Revision$ */ @PrimaryType(name = "mop:attributes") -(a)FormattedBy(MOPFormatter.class) +@NamingPrefix("mop") +(a)FormattedBy(BaseEncodingObjectFormatter.class) @NamingPolicy(onDuplicate = NameConflictResolution.REPLACE) public abstract class AttributesImpl extends AbstractAttributes { Deleted: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/MOPFormatter.java =================================================================== --- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/MOPFormatter.java 2011-03-25 15:33:48 UTC (rev 6125) +++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/MOPFormatter.java 2011-03-25 16:31:17 UTC (rev 6126) @@ -1,37 +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.gatein.mop.core.api; - -import org.chromattic.api.format.ObjectFormatter; -import org.chromattic.api.format.FormatterContext; -import org.chromattic.ext.format.AbstractEncodingObjectFormatter; - -/** - * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> - * @version $Revision$ - */ -public class MOPFormatter extends AbstractEncodingObjectFormatter -{ - - public String getPrefix() - { - return "mop:"; - } - -} Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/ModelImpl.java =================================================================== --- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/ModelImpl.java 2011-03-25 15:33:48 UTC (rev 6125) +++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/ModelImpl.java 2011-03-25 16:31:17 UTC (rev 6126) @@ -148,7 +148,7 @@ workspace = session.findByPath(WorkspaceImpl.class, "mop:workspace"); if (workspace == null) { - workspace = session.insert(WorkspaceImpl.class, "mop:workspace"); + workspace = session.insert(WorkspaceImpl.class, "mop", "workspace"); } } return workspace; Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/NavigationContainer.java =================================================================== --- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/NavigationContainer.java 2011-03-25 15:33:48 UTC (rev 6125) +++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/NavigationContainer.java 2011-03-25 16:31:17 UTC (rev 6126) @@ -19,12 +19,13 @@ package org.gatein.mop.core.api.workspace; import org.chromattic.api.annotations.FormattedBy; +import org.chromattic.api.annotations.NamingPrefix; import org.chromattic.api.annotations.OneToMany; import org.chromattic.api.annotations.OneToOne; import org.chromattic.api.annotations.Create; import org.chromattic.api.annotations.PrimaryType; import org.chromattic.api.annotations.MappedBy; -import org.gatein.mop.core.api.MOPFormatter; +import org.chromattic.ext.format.BaseEncodingObjectFormatter; import java.util.List; import java.util.Map; @@ -34,7 +35,8 @@ * @version $Revision$ */ @PrimaryType(name = "mop:navigationcontainer") -(a)FormattedBy(MOPFormatter.class) +@NamingPrefix("mop") +(a)FormattedBy(BaseEncodingObjectFormatter.class) public abstract class NavigationContainer { Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/PageContainer.java =================================================================== --- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/PageContainer.java 2011-03-25 15:33:48 UTC (rev 6125) +++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/PageContainer.java 2011-03-25 16:31:17 UTC (rev 6126) @@ -19,12 +19,13 @@ package org.gatein.mop.core.api.workspace; import org.chromattic.api.annotations.FormattedBy; +import org.chromattic.api.annotations.NamingPrefix; import org.chromattic.api.annotations.OneToMany; import org.chromattic.api.annotations.OneToOne; import org.chromattic.api.annotations.Create; import org.chromattic.api.annotations.PrimaryType; import org.chromattic.api.annotations.MappedBy; -import org.gatein.mop.core.api.MOPFormatter; +import org.chromattic.ext.format.BaseEncodingObjectFormatter; import java.util.Map; @@ -33,7 +34,8 @@ * @version $Revision$ */ @PrimaryType(name = "mop:pagecontainer") -(a)FormattedBy(MOPFormatter.class) +@NamingPrefix("mop") +(a)FormattedBy(BaseEncodingObjectFormatter.class) public abstract class PageContainer { Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/SiteContainer.java =================================================================== --- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/SiteContainer.java 2011-03-25 15:33:48 UTC (rev 6125) +++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/SiteContainer.java 2011-03-25 16:31:17 UTC (rev 6126) @@ -19,13 +19,11 @@ package org.gatein.mop.core.api.workspace; import org.chromattic.api.annotations.FormattedBy; -import org.chromattic.api.annotations.MappedBy; +import org.chromattic.api.annotations.NamingPrefix; import org.chromattic.api.annotations.OneToMany; -import org.chromattic.api.annotations.OneToOne; import org.chromattic.api.annotations.Create; import org.chromattic.api.annotations.PrimaryType; -import org.gatein.mop.api.workspace.Site; -import org.gatein.mop.core.api.MOPFormatter; +import org.chromattic.ext.format.BaseEncodingObjectFormatter; import java.util.Collection; import java.util.Map; @@ -34,7 +32,8 @@ * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> * @version $Revision$ */ -(a)FormattedBy(MOPFormatter.class) +@NamingPrefix("mop") +(a)FormattedBy(BaseEncodingObjectFormatter.class) @PrimaryType(name = "foo") public abstract class SiteContainer<T extends SiteImpl> { Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/SiteImpl.java =================================================================== --- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/SiteImpl.java 2011-03-25 15:33:48 UTC (rev 6125) +++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/SiteImpl.java 2011-03-25 16:31:17 UTC (rev 6126) @@ -21,21 +21,23 @@ import org.chromattic.api.RelationshipType; import org.chromattic.api.annotations.FormattedBy; import org.chromattic.api.annotations.ManyToOne; +import org.chromattic.api.annotations.NamingPrefix; import org.chromattic.api.annotations.OneToOne; import org.chromattic.api.annotations.MappedBy; import org.chromattic.api.annotations.Destroy; import org.chromattic.api.annotations.Owner; import org.chromattic.api.annotations.PrimaryType; +import org.chromattic.ext.format.BaseEncodingObjectFormatter; import org.gatein.mop.api.workspace.Site; import org.gatein.mop.api.workspace.Page; import org.gatein.mop.api.workspace.ObjectType; -import org.gatein.mop.core.api.MOPFormatter; /** * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> * @version $Revision$ */ -(a)FormattedBy(MOPFormatter.class) +@NamingPrefix("mop") +(a)FormattedBy(BaseEncodingObjectFormatter.class) @PrimaryType(name = "mop:site") public abstract class SiteImpl<C extends SiteContainer> extends WorkspaceObjectImpl implements Site { Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/WorkspaceObjectImpl.java =================================================================== --- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/WorkspaceObjectImpl.java 2011-03-25 15:33:48 UTC (rev 6125) +++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/WorkspaceObjectImpl.java 2011-03-25 16:31:17 UTC (rev 6126) @@ -19,18 +19,19 @@ package org.gatein.mop.core.api.workspace; import org.chromattic.api.annotations.*; +import org.chromattic.ext.format.BaseEncodingObjectFormatter; import org.gatein.mop.api.workspace.WorkspaceObject; import org.gatein.mop.api.workspace.ObjectType; import org.gatein.mop.api.content.CustomizationContext; import org.gatein.mop.core.api.AttributesImpl; -import org.gatein.mop.core.api.MOPFormatter; import org.gatein.mop.core.api.ModelImpl; /** * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> * @version $Revision$ */ -(a)FormattedBy(MOPFormatter.class) +@NamingPrefix("mop") +(a)FormattedBy(BaseEncodingObjectFormatter.class) @PrimaryType(name = "mop:workspaceobject") public abstract class WorkspaceObjectImpl implements WorkspaceObject { Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/content/AbstractCustomization.java =================================================================== --- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/content/AbstractCustomization.java 2011-03-25 15:33:48 UTC (rev 6125) +++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/content/AbstractCustomization.java 2011-03-25 16:31:17 UTC (rev 6126) @@ -19,17 +19,17 @@ package org.gatein.mop.core.api.workspace.content; import org.chromattic.api.annotations.FormattedBy; +import org.chromattic.api.annotations.NamingPrefix; import org.chromattic.api.annotations.Owner; import org.chromattic.api.annotations.PrimaryType; +import org.chromattic.ext.format.BaseEncodingObjectFormatter; import org.gatein.mop.api.content.Customization; import org.gatein.mop.api.content.CustomizationContext; import org.gatein.mop.api.content.ContentType; import org.gatein.mop.api.workspace.WorkspaceCustomizationContext; -import org.gatein.mop.core.api.MOPFormatter; import org.gatein.mop.core.api.content.CustomizationContextComparator; import org.gatein.mop.core.api.content.ContentManagerRegistry; import org.gatein.mop.spi.content.ContentProvider; -import org.gatein.mop.spi.content.StateContainer; import org.chromattic.api.annotations.OneToOne; import org.chromattic.api.annotations.MappedBy; import org.chromattic.api.annotations.Create; @@ -48,7 +48,8 @@ * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> * @version $Revision$ */ -(a)FormattedBy(MOPFormatter.class) +@NamingPrefix("mop") +(a)FormattedBy(BaseEncodingObjectFormatter.class) @PrimaryType(name = "mop:customization") public abstract class AbstractCustomization implements Customization<Object> { Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/content/ContextType.java =================================================================== --- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/content/ContextType.java 2011-03-25 15:33:48 UTC (rev 6125) +++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/content/ContextType.java 2011-03-25 16:31:17 UTC (rev 6126) @@ -19,11 +19,12 @@ package org.gatein.mop.core.api.workspace.content; import org.chromattic.api.annotations.FormattedBy; +import org.chromattic.api.annotations.NamingPrefix; import org.chromattic.api.annotations.OneToMany; import org.chromattic.api.annotations.Name; import org.chromattic.api.annotations.ManyToOne; import org.chromattic.api.annotations.PrimaryType; -import org.gatein.mop.core.api.MOPFormatter; +import org.chromattic.ext.format.BaseEncodingObjectFormatter; import java.util.Map; @@ -32,7 +33,8 @@ * @version $Revision$ */ @PrimaryType(name = "mop:contexttype") -(a)FormattedBy(MOPFormatter.class) +@NamingPrefix("mop") +(a)FormattedBy(BaseEncodingObjectFormatter.class) public abstract class ContextType { Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/content/ContextTypeContainer.java =================================================================== --- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/content/ContextTypeContainer.java 2011-03-25 15:33:48 UTC (rev 6125) +++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/content/ContextTypeContainer.java 2011-03-25 16:31:17 UTC (rev 6126) @@ -19,7 +19,7 @@ package org.gatein.mop.core.api.workspace.content; import org.chromattic.api.annotations.*; -import org.gatein.mop.core.api.MOPFormatter; +import org.chromattic.ext.format.BaseEncodingObjectFormatter; import java.util.Map; @@ -28,7 +28,8 @@ * @version $Revision$ */ @PrimaryType(name = "mop:contexttypecontainer") -(a)FormattedBy(MOPFormatter.class) +@NamingPrefix("mop") +(a)FormattedBy(BaseEncodingObjectFormatter.class) public abstract class ContextTypeContainer { Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/content/CustomizationContainer.java =================================================================== --- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/content/CustomizationContainer.java 2011-03-25 15:33:48 UTC (rev 6125) +++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/content/CustomizationContainer.java 2011-03-25 16:31:17 UTC (rev 6126) @@ -19,15 +19,15 @@ package org.gatein.mop.core.api.workspace.content; import org.chromattic.api.annotations.FormattedBy; +import org.chromattic.api.annotations.NamingPrefix; import org.chromattic.api.annotations.PrimaryType; +import org.chromattic.ext.format.BaseEncodingObjectFormatter; import org.gatein.mop.api.content.Customization; import org.gatein.mop.api.content.ContentType; -import org.gatein.mop.api.workspace.WorkspaceCustomizationContext; import org.chromattic.api.annotations.Create; import org.chromattic.api.annotations.OneToOne; import org.chromattic.api.annotations.OneToMany; import org.chromattic.api.annotations.MappedBy; -import org.gatein.mop.core.api.MOPFormatter; import org.gatein.mop.core.api.workspace.WorkspaceCustomizationContextImpl; import java.util.Map; @@ -37,7 +37,8 @@ * @version $Revision$ */ @PrimaryType(name = "mop:customizationcontainer") -(a)FormattedBy(MOPFormatter.class) +@NamingPrefix("mop") +(a)FormattedBy(BaseEncodingObjectFormatter.class) public abstract class CustomizationContainer { Deleted: components/mop/trunk/core/src/test/java/org/gatein/mop/core/api/POMFormatterTestCase.java =================================================================== --- components/mop/trunk/core/src/test/java/org/gatein/mop/core/api/POMFormatterTestCase.java 2011-03-25 15:33:48 UTC (rev 6125) +++ components/mop/trunk/core/src/test/java/org/gatein/mop/core/api/POMFormatterTestCase.java 2011-03-25 16:31:17 UTC (rev 6126) @@ -1,76 +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.gatein.mop.core.api; - -import junit.framework.TestCase; -import org.chromattic.api.format.ObjectFormatter; - -/** - * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> - * @version $Revision$ - */ -public class POMFormatterTestCase extends TestCase -{ - - /** . */ - private final ObjectFormatter formatter = new MOPFormatter(); - - private void assertString(String expected, String s) - { - assertEquals(expected, formatter.encodeNodeName(null, s)); - assertEquals(s, formatter.decodeNodeName(null, expected)); - } - - private void assertCannotDecode(String s) - { - try - { - formatter.decodeNodeName(null, s); - fail(); - } - catch (IllegalStateException ignore) - { - } - } - - public void testStrings() - { - assertString("mop:", ""); - assertString("mop:a", "a"); - assertString("mop:%00", "{"); - assertString("mop:%01", "}"); - assertString("mop:%02", "."); - assertString("mop:%03", "/"); - assertString("mop:%04", ":"); - assertString("mop:%05", "["); - assertString("mop:%06", "]"); - assertString("mop:%07", "|"); - assertString("mop:%08", "*"); - assertString("mop:%09", "%"); - assertString("mop:a%03b", "a/b"); - } - - public void testDecodeFailure() - { - assertCannotDecode("%0"); - assertCannotDecode("%0" + (char)('0' - 1)); - assertCannotDecode("%0" + (char)('9' + 1)); - assertCannotDecode("%1"); - } -} Modified: components/mop/trunk/core/src/test/java/org/gatein/mop/core/support/content/portlet/PortletPreferenceState.java =================================================================== --- components/mop/trunk/core/src/test/java/org/gatein/mop/core/support/content/portlet/PortletPreferenceState.java 2011-03-25 15:33:48 UTC (rev 6125) +++ components/mop/trunk/core/src/test/java/org/gatein/mop/core/support/content/portlet/PortletPreferenceState.java 2011-03-25 16:31:17 UTC (rev 6126) @@ -18,12 +18,10 @@ */ package org.gatein.mop.core.support.content.portlet; -import org.chromattic.api.annotations.FormattedBy; import org.chromattic.api.annotations.ManyToOne; import org.chromattic.api.annotations.Name; import org.chromattic.api.annotations.PrimaryType; import org.chromattic.api.annotations.Property; -import org.gatein.mop.core.api.MOPFormatter; import java.util.List; @@ -32,7 +30,6 @@ * @version $Revision$ */ @PrimaryType(name = "mop:portletpreference") -(a)FormattedBy(MOPFormatter.class) public abstract class PortletPreferenceState { Modified: components/mop/trunk/pom.xml =================================================================== --- components/mop/trunk/pom.xml 2011-03-25 15:33:48 UTC (rev 6125) +++ components/mop/trunk/pom.xml 2011-03-25 16:31:17 UTC (rev 6126) @@ -124,7 +124,7 @@ <!-- Build settings --> <!-- ************** --> - <org.chromattic.version>1.0.6</org.chromattic.version> + <org.chromattic.version>1.1.0-beta2</org.chromattic.version> <!-- Current testuite doesn't work with surefire 2.7 defined in parent pom @@ -143,14 +143,4 @@ <module>core</module> </modules> - <!-- for testing purpose only --> - <profiles> - <profile> - <id>chromattictrunk</id> - <properties> - <org.chromattic.version>1.1.0-SNAPSHOT</org.chromattic.version> - </properties> - </profile> - </profiles> - </project>