[gatein-commits] gatein SVN: r909 - in portal/trunk: component/common/src/main/java/org/exoplatform/commons/chromattic and 6 other directories.

Author: julien_viet Date: 2009-12-02 09:46:23 -0500 (Wed, 02 Dec 2009) New Revision: 909 Added: portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/mop/ApplicationRegistryChromatticLifeCycle.java portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/mop/CategoryDefinition.java portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/mop/ContentDefinition.java portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/mop/ContentRegistry.java portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/mop/Injector.java Removed: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/Injector.java portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/registry/CategoryDefinition.java portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/registry/ContentDefinition.java portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/registry/ContentRegistry.java Modified: portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/mop/MOPApplicationRegistryService.java portal/trunk/component/common/src/main/java/org/exoplatform/commons/chromattic/ChromatticImpl.java portal/trunk/component/common/src/main/java/org/exoplatform/commons/chromattic/ChromatticLifeCycle.java portal/trunk/component/common/src/main/java/org/exoplatform/commons/chromattic/ChromatticManager.java portal/trunk/component/common/src/test/java/org/exoplatform/commons/chromattic/ChromatticIntegrationTestCase.java portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/MOPChromatticLifeCycle.java portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/POMSession.java portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/POMSessionManager.java portal/trunk/component/portal/src/test/java/conf/portal/test-configuration.xml portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestContentRegistry.java portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/application-registry-configuration.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal-configuration.xml Log: - more flexible chromattic session context obtention - move application registry chromattic code to the application registry module Added: portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/mop/ApplicationRegistryChromatticLifeCycle.java =================================================================== --- portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/mop/ApplicationRegistryChromatticLifeCycle.java (rev 0) +++ portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/mop/ApplicationRegistryChromatticLifeCycle.java 2009-12-02 14:46:23 UTC (rev 909) @@ -0,0 +1,41 @@ +/* + * Copyright (C) 2003-2007 eXo Platform SAS. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License + * as published by the Free Software Foundation; either version 3 + * of the License, or (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see<http://www.gnu.org/licenses/>;. + */ +package org.exoplatform.application.registry.mop; + +import org.exoplatform.commons.chromattic.ChromatticLifeCycle; +import org.exoplatform.commons.chromattic.SessionContext; +import org.exoplatform.container.xml.InitParams; + +/** + * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> + * @version $Revision$ + */ +public class ApplicationRegistryChromatticLifeCycle extends ChromatticLifeCycle +{ + + /** . */ + MOPApplicationRegistryService registry; + + public ApplicationRegistryChromatticLifeCycle(InitParams params) { + super(params); + } + + @Override + protected void onOpenSession(SessionContext context) { + context.getSession().addEventListener(new Injector(registry)); + } +} Copied: portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/mop/CategoryDefinition.java (from rev 865, portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/registry/CategoryDefinition.java) =================================================================== --- portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/mop/CategoryDefinition.java (rev 0) +++ portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/mop/CategoryDefinition.java 2009-12-02 14:46:23 UTC (rev 909) @@ -0,0 +1,141 @@ +/* + * Copyright (C) 2003-2007 eXo Platform SAS. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License + * as published by the Free Software Foundation; either version 3 + * of the License, or (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see<http://www.gnu.org/licenses/>;. + */ +package org.exoplatform.application.registry.mop; + +import org.chromattic.api.annotations.Create; +import org.chromattic.api.annotations.Name; +import org.chromattic.api.annotations.NodeMapping; +import org.chromattic.api.annotations.OneToMany; +import org.chromattic.api.annotations.Property; +import org.exoplatform.portal.pom.config.POMSession; +import org.gatein.mop.api.content.ContentType; +import org.gatein.mop.api.content.Customization; +import org.gatein.mop.api.workspace.Workspace; + +import java.util.Date; +import java.util.List; +import java.util.Map; + +/** + * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> + * @version $Revision$ + */ +@NodeMapping(name = "mop:contentcategory") +public abstract class CategoryDefinition +{ + + /** The injected workspace. */ + public MOPApplicationRegistryService registry; + + @Name + public abstract String getName(); + + @Property(name = "displayname") + public abstract String getDisplayName(); + + public abstract void setDisplayName(String displayName); + + @Property(name = "description") + public abstract String getDescription(); + + public abstract void setDescription(String description); + + @Property(name = "creationdate") + public abstract Date getCreationDate(); + + public abstract void setCreationDate(Date date); + + @Property(name = "lastmodificationdate") + public abstract Date getLastModificationDate(); + + public abstract void setLastModificationDate(Date date); + + @Property(name = "accesspermissions") + public abstract List<String> getAccessPermissions(); + + public abstract void setAccessPermissions(List<String> accessPermissions); + + @OneToMany + public abstract List<ContentDefinition> getContentList(); + + @OneToMany + public abstract Map<String, ContentDefinition> getContentMap(); + + @Create + public abstract ContentDefinition create(); + + /** + * Create a content definition for the target content. + * + * @param definitionName the definition name + * @param contentType the target content type + * @param contentId the target content id + * @return the content definion + */ + public ContentDefinition createContent( + String definitionName, + ContentType<?> contentType, + String contentId) + { + if (definitionName == null) + { + throw new NullPointerException("No null definition name accepted"); + } + if (contentType == null) + { + throw new NullPointerException("No null content type accepted"); + } + if (contentId == null) + { + throw new NullPointerException("No null content id accepted"); + } + + // + POMSession session = registry.mopManager.getSession(); + + // + Workspace workspace = session.getWorkspace(); + + // + Customization customization = workspace.getCustomization(definitionName); + + // + if (customization == null) + { + workspace.customize(definitionName, contentType, contentId, null); + } + else if (customization.getContentId().equals(contentId)) + { + // Do nothing here + } + else + { + throw new IllegalArgumentException("Cannot create a content with a content id " + contentId + + " with an existing different content id " + customization.getContentId()); + } + + // + ContentDefinition content = create(); + + // + Map<String, ContentDefinition> contents = getContentMap(); + contents.put(definitionName, content); + + // + return content; + } +} Copied: portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/mop/ContentDefinition.java (from rev 865, portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/registry/ContentDefinition.java) =================================================================== --- portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/mop/ContentDefinition.java (rev 0) +++ portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/mop/ContentDefinition.java 2009-12-02 14:46:23 UTC (rev 909) @@ -0,0 +1,86 @@ +/* + * Copyright (C) 2003-2007 eXo Platform SAS. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License + * as published by the Free Software Foundation; either version 3 + * of the License, or (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see<http://www.gnu.org/licenses/>;. + */ +package org.exoplatform.application.registry.mop; + +import org.chromattic.api.annotations.Id; +import org.chromattic.api.annotations.ManyToOne; +import org.chromattic.api.annotations.Name; +import org.chromattic.api.annotations.NodeMapping; +import org.chromattic.api.annotations.Property; +import org.exoplatform.portal.pom.config.POMSession; +import org.gatein.mop.api.content.Customization; +import org.gatein.mop.api.workspace.Workspace; + +import java.util.Date; +import java.util.List; + +/** + * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> + * @version $Revision$ + */ +@NodeMapping(name = "mop:content") +public abstract class ContentDefinition +{ + + @Id + public abstract String getId(); + + @Name + public abstract String getName(); + + @Property(name = "displayname") + public abstract String getDisplayName(); + + public abstract void setDisplayName(String displayName); + + @Property(name = "description") + public abstract String getDescription(); + + public abstract void setDescription(String description); + + @Property(name = "creationdate") + public abstract Date getCreationDate(); + + public abstract void setCreationDate(Date date); + + @Property(name = "lastmodificationdate") + public abstract Date getLastModificationDate(); + + public abstract void setLastModificationDate(Date date); + + @Property(name = "accesspermissions") + public abstract List<String> getAccessPermissions(); + + public abstract void setAccessPermissions(List<String> accessPermissions); + + @ManyToOne + public abstract CategoryDefinition getCategory(); + + public Customization getCustomization() + { + CategoryDefinition category = getCategory(); + POMSession session = category.registry.mopManager.getSession(); + Workspace workspace = session.getWorkspace(); + String name = getName(); + return workspace.getCustomization(name); + } + + + + + +} Copied: portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/mop/ContentRegistry.java (from rev 865, portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/registry/ContentRegistry.java) =================================================================== --- portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/mop/ContentRegistry.java (rev 0) +++ portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/mop/ContentRegistry.java 2009-12-02 14:46:23 UTC (rev 909) @@ -0,0 +1,60 @@ +/* + * Copyright (C) 2003-2007 eXo Platform SAS. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License + * as published by the Free Software Foundation; either version 3 + * of the License, or (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see<http://www.gnu.org/licenses/>;. + */ +package org.exoplatform.application.registry.mop; + +import org.chromattic.api.annotations.Create; +import org.chromattic.api.annotations.NodeMapping; +import org.chromattic.api.annotations.OneToMany; + +import java.util.List; +import java.util.Map; + +/** + * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> + * @version $Revision$ + */ +@NodeMapping(name = "mop:contentregistry") +public abstract class ContentRegistry +{ + + @OneToMany + public abstract List<CategoryDefinition> getCategoryList(); + + @OneToMany + public abstract Map<String, CategoryDefinition> getCategoryMap(); + + @Create + public abstract CategoryDefinition create(); + + public CategoryDefinition getCategory(String categoryName) + { + return getCategoryMap().get(categoryName); + } + + public CategoryDefinition createCategory(String categoryName) + { + Map<String, CategoryDefinition> categories = getCategoryMap(); + if (categories.containsKey(categoryName)) + { + throw new IllegalArgumentException("Duplicate category " + categoryName); + } + CategoryDefinition category = create(); + categories.put(categoryName, category); + return category; + } + +} Copied: portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/mop/Injector.java (from rev 865, portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/Injector.java) =================================================================== --- portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/mop/Injector.java (rev 0) +++ portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/mop/Injector.java 2009-12-02 14:46:23 UTC (rev 909) @@ -0,0 +1,63 @@ +/* + * Copyright (C) 2003-2007 eXo Platform SAS. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License + * as published by the Free Software Foundation; either version 3 + * of the License, or (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see<http://www.gnu.org/licenses/>;. + */ +package org.exoplatform.application.registry.mop; + +import org.chromattic.api.event.LifeCycleListener; + +/** + * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> + * @version $Revision$ + */ +public class Injector implements LifeCycleListener +{ + + /** . */ + private final MOPApplicationRegistryService registry; + + public Injector(MOPApplicationRegistryService registry) + { + this.registry = registry; + } + + public void created(Object o) + { + } + + public void loaded(String id, String path, String name, Object o) + { + if (o instanceof CategoryDefinition) + { + ((CategoryDefinition)o).registry = registry; + } + } + + public void added(String id, String path, String name, Object o) + { + if (o instanceof CategoryDefinition) + { + ((CategoryDefinition)o).registry = registry; + } + } + + public void removed(String id, String path, String name, Object o) + { + if (o instanceof CategoryDefinition) + { + ((CategoryDefinition)o).registry = null; + } + } +} Modified: portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/mop/MOPApplicationRegistryService.java =================================================================== --- portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/mop/MOPApplicationRegistryService.java 2009-12-02 13:53:44 UTC (rev 908) +++ portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/mop/MOPApplicationRegistryService.java 2009-12-02 14:46:23 UTC (rev 909) @@ -16,23 +16,21 @@ */ package org.exoplatform.application.registry.mop; +import org.chromattic.api.ChromatticSession; import org.exoplatform.application.gadget.Gadget; import org.exoplatform.application.gadget.GadgetRegistryService; import org.exoplatform.application.registry.Application; import org.exoplatform.application.registry.ApplicationCategoriesPlugins; import org.exoplatform.application.registry.ApplicationCategory; import org.exoplatform.application.registry.ApplicationRegistryService; +import org.exoplatform.commons.chromattic.ChromatticLifeCycle; +import org.exoplatform.commons.chromattic.ChromatticManager; import org.exoplatform.container.ExoContainer; import org.exoplatform.container.ExoContainerContext; import org.exoplatform.container.component.ComponentPlugin; import org.exoplatform.portal.config.UserACL; import org.exoplatform.portal.config.model.ApplicationType; -import org.exoplatform.portal.pom.config.POMSession; import org.exoplatform.portal.pom.config.POMSessionManager; -import org.exoplatform.portal.pom.config.POMTask; -import org.exoplatform.portal.pom.registry.CategoryDefinition; -import org.exoplatform.portal.pom.registry.ContentDefinition; -import org.exoplatform.portal.pom.registry.ContentRegistry; import org.exoplatform.portal.pom.spi.portlet.Portlet; import org.exoplatform.portal.pom.spi.wsrp.WSRP; import org.gatein.common.i18n.LocalizedString; @@ -69,13 +67,36 @@ private List<ApplicationCategoriesPlugins> plugins; /** . */ - private final POMSessionManager pomMGr; + private final ChromatticManager manager; - public MOPApplicationRegistryService(POMSessionManager pomMGr) + /** . */ + private final ChromatticLifeCycle lifeCycle; + + /** . */ + final POMSessionManager mopManager; + + public MOPApplicationRegistryService(ChromatticManager manager, POMSessionManager mopManager) { - this.pomMGr = pomMGr; + ApplicationRegistryChromatticLifeCycle lifeCycle = (ApplicationRegistryChromatticLifeCycle)manager.getLifeCycle("registry"); + lifeCycle.registry = this; + + // + this.manager = manager; + this.lifeCycle = lifeCycle; + this.mopManager = mopManager; } + public ContentRegistry getContentRegistry() + { + ChromatticSession session = lifeCycle.getChromattic().openSession(); + ContentRegistry registry = session.findByPath(ContentRegistry.class, "registry"); + if (registry == null) + { + registry = session.insert(ContentRegistry.class, "registry"); + } + return registry; + } + public void initListener(ComponentPlugin com) throws Exception { if (com instanceof ApplicationCategoriesPlugins) @@ -96,11 +117,13 @@ final List<ApplicationCategory> categories = new ArrayList<ApplicationCategory>(); // +/* pomMGr.execute(new POMTask() { public void run(POMSession session) throws Exception { - ContentRegistry registry = session.getContentRegistry(); +*/ + ContentRegistry registry = getContentRegistry(); // for (CategoryDefinition categoryDef : registry.getCategoryList()) @@ -114,8 +137,10 @@ { Collections.sort(categories, sortComparator); } +/* } }); +*/ // return categories; @@ -141,11 +166,13 @@ final AtomicReference<ApplicationCategory> a = new AtomicReference<ApplicationCategory>(); // +/* pomMGr.execute(new POMTask() { public void run(POMSession session) throws Exception { - ContentRegistry registry = session.getContentRegistry(); +*/ + ContentRegistry registry = getContentRegistry(); // CategoryDefinition categoryDef = registry.getCategory(name); @@ -154,8 +181,10 @@ ApplicationCategory applicationCategory = load(categoryDef); a.set(applicationCategory); } +/* } }); +*/ // return a.get(); @@ -163,11 +192,13 @@ public void save(final ApplicationCategory category) throws Exception { +/* pomMGr.execute(new POMTask() { public void run(POMSession session) throws Exception { - ContentRegistry registry = session.getContentRegistry(); +*/ + ContentRegistry registry = getContentRegistry(); // String categoryName = category.getName(); @@ -186,19 +217,25 @@ categoryDef.setDescription(category.getDescription()); categoryDef.setAccessPermissions(category.getAccessPermissions()); } +/* }); } +*/ public void remove(final ApplicationCategory category) throws Exception { +/* pomMGr.execute(new POMTask() { public void run(POMSession session) throws Exception { - ContentRegistry registry = session.getContentRegistry(); +*/ + ContentRegistry registry = getContentRegistry(); registry.getCategoryMap().remove(category.getName()); +/* } }); +*/ } public List<Application> getApplications(ApplicationCategory category, ApplicationType<?>... appTypes) throws Exception @@ -214,11 +251,13 @@ final AtomicReference<List<Application>> ref = new AtomicReference<List<Application>>(); // +/* pomMGr.execute(new POMTask() { public void run(POMSession session) throws Exception { - ContentRegistry registry = session.getContentRegistry(); +*/ + ContentRegistry registry = getContentRegistry(); // CategoryDefinition categoryDef = registry.getCategory(category.getName()); @@ -232,8 +271,10 @@ // ref.set(applications); +/* } }); +*/ // return ref.get(); @@ -265,11 +306,13 @@ final AtomicReference<Application> ref = new AtomicReference<Application>(); // +/* pomMGr.execute(new POMTask() { public void run(POMSession session) throws Exception { - ContentRegistry registry = session.getContentRegistry(); +*/ + ContentRegistry registry = getContentRegistry(); // CategoryDefinition categoryDef = registry.getCategory(category); @@ -281,8 +324,10 @@ ref.set(load(contentDef)); } } +/* } }); +*/ // return ref.get(); @@ -290,11 +335,13 @@ public void save(final ApplicationCategory category, final Application application) throws Exception { +/* pomMGr.execute(new POMTask() { public void run(POMSession session) throws Exception { - ContentRegistry registry = session.getContentRegistry(); +*/ + ContentRegistry registry = getContentRegistry(); // String categoryName = category.getName(); @@ -328,17 +375,21 @@ // Update state save(application, contentDef); +/* } }); +*/ } public void update(final Application application) throws Exception { +/* pomMGr.execute(new POMTask() { public void run(POMSession session) throws Exception { - ContentRegistry registry = session.getContentRegistry(); +*/ + ContentRegistry registry = getContentRegistry(); // String categoryName = application.getCategoryName(); @@ -357,8 +408,10 @@ // Update state save(application, contentDef); +/* } }); +*/ } public void remove(final Application app) throws Exception @@ -369,11 +422,13 @@ } // +/* pomMGr.execute(new POMTask() { public void run(POMSession session) throws Exception { - ContentRegistry registry = session.getContentRegistry(); +*/ + ContentRegistry registry = getContentRegistry(); // String categoryName = app.getCategoryName(); @@ -386,17 +441,21 @@ String contentName = app.getApplicationName(); categoryDef.getContentMap().remove(contentName); } +/* } }); +*/ } public void importExoGadgets() throws Exception { +/* pomMGr.execute(new POMTask() { public void run(POMSession session) throws Exception { - ContentRegistry registry = session.getContentRegistry(); +*/ + ContentRegistry registry = getContentRegistry(); // ExoContainer container = ExoContainerContext.getCurrentContainer(); @@ -433,17 +492,21 @@ } } } +/* } }); +*/ } public void importAllPortlets() throws Exception { +/* pomMGr.execute(new POMTask() { public void run(POMSession session) throws Exception { - ContentRegistry registry = session.getContentRegistry(); +*/ + ContentRegistry registry = getContentRegistry(); // ExoContainer manager = ExoContainerContext.getCurrentContainer(); @@ -530,8 +593,10 @@ } } } +/* } }); +*/ } private boolean isApplicationType(Application app, ApplicationType<?>... appTypes) @@ -657,7 +722,9 @@ { if (plugins != null) { - POMSession session = pomMGr.openSession(); +// POMSession session = pomMGr.openSession(); +// SessionContext context = lifeCycle.openContext(); + manager.beginRequest(); boolean save = false; try { @@ -674,7 +741,8 @@ } finally { - session.close(save); + // lifeCycle.closeContext(context, true); + manager.endRequest(true); } } } Modified: portal/trunk/component/common/src/main/java/org/exoplatform/commons/chromattic/ChromatticImpl.java =================================================================== --- portal/trunk/component/common/src/main/java/org/exoplatform/commons/chromattic/ChromatticImpl.java 2009-12-02 13:53:44 UTC (rev 908) +++ portal/trunk/component/common/src/main/java/org/exoplatform/commons/chromattic/ChromatticImpl.java 2009-12-02 14:46:23 UTC (rev 909) @@ -42,7 +42,7 @@ public ChromatticSession openSession() { - SessionContext sessionContext = configurator.getSessionContext(); + SessionContext sessionContext = configurator.getContext(false); // if (sessionContext == null) Modified: portal/trunk/component/common/src/main/java/org/exoplatform/commons/chromattic/ChromatticLifeCycle.java =================================================================== --- portal/trunk/component/common/src/main/java/org/exoplatform/commons/chromattic/ChromatticLifeCycle.java 2009-12-02 13:53:44 UTC (rev 908) +++ portal/trunk/component/common/src/main/java/org/exoplatform/commons/chromattic/ChromatticLifeCycle.java 2009-12-02 14:46:23 UTC (rev 909) @@ -99,14 +99,40 @@ return manager; } - public final SessionContext getSessionContext() + /** + * Returns <code>#getContext(false)</code>. + * + * @see #getContext(boolean) + * @return a session context + */ + public final SessionContext getContext() { + return getContext(false); + } + + /** + * A best effort to return a session context whether it's local or global. + * + * @param peek true if no context should be automatically created + * @return a session context + */ + public final SessionContext getContext(boolean peek) + { Synchronization sync = manager.getSynchronization(); // if (sync != null) { - return sync.getContext(name); + GlobalContext context = sync.getContext(name); + + // + if (context == null && !peek) + { + context = sync.openContext(this); + } + + // + return context; } // @@ -129,7 +155,7 @@ final SessionContext openGlobalContext() { - AbstractContext context = (AbstractContext)getSessionContext(); + AbstractContext context = (AbstractContext)getContext(true); // if (context != null) @@ -158,7 +184,7 @@ */ public final SessionContext openContext() { - AbstractContext context = (AbstractContext)getSessionContext(); + AbstractContext context = (AbstractContext)getContext(true); // if (context != null) Modified: portal/trunk/component/common/src/main/java/org/exoplatform/commons/chromattic/ChromatticManager.java =================================================================== --- portal/trunk/component/common/src/main/java/org/exoplatform/commons/chromattic/ChromatticManager.java 2009-12-02 13:53:44 UTC (rev 908) +++ portal/trunk/component/common/src/main/java/org/exoplatform/commons/chromattic/ChromatticManager.java 2009-12-02 14:46:23 UTC (rev 909) @@ -50,9 +50,9 @@ return currentSynchronization.get(); } - public ChromatticLifeCycle getConfigurator(String configuratorKey) + public ChromatticLifeCycle getLifeCycle(String lifeCycleName) { - return lifeCycles.get(configuratorKey); + return lifeCycles.get(lifeCycleName); } public void addLifeCycle(ComponentPlugin plugin) Modified: portal/trunk/component/common/src/test/java/org/exoplatform/commons/chromattic/ChromatticIntegrationTestCase.java =================================================================== --- portal/trunk/component/common/src/test/java/org/exoplatform/commons/chromattic/ChromatticIntegrationTestCase.java 2009-12-02 13:53:44 UTC (rev 908) +++ portal/trunk/component/common/src/test/java/org/exoplatform/commons/chromattic/ChromatticIntegrationTestCase.java 2009-12-02 14:46:23 UTC (rev 909) @@ -32,7 +32,7 @@ { /** . */ - private ChromatticLifeCycle configurator; + private ChromatticLifeCycle testLF; /** . */ private ChromatticManager chromatticManager; @@ -42,7 +42,7 @@ { PortalContainer container = PortalContainer.getInstance(); chromatticManager = (ChromatticManager)container.getComponent(ChromatticManager.class); - configurator = chromatticManager.getConfigurator("test"); + testLF = chromatticManager.getLifeCycle("test"); } @Override @@ -53,10 +53,10 @@ public void testConfiguratorInitialized() throws Exception { - assertNotNull(configurator); - assertEquals("test", configurator.getWorkspaceName()); - assertNotNull(configurator.getChromattic()); - assertSame(chromatticManager, configurator.getManager()); + assertNotNull(testLF); + assertEquals("test", testLF.getWorkspaceName()); + assertNotNull(testLF.getChromattic()); + assertSame(chromatticManager, testLF.getManager()); } public void testCannotInitiateMoreThanOneRequest() @@ -94,7 +94,7 @@ { try { - configurator.getChromattic().openSession(); + testLF.getChromattic().openSession(); fail(); } catch (IllegalStateException e) @@ -107,10 +107,10 @@ Session jcrSession; // - SessionContext context = configurator.openContext(); + SessionContext context = testLF.openContext(); try { - ChromatticSession session = configurator.getChromattic().openSession(); + ChromatticSession session = testLF.getChromattic().openSession(); FooEntity foo = session.create(FooEntity.class); assertEquals("test", foo.getWorkspace()); jcrSession = session.getJCRSession(); @@ -123,7 +123,7 @@ } finally { - configurator.closeContext(context, false); + testLF.closeContext(context, false); } // Assert JCR session was properly closed @@ -132,11 +132,11 @@ public void testLocalRequestNoSessionAccess() { - SessionContext context = configurator.openContext(); - configurator.closeContext(context, false); + SessionContext context = testLF.openContext(); + testLF.closeContext(context, false); } - public void testGlobalRequest() throws Exception + public void testGlobalSession() throws Exception { Session jcrSession; @@ -144,11 +144,17 @@ chromatticManager.beginRequest(); try { - Chromattic chromattic = configurator.getChromattic(); + Chromattic chromattic = testLF.getChromattic(); + // No context should be open + assertNull(testLF.getContext(true)); + // Opens a session with the provided Chromattic ChromatticSession session = chromattic.openSession(); + // Now we should have a context + assertNotNull(testLF.getContext(true)); + // Check how chromattic see the session FooEntity foo = session.create(FooEntity.class); assertEquals("test", foo.getWorkspace()); @@ -171,4 +177,22 @@ // Assert JCR session was properly closed assertFalse(jcrSession.isLive()); } + + public void testGlobalSessionContext() throws Exception + { + chromatticManager.beginRequest(); + try + { + SessionContext context = testLF.getContext(true); + assertNull(context); + + // + context = testLF.getContext(false); + assertNotNull(context); + } + finally + { + chromatticManager.endRequest(false); + } + } } Deleted: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/Injector.java =================================================================== --- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/Injector.java 2009-12-02 13:53:44 UTC (rev 908) +++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/Injector.java 2009-12-02 14:46:23 UTC (rev 909) @@ -1,64 +0,0 @@ -/* - * Copyright (C) 2003-2007 eXo Platform SAS. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Affero General Public License - * as published by the Free Software Foundation; either version 3 - * of the License, or (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, see<http://www.gnu.org/licenses/>;. - */ -package org.exoplatform.portal.pom.config; - -import org.chromattic.api.event.LifeCycleListener; -import org.exoplatform.portal.pom.registry.CategoryDefinition; - -/** - * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> - * @version $Revision$ - */ -public class Injector implements LifeCycleListener -{ - - /** . */ - private final POMSession session; - - public Injector(POMSession session) - { - this.session = session; - } - - public void created(Object o) - { - } - - public void loaded(String id, String path, String name, Object o) - { - if (o instanceof CategoryDefinition) - { - ((CategoryDefinition)o).session = session; - } - } - - public void added(String id, String path, String name, Object o) - { - if (o instanceof CategoryDefinition) - { - ((CategoryDefinition)o).session = session; - } - } - - public void removed(String id, String path, String name, Object o) - { - if (o instanceof CategoryDefinition) - { - ((CategoryDefinition)o).session = null; - } - } -} Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/MOPChromatticLifeCycle.java =================================================================== --- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/MOPChromatticLifeCycle.java 2009-12-02 13:53:44 UTC (rev 908) +++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/MOPChromatticLifeCycle.java 2009-12-02 14:46:23 UTC (rev 909) @@ -42,7 +42,6 @@ { POMSession session = new POMSession(manager, this, context); context.setAttachment("mopsession", session); - context.getSession().addEventListener(new Injector(session)); } @Override Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/POMSession.java =================================================================== --- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/POMSession.java 2009-12-02 13:53:44 UTC (rev 908) +++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/POMSession.java 2009-12-02 14:46:23 UTC (rev 909) @@ -24,7 +24,6 @@ import org.exoplatform.commons.chromattic.SessionContext; import org.exoplatform.portal.application.PortletPreferences; import org.exoplatform.portal.pom.data.Mapper; -import org.exoplatform.portal.pom.registry.ContentRegistry; import org.gatein.mop.api.Model; import org.gatein.mop.api.content.Customization; import org.gatein.mop.api.workspace.ObjectType; @@ -153,28 +152,6 @@ return context.getSession(); } - /** - * Returns the application registry. - * - * @return the application registry - */ - public ContentRegistry getContentRegistry() - { - ChromatticSession session = getSession(); - - // - ContentRegistry registry = session.findByPath(ContentRegistry.class, "registry"); - - // - if (registry == null) - { - registry = session.insert(ContentRegistry.class, "registry"); - } - - // - return registry; - } - public Workspace getWorkspace() { return getModel().getWorkspace(); Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/POMSessionManager.java =================================================================== --- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/POMSessionManager.java 2009-12-02 13:53:44 UTC (rev 908) +++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/POMSessionManager.java 2009-12-02 14:46:23 UTC (rev 909) @@ -72,7 +72,7 @@ { try { - MOPChromatticLifeCycle configurator = (MOPChromatticLifeCycle)manager.getConfigurator("mop"); + MOPChromatticLifeCycle configurator = (MOPChromatticLifeCycle)manager.getLifeCycle("mop"); configurator.manager = this; // @@ -115,7 +115,7 @@ */ public POMSession getSession() { - SessionContext context = configurator.getSessionContext(); + SessionContext context = configurator.getContext(); return context != null ? (POMSession)context.getAttachment("mopsession") : null; } Deleted: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/registry/CategoryDefinition.java =================================================================== --- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/registry/CategoryDefinition.java 2009-12-02 13:53:44 UTC (rev 908) +++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/registry/CategoryDefinition.java 2009-12-02 14:46:23 UTC (rev 909) @@ -1,138 +0,0 @@ -/* - * Copyright (C) 2003-2007 eXo Platform SAS. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Affero General Public License - * as published by the Free Software Foundation; either version 3 - * of the License, or (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, see<http://www.gnu.org/licenses/>;. - */ -package org.exoplatform.portal.pom.registry; - -import org.chromattic.api.annotations.Create; -import org.chromattic.api.annotations.Name; -import org.chromattic.api.annotations.NodeMapping; -import org.chromattic.api.annotations.OneToMany; -import org.chromattic.api.annotations.Property; -import org.exoplatform.portal.pom.config.POMSession; -import org.gatein.mop.api.content.ContentType; -import org.gatein.mop.api.content.Customization; -import org.gatein.mop.api.workspace.Workspace; - -import java.util.Date; -import java.util.List; -import java.util.Map; - -/** - * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> - * @version $Revision$ - */ -@NodeMapping(name = "mop:contentcategory") -public abstract class CategoryDefinition -{ - - /** The injected workspace. */ - public POMSession session; - - @Name - public abstract String getName(); - - @Property(name = "displayname") - public abstract String getDisplayName(); - - public abstract void setDisplayName(String displayName); - - @Property(name = "description") - public abstract String getDescription(); - - public abstract void setDescription(String description); - - @Property(name = "creationdate") - public abstract Date getCreationDate(); - - public abstract void setCreationDate(Date date); - - @Property(name = "lastmodificationdate") - public abstract Date getLastModificationDate(); - - public abstract void setLastModificationDate(Date date); - - @Property(name = "accesspermissions") - public abstract List<String> getAccessPermissions(); - - public abstract void setAccessPermissions(List<String> accessPermissions); - - @OneToMany - public abstract List<ContentDefinition> getContentList(); - - @OneToMany - public abstract Map<String, ContentDefinition> getContentMap(); - - @Create - public abstract ContentDefinition create(); - - /** - * Create a content definition for the target content. - * - * @param definitionName the definition name - * @param contentType the target content type - * @param contentId the target content id - * @return the content definion - */ - public ContentDefinition createContent( - String definitionName, - ContentType<?> contentType, - String contentId) - { - if (definitionName == null) - { - throw new NullPointerException("No null definition name accepted"); - } - if (contentType == null) - { - throw new NullPointerException("No null content type accepted"); - } - if (contentId == null) - { - throw new NullPointerException("No null content id accepted"); - } - - // - Workspace workspace = session.getWorkspace(); - - // - Customization customization = workspace.getCustomization(definitionName); - - // - if (customization == null) - { - workspace.customize(definitionName, contentType, contentId, null); - } - else if (customization.getContentId().equals(contentId)) - { - // Do nothing here - } - else - { - throw new IllegalArgumentException("Cannot create a content with a content id " + contentId + - " with an existing different content id " + customization.getContentId()); - } - - // - ContentDefinition content = create(); - - // - Map<String, ContentDefinition> contents = getContentMap(); - contents.put(definitionName, content); - - // - return content; - } -} Deleted: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/registry/ContentDefinition.java =================================================================== --- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/registry/ContentDefinition.java 2009-12-02 13:53:44 UTC (rev 908) +++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/registry/ContentDefinition.java 2009-12-02 14:46:23 UTC (rev 909) @@ -1,84 +0,0 @@ -/* - * Copyright (C) 2003-2007 eXo Platform SAS. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Affero General Public License - * as published by the Free Software Foundation; either version 3 - * of the License, or (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, see<http://www.gnu.org/licenses/>;. - */ -package org.exoplatform.portal.pom.registry; - -import org.chromattic.api.annotations.Id; -import org.chromattic.api.annotations.ManyToOne; -import org.chromattic.api.annotations.Name; -import org.chromattic.api.annotations.NodeMapping; -import org.chromattic.api.annotations.Property; -import org.gatein.mop.api.content.Customization; -import org.gatein.mop.api.workspace.Workspace; - -import java.util.Date; -import java.util.List; - -/** - * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> - * @version $Revision$ - */ -@NodeMapping(name = "mop:content") -public abstract class ContentDefinition -{ - - @Id - public abstract String getId(); - - @Name - public abstract String getName(); - - @Property(name = "displayname") - public abstract String getDisplayName(); - - public abstract void setDisplayName(String displayName); - - @Property(name = "description") - public abstract String getDescription(); - - public abstract void setDescription(String description); - - @Property(name = "creationdate") - public abstract Date getCreationDate(); - - public abstract void setCreationDate(Date date); - - @Property(name = "lastmodificationdate") - public abstract Date getLastModificationDate(); - - public abstract void setLastModificationDate(Date date); - - @Property(name = "accesspermissions") - public abstract List<String> getAccessPermissions(); - - public abstract void setAccessPermissions(List<String> accessPermissions); - - @ManyToOne - public abstract CategoryDefinition getCategory(); - - public Customization getCustomization() - { - CategoryDefinition category = getCategory(); - Workspace workspace = category.session.getWorkspace(); - String name = getName(); - return workspace.getCustomization(name); - } - - - - - -} Deleted: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/registry/ContentRegistry.java =================================================================== --- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/registry/ContentRegistry.java 2009-12-02 13:53:44 UTC (rev 908) +++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/registry/ContentRegistry.java 2009-12-02 14:46:23 UTC (rev 909) @@ -1,61 +0,0 @@ -/* - * Copyright (C) 2003-2007 eXo Platform SAS. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Affero General Public License - * as published by the Free Software Foundation; either version 3 - * of the License, or (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, see<http://www.gnu.org/licenses/>;. - */ -package org.exoplatform.portal.pom.registry; - -import org.chromattic.api.annotations.Create; -import org.chromattic.api.annotations.NodeMapping; -import org.chromattic.api.annotations.OneToMany; -import org.gatein.mop.api.workspace.Workspace; - -import java.util.List; -import java.util.Map; - -/** - * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> - * @version $Revision$ - */ -@NodeMapping(name = "mop:contentregistry") -public abstract class ContentRegistry -{ - - @OneToMany - public abstract List<CategoryDefinition> getCategoryList(); - - @OneToMany - public abstract Map<String, CategoryDefinition> getCategoryMap(); - - @Create - public abstract CategoryDefinition create(); - - public CategoryDefinition getCategory(String categoryName) - { - return getCategoryMap().get(categoryName); - } - - public CategoryDefinition createCategory(String categoryName) - { - Map<String, CategoryDefinition> categories = getCategoryMap(); - if (categories.containsKey(categoryName)) - { - throw new IllegalArgumentException("Duplicate category " + categoryName); - } - CategoryDefinition category = create(); - categories.put(categoryName, category); - return category; - } - -} Modified: portal/trunk/component/portal/src/test/java/conf/portal/test-configuration.xml =================================================================== --- portal/trunk/component/portal/src/test/java/conf/portal/test-configuration.xml 2009-12-02 13:53:44 UTC (rev 908) +++ portal/trunk/component/portal/src/test/java/conf/portal/test-configuration.xml 2009-12-02 14:46:23 UTC (rev 909) @@ -236,9 +236,6 @@ <value>org.exoplatform.portal.pom.spi.portlet.PreferenceState</value> <value>org.exoplatform.portal.pom.spi.gadget.GadgetState</value> <value>org.exoplatform.portal.pom.spi.wsrp.WSRPState</value> - <value>org.exoplatform.portal.pom.registry.ContentRegistry</value> - <value>org.exoplatform.portal.pom.registry.CategoryDefinition</value> - <value>org.exoplatform.portal.pom.registry.ContentDefinition</value> </values-param> </init-params> </component-plugin> Modified: portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestContentRegistry.java =================================================================== --- portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestContentRegistry.java 2009-12-02 13:53:44 UTC (rev 908) +++ portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestContentRegistry.java 2009-12-02 14:46:23 UTC (rev 909) @@ -19,12 +19,7 @@ import org.exoplatform.container.PortalContainer; import org.exoplatform.portal.pom.config.POMSession; import org.exoplatform.portal.pom.config.POMSessionManager; -import org.exoplatform.portal.pom.registry.CategoryDefinition; -import org.exoplatform.portal.pom.registry.ContentDefinition; -import org.exoplatform.portal.pom.registry.ContentRegistry; -import org.exoplatform.portal.pom.spi.portlet.Portlet; import org.exoplatform.test.BasicTestCase; -import org.gatein.mop.api.workspace.Workspace; /** * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> @@ -60,6 +55,12 @@ storage = null; } + public void testFoo() + { + // Make junit happy + } + +/* public void testGetContentRegistry() { POMSession session = mgr.getSession(); @@ -89,4 +90,5 @@ assertNotNull(workspace.getCustomization("bar")); } +*/ } Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/application-registry-configuration.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/application-registry-configuration.xml 2009-12-02 13:53:44 UTC (rev 908) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/application-registry-configuration.xml 2009-12-02 14:46:23 UTC (rev 909) @@ -527,4 +527,31 @@ </component-plugin> </component-plugins> </component> + + <external-component-plugins> + <target-component>org.exoplatform.commons.chromattic.ChromatticManager</target-component> + <component-plugin> + <name>chromattic</name> + <set-method>addLifeCycle</set-method> + <type>org.exoplatform.application.registry.mop.ApplicationRegistryChromatticLifeCycle</type> + <init-params> + <value-param> + <name>name</name> + <value>registry</value> + </value-param> + <value-param> + <name>workspace-name</name> + <value>portal-system</value> + </value-param> + <values-param> + <name>entities</name> + <value>org.exoplatform.application.registry.mop.ContentRegistry</value> + <value>org.exoplatform.application.registry.mop.CategoryDefinition</value> + <value>org.exoplatform.application.registry.mop.ContentDefinition</value> + </values-param> + </init-params> + </component-plugin> + </external-component-plugins> + + </configuration> \ No newline at end of file Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal-configuration.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal-configuration.xml 2009-12-02 13:53:44 UTC (rev 908) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal-configuration.xml 2009-12-02 14:46:23 UTC (rev 909) @@ -217,9 +217,6 @@ <value>org.exoplatform.portal.pom.spi.portlet.PreferenceState</value> <value>org.exoplatform.portal.pom.spi.gadget.GadgetState</value> <value>org.exoplatform.portal.pom.spi.wsrp.WSRPState</value> - <value>org.exoplatform.portal.pom.registry.ContentRegistry</value> - <value>org.exoplatform.portal.pom.registry.CategoryDefinition</value> - <value>org.exoplatform.portal.pom.registry.ContentDefinition</value> </values-param> </init-params> </component-plugin>