Author: julien_viet Date: 2010-03-11 12:19:13 -0500 (Thu, 11 Mar 2010) New Revision: 2180 Modified: components/mop/trunk/core/pom.xml components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/PathAttribute.java 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/PageLinkImpl.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/TemplatizedImpl.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/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/AbstractCustomizationState.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/main/java/org/gatein/mop/core/api/workspace/content/WorkspaceClone.java components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/content/WorkspaceSpecialization.java components/mop/trunk/pom.xml Log: update to chromatic 1.0.0 Modified: components/mop/trunk/core/pom.xml =================================================================== --- components/mop/trunk/core/pom.xml 2010-03-11 16:56:37 UTC (rev 2179) +++ components/mop/trunk/core/pom.xml 2010-03-11 17:19:13 UTC (rev 2180) @@ -18,7 +18,10 @@ 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project + xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -37,10 +40,6 @@ <name>MOP Core</name> <description>Model Object for Portal Core</description> - <properties> - <org.chromattic.version>1.0.0-cr2</org.chromattic.version> - </properties> - <dependencies> <dependency> @@ -60,53 +59,35 @@ <dependency> <groupId>org.chromattic</groupId> - <version>${org.chromattic.version}</version> <artifactId>chromattic.api</artifactId> </dependency> <dependency> <groupId>org.chromattic</groupId> - <version>${org.chromattic.version}</version> <artifactId>chromattic.ext</artifactId> </dependency> <dependency> <groupId>org.chromattic</groupId> <artifactId>chromattic.apt</artifactId> - <version>${org.chromattic.version}</version> <scope>compile</scope> </dependency> - <!-- - <dependency> - <groupId>org.gatein.common</groupId> - <artifactId>common-common</artifactId> - </dependency> - - <dependency> - <groupId>org.gatein.common</groupId> - <artifactId>common-logging</artifactId> - </dependency> - --> - <!-- should remove it, it's because of usage : org.chromattic.common.AbstractFilterIterator --> <dependency> <groupId>org.chromattic</groupId> <artifactId>chromattic.common</artifactId> - <version>${org.chromattic.version}</version> </dependency> <dependency> <groupId>org.chromattic</groupId> <artifactId>chromattic.core</artifactId> - <version>${org.chromattic.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.chromattic</groupId> <artifactId>chromattic.exo</artifactId> - <version>${org.chromattic.version}</version> <scope>test</scope> </dependency> Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/PathAttribute.java =================================================================== --- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/PathAttribute.java 2010-03-11 16:56:37 UTC (rev 2179) +++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/PathAttribute.java 2010-03-11 17:19:13 UTC (rev 2180) @@ -22,6 +22,7 @@ import org.chromattic.api.RelationshipType; import org.chromattic.api.annotations.ManyToOne; import org.chromattic.api.annotations.MappedBy; +import org.chromattic.api.annotations.Owner; import org.chromattic.api.annotations.PrimaryType; /** @@ -34,6 +35,7 @@ @ManyToOne(type = RelationshipType.PATH) @MappedBy("mop:value") + @Owner public abstract Object getValue(); public abstract void setValue(Object value); 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-03-11 16:56:37 UTC (rev 2179) +++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/GroupSiteContainer.java 2010-03-11 17:19:13 UTC (rev 2180) @@ -19,7 +19,7 @@ package org.gatein.mop.core.api.workspace; import org.chromattic.api.annotations.PrimaryType; -import org.chromattic.api.annotations.RelatedMappedBy; +import org.chromattic.api.annotations.MappedBy; /** * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> @@ -29,7 +29,7 @@ public abstract class GroupSiteContainer extends SiteContainer<GroupSite> { - @RelatedMappedBy("mop:groupsites") + @MappedBy("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-03-11 16:56:37 UTC (rev 2179) +++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/NavigationContainer.java 2010-03-11 17:19:13 UTC (rev 2180) @@ -23,7 +23,7 @@ import org.chromattic.api.annotations.OneToOne; import org.chromattic.api.annotations.Create; import org.chromattic.api.annotations.PrimaryType; -import org.chromattic.api.annotations.RelatedMappedBy; +import org.chromattic.api.annotations.MappedBy; import org.gatein.mop.core.api.MOPFormatter; import java.util.List; @@ -39,7 +39,7 @@ { @OneToOne - @RelatedMappedBy("mop:children") + @MappedBy("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-03-11 16:56:37 UTC (rev 2179) +++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/NavigationImpl.java 2010-03-11 17:19:13 UTC (rev 2180) @@ -23,8 +23,9 @@ import org.chromattic.api.annotations.MappedBy; import org.chromattic.api.annotations.ManyToOne; import org.chromattic.api.annotations.Destroy; +import org.chromattic.api.annotations.Owner; import org.chromattic.api.annotations.PrimaryType; -import org.chromattic.api.annotations.RelatedMappedBy; +import org.chromattic.api.annotations.MappedBy; import org.chromattic.api.RelationshipType; import org.gatein.mop.api.workspace.Navigation; import org.gatein.mop.api.workspace.link.Link; @@ -43,11 +44,12 @@ { @OneToOne - @RelatedMappedBy("mop:rootnavigation") + @MappedBy("mop:rootnavigation") public abstract SiteImpl getParentSite(); @OneToOne @MappedBy("mop:children") + @Owner public abstract NavigationContainer getChildrenContainer(); @ManyToOne @@ -55,6 +57,7 @@ @OneToOne @MappedBy("mop:link") + @Owner public abstract LinkImpl getLink(); public abstract LinkImpl setLink(LinkImpl target); @@ -72,6 +75,7 @@ public abstract void destroy(); @OneToOne(type = RelationshipType.EMBEDDED) + @Owner public abstract TemplatizedImpl getTemplatized(); public abstract void setTemplatized(TemplatizedImpl templatized); 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-03-11 16:56:37 UTC (rev 2179) +++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/PageContainer.java 2010-03-11 17:19:13 UTC (rev 2180) @@ -23,7 +23,7 @@ import org.chromattic.api.annotations.OneToOne; import org.chromattic.api.annotations.Create; import org.chromattic.api.annotations.PrimaryType; -import org.chromattic.api.annotations.RelatedMappedBy; +import org.chromattic.api.annotations.MappedBy; import org.gatein.mop.core.api.MOPFormatter; import java.util.Map; @@ -38,7 +38,7 @@ { @OneToOne - @RelatedMappedBy("mop:children") + @MappedBy("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-03-11 16:56:37 UTC (rev 2179) +++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/PageImpl.java 2010-03-11 17:19:13 UTC (rev 2180) @@ -21,9 +21,10 @@ import org.chromattic.api.annotations.OneToMany; import org.chromattic.api.annotations.OneToOne; import org.chromattic.api.annotations.ManyToOne; +import org.chromattic.api.annotations.Owner; import org.chromattic.api.annotations.PrimaryType; -import org.chromattic.api.annotations.RelatedMappedBy; import org.chromattic.api.annotations.MappedBy; +import org.chromattic.api.annotations.MappedBy; import org.chromattic.api.annotations.Destroy; import org.chromattic.api.RelationshipType; import org.gatein.mop.api.workspace.Page; @@ -43,36 +44,39 @@ { @OneToMany(type = RelationshipType.PATH) - @RelatedMappedBy("mop:template") + @MappedBy("mop:template") public abstract Collection<NavigationImpl> getTemplatizedNavigations(); @OneToMany(type = RelationshipType.PATH) - @RelatedMappedBy("mop:template") + @MappedBy("mop:template") public abstract Collection<PageImpl> getTemplatizedPages(); @OneToMany(type = RelationshipType.PATH) - @RelatedMappedBy("mop:template") + @MappedBy("mop:template") public abstract Collection<? extends WorkspaceObject> getTemplatizedObjects(); @OneToOne @MappedBy("mop:children") + @Owner public abstract PageContainer getChildrenContainer(); @ManyToOne public abstract PageContainer getParentContainer(); @OneToOne - @RelatedMappedBy("mop:rootpage") + @MappedBy("mop:rootpage") public abstract SiteImpl getSiteParent(); @OneToOne @MappedBy("mop:rootcomponent") + @Owner public abstract UIContainerImpl getRootComponent(); @Destroy public abstract void destroy(); @OneToOne(type = RelationshipType.EMBEDDED) + @Owner public abstract WorkspaceCustomizationContextImpl getCustomizationContext(); // ******************************************************************************************************************* Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/PageLinkImpl.java =================================================================== --- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/PageLinkImpl.java 2010-03-11 16:56:37 UTC (rev 2179) +++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/PageLinkImpl.java 2010-03-11 17:19:13 UTC (rev 2180) @@ -20,6 +20,7 @@ import org.chromattic.api.annotations.ManyToOne; import org.chromattic.api.annotations.MappedBy; +import org.chromattic.api.annotations.Owner; import org.chromattic.api.annotations.PrimaryType; import org.chromattic.api.annotations.Property; import org.chromattic.api.annotations.Path; @@ -38,6 +39,7 @@ @ManyToOne(type = RelationshipType.PATH) @MappedBy("mop:page") + @Owner public abstract PageImpl getPage(); public abstract void setPage(PageImpl page); 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-03-11 16:56:37 UTC (rev 2179) +++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/PortalSiteContainer.java 2010-03-11 17:19:13 UTC (rev 2180) @@ -19,7 +19,7 @@ package org.gatein.mop.core.api.workspace; import org.chromattic.api.annotations.PrimaryType; -import org.chromattic.api.annotations.RelatedMappedBy; +import org.chromattic.api.annotations.MappedBy; /** * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> @@ -29,7 +29,7 @@ public abstract class PortalSiteContainer extends SiteContainer<PortalSite> { - @RelatedMappedBy("mop:portalsites") + @MappedBy("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-03-11 16:56:37 UTC (rev 2179) +++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/SiteImpl.java 2010-03-11 17:19:13 UTC (rev 2180) @@ -24,6 +24,7 @@ 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.gatein.mop.api.workspace.Site; import org.gatein.mop.api.workspace.Page; @@ -41,10 +42,12 @@ @OneToOne @MappedBy("mop:rootpage") + @Owner public abstract PageImpl getRoot(); @OneToOne @MappedBy("mop:rootnavigation") + @Owner public abstract NavigationImpl getRootNavigation(); @ManyToOne @@ -54,6 +57,7 @@ public abstract void destroy(); @OneToOne(type = RelationshipType.EMBEDDED) + @Owner public abstract WorkspaceCustomizationContextImpl getCustomizationContext(); public abstract ObjectType<? extends Site> getObjectType(); Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/TemplatizedImpl.java =================================================================== --- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/TemplatizedImpl.java 2010-03-11 16:56:37 UTC (rev 2179) +++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/TemplatizedImpl.java 2010-03-11 17:19:13 UTC (rev 2180) @@ -22,6 +22,7 @@ import org.chromattic.api.annotations.MappedBy; import org.chromattic.api.annotations.MixinType; import org.chromattic.api.annotations.OneToOne; +import org.chromattic.api.annotations.Owner; import org.gatein.mop.api.Scope; import org.gatein.mop.api.workspace.Page; import org.gatein.mop.api.workspace.Templatized; @@ -37,6 +38,7 @@ @OneToOne @MappedBy("mop:template") + @Owner public abstract PathAttribute getRelatedTemplate(); public void setTemplate(Page template) 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-03-11 16:56:37 UTC (rev 2179) +++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/UIWindowImpl.java 2010-03-11 17:19:13 UTC (rev 2180) @@ -21,6 +21,7 @@ import org.chromattic.api.annotations.OneToOne; import org.chromattic.api.annotations.MappedBy; import org.chromattic.api.annotations.Create; +import org.chromattic.api.annotations.Owner; import org.chromattic.api.annotations.PrimaryType; import org.gatein.mop.api.workspace.ui.UIWindow; import org.gatein.mop.api.workspace.ObjectType; @@ -49,6 +50,7 @@ @OneToOne @MappedBy("mop:customization") + @Owner 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-03-11 16:56:37 UTC (rev 2179) +++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/UserSiteContainer.java 2010-03-11 17:19:13 UTC (rev 2180) @@ -19,7 +19,7 @@ package org.gatein.mop.core.api.workspace; import org.chromattic.api.annotations.PrimaryType; -import org.chromattic.api.annotations.RelatedMappedBy; +import org.chromattic.api.annotations.MappedBy; /** * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> @@ -29,7 +29,7 @@ public abstract class UserSiteContainer extends SiteContainer<UserSite> { - @RelatedMappedBy("mop:usersites") + @MappedBy("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-03-11 16:56:37 UTC (rev 2179) +++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/WorkspaceCustomizationContextImpl.java 2010-03-11 17:19:13 UTC (rev 2180) @@ -22,6 +22,7 @@ import org.chromattic.api.RelationshipType; import org.chromattic.api.annotations.MappedBy; import org.chromattic.api.annotations.OneToOne; +import org.chromattic.api.annotations.Owner; import org.chromattic.api.annotations.PrimaryType; import org.gatein.mop.api.content.ContentType; import org.gatein.mop.api.content.Customization; @@ -36,11 +37,14 @@ @PrimaryType(name = "mop:customizationcontext") public abstract class WorkspaceCustomizationContextImpl implements WorkspaceCustomizationContext { + // THIS IS A BUG IT SHOULD NOT BE HERE + @Owner @OneToOne(type = RelationshipType.EMBEDDED) public abstract WorkspaceObjectImpl getOwner(); @OneToOne @MappedBy("mop:customizations") + @Owner 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-03-11 16:56:37 UTC (rev 2179) +++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/WorkspaceImpl.java 2010-03-11 17:19:13 UTC (rev 2180) @@ -22,6 +22,7 @@ import org.chromattic.api.annotations.OneToOne; import org.chromattic.api.annotations.MappedBy; import org.chromattic.api.annotations.FindById; +import org.chromattic.api.annotations.Owner; import org.chromattic.api.annotations.PrimaryType; import org.gatein.mop.api.workspace.Workspace; import org.gatein.mop.api.workspace.Site; @@ -50,17 +51,21 @@ @OneToOne @MappedBy("mop:portalsites") + @Owner public abstract PortalSiteContainer getPortalSites(); @OneToOne @MappedBy("mop:groupsites") + @Owner public abstract GroupSiteContainer getGroupSites(); @OneToOne @MappedBy("mop:usersites") + @Owner public abstract UserSiteContainer getUserSites(); @OneToOne(type = RelationshipType.EMBEDDED) + @Owner public abstract WorkspaceCustomizationContextImpl getCustomizationContext(); // CustomizationContextResolver implementation *********************************************************************** 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 2010-03-11 16:56:37 UTC (rev 2179) +++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/WorkspaceObjectImpl.java 2010-03-11 17:19:13 UTC (rev 2180) @@ -48,6 +48,7 @@ @OneToOne @MappedBy("mop:attributes") + @Owner public abstract AttributesImpl getAttributes(); public <A> A adapt(Class<A> adaptedType) 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-03-11 16:56:37 UTC (rev 2179) +++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/content/AbstractCustomization.java 2010-03-11 17:19:13 UTC (rev 2180) @@ -19,6 +19,7 @@ package org.gatein.mop.core.api.workspace.content; import org.chromattic.api.annotations.FormattedBy; +import org.chromattic.api.annotations.Owner; import org.chromattic.api.annotations.PrimaryType; import org.gatein.mop.api.content.Customization; import org.gatein.mop.api.content.CustomizationContext; @@ -76,6 +77,7 @@ @OneToOne @MappedBy("mop:contexttypes") + @Owner abstract ContextTypeContainer getContextTypes(); @Create @@ -86,6 +88,7 @@ @OneToOne @MappedBy("mop:state") + @Owner public abstract AbstractCustomizationState getCustomizationState(); public abstract void setCustomizationState(AbstractCustomizationState customizationState); Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/content/AbstractCustomizationState.java =================================================================== --- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/content/AbstractCustomizationState.java 2010-03-11 16:56:37 UTC (rev 2179) +++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/content/AbstractCustomizationState.java 2010-03-11 17:19:13 UTC (rev 2180) @@ -21,7 +21,7 @@ import org.chromattic.api.annotations.OneToOne; import org.chromattic.api.annotations.PrimaryType; -import org.chromattic.api.annotations.RelatedMappedBy; +import org.chromattic.api.annotations.MappedBy; /** * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> @@ -31,7 +31,7 @@ public abstract class AbstractCustomizationState { @OneToOne - @RelatedMappedBy("mop:state") + @MappedBy("mop:state") public abstract AbstractCustomization getCustomization(); } 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 2010-03-11 16:56:37 UTC (rev 2179) +++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/content/ContextTypeContainer.java 2010-03-11 17:19:13 UTC (rev 2180) @@ -36,7 +36,7 @@ public abstract Map<String, ContextType> getContextTypes(); @OneToOne - @RelatedMappedBy("mop:contexttypes") + @MappedBy("mop:contexttypes") public abstract AbstractCustomization getCustomization(); } 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-03-11 16:56:37 UTC (rev 2179) +++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/content/CustomizationContainer.java 2010-03-11 17:19:13 UTC (rev 2180) @@ -26,7 +26,7 @@ import org.chromattic.api.annotations.Create; import org.chromattic.api.annotations.OneToOne; import org.chromattic.api.annotations.OneToMany; -import org.chromattic.api.annotations.RelatedMappedBy; +import org.chromattic.api.annotations.MappedBy; import org.gatein.mop.core.api.MOPFormatter; import org.gatein.mop.core.api.workspace.WorkspaceCustomizationContextImpl; @@ -42,7 +42,7 @@ { @OneToOne - @RelatedMappedBy("mop:customizations") + @MappedBy("mop:customizations") public abstract WorkspaceCustomizationContextImpl getOwner(); @OneToMany Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/content/WorkspaceClone.java =================================================================== --- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/content/WorkspaceClone.java 2010-03-11 16:56:37 UTC (rev 2179) +++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/content/WorkspaceClone.java 2010-03-11 17:19:13 UTC (rev 2180) @@ -20,7 +20,7 @@ import org.chromattic.api.annotations.PrimaryType; import org.chromattic.api.annotations.Name; -import org.chromattic.api.annotations.RelatedMappedBy; +import org.chromattic.api.annotations.MappedBy; import org.chromattic.api.annotations.OneToMany; import org.chromattic.api.RelationshipType; import org.gatein.mop.api.content.CustomizationContext; @@ -48,7 +48,7 @@ public abstract String getFooName(); @OneToMany(type = RelationshipType.PATH) - @RelatedMappedBy("mop:customization") + @MappedBy("mop:customization") public abstract Collection<WorkspaceSpecialization> getSpecializations(); // Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/content/WorkspaceSpecialization.java =================================================================== --- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/content/WorkspaceSpecialization.java 2010-03-11 16:56:37 UTC (rev 2179) +++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/content/WorkspaceSpecialization.java 2010-03-11 17:19:13 UTC (rev 2180) @@ -21,6 +21,7 @@ import org.chromattic.api.annotations.ManyToOne; import org.chromattic.api.annotations.MappedBy; import org.chromattic.api.RelationshipType; +import org.chromattic.api.annotations.Owner; import org.chromattic.api.annotations.PrimaryType; /** @@ -33,6 +34,7 @@ @ManyToOne(type = RelationshipType.PATH) @MappedBy("mop:customization") + @Owner public abstract WorkspaceCustomization getCustomization(); public abstract void setCustomization(WorkspaceCustomization customization); Modified: components/mop/trunk/pom.xml =================================================================== --- components/mop/trunk/pom.xml 2010-03-11 16:56:37 UTC (rev 2179) +++ components/mop/trunk/pom.xml 2010-03-11 17:19:13 UTC (rev 2180) @@ -18,7 +18,10 @@ 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project + xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -45,7 +48,6 @@ <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/compone... <url>http://fisheye.jboss.org/browse/gatein/components/mop/trunk/</u... </scm> - <dependencyManagement> <dependencies> @@ -58,6 +60,43 @@ <scope>import</scope> </dependency> + <dependency> + <groupId>org.chromattic</groupId> + <version>${org.chromattic.version}</version> + <artifactId>chromattic.api</artifactId> + </dependency> + + <dependency> + <groupId>org.chromattic</groupId> + <version>${org.chromattic.version}</version> + <artifactId>chromattic.ext</artifactId> + </dependency> + + <dependency> + <groupId>org.chromattic</groupId> + <artifactId>chromattic.apt</artifactId> + <version>${org.chromattic.version}</version> + </dependency> + + <!-- should remove it, it's because of usage : org.chromattic.common.AbstractFilterIterator --> + <dependency> + <groupId>org.chromattic</groupId> + <artifactId>chromattic.common</artifactId> + <version>${org.chromattic.version}</version> + </dependency> + + <dependency> + <groupId>org.chromattic</groupId> + <artifactId>chromattic.core</artifactId> + <version>${org.chromattic.version}</version> + </dependency> + + <dependency> + <groupId>org.chromattic</groupId> + <artifactId>chromattic.exo</artifactId> + <version>${org.chromattic.version}</version> + </dependency> + <!-- Internal dependencies --> <!-- <dependency> @@ -104,6 +143,8 @@ <!-- maven-enforcer-plugin --> <jdk.min.version>1.6</jdk.min.version> + <org.chromattic.version>1.0.0</org.chromattic.version> + </properties> <!-- **************** -->