[gatein-commits] gatein SVN: r1165 - in components/mop/trunk: core/src/main/java/org/gatein/mop/core/api and 2 other directories.

Author: julien_viet Date: 2010-01-05 10:21:02 -0500 (Tue, 05 Jan 2010) New Revision: 1165 Removed: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/SharedSite.java components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/SharedSiteContainer.java Modified: components/mop/trunk/api/src/main/java/org/gatein/mop/api/workspace/ObjectType.java components/mop/trunk/api/src/main/java/org/gatein/mop/api/workspace/Workspace.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/WorkspaceImpl.java components/mop/trunk/core/src/main/resources/conf/mop-nodetypes.xml Log: remove notion of shared site that may create future legacy and is not yet used Modified: components/mop/trunk/api/src/main/java/org/gatein/mop/api/workspace/ObjectType.java =================================================================== --- components/mop/trunk/api/src/main/java/org/gatein/mop/api/workspace/ObjectType.java 2010-01-05 15:07:37 UTC (rev 1164) +++ components/mop/trunk/api/src/main/java/org/gatein/mop/api/workspace/ObjectType.java 2010-01-05 15:21:02 UTC (rev 1165) @@ -56,9 +56,6 @@ public static final ObjectType<Site> USER_SITE = new ObjectType<Site>(Site.class, SITE); /** . */ - public static final ObjectType<Site> SHARED_SITE = new ObjectType<Site>(Site.class, SITE); - - /** . */ public static final ObjectType<Page> PAGE = new ObjectType<Page>(Page.class); /** . */ Modified: components/mop/trunk/api/src/main/java/org/gatein/mop/api/workspace/Workspace.java =================================================================== --- components/mop/trunk/api/src/main/java/org/gatein/mop/api/workspace/Workspace.java 2010-01-05 15:07:37 UTC (rev 1164) +++ components/mop/trunk/api/src/main/java/org/gatein/mop/api/workspace/Workspace.java 2010-01-05 15:21:02 UTC (rev 1165) @@ -30,13 +30,6 @@ { /** - * Returns the default share site. - * - * @return the default shared site - */ - Site getSharedSite(); - - /** * Returns a specified site or null if it cannot be found. * * @param siteType the site type 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 2010-01-05 15:07:37 UTC (rev 1164) +++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/ModelImpl.java 2010-01-05 15:21:02 UTC (rev 1165) @@ -32,7 +32,6 @@ import org.gatein.mop.core.api.workspace.PageImpl; import org.gatein.mop.core.api.workspace.NavigationImpl; import org.gatein.mop.core.api.workspace.WorkspaceObjectImpl; -import org.gatein.mop.core.api.workspace.SharedSite; import org.gatein.mop.core.api.workspace.UIComponentImpl; import org.gatein.mop.core.api.workspace.PageLinkImpl; import org.gatein.mop.core.api.workspace.URLLinkImpl; @@ -71,7 +70,6 @@ tmp.put(ObjectType.PORTAL_SITE, PortalSite.class); tmp.put(ObjectType.GROUP_SITE, GroupSite.class); tmp.put(ObjectType.USER_SITE, UserSite.class); - tmp.put(ObjectType.SHARED_SITE, SharedSite.class); tmp.put(ObjectType.PAGE, PageImpl.class); tmp.put(ObjectType.NAVIGATION, NavigationImpl.class); tmp.put(ObjectType.COMPONENT, UIComponentImpl.class); Deleted: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/SharedSite.java =================================================================== --- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/SharedSite.java 2010-01-05 15:07:37 UTC (rev 1164) +++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/SharedSite.java 2010-01-05 15:21:02 UTC (rev 1165) @@ -1,40 +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.workspace; - -import org.chromattic.api.annotations.NodeMapping; -import org.gatein.mop.core.api.workspace.SiteImpl; -import org.gatein.mop.api.workspace.ObjectType; -import org.gatein.mop.api.workspace.Site; - -/** - * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> - * @version $Revision$ - */ -@NodeMapping(name = "mop:sharedsite") -public abstract class SharedSite extends SiteImpl -{ - - // Site implementation *********************************************************************************************** - - public ObjectType<? extends Site> getObjectType() - { - return ObjectType.SHARED_SITE; - } -} \ No newline at end of file Deleted: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/SharedSiteContainer.java =================================================================== --- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/SharedSiteContainer.java 2010-01-05 15:07:37 UTC (rev 1164) +++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/SharedSiteContainer.java 2010-01-05 15:21:02 UTC (rev 1165) @@ -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.workspace; - -import org.chromattic.api.annotations.NodeMapping; -import org.chromattic.api.annotations.RelatedMappedBy; -import org.gatein.mop.core.api.workspace.SiteContainer; -import org.gatein.mop.core.api.workspace.WorkspaceImpl; - -/** - * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> - * @version $Revision$ - */ -@NodeMapping(name = "mop:sharedsites") -public abstract class SharedSiteContainer extends SiteContainer<SharedSite> -{ - - @RelatedMappedBy("sharedsites") - public abstract WorkspaceImpl getWorkspace(); - -} \ No newline at end of file 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-01-05 15:07:37 UTC (rev 1164) +++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/WorkspaceImpl.java 2010-01-05 15:21:02 UTC (rev 1165) @@ -25,7 +25,6 @@ import org.gatein.mop.api.workspace.Workspace; import org.gatein.mop.api.workspace.Site; import org.gatein.mop.api.workspace.ObjectType; -import org.gatein.mop.api.workspace.WorkspaceObject; import org.gatein.mop.api.workspace.WorkspaceCustomizationContext; import org.gatein.mop.api.content.CustomizationContext; import org.gatein.mop.api.content.Customization; @@ -62,10 +61,6 @@ public abstract UserSiteContainer getUserSites(); @OneToOne - @MappedBy("sharedsites") - public abstract UserSiteContainer getSharedSites(); - - @OneToOne @MappedBy("customizations") public abstract CustomizationContainer getCustomizations(); @@ -128,10 +123,6 @@ { return (SiteContainer<S>)getUserSites(); } - else if (siteType == ObjectType.SHARED_SITE) - { - return (SiteContainer<S>)getSharedSites(); - } else { throw new UnsupportedOperationException(); @@ -160,9 +151,4 @@ SiteContainer<S> sites = getSiteContainer(siteType); return sites.addSite(name); } - - public Site getSharedSite() - { - return getSite(ObjectType.SHARED_SITE, "default"); - } } Modified: components/mop/trunk/core/src/main/resources/conf/mop-nodetypes.xml =================================================================== --- components/mop/trunk/core/src/main/resources/conf/mop-nodetypes.xml 2010-01-05 15:07:37 UTC (rev 1164) +++ components/mop/trunk/core/src/main/resources/conf/mop-nodetypes.xml 2010-01-05 15:21:02 UTC (rev 1165) @@ -349,12 +349,6 @@ </supertypes> </nodeType> - <nodeType name="mop:sharedsite" isMixin="false" hasOrderableChildNodes="false" primaryItemName=""> - <supertypes> - <supertype>mop:site</supertype> - </supertypes> - </nodeType> - <nodeType name="mop:portalsites" isMixin="false" hasOrderableChildNodes="false" primaryItemName=""> <supertypes> <supertype>nt:base</supertype> @@ -400,21 +394,6 @@ </childNodeDefinitions> </nodeType> - <nodeType name="mop:sharedsites" isMixin="false" hasOrderableChildNodes="false" primaryItemName=""> - <supertypes> - <supertype>nt:base</supertype> - <supertype>mix:referenceable</supertype> - </supertypes> - <childNodeDefinitions> - <childNodeDefinition name="*" defaultPrimaryType="mop:sharedsite" autoCreated="false" mandatory="false" - onParentVersion="COPY" protected="false" sameNameSiblings="false"> - <requiredPrimaryTypes> - <requiredPrimaryType>mop:sharedsite</requiredPrimaryType> - </requiredPrimaryTypes> - </childNodeDefinition> - </childNodeDefinitions> - </nodeType> - <nodeType name="mop:workspace" isMixin="false" hasOrderableChildNodes="false" primaryItemName=""> <supertypes> <supertype>mop:workspaceobject</supertype> @@ -439,12 +418,6 @@ <requiredPrimaryType>mop:usersites</requiredPrimaryType> </requiredPrimaryTypes> </childNodeDefinition> - <childNodeDefinition name="sharedsites" defaultPrimaryType="mop:sharedsites" autoCreated="true" mandatory="false" - onParentVersion="COPY" protected="false" sameNameSiblings="false"> - <requiredPrimaryTypes> - <requiredPrimaryType>mop:sharedsites</requiredPrimaryType> - </requiredPrimaryTypes> - </childNodeDefinition> </childNodeDefinitions> </nodeType>