Author: julien_viet Date: 2010-02-21 13:51:13 -0500 (Sun, 21 Feb 2010) New Revision: 1791 Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/GroupSiteContainer.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/NavigationImpl.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/PageImpl.java components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/PortalSiteContainer.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/UIWindowImpl.java components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/UserSiteContainer.java components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/WorkspaceCustomizationContextImpl.java components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/WorkspaceImpl.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/CustomizationContainer.java components/mop/trunk/core/src/test/java/org/gatein/mop/core/support/content/portlet/PortletPreferencesState.java Log: update to chromattic trunk Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/GroupSiteContainer.java =================================================================== --- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/GroupSiteContainer.java 2010-02-21 01:15:09 UTC (rev 1790) +++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/GroupSiteContainer.java 2010-02-21 18:51:13 UTC (rev 1791) @@ -29,7 +29,7 @@ public abstract class GroupSiteContainer extends SiteContainer<GroupSite> { - @RelatedMappedBy("groupsites") + @RelatedMappedBy("mop:groupsites") public abstract WorkspaceImpl getWorkspace(); } 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 2010-02-21 01:15:09 UTC (rev 1790) +++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/NavigationContainer.java 2010-02-21 18:51:13 UTC (rev 1791) @@ -39,7 +39,7 @@ { @OneToOne - @RelatedMappedBy("children") + @RelatedMappedBy("mop:children") public abstract NavigationImpl getOwner(); @OneToMany Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/NavigationImpl.java =================================================================== --- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/NavigationImpl.java 2010-02-21 01:15:09 UTC (rev 1790) +++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/NavigationImpl.java 2010-02-21 18:51:13 UTC (rev 1791) @@ -44,18 +44,18 @@ { @OneToOne - @RelatedMappedBy("rootnavigation") + @RelatedMappedBy("mop:rootnavigation") public abstract SiteImpl getParentSite(); @OneToOne - @MappedBy("children") + @MappedBy("mop:children") public abstract NavigationContainer getChildrenContainer(); @ManyToOne public abstract NavigationContainer getParentContainer(); @OneToOne - @MappedBy("link") + @MappedBy("mop:link") public abstract LinkImpl getLink(); public abstract LinkImpl setLink(LinkImpl target); 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 2010-02-21 01:15:09 UTC (rev 1790) +++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/PageContainer.java 2010-02-21 18:51:13 UTC (rev 1791) @@ -38,7 +38,7 @@ { @OneToOne - @RelatedMappedBy("children") + @RelatedMappedBy("mop:children") public abstract PageImpl getOwner(); @OneToMany Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/PageImpl.java =================================================================== --- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/PageImpl.java 2010-02-21 01:15:09 UTC (rev 1790) +++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/PageImpl.java 2010-02-21 18:51:13 UTC (rev 1791) @@ -85,18 +85,18 @@ public abstract Collection<? extends WorkspaceObject> getTemplatizedObjects(); @OneToOne - @MappedBy("children") + @MappedBy("mop:children") public abstract PageContainer getChildrenContainer(); @ManyToOne public abstract PageContainer getParentContainer(); @OneToOne - @RelatedMappedBy("rootpage") + @RelatedMappedBy("mop:rootpage") public abstract SiteImpl getSiteParent(); @OneToOne - @MappedBy("rootcomponent") + @MappedBy("mop:rootcomponent") public abstract UIContainerImpl getRootComponent(); @Destroy Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/PortalSiteContainer.java =================================================================== --- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/PortalSiteContainer.java 2010-02-21 01:15:09 UTC (rev 1790) +++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/PortalSiteContainer.java 2010-02-21 18:51:13 UTC (rev 1791) @@ -29,7 +29,7 @@ public abstract class PortalSiteContainer extends SiteContainer<PortalSite> { - @RelatedMappedBy("portalsites") + @RelatedMappedBy("mop:portalsites") public abstract WorkspaceImpl getWorkspace(); 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 2010-02-21 01:15:09 UTC (rev 1790) +++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/SiteImpl.java 2010-02-21 18:51:13 UTC (rev 1791) @@ -40,11 +40,11 @@ { @OneToOne - @MappedBy("rootpage") + @MappedBy("mop:rootpage") public abstract PageImpl getRoot(); @OneToOne - @MappedBy("rootnavigation") + @MappedBy("mop:rootnavigation") public abstract NavigationImpl getRootNavigation(); @ManyToOne Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/UIWindowImpl.java =================================================================== --- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/UIWindowImpl.java 2010-02-21 01:15:09 UTC (rev 1790) +++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/UIWindowImpl.java 2010-02-21 18:51:13 UTC (rev 1791) @@ -48,7 +48,7 @@ // Abstract ********************************************************************************************************** @OneToOne - @MappedBy("customization") + @MappedBy("mop:customization") public abstract WorkspaceCustomization getCustomization(); public abstract void setCustomization(WorkspaceCustomization customization); Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/UserSiteContainer.java =================================================================== --- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/UserSiteContainer.java 2010-02-21 01:15:09 UTC (rev 1790) +++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/UserSiteContainer.java 2010-02-21 18:51:13 UTC (rev 1791) @@ -29,7 +29,7 @@ public abstract class UserSiteContainer extends SiteContainer<UserSite> { - @RelatedMappedBy("usersites") + @RelatedMappedBy("mop:usersites") public abstract WorkspaceImpl getWorkspace(); } \ No newline at end of file Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/WorkspaceCustomizationContextImpl.java =================================================================== --- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/WorkspaceCustomizationContextImpl.java 2010-02-21 01:15:09 UTC (rev 1790) +++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/WorkspaceCustomizationContextImpl.java 2010-02-21 18:51:13 UTC (rev 1791) @@ -40,7 +40,7 @@ public abstract WorkspaceObjectImpl getOwner(); @OneToOne - @MappedBy("customizations") + @MappedBy("mop:customizations") public abstract CustomizationContainer getCustomizations(); public String getContextType() Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/WorkspaceImpl.java =================================================================== --- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/WorkspaceImpl.java 2010-02-21 01:15:09 UTC (rev 1790) +++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/WorkspaceImpl.java 2010-02-21 18:51:13 UTC (rev 1791) @@ -49,15 +49,15 @@ // Abstract ********************************************************************************************************** @OneToOne - @MappedBy("portalsites") + @MappedBy("mop:portalsites") public abstract PortalSiteContainer getPortalSites(); @OneToOne - @MappedBy("groupsites") + @MappedBy("mop:groupsites") public abstract GroupSiteContainer getGroupSites(); @OneToOne - @MappedBy("usersites") + @MappedBy("mop:usersites") public abstract UserSiteContainer getUserSites(); @OneToOne(type = RelationshipType.EMBEDDED) 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 2010-02-21 01:15:09 UTC (rev 1790) +++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/content/AbstractCustomization.java 2010-02-21 18:51:13 UTC (rev 1791) @@ -75,7 +75,7 @@ public abstract String getId(); @OneToOne - @MappedBy("contexttypes") + @MappedBy("mop:contexttypes") abstract ContextTypeContainer getContextTypes(); @Create 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 2010-02-21 01:15:09 UTC (rev 1790) +++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/content/CustomizationContainer.java 2010-02-21 18:51:13 UTC (rev 1791) @@ -42,7 +42,7 @@ { @OneToOne - @RelatedMappedBy("customizations") + @RelatedMappedBy("mop:customizations") public abstract WorkspaceCustomizationContextImpl getOwner(); @OneToMany Modified: components/mop/trunk/core/src/test/java/org/gatein/mop/core/support/content/portlet/PortletPreferencesState.java =================================================================== --- components/mop/trunk/core/src/test/java/org/gatein/mop/core/support/content/portlet/PortletPreferencesState.java 2010-02-21 01:15:09 UTC (rev 1790) +++ components/mop/trunk/core/src/test/java/org/gatein/mop/core/support/content/portlet/PortletPreferencesState.java 2010-02-21 18:51:13 UTC (rev 1791) @@ -45,7 +45,7 @@ public abstract PortletPreferenceState create(); @OneToOne - @RelatedMappedBy("state") + @RelatedMappedBy("mop:state") public abstract AbstractCustomization getCustomization(); private void setPayload(Preferences payload)