Author: julien_viet Date: 2009-10-05 11:39:14 -0400 (Mon, 05 Oct 2009) New Revision: 283 Modified: components/mop/trunk/api/src/main/java/org/gatein/mop/api/Model.java components/mop/trunk/api/src/main/java/org/gatein/mop/api/content/Customization.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/content/AbstractCustomization.java components/mop/trunk/core/src/test/java/org/gatein/mop/core/api/workspace/WorkspaceTestCase.java Log: update to chromattic 1.0.O-beta4 Modified: components/mop/trunk/api/src/main/java/org/gatein/mop/api/Model.java =================================================================== --- components/mop/trunk/api/src/main/java/org/gatein/mop/api/Model.java 2009-10-05 15:34:01 UTC (rev 282) +++ components/mop/trunk/api/src/main/java/org/gatein/mop/api/Model.java 2009-10-05 15:39:14 UTC (rev 283) @@ -21,6 +21,7 @@ import org.gatein.mop.api.workspace.Workspace; import org.gatein.mop.api.workspace.WorkspaceObject; import org.gatein.mop.api.workspace.ObjectType; +import org.gatein.mop.api.content.Customization; import java.util.Iterator; @@ -55,6 +56,8 @@ String pathOf(WorkspaceObject o); + Customization<?> findCustomizationById(String id); + void save(); void close(); Modified: components/mop/trunk/api/src/main/java/org/gatein/mop/api/content/Customization.java =================================================================== --- components/mop/trunk/api/src/main/java/org/gatein/mop/api/content/Customization.java 2009-10-05 15:34:01 UTC (rev 282) +++ components/mop/trunk/api/src/main/java/org/gatein/mop/api/content/Customization.java 2009-10-05 15:39:14 UTC (rev 283) @@ -31,6 +31,13 @@ public interface Customization<S> { /** + * Returns the customization id + * + * @return the customization id + */ + String getId(); + + /** * Returns the content id this customization refers to. * * @return the content id 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 2009-10-05 15:34:01 UTC (rev 282) +++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/ModelImpl.java 2009-10-05 15:39:14 UTC (rev 283) @@ -40,6 +40,7 @@ import org.gatein.mop.core.api.workspace.content.ContextSpecialization; import org.gatein.mop.core.api.workspace.content.AbstractCustomization; import org.gatein.mop.api.content.CustomizationContext; +import org.gatein.mop.api.content.Customization; import org.gatein.mop.api.workspace.Workspace; import org.gatein.mop.api.workspace.ObjectType; import org.gatein.mop.api.workspace.WorkspaceObject; @@ -140,16 +141,20 @@ public void created(Object o) { inject(o, false); } - public void loaded(Object o) { + public void loaded(String id, String path, String name, Object o) { inject(o, true); } - public void persisted(Object o) { + public void added(String id, String path, String name, Object o) { inject(o, true); } - public void removed(Object o) { + public void removed(String id, String path, String name, Object o) { } }; + public Customization<?> findCustomizationById(String id) { + return session.findById(Customization.class, id); + } + public <O extends WorkspaceObject> Iterator<O> findObject(ObjectType<O> type, String statement) { Class<? extends WorkspaceObjectImpl> impl = typeToClassImpl.get(type); return session.createQueryBuilder().from(impl).<O>where(statement).get().iterator(); 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 2009-10-05 15:34:01 UTC (rev 282) +++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/content/AbstractCustomization.java 2009-10-05 15:39:14 UTC (rev 283) @@ -29,6 +29,7 @@ import org.chromattic.api.annotations.OneToOne; import org.chromattic.api.annotations.MappedBy; import org.chromattic.api.annotations.Create; +import org.chromattic.api.annotations.Id; import org.chromattic.api.ChromatticSession; import java.util.Set; @@ -63,6 +64,9 @@ /** . */ public ChromatticSession session; + @Id + public abstract String getId(); + @OneToOne @MappedBy("contexttypes") abstract ContextTypeContainer getContextTypes(); Modified: components/mop/trunk/core/src/test/java/org/gatein/mop/core/api/workspace/WorkspaceTestCase.java =================================================================== --- components/mop/trunk/core/src/test/java/org/gatein/mop/core/api/workspace/WorkspaceTestCase.java 2009-10-05 15:34:01 UTC (rev 282) +++ components/mop/trunk/core/src/test/java/org/gatein/mop/core/api/workspace/WorkspaceTestCase.java 2009-10-05 15:39:14 UTC (rev 283) @@ -208,7 +208,7 @@ public void testComponentOrder() { ModelImpl pom = pomService.getModel(); Workspace workspace = pom.getWorkspace(); - Site portal = workspace.addSite(ObjectType.PORTAL_SITE, "portal"); + Site portal = workspace.addSite(ObjectType.PORTAL_SITE, "portal2"); Page root = portal.getRootPage(); UIContainer container = root.getRootComponent();