Author: chris.laprun(a)jboss.com Date: 2009-12-20 10:05:20 -0500 (Sun, 20 Dec 2009) New Revision: 1079 Added: portal/branches/wsrp-integration/component/common/src/main/java/conf/ portal/branches/wsrp-integration/component/common/src/main/java/conf/configuration-jboss.properties portal/branches/wsrp-integration/component/common/src/main/java/conf/configuration.properties portal/branches/wsrp-integration/component/common/src/main/java/conf/configuration.xml Removed: portal/branches/wsrp-integration/component/common/src/main/java/conf/configuration-jboss.properties portal/branches/wsrp-integration/component/common/src/main/java/conf/configuration.properties portal/branches/wsrp-integration/component/common/src/main/java/conf/configuration.xml portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/pom/config/AbstractPOMTask.java Modified: portal/branches/wsrp-integration/component/application-registry/pom.xml portal/branches/wsrp-integration/component/application-registry/src/main/java/org/exoplatform/application/gadget/GadgetDeployer.java portal/branches/wsrp-integration/component/application-registry/src/main/java/org/exoplatform/application/gadget/LocalImporter.java portal/branches/wsrp-integration/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/ApplicationRegistryServiceImpl.java portal/branches/wsrp-integration/component/application-registry/src/test/java/conf/application-registry-configuration.xml portal/branches/wsrp-integration/component/application-registry/src/test/java/org/exoplatform/application/registry/TestApplicationRegistryService.java portal/branches/wsrp-integration/component/common/pom.xml portal/branches/wsrp-integration/component/common/src/main/java/org/exoplatform/commons/chromattic/ChromatticLifeCycle.java portal/branches/wsrp-integration/component/common/src/main/java/org/exoplatform/commons/chromattic/ChromatticManager.java portal/branches/wsrp-integration/component/common/src/main/java/org/exoplatform/commons/chromattic/Synchronization.java portal/branches/wsrp-integration/component/common/src/test/java/org/exoplatform/commons/chromattic/ChromatticIntegrationTestCase.java portal/branches/wsrp-integration/component/common/src/test/java/org/exoplatform/commons/chromattic/FooEntity.java portal/branches/wsrp-integration/component/common/src/test/resources/conf/test-configuration.xml portal/branches/wsrp-integration/component/identity/pom.xml portal/branches/wsrp-integration/component/identity/src/main/java/org/exoplatform/services/organization/idm/GroupDAOImpl.java portal/branches/wsrp-integration/component/pc/pom.xml portal/branches/wsrp-integration/component/portal/pom.xml portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/config/DataStorage.java portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/config/DataStorageImpl.java portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/pom/config/ExecutorDispatcher.java portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/pom/config/POMDataStorage.java portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/pom/config/POMSession.java portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/pom/config/POMSessionManager.java portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/pom/config/POMTask.java portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/pom/config/TaskExecutionDecorator.java portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/pom/config/TaskExecutor.java portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/pom/config/cache/CacheableDataTask.java portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/pom/config/cache/DataCache.java portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/pom/config/tasks/DashboardTask.java portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/pom/config/tasks/PageNavigationTask.java portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/pom/config/tasks/PageTask.java portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/pom/config/tasks/PortalConfigTask.java portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/pom/config/tasks/PortletPreferencesTask.java portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/pom/config/tasks/PreferencesTask.java portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/pom/config/tasks/SearchTask.java portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/pom/data/ModelDataStorage.java portal/branches/wsrp-integration/component/portal/src/test/java/conf/portal/portal-configuration.xml portal/branches/wsrp-integration/component/portal/src/test/java/org/exoplatform/portal/config/AbstractPortalTest.java portal/branches/wsrp-integration/component/portal/src/test/java/org/exoplatform/portal/config/TestDataStorage.java portal/branches/wsrp-integration/component/portal/src/test/java/org/exoplatform/portal/config/TestGadget.java portal/branches/wsrp-integration/component/portal/src/test/java/org/exoplatform/portal/config/TestPortletPreferences.java portal/branches/wsrp-integration/component/portal/src/test/java/org/exoplatform/portal/config/TestUserPortalConfigService.java portal/branches/wsrp-integration/component/portal/src/test/java/org/exoplatform/portal/config/TestWSRP.java portal/branches/wsrp-integration/component/resources/pom.xml portal/branches/wsrp-integration/component/scripting/pom.xml portal/branches/wsrp-integration/component/test/core/pom.xml portal/branches/wsrp-integration/component/test/jcr/pom.xml portal/branches/wsrp-integration/component/test/organization/pom.xml portal/branches/wsrp-integration/component/web/pom.xml portal/branches/wsrp-integration/component/wsrp/pom.xml portal/branches/wsrp-integration/component/xml-parser/pom.xml portal/branches/wsrp-integration/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/jcr/repository-configuration.xml portal/branches/wsrp-integration/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/jcr/repository-configuration.xml portal/branches/wsrp-integration/examples/portlets/jsfhellouser/pom.xml portal/branches/wsrp-integration/examples/portlets/jsphellouser/pom.xml portal/branches/wsrp-integration/examples/portlets/simplesthelloworld/pom.xml portal/branches/wsrp-integration/gadgets/core/pom.xml portal/branches/wsrp-integration/gadgets/eXoGadgets/pom.xml portal/branches/wsrp-integration/gadgets/server/pom.xml portal/branches/wsrp-integration/packaging/pkg/pom.xml portal/branches/wsrp-integration/pom.xml portal/branches/wsrp-integration/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIBarDecorator/UIInfoBar/Stylesheet.css portal/branches/wsrp-integration/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UISelector/UIGroupMembershipSelector/Stylesheet.css portal/branches/wsrp-integration/web/portal/src/main/webapp/WEB-INF/conf/common/autologin-configuration.xml portal/branches/wsrp-integration/web/portal/src/main/webapp/WEB-INF/conf/database/database-configuration.xml portal/branches/wsrp-integration/web/portal/src/main/webapp/WEB-INF/conf/jcr/repository-configuration.tmpl.xml portal/branches/wsrp-integration/web/portal/src/main/webapp/WEB-INF/conf/jcr/repository-configuration.xml portal/branches/wsrp-integration/web/portal/src/main/webapp/WEB-INF/conf/portal/application-registry-configuration.xml portal/branches/wsrp-integration/web/portal/src/main/webapp/WEB-INF/conf/portal/portal-configuration.xml portal/branches/wsrp-integration/web/rest/pom.xml portal/branches/wsrp-integration/webui/core/pom.xml portal/branches/wsrp-integration/webui/core/src/main/java/org/exoplatform/webui/form/UIFormTextAreaInput.java portal/branches/wsrp-integration/webui/portal/pom.xml portal/branches/wsrp-integration/webui/portal/src/main/java/org/exoplatform/portal/webui/application/ModelAdapter.java portal/branches/wsrp-integration/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIGadget.java portal/branches/wsrp-integration/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalForm.java portal/branches/wsrp-integration/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIPortalApplication.java Log: - Merged trunk changes from revision 1041 to 1078. Modified: portal/branches/wsrp-integration/component/application-registry/pom.xml =================================================================== --- portal/branches/wsrp-integration/component/application-registry/pom.xml 2009-12-20 10:23:34 UTC (rev 1078) +++ portal/branches/wsrp-integration/component/application-registry/pom.xml 2009-12-20 15:05:20 UTC (rev 1079) @@ -19,99 +19,90 @@ --> -<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"> - <parent> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component</artifactId> - <version>3.0.0-Beta04-SNAPSHOT</version> - </parent> +<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"> + <parent> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component</artifactId> + <version>3.0.0-Beta04-SNAPSHOT</version> + </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>exo.portal.component.application-registry</artifactId> - <name>GateIn Portal Component Application Registry</name> - <packaging>jar</packaging> + <modelVersion>4.0.0</modelVersion> + <artifactId>exo.portal.component.application-registry</artifactId> + <name>GateIn Portal Component Application Registry</name> + <packaging>jar</packaging> - <dependencies> - <dependency> - <groupId>org.exoplatform.jcr</groupId> - <artifactId>exo.jcr.component.ext</artifactId> - <version>${org.exoplatform.jcr.version}</version> - </dependency> + <dependencies> + <dependency> + <groupId>org.exoplatform.jcr</groupId> + <artifactId>exo.jcr.component.ext</artifactId> + </dependency> - <dependency> - <groupId>org.exoplatform.core</groupId> - <artifactId>exo.core.component.organization.api</artifactId> - <version>${org.exoplatform.core.version}</version> - </dependency> + <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.organization.api</artifactId> + </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.portal</artifactId> - <version>3.0.0-Beta04-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.chromattic</groupId> - <artifactId>chromattic.ntdef</artifactId> - <version>${version.chromattic}</version> - </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.portal</artifactId> + <version>3.0.0-Beta04-SNAPSHOT</version> + </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.test.core</artifactId> - <version>3.0.0-Beta04-SNAPSHOT</version> - <scope>test</scope> - </dependency> + <dependency> + <groupId>org.chromattic</groupId> + <artifactId>chromattic.ntdef</artifactId> + </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.test.jcr</artifactId> - <version>3.0.0-Beta04-SNAPSHOT</version> - <scope>test</scope> - </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.test.core</artifactId> + <version>3.0.0-Beta04-SNAPSHOT</version> + <scope>test</scope> + </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.test.organization</artifactId> - <version>3.0.0-Beta04-SNAPSHOT</version> - <scope>test</scope> - </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.test.jcr</artifactId> + <version>3.0.0-Beta04-SNAPSHOT</version> + <scope>test</scope> + </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.portal</artifactId> - <version>3.0.0-Beta04-SNAPSHOT</version> - <type>test-jar</type> - <scope>test</scope> - </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.test.organization</artifactId> + <version>3.0.0-Beta04-SNAPSHOT</version> + <scope>test</scope> + </dependency> - <dependency> - <groupId>org.chromattic</groupId> - <artifactId>chromattic.core</artifactId> - <version>${version.chromattic}</version> - <scope>test</scope> - </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.portal</artifactId> + <version>3.0.0-Beta04-SNAPSHOT</version> + <type>test-jar</type> + <scope>test</scope> + </dependency> - <!-- - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.portal</artifactId> - <version>3.0.0-Beta04-SNAPSHOT</version> - <classifier>testconf</classifier> - <scope>test</scope> - </dependency> ---> + <dependency> + <groupId>org.chromattic</groupId> + <artifactId>chromattic.core</artifactId> + <version>${version.chromattic}</version> + <scope>test</scope> + </dependency> - <dependency> - <groupId>org.gatein.pc</groupId> - <artifactId>pc-api</artifactId> - <version>${org.gatein.pc.version}</version> - <exclusions> - <exclusion> - <groupId>org.gatein.wci</groupId> - <artifactId>wci-wci</artifactId> - </exclusion> - </exclusions> - </dependency> - </dependencies> + <!-- + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.portal</artifactId> + <version>3.0.0-Beta04-SNAPSHOT</version> + <classifier>testconf</classifier> + <scope>test</scope> + </dependency> + --> + + <dependency> + <groupId>org.gatein.pc</groupId> + <artifactId>pc-api</artifactId> + </dependency> + </dependencies> </project> Modified: portal/branches/wsrp-integration/component/application-registry/src/main/java/org/exoplatform/application/gadget/GadgetDeployer.java =================================================================== --- portal/branches/wsrp-integration/component/application-registry/src/main/java/org/exoplatform/application/gadget/GadgetDeployer.java 2009-12-20 10:23:34 UTC (rev 1078) +++ portal/branches/wsrp-integration/component/application-registry/src/main/java/org/exoplatform/application/gadget/GadgetDeployer.java 2009-12-20 15:05:20 UTC (rev 1079) @@ -20,7 +20,7 @@ import org.exoplatform.application.gadget.impl.GadgetRegistryServiceImpl; import org.exoplatform.commons.chromattic.ChromatticLifeCycle; -import org.exoplatform.commons.chromattic.SessionContext; +import org.exoplatform.container.ExoContainerContext; import org.exoplatform.container.PortalContainer; import org.exoplatform.container.RootContainer; import org.gatein.common.logging.Logger; @@ -56,8 +56,12 @@ /** . */ private GadgetRegistryServiceImpl gadgetRegistryService; - public GadgetDeployer(GadgetRegistryService gadgetRegistryService) + /** . */ + private ExoContainerContext context; + + public GadgetDeployer(ExoContainerContext context, GadgetRegistryService gadgetRegistryService) { + this.context = context; this.gadgetRegistryService = (GadgetRegistryServiceImpl)gadgetRegistryService; } @@ -82,7 +86,7 @@ handle(context, url); } }; - PortalContainer.addInitTask(scontext, task); + PortalContainer.addInitTask(scontext, task, context.getPortalContainerName()); } } catch (MalformedURLException e) @@ -106,7 +110,7 @@ private void handle(ServletContext scontext, URL gadgetsURL) { ChromatticLifeCycle lifeCycle = gadgetRegistryService.getChromatticLifeCycle(); - SessionContext context = lifeCycle.openContext(); + lifeCycle.openContext(); InputStream in; try { @@ -118,7 +122,7 @@ { Element gadgetElement = (Element)nodeList.item(i); String gadgetName = gadgetElement.getAttribute("name"); - log.info("About to import gadget " + gadgetName); + log.debug("About to import gadget " + gadgetName); Element pathElt = XMLTools.getUniqueChild(gadgetElement, "path", false); if (pathElt != null) { @@ -140,7 +144,7 @@ ServletLocalImporter importer = new ServletLocalImporter( gadgetName, gadgetRegistryService.getRegistry(), - url, + url, scontext, false); importer.doImport(); Modified: portal/branches/wsrp-integration/component/application-registry/src/main/java/org/exoplatform/application/gadget/LocalImporter.java =================================================================== --- portal/branches/wsrp-integration/component/application-registry/src/main/java/org/exoplatform/application/gadget/LocalImporter.java 2009-12-20 10:23:34 UTC (rev 1078) +++ portal/branches/wsrp-integration/component/application-registry/src/main/java/org/exoplatform/application/gadget/LocalImporter.java 2009-12-20 15:05:20 UTC (rev 1079) @@ -116,7 +116,7 @@ { if (registry.getGadget(name) != null) { - System.out.println("Cannot import existing gagdet " + name); + log.debug("Will not import existing gagdet " + name); return; } @@ -124,7 +124,7 @@ byte[] bytes = getGadgetBytes(); if (bytes == null) { - System.out.println("Coult not import gadget " + gadgetPath); + log.error("Cannot import gadget " + gadgetPath + " because its data could not be found"); return; } @@ -150,7 +150,7 @@ // log.info("Importing gadget name=" + name + " description=" + description + " thumbnail=" + thumbnail + " title=" + - thumbnail + " title=" + title); + thumbnail + " title=" + title); // def.setDescription(description); Modified: portal/branches/wsrp-integration/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/ApplicationRegistryServiceImpl.java =================================================================== --- portal/branches/wsrp-integration/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/ApplicationRegistryServiceImpl.java 2009-12-20 10:23:34 UTC (rev 1078) +++ portal/branches/wsrp-integration/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/ApplicationRegistryServiceImpl.java 2009-12-20 15:05:20 UTC (rev 1079) @@ -52,9 +52,9 @@ import java.util.Set; /** - * The fundamental reason that motives to use tasks is because of the JMX access that does not - * setup a context and therefore the task either reuse the existing context setup by the portal - * or create a temporary context when accessed by JMX. + * The fundamental reason that motives to use tasks is because of the JMX access that does not setup a context and + * therefore the task either reuse the existing context setup by the portal or create a temporary context when accessed + * by JMX. * * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> * @version $Revision$ @@ -620,7 +620,7 @@ finally { // lifeCycle.closeContext(context, true); - manager.getSynchronization().setSave(save); + manager.getSynchronization().setSaveOnClose(save); RequestLifeCycle.end(); } } Modified: portal/branches/wsrp-integration/component/application-registry/src/test/java/conf/application-registry-configuration.xml =================================================================== --- portal/branches/wsrp-integration/component/application-registry/src/test/java/conf/application-registry-configuration.xml 2009-12-20 10:23:34 UTC (rev 1078) +++ portal/branches/wsrp-integration/component/application-registry/src/test/java/conf/application-registry-configuration.xml 2009-12-20 15:05:20 UTC (rev 1079) @@ -21,573 +21,647 @@ --> <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd" - xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"> + xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd" + xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"> - <component> - <key>org.exoplatform.application.registry.ApplicationRegistryService</key> - <type>org.exoplatform.application.registry.impl.ApplicationRegistryServiceImpl</type> - <!-- - <component-plugins> - <component-plugin> - <name>new.portal.portlets.registry</name> - <set-method>initListener</set-method> - <type>org.exoplatform.application.registry.ApplicationCategoriesPlugins</type> - <description>this listener init the portlets are registered in PortletRegister</description> - <init-params> - <object-param> - <name>administration</name> - <description>description</description> - <object type="org.exoplatform.application.registry.ApplicationCategory"> - <field name="name"><string>administration</string></field> - <field name="displayName"><string>Administration</string></field> - <field name="description"><string>application for administration</string></field> - <field name="accessPermissions"> - <collection type="java.util.ArrayList" item-type="java.lang.String"> - <value><string>*:/platform/administrators</string></value> - <value><string>*:/organization/management/executive-board</string></value> - </collection> - </field> - <field name="applications"> - <collection type="java.util.ArrayList"> - <value> - <object type="org.exoplatform.application.registry.Application"> - <field name="applicationName"><string>ApplicationRegistryPortlet</string></field> - <field name="categoryName"><string>administration</string></field> - <field name="displayName"><string>Application Registry</string></field> - <field name="description"><string>Application Registry</string></field> - <field name="applicationType"><string>portlet</string></field> - <field name="applicationGroup"><string>exoadmin</string></field> - <field name="accessPermissions"> - <collection type="java.util.ArrayList" item-type="java.lang.String"> - <value><string>*:/platform/administrators</string></value> - <value><string>*:/organization/management/executive-board</string></value> - </collection> - </field> - </object> - </value> - <value> - <object type="org.exoplatform.application.registry.Application"> - <field name="applicationName"><string>OrganizationPortlet</string></field> - <field name="categoryName"><string>administration</string></field> - <field name="displayName"><string>Organization Management</string></field> - <field name="description"><string>Organization Management</string></field> - <field name="applicationType"><string>portlet</string></field> - <field name="applicationGroup"><string>exoadmin</string></field> - <field name="accessPermissions"> - <collection type="java.util.ArrayList" item-type="java.lang.String"> - <value><string>*:/platform/administrators</string></value> - <value><string>*:/organization/management/executive-board</string></value> - </collection> - </field> - </object> - </value> - <value> - <object type="org.exoplatform.application.registry.Application"> - <field name="applicationName"><string>AccountPortlet</string></field> - <field name="categoryName"><string>administration</string></field> - <field name="displayName"><string>New Account</string></field> - <field name="description"><string>New Account</string></field> - <field name="applicationType"><string>portlet</string></field> - <field name="applicationGroup"><string>exoadmin</string></field> - <field name="accessPermissions"> - <collection type="java.util.ArrayList" item-type="java.lang.String"> - <value><string>*:/platform/administrators</string></value> - <value><string>*:/organization/management/executive-board</string></value> - </collection> - </field> - </object> - </value> - </collection> - </field> - </object> - </object-param> + <component> + <key>org.exoplatform.application.registry.ApplicationRegistryService</key> + <type>org.exoplatform.application.registry.impl.ApplicationRegistryServiceImpl</type> + <!-- + <component-plugins> + <component-plugin> + <name>new.portal.portlets.registry</name> + <set-method>initListener</set-method> + <type>org.exoplatform.application.registry.ApplicationCategoriesPlugins</type> + <description>this listener init the portlets are registered in PortletRegister</description> + <init-params> + <object-param> + <name>administration</name> + <description>description</description> + <object type="org.exoplatform.application.registry.ApplicationCategory"> + <field name="name"><string>administration</string></field> + <field name="displayName"><string>Administration</string></field> + <field name="description"><string>application for administration</string></field> + <field name="accessPermissions"> + <collection type="java.util.ArrayList" item-type="java.lang.String"> + <value><string>*:/platform/administrators</string></value> + <value><string>*:/organization/management/executive-board</string></value> + </collection> + </field> + <field name="applications"> + <collection type="java.util.ArrayList"> + <value> + <object type="org.exoplatform.application.registry.Application"> + <field name="applicationName"><string>ApplicationRegistryPortlet</string></field> + <field name="categoryName"><string>administration</string></field> + <field name="displayName"><string>Application Registry</string></field> + <field name="description"><string>Application Registry</string></field> + <field name="applicationType"><string>portlet</string></field> + <field name="applicationGroup"><string>exoadmin</string></field> + <field name="accessPermissions"> + <collection type="java.util.ArrayList" item-type="java.lang.String"> + <value><string>*:/platform/administrators</string></value> + <value><string>*:/organization/management/executive-board</string></value> + </collection> + </field> + </object> + </value> + <value> + <object type="org.exoplatform.application.registry.Application"> + <field name="applicationName"><string>OrganizationPortlet</string></field> + <field name="categoryName"><string>administration</string></field> + <field name="displayName"><string>Organization Management</string></field> + <field name="description"><string>Organization Management</string></field> + <field name="applicationType"><string>portlet</string></field> + <field name="applicationGroup"><string>exoadmin</string></field> + <field name="accessPermissions"> + <collection type="java.util.ArrayList" item-type="java.lang.String"> + <value><string>*:/platform/administrators</string></value> + <value><string>*:/organization/management/executive-board</string></value> + </collection> + </field> + </object> + </value> + <value> + <object type="org.exoplatform.application.registry.Application"> + <field name="applicationName"><string>AccountPortlet</string></field> + <field name="categoryName"><string>administration</string></field> + <field name="displayName"><string>New Account</string></field> + <field name="description"><string>New Account</string></field> + <field name="applicationType"><string>portlet</string></field> + <field name="applicationGroup"><string>exoadmin</string></field> + <field name="accessPermissions"> + <collection type="java.util.ArrayList" item-type="java.lang.String"> + <value><string>*:/platform/administrators</string></value> + <value><string>*:/organization/management/executive-board</string></value> + </collection> + </field> + </object> + </value> + </collection> + </field> + </object> + </object-param> - <object-param> - <name>web</name> - <description>description</description> - <object type="org.exoplatform.application.registry.ApplicationCategory"> - <field name="name"><string>web</string></field> - <field name="displayName"><string>web</string></field> - <field name="description"><string>BasicPortlets</string></field> - <field name="accessPermissions"> - <collection type="java.util.ArrayList" item-type="java.lang.String"> - <value><string>*:/platform/users</string></value> - </collection> - </field> - <field name="applications"> - <collection type="java.util.ArrayList"> - <value> - <object type="org.exoplatform.application.registry.Application"> - <field name="categoryName"><string>web</string></field> - <field name="applicationName"><string>IFramePortlet</string></field> - <field name="displayName"><string>IFrame</string></field> - <field name="description"><string>IFrame</string></field> - <field name="applicationType"><string>portlet</string></field> - <field name="applicationGroup"><string>web</string></field> - <field name="accessPermissions"> - <collection type="java.util.ArrayList" item-type="java.lang.String"> - <value><string>*:/platform/users</string></value> - </collection> - </field> - </object> - </value> - <value> - <object type="org.exoplatform.application.registry.Application"> - <field name="categoryName"><string>web</string></field> - <field name="applicationName"><string>SiteMapPortlet</string></field> - <field name="displayName"><string>SiteMap</string></field> - <field name="description"><string>SiteMap</string></field> - <field name="applicationType"><string>portlet</string></field> - <field name="applicationGroup"><string>web</string></field> - <field name="accessPermissions"> - <collection type="java.util.ArrayList" item-type="java.lang.String"> - <value><string>*:/platform/users</string></value> - </collection> - </field> - </object> - </value> - <value> - <object type="org.exoplatform.application.registry.Application"> - <field name="categoryName"><string>web</string></field> - <field name="applicationName"><string>BrowserPortlet</string></field> - <field name="displayName"><string>Web Explorer</string></field> - <field name="description"><string>Web Explorer</string></field> - <field name="applicationType"><string>portlet</string></field> - <field name="applicationGroup"><string>web</string></field> - <field name="accessPermissions"> - <collection type="java.util.ArrayList" item-type="java.lang.String"> - <value><string>*:/platform/users</string></value> - </collection> - </field> - </object> - </value> - </collection> - </field> - </object> - </object-param> + <object-param> + <name>web</name> + <description>description</description> + <object type="org.exoplatform.application.registry.ApplicationCategory"> + <field name="name"><string>web</string></field> + <field name="displayName"><string>web</string></field> + <field name="description"><string>BasicPortlets</string></field> + <field name="accessPermissions"> + <collection type="java.util.ArrayList" item-type="java.lang.String"> + <value><string>*:/platform/users</string></value> + </collection> + </field> + <field name="applications"> + <collection type="java.util.ArrayList"> + <value> + <object type="org.exoplatform.application.registry.Application"> + <field name="categoryName"><string>web</string></field> + <field name="applicationName"><string>IFramePortlet</string></field> + <field name="displayName"><string>IFrame</string></field> + <field name="description"><string>IFrame</string></field> + <field name="applicationType"><string>portlet</string></field> + <field name="applicationGroup"><string>web</string></field> + <field name="accessPermissions"> + <collection type="java.util.ArrayList" item-type="java.lang.String"> + <value><string>*:/platform/users</string></value> + </collection> + </field> + </object> + </value> + <value> + <object type="org.exoplatform.application.registry.Application"> + <field name="categoryName"><string>web</string></field> + <field name="applicationName"><string>SiteMapPortlet</string></field> + <field name="displayName"><string>SiteMap</string></field> + <field name="description"><string>SiteMap</string></field> + <field name="applicationType"><string>portlet</string></field> + <field name="applicationGroup"><string>web</string></field> + <field name="accessPermissions"> + <collection type="java.util.ArrayList" item-type="java.lang.String"> + <value><string>*:/platform/users</string></value> + </collection> + </field> + </object> + </value> + <value> + <object type="org.exoplatform.application.registry.Application"> + <field name="categoryName"><string>web</string></field> + <field name="applicationName"><string>BrowserPortlet</string></field> + <field name="displayName"><string>Web Explorer</string></field> + <field name="description"><string>Web Explorer</string></field> + <field name="applicationType"><string>portlet</string></field> + <field name="applicationGroup"><string>web</string></field> + <field name="accessPermissions"> + <collection type="java.util.ArrayList" item-type="java.lang.String"> + <value><string>*:/platform/users</string></value> + </collection> + </field> + </object> + </value> + </collection> + </field> + </object> + </object-param> - <object-param> - <name>dashboard</name> - <description>description</description> - <object type="org.exoplatform.application.registry.ApplicationCategory"> - <field name="name"><string>dashboard</string></field> - <field name="displayName"><string>Dashboard</string></field> - <field name="description"><string>Dashboard</string></field> - <field name="accessPermissions"> - <collection type="java.util.ArrayList" item-type="java.lang.String"> - <value><string>*:/platform/users</string></value> - </collection> - </field> - <field name="applications"> - <collection type="java.util.ArrayList"> - <value> - <object type="org.exoplatform.application.registry.Application"> - <field name="categoryName"><string>dashboard</string></field> - <field name="applicationName"><string>DashboardPortlet</string></field> - <field name="displayName"><string>Dashboard Portlet</string></field> - <field name="description"><string>Dashboard Portlet</string></field> - <field name="applicationType"><string>portlet</string></field> - <field name="applicationGroup"><string>dashboard</string></field> - <field name="accessPermissions"> - <collection type="java.util.ArrayList" item-type="java.lang.String"> - <value><string>*:/platform/users</string></value> - </collection> - </field> - </object> - </value> - <value> - <object type="org.exoplatform.application.registry.Application"> - <field name="categoryName"><string>dashboard</string></field> - <field name="applicationName"><string>GadgetPortlet</string></field> - <field name="displayName"><string>Gadget Wrapper Portlet</string></field> - <field name="description"><string>Gadget Wrapper Portlet</string></field> - <field name="applicationType"><string>portlet</string></field> - <field name="applicationGroup"><string>dashboard</string></field> - <field name="accessPermissions"> - <collection type="java.util.ArrayList" item-type="java.lang.String"> - <value><string>*:/platform/users</string></value> - </collection> - </field> - </object> - </value> - </collection> - </field> - </object> - </object-param> - </init-params> - </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.impl.ApplicationRegistryChromatticLifeCycle</type> - <init-params> - <value-param> - <name>name</name> - <value>app</value> - </value-param> - <value-param> - <name>workspace-name</name> - <value>portal-test</value> - </value-param> - <values-param> - <name>entities</name> - <value>org.exoplatform.application.registry.impl.ContentRegistry</value> - <value>org.exoplatform.application.registry.impl.CategoryDefinition</value> - <value>org.exoplatform.application.registry.impl.ContentDefinition</value> - <value>org.exoplatform.application.gadget.impl.GadgetRegistry</value> - <value>org.exoplatform.application.gadget.impl.GadgetDefinition</value> - <value>org.exoplatform.application.gadget.impl.LocalGadgetData</value> - <value>org.exoplatform.application.gadget.impl.RemoteGadgetData</value> - <value>org.chromattic.ntdef.NTFile</value> - <value>org.chromattic.ntdef.NTFolder</value> - <value>org.chromattic.ntdef.NTResource</value> - </values-param> - </init-params> - </component-plugin> - </external-component-plugins> + <object-param> + <name>dashboard</name> + <description>description</description> + <object type="org.exoplatform.application.registry.ApplicationCategory"> + <field name="name"><string>dashboard</string></field> + <field name="displayName"><string>Dashboard</string></field> + <field name="description"><string>Dashboard</string></field> + <field name="accessPermissions"> + <collection type="java.util.ArrayList" item-type="java.lang.String"> + <value><string>*:/platform/users</string></value> + </collection> + </field> + <field name="applications"> + <collection type="java.util.ArrayList"> + <value> + <object type="org.exoplatform.application.registry.Application"> + <field name="categoryName"><string>dashboard</string></field> + <field name="applicationName"><string>DashboardPortlet</string></field> + <field name="displayName"><string>Dashboard Portlet</string></field> + <field name="description"><string>Dashboard Portlet</string></field> + <field name="applicationType"><string>portlet</string></field> + <field name="applicationGroup"><string>dashboard</string></field> + <field name="accessPermissions"> + <collection type="java.util.ArrayList" item-type="java.lang.String"> + <value><string>*:/platform/users</string></value> + </collection> + </field> + </object> + </value> + <value> + <object type="org.exoplatform.application.registry.Application"> + <field name="categoryName"><string>dashboard</string></field> + <field name="applicationName"><string>GadgetPortlet</string></field> + <field name="displayName"><string>Gadget Wrapper Portlet</string></field> + <field name="description"><string>Gadget Wrapper Portlet</string></field> + <field name="applicationType"><string>portlet</string></field> + <field name="applicationGroup"><string>dashboard</string></field> + <field name="accessPermissions"> + <collection type="java.util.ArrayList" item-type="java.lang.String"> + <value><string>*:/platform/users</string></value> + </collection> + </field> + </object> + </value> + </collection> + </field> + </object> + </object-param> + </init-params> + </component-plugin> + </component-plugins> + --> + </component> - <external-component-plugins> - <target-component>org.exoplatform.services.jcr.RepositoryService</target-component> - <component-plugin> - <name>add.namespaces</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.jcr.impl.AddNamespacesPlugin</type> - <init-params> - <properties-param> - <name>namespaces</name> - <property name="app" value="http://www.gatein.org/jcr/application-registry/1.0/"/> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>add.nodeType</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.jcr.impl.AddNodeTypePlugin</type> - <init-params> - <values-param> - <name>autoCreatedInNewRepository</name> - <description>Node types configuration file</description> - <value>jar:/conf/application-nodetypes.xml</value> - </values-param> - </init-params> - </component-plugin> - </external-component-plugins> + <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.impl.ApplicationRegistryChromatticLifeCycle</type> + <init-params> + <value-param> + <name>domain-name</name> + <value>app</value> + </value-param> + <value-param> + <name>workspace-name</name> + <value>portal-test</value> + </value-param> + <values-param> + <name>entities</name> + <value>org.exoplatform.application.registry.impl.ContentRegistry</value> + <value>org.exoplatform.application.registry.impl.CategoryDefinition</value> + <value>org.exoplatform.application.registry.impl.ContentDefinition</value> + <value>org.exoplatform.application.gadget.impl.GadgetRegistry</value> + <value>org.exoplatform.application.gadget.impl.GadgetDefinition</value> + <value>org.exoplatform.application.gadget.impl.LocalGadgetData</value> + <value>org.exoplatform.application.gadget.impl.RemoteGadgetData</value> + <value>org.chromattic.ntdef.NTFile</value> + <value>org.chromattic.ntdef.NTFolder</value> + <value>org.chromattic.ntdef.NTResource</value> + </values-param> + </init-params> + </component-plugin> + </external-component-plugins> - <external-component-plugins> - <target-component>org.exoplatform.portal.config.UserPortalConfigService</target-component> - <component-plugin> - <name>new.portal.config.user.listener</name> - <set-method>initListener</set-method> - <type>org.exoplatform.portal.config.NewPortalConfigListener</type> - <description>this listener init the portal configuration</description> - <init-params> - <value-param> - <name>default.portal</name> - <description>The default portal for checking db is empty or not</description> - <value>classic</value> - </value-param> - <value-param> - <name>initializing.failure.ignore</name> - <description>In the run method, use try catch or not (value is true/false)</description> - <value>true</value> - </value-param> - <object-param> - <name>portal.configuration</name> - <description>description</description> - <object type="org.exoplatform.portal.config.NewPortalConfig"> - <field name="predefinedOwner"> - <collection type="java.util.HashSet"> - <value> - <string>classic</string> - </value> - <value> - <string>test</string> - </value> - </collection> - </field> - <field name="ownerType"> - <string>portal</string> - </field> - <field name="templateLocation"> - <string>classpath:/portal</string> - </field> - </object> - </object-param> - <object-param> - <name>group.configuration</name> - <description>description</description> - <object type="org.exoplatform.portal.config.NewPortalConfig"> - <field name="predefinedOwner"> - <collection type="java.util.HashSet"> - <value> - <string>platform/administrators</string> - </value> - <value> - <string>platform/users</string> - </value> - <value> - <string>platform/guests</string> - </value> - <value> - <string>platform/test/legacy</string> - </value> - <value> - <string>platform/test/normalized</string> - </value> - <value> - <string>organization/management/executive-board</string> - </value> - </collection> - </field> - <field name="ownerType"> - <string>group</string> - </field> - <field name="templateLocation"> - <string>classpath:/portal</string> - </field> - </object> - </object-param> - <object-param> - <name>user.configuration</name> - <description>description</description> - <object type="org.exoplatform.portal.config.NewPortalConfig"> - <field name="predefinedOwner"> - <collection type="java.util.HashSet"> - <value> - <string>root</string> - </value> - <value> - <string>john</string> - </value> - <value> - <string>mary</string> - </value> - <value> - <string>demo</string> - </value> - <value> - <string>overwritelayout</string> - </value> - </collection> - </field> - <field name="ownerType"> - <string>user</string> - </field> - <field name="templateLocation"> - <string>classpath:/portal</string> - </field> - </object> - </object-param> - <object-param> - <name>page.templates</name> - <description>List of page templates</description> - <object type="org.exoplatform.portal.config.PageTemplateConfig"> - <field name="templates"> - <collection type="java.util.ArrayList"></collection> - </field> - <field name="location"> - <string>classpath:/portal/template/pages</string> - </field> - </object> - </object-param> - </init-params> - </component-plugin> - </external-component-plugins> + <external-component-plugins> + <target-component>org.exoplatform.services.jcr.RepositoryService</target-component> + <component-plugin> + <name>add.namespaces</name> + <set-method>addPlugin</set-method> + <type>org.exoplatform.services.jcr.impl.AddNamespacesPlugin</type> + <init-params> + <properties-param> + <name>namespaces</name> + <property name="app" value="http://www.gatein.org/jcr/application-registry/1.0/"/> + </properties-param> + </init-params> + </component-plugin> + <component-plugin> + <name>add.nodeType</name> + <set-method>addPlugin</set-method> + <type>org.exoplatform.services.jcr.impl.AddNodeTypePlugin</type> + <init-params> + <values-param> + <name>autoCreatedInNewRepository</name> + <description>Node types configuration file</description> + <value>jar:/conf/application-nodetypes.xml</value> + </values-param> + </init-params> + </component-plugin> + </external-component-plugins> - <external-component-plugins> - <target-component>org.exoplatform.services.organization.OrganizationService</target-component> - <component-plugin> - <name>init.service.listener</name> - <set-method>addListenerPlugin</set-method> - <type>org.exoplatform.services.organization.OrganizationDatabaseInitializer</type> - <description>this listener populate organization data for the first launch</description> - <init-params> - <value-param> - <name>checkDatabaseAlgorithm</name> - <description>check database</description> - <value>entry</value> - </value-param> - <value-param> - <name>printInformation</name> - <description>Print information init database</description> - <value>true</value> - </value-param> - <object-param> - <name>configuration</name> - <description>description</description> - <object type="org.exoplatform.services.organization.OrganizationConfig"> - <field name="membershipType"> - <collection type="java.util.ArrayList"> - <value> - <object type="org.exoplatform.services.organization.OrganizationConfig$MembershipType"> - <field name="type"><string>member</string></field> - <field name="description"><string>member membership type</string></field> - </object> - </value> - <value> - <object type="org.exoplatform.services.organization.OrganizationConfig$MembershipType"> - <field name="type"><string>MembershipType_1</string></field> - <field name="description"><string>MembershipType_1 membership type</string></field> - </object> - </value> - <value> - <object type="org.exoplatform.services.organization.OrganizationConfig$MembershipType"> - <field name="type"><string>MembershipType_2</string></field> - <field name="description"><string>MembershipType_2 membership type</string></field> - </object> - </value> - </collection> - </field> + <external-component-plugins> + <target-component>org.exoplatform.portal.config.UserPortalConfigService</target-component> + <component-plugin> + <name>new.portal.config.user.listener</name> + <set-method>initListener</set-method> + <type>org.exoplatform.portal.config.NewPortalConfigListener</type> + <description>this listener init the portal configuration</description> + <init-params> + <value-param> + <name>default.portal</name> + <description>The default portal for checking db is empty or not</description> + <value>classic</value> + </value-param> + <value-param> + <name>initializing.failure.ignore</name> + <description>In the run method, use try catch or not (value is true/false)</description> + <value>true</value> + </value-param> + <object-param> + <name>portal.configuration</name> + <description>description</description> + <object type="org.exoplatform.portal.config.NewPortalConfig"> + <field name="predefinedOwner"> + <collection type="java.util.HashSet"> + <value> + <string>classic</string> + </value> + <value> + <string>test</string> + </value> + </collection> + </field> + <field name="ownerType"> + <string>portal</string> + </field> + <field name="templateLocation"> + <string>classpath:/portal</string> + </field> + </object> + </object-param> + <object-param> + <name>group.configuration</name> + <description>description</description> + <object type="org.exoplatform.portal.config.NewPortalConfig"> + <field name="predefinedOwner"> + <collection type="java.util.HashSet"> + <value> + <string>platform/administrators</string> + </value> + <value> + <string>platform/users</string> + </value> + <value> + <string>platform/guests</string> + </value> + <value> + <string>platform/test/legacy</string> + </value> + <value> + <string>platform/test/normalized</string> + </value> + <value> + <string>organization/management/executive-board</string> + </value> + </collection> + </field> + <field name="ownerType"> + <string>group</string> + </field> + <field name="templateLocation"> + <string>classpath:/portal</string> + </field> + </object> + </object-param> + <object-param> + <name>user.configuration</name> + <description>description</description> + <object type="org.exoplatform.portal.config.NewPortalConfig"> + <field name="predefinedOwner"> + <collection type="java.util.HashSet"> + <value> + <string>root</string> + </value> + <value> + <string>john</string> + </value> + <value> + <string>mary</string> + </value> + <value> + <string>demo</string> + </value> + <value> + <string>overwritelayout</string> + </value> + </collection> + </field> + <field name="ownerType"> + <string>user</string> + </field> + <field name="templateLocation"> + <string>classpath:/portal</string> + </field> + </object> + </object-param> + <object-param> + <name>page.templates</name> + <description>List of page templates</description> + <object type="org.exoplatform.portal.config.PageTemplateConfig"> + <field name="templates"> + <collection type="java.util.ArrayList"></collection> + </field> + <field name="location"> + <string>classpath:/portal/template/pages</string> + </field> + </object> + </object-param> + </init-params> + </component-plugin> + </external-component-plugins> - <field name="group"> - <collection type="java.util.ArrayList"> - <value> - <object type="org.exoplatform.services.organization.OrganizationConfig$Group"> - <field name="name"><string>platform</string></field> - <field name="parentId"><string></string></field> - <field name="description"><string>the /platform group</string></field> - <field name="label"><string>Platform</string></field> - </object> - </value> - <value> - <object type="org.exoplatform.services.organization.OrganizationConfig$Group"> - <field name="name"><string>users</string></field> - <field name="parentId"><string>/platform</string></field> - <field name="description"><string>the /platform/users group</string></field> - <field name="label"><string>Users</string></field> - </object> - </value> - <value> - <object type="org.exoplatform.services.organization.OrganizationConfig$Group"> - <field name="name"><string>Group1</string></field> - <field name="parentId"><string>/platform/users</string></field> - <field name="description"><string>the /platform/users/Group1 group</string></field> - <field name="label"><string>Group1</string></field> - </object> - </value> - <value> - <object type="org.exoplatform.services.organization.OrganizationConfig$Group"> - <field name="name"><string>Group2</string></field> - <field name="parentId"><string>/platform/users</string></field> - <field name="description"><string>the /platform/users/Group2 group</string></field> - <field name="label"><string>Group2</string></field> - </object> - </value> - </collection> - </field> + <external-component-plugins> + <target-component>org.exoplatform.services.organization.OrganizationService</target-component> + <component-plugin> + <name>init.service.listener</name> + <set-method>addListenerPlugin</set-method> + <type>org.exoplatform.services.organization.OrganizationDatabaseInitializer</type> + <description>this listener populate organization data for the first launch</description> + <init-params> + <value-param> + <name>checkDatabaseAlgorithm</name> + <description>check database</description> + <value>entry</value> + </value-param> + <value-param> + <name>printInformation</name> + <description>Print information init database</description> + <value>true</value> + </value-param> + <object-param> + <name>configuration</name> + <description>description</description> + <object type="org.exoplatform.services.organization.OrganizationConfig"> + <field name="membershipType"> + <collection type="java.util.ArrayList"> + <value> + <object type="org.exoplatform.services.organization.OrganizationConfig$MembershipType"> + <field name="type"> + <string>member</string> + </field> + <field name="description"> + <string>member membership type</string> + </field> + </object> + </value> + <value> + <object type="org.exoplatform.services.organization.OrganizationConfig$MembershipType"> + <field name="type"> + <string>MembershipType_1</string> + </field> + <field name="description"> + <string>MembershipType_1 membership type</string> + </field> + </object> + </value> + <value> + <object type="org.exoplatform.services.organization.OrganizationConfig$MembershipType"> + <field name="type"> + <string>MembershipType_2</string> + </field> + <field name="description"> + <string>MembershipType_2 membership type</string> + </field> + </object> + </value> + </collection> + </field> - <field name="user"> - <collection type="java.util.ArrayList"> - <value> - <object type="org.exoplatform.services.organization.OrganizationConfig$User"> - <field name="userName"><string>demo</string></field> - <field name="password"><string>gtn</string></field> - <field name="firstName"><string>Demo</string></field> - <field name="lastName"><string>gtn</string></field> - <field name="email"><string>demo@localhost</string></field> - <field name="groups"> - <string>member:/platform/users</string> - </field> - </object> - </value> - <value> - <object type="org.exoplatform.services.organization.OrganizationConfig$User"> - <field name="userName"><string>userName_1</string></field> - <field name="password"><string>default</string></field> - <field name="firstName"><string>default</string></field> - <field name="lastName"><string>default</string></field> - <field name=&quot;email&quot;&gt;&lt;string&gt;exo(a)exoportal.org&lt;/string&gt;&lt;/field&gt; - <field name="groups"> - <string>member:/platform/users</string> - </field> - </object> - </value> - <value> - <object type="org.exoplatform.services.organization.OrganizationConfig$User"> - <field name="userName"><string>userName_2</string></field> - <field name="password"><string>default</string></field> - <field name="firstName"><string>default</string></field> - <field name="lastName"><string>default</string></field> - <field name=&quot;email&quot;&gt;&lt;string&gt;exo(a)exoportal.org&lt;/string&gt;&lt;/field&gt; - <field name="groups"> - <string>member:/platform/users</string> - </field> - </object> - </value> + <field name="group"> + <collection type="java.util.ArrayList"> + <value> + <object type="org.exoplatform.services.organization.OrganizationConfig$Group"> + <field name="name"> + <string>platform</string> + </field> + <field name="parentId"> + <string></string> + </field> + <field name="description"> + <string>the /platform group</string> + </field> + <field name="label"> + <string>Platform</string> + </field> + </object> + </value> + <value> + <object type="org.exoplatform.services.organization.OrganizationConfig$Group"> + <field name="name"> + <string>users</string> + </field> + <field name="parentId"> + <string>/platform</string> + </field> + <field name="description"> + <string>the /platform/users group</string> + </field> + <field name="label"> + <string>Users</string> + </field> + </object> + </value> + <value> + <object type="org.exoplatform.services.organization.OrganizationConfig$Group"> + <field name="name"> + <string>Group1</string> + </field> + <field name="parentId"> + <string>/platform/users</string> + </field> + <field name="description"> + <string>the /platform/users/Group1 group</string> + </field> + <field name="label"> + <string>Group1</string> + </field> + </object> + </value> + <value> + <object type="org.exoplatform.services.organization.OrganizationConfig$Group"> + <field name="name"> + <string>Group2</string> + </field> + <field name="parentId"> + <string>/platform/users</string> + </field> + <field name="description"> + <string>the /platform/users/Group2 group</string> + </field> + <field name="label"> + <string>Group2</string> + </field> + </object> + </value> + </collection> + </field> - <!-- - <value> - <object type="org.exoplatform.services.organization.OrganizationConfig$User"> - <field name="userName"><string>root</string></field> - <field name="password"><string>gtn</string></field> - <field name="firstName"><string>Root</string></field> - <field name="lastName"><string>Root</string></field> - <field name="email"><string>root@localhost</string></field> - <field name="groups"> - <string> - manager:/platform/administrators,member:/platform/users, - member:/organization/management/executive-board - </string> - </field> - </object> - </value> + <field name="user"> + <collection type="java.util.ArrayList"> + <value> + <object type="org.exoplatform.services.organization.OrganizationConfig$User"> + <field name="userName"> + <string>demo</string> + </field> + <field name="password"> + <string>gtn</string> + </field> + <field name="firstName"> + <string>Demo</string> + </field> + <field name="lastName"> + <string>gtn</string> + </field> + <field name="email"> + <string>demo@localhost</string> + </field> + <field name="groups"> + <string>member:/platform/users</string> + </field> + </object> + </value> + <value> + <object type="org.exoplatform.services.organization.OrganizationConfig$User"> + <field name="userName"> + <string>userName_1</string> + </field> + <field name="password"> + <string>default</string> + </field> + <field name="firstName"> + <string>default</string> + </field> + <field name="lastName"> + <string>default</string> + </field> + <field name="email"> + <string&gt;exo(a)exoportal.org&lt;/string&gt; + </field> + <field name="groups"> + <string>member:/platform/users</string> + </field> + </object> + </value> + <value> + <object type="org.exoplatform.services.organization.OrganizationConfig$User"> + <field name="userName"> + <string>userName_2</string> + </field> + <field name="password"> + <string>default</string> + </field> + <field name="firstName"> + <string>default</string> + </field> + <field name="lastName"> + <string>default</string> + </field> + <field name="email"> + <string&gt;exo(a)exoportal.org&lt;/string&gt; + </field> + <field name="groups"> + <string>member:/platform/users</string> + </field> + </object> + </value> - <value> - <object type="org.exoplatform.services.organization.OrganizationConfig$User"> - <field name="userName"><string>john</string></field> - <field name="password"><string>gtn</string></field> - <field name="firstName"><string>John</string></field> - <field name="lastName"><string>Anthony</string></field> - <field name="email"><string>john@localhost</string></field> - <field name="groups"> - <string> - member:/platform/administrators,member:/platform/users, - manager:/organization/management/executive-board - </string> - </field> - </object> - </value> - <value> - <object type="org.exoplatform.services.organization.OrganizationConfig$User"> - <field name="userName"><string>mary</string></field> - <field name="password"><string>gtn</string></field> - <field name="firstName"><string>Mary</string></field> - <field name="lastName"><string>Kelly</string></field> - <field name="email"><string>mary@localhost</string></field> - <field name="groups"> - <string>member:/platform/users</string> - </field> - </object> - </value> + <!-- + <value> + <object type="org.exoplatform.services.organization.OrganizationConfig$User"> + <field name="userName"><string>root</string></field> + <field name="password"><string>gtn</string></field> + <field name="firstName"><string>Root</string></field> + <field name="lastName"><string>Root</string></field> + <field name="email"><string>root@localhost</string></field> + <field name="groups"> + <string> + manager:/platform/administrators,member:/platform/users, + member:/organization/management/executive-board + </string> + </field> + </object> + </value> - <value> - <object type="org.exoplatform.services.organization.OrganizationConfig$User"> - <field name="userName"><string>overwritelayout</string></field> - <field name="password"><string>whatever</string></field> - <field name="firstName"><string>whatever</string></field> - <field name="lastName"><string>whatever</string></field> - <field name="email"><string>whatever@localhost</string></field> - <field name="groups"> - <string>member:/platform/guests</string> - </field> - </object> - </value> ---> + <value> + <object type="org.exoplatform.services.organization.OrganizationConfig$User"> + <field name="userName"><string>john</string></field> + <field name="password"><string>gtn</string></field> + <field name="firstName"><string>John</string></field> + <field name="lastName"><string>Anthony</string></field> + <field name="email"><string>john@localhost</string></field> + <field name="groups"> + <string> + member:/platform/administrators,member:/platform/users, + manager:/organization/management/executive-board + </string> + </field> + </object> + </value> + <value> + <object type="org.exoplatform.services.organization.OrganizationConfig$User"> + <field name="userName"><string>mary</string></field> + <field name="password"><string>gtn</string></field> + <field name="firstName"><string>Mary</string></field> + <field name="lastName"><string>Kelly</string></field> + <field name="email"><string>mary@localhost</string></field> + <field name="groups"> + <string>member:/platform/users</string> + </field> + </object> + </value> - </collection> - </field> - </object> - </object-param> - </init-params> - </component-plugin> + <value> + <object type="org.exoplatform.services.organization.OrganizationConfig$User"> + <field name="userName"><string>overwritelayout</string></field> + <field name="password"><string>whatever</string></field> + <field name="firstName"><string>whatever</string></field> + <field name="lastName"><string>whatever</string></field> + <field name="email"><string>whatever@localhost</string></field> + <field name="groups"> + <string>member:/platform/guests</string> + </field> + </object> + </value> + --> - </external-component-plugins> + </collection> + </field> + </object> + </object-param> + </init-params> + </component-plugin> + </external-component-plugins> + </configuration> Modified: portal/branches/wsrp-integration/component/application-registry/src/test/java/org/exoplatform/application/registry/TestApplicationRegistryService.java =================================================================== --- portal/branches/wsrp-integration/component/application-registry/src/test/java/org/exoplatform/application/registry/TestApplicationRegistryService.java 2009-12-20 10:23:34 UTC (rev 1078) +++ portal/branches/wsrp-integration/component/application-registry/src/test/java/org/exoplatform/application/registry/TestApplicationRegistryService.java 2009-12-20 15:05:20 UTC (rev 1079) @@ -1,16 +1,16 @@ /** * 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 @@ -31,12 +31,7 @@ import java.util.ArrayList; import java.util.List; -/** - * Created by The eXo Platform SARL - * Author : Tung Pham - * thanhtungty(a)gmail.com - * Nov 27, 2007 - */ +/** Created by The eXo Platform SARL Author : Tung Pham thanhtungty(a)gmail.com Nov 27, 2007 */ public class TestApplicationRegistryService extends AbstractApplicationRegistryTest { @@ -85,7 +80,7 @@ @Override protected void tearDown() throws Exception { - chromatticManager.getSynchronization().setSave(false); + chromatticManager.getSynchronization().setSaveOnClose(false); end(); } @@ -305,6 +300,7 @@ // service.clearAllRegistries() ; } */ + private ApplicationCategory createAppCategory(String categoryName, String categoryDes) { ApplicationCategory category = new ApplicationCategory(); @@ -313,6 +309,7 @@ category.setDescription(categoryDes); return category; } + private Application createApplication(String appName, String appGroup) { Application app = new Application(); Modified: portal/branches/wsrp-integration/component/common/pom.xml =================================================================== --- portal/branches/wsrp-integration/component/common/pom.xml 2009-12-20 10:23:34 UTC (rev 1078) +++ portal/branches/wsrp-integration/component/common/pom.xml 2009-12-20 15:05:20 UTC (rev 1079) @@ -19,85 +19,81 @@ --> -<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"> - <parent> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component</artifactId> - <version>3.0.0-Beta04-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>exo.portal.component.common</artifactId> - <packaging>jar</packaging> - <name>GateIn Portal Component Common</name> - <dependencies> +<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"> + <parent> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component</artifactId> + <version>3.0.0-Beta04-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>exo.portal.component.common</artifactId> + <packaging>jar</packaging> + <name>GateIn Portal Component Common</name> + <dependencies> - <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.commons</artifactId> - <version>${org.exoplatform.kernel.version}</version> - </dependency> - <dependency> - <groupId>org.exoplatform.core</groupId> - <artifactId>exo.core.component.database</artifactId> - <version>${org.exoplatform.core.version}</version> - </dependency> - <dependency> - <groupId>org.exoplatform.jcr</groupId> - <artifactId>exo.jcr.component.core</artifactId> - <version>${org.exoplatform.jcr.version}</version> - </dependency> - <dependency> + <dependency> <groupId>org.gatein.common</groupId> + <artifactId>common-logging</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.commons</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.database</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.jcr</groupId> + <artifactId>exo.jcr.component.core</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.common</groupId> <artifactId>common-common</artifactId> <version>${org.gatein.common.version}</version> - </dependency> - <dependency> - <groupId>org.exoplatform.jcr</groupId> - <artifactId>exo.jcr.component.ext</artifactId> - <version>${org.exoplatform.jcr.version}</version> - </dependency> - <dependency> - <groupId>org.chromattic</groupId> - <artifactId>chromattic.api</artifactId> - <version>${version.chromattic}</version> - </dependency> - <dependency> - <groupId>org.chromattic</groupId> - <artifactId>chromattic.spi</artifactId> - <version>${version.chromattic}</version> - </dependency> + </dependency> + <dependency> + <groupId>org.exoplatform.jcr</groupId> + <artifactId>exo.jcr.component.ext</artifactId> + </dependency> + <dependency> + <groupId>org.chromattic</groupId> + <artifactId>chromattic.api</artifactId> + </dependency> + <dependency> + <groupId>org.chromattic</groupId> + <artifactId>chromattic.spi</artifactId> + </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.test.core</artifactId> - <version>3.0.0-Beta04-SNAPSHOT</version> - <scope>test</scope> - </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.test.core</artifactId> + <version>3.0.0-Beta04-SNAPSHOT</version> + <scope>test</scope> + </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.test.jcr</artifactId> - <version>3.0.0-Beta04-SNAPSHOT</version> - <scope>test</scope> - </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.test.jcr</artifactId> + <version>3.0.0-Beta04-SNAPSHOT</version> + <scope>test</scope> + </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.1</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.chromattic</groupId> - <artifactId>chromattic.core</artifactId> - <version>${version.chromattic}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.chromattic</groupId> - <artifactId>chromattic.apt</artifactId> - <version>${version.chromattic}</version> - <scope>test</scope> - </dependency> - </dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.chromattic</groupId> + <artifactId>chromattic.core</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.chromattic</groupId> + <artifactId>chromattic.apt</artifactId> + <scope>test</scope> + </dependency> + </dependencies> </project> Copied: portal/branches/wsrp-integration/component/common/src/main/java/conf (from rev 1078, portal/trunk/component/common/src/main/java/conf) Deleted: portal/branches/wsrp-integration/component/common/src/main/java/conf/configuration-jboss.properties =================================================================== --- portal/trunk/component/common/src/main/java/conf/configuration-jboss.properties 2009-12-20 10:23:34 UTC (rev 1078) +++ portal/branches/wsrp-integration/component/common/src/main/java/conf/configuration-jboss.properties 2009-12-20 15:05:20 UTC (rev 1079) @@ -1,27 +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. -# - -# Data -gatein.data.dir=${jboss.server.data.dir}/gatein - -# DB -gatein.db.data.dir=${gatein.data.dir}/db - -# JCR -gatein.jcr.data.dir=${gatein.data.dir}/jcr Copied: portal/branches/wsrp-integration/component/common/src/main/java/conf/configuration-jboss.properties (from rev 1078, portal/trunk/component/common/src/main/java/conf/configuration-jboss.properties) =================================================================== --- portal/branches/wsrp-integration/component/common/src/main/java/conf/configuration-jboss.properties (rev 0) +++ portal/branches/wsrp-integration/component/common/src/main/java/conf/configuration-jboss.properties 2009-12-20 15:05:20 UTC (rev 1079) @@ -0,0 +1,27 @@ +# +# 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. +# + +# Data +gatein.data.dir=${jboss.server.data.dir}/gatein + +# DB +gatein.db.data.dir=${gatein.data.dir}/db + +# JCR +gatein.jcr.data.dir=${gatein.data.dir}/jcr Deleted: portal/branches/wsrp-integration/component/common/src/main/java/conf/configuration.properties =================================================================== --- portal/trunk/component/common/src/main/java/conf/configuration.properties 2009-12-20 10:23:34 UTC (rev 1078) +++ portal/branches/wsrp-integration/component/common/src/main/java/conf/configuration.properties 2009-12-20 15:05:20 UTC (rev 1079) @@ -1,27 +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. -# - -# Data -gatein.data.dir=../temp - -# DB -gatein.db.data.dir=${gatein.data.dir}/db - -# JCR -gatein.jcr.data.dir=${gatein.data.dir}/jcr Copied: portal/branches/wsrp-integration/component/common/src/main/java/conf/configuration.properties (from rev 1078, portal/trunk/component/common/src/main/java/conf/configuration.properties) =================================================================== --- portal/branches/wsrp-integration/component/common/src/main/java/conf/configuration.properties (rev 0) +++ portal/branches/wsrp-integration/component/common/src/main/java/conf/configuration.properties 2009-12-20 15:05:20 UTC (rev 1079) @@ -0,0 +1,27 @@ +# +# 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. +# + +# Data +gatein.data.dir=../temp + +# DB +gatein.db.data.dir=${gatein.data.dir}/db + +# JCR +gatein.jcr.data.dir=${gatein.data.dir}/jcr Deleted: portal/branches/wsrp-integration/component/common/src/main/java/conf/configuration.xml =================================================================== --- portal/trunk/component/common/src/main/java/conf/configuration.xml 2009-12-20 10:23:34 UTC (rev 1078) +++ portal/branches/wsrp-integration/component/common/src/main/java/conf/configuration.xml 2009-12-20 15:05:20 UTC (rev 1079) @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> -<!-- - - 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. - ---> - -<configuration - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd http://www.exoplaform.org/xml/ns/kernel_1_1.xsd" - xmlns="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd"> - - <component> - <key>org.exoplatform.container.PropertyConfigurator</key> - <type>org.exoplatform.container.PropertyConfigurator</type> - <init-params> - <value-param> - <name>properties.url</name> - <value>jar:/conf/configuration.properties</value> - </value-param> - <value-param profiles="jboss"> - <name>properties.url</name> - <value>jar:/conf/configuration-jboss.properties</value> - </value-param> - </init-params> - </component> - -</configuration> Copied: portal/branches/wsrp-integration/component/common/src/main/java/conf/configuration.xml (from rev 1078, portal/trunk/component/common/src/main/java/conf/configuration.xml) =================================================================== --- portal/branches/wsrp-integration/component/common/src/main/java/conf/configuration.xml (rev 0) +++ portal/branches/wsrp-integration/component/common/src/main/java/conf/configuration.xml 2009-12-20 15:05:20 UTC (rev 1079) @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<!-- + + 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. + +--> + +<configuration + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd http://www.exoplaform.org/xml/ns/kernel_1_1.xsd" + xmlns="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd"> + + <component> + <key>org.exoplatform.container.PropertyConfigurator</key> + <type>org.exoplatform.container.PropertyConfigurator</type> + <init-params> + <value-param> + <name>properties.url</name> + <value>jar:/conf/configuration.properties</value> + </value-param> + <value-param profiles="jboss"> + <name>properties.url</name> + <value>jar:/conf/configuration-jboss.properties</value> + </value-param> + </init-params> + </component> + +</configuration> Modified: portal/branches/wsrp-integration/component/common/src/main/java/org/exoplatform/commons/chromattic/ChromatticLifeCycle.java =================================================================== --- portal/branches/wsrp-integration/component/common/src/main/java/org/exoplatform/commons/chromattic/ChromatticLifeCycle.java 2009-12-20 10:23:34 UTC (rev 1078) +++ portal/branches/wsrp-integration/component/common/src/main/java/org/exoplatform/commons/chromattic/ChromatticLifeCycle.java 2009-12-20 15:05:20 UTC (rev 1079) @@ -22,31 +22,23 @@ import org.chromattic.api.ChromatticBuilder; import org.exoplatform.container.component.BaseComponentPlugin; import org.exoplatform.container.xml.InitParams; +import org.gatein.common.logging.Logger; +import org.gatein.common.logging.LoggerFactory; import java.util.List; /** - * <p>The chromattic life cycle objets is a plugin that allow to bootstrap a chromattic builder and make - * it managed either locally or globally.</p> + * <p>The chromattic life cycle objets is a plugin that allow to bootstrap a chromattic builder and make it managed + * either locally or globally.</p> <p/> <p>It is allowed to create subclasses of this class to override the methods + * {@link #onOpenSession(SessionContext)} or {@link #onCloseSession(SessionContext)} to perform additional treatment on + * the session context at a precise phase of its life cycle.</p> <p/> <p>The life cycle domain uniquely identifies the + * chromattic domain among all domain registered against the {@link org.exoplatform.commons.chromattic.ChromatticManager} + * manager.</p> <p/> <p>The plugin takes an instance of {@link org.exoplatform.container.xml.InitParams} as parameter + * that contains the following entries: <p/> <ul> <li>The <code>domain-name</code> string that is the life cycle domain + * name</li> <li>The <code>workspace-name</code> string that is the repository workspace name associated with this life + * cycle</li> <li>The <code>entities</code> list value that contains the list of chromattic entities that will be + * registered against the builder chromattic builder</li> </ul> </p> * - * <p>It is allowed to create subclasses of this class to override the methods {@link #onOpenSession(SessionContext)} - * or {@link #onCloseSession(SessionContext)} to perform additional treatment on the session context at a precise - * phase of its life cycle.</p> - * - * <p>The life cycle name uniquely identifies the chromattic domain among all domain registered against the - * {@link org.exoplatform.commons.chromattic.ChromatticManager} manager.</p> - * - * <p>The plugin takes an instance of {@link org.exoplatform.container.xml.InitParams} as parameter that contains - * the following entries: - * - * <ul> - * <li>The <code>name</code> string that is the life cycle name</li> - * <li>The <code>workspace-name</code> string that is the repository workspace name associated with this life cycle</li> - * <li>The <code>entities</code> list value that contains the list of chromattic entities that will be registered - * against the builder chromattic builder</li> - * </ul> - * </p> - * * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> * @version $Revision$ */ @@ -54,7 +46,7 @@ { /** . */ - private final String name; + private final String domainName; /** . */ private final String workspaceName; @@ -74,16 +66,19 @@ /** . */ final ThreadLocal<LocalContext> currentContext = new ThreadLocal<LocalContext>(); + /** . */ + final Logger log = LoggerFactory.getLogger(ChromatticLifeCycle.class); + public ChromatticLifeCycle(InitParams params) { - this.name = params.getValueParam("name").getValue(); + this.domainName = params.getValueParam("domain-name").getValue(); this.workspaceName = params.getValueParam("workspace-name").getValue(); this.entityClassNames = params.getValuesParam("entities").getValues(); } - public final String getName() + public String getDomainName() { - return name; + return domainName; } public final String getWorkspaceName() @@ -120,25 +115,37 @@ */ public final SessionContext getContext(boolean peek) { + log.trace("Requesting context"); Synchronization sync = manager.getSynchronization(); // if (sync != null) { - GlobalContext context = sync.getContext(name); + log.trace("Found synchronization about to get the current context for chromattic " + domainName); + GlobalContext context = sync.getContext(domainName); // if (context == null && !peek) { + log.trace("No current context found, about to open one"); context = sync.openContext(this); } + else + { + log.trace("Found a context and will return it"); + } // return context; } // - return currentContext.get(); + log.trace("No active synchronization about to try the current local context"); + LocalContext localContext = currentContext.get(); + log.trace("Found local context " + localContext); + + // + return localContext; } LoginContext getLoginContext() @@ -157,24 +164,31 @@ final SessionContext openGlobalContext() { + log.trace("Opening a global context"); AbstractContext context = (AbstractContext)getContext(true); // if (context != null) { - throw new IllegalStateException("A session is already opened."); + String msg = "A global context is already opened"; + log.trace(msg); + throw new IllegalStateException(msg); } // Attempt to get the synchronization + log.trace("Ok, no global context found, asking current synchronization"); Synchronization sync = manager.getSynchronization(); // if (sync == null) { - throw new IllegalStateException("Need global synchronization"); + String msg = "Need global synchronization for opening a global context"; + log.trace(msg); + throw new IllegalStateException(msg); } // + log.trace("Opening a global context for the related sync"); return sync.openContext(this); } @@ -186,24 +200,30 @@ */ public final SessionContext openContext() { + log.trace("Opening a context"); AbstractContext context = (AbstractContext)getContext(true); // if (context != null) { - throw new IllegalStateException("A session is already opened."); + String msg = "A context is already opened"; + log.trace(msg); + throw new IllegalStateException(msg); } // + log.trace("Ok, no context found, asking current synchronization"); Synchronization sync = manager.getSynchronization(); // if (sync != null) { + log.trace("Found a synchronization, about to open a global context"); context = sync.openContext(this); } else { + log.trace("Not synchronization found, about to a local context"); LocalContext localContext = new LocalContext(this); currentContext.set(localContext); onOpenSession(localContext); @@ -216,12 +236,15 @@ public final void closeContext(boolean save) { + log.trace("Requesting for context close with save=" + save + " going to look for any context"); AbstractContext context = (AbstractContext)getContext(true); // if (context == null) { - throw new IllegalStateException("No current context existing"); + String msg = "Cannot close non existing context"; + log.trace(msg); + throw new IllegalStateException(msg); } // @@ -238,13 +261,16 @@ public final void start() throws Exception { + log.debug("About to setup Chromattic life cycle " + domainName); ChromatticBuilder builder = ChromatticBuilder.create(); // ClassLoader cl = Thread.currentThread().getContextClassLoader(); for (String className : entityClassNames) { - Class<?> entityClass = cl.loadClass(className); + String fqn = className.trim(); + log.debug("Adding class " + fqn + " to life cycle " + domainName); + Class<?> entityClass = cl.loadClass(fqn); builder.add(entityClass); } @@ -258,12 +284,13 @@ builder.setOption(ChromatticBuilder.SESSION_LIFECYCLE_CLASSNAME, PortalSessionLifeCycle.class.getName()); // + log.debug("Building Chromattic " + domainName); realChromattic = builder.build(); chromattic = new ChromatticImpl(this); } catch (Exception e) { - e.printStackTrace(); + log.error("Could not start Chromattic " + domainName, e); } finally { Modified: portal/branches/wsrp-integration/component/common/src/main/java/org/exoplatform/commons/chromattic/ChromatticManager.java =================================================================== --- portal/branches/wsrp-integration/component/common/src/main/java/org/exoplatform/commons/chromattic/ChromatticManager.java 2009-12-20 10:23:34 UTC (rev 1078) +++ portal/branches/wsrp-integration/component/common/src/main/java/org/exoplatform/commons/chromattic/ChromatticManager.java 2009-12-20 15:05:20 UTC (rev 1079) @@ -45,7 +45,8 @@ /** . */ private final ThreadLocal<Synchronization> currentSynchronization = new ThreadLocal<Synchronization>(); - public ChromatticManager(RepositoryService repositoryService) throws Exception { + public ChromatticManager(RepositoryService repositoryService) throws Exception + { this.repositoryService = repositoryService; this.lifeCycleToWorkspaceMap = new HashMap<String, String>(); } @@ -56,6 +57,7 @@ } // Called by kernel + public void addLifeCycle(ComponentPlugin plugin) { ChromatticLifeCycle lifeCycle = (ChromatticLifeCycle)plugin; @@ -63,7 +65,7 @@ { lifeCycle.manager = this; lifeCycle.start(); - lifeCycles.put(lifeCycle.getName(), lifeCycle); + lifeCycles.put(lifeCycle.getDomainName(), lifeCycle); } catch (Exception e) { @@ -77,8 +79,8 @@ } /** - * Begins the demarcation of a request and associates the current thread of execution with - * a context that will provides access to the correct persistence context. + * Begins the demarcation of a request and associates the current thread of execution with a context that will + * provides access to the correct persistence context. * * @throws IllegalStateException if a request is already associated with this thread */ @@ -130,7 +132,7 @@ public void endRequest(ExoContainer container) { Synchronization sync = currentSynchronization.get(); - boolean save = sync.isSave(); + boolean save = sync.getSaveOnClose(); endRequest(save); } } Modified: portal/branches/wsrp-integration/component/common/src/main/java/org/exoplatform/commons/chromattic/Synchronization.java =================================================================== --- portal/branches/wsrp-integration/component/common/src/main/java/org/exoplatform/commons/chromattic/Synchronization.java 2009-12-20 10:23:34 UTC (rev 1078) +++ portal/branches/wsrp-integration/component/common/src/main/java/org/exoplatform/commons/chromattic/Synchronization.java 2009-12-20 15:05:20 UTC (rev 1079) @@ -33,12 +33,12 @@ /** The sessions mapped by workspace name. */ private final Map<String, Session> repositorySessions = new HashMap<String, Session>(); - + /** . */ private final Map<String, GlobalContext> contexts = new HashMap<String, GlobalContext>(); /** . */ - private boolean save = true; + private boolean saveOnClose = true; /** * Returns a specified global context by its name. @@ -68,7 +68,7 @@ { throw new NullPointerException(); } - String name = lifeCycle.getName(); + String name = lifeCycle.getDomainName(); GlobalContext context = contexts.get(name); if (context != null) { @@ -100,13 +100,13 @@ } } - public boolean isSave() + public boolean getSaveOnClose() { - return save; + return saveOnClose; } - public void setSave(boolean save) + public void setSaveOnClose(boolean saveOnClose) { - this.save = save; + this.saveOnClose = saveOnClose; } } Modified: portal/branches/wsrp-integration/component/common/src/test/java/org/exoplatform/commons/chromattic/ChromatticIntegrationTestCase.java =================================================================== --- portal/branches/wsrp-integration/component/common/src/test/java/org/exoplatform/commons/chromattic/ChromatticIntegrationTestCase.java 2009-12-20 10:23:34 UTC (rev 1078) +++ portal/branches/wsrp-integration/component/common/src/test/java/org/exoplatform/commons/chromattic/ChromatticIntegrationTestCase.java 2009-12-20 15:05:20 UTC (rev 1079) @@ -216,4 +216,25 @@ chromatticManager.endRequest(false); } } + + public void testPersistence() throws Exception + { + + chromatticManager.beginRequest(); + ChromatticSession session = testLF.getChromattic().openSession(); + FooEntity foo = session.create(FooEntity.class); + String fooId = session.persist(foo, "testPersistence"); + session.save(); + chromatticManager.endRequest(true); + + chromatticManager.beginRequest(); + session = testLF.getChromattic().openSession(); + foo = session.findById(FooEntity.class, fooId); + session.close(); + chromatticManager.endRequest(false); + + assertNotNull(foo); + + } + } Modified: portal/branches/wsrp-integration/component/common/src/test/java/org/exoplatform/commons/chromattic/FooEntity.java =================================================================== --- portal/branches/wsrp-integration/component/common/src/test/java/org/exoplatform/commons/chromattic/FooEntity.java 2009-12-20 10:23:34 UTC (rev 1078) +++ portal/branches/wsrp-integration/component/common/src/test/java/org/exoplatform/commons/chromattic/FooEntity.java 2009-12-20 15:05:20 UTC (rev 1079) @@ -25,7 +25,7 @@ * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> * @version $Revision$ */ -@NodeMapping(name = "foo") +@NodeMapping(name = "nt:base") public abstract class FooEntity { Modified: portal/branches/wsrp-integration/component/common/src/test/resources/conf/test-configuration.xml =================================================================== --- portal/branches/wsrp-integration/component/common/src/test/resources/conf/test-configuration.xml 2009-12-20 10:23:34 UTC (rev 1078) +++ portal/branches/wsrp-integration/component/common/src/test/resources/conf/test-configuration.xml 2009-12-20 15:05:20 UTC (rev 1079) @@ -21,32 +21,32 @@ --> <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd" - xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"> - <component> - <key>org.exoplatform.commons.chromattic.ChromatticManager</key> - <type>org.exoplatform.commons.chromattic.ChromatticManager</type> - </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.commons.chromattic.ChromatticLifeCycle</type> - <init-params> - <value-param> - <name>name</name> - <value>test</value> - </value-param> - <value-param> - <name>workspace-name</name> - <value>portal-test</value> - </value-param> - <values-param> - <name>entities</name> - <value>org.exoplatform.commons.chromattic.FooEntity</value> - </values-param> - </init-params> - </component-plugin> - </external-component-plugins> + xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd" + xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"> + <component> + <key>org.exoplatform.commons.chromattic.ChromatticManager</key> + <type>org.exoplatform.commons.chromattic.ChromatticManager</type> + </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.commons.chromattic.ChromatticLifeCycle</type> + <init-params> + <value-param> + <name>domain-name</name> + <value>test</value> + </value-param> + <value-param> + <name>workspace-name</name> + <value>portal-test</value> + </value-param> + <values-param> + <name>entities</name> + <value>org.exoplatform.commons.chromattic.FooEntity</value> + </values-param> + </init-params> + </component-plugin> + </external-component-plugins> </configuration> Modified: portal/branches/wsrp-integration/component/identity/pom.xml =================================================================== --- portal/branches/wsrp-integration/component/identity/pom.xml 2009-12-20 10:23:34 UTC (rev 1078) +++ portal/branches/wsrp-integration/component/identity/pom.xml 2009-12-20 15:05:20 UTC (rev 1079) @@ -19,93 +19,68 @@ --> -<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"> <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> <version>3.0.0-Beta04-SNAPSHOT</version> </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>exo.portal.component.identity</artifactId> - <packaging>jar</packaging> - <name>GateIn Portal Component JBoss IDM integration</name> + <modelVersion>4.0.0</modelVersion> + <artifactId>exo.portal.component.identity</artifactId> + <packaging>jar</packaging> + <name>GateIn Portal Component JBoss IDM integration</name> - <dependencies> - <dependency> - <groupId>org.exoplatform.core</groupId> - <artifactId>exo.core.component.database</artifactId> - <version>${org.exoplatform.core.version}</version> - <exclusions> + <dependencies> + <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.database</artifactId> + <exclusions> <exclusion> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-core</artifactId> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> </exclusion> <exclusion> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-annotations</artifactId> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-annotations</artifactId> </exclusion> - </exclusions> - </dependency> + </exclusions> + </dependency> - <dependency> - <groupId>org.exoplatform.core</groupId> - <artifactId>exo.core.component.organization.api</artifactId> - <version>${org.exoplatform.core.version}</version> - </dependency> + <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.organization.api</artifactId> + </dependency> - <dependency> - <groupId>org.picketlink.idm</groupId> - <artifactId>picketlink-idm-core</artifactId> - <version>${org.picketlink.idm}</version> - </dependency> - <dependency> - <groupId>org.picketlink.idm</groupId> - <artifactId>picketlink-idm-hibernate</artifactId> - <version>${org.picketlink.idm}</version> - </dependency> - <dependency> - <groupId>org.picketlink.idm</groupId> - <artifactId>picketlink-idm-ldap</artifactId> - <version>${org.picketlink.idm}</version> - </dependency> - <dependency> - <groupId>org.picketlink.idm</groupId> - <artifactId>picketlink-idm-cache</artifactId> - <version>${org.picketlink.idm}</version> - </dependency> + <dependency> + <groupId>org.picketlink.idm</groupId> + <artifactId>picketlink-idm-core</artifactId> + </dependency> + <dependency> + <groupId>org.picketlink.idm</groupId> + <artifactId>picketlink-idm-hibernate</artifactId> + </dependency> + <dependency> + <groupId>org.picketlink.idm</groupId> + <artifactId>picketlink-idm-ldap</artifactId> + </dependency> + <dependency> + <groupId>org.picketlink.idm</groupId> + <artifactId>picketlink-idm-cache</artifactId> + </dependency> - <!--To use instead of outdated version from xdoclet--> - <!--<dependency>--> - <!--<groupId>commons-collections</groupId>--> - <!--<artifactId>commons-collections</artifactId>--> - <!--<version>3.2.1</version>--> - - <!--</dependency>--> - <dependency> <groupId>hsqldb</groupId> <artifactId>hsqldb</artifactId> - <version>1.8.0.7</version> <scope>test</scope> </dependency> - <!--<dependency>--> - <!--<groupId>com.sun.xml.bind</groupId>--> - <!--<artifactId>jaxb-impl</artifactId>--> - <!--<version>2.1.8</version>--> - <!--</dependency>--> + <dependency> + <groupId>javax.resource</groupId> + <artifactId>connector-api</artifactId> + <scope>test</scope> + </dependency> - - - - - <dependency> - <groupId>javax.resource</groupId> - <artifactId>connector-api</artifactId> - <version>1.5</version> - <scope>test</scope> - </dependency> - - </dependencies> + </dependencies> </project> Modified: portal/branches/wsrp-integration/component/identity/src/main/java/org/exoplatform/services/organization/idm/GroupDAOImpl.java =================================================================== --- portal/branches/wsrp-integration/component/identity/src/main/java/org/exoplatform/services/organization/idm/GroupDAOImpl.java 2009-12-20 10:23:34 UTC (rev 1078) +++ portal/branches/wsrp-integration/component/identity/src/main/java/org/exoplatform/services/organization/idm/GroupDAOImpl.java 2009-12-20 15:05:20 UTC (rev 1079) @@ -1,16 +1,16 @@ /** * 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 @@ -429,7 +429,8 @@ attrs = attrsList.toArray(attrs); - getIdentitySession().getAttributesManager().addAttributes(jbidGroup, attrs); + //getIdentitySession().getAttributesManager().addAttributes(jbidGroup, attrs); + getIdentitySession().getAttributesManager().updateAttributes(jbidGroup, attrs); } Modified: portal/branches/wsrp-integration/component/pc/pom.xml =================================================================== --- portal/branches/wsrp-integration/component/pc/pom.xml 2009-12-20 10:23:34 UTC (rev 1078) +++ portal/branches/wsrp-integration/component/pc/pom.xml 2009-12-20 15:05:20 UTC (rev 1079) @@ -19,92 +19,62 @@ --> -<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"> - <parent> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component</artifactId> - <version>3.0.0-Beta04-SNAPSHOT</version> - </parent> - - <modelVersion>4.0.0</modelVersion> - <artifactId>exo.portal.component.pc</artifactId> - <packaging>jar</packaging> - <version>3.0.0-Beta04-SNAPSHOT</version> - <name>GateIn Portal Component PC integration</name> - - <dependencies> - - <dependency> +<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"> + <parent> <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.resources</artifactId> + <artifactId>exo.portal.component</artifactId> <version>3.0.0-Beta04-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.gatein.common</groupId> - <artifactId>common-common</artifactId> - <version>${org.gatein.common.version}</version> - </dependency> - <dependency> - <groupId>org.gatein.pc</groupId> - <artifactId>pc-api</artifactId> - <version>${org.gatein.pc.version}</version> - <exclusions> - <exclusion> - <groupId>org.gatein.wci</groupId> - <artifactId>wci-wci</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.gatein.pc</groupId> - <artifactId>pc-portlet</artifactId> - <version>${org.gatein.pc.version}</version> - <exclusions> - <exclusion> - <groupId>org.gatein.wci</groupId> - <artifactId>wci-wci</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.gatein.pc</groupId> - <artifactId>pc-mc</artifactId> - <version>${org.gatein.pc.version}</version> - <exclusions> - <exclusion> - <groupId>org.gatein.wci</groupId> - <artifactId>wci-wci</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.gatein.pc</groupId> - <artifactId>pc-federation</artifactId> - <version>${org.gatein.pc.version}</version> - <exclusions> - <exclusion> - <groupId>org.gatein.wci</groupId> - <artifactId>wci-wci</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.gatein.pc</groupId> - <artifactId>pc-bridge</artifactId> - <version>${org.gatein.pc.version}</version> - </dependency> - <dependency> - <groupId>org.gatein.wci</groupId> - <artifactId>wci-wci</artifactId> - <version>${org.gatein.wci.version}</version> - </dependency> - <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.container</artifactId> - </dependency> + </parent> - </dependencies> - - <build> - </build> + <modelVersion>4.0.0</modelVersion> + <artifactId>exo.portal.component.pc</artifactId> + <packaging>jar</packaging> + <version>3.0.0-Beta04-SNAPSHOT</version> + <name>GateIn Portal Component PC integration</name> + + <dependencies> + + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.resources</artifactId> + <version>3.0.0-Beta04-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.gatein.common</groupId> + <artifactId>common-common</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.pc</groupId> + <artifactId>pc-api</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.pc</groupId> + <artifactId>pc-portlet</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.pc</groupId> + <artifactId>pc-mc</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.pc</groupId> + <artifactId>pc-federation</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.pc</groupId> + <artifactId>pc-bridge</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.wci</groupId> + <artifactId>wci-wci</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.container</artifactId> + </dependency> + + </dependencies> + + <build> + </build> </project> Modified: portal/branches/wsrp-integration/component/portal/pom.xml =================================================================== --- portal/branches/wsrp-integration/component/portal/pom.xml 2009-12-20 10:23:34 UTC (rev 1078) +++ portal/branches/wsrp-integration/component/portal/pom.xml 2009-12-20 15:05:20 UTC (rev 1079) @@ -19,151 +19,144 @@ --> -<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"> - <parent> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component</artifactId> - <version>3.0.0-Beta04-SNAPSHOT</version> - </parent> - - <modelVersion>4.0.0</modelVersion> - <artifactId>exo.portal.component.portal</artifactId> - <packaging>jar</packaging> - <name>GateIn Portal Component Portal Data</name> - - <dependencies> - <dependency> - <groupId>org.exoplatform.core</groupId> - <artifactId>exo.core.component.organization.jdbc</artifactId> - <version>${org.exoplatform.core.version}</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.exoplatform.jcr</groupId> - <artifactId>exo.jcr.component.ext</artifactId> - <version>${org.exoplatform.jcr.version}</version> - </dependency> - - <dependency> +<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"> + <parent> <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.common</artifactId> + <artifactId>exo.portal.component</artifactId> <version>3.0.0-Beta04-SNAPSHOT</version> - </dependency> + </parent> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.web</artifactId> - <version>3.0.0-Beta04-SNAPSHOT</version> - </dependency> + <modelVersion>4.0.0</modelVersion> + <artifactId>exo.portal.component.portal</artifactId> + <packaging>jar</packaging> + <name>GateIn Portal Component Portal Data</name> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.pc</artifactId> - <version>3.0.0-Beta04-SNAPSHOT</version> - </dependency> + <dependencies> + <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.organization.jdbc</artifactId> + <scope>compile</scope> + </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.identity</artifactId> - <version>3.0.0-Beta04-SNAPSHOT</version> - </dependency> + <dependency> + <groupId>org.exoplatform.jcr</groupId> + <artifactId>exo.jcr.component.ext</artifactId> + </dependency> - <dependency> - <groupId>org.gatein.mop</groupId> - <artifactId>mop-api</artifactId> - <version>${org.gatein.mop.version}</version> - </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.common</artifactId> + <version>3.0.0-Beta04-SNAPSHOT</version> + </dependency> - <dependency> - <groupId>org.gatein.mop</groupId> - <artifactId>mop-spi</artifactId> - <version>${org.gatein.mop.version}</version> - </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.web</artifactId> + <version>3.0.0-Beta04-SNAPSHOT</version> + </dependency> - <dependency> - <groupId>org.gatein.mop</groupId> - <artifactId>mop-core</artifactId> - <version>${org.gatein.mop.version}</version> - </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.pc</artifactId> + <version>3.0.0-Beta04-SNAPSHOT</version> + </dependency> - <dependency> - <groupId>org.picketlink.idm</groupId> - <artifactId>picketlink-idm-core</artifactId> - <version>${org.picketlink.idm}</version> - </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.identity</artifactId> + <version>3.0.0-Beta04-SNAPSHOT</version> + </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>${javax.servlet.version}</version> - <scope>provided</scope> - </dependency> + <dependency> + <groupId>org.gatein.mop</groupId> + <artifactId>mop-api</artifactId> + </dependency> - <dependency> - <groupId>org.chromattic</groupId> - <artifactId>chromattic.core</artifactId> - <version>${version.chromattic}</version> - <scope>test</scope> - </dependency> + <dependency> + <groupId>org.gatein.mop</groupId> + <artifactId>mop-spi</artifactId> + </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.test.core</artifactId> - <version>3.0.0-Beta04-SNAPSHOT</version> - <scope>test</scope> - </dependency> + <dependency> + <groupId>org.gatein.mop</groupId> + <artifactId>mop-core</artifactId> + </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.test.jcr</artifactId> - <version>3.0.0-Beta04-SNAPSHOT</version> - <scope>test</scope> - </dependency> + <dependency> + <groupId>org.picketlink.idm</groupId> + <artifactId>picketlink-idm-core</artifactId> + </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.test.organization</artifactId> - <version>3.0.0-Beta04-SNAPSHOT</version> - <scope>test</scope> - </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <scope>provided</scope> + </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.jibx</groupId> - <artifactId>maven-jibx-plugin</artifactId> - <version>${org.jibx.version}</version> - <configuration> - <directory>src/main/resources</directory> - <includes> - <includes>binding.xml</includes> - </includes> - </configuration> - <executions> - <execution> - <goals> - <goal>bind</goal> - </goals> - </execution> - </executions> - </plugin> + <dependency> + <groupId>org.chromattic</groupId> + <artifactId>chromattic.core</artifactId> + <scope>test</scope> + </dependency> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>test-jar</goal> - </goals> - </execution> - </executions> - </plugin> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.test.core</artifactId> + <version>3.0.0-Beta04-SNAPSHOT</version> + <scope>test</scope> + </dependency> - </plugins> - </build> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.test.jcr</artifactId> + <version>3.0.0-Beta04-SNAPSHOT</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.test.organization</artifactId> + <version>3.0.0-Beta04-SNAPSHOT</version> + <scope>test</scope> + </dependency> + + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.jibx</groupId> + <artifactId>maven-jibx-plugin</artifactId> + <version>${org.jibx.version}</version> + <configuration> + <directory>src/main/resources</directory> + <includes> + <includes>binding.xml</includes> + </includes> + </configuration> + <executions> + <execution> + <goals> + <goal>bind</goal> + </goals> + </execution> + </executions> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>test-jar</goal> + </goals> + </execution> + </executions> + </plugin> + + </plugins> + </build> </project> Modified: portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/config/DataStorage.java =================================================================== --- portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/config/DataStorage.java 2009-12-20 10:23:34 UTC (rev 1078) +++ portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/config/DataStorage.java 2009-12-20 15:05:20 UTC (rev 1079) @@ -1,16 +1,16 @@ /** * 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 @@ -22,22 +22,21 @@ import org.exoplatform.commons.utils.LazyPageList; import org.exoplatform.portal.application.PortletPreferences; import org.exoplatform.portal.config.model.ApplicationState; +import org.exoplatform.portal.config.model.ApplicationType; import org.exoplatform.portal.config.model.Container; import org.exoplatform.portal.config.model.Dashboard; -import org.exoplatform.portal.pom.data.ModelChange; import org.exoplatform.portal.config.model.Page; import org.exoplatform.portal.config.model.PageNavigation; import org.exoplatform.portal.config.model.PortalConfig; +import org.exoplatform.portal.pom.data.ModelChange; import java.util.Comparator; import java.util.List; /** - * Created by The eXo Platform SAS - * Apr 19, 2007 - * - * This interface is used to load the PortalConfig, Page config and Navigation config from the - * database + * Created by The eXo Platform SAS Apr 19, 2007 + * <p/> + * This interface is used to load the PortalConfig, Page config and Navigation config from the database */ public interface DataStorage { @@ -57,10 +56,10 @@ /** * Clones a page. * - * @param pageId the id of the page to clone + * @param pageId the id of the page to clone * @param clonedOwnerType the target owner type of the clone - * @param clonedOwnerId the target owner id of the clone - * @param clonedName the target name of the clone + * @param clonedOwnerId the target owner id of the clone + * @param clonedName the target name of the clone * @return the cloned page * @throws Exception any exception */ @@ -72,12 +71,12 @@ public void create(Page page) throws Exception; /** - * Saves a page. If a page with the same id already exists then a merge operation will occur, otherwise - * a new page will be created from the provided argument. + * Saves a page. If a page with the same id already exists then a merge operation will occur, otherwise a new page + * will be created from the provided argument. + * <p/> + * The operation returns a list of the change object that describes the changes that occured during the save + * operation. * - * The operation returns a list of the change object that describes the changes that occured during the - * save operation. - * * @param page the page to save * @return the list of model changes that occured during the save operation * @throws Exception any exception @@ -98,7 +97,7 @@ public <S> String getId(ApplicationState<S> state) throws Exception; - public <S> S load(ApplicationState<S> state) throws Exception; + public <S> S load(ApplicationState<S> state, ApplicationType<S> type) throws Exception; public <S> ApplicationState<S> save(ApplicationState<S> state, S preferences) throws Exception; Modified: portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/config/DataStorageImpl.java =================================================================== --- portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/config/DataStorageImpl.java 2009-12-20 10:23:34 UTC (rev 1078) +++ portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/config/DataStorageImpl.java 2009-12-20 15:05:20 UTC (rev 1079) @@ -22,14 +22,15 @@ import org.exoplatform.commons.utils.ListAccess; import org.exoplatform.portal.application.PortletPreferences; import org.exoplatform.portal.config.model.ApplicationState; +import org.exoplatform.portal.config.model.ApplicationType; import org.exoplatform.portal.config.model.Container; import org.exoplatform.portal.config.model.Dashboard; -import org.exoplatform.portal.pom.data.ModelChange; import org.exoplatform.portal.config.model.ModelObject; import org.exoplatform.portal.config.model.Page; import org.exoplatform.portal.config.model.PageNavigation; import org.exoplatform.portal.config.model.PortalConfig; import org.exoplatform.portal.pom.data.DashboardData; +import org.exoplatform.portal.pom.data.ModelChange; import org.exoplatform.portal.pom.data.ModelData; import org.exoplatform.portal.pom.data.ModelDataStorage; import org.exoplatform.portal.pom.data.NavigationData; @@ -76,9 +77,9 @@ delegate.remove(page.build()); } - public <S> S load(ApplicationState<S> state) throws Exception + public <S> S load(ApplicationState<S> state, ApplicationType<S> type) throws Exception { - return delegate.load(state); + return delegate.load(state, type); } public void create(Page page) throws Exception @@ -176,6 +177,7 @@ { return list.size(); } + public O[] load(int index, int length) throws Exception, IllegalArgumentException { O[] pages = (O[])Array.newInstance(q.getClassType(), length); Deleted: portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/pom/config/AbstractPOMTask.java =================================================================== --- portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/pom/config/AbstractPOMTask.java 2009-12-20 10:23:34 UTC (rev 1078) +++ portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/pom/config/AbstractPOMTask.java 2009-12-20 15:05:20 UTC (rev 1079) @@ -1,29 +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.exoplatform.portal.pom.config; - -/** - * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> - * @version $Revision$ - */ -public abstract class AbstractPOMTask implements POMTask -{ - -} Modified: portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/pom/config/ExecutorDispatcher.java =================================================================== --- portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/pom/config/ExecutorDispatcher.java 2009-12-20 10:23:34 UTC (rev 1078) +++ portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/pom/config/ExecutorDispatcher.java 2009-12-20 15:05:20 UTC (rev 1079) @@ -34,11 +34,11 @@ /** . */ private static final String[] padding = {" ", " ", " ", " "}; - public void execute(POMSession session, POMTask task) throws Exception + public <V> V execute(POMSession session, POMTask<V> task) throws Exception { String s = task.toString(); long t0 = System.currentTimeMillis(); - session.execute(task); + V v = session.execute(task); long t1 = System.currentTimeMillis(); String t = "" + (t1 - t0); if (t.length() < 4) @@ -50,5 +50,6 @@ { log.debug("Executed in " + t + " " + s + ""); } + return v; } } Modified: portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/pom/config/POMDataStorage.java =================================================================== --- portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/pom/config/POMDataStorage.java 2009-12-20 10:23:34 UTC (rev 1078) +++ portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/pom/config/POMDataStorage.java 2009-12-20 15:05:20 UTC (rev 1079) @@ -1,16 +1,16 @@ /** * 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 @@ -19,7 +19,6 @@ package org.exoplatform.portal.pom.config; -import org.exoplatform.commons.chromattic.ChromatticManager; import org.exoplatform.commons.utils.IOUtil; import org.exoplatform.commons.utils.LazyPageList; import org.exoplatform.container.configuration.ConfigurationManager; @@ -27,6 +26,7 @@ import org.exoplatform.portal.config.Query; import org.exoplatform.portal.config.model.Application; import org.exoplatform.portal.config.model.ApplicationState; +import org.exoplatform.portal.config.model.ApplicationType; import org.exoplatform.portal.config.model.CloneApplicationState; import org.exoplatform.portal.config.model.Container; import org.exoplatform.portal.config.model.ModelObject; @@ -48,8 +48,6 @@ import org.exoplatform.portal.pom.data.PageKey; import org.exoplatform.portal.pom.data.PortalData; import org.exoplatform.portal.pom.data.PortalKey; -import org.exoplatform.services.log.ExoLogger; -import org.exoplatform.services.log.Log; import org.jibx.runtime.BindingDirectory; import org.jibx.runtime.IBindingFactory; import org.jibx.runtime.IUnmarshallingContext; @@ -72,27 +70,15 @@ /** . */ private ConfigurationManager confManager_; - /** . */ - private final Log log = ExoLogger.getLogger(getClass()); - - /** . */ - private final ChromatticManager manager; - - public POMDataStorage(POMSessionManager pomMgr, ConfigurationManager confManager, ChromatticManager manager) + public POMDataStorage(POMSessionManager pomMgr, ConfigurationManager confManager) { this.pomMgr = pomMgr; this.confManager_ = confManager; - this.manager = manager; } - public POMSessionManager getPOMSessionManager() - { - return pomMgr; - } - public PortalData getPortalConfig(PortalKey key) throws Exception { - return pomMgr.execute(new PortalConfigTask.Load(key)).getConfig(); + return pomMgr.execute(new PortalConfigTask.Load(key)); } public void create(PortalData config) throws Exception @@ -112,12 +98,12 @@ public PageData getPage(PageKey key) throws Exception { - return pomMgr.execute(new PageTask.Load(key)).getPage(); + return pomMgr.execute(new PageTask.Load(key)); } public PageData clonePage(PageKey key, PageKey cloneKey) throws Exception { - return pomMgr.execute(new PageTask.Clone(key, cloneKey, true)).getPage(); + return pomMgr.execute(new PageTask.Clone(key, cloneKey, true)); } public void remove(PageData page) throws Exception @@ -132,12 +118,14 @@ public List<ModelChange> save(PageData page) throws Exception { - return pomMgr.execute(new PageTask.Save(page)).getChanges(); + PageTask.Save task = new PageTask.Save(page); + pomMgr.execute(task); + return task.getChanges(); } public NavigationData getPageNavigation(NavigationKey key) throws Exception { - return pomMgr.execute(new PageNavigationTask.Load(key)).getPageNavigation(); + return pomMgr.execute(new PageNavigationTask.Load(key)); } public void save(NavigationData navigation) throws Exception @@ -171,12 +159,12 @@ else if (state instanceof PersistentApplicationState) { PersistentApplicationState pstate = (PersistentApplicationState)state; - contentId = pomMgr.execute(new PreferencesTask.GetContentId<S>(pstate.getStorageId())).getContentId(); + contentId = pomMgr.execute(new PreferencesTask.GetContentId<S>(pstate.getStorageId())); } else if (state instanceof CloneApplicationState) { CloneApplicationState cstate = (CloneApplicationState)state; - contentId = pomMgr.execute(new PreferencesTask.GetContentId<S>(cstate.getStorageId())).getContentId(); + contentId = pomMgr.execute(new PreferencesTask.GetContentId<S>(cstate.getStorageId())); } else { @@ -187,8 +175,9 @@ return contentId; } - public <S> S load(ApplicationState<S> state) throws Exception + public <S> S load(ApplicationState<S> state, ApplicationType<S> type) throws Exception { + Class<S> clazz = type.getContentType().getStateClass(); if (state instanceof TransientApplicationState) { TransientApplicationState<S> transientState = (TransientApplicationState<S>)state; @@ -197,16 +186,13 @@ } else if (state instanceof CloneApplicationState) { - PreferencesTask.Load<S> load = new PreferencesTask.Load<S>(((CloneApplicationState<S>)state).getStorageId()); - pomMgr.execute(load); - return load.getState(); + PreferencesTask.Load<S> load = new PreferencesTask.Load<S>(((CloneApplicationState<S>)state).getStorageId(), clazz); + return pomMgr.execute(load); } else { - PreferencesTask.Load<S> load = - new PreferencesTask.Load<S>(((PersistentApplicationState<S>)state).getStorageId()); - pomMgr.execute(load); - return load.getState(); + PreferencesTask.Load<S> load = new PreferencesTask.Load<S>(((PersistentApplicationState<S>)state).getStorageId(), clazz); + return pomMgr.execute(load); } } @@ -236,7 +222,7 @@ public PortletPreferences getPortletPreferences(String windowID) throws Exception { - return pomMgr.execute(new PortletPreferencesTask.Load(windowID)).getPreferences(); + return pomMgr.execute(new PortletPreferencesTask.Load(windowID)); } public <T> LazyPageList<T> find(Query<T> q) throws Exception @@ -249,24 +235,23 @@ Class<T> type = q.getClassType(); if (PageData.class.equals(type)) { - return (LazyPageList<T>)pomMgr.execute(new SearchTask.FindPage((Query<PageData>)q)).getResult(); + return (LazyPageList<T>)pomMgr.execute(new SearchTask.FindPage((Query<PageData>)q)); } else if (NavigationData.class.equals(type)) { - return (LazyPageList<T>)pomMgr.execute(new SearchTask.FindNavigation((Query<NavigationData>)q)).getResult(); + return (LazyPageList<T>)pomMgr.execute(new SearchTask.FindNavigation((Query<NavigationData>)q)); } else if (PortletPreferences.class.equals(type)) { - return (LazyPageList<T>)pomMgr.execute(new SearchTask.FindPortletPreferences((Query<PortletPreferences>)q)) - .getResult(); + return (LazyPageList<T>)pomMgr.execute(new SearchTask.FindPortletPreferences((Query<PortletPreferences>)q)); } else if (PortalData.class.equals(type)) { - return (LazyPageList<T>)pomMgr.execute(new SearchTask.FindSite((Query<PortalData>)q)).getResult(); + return (LazyPageList<T>)pomMgr.execute(new SearchTask.FindSite((Query<PortalData>)q)); } else if (PortalKey.class.equals(type) && "portal".equals(q.getOwnerType())) { - return (LazyPageList<T>)pomMgr.execute(new SearchTask.FindSiteKey((Query<PortalKey>)q)).getResult(); + return (LazyPageList<T>)pomMgr.execute(new SearchTask.FindSiteKey((Query<PortalKey>)q)); } else { @@ -275,8 +260,8 @@ } /** - * This is a hack and should be removed, it is only used temporarily. - * This is because the objects are loaded from files and don't have name. + * This is a hack and should be removed, it is only used temporarily. This is because the objects are loaded from + * files and don't have name. */ private void generateStorageName(ModelObject obj) { @@ -289,13 +274,13 @@ } else if (obj instanceof Application) { - ((Application)obj).setStorageName(UUID.randomUUID().toString()); + obj.setStorageName(UUID.randomUUID().toString()); } } public DashboardData loadDashboard(String dashboardId) throws Exception { - return pomMgr.execute(new DashboardTask.Load(dashboardId)).getDashboard(); + return pomMgr.execute(new DashboardTask.Load(dashboardId)); } public void saveDashboard(DashboardData dashboard) throws Exception Modified: portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/pom/config/POMSession.java =================================================================== --- portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/pom/config/POMSession.java 2009-12-20 10:23:34 UTC (rev 1078) +++ portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/pom/config/POMSession.java 2009-12-20 15:05:20 UTC (rev 1079) @@ -1,16 +1,16 @@ /** * 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 @@ -230,7 +230,7 @@ } public <O extends WorkspaceObject> Iterator<O> findObjects(ObjectType<O> type, ObjectType<? extends Site> siteType, - String ownerId, String title) + String ownerId, String title) { this.save(); // @@ -338,7 +338,7 @@ throw new Error(e); } Class<O> mappedClass = (Class<O>)mapping.get(type); - return session.createQueryBuilder().from(mappedClass).<O> where(statement).get().objects(); + return session.createQueryBuilder().from(mappedClass).<O>where(statement).get().objects(); } private final SynchronizationListener listener = new SynchronizationListener() @@ -346,6 +346,7 @@ public void beforeSynchronization() { } + public void afterSynchronization(SynchronizationStatus status) { if (status == SynchronizationStatus.SAVED && staleKeys != null) @@ -358,7 +359,7 @@ } }; - public void execute(POMTask task) throws Exception + public <V> V execute(POMTask<V> task) throws Exception { if (isInTask) { @@ -370,8 +371,9 @@ try { isInTask = true; - task.run(this); + V v = task.run(this); needRollback = false; + return v; } finally { Modified: portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/pom/config/POMSessionManager.java =================================================================== --- portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/pom/config/POMSessionManager.java 2009-12-20 10:23:34 UTC (rev 1078) +++ portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/pom/config/POMSessionManager.java 2009-12-20 15:05:20 UTC (rev 1079) @@ -129,17 +129,15 @@ * <p>Execute the task with a session.</p> * * @param task the task to execute + * @return the value * @throws Exception any exception thrown by the task */ - public <T extends POMTask> T execute(T task) throws Exception + public <V> V execute(POMTask<V> task) throws Exception { POMSession session = getSession(); // - executor.execute(session, task); - - // - return task; + return executor.execute(session, task); } } Modified: portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/pom/config/POMTask.java =================================================================== --- portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/pom/config/POMTask.java 2009-12-20 10:23:34 UTC (rev 1078) +++ portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/pom/config/POMTask.java 2009-12-20 15:05:20 UTC (rev 1079) @@ -1,16 +1,16 @@ /** * 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 @@ -23,9 +23,9 @@ * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> * @version $Revision$ */ -public interface POMTask +public interface POMTask<V> { - void run(POMSession session) throws Exception; + V run(POMSession session) throws Exception; } Modified: portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/pom/config/TaskExecutionDecorator.java =================================================================== --- portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/pom/config/TaskExecutionDecorator.java 2009-12-20 10:23:34 UTC (rev 1078) +++ portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/pom/config/TaskExecutionDecorator.java 2009-12-20 15:05:20 UTC (rev 1079) @@ -33,9 +33,9 @@ this.next = next; } - public void execute(POMSession session, POMTask task) throws Exception + public <V> V execute(POMSession session, POMTask<V> task) throws Exception { - next.execute(session, task); + return next.execute(session, task); } public <E extends TaskExecutor> E getDecorator(Class<E> decoratorClass) Modified: portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/pom/config/TaskExecutor.java =================================================================== --- portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/pom/config/TaskExecutor.java 2009-12-20 10:23:34 UTC (rev 1078) +++ portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/pom/config/TaskExecutor.java 2009-12-20 15:05:20 UTC (rev 1079) @@ -25,6 +25,6 @@ public interface TaskExecutor { - void execute(POMSession session, POMTask task) throws Exception; + <V> V execute(POMSession session, POMTask<V> task) throws Exception; } Modified: portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/pom/config/cache/CacheableDataTask.java =================================================================== --- portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/pom/config/cache/CacheableDataTask.java 2009-12-20 10:23:34 UTC (rev 1078) +++ portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/pom/config/cache/CacheableDataTask.java 2009-12-20 15:05:20 UTC (rev 1079) @@ -26,17 +26,13 @@ * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> * @version $Revision$ */ -public interface CacheableDataTask<K extends Serializable, V> extends POMTask +public interface CacheableDataTask<K extends Serializable, V> extends POMTask<V> { + Class<V> getValueType(); + DataAccessMode getAccessMode(); K getKey(); - V getValue(); - - void setValue(V value); - - Class<V> getValueType(); - } Modified: portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/pom/config/cache/DataCache.java =================================================================== --- portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/pom/config/cache/DataCache.java 2009-12-20 10:23:34 UTC (rev 1078) +++ portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/pom/config/cache/DataCache.java 2009-12-20 15:05:20 UTC (rev 1079) @@ -20,8 +20,8 @@ import org.exoplatform.portal.pom.config.POMSession; import org.exoplatform.portal.pom.config.POMTask; -import org.exoplatform.portal.pom.config.TaskExecutor; import org.exoplatform.portal.pom.config.TaskExecutionDecorator; +import org.exoplatform.portal.pom.config.TaskExecutor; import java.io.Serializable; import java.util.concurrent.atomic.AtomicLong; @@ -41,56 +41,52 @@ super(next); } - public void execute(POMSession session, POMTask task) throws Exception + public <V> V execute(POMSession session, POMTask<V> task) throws Exception { if (task instanceof CacheableDataTask) { - CacheableDataTask<?, ?> loadTask = (CacheableDataTask<?,?>)task; + CacheableDataTask<?, V> loadTask = (CacheableDataTask<?, V>)task; switch (loadTask.getAccessMode()) { case READ: - read(session, loadTask); - break; + return read(session, loadTask); case CREATE: - create(session, loadTask); - break; + return create(session, loadTask); case WRITE: - write(session, loadTask); - break; + return write(session, loadTask); case DESTROY: - remove(session, loadTask); - break; + return remove(session, loadTask); default: throw new UnsupportedOperationException(); } } else { - super.execute(session, task); + return super.execute(session, task); } } - private <K extends Serializable, V> void remove(POMSession session, CacheableDataTask<K, V> task) throws Exception + private <K extends Serializable, V> V remove(POMSession session, CacheableDataTask<K, V> task) throws Exception { K key = task.getKey(); session.scheduleForEviction(key); - super.execute(session, task); + return super.execute(session, task); } - private <K extends Serializable, V> void write(POMSession session, CacheableDataTask<K, V> task) throws Exception + private <K extends Serializable, V> V write(POMSession session, CacheableDataTask<K, V> task) throws Exception { K key = task.getKey(); session.scheduleForEviction(key); - super.execute(session, task); + return super.execute(session, task); } - private <K extends Serializable, V> void create(POMSession session, CacheableDataTask<K, V> task) throws Exception + private <K extends Serializable, V> V create(POMSession session, CacheableDataTask<K, V> task) throws Exception { // Nothing to do for now - super.execute(session, task); + return super.execute(session, task); } - private <K extends Serializable, V> void read(POMSession session, CacheableDataTask<K, V> task) throws Exception + private <K extends Serializable, V> V read(POMSession session, CacheableDataTask<K, V> task) throws Exception { if (!session.isModified()) { @@ -109,26 +105,28 @@ // if (v != null) { - task.setValue(v); + return v; } else { readCount.incrementAndGet(); // - super.execute(session, task); + v = super.execute(session, task); // - v = task.getValue(); if (v != null) { session.putInCache(key, v); } + + // + return v; } } else { - super.execute(session, task); + return super.execute(session, task); } } Modified: portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/pom/config/tasks/DashboardTask.java =================================================================== --- portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/pom/config/tasks/DashboardTask.java 2009-12-20 10:23:34 UTC (rev 1078) +++ portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/pom/config/tasks/DashboardTask.java 2009-12-20 15:05:20 UTC (rev 1079) @@ -1,16 +1,16 @@ /** * 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 @@ -19,10 +19,10 @@ package org.exoplatform.portal.pom.config.tasks; +import org.exoplatform.portal.pom.config.POMSession; +import org.exoplatform.portal.pom.config.POMTask; import org.exoplatform.portal.pom.data.DashboardData; import org.exoplatform.portal.pom.data.Mapper; -import org.exoplatform.portal.pom.config.AbstractPOMTask; -import org.exoplatform.portal.pom.config.POMSession; import org.gatein.mop.api.workspace.ObjectType; import org.gatein.mop.api.workspace.ui.UIContainer; @@ -30,37 +30,32 @@ * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> * @version $Revision$ */ -public abstract class DashboardTask extends AbstractPOMTask +public abstract class DashboardTask { - public static class Load extends DashboardTask + public static class Load implements POMTask<DashboardData> { /** . */ protected final String storageId; - /** . */ - protected DashboardData dashboard; - public Load(String storageId) { this.storageId = storageId; } - public void run(POMSession session) throws Exception + public DashboardData run(POMSession session) throws Exception { UIContainer container = session.findObjectById(ObjectType.CONTAINER, storageId); // if (container != null) { - dashboard = new Mapper(session).loadDashboard(container); + return new Mapper(session).loadDashboard(container); } - } - public DashboardData getDashboard() - { - return dashboard; + // + return null; } @Override @@ -70,7 +65,7 @@ } } - public static class Save extends DashboardTask + public static class Save implements POMTask<Void> { /** The dashboard object. */ @@ -89,7 +84,7 @@ this.dashboard = dashboard; } - public void run(POMSession session) throws Exception + public Void run(POMSession session) throws Exception { String id = dashboard.getStorageId(); if (id == null) @@ -109,6 +104,9 @@ // mapper.saveDashboard(dashboard, container); + + // + return null; } @Override Modified: portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/pom/config/tasks/PageNavigationTask.java =================================================================== --- portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/pom/config/tasks/PageNavigationTask.java 2009-12-20 10:23:34 UTC (rev 1078) +++ portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/pom/config/tasks/PageNavigationTask.java 2009-12-20 15:05:20 UTC (rev 1079) @@ -1,16 +1,16 @@ /** * 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 @@ -19,12 +19,10 @@ package org.exoplatform.portal.pom.config.tasks; -import org.exoplatform.portal.pom.config.cache.DataAccessMode; +import org.exoplatform.portal.pom.config.POMSession; import org.exoplatform.portal.pom.config.cache.CacheableDataTask; +import org.exoplatform.portal.pom.config.cache.DataAccessMode; import org.exoplatform.portal.pom.data.Mapper; - -import org.exoplatform.portal.pom.config.AbstractPOMTask; -import org.exoplatform.portal.pom.config.POMSession; import org.exoplatform.portal.pom.data.NavigationData; import org.exoplatform.portal.pom.data.NavigationKey; import org.gatein.mop.api.workspace.Navigation; @@ -36,7 +34,7 @@ * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> * @version $Revision$ */ -public abstract class PageNavigationTask extends AbstractPOMTask +public abstract class PageNavigationTask { /** . */ @@ -54,19 +52,11 @@ public static class Load extends PageNavigationTask implements CacheableDataTask<NavigationKey, NavigationData> { - /** . */ - private NavigationData pageNav; - public Load(NavigationKey key) { super(key); } - public NavigationData getPageNavigation() - { - return pageNav; - } - public DataAccessMode getAccessMode() { return DataAccessMode.READ; @@ -77,22 +67,12 @@ return key; } - public NavigationData getValue() - { - return pageNav; - } - - public void setValue(NavigationData value) - { - this.pageNav = value; - } - public Class<NavigationData> getValueType() { return NavigationData.class; } - public void run(POMSession session) throws Exception + public NavigationData run(POMSession session) throws Exception { Workspace workspace = session.getWorkspace(); Site site = workspace.getSite(siteType, key.getId()); @@ -102,7 +82,7 @@ Navigation defaultNav = nav.getChild("default"); if (defaultNav != null) { - pageNav = new Mapper(session).load(defaultNav); + return new Mapper(session).load(defaultNav); } } else @@ -110,6 +90,9 @@ System.out.println("Cannot load page navigation as the corresponding portal " + key.getId() + " with type " + siteType + " does not exist"); } + + // + return null; } @Override @@ -119,7 +102,7 @@ } } - public static class Save extends PageNavigationTask implements CacheableDataTask<NavigationKey, NavigationData> + public static class Save extends PageNavigationTask implements CacheableDataTask<NavigationKey, Void> { /** . */ @@ -137,32 +120,22 @@ this.overwrite = overwrite; } - public DataAccessMode getAccessMode() + public Class<Void> getValueType() { - return pageNav.getStorageId() != null ? DataAccessMode.WRITE : DataAccessMode.CREATE; + return Void.class; } - public void setValue(NavigationData value) + public DataAccessMode getAccessMode() { - throw new UnsupportedOperationException(); + return pageNav.getStorageId() != null ? DataAccessMode.WRITE : DataAccessMode.CREATE; } - public Class<NavigationData> getValueType() - { - return NavigationData.class; - } - - public NavigationData getValue() - { - return pageNav; - } - public NavigationKey getKey() { return key; } - public void run(POMSession session) throws Exception + public Void run(POMSession session) throws Exception { Workspace workspace = session.getWorkspace(); Site site = workspace.getSite(siteType, key.getId()); @@ -184,6 +157,9 @@ // new Mapper(session).save(pageNav, defaultNav); + + // + return null; } @Override @@ -193,7 +169,7 @@ } } - public static class Remove extends PageNavigationTask implements CacheableDataTask<NavigationKey, NavigationData> + public static class Remove extends PageNavigationTask implements CacheableDataTask<NavigationKey, Void> { public Remove(NavigationData pageNav) @@ -206,27 +182,17 @@ return DataAccessMode.DESTROY; } - public void setValue(NavigationData value) + public Class<Void> getValueType() { - throw new UnsupportedOperationException(); + return Void.class; } - public Class<NavigationData> getValueType() - { - return NavigationData.class; - } - - public NavigationData getValue() - { - return null; - } - public NavigationKey getKey() { return key; } - public void run(POMSession session) throws Exception + public Void run(POMSession session) throws Exception { Workspace workspace = session.getWorkspace(); Site site = workspace.getSite(siteType, key.getId()); @@ -245,6 +211,9 @@ { defaultNav.destroy(); } + + // + return null; } @Override Modified: portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/pom/config/tasks/PageTask.java =================================================================== --- portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/pom/config/tasks/PageTask.java 2009-12-20 10:23:34 UTC (rev 1078) +++ portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/pom/config/tasks/PageTask.java 2009-12-20 15:05:20 UTC (rev 1079) @@ -1,16 +1,16 @@ /** * 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 @@ -19,14 +19,13 @@ package org.exoplatform.portal.pom.config.tasks; -import org.exoplatform.portal.pom.config.cache.DataAccessMode; +import org.exoplatform.portal.pom.config.POMSession; +import org.exoplatform.portal.pom.config.POMTask; import org.exoplatform.portal.pom.config.cache.CacheableDataTask; +import org.exoplatform.portal.pom.config.cache.DataAccessMode; import org.exoplatform.portal.pom.data.Mapper; import org.exoplatform.portal.pom.data.ModelChange; import org.exoplatform.portal.pom.data.PageData; - -import org.exoplatform.portal.pom.config.AbstractPOMTask; -import org.exoplatform.portal.pom.config.POMSession; import org.exoplatform.portal.pom.data.PageKey; import org.gatein.mop.api.Attributes; import org.gatein.mop.api.content.ContentType; @@ -45,7 +44,7 @@ * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> * @version $Revision$ */ -public abstract class PageTask extends AbstractPOMTask +public abstract class PageTask { /** . */ @@ -72,7 +71,7 @@ this.siteType = Mapper.parseSiteType(ownerType); } - public static class Clone extends PageTask + public static class Clone extends PageTask implements POMTask<PageData> { /** . */ @@ -88,9 +87,6 @@ private final String cloneName; /** . */ - private PageData page; - - /** . */ private boolean deep; public Clone(PageKey key, PageKey cloneKey, boolean deep) @@ -105,7 +101,7 @@ this.cloneSiteType = Mapper.parseSiteType(cloneOwnerType); } - public void run(POMSession session) throws Exception + public PageData run(POMSession session) throws Exception { Workspace workspace = session.getWorkspace(); @@ -151,7 +147,7 @@ org.gatein.mop.api.workspace.Page dstPage = dstPages.addChild(cloneName); // - + Attributes srcAttrs = srcPage.getAttributes(); Attributes dstAttrs = dstPage.getAttributes(); for (String key : srcAttrs.getKeys()) @@ -159,15 +155,15 @@ Object value = srcAttrs.getObject(key); dstAttrs.setObject(key, value); } - + copy(srcPage, dstPage, srcPage.getRootComponent(), dstPage.getRootComponent()); // - this.page = new Mapper(session).load(dstPage); + return new Mapper(session).load(dstPage); } private void copy(org.gatein.mop.api.workspace.Page srcPage, org.gatein.mop.api.workspace.Page dstPage, - UIContainer src, UIContainer dst) + UIContainer src, UIContainer dst) { for (UIComponent srcChild : src) { @@ -232,11 +228,6 @@ } } - public PageData getPage() - { - return page; - } - @Override public String toString() { @@ -245,7 +236,7 @@ } } - public static class Remove extends PageTask implements CacheableDataTask<PageKey, PageData> + public static class Remove extends PageTask implements CacheableDataTask<PageKey, Void> { public Remove(PageData page) @@ -258,27 +249,17 @@ return DataAccessMode.DESTROY; } - public void setValue(PageData value) + public Class<Void> getValueType() { - throw new UnsupportedOperationException(); + return Void.class; } - public Class<PageData> getValueType() - { - return PageData.class; - } - - public PageData getValue() - { - return null; - } - public PageKey getKey() { return key; } - public void run(POMSession session) + public Void run(POMSession session) { Workspace workspace = session.getWorkspace(); Site site = workspace.getSite(siteType, ownerId); @@ -299,6 +280,9 @@ } page.destroy(); } + + // + return null; } @Override @@ -308,7 +292,7 @@ } } - public static class Save extends PageTask implements CacheableDataTask<PageKey, PageData> + public static class Save extends PageTask implements CacheableDataTask<PageKey, Void> { /** . */ @@ -330,27 +314,17 @@ return page.getStorageId() != null ? DataAccessMode.WRITE : DataAccessMode.CREATE; } - public void setValue(PageData value) + public Class<Void> getValueType() { - throw new UnsupportedOperationException(); + return Void.class; } - public Class<PageData> getValueType() - { - return PageData.class; - } - - public PageData getValue() - { - return page; - } - public PageKey getKey() { return key; } - public void run(POMSession session) throws Exception + public Void run(POMSession session) throws Exception { Workspace workspace = session.getWorkspace(); Site site = workspace.getSite(siteType, ownerId); @@ -363,6 +337,9 @@ // Mapper mapper = new Mapper(session); changes = mapper.save(this.page, site, name); + + // + return null; } public List<ModelChange> getChanges() @@ -380,19 +357,11 @@ public static class Load extends PageTask implements CacheableDataTask<PageKey, PageData> { - /** . */ - private PageData page; - public Load(PageKey key) { super(key); } - public PageData getPage() - { - return page; - } - public DataAccessMode getAccessMode() { return DataAccessMode.READ; @@ -408,18 +377,8 @@ return PageData.class; } - public void setValue(PageData value) + public PageData run(POMSession session) { - page = value; - } - - public PageData getValue() - { - return page; - } - - public void run(POMSession session) - { Workspace workspace = session.getWorkspace(); Site site = workspace.getSite(siteType, ownerId); if (site != null) @@ -429,9 +388,12 @@ org.gatein.mop.api.workspace.Page page = pages.getChild(name); if (page != null) { - this.page = new Mapper(session).load(page); + return new Mapper(session).load(page); } } + + // + return null; } @Override Modified: portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/pom/config/tasks/PortalConfigTask.java =================================================================== --- portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/pom/config/tasks/PortalConfigTask.java 2009-12-20 10:23:34 UTC (rev 1078) +++ portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/pom/config/tasks/PortalConfigTask.java 2009-12-20 15:05:20 UTC (rev 1079) @@ -1,16 +1,16 @@ /** * 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 @@ -20,12 +20,11 @@ package org.exoplatform.portal.pom.config.tasks; import org.exoplatform.portal.application.PortletPreferences; -import org.exoplatform.portal.pom.config.cache.DataAccessMode; +import org.exoplatform.portal.pom.config.POMSession; import org.exoplatform.portal.pom.config.cache.CacheableDataTask; +import org.exoplatform.portal.pom.config.cache.DataAccessMode; import org.exoplatform.portal.pom.data.Mapper; import org.exoplatform.portal.pom.data.PortalData; -import org.exoplatform.portal.pom.config.AbstractPOMTask; -import org.exoplatform.portal.pom.config.POMSession; import org.exoplatform.portal.pom.data.PortalKey; import org.gatein.mop.api.workspace.ObjectType; import org.gatein.mop.api.workspace.Page; @@ -36,7 +35,7 @@ * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> * @version $Revision$ */ -public abstract class PortalConfigTask extends AbstractPOMTask +public abstract class PortalConfigTask { /** . */ @@ -51,7 +50,7 @@ this.type = Mapper.parseSiteType(key.getType()); } - public static class Remove extends PortalConfigTask implements CacheableDataTask<PortalKey, PortalData> + public static class Remove extends PortalConfigTask implements CacheableDataTask<PortalKey, Void> { public Remove(PortalKey key) @@ -64,9 +63,9 @@ return DataAccessMode.DESTROY; } - public Class<PortalData> getValueType() + public Class<Void> getValueType() { - return PortalData.class; + return Void.class; } public PortalKey getKey() @@ -74,18 +73,8 @@ return key; } - public void setValue(PortalData value) + public Void run(POMSession session) { - throw new UnsupportedOperationException(); - } - - public PortalData getValue() - { - return null; - } - - public void run(POMSession session) - { Workspace workspace = session.getWorkspace(); Site site = workspace.getSite(type, key.getId()); if (site == null) @@ -96,6 +85,7 @@ { site.destroy(); } + return null; } @Override @@ -105,7 +95,7 @@ } } - public static class Save extends PortalConfigTask implements CacheableDataTask<PortalKey, PortalData> + public static class Save extends PortalConfigTask implements CacheableDataTask<PortalKey, Void> { /** . */ @@ -128,27 +118,17 @@ return overwrite ? DataAccessMode.WRITE : DataAccessMode.CREATE; } - public void setValue(PortalData value) + public Class<Void> getValueType() { - throw new UnsupportedOperationException(); + return Void.class; } - public Class<PortalData> getValueType() - { - return PortalData.class; - } - - public PortalData getValue() - { - return config; - } - public PortalKey getKey() { return key; } - public void run(POMSession session) throws Exception + public Void run(POMSession session) throws Exception { Workspace workspace = session.getWorkspace(); Site site = workspace.getSite(type, key.getId()); @@ -179,6 +159,9 @@ } } new Mapper(session).save(config, site); + + // + return null; } @Override @@ -209,34 +192,22 @@ return key; } - public void setValue(PortalData value) - { - config = value; - } - public Class<PortalData> getValueType() { return PortalData.class; } - public PortalData getValue() + public PortalData run(POMSession session) { - return config; - } - - public PortalData getConfig() - { - return config; - } - - public void run(POMSession session) - { Workspace workspace = session.getWorkspace(); Site site = workspace.getSite(type, key.getId()); if (site != null) { - this.config = new Mapper(session).load(site); + return new Mapper(session).load(site); } + + // + return null; } @Override Modified: portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/pom/config/tasks/PortletPreferencesTask.java =================================================================== --- portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/pom/config/tasks/PortletPreferencesTask.java 2009-12-20 10:23:34 UTC (rev 1078) +++ portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/pom/config/tasks/PortletPreferencesTask.java 2009-12-20 15:05:20 UTC (rev 1079) @@ -1,16 +1,16 @@ /** * 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 @@ -21,9 +21,9 @@ import org.exoplatform.portal.application.PortletPreferences; import org.exoplatform.portal.application.Preference; +import org.exoplatform.portal.pom.config.POMSession; +import org.exoplatform.portal.pom.config.POMTask; import org.exoplatform.portal.pom.data.Mapper; -import org.exoplatform.portal.pom.config.AbstractPOMTask; -import org.exoplatform.portal.pom.config.POMSession; import org.exoplatform.portal.pom.spi.portlet.Portlet; import org.exoplatform.portal.pom.spi.portlet.PortletBuilder; import org.gatein.mop.api.content.Customization; @@ -39,7 +39,7 @@ * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> * @version $Revision$ */ -public abstract class PortletPreferencesTask extends AbstractPOMTask +public abstract class PortletPreferencesTask { /* @@ -92,7 +92,7 @@ this.windowId = windowId; } - public static class Save extends PortletPreferencesTask + public static class Save extends PortletPreferencesTask implements POMTask<Void> { /** . */ @@ -106,8 +106,13 @@ this.prefs = prefs; } - public void run(POMSession session) throws Exception + public Class<Void> getValueType() { + return Void.class; + } + + public Void run(POMSession session) throws Exception + { Workspace workspace = session.getWorkspace(); Site site = workspace.getSite(siteType, ownerId); @@ -172,26 +177,26 @@ { session.addPortletPreferences(prefs); } + + // + return null; } } - public static class Load extends PortletPreferencesTask + public static class Load extends PortletPreferencesTask implements POMTask<PortletPreferences> { - /** . */ - private PortletPreferences prefs; - public Load(String windowId) { super(windowId); } - public PortletPreferences getPreferences() + public Class<PortletPreferences> getValueType() { - return prefs; + return PortletPreferences.class; } - public void run(POMSession session) throws Exception + public PortletPreferences run(POMSession session) throws Exception { Workspace workspace = session.getWorkspace(); Site site = workspace.getSite(siteType, ownerId); @@ -245,10 +250,13 @@ PortletPreferences prefs = new PortletPreferences(); prefs.setWindowId(windowId); prefs.setPreferences(list); - this.prefs = prefs; + return prefs; } } } + + // + return null; } } } Modified: portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/pom/config/tasks/PreferencesTask.java =================================================================== --- portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/pom/config/tasks/PreferencesTask.java 2009-12-20 10:23:34 UTC (rev 1078) +++ portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/pom/config/tasks/PreferencesTask.java 2009-12-20 15:05:20 UTC (rev 1079) @@ -1,16 +1,16 @@ /** * 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 @@ -19,8 +19,8 @@ package org.exoplatform.portal.pom.config.tasks; -import org.exoplatform.portal.pom.config.AbstractPOMTask; import org.exoplatform.portal.pom.config.POMSession; +import org.exoplatform.portal.pom.config.POMTask; import org.exoplatform.portal.pom.config.cache.CacheableDataTask; import org.exoplatform.portal.pom.config.cache.DataAccessMode; import org.gatein.mop.api.content.Customization; @@ -29,50 +29,43 @@ * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> * @version $Revision$ */ -public abstract class PreferencesTask<S> extends AbstractPOMTask +public abstract class PreferencesTask<S> { /** . */ - private static final Object NULL_PREFS = new Object(); +// private static final Object NULL_PREFS = new Object(); - public static class GetContentId<S> extends PreferencesTask<S> + public static class GetContentId<S> extends PreferencesTask<S> implements POMTask<String> { /** . */ private final String storageId; - /** . */ - private String contentId; - public GetContentId(String storageId) { this.storageId = storageId; } - public void run(POMSession session) throws Exception + public String run(POMSession session) throws Exception { Customization<S> customization = (Customization<S>)session.findCustomizationById(storageId); - contentId = customization.getContentId(); + return customization.getContentId(); } - - public String getContentId() - { - return contentId; - } } - public static class Load<S> extends PreferencesTask<S> implements CacheableDataTask<String, Object> + public static class Load<S> extends PreferencesTask<S> implements CacheableDataTask<String, S> { /** . */ private final String storageId; /** . */ - private S prefs; + private final Class<S> valueType; - public Load(String storageId) + public Load(String storageId, Class<S> valueType) { this.storageId = storageId; + this.valueType = valueType; } public DataAccessMode getAccessMode() @@ -80,40 +73,22 @@ return DataAccessMode.READ; } - public void setValue(Object value) + public Class<S> getValueType() { - if (value != NULL_PREFS) - { - prefs = (S)value; - } + return valueType; } - public Class<Object> getValueType() - { - return Object.class; - } - - public Object getValue() - { - return prefs == null ? NULL_PREFS : prefs; - } - public String getKey() { return storageId; } - public void run(POMSession session) throws Exception + public S run(POMSession session) throws Exception { Customization<S> customization = (Customization<S>)session.findCustomizationById(storageId); - prefs = customization.getVirtualState(); + return customization.getVirtualState(); } - public S getState() - { - return prefs; - } - @Override public String toString() { @@ -121,7 +96,7 @@ } } - public static class Save<S> extends PreferencesTask<S> implements CacheableDataTask<String, Object> + public static class Save<S> extends PreferencesTask<S> implements CacheableDataTask<String, Void> { /** . */ @@ -141,27 +116,17 @@ return DataAccessMode.WRITE; } - public void setValue(Object value) + public Class<Void> getValueType() { - throw new UnsupportedOperationException(); + return Void.class; } - public Class<Object> getValueType() - { - return Object.class; - } - - public Object getValue() - { - return prefs == null ? NULL_PREFS : prefs ; - } - public String getKey() { return storageId; } - public void run(POMSession session) throws Exception + public Void run(POMSession session) throws Exception { Customization<S> customization = (Customization<S>)session.findCustomizationById(storageId); @@ -174,6 +139,9 @@ { customization.setState(null); } + + // + return null; } @Override Modified: portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/pom/config/tasks/SearchTask.java =================================================================== --- portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/pom/config/tasks/SearchTask.java 2009-12-20 10:23:34 UTC (rev 1078) +++ portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/pom/config/tasks/SearchTask.java 2009-12-20 15:05:20 UTC (rev 1079) @@ -1,16 +1,16 @@ /** * 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 @@ -23,13 +23,13 @@ import org.exoplatform.commons.utils.ListAccess; import org.exoplatform.portal.application.PortletPreferences; import org.exoplatform.portal.config.Query; +import org.exoplatform.portal.pom.config.POMSession; +import org.exoplatform.portal.pom.config.POMTask; import org.exoplatform.portal.pom.data.Mapper; import org.exoplatform.portal.pom.data.NavigationData; import org.exoplatform.portal.pom.data.PageData; import org.exoplatform.portal.pom.data.PortalData; import org.exoplatform.portal.pom.data.PortalKey; -import org.exoplatform.portal.pom.config.AbstractPOMTask; -import org.exoplatform.portal.pom.config.POMSession; import org.gatein.mop.api.workspace.Navigation; import org.gatein.mop.api.workspace.ObjectType; import org.gatein.mop.api.workspace.Site; @@ -45,25 +45,17 @@ * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> * @version $Revision$ */ -public abstract class SearchTask<T> extends AbstractPOMTask +public abstract class SearchTask<T> implements POMTask<LazyPageList<T>> { /** . */ protected final Query<T> q; - /** . */ - protected LazyPageList<T> result; - public SearchTask(Query<T> query) { this.q = query; } - public LazyPageList<T> getResult() - { - return result; - } - public abstract static class FindSiteObject<W extends WorkspaceObject, T> extends SearchTask<T> { @@ -72,7 +64,7 @@ super(query); } - public void run(final POMSession session) throws Exception + public LazyPageList<T> run(final POMSession session) throws Exception { Iterator<W> ite; try @@ -88,7 +80,7 @@ } catch (IllegalArgumentException e) { - ite = Collections.<W> emptyList().iterator(); + ite = Collections.<W>emptyList().iterator(); } // @@ -119,11 +111,12 @@ } }; - result = new LazyPageList<T>(la, 10); + // + return new LazyPageList<T>(la, 10); } protected abstract Iterator<W> findW(POMSession session, ObjectType<? extends Site> siteType, String ownerId, - String title); + String title); protected abstract T[] createT(int length); @@ -140,7 +133,7 @@ } protected Iterator<org.gatein.mop.api.workspace.Page> findW(POMSession session, - ObjectType<? extends Site> siteType, String ownerId, String title) + ObjectType<? extends Site> siteType, String ownerId, String title) { return session.findObjects(ObjectType.PAGE, siteType, q.getOwnerId(), q.getTitle()); } @@ -165,7 +158,7 @@ } protected Iterator<Navigation> findW(POMSession session, ObjectType<? extends Site> siteType, String ownerId, - String title) + String title) { return session.findObjects(ObjectType.NAVIGATION, siteType, q.getOwnerId(), q.getTitle()); } @@ -189,11 +182,11 @@ super(portletPreferencesQuery); } - public void run(final POMSession session) throws Exception + public LazyPageList<PortletPreferences> run(final POMSession session) throws Exception { // We return empty on purpose at it is used when preferences are deleted by the UserPortalConfigService // and the prefs are deleted transitively when an entity is removed - result = new LazyPageList<PortletPreferences>(new ListAccess<PortletPreferences>() + return new LazyPageList<PortletPreferences>(new ListAccess<PortletPreferences>() { public PortletPreferences[] load(int index, int length) throws Exception, IllegalArgumentException { @@ -216,7 +209,7 @@ super(siteQuery); } - public void run(final POMSession session) throws Exception + public LazyPageList<PortalData> run(final POMSession session) throws Exception { Workspace workspace = session.getWorkspace(); String ownerType = q.getOwnerType(); @@ -242,7 +235,7 @@ return portals.size(); } }; - result = new LazyPageList<PortalData>(la, 10); + return new LazyPageList<PortalData>(la, 10); } } @@ -254,7 +247,7 @@ super(siteQuery); } - public void run(final POMSession session) throws Exception + public LazyPageList<PortalKey> run(final POMSession session) throws Exception { Workspace workspace = session.getWorkspace(); final Collection<? extends Site> portals = workspace.getSites(ObjectType.PORTAL_SITE); @@ -277,7 +270,7 @@ return portals.size(); } }; - result = new LazyPageList<PortalKey>(la, 10); + return new LazyPageList<PortalKey>(la, 10); } } } Modified: portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/pom/data/ModelDataStorage.java =================================================================== --- portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/pom/data/ModelDataStorage.java 2009-12-20 10:23:34 UTC (rev 1078) +++ portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/pom/data/ModelDataStorage.java 2009-12-20 15:05:20 UTC (rev 1079) @@ -1,16 +1,16 @@ /** * 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 @@ -23,20 +23,16 @@ import org.exoplatform.portal.application.PortletPreferences; import org.exoplatform.portal.config.Query; import org.exoplatform.portal.config.model.ApplicationState; +import org.exoplatform.portal.config.model.ApplicationType; import org.exoplatform.portal.config.model.Container; -import org.exoplatform.portal.pom.data.ModelChange; -import org.exoplatform.portal.pom.data.PageData; -import org.exoplatform.portal.pom.data.PortalData; import java.util.Comparator; import java.util.List; /** - * Created by The eXo Platform SAS - * Apr 19, 2007 - * - * This interface is used to load the PortalConfig, Page config and Navigation config from the - * database + * Created by The eXo Platform SAS Apr 19, 2007 + * <p/> + * This interface is used to load the PortalConfig, Page config and Navigation config from the database */ public interface ModelDataStorage { @@ -54,7 +50,7 @@ /** * Clones a page. * - * @param key the key of the page to clone + * @param key the key of the page to clone * @param cloneKey the key of the clone * @return the cloned page * @throws Exception any exception @@ -67,12 +63,12 @@ public void create(PageData page) throws Exception; /** - * Saves a page. If a page with the same id already exists then a merge operation will occur, otherwise - * a new page will be created from the provided argument. + * Saves a page. If a page with the same id already exists then a merge operation will occur, otherwise a new page + * will be created from the provided argument. + * <p/> + * The operation returns a list of the change object that describes the changes that occured during the save + * operation. * - * The operation returns a list of the change object that describes the changes that occured during the - * save operation. - * * @param page the page to save * @return the list of model changes that occured during the save operation * @throws Exception any exception @@ -91,7 +87,7 @@ public <S> String getId(ApplicationState<S> state) throws Exception; - public <S> S load(ApplicationState<S> state) throws Exception; + public <S> S load(ApplicationState<S> state, ApplicationType<S> type) throws Exception; public <S> ApplicationState<S> save(ApplicationState<S> state, S preferences) throws Exception; Modified: portal/branches/wsrp-integration/component/portal/src/test/java/conf/portal/portal-configuration.xml =================================================================== --- portal/branches/wsrp-integration/component/portal/src/test/java/conf/portal/portal-configuration.xml 2009-12-20 10:23:34 UTC (rev 1078) +++ portal/branches/wsrp-integration/component/portal/src/test/java/conf/portal/portal-configuration.xml 2009-12-20 15:05:20 UTC (rev 1079) @@ -21,210 +21,232 @@ --> <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd" - xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"> + xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd" + xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"> - <component> - <key>org.exoplatform.services.cache.CacheService</key> - <jmx-name>cache:type=CacheService</jmx-name> - <type>org.exoplatform.services.cache.impl.CacheServiceImpl</type> - <init-params> - <object-param> - <name>cache.config.default</name> - <description>The default cache configuration</description> - <object type="org.exoplatform.services.cache.ExoCacheConfig"> - <field name="name"><string>default</string></field> - <field name="maxSize"><int>300</int></field> - <field name="liveTime"><long>6000</long></field> - <field name="distributed"><boolean>false</boolean></field> - <field name="implementation"><string>org.exoplatform.services.cache.concurrent.ConcurrentFIFOExoCache</string></field> - </object> - </object-param> - </init-params> - </component> + <component> + <key>org.exoplatform.services.cache.CacheService</key> + <jmx-name>cache:type=CacheService</jmx-name> + <type>org.exoplatform.services.cache.impl.CacheServiceImpl</type> + <init-params> + <object-param> + <name>cache.config.default</name> + <description>The default cache configuration</description> + <object type="org.exoplatform.services.cache.ExoCacheConfig"> + <field name="name"> + <string>default</string> + </field> + <field name="maxSize"> + <int>300</int> + </field> + <field name="liveTime"> + <long>6000</long> + </field> + <field name="distributed"> + <boolean>false</boolean> + </field> + <field name="implementation"> + <string>org.exoplatform.services.cache.concurrent.ConcurrentFIFOExoCache</string> + </field> + </object> + </object-param> + </init-params> + </component> - <component> - <key>org.exoplatform.services.security.Authenticator</key> - <type>org.exoplatform.services.organization.auth.OrganizationAuthenticatorImpl</type> - </component> + <component> + <key>org.exoplatform.services.security.Authenticator</key> + <type>org.exoplatform.services.organization.auth.OrganizationAuthenticatorImpl</type> + </component> - <component> - <key>org.exoplatform.services.listener.ListenerService</key> - <type>org.exoplatform.services.listener.ListenerService</type> - </component> + <component> + <key>org.exoplatform.services.listener.ListenerService</key> + <type>org.exoplatform.services.listener.ListenerService</type> + </component> - <component> - <key>org.exoplatform.commons.chromattic.ChromatticManager</key> - <type>org.exoplatform.commons.chromattic.ChromatticManager</type> - </component> + <component> + <key>org.exoplatform.commons.chromattic.ChromatticManager</key> + <type>org.exoplatform.commons.chromattic.ChromatticManager</type> + </component> - <component> - <key>org.exoplatform.portal.pom.config.POMSessionManager</key> - <type>org.exoplatform.portal.pom.config.POMSessionManager</type> - </component> + <component> + <key>org.exoplatform.portal.pom.config.POMSessionManager</key> + <type>org.exoplatform.portal.pom.config.POMSessionManager</type> + </component> - <component> - <key>org.exoplatform.portal.pom.data.ModelDataStorage</key> - <type>org.exoplatform.portal.pom.config.POMDataStorage</type> - </component> + <component> + <key>org.exoplatform.portal.pom.data.ModelDataStorage</key> + <type>org.exoplatform.portal.pom.config.POMDataStorage</type> + </component> - <component> - <key>org.exoplatform.portal.config.DataStorage</key> - <type>org.exoplatform.portal.config.DataStorageImpl</type> - </component> + <component> + <key>org.exoplatform.portal.config.DataStorage</key> + <type>org.exoplatform.portal.config.DataStorageImpl</type> + </component> - <component> - <key>org.exoplatform.services.jcr.ext.hierarchy.NodeHierarchyCreator</key> - <type>org.exoplatform.services.jcr.ext.hierarchy.impl.NodeHierarchyCreatorImpl</type> - </component> + <component> + <key>org.exoplatform.services.jcr.ext.hierarchy.NodeHierarchyCreator</key> + <type>org.exoplatform.services.jcr.ext.hierarchy.impl.NodeHierarchyCreatorImpl</type> + </component> - <component> - <key>org.exoplatform.portal.config.UserACL</key> - <type>org.exoplatform.portal.config.UserACL</type> - <init-params> - <value-param> - <name>super.user</name> - <description>administrator</description> - <value>root</value> - </value-param> - <value-param> - <name>guests.group</name> - <description>guests group</description> - <value>/platform/guests</value> - </value-param> - <value-param> - <name>navigation.creator.membership.type</name> - <description>specific membership type have full permission with group navigation</description> - <value>manager</value> - </value-param> - </init-params> - </component> + <component> + <key>org.exoplatform.portal.config.UserACL</key> + <type>org.exoplatform.portal.config.UserACL</type> + <init-params> + <value-param> + <name>super.user</name> + <description>administrator</description> + <value>root</value> + </value-param> + <value-param> + <name>guests.group</name> + <description>guests group</description> + <value>/platform/guests</value> + </value-param> + <value-param> + <name>navigation.creator.membership.type</name> + <description>specific membership type have full permission with group navigation</description> + <value>manager</value> + </value-param> + </init-params> + </component> - <component> - <key>org.exoplatform.portal.config.UserPortalConfigService</key> - <type>org.exoplatform.portal.config.UserPortalConfigService</type> - </component> + <component> + <key>org.exoplatform.portal.config.UserPortalConfigService</key> + <type>org.exoplatform.portal.config.UserPortalConfigService</type> + </component> - <external-component-plugins> - <target-component>org.exoplatform.services.jcr.RepositoryService</target-component> - <component-plugin> - <name>add.namespaces</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.jcr.impl.AddNamespacesPlugin</type> - <init-params> - <properties-param> - <name>namespaces</name> - <property name="mop" value="http://www.gatein.org/jcr/mop/1.0/"/> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>add.nodeType</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.jcr.impl.AddNodeTypePlugin</type> - <init-params> - <values-param> - <name>autoCreatedInNewRepository</name> - <description>Node types configuration file</description> - <value>jar:/conf/mop-nodetypes.xml</value> - <value>jar:/conf/content-nodetypes.xml</value> - </values-param> - </init-params> - </component-plugin> - </external-component-plugins> + <external-component-plugins> + <target-component>org.exoplatform.services.jcr.RepositoryService</target-component> + <component-plugin> + <name>add.namespaces</name> + <set-method>addPlugin</set-method> + <type>org.exoplatform.services.jcr.impl.AddNamespacesPlugin</type> + <init-params> + <properties-param> + <name>namespaces</name> + <property name="mop" value="http://www.gatein.org/jcr/mop/1.0/"/> + </properties-param> + </init-params> + </component-plugin> + <component-plugin> + <name>add.nodeType</name> + <set-method>addPlugin</set-method> + <type>org.exoplatform.services.jcr.impl.AddNodeTypePlugin</type> + <init-params> + <values-param> + <name>autoCreatedInNewRepository</name> + <description>Node types configuration file</description> + <value>jar:/conf/mop-nodetypes.xml</value> + <value>jar:/conf/content-nodetypes.xml</value> + </values-param> + </init-params> + </component-plugin> + </external-component-plugins> - <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.portal.pom.config.MOPChromatticLifeCycle</type> - <init-params> - <value-param> - <name>name</name> - <value>mop</value> - </value-param> - <value-param> - <name>workspace-name</name> - <value>portal-test</value> - </value-param> - <values-param> - <name>entities</name> - <value>org.gatein.mop.core.api.workspace.WorkspaceImpl</value> - <value>org.gatein.mop.core.api.workspace.UIContainerImpl</value> - <value>org.gatein.mop.core.api.workspace.UIWindowImpl</value> - <value>org.gatein.mop.core.api.workspace.UIBodyImpl</value> - <value>org.gatein.mop.core.api.workspace.PageImpl</value> - <value>org.gatein.mop.core.api.workspace.PageContainer</value> - <value>org.gatein.mop.core.api.workspace.NavigationImpl</value> - <value>org.gatein.mop.core.api.workspace.NavigationContainer</value> - <value>org.gatein.mop.core.api.workspace.PageLinkImpl</value> - <value>org.gatein.mop.core.api.workspace.URLLinkImpl</value> - <value>org.gatein.mop.core.api.workspace.PortalSiteContainer</value> - <value>org.gatein.mop.core.api.workspace.PortalSite</value> - <value>org.gatein.mop.core.api.workspace.GroupSiteContainer</value> - <value>org.gatein.mop.core.api.workspace.GroupSite</value> - <value>org.gatein.mop.core.api.workspace.UserSiteContainer</value> - <value>org.gatein.mop.core.api.workspace.UserSite</value> - <value>org.gatein.mop.core.api.workspace.content.CustomizationContainer</value> - <value>org.gatein.mop.core.api.workspace.content.ContextTypeContainer</value> - <value>org.gatein.mop.core.api.workspace.content.ContextType</value> - <value>org.gatein.mop.core.api.workspace.content.ContextSpecialization</value> - <value>org.gatein.mop.core.api.workspace.content.WorkspaceClone</value> - <value>org.gatein.mop.core.api.workspace.content.WorkspaceSpecialization</value> - <value>org.exoplatform.portal.pom.spi.portlet.PortletState</value> - <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> - </values-param> - </init-params> - </component-plugin> - </external-component-plugins> + <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.portal.pom.config.MOPChromatticLifeCycle</type> + <init-params> + <value-param> + <name>domain-name</name> + <value>mop</value> + </value-param> + <value-param> + <name>workspace-name</name> + <value>portal-test</value> + </value-param> + <values-param> + <name>entities</name> + <value>org.gatein.mop.core.api.workspace.WorkspaceImpl</value> + <value>org.gatein.mop.core.api.workspace.UIContainerImpl</value> + <value>org.gatein.mop.core.api.workspace.UIWindowImpl</value> + <value>org.gatein.mop.core.api.workspace.UIBodyImpl</value> + <value>org.gatein.mop.core.api.workspace.PageImpl</value> + <value>org.gatein.mop.core.api.workspace.PageContainer</value> + <value>org.gatein.mop.core.api.workspace.NavigationImpl</value> + <value>org.gatein.mop.core.api.workspace.NavigationContainer</value> + <value>org.gatein.mop.core.api.workspace.PageLinkImpl</value> + <value>org.gatein.mop.core.api.workspace.URLLinkImpl</value> + <value>org.gatein.mop.core.api.workspace.PortalSiteContainer</value> + <value>org.gatein.mop.core.api.workspace.PortalSite</value> + <value>org.gatein.mop.core.api.workspace.GroupSiteContainer</value> + <value>org.gatein.mop.core.api.workspace.GroupSite</value> + <value>org.gatein.mop.core.api.workspace.UserSiteContainer</value> + <value>org.gatein.mop.core.api.workspace.UserSite</value> + <value>org.gatein.mop.core.api.workspace.content.CustomizationContainer</value> + <value>org.gatein.mop.core.api.workspace.content.ContextTypeContainer</value> + <value>org.gatein.mop.core.api.workspace.content.ContextType</value> + <value>org.gatein.mop.core.api.workspace.content.ContextSpecialization</value> + <value>org.gatein.mop.core.api.workspace.content.WorkspaceClone</value> + <value>org.gatein.mop.core.api.workspace.content.WorkspaceSpecialization</value> + <value>org.exoplatform.portal.pom.spi.portlet.PortletState</value> + <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> + </values-param> + </init-params> + </component-plugin> + </external-component-plugins> - <external-component-plugins> - <target-component>org.exoplatform.services.organization.OrganizationService</target-component> - <component-plugin> - <name>new.user.event.listener</name> - <set-method>addListenerPlugin</set-method> - <type>org.exoplatform.services.organization.impl.NewUserEventListener</type> - <description>this listener assign group and membership to a new created user</description> - <init-params> - <object-param> - <name>configuration</name> - <description>description</description> - <object type="org.exoplatform.services.organization.impl.NewUserConfig"> - <field name="group"> - <collection type="java.util.ArrayList"> - <value> - <object type="org.exoplatform.services.organization.impl.NewUserConfig$JoinGroup"> - <field name="groupId"><string>/platform/users</string></field> - <field name="membership"><string>member</string></field> - </object> - </value> - </collection> - </field> - <field name="ignoredUser"> - <collection type="java.util.HashSet"> - <value><string>root</string></value> - <value><string>john</string></value> - <value><string>mary</string></value> - <value><string>demo</string></value> - </collection> - </field> - </object> - </object-param> - </init-params> - </component-plugin> - <component-plugin> - <name>user.portal.config.listener</name> - <set-method>addListenerPlugin</set-method> - <type>org.exoplatform.portal.config.UserPortalConfigListener</type> - </component-plugin> - <component-plugin> - <name>group.portal.config.listener</name> - <set-method>addListenerPlugin</set-method> - <type>org.exoplatform.portal.config.GroupPortalConfigListener</type> - </component-plugin> - </external-component-plugins> + <external-component-plugins> + <target-component>org.exoplatform.services.organization.OrganizationService</target-component> + <component-plugin> + <name>new.user.event.listener</name> + <set-method>addListenerPlugin</set-method> + <type>org.exoplatform.services.organization.impl.NewUserEventListener</type> + <description>this listener assign group and membership to a new created user</description> + <init-params> + <object-param> + <name>configuration</name> + <description>description</description> + <object type="org.exoplatform.services.organization.impl.NewUserConfig"> + <field name="group"> + <collection type="java.util.ArrayList"> + <value> + <object type="org.exoplatform.services.organization.impl.NewUserConfig$JoinGroup"> + <field name="groupId"> + <string>/platform/users</string> + </field> + <field name="membership"> + <string>member</string> + </field> + </object> + </value> + </collection> + </field> + <field name="ignoredUser"> + <collection type="java.util.HashSet"> + <value> + <string>root</string> + </value> + <value> + <string>john</string> + </value> + <value> + <string>mary</string> + </value> + <value> + <string>demo</string> + </value> + </collection> + </field> + </object> + </object-param> + </init-params> + </component-plugin> + <component-plugin> + <name>user.portal.config.listener</name> + <set-method>addListenerPlugin</set-method> + <type>org.exoplatform.portal.config.UserPortalConfigListener</type> + </component-plugin> + <component-plugin> + <name>group.portal.config.listener</name> + <set-method>addListenerPlugin</set-method> + <type>org.exoplatform.portal.config.GroupPortalConfigListener</type> + </component-plugin> + </external-component-plugins> </configuration> Modified: portal/branches/wsrp-integration/component/portal/src/test/java/org/exoplatform/portal/config/AbstractPortalTest.java =================================================================== --- portal/branches/wsrp-integration/component/portal/src/test/java/org/exoplatform/portal/config/AbstractPortalTest.java 2009-12-20 10:23:34 UTC (rev 1078) +++ portal/branches/wsrp-integration/component/portal/src/test/java/org/exoplatform/portal/config/AbstractPortalTest.java 2009-12-20 15:05:20 UTC (rev 1079) @@ -57,7 +57,7 @@ { PortalContainer container = getContainer(); ChromatticManager manager = (ChromatticManager)container.getComponentInstanceOfType(ChromatticManager.class); - manager.getSynchronization().setSave(save); + manager.getSynchronization().setSaveOnClose(save); super.end(); } Modified: portal/branches/wsrp-integration/component/portal/src/test/java/org/exoplatform/portal/config/TestDataStorage.java =================================================================== --- portal/branches/wsrp-integration/component/portal/src/test/java/org/exoplatform/portal/config/TestDataStorage.java 2009-12-20 10:23:34 UTC (rev 1078) +++ portal/branches/wsrp-integration/component/portal/src/test/java/org/exoplatform/portal/config/TestDataStorage.java 2009-12-20 15:05:20 UTC (rev 1079) @@ -1,16 +1,16 @@ /** * 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 @@ -19,8 +19,6 @@ package org.exoplatform.portal.config; -import static org.exoplatform.portal.pom.config.Utils.split; - import org.exoplatform.container.PortalContainer; import org.exoplatform.portal.application.PortletPreferences; import org.exoplatform.portal.application.Preference; @@ -29,14 +27,14 @@ import org.exoplatform.portal.config.model.ApplicationType; import org.exoplatform.portal.config.model.Container; import org.exoplatform.portal.config.model.Dashboard; -import org.exoplatform.portal.config.model.PageNode; -import org.exoplatform.portal.pom.config.POMSession; -import org.exoplatform.portal.pom.data.ModelChange; import org.exoplatform.portal.config.model.Page; import org.exoplatform.portal.config.model.PageNavigation; +import org.exoplatform.portal.config.model.PageNode; import org.exoplatform.portal.config.model.PortalConfig; import org.exoplatform.portal.config.model.TransientApplicationState; +import org.exoplatform.portal.pom.config.POMSession; import org.exoplatform.portal.pom.config.POMSessionManager; +import org.exoplatform.portal.pom.data.ModelChange; import org.exoplatform.portal.pom.spi.gadget.Gadget; import org.exoplatform.portal.pom.spi.portlet.Portlet; import org.exoplatform.portal.pom.spi.portlet.PortletBuilder; @@ -45,10 +43,9 @@ import java.util.Collections; import java.util.List; -/** - * Created by The eXo Platform SARL Author : Tung Pham thanhtungty(a)gmail.com Nov - * 13, 2007 - */ +import static org.exoplatform.portal.pom.config.Utils.split; + +/** Created by The eXo Platform SARL Author : Tung Pham thanhtungty(a)gmail.com Nov 13, 2007 */ public class TestDataStorage extends AbstractPortalTest { @@ -245,7 +242,7 @@ Application application = (Application)page.getChildren().remove(0); container.getChildren().add(application); page.getChildren().add(container); - + // storage_.save(page); @@ -463,7 +460,7 @@ assertEquals("web/BannerPortlet", storage_.getId(banner1.getState())); // Check state - Portlet pagePrefs = storage_.load(instanceId); + Portlet pagePrefs = storage_.load(instanceId, ApplicationType.PORTLET); assertEquals(new PortletBuilder().add("template", "par:/groovy/groovy/webui/component/UIBannerPortlet.gtmpl") .build(), pagePrefs); @@ -488,7 +485,7 @@ storage_.save(sitePrefs); // Check that page prefs have not changed - pagePrefs = storage_.load(instanceId); + pagePrefs = storage_.load(instanceId, ApplicationType.PORTLET); assertEquals(new PortletBuilder().add("template", "par:/groovy/groovy/webui/component/UIBannerPortlet.gtmpl") .build(), pagePrefs); @@ -497,7 +494,7 @@ storage_.save(instanceId, pagePrefs); // Check that page prefs have changed - pagePrefs = storage_.load(instanceId); + pagePrefs = storage_.load(instanceId, ApplicationType.PORTLET); assertEquals(new PortletBuilder().add("template", "foo").build(), pagePrefs); // Check that site prefs have not changed Modified: portal/branches/wsrp-integration/component/portal/src/test/java/org/exoplatform/portal/config/TestGadget.java =================================================================== --- portal/branches/wsrp-integration/component/portal/src/test/java/org/exoplatform/portal/config/TestGadget.java 2009-12-20 10:23:34 UTC (rev 1078) +++ portal/branches/wsrp-integration/component/portal/src/test/java/org/exoplatform/portal/config/TestGadget.java 2009-12-20 15:05:20 UTC (rev 1079) @@ -1,16 +1,16 @@ /** * 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 @@ -21,6 +21,7 @@ import org.exoplatform.container.PortalContainer; import org.exoplatform.portal.config.model.Application; +import org.exoplatform.portal.config.model.ApplicationType; import org.exoplatform.portal.config.model.Page; import org.exoplatform.portal.config.model.TransientApplicationState; import org.exoplatform.portal.pom.config.POMSession; @@ -77,7 +78,7 @@ container = storage_.getPage("portal::test::gadget_page"); gadgetApplication = (Application<Gadget>)container.getChildren().get(0); - gadget = storage_.load(gadgetApplication.getState()); + gadget = storage_.load(gadgetApplication.getState(), ApplicationType.GADGET); assertNotNull(gadget); assertEquals("user_pref", gadget.getUserPref()); } Modified: portal/branches/wsrp-integration/component/portal/src/test/java/org/exoplatform/portal/config/TestPortletPreferences.java =================================================================== --- portal/branches/wsrp-integration/component/portal/src/test/java/org/exoplatform/portal/config/TestPortletPreferences.java 2009-12-20 10:23:34 UTC (rev 1078) +++ portal/branches/wsrp-integration/component/portal/src/test/java/org/exoplatform/portal/config/TestPortletPreferences.java 2009-12-20 15:05:20 UTC (rev 1079) @@ -1,16 +1,16 @@ /** * 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 @@ -21,13 +21,13 @@ import org.exoplatform.container.PortalContainer; import org.exoplatform.portal.config.model.Application; +import org.exoplatform.portal.config.model.ApplicationType; import org.exoplatform.portal.config.model.Page; import org.exoplatform.portal.config.model.PersistentApplicationState; import org.exoplatform.portal.pom.config.POMSession; import org.exoplatform.portal.pom.config.POMSessionManager; import org.exoplatform.portal.pom.spi.portlet.Portlet; import org.exoplatform.portal.pom.spi.portlet.PortletBuilder; -import org.exoplatform.test.BasicTestCase; /** * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> @@ -74,7 +74,7 @@ PersistentApplicationState<Portlet> state = (PersistentApplicationState)app.getState(); // - Portlet prefs = storage_.load(state); + Portlet prefs = storage_.load(state, ApplicationType.PORTLET); assertEquals(new PortletBuilder().add("template", "par:/groovy/groovy/webui/component/UIBannerPortlet.gtmpl") .build(), prefs); @@ -83,7 +83,7 @@ storage_.save(state, prefs); // - prefs = storage_.load(state); + prefs = storage_.load(state, ApplicationType.PORTLET); assertNotNull(prefs); assertEquals(new PortletBuilder().add("template", "someanothervalue").build(), prefs); } Modified: portal/branches/wsrp-integration/component/portal/src/test/java/org/exoplatform/portal/config/TestUserPortalConfigService.java =================================================================== --- portal/branches/wsrp-integration/component/portal/src/test/java/org/exoplatform/portal/config/TestUserPortalConfigService.java 2009-12-20 10:23:34 UTC (rev 1078) +++ portal/branches/wsrp-integration/component/portal/src/test/java/org/exoplatform/portal/config/TestUserPortalConfigService.java 2009-12-20 15:05:20 UTC (rev 1079) @@ -1,16 +1,16 @@ /** * 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 @@ -20,7 +20,6 @@ package org.exoplatform.portal.config; import junit.framework.AssertionFailedError; - import org.exoplatform.container.PortalContainer; import org.exoplatform.portal.application.PortletPreferences; import org.exoplatform.portal.config.model.Application; @@ -54,7 +53,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import java.util.concurrent.CountDownLatch; /** * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> @@ -666,7 +664,7 @@ // Application<Portlet> app = (Application<Portlet>)clone.getChildren().get(0); - Portlet prefs2 = storage_.load(app.getState()); + Portlet prefs2 = storage_.load(app.getState(), ApplicationType.PORTLET); assertEquals(new PortletBuilder().add("template", "par:/groovy/groovy/webui/component/UIBannerPortlet.gtmpl").build(), prefs2); @@ -676,7 +674,7 @@ storage_.save(prefs); // - prefs2 = storage_.load(app.getState()); + prefs2 = storage_.load(app.getState(), ApplicationType.PORTLET); assertEquals(new PortletBuilder().add("template", "par:/groovy/groovy/webui/component/UIBannerPortlet.gtmpl").build(), prefs2); } @@ -704,7 +702,7 @@ assertEquals("dashboard/DashboardPortlet", storage_.getId(app.getState())); // assertEquals("portal", app.getInstanceState().getOwnerType()); // assertEquals("test", app.getInstanceState().getOwnerId()); - Portlet prefs2 = storage_.load(app.getState()); + Portlet prefs2 = storage_.load(app.getState(), ApplicationType.PORTLET); assertNull(prefs2); } }.execute(null); Modified: portal/branches/wsrp-integration/component/portal/src/test/java/org/exoplatform/portal/config/TestWSRP.java =================================================================== --- portal/branches/wsrp-integration/component/portal/src/test/java/org/exoplatform/portal/config/TestWSRP.java 2009-12-20 10:23:34 UTC (rev 1078) +++ portal/branches/wsrp-integration/component/portal/src/test/java/org/exoplatform/portal/config/TestWSRP.java 2009-12-20 15:05:20 UTC (rev 1079) @@ -21,12 +21,12 @@ import org.exoplatform.container.PortalContainer; import org.exoplatform.portal.config.model.Application; +import org.exoplatform.portal.config.model.ApplicationType; import org.exoplatform.portal.config.model.Page; import org.exoplatform.portal.config.model.TransientApplicationState; import org.exoplatform.portal.pom.config.POMSession; import org.exoplatform.portal.pom.config.POMSessionManager; import org.exoplatform.portal.pom.spi.wsrp.WSRP; -import org.exoplatform.test.BasicTestCase; /** * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> @@ -80,7 +80,7 @@ container = storage_.getPage(pageId); wsrpApplication = (Application<WSRP>)container.getChildren().get(0); - wsrp = storage_.load(wsrpApplication.getState()); + wsrp = storage_.load(wsrpApplication.getState(), ApplicationType.WSRP_PORTLET); assertNotNull(wsrp); assertEquals(id, wsrp.getPortletId()); } Modified: portal/branches/wsrp-integration/component/resources/pom.xml =================================================================== --- portal/branches/wsrp-integration/component/resources/pom.xml 2009-12-20 10:23:34 UTC (rev 1078) +++ portal/branches/wsrp-integration/component/resources/pom.xml 2009-12-20 15:05:20 UTC (rev 1079) @@ -19,76 +19,71 @@ --> -<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"> - <parent> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component</artifactId> - <version>3.0.0-Beta04-SNAPSHOT</version> - </parent> +<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"> + <parent> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component</artifactId> + <version>3.0.0-Beta04-SNAPSHOT</version> + </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>exo.portal.component.resources</artifactId> - <packaging>jar</packaging> - <name>GateIn Portal Component Resources</name> - <description>resources data service...</description> + <modelVersion>4.0.0</modelVersion> + <artifactId>exo.portal.component.resources</artifactId> + <packaging>jar</packaging> + <name>GateIn Portal Component Resources</name> + <description>resources data service...</description> - <dependencies> - <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.commons</artifactId> - </dependency> + <dependencies> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.commons</artifactId> + </dependency> - <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.component.common</artifactId> - </dependency> - - <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.component.command</artifactId> - </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.component.common</artifactId> + </dependency> - <dependency> - <groupId>org.exoplatform.core</groupId> - <artifactId>exo.core.component.database</artifactId> - <version>${org.exoplatform.core.version}</version> - </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.component.command</artifactId> + </dependency> - <dependency> - <groupId>org.exoplatform.core</groupId> - <artifactId>exo.core.component.security.core</artifactId> - <version>${org.exoplatform.core.version}</version> - </dependency> + <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.database</artifactId> + </dependency> - <dependency> - <groupId>org.exoplatform.core</groupId> - <artifactId>exo.core.component.document</artifactId> - <version>${org.exoplatform.core.version}</version> - </dependency> + <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.security.core</artifactId> + </dependency> - <dependency> - <groupId>org.exoplatform.jcr</groupId> - <artifactId>exo.jcr.component.core</artifactId> - <version>${org.exoplatform.jcr.version}</version> - </dependency> + <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.document</artifactId> + </dependency> - <dependency> - <groupId>org.exoplatform.jcr</groupId> - <artifactId>exo.jcr.component.ext</artifactId> - <version>${org.exoplatform.jcr.version}</version> - </dependency> + <dependency> + <groupId>org.exoplatform.jcr</groupId> + <artifactId>exo.jcr.component.core</artifactId> + </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.common</artifactId> - <version>3.0.0-Beta04-SNAPSHOT</version> - </dependency> + <dependency> + <groupId>org.exoplatform.jcr</groupId> + <artifactId>exo.jcr.component.ext</artifactId> + </dependency> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.1</version> - <scope>test</scope> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.common</artifactId> + <version>3.0.0-Beta04-SNAPSHOT</version> </dependency> - </dependencies> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + </dependencies> </project> Modified: portal/branches/wsrp-integration/component/scripting/pom.xml =================================================================== --- portal/branches/wsrp-integration/component/scripting/pom.xml 2009-12-20 10:23:34 UTC (rev 1078) +++ portal/branches/wsrp-integration/component/scripting/pom.xml 2009-12-20 15:05:20 UTC (rev 1079) @@ -19,46 +19,45 @@ --> -<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"> - <parent> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component</artifactId> - <version>3.0.0-Beta04-SNAPSHOT</version> - </parent> - - <modelVersion>4.0.0</modelVersion> - <artifactId>exo.portal.component.scripting</artifactId> - <packaging>jar</packaging> - <name>GateIn Portal Component Scripting</name> - - <dependencies> - <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.component.cache</artifactId> - </dependency> - - <dependency> +<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"> + <parent> <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.common</artifactId> + <artifactId>exo.portal.component</artifactId> <version>3.0.0-Beta04-SNAPSHOT</version> - </dependency> + </parent> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.xml-parser</artifactId> - <version>3.0.0-Beta04-SNAPSHOT</version> - </dependency> + <modelVersion>4.0.0</modelVersion> + <artifactId>exo.portal.component.scripting</artifactId> + <packaging>jar</packaging> + <name>GateIn Portal Component Scripting</name> - <dependency> - <groupId>rhino</groupId> - <artifactId>js</artifactId> - <version>${rhino.version}</version> - </dependency> + <dependencies> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.component.cache</artifactId> + </dependency> - <dependency> - <groupId>org.codehaus.groovy</groupId> - <artifactId>groovy-all</artifactId> - <version>${org.codehaus.groovy.version}</version> - </dependency> - </dependencies> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.common</artifactId> + <version>3.0.0-Beta04-SNAPSHOT</version> + </dependency> + + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.xml-parser</artifactId> + <version>3.0.0-Beta04-SNAPSHOT</version> + </dependency> + + <dependency> + <groupId>rhino</groupId> + <artifactId>js</artifactId> + </dependency> + + <dependency> + <groupId>org.codehaus.groovy</groupId> + <artifactId>groovy-all</artifactId> + </dependency> + </dependencies> </project> Modified: portal/branches/wsrp-integration/component/test/core/pom.xml =================================================================== --- portal/branches/wsrp-integration/component/test/core/pom.xml 2009-12-20 10:23:34 UTC (rev 1078) +++ portal/branches/wsrp-integration/component/test/core/pom.xml 2009-12-20 15:05:20 UTC (rev 1079) @@ -17,68 +17,60 @@ ~ 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"> - <parent> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.test</artifactId> - <version>3.0.0-Beta04-SNAPSHOT</version> - </parent> + <parent> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.test</artifactId> + <version>3.0.0-Beta04-SNAPSHOT</version> + </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>exo.portal.component.test.core</artifactId> - <packaging>jar</packaging> - <name>GateIn Portal Component Core Test</name> + <modelVersion>4.0.0</modelVersion> + <artifactId>exo.portal.component.test.core</artifactId> + <packaging>jar</packaging> + <name>GateIn Portal Component Core Test</name> - <dependencies> + <dependencies> - <dependency> - <groupId>org.gatein.common</groupId> - <artifactId>common-logging</artifactId> - <version>${org.gatein.common.version}</version> - </dependency> + <dependency> + <groupId>org.gatein.common</groupId> + <artifactId>common-logging</artifactId> + </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.1</version> - </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> - <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.commons</artifactId> - </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.commons</artifactId> + </dependency> - <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.component.common</artifactId> - </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.component.common</artifactId> + </dependency> - <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.container</artifactId> - </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.container</artifactId> + </dependency> - <dependency> - <groupId>commons-dbcp</groupId> - <artifactId>commons-dbcp</artifactId> - <version>1.2.2</version> - <exclusions> - <exclusion> - <groupId>xerces</groupId> - <artifactId>xercesImpl</artifactId> - </exclusion> - </exclusions> - </dependency> + <dependency> + <groupId>commons-dbcp</groupId> + <artifactId>commons-dbcp</artifactId> + </dependency> - </dependencies> + </dependencies> - <build> - <resources> - <resource> - <directory>src/main/resources</directory> - </resource> - </resources> - </build> + <build> + <resources> + <resource> + <directory>src/main/resources</directory> + </resource> + </resources> + </build> </project> Modified: portal/branches/wsrp-integration/component/test/jcr/pom.xml =================================================================== --- portal/branches/wsrp-integration/component/test/jcr/pom.xml 2009-12-20 10:23:34 UTC (rev 1078) +++ portal/branches/wsrp-integration/component/test/jcr/pom.xml 2009-12-20 15:05:20 UTC (rev 1079) @@ -17,52 +17,50 @@ ~ 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"> - <parent> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.test</artifactId> - <version>3.0.0-Beta04-SNAPSHOT</version> - </parent> + <parent> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.test</artifactId> + <version>3.0.0-Beta04-SNAPSHOT</version> + </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>exo.portal.component.test.jcr</artifactId> - <packaging>jar</packaging> - <name>GateIn Portal Component Core Test JCR</name> + <modelVersion>4.0.0</modelVersion> + <artifactId>exo.portal.component.test.jcr</artifactId> + <packaging>jar</packaging> + <name>GateIn Portal Component Core Test JCR</name> - <dependencies> + <dependencies> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.test.core</artifactId> - <version>3.0.0-Beta04-SNAPSHOT</version> - </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.test.core</artifactId> + <version>3.0.0-Beta04-SNAPSHOT</version> + </dependency> - <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - <version>3.2.1</version> - </dependency> + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + </dependency> - <dependency> - <groupId>org.exoplatform.jcr</groupId> - <artifactId>exo.jcr.component.ext</artifactId> - <version>${org.exoplatform.jcr.version}</version> - </dependency> + <dependency> + <groupId>org.exoplatform.jcr</groupId> + <artifactId>exo.jcr.component.ext</artifactId> + </dependency> - <dependency> - <groupId>org.exoplatform.core</groupId> - <artifactId>exo.core.component.organization.jdbc</artifactId> - <version>${org.exoplatform.core.version}</version> - </dependency> - </dependencies> - - <build> - <resources> - <resource> - <directory>src/main/resources</directory> - </resource> - </resources> - </build> + <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.organization.jdbc</artifactId> + </dependency> + </dependencies> + <build> + <resources> + <resource> + <directory>src/main/resources</directory> + </resource> + </resources> + </build> + </project> Modified: portal/branches/wsrp-integration/component/test/organization/pom.xml =================================================================== --- portal/branches/wsrp-integration/component/test/organization/pom.xml 2009-12-20 10:23:34 UTC (rev 1078) +++ portal/branches/wsrp-integration/component/test/organization/pom.xml 2009-12-20 15:05:20 UTC (rev 1079) @@ -17,7 +17,8 @@ ~ 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"> <parent> <groupId>org.exoplatform.portal</groupId> @@ -37,7 +38,7 @@ <artifactId>exo.portal.component.test.core</artifactId> <version>3.0.0-Beta04-SNAPSHOT</version> </dependency> - + <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.identity</artifactId> @@ -47,11 +48,10 @@ <dependency> <groupId>commons-collections</groupId> <artifactId>commons-collections</artifactId> - <version>3.2.1</version> </dependency> </dependencies> - + <build> <resources> <resource> Modified: portal/branches/wsrp-integration/component/web/pom.xml =================================================================== --- portal/branches/wsrp-integration/component/web/pom.xml 2009-12-20 10:23:34 UTC (rev 1078) +++ portal/branches/wsrp-integration/component/web/pom.xml 2009-12-20 15:05:20 UTC (rev 1079) @@ -19,148 +19,78 @@ --> -<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"> - <parent> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component</artifactId> - <version>3.0.0-Beta04-SNAPSHOT</version> - </parent> +<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"> + <parent> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component</artifactId> + <version>3.0.0-Beta04-SNAPSHOT</version> + </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>exo.portal.component.web</artifactId> - <packaging>jar</packaging> - <name>GateIn Portal Component Web</name> + <modelVersion>4.0.0</modelVersion> + <artifactId>exo.portal.component.web</artifactId> + <packaging>jar</packaging> + <name>GateIn Portal Component Web</name> - <properties> - <maven.test.skip>true</maven.test.skip> - </properties> + <properties> + <maven.test.skip>true</maven.test.skip> + </properties> - <dependencies> - <dependency> - <groupId>org.exoplatform.core</groupId> - <artifactId>exo.core.component.organization.api</artifactId> - <version>${org.exoplatform.core.version}</version> - </dependency> - - <dependency> - <groupId>org.exoplatform.jcr</groupId> - <artifactId>exo.jcr.component.ext</artifactId> - <version>${org.exoplatform.jcr.version}</version> - </dependency> - - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.common</artifactId> - <version>3.0.0-Beta04-SNAPSHOT</version> - </dependency> + <dependencies> + <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.organization.api</artifactId> + </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.resources</artifactId> - <version>3.0.0-Beta04-SNAPSHOT</version> - </dependency> + <dependency> + <groupId>org.exoplatform.jcr</groupId> + <artifactId>exo.jcr.component.ext</artifactId> + </dependency> - <dependency> - <groupId>org.gatein.wci</groupId> - <artifactId>wci-wci</artifactId> - <version>${org.gatein.wci.version}</version> - </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.common</artifactId> + <version>3.0.0-Beta04-SNAPSHOT</version> + </dependency> - <dependency> - <groupId>org.gatein.pc</groupId> - <artifactId>pc-api</artifactId> - <version>${org.gatein.pc.version}</version> - <exclusions> - <exclusion> - <groupId>org.gatein.wci</groupId> - <artifactId>wci-wci</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.gatein.pc</groupId> - <artifactId>pc-portlet</artifactId> - <version>${org.gatein.pc.version}</version> - <exclusions> - <exclusion> - <groupId>org.gatein.wci</groupId> - <artifactId>wci-wci</artifactId> - </exclusion> - </exclusions> - </dependency> - <!-- just to get those deps into the repo --> - <dependency> - <groupId>org.gatein.pc</groupId> - <artifactId>pc-controller</artifactId> - <version>${org.gatein.pc.version}</version> - <exclusions> - <exclusion> - <groupId>org.gatein.wci</groupId> - <artifactId>wci-wci</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.gatein.pc</groupId> - <artifactId>pc-portal</artifactId> - <version>${org.gatein.pc.version}</version> - <exclusions> - <exclusion> - <groupId>org.gatein.wci</groupId> - <artifactId>wci-wci</artifactId> - </exclusion> - </exclusions> - </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.resources</artifactId> + <version>3.0.0-Beta04-SNAPSHOT</version> + </dependency> - <dependency> - <groupId>org.chromattic</groupId> - <artifactId>chromattic.apt</artifactId> - <version>${version.chromattic}</version> - <scope>compile</scope> - </dependency> + <dependency> + <groupId>org.gatein.wci</groupId> + <artifactId>wci-wci</artifactId> + </dependency> - <dependency> - <groupId>org.gatein.pc</groupId> - <artifactId>pc-federation</artifactId> - <version>${org.gatein.pc.version}</version> - </dependency> - <dependency> - <groupId>org.gatein.pc</groupId> - <artifactId>pc-mc</artifactId> - <version>${org.gatein.pc.version}</version> - <exclusions> - <exclusion> - <groupId>org.gatein.wci</groupId> - <artifactId>wci-wci</artifactId> - </exclusion> - </exclusions> - </dependency> + <dependency> + <groupId>org.chromattic</groupId> + <artifactId>chromattic.apt</artifactId> + <scope>compile</scope> + </dependency> - <!-- end --> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.scripting</artifactId> - <version>3.0.0-Beta04-SNAPSHOT</version> - </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.scripting</artifactId> + <version>3.0.0-Beta04-SNAPSHOT</version> + </dependency> - <dependency> - <groupId>org.apache.shindig</groupId> - <artifactId>shindig-gadgets</artifactId> - <version>${org.shindig.version}</version> - </dependency> + <dependency> + <groupId>org.apache.shindig</groupId> + <artifactId>shindig-gadgets</artifactId> + </dependency> - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - <version>1.4</version> - <type>jar</type> - </dependency> - - <dependency> - <groupId>org.json</groupId> - <artifactId>json</artifactId> - <version>20070829</version> - <type>jar</type> - </dependency> - </dependencies> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <type>jar</type> + </dependency> + + <dependency> + <groupId>org.json</groupId> + <artifactId>json</artifactId> + <type>jar</type> + </dependency> + </dependencies> </project> Modified: portal/branches/wsrp-integration/component/wsrp/pom.xml =================================================================== --- portal/branches/wsrp-integration/component/wsrp/pom.xml 2009-12-20 10:23:34 UTC (rev 1078) +++ portal/branches/wsrp-integration/component/wsrp/pom.xml 2009-12-20 15:05:20 UTC (rev 1079) @@ -40,44 +40,27 @@ <dependency> <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp-producer-lib</artifactId> - <version>${org.gatein.wsrp.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp-consumer</artifactId> - <version>${org.gatein.wsrp.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp-integration-api</artifactId> - <version>${org.gatein.wsrp.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.gatein.pc</groupId> <artifactId>pc-api</artifactId> - <version>${org.gatein.pc.version}</version> <scope>provided</scope> - <exclusions> - <exclusion> - <groupId>org.gatein.wci</groupId> - <artifactId>wci-wci</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.gatein.pc</groupId> <artifactId>pc-portlet</artifactId> - <version>${org.gatein.pc.version}</version> <scope>provided</scope> - <exclusions> - <exclusion> - <groupId>org.gatein.wci</groupId> - <artifactId>wci-wci</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.exoplatform.kernel</groupId> @@ -90,7 +73,6 @@ <version>${project.version}</version> <scope>provided</scope> </dependency> - <dependency> <groupId>org.exoplatform.jcr</groupId> <artifactId>exo.jcr.component.ext</artifactId> @@ -99,8 +81,6 @@ <dependency> <groupId>org.chromattic</groupId> <artifactId>chromattic.api</artifactId> - <version>${version.chromattic}</version> - <scope>provided</scope> </dependency> <dependency> <groupId>org.chromattic</groupId> Modified: portal/branches/wsrp-integration/component/xml-parser/pom.xml =================================================================== --- portal/branches/wsrp-integration/component/xml-parser/pom.xml 2009-12-20 10:23:34 UTC (rev 1078) +++ portal/branches/wsrp-integration/component/xml-parser/pom.xml 2009-12-20 15:05:20 UTC (rev 1079) @@ -19,55 +19,55 @@ --> -<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"> - <parent> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component</artifactId> - <version>3.0.0-Beta04-SNAPSHOT</version> - </parent> +<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"> + <parent> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component</artifactId> + <version>3.0.0-Beta04-SNAPSHOT</version> + </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>exo.portal.component.xml-parser</artifactId> - <packaging>jar</packaging> - <name>GateIn Portal Component XML Parser</name> + <modelVersion>4.0.0</modelVersion> + <artifactId>exo.portal.component.xml-parser</artifactId> + <packaging>jar</packaging> + <name>GateIn Portal Component XML Parser</name> - <properties> - <maven.test.skip>true</maven.test.skip> - </properties> + <properties> + <maven.test.skip>true</maven.test.skip> + </properties> - <dependencies> - <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.component.common</artifactId> - </dependency> + <dependencies> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.component.common</artifactId> + </dependency> - <dependency> - <groupId>commons-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> - <version>3.0</version> - <scope>compile</scope> - </dependency> - </dependencies> - <build> - <testResources> - <testResource> - <directory>src/test/java</directory> - <includes> - <include>**/*.properties</include> - <include>**/*.xml</include> - <include>**/*.jstmpl</include> - <include>**/*.html</include> - </includes> - </testResource> - <testResource> - <directory>src/test/resources</directory> - <includes> - <include>**/*.properties</include> - <include>**/*.xml</include> - <include>**/*.jstmpl</include> - <include>**/*.html</include> - </includes> - </testResource> - </testResources> - </build> + <dependency> + <groupId>commons-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + <scope>compile</scope> + </dependency> + </dependencies> + <build> + <testResources> + <testResource> + <directory>src/test/java</directory> + <includes> + <include>**/*.properties</include> + <include>**/*.xml</include> + <include>**/*.jstmpl</include> + <include>**/*.html</include> + </includes> + </testResource> + <testResource> + <directory>src/test/resources</directory> + <includes> + <include>**/*.properties</include> + <include>**/*.xml</include> + <include>**/*.jstmpl</include> + <include>**/*.html</include> + </includes> + </testResource> + </testResources> + </build> </project> Modified: portal/branches/wsrp-integration/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/jcr/repository-configuration.xml =================================================================== --- portal/branches/wsrp-integration/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/jcr/repository-configuration.xml 2009-12-20 10:23:34 UTC (rev 1078) +++ portal/branches/wsrp-integration/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/jcr/repository-configuration.xml 2009-12-20 15:05:20 UTC (rev 1079) @@ -20,61 +20,66 @@ --> <repository-service default-repository="repository"> - <repositories> - <repository name="repository" system-workspace="system" default-workspace="portal-system"> - <security-domain>gatein-domain</security-domain> - <access-control>optional</access-control> - <authentication-policy>org.exoplatform.services.jcr.impl.core.access.JAASAuthenticator</authentication-policy> - <workspaces> - <workspace name="sample-ws"> - <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> - <properties> - <property name="source-name" value="jdbcexo${container.name.suffix}" /> - <property name="dialect" value="hsqldb" /> - <property name="multi-db" value="false" /> - <property name="update-storage" value="true" /> - <property name="max-buffer-size" value="204800" /> - <property name="swap-directory" value="../temp/swap/sample-ws${container.name.suffix}" /> - </properties> - <value-storages> - <value-storage id="sample-ws" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> - <properties> - <property name="path" value="../temp/values/sample-ws${container.name.suffix}" /> - </properties> - <filters> - <filter property-type="Binary" /> - </filters> - </value-storage> - </value-storages> - </container> - <initializer class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer"> - <properties> - <property name="root-nodetype" value="nt:unstructured" /> - <property name="root-permissions" - value="any read;*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove" /> - </properties> - </initializer> - <cache enabled="true"> - <properties> - <property name="max-size" value="20000" /> - <property name="live-time" value="30000" /> - </properties> - </cache> - <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> - <properties> - <property name="index-dir" value="../temp/jcrlucenedb/sample-ws${container.name.suffix}" /> - </properties> - </query-handler> - <lock-manager> - <time-out>15m</time-out><!-- 15min --> - <persister class="org.exoplatform.services.jcr.impl.core.lock.FileSystemLockPersister"> - <properties> - <property name="path" value="../temp/lock/sample-ws${container.name.suffix}" /> - </properties> - </persister> - </lock-manager> - </workspace> - </workspaces> - </repository> - </repositories> + <repositories> + <repository name="repository" system-workspace="system" default-workspace="portal-system"> + <security-domain>gatein-domain</security-domain> + <access-control>optional</access-control> + <authentication-policy>org.exoplatform.services.jcr.impl.core.access.JAASAuthenticator</authentication-policy> + <workspaces> + <workspace name="sample-ws"> + <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> + <properties> + <property name="source-name" value="jdbcexo${container.name.suffix}"/> + <property name="dialect" value="hsqldb"/> + <property name="multi-db" value="false"/> + <property name="update-storage" value="true"/> + <property name="max-buffer-size" value="204800"/> + <property name="swap-directory" + value="${gatein.jcr.data.dir}/swap/sample-ws${container.name.suffix}"/> + </properties> + <value-storages> + <value-storage id="sample-ws" + class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> + <properties> + <property name="path" + value="${gatein.jcr.data.dir}/values/sample-ws${container.name.suffix}"/> + </properties> + <filters> + <filter property-type="Binary"/> + </filters> + </value-storage> + </value-storages> + </container> + <initializer class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer"> + <properties> + <property name="root-nodetype" value="nt:unstructured"/> + <property name="root-permissions" + value="any read;*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove"/> + </properties> + </initializer> + <cache enabled="true"> + <properties> + <property name="max-size" value="20000"/> + <property name="live-time" value="30000"/> + </properties> + </cache> + <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> + <properties> + <property name="index-dir" + value="${gatein.jcr.data.dir}/jcrlucenedb/sample-ws${container.name.suffix}"/> + </properties> + </query-handler> + <lock-manager> + <time-out>15m</time-out> + <!-- 15min --> + <persister class="org.exoplatform.services.jcr.impl.core.lock.FileSystemLockPersister"> + <properties> + <property name="path" value="${gatein.jcr.data.dir}/lock/sample-ws${container.name.suffix}"/> + </properties> + </persister> + </lock-manager> + </workspace> + </workspaces> + </repository> + </repositories> </repository-service> Modified: portal/branches/wsrp-integration/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/jcr/repository-configuration.xml =================================================================== --- portal/branches/wsrp-integration/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/jcr/repository-configuration.xml 2009-12-20 10:23:34 UTC (rev 1078) +++ portal/branches/wsrp-integration/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/jcr/repository-configuration.xml 2009-12-20 15:05:20 UTC (rev 1079) @@ -20,61 +20,66 @@ --> <repository-service default-repository="repository"> - <repositories> - <repository name="repository" system-workspace="system" default-workspace="portal-system"> - <security-domain>gatein-domain</security-domain> - <access-control>optional</access-control> - <authentication-policy>org.exoplatform.services.jcr.impl.core.access.JAASAuthenticator</authentication-policy> - <workspaces> - <workspace name="sample-ws"> - <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> - <properties> - <property name="source-name" value="jdbcexo${container.name.suffix}" /> - <property name="dialect" value="hsqldb" /> - <property name="multi-db" value="false" /> - <property name="update-storage" value="true" /> - <property name="max-buffer-size" value="204800" /> - <property name="swap-directory" value="../temp/swap/sample-ws${container.name.suffix}" /> - </properties> - <value-storages> - <value-storage id="sample-ws" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> - <properties> - <property name="path" value="../temp/values/sample-ws${container.name.suffix}" /> - </properties> - <filters> - <filter property-type="Binary" /> - </filters> - </value-storage> - </value-storages> - </container> - <initializer class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer"> - <properties> - <property name="root-nodetype" value="nt:unstructured" /> - <property name="root-permissions" - value="any read;*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove" /> - </properties> - </initializer> - <cache enabled="true"> - <properties> - <property name="max-size" value="20000" /> - <property name="live-time" value="30000" /> - </properties> - </cache> - <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> - <properties> - <property name="index-dir" value="../temp/jcrlucenedb/sample-ws${container.name.suffix}" /> - </properties> - </query-handler> - <lock-manager> - <time-out>15m</time-out><!-- 15min --> - <persister class="org.exoplatform.services.jcr.impl.core.lock.FileSystemLockPersister"> - <properties> - <property name="path" value="../temp/lock/sample-ws${container.name.suffix}" /> - </properties> - </persister> - </lock-manager> - </workspace> - </workspaces> - </repository> - </repositories> + <repositories> + <repository name="repository" system-workspace="system" default-workspace="portal-system"> + <security-domain>gatein-domain</security-domain> + <access-control>optional</access-control> + <authentication-policy>org.exoplatform.services.jcr.impl.core.access.JAASAuthenticator</authentication-policy> + <workspaces> + <workspace name="sample-ws"> + <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> + <properties> + <property name="source-name" value="jdbcexo${container.name.suffix}"/> + <property name="dialect" value="hsqldb"/> + <property name="multi-db" value="false"/> + <property name="update-storage" value="true"/> + <property name="max-buffer-size" value="204800"/> + <property name="swap-directory" + value="${gatein.jcr.data.dir}/swap/sample-ws${container.name.suffix}"/> + </properties> + <value-storages> + <value-storage id="sample-ws" + class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> + <properties> + <property name="path" + value="${gatein.jcr.data.dir}/values/sample-ws${container.name.suffix}"/> + </properties> + <filters> + <filter property-type="Binary"/> + </filters> + </value-storage> + </value-storages> + </container> + <initializer class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer"> + <properties> + <property name="root-nodetype" value="nt:unstructured"/> + <property name="root-permissions" + value="any read;*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove"/> + </properties> + </initializer> + <cache enabled="true"> + <properties> + <property name="max-size" value="20000"/> + <property name="live-time" value="30000"/> + </properties> + </cache> + <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> + <properties> + <property name="index-dir" + value="${gatein.jcr.data.dir}/jcrlucenedb/sample-ws${container.name.suffix}"/> + </properties> + </query-handler> + <lock-manager> + <time-out>15m</time-out> + <!-- 15min --> + <persister class="org.exoplatform.services.jcr.impl.core.lock.FileSystemLockPersister"> + <properties> + <property name="path" value="${gatein.jcr.data.dir}/lock/sample-ws${container.name.suffix}"/> + </properties> + </persister> + </lock-manager> + </workspace> + </workspaces> + </repository> + </repositories> </repository-service> Modified: portal/branches/wsrp-integration/examples/portlets/jsfhellouser/pom.xml =================================================================== --- portal/branches/wsrp-integration/examples/portlets/jsfhellouser/pom.xml 2009-12-20 10:23:34 UTC (rev 1078) +++ portal/branches/wsrp-integration/examples/portlets/jsfhellouser/pom.xml 2009-12-20 15:05:20 UTC (rev 1079) @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<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> <!-- @@ -15,7 +16,7 @@ <artifactId>gatein-jsf-hellouser</artifactId> <packaging>war</packaging> <name>GateIn Portal Examples - JSF Hello User Portlet</name> - <description /> + <description/> <build> <plugins> @@ -34,20 +35,17 @@ <dependency> <groupId>javax.portlet</groupId> <artifactId>portlet-api</artifactId> - <version>2.0</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.jboss.portletbridge</groupId> <artifactId>portletbridge-api</artifactId> - <version>2.0.0.BETA</version> </dependency> <dependency> <groupId>org.jboss.portletbridge</groupId> <artifactId>portletbridge-impl</artifactId> - <version>2.0.0.BETA</version> </dependency> </dependencies> Modified: portal/branches/wsrp-integration/examples/portlets/jsphellouser/pom.xml =================================================================== --- portal/branches/wsrp-integration/examples/portlets/jsphellouser/pom.xml 2009-12-20 10:23:34 UTC (rev 1078) +++ portal/branches/wsrp-integration/examples/portlets/jsphellouser/pom.xml 2009-12-20 15:05:20 UTC (rev 1079) @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<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> <!-- @@ -33,7 +34,6 @@ <dependency> <groupId>javax.portlet</groupId> <artifactId>portlet-api</artifactId> - <version>2.0</version> <scope>provided</scope> </dependency> </dependencies> Modified: portal/branches/wsrp-integration/examples/portlets/simplesthelloworld/pom.xml =================================================================== --- portal/branches/wsrp-integration/examples/portlets/simplesthelloworld/pom.xml 2009-12-20 10:23:34 UTC (rev 1078) +++ portal/branches/wsrp-integration/examples/portlets/simplesthelloworld/pom.xml 2009-12-20 15:05:20 UTC (rev 1079) @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<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> <!-- @@ -15,7 +16,7 @@ <artifactId>gatein-simplest-helloworld</artifactId> <packaging>war</packaging> <name>GateIn Portal Examples - Simplest Hello World Portlet</name> - <description /> + <description/> <build> <plugins> @@ -34,7 +35,6 @@ <dependency> <groupId>javax.portlet</groupId> <artifactId>portlet-api</artifactId> - <version>2.0</version> <scope>provided</scope> </dependency> </dependencies> Modified: portal/branches/wsrp-integration/gadgets/core/pom.xml =================================================================== --- portal/branches/wsrp-integration/gadgets/core/pom.xml 2009-12-20 10:23:34 UTC (rev 1078) +++ portal/branches/wsrp-integration/gadgets/core/pom.xml 2009-12-20 15:05:20 UTC (rev 1079) @@ -20,82 +20,75 @@ --> -<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> - <parent> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.gadgets</artifactId> - <version>3.0.0-Beta04-SNAPSHOT</version> - </parent> - - <artifactId>exo.portal.gadgets-core</artifactId> - <packaging>jar</packaging> - <name>GateIn Portal eXo Gadgets Core</name> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>unpack</id> - <phase>compile</phase> - <goals> - <goal>unpack</goal> - </goals> - <configuration> - <artifactItems> - <artifactItem> - <groupId>org.apache.shindig</groupId> - <artifactId>shindig-gadgets</artifactId> - <version>${org.shindig.version}</version> - <type>jar</type> - <overWrite>false</overWrite> - <outputDirectory>${project.build.directory}/classes</outputDirectory> - <excludes>config/oauth.json,containers/default/container.js</excludes> - </artifactItem> - </artifactItems> - </configuration> - </execution> - </executions> - </plugin> - - </plugins> - <resources> - <resource> - <directory>src/main/java</directory> - <includes> - <include>**/container.js</include> - <include>**/oauth.json</include> - <include>**/*.xml</include> - </includes> - </resource> - </resources> - </build> - <dependencies> - <!--dependency> - <groupId>com.google.code.guice</groupId> - <artifactId>guice</artifactId> - <version>1.0</version> - <type>jar</type> - </dependency--> - <dependency> +<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> + <parent> <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.web</artifactId> + <artifactId>exo.portal.gadgets</artifactId> <version>3.0.0-Beta04-SNAPSHOT</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.shindig</groupId> - <artifactId>shindig-common</artifactId> - <version>${org.shindig.version}</version> - <type>jar</type> - </dependency> - <dependency> - <groupId>org.apache.shindig</groupId> - <artifactId>shindig-features</artifactId> - <version>${org.shindig.version}</version> - <type>jar</type> - </dependency> - </dependencies> + </parent> + + <artifactId>exo.portal.gadgets-core</artifactId> + <packaging>jar</packaging> + <name>GateIn Portal eXo Gadgets Core</name> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>unpack</id> + <phase>compile</phase> + <goals> + <goal>unpack</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>org.apache.shindig</groupId> + <artifactId>shindig-gadgets</artifactId> + <version>${org.shindig.version}</version> + <type>jar</type> + <overWrite>false</overWrite> + <outputDirectory>${project.build.directory}/classes</outputDirectory> + <excludes>config/oauth.json,containers/default/container.js</excludes> + </artifactItem> + </artifactItems> + </configuration> + </execution> + </executions> + </plugin> + + </plugins> + <resources> + <resource> + <directory>src/main/java</directory> + <includes> + <include>**/container.js</include> + <include>**/oauth.json</include> + <include>**/*.xml</include> + </includes> + </resource> + </resources> + </build> + <dependencies> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.web</artifactId> + <version>3.0.0-Beta04-SNAPSHOT</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.shindig</groupId> + <artifactId>shindig-common</artifactId> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.apache.shindig</groupId> + <artifactId>shindig-features</artifactId> + <type>jar</type> + </dependency> + </dependencies> </project> Modified: portal/branches/wsrp-integration/gadgets/eXoGadgets/pom.xml =================================================================== --- portal/branches/wsrp-integration/gadgets/eXoGadgets/pom.xml 2009-12-20 10:23:34 UTC (rev 1078) +++ portal/branches/wsrp-integration/gadgets/eXoGadgets/pom.xml 2009-12-20 15:05:20 UTC (rev 1079) @@ -19,42 +19,42 @@ --> -<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"> - <parent> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.gadgets</artifactId> - <version>3.0.0-Beta04-SNAPSHOT</version> - </parent> +<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"> + <parent> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.gadgets</artifactId> + <version>3.0.0-Beta04-SNAPSHOT</version> + </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>exo.portal.eXoGadgets</artifactId> - <packaging>war</packaging> - <name>GateIn Portal eXo Gadgets Application</name> + <modelVersion>4.0.0</modelVersion> + <artifactId>exo.portal.eXoGadgets</artifactId> + <packaging>war</packaging> + <name>GateIn Portal eXo Gadgets Application</name> - <build> - <finalName>eXoGadgets</finalName> - </build> + <build> + <finalName>eXoGadgets</finalName> + </build> - <dependencies> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.web</artifactId> - <version>3.0.0-Beta04-SNAPSHOT</version> - <scope>provided</scope> - </dependency> + <dependencies> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.web</artifactId> + <version>3.0.0-Beta04-SNAPSHOT</version> + <scope>provided</scope> + </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.webui.portal</artifactId> - <version>3.0.0-Beta04-SNAPSHOT</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.shindig</groupId> - <version>${org.shindig.version}</version> - <artifactId>shindig-common</artifactId> - <scope>provided</scope> - </dependency> - - </dependencies> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.webui.portal</artifactId> + <version>3.0.0-Beta04-SNAPSHOT</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.shindig</groupId> + <artifactId>shindig-common</artifactId> + <scope>provided</scope> + </dependency> + + </dependencies> </project> Modified: portal/branches/wsrp-integration/gadgets/server/pom.xml =================================================================== --- portal/branches/wsrp-integration/gadgets/server/pom.xml 2009-12-20 10:23:34 UTC (rev 1078) +++ portal/branches/wsrp-integration/gadgets/server/pom.xml 2009-12-20 15:05:20 UTC (rev 1079) @@ -20,148 +20,125 @@ --> -<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> - <parent> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.gadgets</artifactId> - <version>3.0.0-Beta04-SNAPSHOT</version> - </parent> +<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> + <parent> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.gadgets</artifactId> + <version>3.0.0-Beta04-SNAPSHOT</version> + </parent> - <artifactId>exo.portal.gadgets-server</artifactId> - <packaging>war</packaging> - <name>GateIn Portal eXo Gadgets Server</name> + <artifactId>exo.portal.gadgets-server</artifactId> + <packaging>war</packaging> + <name>GateIn Portal eXo Gadgets Server</name> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-war-plugin</artifactId> - <!-- <version>2.0</version> --> - <configuration> - <dependentWarExcludes>gadgets/**</dependentWarExcludes> - <dependentWarExcludes>WEB-INF/web**</dependentWarExcludes> - </configuration> - </plugin> - </plugins> - </build> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-war-plugin</artifactId> + <configuration> + <dependentWarExcludes>gadgets/**</dependentWarExcludes> + <dependentWarExcludes>WEB-INF/web**</dependentWarExcludes> + </configuration> + </plugin> + </plugins> + </build> - <dependencies> - <!-- project dependencies --> - <dependency> - <groupId>org.apache.shindig</groupId> - <artifactId>shindig-server</artifactId> - <version>${org.shindig.version}</version> - <type>war</type> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.shindig</groupId> - <version>${org.shindig.version}</version> - <artifactId>shindig-features</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.shindig</groupId> - <version>${org.shindig.version}</version> - <artifactId>shindig-social-api</artifactId> - <scope>provided</scope> - </dependency> - <!-- external dependencies --> + <dependencies> + <!-- project dependencies --> + <dependency> + <groupId>org.apache.shindig</groupId> + <artifactId>shindig-server</artifactId> + <type>war</type> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.shindig</groupId> + <artifactId>shindig-features</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.shindig</groupId> + <artifactId>shindig-social-api</artifactId> + <scope>provided</scope> + </dependency> + <!-- external dependencies --> - <dependency> - <groupId>org.json</groupId> - <artifactId>json</artifactId> - <version>20070829</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>caja</groupId> - <artifactId>caja</artifactId> - <version>r3375</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>caja</groupId> - <artifactId>json_simple</artifactId> - <version>r1</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>net.oauth</groupId> - <artifactId>core</artifactId> - <version>20080621</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>com.google.collections</groupId> - <artifactId>google-collections</artifactId> - <version>1.0-rc2</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>com.google.code.guice</groupId> - <artifactId>guice</artifactId> - <version>2.0</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - <version>2.4</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>rome</groupId> - <artifactId>rome</artifactId> - <version>0.9</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>com.ibm.icu</groupId> - <artifactId>icu4j</artifactId> - <version>3.8</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>net.sourceforge.nekohtml</groupId> - <artifactId>nekohtml</artifactId> - <version>1.9.9</version> - <scope>provided</scope> - </dependency> + <dependency> + <groupId>org.json</groupId> + <artifactId>json</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>caja</groupId> + <artifactId>caja</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>caja</groupId> + <artifactId>json_simple</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>net.oauth</groupId> + <artifactId>core</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>com.google.collections</groupId> + <artifactId>google-collections</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>com.google.code.guice</groupId> + <artifactId>guice</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>rome</groupId> + <artifactId>rome</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>com.ibm.icu</groupId> + <artifactId>icu4j</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>net.sourceforge.nekohtml</groupId> + <artifactId>nekohtml</artifactId> + <scope>provided</scope> + </dependency> - <dependency> - <groupId>xerces</groupId> - <artifactId>xercesImpl</artifactId> - <version>2.9.1</version> - <scope>provided</scope> - </dependency> + <dependency> + <groupId>xerces</groupId> + <artifactId>xercesImpl</artifactId> + <scope>provided</scope> + </dependency> - <dependency> - <groupId>jaxen</groupId> - <artifactId>jaxen</artifactId> - <version>1.1.1</version> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>nu.validator.htmlparser</groupId> - <artifactId>htmlparser</artifactId> - <version>1.0.7</version> - <scope>provided</scope> - </dependency> + <dependency> + <groupId>jaxen</groupId> + <artifactId>jaxen</artifactId> + <scope>provided</scope> + </dependency> - <dependency> - <groupId>commons-digester</groupId> - <artifactId>commons-digester</artifactId> - <version>1.7</version> - <scope>provided</scope> - </dependency> - <!--dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - <version>1.4</version> - <type>jar</type> - </dependency--> - </dependencies> + <dependency> + <groupId>nu.validator.htmlparser</groupId> + <artifactId>htmlparser</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>commons-digester</groupId> + <artifactId>commons-digester</artifactId> + <scope>provided</scope> + </dependency> + </dependencies> </project> Modified: portal/branches/wsrp-integration/packaging/pkg/pom.xml =================================================================== --- portal/branches/wsrp-integration/packaging/pkg/pom.xml 2009-12-20 10:23:34 UTC (rev 1078) +++ portal/branches/wsrp-integration/packaging/pkg/pom.xml 2009-12-20 15:05:20 UTC (rev 1079) @@ -19,7 +19,8 @@ --> -<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"> <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.packaging</artifactId> @@ -30,14 +31,14 @@ <artifactId>exo.portal.packaging.assembly</artifactId> <packaging>pom</packaging> <name>GateIn Portal Packaging Assemblies</name> - + <dependencies> <dependency> <groupId>org.gatein.tools</groupId> <artifactId>packager</artifactId> <type>zip</type> - <version>1.0.0-Beta02</version> + <version>1.0.0-Beta04</version> </dependency> <dependency> @@ -45,48 +46,48 @@ <artifactId>kernel.packaging.module</artifactId> <version>${org.exoplatform.kernel.version}</version> <type>js</type> - </dependency> - <dependency> + </dependency> + <dependency> <groupId>org.exoplatform.core</groupId> <artifactId>core.packaging.module</artifactId> <version>${org.exoplatform.core.version}</version> <type>js</type> - </dependency> - <dependency> + </dependency> + <dependency> <groupId>org.exoplatform.ws</groupId> <artifactId>ws.packaging.module</artifactId> <version>${org.exoplatform.ws.version}</version> <type>js</type> - </dependency> - <dependency> + </dependency> + <dependency> <groupId>org.exoplatform.jcr</groupId> <artifactId>jcr.packaging.module</artifactId> <version>${org.exoplatform.jcr.version}</version> <type>js</type> - </dependency> - <dependency> + </dependency> + <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>portal.packaging.module</artifactId> <version>3.0.0-Beta04-SNAPSHOT</version> <type>js</type> - </dependency> - <dependency> + </dependency> + <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>portal.packaging.product</artifactId> <version>3.0.0-Beta04-SNAPSHOT</version> <type>js</type> - </dependency> + </dependency> </dependencies> <build> <plugins> - <!-- needed for exobuild to call maven dependency:get --> + <!-- needed for exobuild to call maven dependency:get --> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> <version>2.1</version> <configuration> - <repositoryUrl>xxx</repositoryUrl> + <repositoryUrl>xxx</repositoryUrl> </configuration> </plugin> <!-- check-out exobuild --> @@ -104,33 +105,34 @@ <overWriteSnapshots>true</overWriteSnapshots> <artifactItems> <artifactItem> - <groupId>org.gatein.tools</groupId> - <artifactId>packager</artifactId> - <type>zip</type> - <outputDirectory>target/packager</outputDirectory> + <groupId>org.gatein.tools</groupId> + <artifactId>packager</artifactId> + <type>zip</type> + <outputDirectory>target/packager</outputDirectory> </artifactItem> </artifactItems> </configuration> </execution> - <execution> - <id>copy-dependencies</id> - <phase>compile</phase> - <goals> - <goal>copy-dependencies</goal> - </goals> - <configuration> + <execution> + <id>copy-dependencies</id> + <phase>compile</phase> + <goals> + <goal>copy-dependencies</goal> + </goals> + <configuration> <includeTypes>js</includeTypes> <stripVersion>true</stripVersion> <outputDirectory>${project.build.directory}/packager-conf</outputDirectory> - </configuration> - </execution> + </configuration> + </execution> </executions> </plugin> - </plugins> + </plugins> </build> <properties> - <gatein.working.dir>${basedir}/target</gatein.working.dir><!-- Default value for server installation dir --> + <gatein.working.dir>${basedir}/target</gatein.working.dir> + <!-- Default value for server installation dir --> </properties> <profiles> @@ -153,17 +155,24 @@ <rules> <requireProperty> <property>exo.projects.directory.dependencies</property> - <message>"You must define the property exo.projects.directory.dependencies to give the path to the directory where you store your applications servers"</message> + <message>"You must define the property exo.projects.directory.dependencies to give the + path to the directory where you store your applications servers" + </message> </requireProperty> <requireProperty> <property>exo.projects.app.tomcat.version</property> - <message>"You must define the property exo.projects.app.tomcat.version to give the name of the directory where is stored tomcat"</message> + <message>"You must define the property exo.projects.app.tomcat.version to give the name + of the directory where is stored tomcat" + </message> </requireProperty> <requireFilesExist> <files> - <file>${exo.projects.directory.dependencies}/${exo.projects.app.tomcat.version}/</file> + <file>${exo.projects.directory.dependencies}/${exo.projects.app.tomcat.version}/ + </file> </files> - <message>"The following Tomcat directory doesn't exist : ${exo.projects.directory.dependencies}/${exo.projects.app.tomcat.version}"</message> + <message>"The following Tomcat directory doesn't exist : + ${exo.projects.directory.dependencies}/${exo.projects.app.tomcat.version}" + </message> </requireFilesExist> </rules> <fail>true</fail> @@ -189,7 +198,8 @@ <argument>-Dexo.conf.dir=${basedir}/target/packager-conf</argument> <argument>-Dexo.working.dir=${gatein.working.dir}/</argument> <!--argument>-Dexo.src.dir=NONE</argument--> - <argument>-Dexo.dep.dir=${exo.projects.directory.dependencies}</argument><!-- to get the server ref install --> + <argument>-Dexo.dep.dir=${exo.projects.directory.dependencies}</argument> + <!-- to get the server ref install --> <argument>-Dexo.m2.repos=file:${settings.localRepository}</argument> <argument>-Dclean.server=${exo.projects.app.tomcat.version}</argument> <argument>-Dexo.m2.home=${maven.home}</argument> @@ -211,26 +221,26 @@ </execution> </executions> </plugin> -<!-- - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <id>tomcat-assembly</id> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <descriptors> - <descriptor>src/main/assembly/tomcat-zip.xml</descriptor> - </descriptors> - <attach>false</attach> - </configuration> - </execution> - </executions> - </plugin> ---> + <!-- + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>tomcat-assembly</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <descriptors> + <descriptor>src/main/assembly/tomcat-zip.xml</descriptor> + </descriptors> + <attach>false</attach> + </configuration> + </execution> + </executions> + </plugin> + --> </plugins> </build> </profile> @@ -254,17 +264,24 @@ <rules> <requireProperty> <property>exo.projects.directory.dependencies</property> - <message>"You must define the property exo.projects.directory.dependencies to give the path to the directory where you store your applications servers"</message> + <message>"You must define the property exo.projects.directory.dependencies to give the + path to the directory where you store your applications servers" + </message> </requireProperty> <requireProperty> <property>exo.projects.app.jboss.version</property> - <message>"You must define the property exo.projects.app.jboss.version to give the name of the directory where is stored JBossAS"</message> + <message>"You must define the property exo.projects.app.jboss.version to give the name + of the directory where is stored JBossAS" + </message> </requireProperty> <requireFilesExist> <files> - <file>${exo.projects.directory.dependencies}/${exo.projects.app.jboss.version}/</file> + <file>${exo.projects.directory.dependencies}/${exo.projects.app.jboss.version}/ + </file> </files> - <message>"The following JBossAS directory doesn't exist : ${exo.projects.directory.dependencies}/${exo.projects.app.tomcat.version}"</message> + <message>"The following JBossAS directory doesn't exist : + ${exo.projects.directory.dependencies}/${exo.projects.app.tomcat.version}" + </message> </requireFilesExist> </rules> <fail>true</fail> @@ -290,8 +307,11 @@ <argument>-Dexo.conf.dir=${basedir}/target/packager-conf</argument> <argument>-Dexo.working.dir=${gatein.working.dir}</argument> <!--argument>-Dexo.src.dir=NONE</argument--> - <argument>-Dexo.dep.dir=${exo.projects.directory.dependencies}</argument><!-- to get the server ref install --> - <argument>-Dexo.m2.repos=file:${settings.localRepository},http://maven2... + <argument>-Dexo.dep.dir=${exo.projects.directory.dependencies}</argument> + <!-- to get the server ref install --> + <argument> + -Dexo.m2.repos=file:${settings.localRepository},http://maven2.exoplatform.org/rest/maven2,http://repository.jboss.org/maven2 + </argument> <argument>-Dclean.server=${exo.projects.app.jboss.version}</argument> <argument>-Dexo.m2.home=${maven.home}</argument> <argument>-Xshare:auto</argument> @@ -312,26 +332,26 @@ </execution> </executions> </plugin> -<!-- - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <id>jbossas-assembly</id> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <descriptors> - <descriptor>src/main/assembly/jbossear-zip.xml</descriptor> - </descriptors> - <attach>false</attach> - </configuration> - </execution> - </executions> - </plugin> ---> + <!-- + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>jbossas-assembly</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <descriptors> + <descriptor>src/main/assembly/jbossear-zip.xml</descriptor> + </descriptors> + <attach>false</attach> + </configuration> + </execution> + </executions> + </plugin> + --> </plugins> </build> </profile> Modified: portal/branches/wsrp-integration/pom.xml =================================================================== --- portal/branches/wsrp-integration/pom.xml 2009-12-20 10:23:34 UTC (rev 1078) +++ portal/branches/wsrp-integration/pom.xml 2009-12-20 15:05:20 UTC (rev 1079) @@ -19,7 +19,8 @@ --> -<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> @@ -59,13 +60,13 @@ <!-- ************** --> <!-- Build settings --> <!-- ************** --> - + <!-- maven-enforcer-plugin --> <jdk.min.version>1.6</jdk.min.version> <!-- maven-release-plugin --> <arguments>-Prelease,pkg-tomcat,pkg-jbossas -Dmaven.test.skip=true</arguments> - </properties> + </properties> <scm> <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/portal/trunk&... @@ -85,46 +86,406 @@ <module>packaging</module> </modules> - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.commons</artifactId> - <version>${org.exoplatform.kernel.version}</version> - <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.component.cache</artifactId> - <version>${org.exoplatform.kernel.version}</version> - </dependency> - <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.component.command</artifactId> - <version>${org.exoplatform.kernel.version}</version> - </dependency> - <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.component.common</artifactId> - <version>${org.exoplatform.kernel.version}</version> - </dependency> - <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.container</artifactId> - <version>${org.exoplatform.kernel.version}</version> - </dependency> - </dependencies> - </dependencyManagement> + <dependencyManagement> + <dependencies> + <!-- eXo JCR stack --> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.commons</artifactId> + <version>${org.exoplatform.kernel.version}</version> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </exclusion> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.commons</artifactId> + <version>${org.exoplatform.kernel.version}</version> + </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.component.cache</artifactId> + <version>${org.exoplatform.kernel.version}</version> + </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.component.command</artifactId> + <version>${org.exoplatform.kernel.version}</version> + </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.component.common</artifactId> + <version>${org.exoplatform.kernel.version}</version> + </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.container</artifactId> + <version>${org.exoplatform.kernel.version}</version> + </dependency> + <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.organization.api</artifactId> + <version>${org.exoplatform.core.version}</version> + </dependency> + <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.database</artifactId> + <version>${org.exoplatform.core.version}</version> + </dependency> + <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.organization.api</artifactId> + <version>${org.exoplatform.core.version}</version> + </dependency> + <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.organization.jdbc</artifactId> + <version>${org.exoplatform.core.version}</version> + </dependency> + <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.security.core</artifactId> + <version>${org.exoplatform.core.version}</version> + </dependency> + <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.document</artifactId> + <version>${org.exoplatform.core.version}</version> + </dependency> + <dependency> + <groupId>org.exoplatform.jcr</groupId> + <artifactId>exo.jcr.component.core</artifactId> + <version>${org.exoplatform.jcr.version}</version> + </dependency> + <dependency> + <groupId>org.exoplatform.jcr</groupId> + <artifactId>exo.jcr.component.ext</artifactId> + <version>${org.exoplatform.jcr.version}</version> + </dependency> + <dependency> + <groupId>org.exoplatform.ws</groupId> + <artifactId>exo.ws.frameworks.servlet</artifactId> + <version>${org.exoplatform.ws.version}</version> + </dependency> + + <!-- GateIn components --> + <dependency> + <groupId>org.gatein.common</groupId> + <artifactId>common-logging</artifactId> + <version>${org.gatein.common.version}</version> + </dependency> + <dependency> + <groupId>org.gatein.common</groupId> + <artifactId>common-common</artifactId> + <version>${org.gatein.common.version}</version> + </dependency> + <dependency> + <groupId>org.gatein.wci</groupId> + <artifactId>wci-wci</artifactId> + <version>${org.gatein.wci.version}</version> + </dependency> + <dependency> + <groupId>org.gatein.pc</groupId> + <artifactId>pc-bridge</artifactId> + <version>${org.gatein.pc.version}</version> + </dependency> + <dependency> + <groupId>org.gatein.pc</groupId> + <artifactId>pc-federation</artifactId> + <version>${org.gatein.pc.version}</version> + </dependency> + <dependency> + <groupId>org.gatein.pc</groupId> + <artifactId>pc-mc</artifactId> + <version>${org.gatein.pc.version}</version> + </dependency> + <dependency> + <groupId>org.gatein.pc</groupId> + <artifactId>pc-portlet</artifactId> + <version>${org.gatein.pc.version}</version> + </dependency> + <dependency> + <groupId>org.gatein.pc</groupId> + <artifactId>pc-api</artifactId> + <version>${org.gatein.pc.version}</version> + </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-producer-lib</artifactId> + <version>${org.gatein.wsrp.version}</version> + </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-consumer</artifactId> + <version>${org.gatein.wsrp.version}</version> + </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-integration-api</artifactId> + <version>${org.gatein.wsrp.version}</version> + </dependency> + <dependency> + <groupId>org.gatein.mop</groupId> + <artifactId>mop-api</artifactId> + <version>${org.gatein.mop.version}</version> + </dependency> + <dependency> + <groupId>org.gatein.mop</groupId> + <artifactId>mop-spi</artifactId> + <version>${org.gatein.mop.version}</version> + </dependency> + <dependency> + <groupId>org.gatein.mop</groupId> + <artifactId>mop-core</artifactId> + <version>${org.gatein.mop.version}</version> + </dependency> + + <!-- Chromattic --> + <dependency> + <groupId>org.chromattic</groupId> + <artifactId>chromattic.apt</artifactId> + <version>${version.chromattic}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.chromattic</groupId> + <artifactId>chromattic.api</artifactId> + <version>${version.chromattic}</version> + </dependency> + <dependency> + <groupId>org.chromattic</groupId> + <artifactId>chromattic.spi</artifactId> + <version>${version.chromattic}</version> + </dependency> + <dependency> + <groupId>org.chromattic</groupId> + <artifactId>chromattic.core</artifactId> + <version>${version.chromattic}</version> + </dependency> + <dependency> + <groupId>org.chromattic</groupId> + <artifactId>chromattic.ntdef</artifactId> + <version>${version.chromattic}</version> + </dependency> + + <!-- Picketlink --> + <dependency> + <groupId>org.picketlink.idm</groupId> + <artifactId>picketlink-idm-core</artifactId> + <version>${org.picketlink.idm}</version> + </dependency> + <dependency> + <groupId>org.picketlink.idm</groupId> + <artifactId>picketlink-idm-hibernate</artifactId> + <version>${org.picketlink.idm}</version> + </dependency> + <dependency> + <groupId>org.picketlink.idm</groupId> + <artifactId>picketlink-idm-ldap</artifactId> + <version>${org.picketlink.idm}</version> + </dependency> + <dependency> + <groupId>org.picketlink.idm</groupId> + <artifactId>picketlink-idm-cache</artifactId> + <version>${org.picketlink.idm}</version> + </dependency> + + <dependency> + <groupId>javax.portlet</groupId> + <artifactId>portlet-api</artifactId> + <version>2.0</version> + </dependency> + + <!-- Portlet bridge --> + <dependency> + <groupId>org.jboss.portletbridge</groupId> + <artifactId>portletbridge-api</artifactId> + <version>2.0.0.BETA</version> + </dependency> + <dependency> + <groupId>org.jboss.portletbridge</groupId> + <artifactId>portletbridge-impl</artifactId> + <version>2.0.0.BETA</version> + </dependency> + + <dependency> + <groupId>commons-dbcp</groupId> + <artifactId>commons-dbcp</artifactId> + <version>1.2.2</version> + <exclusions> + <exclusion> + <groupId>xerces</groupId> + <artifactId>xercesImpl</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <version>1.4</version> + </dependency> + <dependency> + <groupId>org.json</groupId> + <artifactId>json</artifactId> + <version>20070829</version> + </dependency> + <dependency> + <groupId>hsqldb</groupId> + <artifactId>hsqldb</artifactId> + <version>1.8.0.7</version> + </dependency> + <dependency> + <groupId>javax.resource</groupId> + <artifactId>connector-api</artifactId> + <version>1.5</version> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>${javax.servlet.version}</version> + </dependency> + <dependency> + <groupId>rhino</groupId> + <artifactId>js</artifactId> + <version>${rhino.version}</version> + </dependency> + <dependency> + <groupId>org.codehaus.groovy</groupId> + <artifactId>groovy-all</artifactId> + <version>${org.codehaus.groovy.version}</version> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.1</version> + </dependency> + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <version>3.2.1</version> + </dependency> + <dependency> + <groupId>commons-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + <version>3.0</version> + </dependency> + + <dependency> + <groupId>caja</groupId> + <artifactId>caja</artifactId> + <version>r3375</version> + </dependency> + <dependency> + <groupId>caja</groupId> + <artifactId>json_simple</artifactId> + <version>r1</version> + </dependency> + <dependency> + <groupId>net.oauth</groupId> + <artifactId>core</artifactId> + <version>20080621</version> + </dependency> + <dependency> + <groupId>com.google.collections</groupId> + <artifactId>google-collections</artifactId> + <version>1.0-rc2</version> + </dependency> + <dependency> + <groupId>com.google.code.guice</groupId> + <artifactId>guice</artifactId> + <version>2.0</version> + </dependency> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>2.4</version> + </dependency> + <dependency> + <groupId>rome</groupId> + <artifactId>rome</artifactId> + <version>0.9</version> + </dependency> + <dependency> + <groupId>com.ibm.icu</groupId> + <artifactId>icu4j</artifactId> + <version>3.8</version> + </dependency> + <dependency> + <groupId>net.sourceforge.nekohtml</groupId> + <artifactId>nekohtml</artifactId> + <version>1.9.9</version> + </dependency> + <dependency> + <groupId>xerces</groupId> + <artifactId>xercesImpl</artifactId> + <version>2.9.1</version> + </dependency> + <dependency> + <groupId>jaxen</groupId> + <artifactId>jaxen</artifactId> + <version>1.1.1</version> + </dependency> + <dependency> + <groupId>nu.validator.htmlparser</groupId> + <artifactId>htmlparser</artifactId> + <version>1.0.7</version> + </dependency> + <dependency> + <groupId>commons-digester</groupId> + <artifactId>commons-digester</artifactId> + <version>1.7</version> + </dependency> + + <dependency> + <groupId>org.apache.shindig</groupId> + <artifactId>shindig-gadgets</artifactId> + <version>${org.shindig.version}</version> + </dependency> + <dependency> + <groupId>org.apache.shindig</groupId> + <artifactId>shindig-features</artifactId> + <version>${org.shindig.version}</version> + </dependency> + <dependency> + <groupId>org.apache.shindig</groupId> + <artifactId>shindig-common</artifactId> + <version>${org.shindig.version}</version> + </dependency> + <dependency> + <groupId>org.apache.shindig</groupId> + <artifactId>shindig-server</artifactId> + <version>${org.shindig.version}</version> + </dependency> + <dependency> + <groupId>org.apache.shindig</groupId> + <artifactId>shindig-server</artifactId> + <version>${org.shindig.version}</version> + <type>war</type> + </dependency> + <dependency> + <groupId>org.apache.shindig</groupId> + <artifactId>shindig-social-api</artifactId> + <version>${org.shindig.version}</version> + </dependency> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.1</version> + </dependency> + + </dependencies> + + </dependencyManagement> + <dependencies> <dependency> <groupId>org.slf4j</groupId> @@ -133,7 +494,7 @@ <scope>test</scope> </dependency> </dependencies> - + <build> <resources> <resource> @@ -160,15 +521,15 @@ <pluginManagement> <plugins> <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>exec-maven-plugin</artifactId> - <version>1.1.1</version> + <groupId>org.codehaus.mojo</groupId> + <artifactId>exec-maven-plugin</artifactId> + <version>1.1.1</version> </plugin> <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <version>1.4</version> - </plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <version>1.4</version> + </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> @@ -209,11 +570,12 @@ <phase>compile</phase> <configuration> <tasks> - <copy failonerror="false" todir="${project.build.directory}/${project.build.finalName}/WEB-INF/classes"> + <copy failonerror="false" + todir="${project.build.directory}/${project.build.finalName}/WEB-INF/classes"> <fileset dir="${basedir}/src/main/webapp/WEB-INF/classes"> - <include name="**/*_en.properties" /> + <include name="**/*_en.properties"/> </fileset> - <globmapper from="*_en.properties" to="*.properties" /> + <globmapper from="*_en.properties" to="*.properties"/> </copy> </tasks> </configuration> Modified: portal/branches/wsrp-integration/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIBarDecorator/UIInfoBar/Stylesheet.css =================================================================== --- portal/branches/wsrp-integration/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIBarDecorator/UIInfoBar/Stylesheet.css 2009-12-20 10:23:34 UTC (rev 1078) +++ portal/branches/wsrp-integration/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIBarDecorator/UIInfoBar/Stylesheet.css 2009-12-20 15:05:20 UTC (rev 1079) @@ -80,7 +80,7 @@ .UIInfoBar .BlueRoundedStyle .FixHeight { height: 26px; - _width: 195px; + _width: 230px; white-space: nowrap; } Modified: portal/branches/wsrp-integration/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UISelector/UIGroupMembershipSelector/Stylesheet.css =================================================================== --- portal/branches/wsrp-integration/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UISelector/UIGroupMembershipSelector/Stylesheet.css 2009-12-20 10:23:34 UTC (rev 1078) +++ portal/branches/wsrp-integration/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UISelector/UIGroupMembershipSelector/Stylesheet.css 2009-12-20 15:05:20 UTC (rev 1079) @@ -38,12 +38,11 @@ } .UIGroupMembershipSelector .UIBreadcumbs .RightBreadcumbsBar { - background: none; height: auto; } .UIGroupMembershipSelector .UIBreadcumbs .BreadcumbsInfoBar { - background: none; + height: auto; } .UIGroupMembershipSelector .UIBreadcumbs a.Selected { Modified: portal/branches/wsrp-integration/web/portal/src/main/webapp/WEB-INF/conf/common/autologin-configuration.xml =================================================================== --- portal/branches/wsrp-integration/web/portal/src/main/webapp/WEB-INF/conf/common/autologin-configuration.xml 2009-12-20 10:23:34 UTC (rev 1078) +++ portal/branches/wsrp-integration/web/portal/src/main/webapp/WEB-INF/conf/common/autologin-configuration.xml 2009-12-20 15:05:20 UTC (rev 1079) @@ -25,54 +25,54 @@ xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd" xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"> - <component> - <key>org.exoplatform.web.security.security.CookieTokenService</key> - <type>org.exoplatform.web.security.security.CookieTokenService</type> - <init-params> - <values-param> - <name>service.configuration</name> - <value>jcr-token</value> - <value>7</value> - <value>DAY</value> - </values-param> - </init-params> - </component> + <component> + <key>org.exoplatform.web.security.security.CookieTokenService</key> + <type>org.exoplatform.web.security.security.CookieTokenService</type> + <init-params> + <values-param> + <name>service.configuration</name> + <value>jcr-token</value> + <value>7</value> + <value>DAY</value> + </values-param> + </init-params> + </component> - <component> - <key>org.exoplatform.web.security.security.TransientTokenService</key> - <type>org.exoplatform.web.security.security.TransientTokenService</type> - <init-params> - <values-param> - <name>service.configuration</name> - <value>memory-token</value> - <value>1</value> - <value>MINUTE</value> - </values-param> - </init-params> - </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.commons.chromattic.ChromatticLifeCycle</type> + <component> + <key>org.exoplatform.web.security.security.TransientTokenService</key> + <type>org.exoplatform.web.security.security.TransientTokenService</type> <init-params> - <value-param> - <name>name</name> - <value>autologin</value> - </value-param> - <value-param> - <name>workspace-name</name> - <value>portal-work</value> - </value-param> - <values-param> - <name>entities</name> - <value>org.exoplatform.web.security.security.TokenContainer</value> - <value>org.exoplatform.web.security.security.TokenEntry</value> - </values-param> + <values-param> + <name>service.configuration</name> + <value>memory-token</value> + <value>1</value> + <value>MINUTE</value> + </values-param> </init-params> - </component-plugin> - </external-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.commons.chromattic.ChromatticLifeCycle</type> + <init-params> + <value-param> + <name>domain-name</name> + <value>autologin</value> + </value-param> + <value-param> + <name>workspace-name</name> + <value>portal-work</value> + </value-param> + <values-param> + <name>entities</name> + <value>org.exoplatform.web.security.security.TokenContainer</value> + <value>org.exoplatform.web.security.security.TokenEntry</value> + </values-param> + </init-params> + </component-plugin> + </external-component-plugins> + </configuration> Modified: portal/branches/wsrp-integration/web/portal/src/main/webapp/WEB-INF/conf/database/database-configuration.xml =================================================================== --- portal/branches/wsrp-integration/web/portal/src/main/webapp/WEB-INF/conf/database/database-configuration.xml 2009-12-20 10:23:34 UTC (rev 1078) +++ portal/branches/wsrp-integration/web/portal/src/main/webapp/WEB-INF/conf/database/database-configuration.xml 2009-12-20 15:05:20 UTC (rev 1079) @@ -24,63 +24,60 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd" xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"> - <component> - <key>org.exoplatform.services.database.HibernateService</key> - <jmx-name>database:type=HibernateService</jmx-name> - <type>org.exoplatform.services.database.impl.HibernateServiceImpl</type> - <init-params> - <properties-param> - <name>hibernate.properties</name> - <description>Default Hibernate Service</description> - <property name="hibernate.show_sql" value="false"/> - <property name="hibernate.current_session_context_class" value="thread"/> - <property name="hibernate.cache.use_second_level_cache" value="true"/> - <property name="hibernate.cache.use_query_cache" value="true"/> - <!--CHANGEME HashtableCacheProvider shold not be used in production env--> - <property name="hibernate.cache.provider_class" value="org.hibernate.cache.HashtableCacheProvider"/> - <property name="hibernate.cglib.use_reflection_optimizer" value="true"/> - <property name="hibernate.connection.url" value="jdbc:hsqldb:file:../temp/data/exodb${container.name.suffix}"/> - <property name="hibernate.connection.driver_class" value="org.hsqldb.jdbcDriver"/> - <property name="hibernate.connection.autocommit" value="true"/> - <property name="hibernate.connection.username" value="sa"/> - <property name="hibernate.connection.password" value=""/> - <property name="hibernate.dialect" value="org.hibernate.dialect.HSQLDialect"/> - <property name="hibernate.c3p0.min_size" value="5"/> - <property name="hibernate.c3p0.max_size" value="20"/> - <property name="hibernate.c3p0.timeout" value="1800"/> - <property name="hibernate.c3p0.max_statements" value="50"/> - </properties-param> - </init-params> - </component> - - <external-component-plugins> - <target-component>org.exoplatform.services.naming.InitialContextInitializer</target-component> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> + <component> + <key>org.exoplatform.services.database.HibernateService</key> + <jmx-name>database:type=HibernateService</jmx-name> + <type>org.exoplatform.services.database.impl.HibernateServiceImpl</type> <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcexo${container.name.suffix}</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> - <property name="url" value="jdbc:hsqldb:file:../temp/data/exodb${container.name.suffix}"/> - <property name="username" value="sa"/> - <property name="password" value=""/> - </properties-param> + <properties-param> + <name>hibernate.properties</name> + <description>Default Hibernate Service</description> + <property name="hibernate.show_sql" value="false"/> + <property name="hibernate.current_session_context_class" value="thread"/> + <property name="hibernate.cache.use_second_level_cache" value="true"/> + <property name="hibernate.cache.use_query_cache" value="true"/> + <!--CHANGEME HashtableCacheProvider shold not be used in production env--> + <property name="hibernate.cache.provider_class" value="org.hibernate.cache.HashtableCacheProvider"/> + <property name="hibernate.cglib.use_reflection_optimizer" value="true"/> + <property name="hibernate.connection.datasource" value="jdbcexo${container.name.suffix}"/> + <property name="hibernate.connection.autocommit" value="true"/> + <property name="hibernate.dialect" value="org.hibernate.dialect.HSQLDialect"/> + <property name="hibernate.c3p0.min_size" value="5"/> + <property name="hibernate.c3p0.max_size" value="20"/> + <property name="hibernate.c3p0.timeout" value="1800"/> + <property name="hibernate.c3p0.max_statements" value="50"/> + </properties-param> </init-params> - </component-plugin> - </external-component-plugins> + </component> + + <external-component-plugins> + <target-component>org.exoplatform.services.naming.InitialContextInitializer</target-component> + <component-plugin> + <name>bind.datasource</name> + <set-method>addPlugin</set-method> + <type>org.exoplatform.services.naming.BindReferencePlugin</type> + <init-params> + <value-param> + <name>bind-name</name> + <value>jdbcexo${container.name.suffix}</value> + </value-param> + <value-param> + <name>class-name</name> + <value>javax.sql.DataSource</value> + </value-param> + <value-param> + <name>factory</name> + <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> + </value-param> + <properties-param> + <name>ref-addresses</name> + <description>ref-addresses</description> + <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> + <property name="url" value="jdbc:hsqldb:file:${gatein.db.data.dir}/data/exodb${container.name.suffix}"/> + <property name="username" value="sa"/> + <property name="password" value=""/> + </properties-param> + </init-params> + </component-plugin> + </external-component-plugins> </configuration> Modified: portal/branches/wsrp-integration/web/portal/src/main/webapp/WEB-INF/conf/jcr/repository-configuration.tmpl.xml =================================================================== --- portal/branches/wsrp-integration/web/portal/src/main/webapp/WEB-INF/conf/jcr/repository-configuration.tmpl.xml 2009-12-20 10:23:34 UTC (rev 1078) +++ portal/branches/wsrp-integration/web/portal/src/main/webapp/WEB-INF/conf/jcr/repository-configuration.tmpl.xml 2009-12-20 15:05:20 UTC (rev 1079) @@ -20,160 +20,178 @@ --> <repository-service default-repository="repository"> - <repositories> - <repository name="repository" system-workspace="system" default-workspace="portal-system"> - <security-domain>gatein-domain</security-domain> - <access-control>optional</access-control> - <authentication-policy>org.exoplatform.services.jcr.impl.core.access.JAASAuthenticator</authentication-policy> + <repositories> + <repository name="repository" system-workspace="system" default-workspace="portal-system"> + <security-domain>gatein-domain</security-domain> + <access-control>optional</access-control> + <authentication-policy>org.exoplatform.services.jcr.impl.core.access.JAASAuthenticator</authentication-policy> - <!-- System --> - <workspaces> - <workspace name="system"> - <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> - <properties> - <property name="source-name" value="jdbcexo${container.name.suffix}"/> - <property name="dialect" value="hsqldb"/> - <property name="multi-db" value="false"/> - <property name="update-storage" value="true"/> - <property name="max-buffer-size" value="204800"/> - <property name="swap-directory" value="../temp/swap/system${container.name.suffix}"/> - </properties> - <value-storages> - <value-storage id="system" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> - <properties> - <property name="path" value="../temp/values/system${container.name.suffix}"/> - </properties> - <filters> - <filter property-type="Binary"/> - </filters> - </value-storage> - </value-storages> - </container> - <initializer class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer"> - <properties> - <property name="root-nodetype" value="nt:unstructured"/> - <property name="root-permissions" value="*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove"/> - </properties> - </initializer> - <cache enabled="true"> - <properties> - <property name="max-size" value="20000"/> - <property name="live-time" value="30000"/> - </properties> - </cache> - <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> - <properties> - <property name="index-dir" value="../temp/jcrlucenedb/system${container.name.suffix}"/> - </properties> - </query-handler> - <lock-manager> - <time-out>15m</time-out><!-- 15min --> - <persister class="org.exoplatform.services.jcr.impl.core.lock.FileSystemLockPersister"> - <properties> - <property name="path" value="../temp/lock/system${container.name.suffix}"/> - </properties> - </persister> - </lock-manager> - </workspace> + <!-- System --> + <workspaces> + <workspace name="system"> + <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> + <properties> + <property name="source-name" value="jdbcexo${container.name.suffix}"/> + <property name="dialect" value="hsqldb"/> + <property name="multi-db" value="false"/> + <property name="update-storage" value="true"/> + <property name="max-buffer-size" value="204800"/> + <property name="swap-directory" + value="${gatein.jcr.data.dir}/swap/system${container.name.suffix}"/> + </properties> + <value-storages> + <value-storage id="system" + class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> + <properties> + <property name="path" value="${gatein.jcr.data.dir}/values/system${container.name.suffix}"/> + </properties> + <filters> + <filter property-type="Binary"/> + </filters> + </value-storage> + </value-storages> + </container> + <initializer class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer"> + <properties> + <property name="root-nodetype" value="nt:unstructured"/> + <property name="root-permissions" + value="*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove"/> + </properties> + </initializer> + <cache enabled="true"> + <properties> + <property name="max-size" value="20000"/> + <property name="live-time" value="30000"/> + </properties> + </cache> + <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> + <properties> + <property name="index-dir" + value="${gatein.jcr.data.dir}/jcrlucenedb/system${container.name.suffix}"/> + </properties> + </query-handler> + <lock-manager> + <time-out>15m</time-out> + <!-- 15min --> + <persister class="org.exoplatform.services.jcr.impl.core.lock.FileSystemLockPersister"> + <properties> + <property name="path" value="${gatein.jcr.data.dir}/lock/system${container.name.suffix}"/> + </properties> + </persister> + </lock-manager> + </workspace> - <!-- Portal system data --> - <workspace name="portal-system"> - <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> - <properties> - <property name="source-name" value="jdbcexo${container.name.suffix}"/> - <property name="dialect" value="hsqldb"/> - <property name="multi-db" value="false"/> - <property name="update-storage" value="true"/> - <property name="max-buffer-size" value="204800"/> - <property name="swap-directory" value="../temp/swap/portal-system${container.name.suffix}"/> - </properties> - <value-storages> - <value-storage id="portal-system" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> - <properties> - <property name="path" value="../temp/values/portal-system${container.name.suffix}"/> - </properties> - <filters> - <filter property-type="Binary"/> - </filters> - </value-storage> - </value-storages> - </container> - <initializer class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer"> - <properties> - <property name="root-nodetype" value="nt:unstructured"/> - <property name="root-permissions" value="any read;*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove"/> - </properties> - </initializer> - <cache enabled="true"> - <properties> - <property name="max-size" value="20000"/> - <property name="live-time" value="30000"/> - </properties> - </cache> - <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> - <properties> - <property name="index-dir" value="../temp/jcrlucenedb/portal-system${container.name.suffix}"/> - </properties> - </query-handler> - <lock-manager> - <time-out>15m</time-out><!-- 15min --> - <persister class="org.exoplatform.services.jcr.impl.core.lock.FileSystemLockPersister"> - <properties> - <property name="path" value="../temp/lock/portal-system${container.name.suffix}"/> - </properties> - </persister> - </lock-manager> - </workspace> + <!-- Portal system data --> + <workspace name="portal-system"> + <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> + <properties> + <property name="source-name" value="jdbcexo${container.name.suffix}"/> + <property name="dialect" value="hsqldb"/> + <property name="multi-db" value="false"/> + <property name="update-storage" value="true"/> + <property name="max-buffer-size" value="204800"/> + <property name="swap-directory" + value="${gatein.jcr.data.dir}/swap/portal-system${container.name.suffix}"/> + </properties> + <value-storages> + <value-storage id="portal-system" + class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> + <properties> + <property name="path" + value="${gatein.jcr.data.dir}/values/portal-system${container.name.suffix}"/> + </properties> + <filters> + <filter property-type="Binary"/> + </filters> + </value-storage> + </value-storages> + </container> + <initializer class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer"> + <properties> + <property name="root-nodetype" value="nt:unstructured"/> + <property name="root-permissions" + value="any read;*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove"/> + </properties> + </initializer> + <cache enabled="true"> + <properties> + <property name="max-size" value="20000"/> + <property name="live-time" value="30000"/> + </properties> + </cache> + <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> + <properties> + <property name="index-dir" + value="${gatein.jcr.data.dir}/jcrlucenedb/portal-system${container.name.suffix}"/> + </properties> + </query-handler> + <lock-manager> + <time-out>15m</time-out> + <!-- 15min --> + <persister class="org.exoplatform.services.jcr.impl.core.lock.FileSystemLockPersister"> + <properties> + <property name="path" + value="${gatein.jcr.data.dir}/lock/portal-system${container.name.suffix}"/> + </properties> + </persister> + </lock-manager> + </workspace> - <!-- Portal work data --> - <workspace name="portal-work"> - <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> - <properties> - <property name="source-name" value="jdbcexo${container.name.suffix}"/> - <property name="dialect" value="hsqldb"/> - <property name="multi-db" value="false"/> - <property name="update-storage" value="true"/> - <property name="max-buffer-size" value="204800"/> - <property name="swap-directory" value="../temp/swap/portal-work${container.name.suffix}"/> - </properties> - <value-storages> - <value-storage id="portal-work" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> - <properties> - <property name="path" value="../temp/values/portal-work${container.name.suffix}"/> - </properties> - <filters> - <filter property-type="Binary"/> - </filters> - </value-storage> - </value-storages> - </container> - <initializer class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer"> - <properties> - <property name="root-nodetype" value="nt:unstructured"/> - <property name="root-permissions" value="any read;*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove"/> - </properties> - </initializer> - <cache enabled="true"> - <properties> - <property name="max-size" value="20000"/> - <property name="live-time" value="30000"/> - </properties> - </cache> - <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> - <properties> - <property name="index-dir" value="../temp/jcrlucenedb/portal-work${container.name.suffix}"/> - </properties> - </query-handler> - <lock-manager> - <time-out>15m</time-out><!-- 15min --> - <persister class="org.exoplatform.services.jcr.impl.core.lock.FileSystemLockPersister"> - <properties> - <property name="path" value="../temp/lock/portal-work${container.name.suffix}"/> - </properties> - </persister> - </lock-manager> - </workspace> - <!-- Workspace for WSRP --> + <!-- Portal work data --> + <workspace name="portal-work"> + <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> + <properties> + <property name="source-name" value="jdbcexo${container.name.suffix}"/> + <property name="dialect" value="hsqldb"/> + <property name="multi-db" value="false"/> + <property name="update-storage" value="true"/> + <property name="max-buffer-size" value="204800"/> + <property name="swap-directory" + value="${gatein.jcr.data.dir}/swap/portal-work${container.name.suffix}"/> + </properties> + <value-storages> + <value-storage id="portal-work" + class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> + <properties> + <property name="path" + value="${gatein.jcr.data.dir}/values/portal-work${container.name.suffix}"/> + </properties> + <filters> + <filter property-type="Binary"/> + </filters> + </value-storage> + </value-storages> + </container> + <initializer class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer"> + <properties> + <property name="root-nodetype" value="nt:unstructured"/> + <property name="root-permissions" + value="any read;*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove"/> + </properties> + </initializer> + <cache enabled="true"> + <properties> + <property name="max-size" value="20000"/> + <property name="live-time" value="30000"/> + </properties> + </cache> + <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> + <properties> + <property name="index-dir" + value="${gatein.jcr.data.dir}/jcrlucenedb/portal-work${container.name.suffix}"/> + </properties> + </query-handler> + <lock-manager> + <time-out>15m</time-out> + <!-- 15min --> + <persister class="org.exoplatform.services.jcr.impl.core.lock.FileSystemLockPersister"> + <properties> + <property name="path" value="${gatein.jcr.data.dir}/lock/portal-work${container.name.suffix}"/> + </properties> + </persister> + </lock-manager> + </workspace> + <!-- Workspace for WSRP --> <workspace name="wsrp-system"> <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> <properties> @@ -223,7 +241,7 @@ </persister> </lock-manager> </workspace> - </workspaces> - </repository> - </repositories> + </workspaces> + </repository> + </repositories> </repository-service> Modified: portal/branches/wsrp-integration/web/portal/src/main/webapp/WEB-INF/conf/jcr/repository-configuration.xml =================================================================== --- portal/branches/wsrp-integration/web/portal/src/main/webapp/WEB-INF/conf/jcr/repository-configuration.xml 2009-12-20 10:23:34 UTC (rev 1078) +++ portal/branches/wsrp-integration/web/portal/src/main/webapp/WEB-INF/conf/jcr/repository-configuration.xml 2009-12-20 15:05:20 UTC (rev 1079) @@ -20,160 +20,177 @@ --> <repository-service default-repository="repository"> - <repositories> - <repository name="repository" system-workspace="system" default-workspace="portal-system"> - <security-domain>gatein-domain</security-domain> - <access-control>optional</access-control> - <authentication-policy>org.exoplatform.services.jcr.impl.core.access.JAASAuthenticator</authentication-policy> + <repositories> + <repository name="repository" system-workspace="system" default-workspace="portal-system"> + <security-domain>gatein-domain</security-domain> + <access-control>optional</access-control> + <authentication-policy>org.exoplatform.services.jcr.impl.core.access.JAASAuthenticator</authentication-policy> - <!-- System --> - <workspaces> - <workspace name="system"> - <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> - <properties> - <property name="source-name" value="jdbcexo${container.name.suffix}"/> - <property name="dialect" value="hsqldb"/> - <property name="multi-db" value="false"/> - <property name="update-storage" value="true"/> - <property name="max-buffer-size" value="204800"/> - <property name="swap-directory" value="../temp/swap/system${container.name.suffix}"/> - </properties> - <value-storages> - <value-storage id="system" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> - <properties> - <property name="path" value="../temp/values/system${container.name.suffix}"/> - </properties> - <filters> - <filter property-type="Binary"/> - </filters> - </value-storage> - </value-storages> - </container> - <initializer class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer"> - <properties> - <property name="root-nodetype" value="nt:unstructured"/> - <property name="root-permissions" value="*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove"/> - </properties> - </initializer> - <cache enabled="true"> - <properties> - <property name="max-size" value="20000"/> - <property name="live-time" value="30000"/> - </properties> - </cache> - <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> - <properties> - <property name="index-dir" value="../temp/jcrlucenedb/system${container.name.suffix}"/> - </properties> - </query-handler> - <lock-manager> - <time-out>15m</time-out><!-- 15min --> - <persister class="org.exoplatform.services.jcr.impl.core.lock.FileSystemLockPersister"> - <properties> - <property name="path" value="../temp/lock/system${container.name.suffix}"/> - </properties> - </persister> - </lock-manager> - </workspace> + <!-- System --> + <workspaces> + <workspace name="system"> + <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> + <properties> + <property name="source-name" value="jdbcexo${container.name.suffix}"/> + <property name="dialect" value="hsqldb"/> + <property name="multi-db" value="false"/> + <property name="update-storage" value="true"/> + <property name="max-buffer-size" value="204800"/> + <property name="swap-directory" value="${gatein.jcr.data.dir}/system${container.name.suffix}"/> + </properties> + <value-storages> + <value-storage id="system" + class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> + <properties> + <property name="path" value="${gatein.jcr.data.dir}/values/system${container.name.suffix}"/> + </properties> + <filters> + <filter property-type="Binary"/> + </filters> + </value-storage> + </value-storages> + </container> + <initializer class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer"> + <properties> + <property name="root-nodetype" value="nt:unstructured"/> + <property name="root-permissions" + value="*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove"/> + </properties> + </initializer> + <cache enabled="true"> + <properties> + <property name="max-size" value="20000"/> + <property name="live-time" value="30000"/> + </properties> + </cache> + <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> + <properties> + <property name="index-dir" + value="${gatein.jcr.data.dir}/jcrlucenedb/system${container.name.suffix}"/> + </properties> + </query-handler> + <lock-manager> + <time-out>15m</time-out> + <!-- 15min --> + <persister class="org.exoplatform.services.jcr.impl.core.lock.FileSystemLockPersister"> + <properties> + <property name="path" value="${gatein.jcr.data.dir}/lock/system${container.name.suffix}"/> + </properties> + </persister> + </lock-manager> + </workspace> - <!-- Portal system data --> - <workspace name="portal-system"> - <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> - <properties> - <property name="source-name" value="jdbcexo${container.name.suffix}"/> - <property name="dialect" value="hsqldb"/> - <property name="multi-db" value="false"/> - <property name="update-storage" value="true"/> - <property name="max-buffer-size" value="204800"/> - <property name="swap-directory" value="../temp/swap/portal-system${container.name.suffix}"/> - </properties> - <value-storages> - <value-storage id="portal-system" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> - <properties> - <property name="path" value="../temp/values/portal-system${container.name.suffix}"/> - </properties> - <filters> - <filter property-type="Binary"/> - </filters> - </value-storage> - </value-storages> - </container> - <initializer class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer"> - <properties> - <property name="root-nodetype" value="nt:unstructured"/> - <property name="root-permissions" value="any read;*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove"/> - </properties> - </initializer> - <cache enabled="true"> - <properties> - <property name="max-size" value="20000"/> - <property name="live-time" value="30000"/> - </properties> - </cache> - <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> - <properties> - <property name="index-dir" value="../temp/jcrlucenedb/portal-system${container.name.suffix}"/> - </properties> - </query-handler> - <lock-manager> - <time-out>15m</time-out><!-- 15min --> - <persister class="org.exoplatform.services.jcr.impl.core.lock.FileSystemLockPersister"> - <properties> - <property name="path" value="../temp/lock/portal-system${container.name.suffix}"/> - </properties> - </persister> - </lock-manager> - </workspace> + <!-- Portal system data --> + <workspace name="portal-system"> + <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> + <properties> + <property name="source-name" value="jdbcexo${container.name.suffix}"/> + <property name="dialect" value="hsqldb"/> + <property name="multi-db" value="false"/> + <property name="update-storage" value="true"/> + <property name="max-buffer-size" value="204800"/> + <property name="swap-directory" + value="${gatein.jcr.data.dir}/swap/portal-system${container.name.suffix}"/> + </properties> + <value-storages> + <value-storage id="portal-system" + class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> + <properties> + <property name="path" + value="${gatein.jcr.data.dir}/values/portal-system${container.name.suffix}"/> + </properties> + <filters> + <filter property-type="Binary"/> + </filters> + </value-storage> + </value-storages> + </container> + <initializer class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer"> + <properties> + <property name="root-nodetype" value="nt:unstructured"/> + <property name="root-permissions" + value="any read;*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove"/> + </properties> + </initializer> + <cache enabled="true"> + <properties> + <property name="max-size" value="20000"/> + <property name="live-time" value="30000"/> + </properties> + </cache> + <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> + <properties> + <property name="index-dir" + value="${gatein.jcr.data.dir}/jcrlucenedb/portal-system${container.name.suffix}"/> + </properties> + </query-handler> + <lock-manager> + <time-out>15m</time-out> + <!-- 15min --> + <persister class="org.exoplatform.services.jcr.impl.core.lock.FileSystemLockPersister"> + <properties> + <property name="path" + value="${gatein.jcr.data.dir}/lock/portal-system${container.name.suffix}"/> + </properties> + </persister> + </lock-manager> + </workspace> - <!-- Portal work data --> - <workspace name="portal-work"> - <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> - <properties> - <property name="source-name" value="jdbcexo${container.name.suffix}"/> - <property name="dialect" value="hsqldb"/> - <property name="multi-db" value="false"/> - <property name="update-storage" value="true"/> - <property name="max-buffer-size" value="204800"/> - <property name="swap-directory" value="../temp/swap/portal-work${container.name.suffix}"/> - </properties> - <value-storages> - <value-storage id="portal-work" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> - <properties> - <property name="path" value="../temp/values/portal-work${container.name.suffix}"/> - </properties> - <filters> - <filter property-type="Binary"/> - </filters> - </value-storage> - </value-storages> - </container> - <initializer class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer"> - <properties> - <property name="root-nodetype" value="nt:unstructured"/> - <property name="root-permissions" value="any read;*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove"/> - </properties> - </initializer> - <cache enabled="true"> - <properties> - <property name="max-size" value="20000"/> - <property name="live-time" value="30000"/> - </properties> - </cache> - <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> - <properties> - <property name="index-dir" value="../temp/jcrlucenedb/portal-work${container.name.suffix}"/> - </properties> - </query-handler> - <lock-manager> - <time-out>15m</time-out><!-- 15min --> - <persister class="org.exoplatform.services.jcr.impl.core.lock.FileSystemLockPersister"> - <properties> - <property name="path" value="../temp/lock/portal-work${container.name.suffix}"/> - </properties> - </persister> - </lock-manager> - </workspace> - <!-- Workspace for WSRP--> + <!-- Portal work data --> + <workspace name="portal-work"> + <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> + <properties> + <property name="source-name" value="jdbcexo${container.name.suffix}"/> + <property name="dialect" value="hsqldb"/> + <property name="multi-db" value="false"/> + <property name="update-storage" value="true"/> + <property name="max-buffer-size" value="204800"/> + <property name="swap-directory" + value="${gatein.jcr.data.dir}/swap/portal-work${container.name.suffix}"/> + </properties> + <value-storages> + <value-storage id="portal-work" + class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> + <properties> + <property name="path" + value="${gatein.jcr.data.dir}/values/portal-work${container.name.suffix}"/> + </properties> + <filters> + <filter property-type="Binary"/> + </filters> + </value-storage> + </value-storages> + </container> + <initializer class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer"> + <properties> + <property name="root-nodetype" value="nt:unstructured"/> + <property name="root-permissions" + value="any read;*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove"/> + </properties> + </initializer> + <cache enabled="true"> + <properties> + <property name="max-size" value="20000"/> + <property name="live-time" value="30000"/> + </properties> + </cache> + <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> + <properties> + <property name="index-dir" + value="${gatein.jcr.data.dir}/jcrlucenedb/portal-work${container.name.suffix}"/> + </properties> + </query-handler> + <lock-manager> + <time-out>15m</time-out> + <!-- 15min --> + <persister class="org.exoplatform.services.jcr.impl.core.lock.FileSystemLockPersister"> + <properties> + <property name="path" value="${gatein.jcr.data.dir}/lock/portal-work${container.name.suffix}"/> + </properties> + </persister> + </lock-manager> + </workspace> + <!-- Workspace for WSRP--> <workspace name="wsrp-system"> <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> <properties> @@ -223,7 +240,7 @@ </persister> </lock-manager> </workspace> - </workspaces> - </repository> - </repositories> + </workspaces> + </repository> + </repositories> </repository-service> Modified: portal/branches/wsrp-integration/web/portal/src/main/webapp/WEB-INF/conf/portal/application-registry-configuration.xml =================================================================== --- portal/branches/wsrp-integration/web/portal/src/main/webapp/WEB-INF/conf/portal/application-registry-configuration.xml 2009-12-20 10:23:34 UTC (rev 1078) +++ portal/branches/wsrp-integration/web/portal/src/main/webapp/WEB-INF/conf/portal/application-registry-configuration.xml 2009-12-20 15:05:20 UTC (rev 1079) @@ -19,50 +19,52 @@ 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd" xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"> +<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd" + xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"> - <component> - <key>org.exoplatform.application.gadget.SourceStorage</key> - <type>org.exoplatform.application.gadget.impl.SourceStorageImpl</type> - </component> + <component> + <key>org.exoplatform.application.gadget.SourceStorage</key> + <type>org.exoplatform.application.gadget.impl.SourceStorageImpl</type> + </component> - <component> - <key>org.exoplatform.application.gadget.GadgetRegistryService</key> - <type>org.exoplatform.application.gadget.impl.GadgetRegistryServiceImpl</type> - <init-params> - <value-param> - <name>gadgets.country</name> - <description>US</description> - <value>US</value> - </value-param> - <value-param> - <name>gadgets.language</name> - <description>en</description> - <value>en</value> - </value-param> - <value-param> - <name>gadgets.moduleId</name> - <description>0</description> - <value>0</value> - </value-param> - <value-param> - <name>gadgets.hostName</name> - <description>Gadget server url</description> - <value>eXoGadgetServer/gadgets</value> - </value-param> - <properties-param> - <name>developerInfo</name> - <description>The group that is allowed to develop gadgets</description> - <property name="developer.group" value="/platform/administrators"/> - </properties-param> - </init-params> - </component> + <component> + <key>org.exoplatform.application.gadget.GadgetRegistryService</key> + <type>org.exoplatform.application.gadget.impl.GadgetRegistryServiceImpl</type> + <init-params> + <value-param> + <name>gadgets.country</name> + <description>US</description> + <value>US</value> + </value-param> + <value-param> + <name>gadgets.language</name> + <description>en</description> + <value>en</value> + </value-param> + <value-param> + <name>gadgets.moduleId</name> + <description>0</description> + <value>0</value> + </value-param> + <value-param> + <name>gadgets.hostName</name> + <description>Gadget server url</description> + <value>eXoGadgetServer/gadgets</value> + </value-param> + <properties-param> + <name>developerInfo</name> + <description>The group that is allowed to develop gadgets</description> + <property name="developer.group" value="/platform/administrators"/> + </properties-param> + </init-params> + </component> - <component> - <key>org.exoplatform.application.gadget.GadgetDeployer</key> - <type>org.exoplatform.application.gadget.GadgetDeployer</type> - </component> + <component> + <key>org.exoplatform.application.gadget.GadgetDeployer</key> + <type>org.exoplatform.application.gadget.GadgetDeployer</type> + </component> <component> <key>org.exoplatform.application.registry.ApplicationRegistryService</key> @@ -521,36 +523,36 @@ </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.impl.ApplicationRegistryChromatticLifeCycle</type> - <init-params> - <value-param> - <name>name</name> - <value>app</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.impl.ContentRegistry</value> - <value>org.exoplatform.application.registry.impl.CategoryDefinition</value> - <value>org.exoplatform.application.registry.impl.ContentDefinition</value> - <value>org.exoplatform.application.gadget.impl.GadgetRegistry</value> - <value>org.exoplatform.application.gadget.impl.GadgetDefinition</value> - <value>org.exoplatform.application.gadget.impl.LocalGadgetData</value> - <value>org.exoplatform.application.gadget.impl.RemoteGadgetData</value> - <value>org.chromattic.ntdef.NTFile</value> - <value>org.chromattic.ntdef.NTFolder</value> - <value>org.chromattic.ntdef.NTResource</value> - </values-param> - </init-params> - </component-plugin> - </external-component-plugins> + <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.impl.ApplicationRegistryChromatticLifeCycle</type> + <init-params> + <value-param> + <name>domain-name</name> + <value>app</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.impl.ContentRegistry</value> + <value>org.exoplatform.application.registry.impl.CategoryDefinition</value> + <value>org.exoplatform.application.registry.impl.ContentDefinition</value> + <value>org.exoplatform.application.gadget.impl.GadgetRegistry</value> + <value>org.exoplatform.application.gadget.impl.GadgetDefinition</value> + <value>org.exoplatform.application.gadget.impl.LocalGadgetData</value> + <value>org.exoplatform.application.gadget.impl.RemoteGadgetData</value> + <value>org.chromattic.ntdef.NTFile</value> + <value>org.chromattic.ntdef.NTFolder</value> + <value>org.chromattic.ntdef.NTResource</value> + </values-param> + </init-params> + </component-plugin> + </external-component-plugins> </configuration> \ No newline at end of file Modified: portal/branches/wsrp-integration/web/portal/src/main/webapp/WEB-INF/conf/portal/portal-configuration.xml =================================================================== --- portal/branches/wsrp-integration/web/portal/src/main/webapp/WEB-INF/conf/portal/portal-configuration.xml 2009-12-20 10:23:34 UTC (rev 1078) +++ portal/branches/wsrp-integration/web/portal/src/main/webapp/WEB-INF/conf/portal/portal-configuration.xml 2009-12-20 15:05:20 UTC (rev 1079) @@ -24,202 +24,236 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd" xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"> - - <component> - <key>org.exoplatform.portal.pom.config.POMSessionManager</key> - <type>org.exoplatform.portal.pom.config.POMSessionManager</type> - </component> - <component> - <key>org.exoplatform.portal.pom.data.ModelDataStorage</key> - <type>org.exoplatform.portal.pom.config.POMDataStorage</type> - </component> + <component> + <key>org.exoplatform.portal.pom.config.POMSessionManager</key> + <type>org.exoplatform.portal.pom.config.POMSessionManager</type> + </component> - <component> - <key>org.exoplatform.portal.config.DataStorage</key> - <type>org.exoplatform.portal.config.DataStorageImpl</type> - </component> + <component> + <key>org.exoplatform.portal.pom.data.ModelDataStorage</key> + <type>org.exoplatform.portal.pom.config.POMDataStorage</type> + </component> - <component> - <key>org.exoplatform.portal.config.UserACL</key> - <type>org.exoplatform.portal.config.UserACL</type> - <init-params> - <value-param> - <name>super.user</name> - <description>administrator</description> - <value>root</value> - </value-param> - - <value-param> - <name>portal.administrator.groups</name> - <description>administrator</description> - <value>/platform/administrators</value> - </value-param> - - <value-param> - <name>portal.administrator.mstype</name> - <description>administrator</description> - <value>manager</value> - </value-param> - - <value-param> - <name>portal.creator.groups</name> - <description>groups with membership type have permission to manage portal</description> - <value>*:/platform/administrators,*:/organization/management/executive-board</value> - </value-param> - - <value-param> - <name>navigation.creator.membership.type</name> - <description>specific membership type have full permission with group navigation</description> - <value>manager</value> - </value-param> - <value-param> - <name>guests.group</name> - <description>guests group</description> - <value>/platform/guests</value> - </value-param> - <values-param> - <name>mandatory.groups</name> - <description>Groups that can not be deleted.</description> - <value>/platform/administrators</value> - <value>/platform/users</value> - <value>/platform/guests</value> - </values-param> - <values-param> - <name>mandatory.mstypes</name> - <description>Membership type that can not be deleted.</description> - <value>member</value> - </values-param> - </init-params> - </component> - - <component> - <key>org.exoplatform.portal.config.UserPortalConfigService</key> - <type>org.exoplatform.portal.config.UserPortalConfigService</type> - <component-plugins> - <component-plugin> - <name>new.portal.config.user.listener</name> - <set-method>initListener</set-method> - <type>org.exoplatform.portal.config.NewPortalConfigListener</type> - <description>this listener init the portal configuration</description> - <init-params> - <value-param> - <name>default.portal</name> - <description>The default portal for checking db is empty or not</description> - <value>classic</value> - </value-param> - <value-param> - <name>initializing.failure.ignore</name> - <description>In the run method, use try catch or not (value is true/false)</description> - <value>false</value> - </value-param> - <object-param> - <name>portal.configuration</name> - <description>description</description> - <object type="org.exoplatform.portal.config.NewPortalConfig"> - <field name="predefinedOwner"> - <collection type="java.util.HashSet"> - <value><string>classic</string></value> - </collection> - </field> - <field name="ownerType"><string>portal</string></field> - <field name="templateLocation"><string>war:/conf/portal/</string></field> - </object> - </object-param> - <object-param> - <name>group.configuration</name> - <description>description</description> - <object type="org.exoplatform.portal.config.NewPortalConfig"> - <field name="predefinedOwner"> - <collection type="java.util.HashSet"> - <value><string>platform/administrators</string></value> - <value><string>platform/users</string></value> - <value><string>platform/guests</string></value> - <value><string>organization/management/executive-board</string></value> - </collection> - </field> - <field name="ownerType"><string>group</string></field> - <field name="templateLocation"><string>war:/conf/portal</string></field> - </object> - </object-param> - <object-param> - <name>user.configuration</name> - <description>description</description> - <object type="org.exoplatform.portal.config.NewPortalConfig"> - <field name="predefinedOwner"> - <collection type="java.util.HashSet"> - <value><string>root</string></value> - <value><string>john</string></value> - <value><string>mary</string></value> - <value><string>demo</string></value> - <value><string>user</string></value> - </collection> - </field> - <field name="ownerType"><string>user</string></field> - <field name="templateLocation"><string>war:/conf/portal</string></field> - </object> - </object-param> - <object-param> - <name>page.templates</name> - <description>List of page templates</description> - <object type="org.exoplatform.portal.config.PageTemplateConfig"> - <field name="templates"> - <collection type="java.util.ArrayList"></collection> - </field> - <field name="location"><string>war:/conf/portal/template/pages</string></field> - </object> - </object-param> - </init-params> - </component-plugin> - </component-plugins> - </component> + <component> + <key>org.exoplatform.portal.config.DataStorage</key> + <type>org.exoplatform.portal.config.DataStorageImpl</type> + </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.portal.pom.config.MOPChromatticLifeCycle</type> + <component> + <key>org.exoplatform.portal.config.UserACL</key> + <type>org.exoplatform.portal.config.UserACL</type> <init-params> - <value-param> - <name>name</name> - <value>mop</value> - </value-param> - <value-param> - <name>workspace-name</name> - <value>portal-system</value> - </value-param> - <values-param> - <name>entities</name> - <value>org.gatein.mop.core.api.workspace.WorkspaceImpl</value> - <value>org.gatein.mop.core.api.workspace.UIContainerImpl</value> - <value>org.gatein.mop.core.api.workspace.UIWindowImpl</value> - <value>org.gatein.mop.core.api.workspace.UIBodyImpl</value> - <value>org.gatein.mop.core.api.workspace.PageImpl</value> - <value>org.gatein.mop.core.api.workspace.PageContainer</value> - <value>org.gatein.mop.core.api.workspace.NavigationImpl</value> - <value>org.gatein.mop.core.api.workspace.NavigationContainer</value> - <value>org.gatein.mop.core.api.workspace.PageLinkImpl</value> - <value>org.gatein.mop.core.api.workspace.URLLinkImpl</value> - <value>org.gatein.mop.core.api.workspace.PortalSiteContainer</value> - <value>org.gatein.mop.core.api.workspace.PortalSite</value> - <value>org.gatein.mop.core.api.workspace.GroupSiteContainer</value> - <value>org.gatein.mop.core.api.workspace.GroupSite</value> - <value>org.gatein.mop.core.api.workspace.UserSiteContainer</value> - <value>org.gatein.mop.core.api.workspace.UserSite</value> - <value>org.gatein.mop.core.api.workspace.content.CustomizationContainer</value> - <value>org.gatein.mop.core.api.workspace.content.ContextTypeContainer</value> - <value>org.gatein.mop.core.api.workspace.content.ContextType</value> - <value>org.gatein.mop.core.api.workspace.content.ContextSpecialization</value> - <value>org.gatein.mop.core.api.workspace.content.WorkspaceClone</value> - <value>org.gatein.mop.core.api.workspace.content.WorkspaceSpecialization</value> - <value>org.exoplatform.portal.pom.spi.portlet.PortletState</value> - <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> - </values-param> + <value-param> + <name>super.user</name> + <description>administrator</description> + <value>root</value> + </value-param> + + <value-param> + <name>portal.administrator.groups</name> + <description>administrator</description> + <value>/platform/administrators</value> + </value-param> + + <value-param> + <name>portal.administrator.mstype</name> + <description>administrator</description> + <value>manager</value> + </value-param> + + <value-param> + <name>portal.creator.groups</name> + <description>groups with membership type have permission to manage portal</description> + <value>*:/platform/administrators,*:/organization/management/executive-board</value> + </value-param> + + <value-param> + <name>navigation.creator.membership.type</name> + <description>specific membership type have full permission with group navigation</description> + <value>manager</value> + </value-param> + <value-param> + <name>guests.group</name> + <description>guests group</description> + <value>/platform/guests</value> + </value-param> + <values-param> + <name>mandatory.groups</name> + <description>Groups that can not be deleted.</description> + <value>/platform/administrators</value> + <value>/platform/users</value> + <value>/platform/guests</value> + </values-param> + <values-param> + <name>mandatory.mstypes</name> + <description>Membership type that can not be deleted.</description> + <value>member</value> + </values-param> </init-params> - </component-plugin> - </external-component-plugins> + </component> + <component> + <key>org.exoplatform.portal.config.UserPortalConfigService</key> + <type>org.exoplatform.portal.config.UserPortalConfigService</type> + <component-plugins> + <component-plugin> + <name>new.portal.config.user.listener</name> + <set-method>initListener</set-method> + <type>org.exoplatform.portal.config.NewPortalConfigListener</type> + <description>this listener init the portal configuration</description> + <init-params> + <value-param> + <name>default.portal</name> + <description>The default portal for checking db is empty or not</description> + <value>classic</value> + </value-param> + <value-param> + <name>initializing.failure.ignore</name> + <description>In the run method, use try catch or not (value is true/false)</description> + <value>false</value> + </value-param> + <object-param> + <name>portal.configuration</name> + <description>description</description> + <object type="org.exoplatform.portal.config.NewPortalConfig"> + <field name="predefinedOwner"> + <collection type="java.util.HashSet"> + <value> + <string>classic</string> + </value> + </collection> + </field> + <field name="ownerType"> + <string>portal</string> + </field> + <field name="templateLocation"> + <string>war:/conf/portal/</string> + </field> + </object> + </object-param> + <object-param> + <name>group.configuration</name> + <description>description</description> + <object type="org.exoplatform.portal.config.NewPortalConfig"> + <field name="predefinedOwner"> + <collection type="java.util.HashSet"> + <value> + <string>platform/administrators</string> + </value> + <value> + <string>platform/users</string> + </value> + <value> + <string>platform/guests</string> + </value> + <value> + <string>organization/management/executive-board</string> + </value> + </collection> + </field> + <field name="ownerType"> + <string>group</string> + </field> + <field name="templateLocation"> + <string>war:/conf/portal</string> + </field> + </object> + </object-param> + <object-param> + <name>user.configuration</name> + <description>description</description> + <object type="org.exoplatform.portal.config.NewPortalConfig"> + <field name="predefinedOwner"> + <collection type="java.util.HashSet"> + <value> + <string>root</string> + </value> + <value> + <string>john</string> + </value> + <value> + <string>mary</string> + </value> + <value> + <string>demo</string> + </value> + <value> + <string>user</string> + </value> + </collection> + </field> + <field name="ownerType"> + <string>user</string> + </field> + <field name="templateLocation"> + <string>war:/conf/portal</string> + </field> + </object> + </object-param> + <object-param> + <name>page.templates</name> + <description>List of page templates</description> + <object type="org.exoplatform.portal.config.PageTemplateConfig"> + <field name="templates"> + <collection type="java.util.ArrayList"></collection> + </field> + <field name="location"> + <string>war:/conf/portal/template/pages</string> + </field> + </object> + </object-param> + </init-params> + </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.portal.pom.config.MOPChromatticLifeCycle</type> + <init-params> + <value-param> + <name>domain-name</name> + <value>mop</value> + </value-param> + <value-param> + <name>workspace-name</name> + <value>portal-system</value> + </value-param> + <values-param> + <name>entities</name> + <value>org.gatein.mop.core.api.workspace.WorkspaceImpl</value> + <value>org.gatein.mop.core.api.workspace.UIContainerImpl</value> + <value>org.gatein.mop.core.api.workspace.UIWindowImpl</value> + <value>org.gatein.mop.core.api.workspace.UIBodyImpl</value> + <value>org.gatein.mop.core.api.workspace.PageImpl</value> + <value>org.gatein.mop.core.api.workspace.PageContainer</value> + <value>org.gatein.mop.core.api.workspace.NavigationImpl</value> + <value>org.gatein.mop.core.api.workspace.NavigationContainer</value> + <value>org.gatein.mop.core.api.workspace.PageLinkImpl</value> + <value>org.gatein.mop.core.api.workspace.URLLinkImpl</value> + <value>org.gatein.mop.core.api.workspace.PortalSiteContainer</value> + <value>org.gatein.mop.core.api.workspace.PortalSite</value> + <value>org.gatein.mop.core.api.workspace.GroupSiteContainer</value> + <value>org.gatein.mop.core.api.workspace.GroupSite</value> + <value>org.gatein.mop.core.api.workspace.UserSiteContainer</value> + <value>org.gatein.mop.core.api.workspace.UserSite</value> + <value>org.gatein.mop.core.api.workspace.content.CustomizationContainer</value> + <value>org.gatein.mop.core.api.workspace.content.ContextTypeContainer</value> + <value>org.gatein.mop.core.api.workspace.content.ContextType</value> + <value>org.gatein.mop.core.api.workspace.content.ContextSpecialization</value> + <value>org.gatein.mop.core.api.workspace.content.WorkspaceClone</value> + <value>org.gatein.mop.core.api.workspace.content.WorkspaceSpecialization</value> + <value>org.exoplatform.portal.pom.spi.portlet.PortletState</value> + <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> + </values-param> + </init-params> + </component-plugin> + </external-component-plugins> + </configuration> Modified: portal/branches/wsrp-integration/web/rest/pom.xml =================================================================== --- portal/branches/wsrp-integration/web/rest/pom.xml 2009-12-20 10:23:34 UTC (rev 1078) +++ portal/branches/wsrp-integration/web/rest/pom.xml 2009-12-20 15:05:20 UTC (rev 1079) @@ -19,44 +19,44 @@ --> -<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"> - <parent> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.web</artifactId> - <version>3.0.0-Beta04-SNAPSHOT</version> - </parent> +<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"> + <parent> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.web</artifactId> + <version>3.0.0-Beta04-SNAPSHOT</version> + </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>exo.portal.web.rest</artifactId> - <packaging>war</packaging> - <name>GateIn Portal Web REST application</name> + <modelVersion>4.0.0</modelVersion> + <artifactId>exo.portal.web.rest</artifactId> + <packaging>war</packaging> + <name>GateIn Portal Web REST application</name> - <dependencies> - <dependency> - <groupId>org.exoplatform.ws</groupId> - <artifactId>exo.ws.frameworks.servlet</artifactId> - <version>${org.exoplatform.ws.version}</version> - <scope>provided</scope> - </dependency> - </dependencies> + <dependencies> + <dependency> + <groupId>org.exoplatform.ws</groupId> + <artifactId>exo.ws.frameworks.servlet</artifactId> + <scope>provided</scope> + </dependency> + </dependencies> - <build> - <finalName>rest</finalName> - <plugins> - <plugin> - <artifactId>maven-war-plugin</artifactId> - <configuration> - <!-- This is broken in maven-war-plugin 2.0, works in 2.0.1 --> - <warSourceExcludes>WEB-INF/lib/*.jar</warSourceExcludes> - <archive> - <manifest> - <addClasspath>false</addClasspath> - <classpathPrefix>lib/</classpathPrefix> - </manifest> - </archive> - </configuration> - </plugin> - </plugins> - </build> + <build> + <finalName>rest</finalName> + <plugins> + <plugin> + <artifactId>maven-war-plugin</artifactId> + <configuration> + <!-- This is broken in maven-war-plugin 2.0, works in 2.0.1 --> + <warSourceExcludes>WEB-INF/lib/*.jar</warSourceExcludes> + <archive> + <manifest> + <addClasspath>false</addClasspath> + <classpathPrefix>lib/</classpathPrefix> + </manifest> + </archive> + </configuration> + </plugin> + </plugins> + </build> </project> Modified: portal/branches/wsrp-integration/webui/core/pom.xml =================================================================== --- portal/branches/wsrp-integration/webui/core/pom.xml 2009-12-20 10:23:34 UTC (rev 1078) +++ portal/branches/wsrp-integration/webui/core/pom.xml 2009-12-20 15:05:20 UTC (rev 1079) @@ -19,64 +19,64 @@ --> -<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"> - <parent> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.webui</artifactId> - <version>3.0.0-Beta04-SNAPSHOT</version> - </parent> - - <modelVersion>4.0.0</modelVersion> - <artifactId>exo.portal.webui.core</artifactId> - <packaging>jar</packaging> - <name>GateIn Portal WebUI Core</name> - - <properties> - <maven.test.skip>true</maven.test.skip> - </properties> - - <dependencies> - <dependency> +<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"> + <parent> <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.web</artifactId> + <artifactId>exo.portal.webui</artifactId> <version>3.0.0-Beta04-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.gatein.common</groupId> - <artifactId>common-common</artifactId> - <version>${org.gatein.common.version}</version> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.jibx</groupId> - <artifactId>maven-jibx-plugin</artifactId> - <version>${org.jibx.version}</version> - <configuration> - <directory>src/main/resources</directory> - <includes> - <includes>binding.xml</includes> - </includes> - </configuration> - <executions> - <execution> - <goals> - <goal>bind</goal> - </goals> - </execution> - </executions> - </plugin> + </parent> - <!-- --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <compilerArgument>-proc:none</compilerArgument> - </configuration> - </plugin> - </plugins> - </build> + <modelVersion>4.0.0</modelVersion> + <artifactId>exo.portal.webui.core</artifactId> + <packaging>jar</packaging> + <name>GateIn Portal WebUI Core</name> + + <properties> + <maven.test.skip>true</maven.test.skip> + </properties> + + <dependencies> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.web</artifactId> + <version>3.0.0-Beta04-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.gatein.common</groupId> + <artifactId>common-common</artifactId> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.jibx</groupId> + <artifactId>maven-jibx-plugin</artifactId> + <version>${org.jibx.version}</version> + <configuration> + <directory>src/main/resources</directory> + <includes> + <includes>binding.xml</includes> + </includes> + </configuration> + <executions> + <execution> + <goals> + <goal>bind</goal> + </goals> + </execution> + </executions> + </plugin> + + <!-- --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <compilerArgument>-proc:none</compilerArgument> + </configuration> + </plugin> + </plugins> + </build> </project> Modified: portal/branches/wsrp-integration/webui/core/src/main/java/org/exoplatform/webui/form/UIFormTextAreaInput.java =================================================================== --- portal/branches/wsrp-integration/webui/core/src/main/java/org/exoplatform/webui/form/UIFormTextAreaInput.java 2009-12-20 10:23:34 UTC (rev 1078) +++ portal/branches/wsrp-integration/webui/core/src/main/java/org/exoplatform/webui/form/UIFormTextAreaInput.java 2009-12-20 15:05:20 UTC (rev 1079) @@ -1,16 +1,16 @@ /** * 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 @@ -23,33 +23,30 @@ import java.io.Writer; -/** - * Represents a textarea element - * The value is stored in UIFormInputBase - */ +/** Represents a textarea element The value is stored in UIFormInputBase */ public class UIFormTextAreaInput extends UIFormInputBase<String> { - /** - * number of rows - */ + /** number of rows */ private int rows = 10; - /** - * number of columns - */ + /** number of columns */ private int columns = 30; - public UIFormTextAreaInput(String name, String bindingExpression, String value) { + public UIFormTextAreaInput(String name, String bindingExpression, String value) + { super(name, bindingExpression, String.class); - this.value_ = value ; + this.value_ = value; } - + @SuppressWarnings("unused") - public void decode(Object input, WebuiRequestContext context) throws Exception { - String val = (String) input ; - if((val == null || val.length() == 0)) return ; - value_ = val ; - if(value_ != null && value_.length() == 0) value_ = null ; + public void decode(Object input, WebuiRequestContext context) throws Exception + { + String val = (String)input; + value_ = val; + if (value_ != null && value_.length() == 0) + { + value_ = null; + } } public void processRender(WebuiRequestContext context) throws Exception @@ -57,20 +54,30 @@ Writer w = context.getWriter(); String value = getValue(); if (value == null) + { value = getDefaultValue(); + } w.append("<textarea class='textarea' name='").append(getName()).append("' id='").append(getId()).append("'"); if (readonly_) + { w.write(" readonly "); + } if (!enable_) + { w.write(" disabled "); + } w.append(" rows=\"").append(String.valueOf(rows)).append("\""); w.append(" cols=\"").append(String.valueOf(columns)).append("\""); w.write(">"); if (value != null) + { w.write(value); + } w.write("</textarea>"); if (this.isMandatory()) + { w.write(" *"); + } } public int getColumns() Modified: portal/branches/wsrp-integration/webui/portal/pom.xml =================================================================== --- portal/branches/wsrp-integration/webui/portal/pom.xml 2009-12-20 10:23:34 UTC (rev 1078) +++ portal/branches/wsrp-integration/webui/portal/pom.xml 2009-12-20 15:05:20 UTC (rev 1079) @@ -19,80 +19,79 @@ --> -<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"> - <parent> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.webui</artifactId> - <version>3.0.0-Beta04-SNAPSHOT</version> - </parent> +<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"> + <parent> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.webui</artifactId> + <version>3.0.0-Beta04-SNAPSHOT</version> + </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>exo.portal.webui.portal</artifactId> - <packaging>jar</packaging> - <name>GateIn Portal WebUI Portal</name> + <modelVersion>4.0.0</modelVersion> + <artifactId>exo.portal.webui.portal</artifactId> + <packaging>jar</packaging> + <name>GateIn Portal WebUI Portal</name> - <dependencies> - <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.commons</artifactId> - </dependency> + <dependencies> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.commons</artifactId> + </dependency> - <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.component.common</artifactId> - </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.component.common</artifactId> + </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.resources</artifactId> - <version>3.0.0-Beta04-SNAPSHOT</version> - </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.resources</artifactId> + <version>3.0.0-Beta04-SNAPSHOT</version> + </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.webui.core</artifactId> - <version>3.0.0-Beta04-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.webui.eXo</artifactId> - <version>3.0.0-Beta04-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.portal</artifactId> - <version>3.0.0-Beta04-SNAPSHOT</version> - </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.webui.core</artifactId> + <version>3.0.0-Beta04-SNAPSHOT</version> + </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.application-registry</artifactId> - <version>3.0.0-Beta04-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.pc</artifactId> - <version>3.0.0-Beta04-SNAPSHOT</version> - </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.webui.eXo</artifactId> + <version>3.0.0-Beta04-SNAPSHOT</version> + </dependency> - <dependency> - <groupId>org.exoplatform.jcr</groupId> - <artifactId>exo.jcr.component.ext</artifactId> - <version>${org.exoplatform.jcr.version}</version> - </dependency> - <dependency> - <groupId>org.apache.shindig</groupId> - <artifactId>shindig-common</artifactId> - <version>${org.shindig.version}</version> - <type>jar</type> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.gadgets-core</artifactId> - <version>3.0.0-Beta04-SNAPSHOT</version> - </dependency> - </dependencies> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.portal</artifactId> + <version>3.0.0-Beta04-SNAPSHOT</version> + </dependency> + + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.application-registry</artifactId> + <version>3.0.0-Beta04-SNAPSHOT</version> + </dependency> + + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.pc</artifactId> + <version>3.0.0-Beta04-SNAPSHOT</version> + </dependency> + + <dependency> + <groupId>org.exoplatform.jcr</groupId> + <artifactId>exo.jcr.component.ext</artifactId> + </dependency> + <dependency> + <groupId>org.apache.shindig</groupId> + <artifactId>shindig-common</artifactId> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.gadgets-core</artifactId> + <version>3.0.0-Beta04-SNAPSHOT</version> + </dependency> + </dependencies> </project> Modified: portal/branches/wsrp-integration/webui/portal/src/main/java/org/exoplatform/portal/webui/application/ModelAdapter.java =================================================================== --- portal/branches/wsrp-integration/webui/portal/src/main/java/org/exoplatform/portal/webui/application/ModelAdapter.java 2009-12-20 10:23:34 UTC (rev 1078) +++ portal/branches/wsrp-integration/webui/portal/src/main/java/org/exoplatform/portal/webui/application/ModelAdapter.java 2009-12-20 15:05:20 UTC (rev 1079) @@ -84,10 +84,10 @@ @Override public StatefulPortletContext<ExoPortletState> getPortletContext(ExoContainer container, String applicationId, - ApplicationState<Portlet> applicationState) throws Exception + ApplicationState<Portlet> applicationState) throws Exception { DataStorage dataStorage = (DataStorage)container.getComponentInstanceOfType(DataStorage.class); - Portlet preferences = dataStorage.load(applicationState); + Portlet preferences = dataStorage.load(applicationState, ApplicationType.PORTLET); PortletContext producerOfferedPortletContext = getProducerOfferedPortletContext(applicationId); ExoPortletState map = new ExoPortletState(producerOfferedPortletContext.getId()); if (preferences != null) @@ -102,7 +102,7 @@ @Override public ApplicationState<Portlet> update(ExoContainer container, ExoPortletState updateState, - ApplicationState<Portlet> applicationState) throws Exception + ApplicationState<Portlet> applicationState) throws Exception { // Compute new preferences PortletBuilder builder = new PortletBuilder(); @@ -142,15 +142,19 @@ TransientApplicationState<Portlet> transientState = (TransientApplicationState<Portlet>)applicationState; Portlet pref = transientState.getContentState(); if (pref == null) + { pref = new Portlet(); + } return pref; } else { DataStorage dataStorage = (DataStorage)container.getComponentInstanceOfType(DataStorage.class); - Portlet pref = dataStorage.load(applicationState); + Portlet pref = dataStorage.load(applicationState, ApplicationType.PORTLET); if (pref == null) + { pref = new Portlet(); + } return pref; } } @@ -167,7 +171,7 @@ @Override public StatefulPortletContext<ExoPortletState> getPortletContext(ExoContainer container, String applicationId, - ApplicationState<Gadget> applicationState) throws Exception + ApplicationState<Gadget> applicationState) throws Exception { GadgetRegistryService gadgetService = (GadgetRegistryService)container.getComponentInstanceOfType(GadgetRegistryService.class); @@ -181,7 +185,7 @@ @Override public ApplicationState<Gadget> update(ExoContainer container, ExoPortletState updateState, - ApplicationState<Gadget> gadgetApplicationState) throws Exception + ApplicationState<Gadget> gadgetApplicationState) throws Exception { throw new UnsupportedOperationException("Cannot edit gadget preferences"); } @@ -216,10 +220,10 @@ @Override public StatefulPortletContext<WSRP> getPortletContext(ExoContainer container, String applicationId, - ApplicationState<WSRP> state) throws Exception + ApplicationState<WSRP> state) throws Exception { DataStorage dataStorage = (DataStorage)container.getComponentInstanceOfType(DataStorage.class); - WSRP wsrp = dataStorage.load(state); + WSRP wsrp = dataStorage.load(state, ApplicationType.WSRP_PORTLET); if (wsrp == null) { wsrp = new WSRP(); @@ -250,10 +254,10 @@ public abstract PortletContext getProducerOfferedPortletContext(String applicationId); public abstract StatefulPortletContext<C> getPortletContext(ExoContainer container, String applicationId, - ApplicationState<S> applicationState) throws Exception; + ApplicationState<S> applicationState) throws Exception; public abstract ApplicationState<S> update(ExoContainer container, C updateState, - ApplicationState<S> applicationState) throws Exception; + ApplicationState<S> applicationState) throws Exception; /** * Returns the state of the gadget as preferences or null if the preferences cannot be edited as such. Modified: portal/branches/wsrp-integration/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIGadget.java =================================================================== --- portal/branches/wsrp-integration/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIGadget.java 2009-12-20 10:23:34 UTC (rev 1078) +++ portal/branches/wsrp-integration/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIGadget.java 2009-12-20 15:05:20 UTC (rev 1079) @@ -1,16 +1,16 @@ /** * 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 @@ -24,8 +24,8 @@ import org.exoplatform.container.ExoContainerContext; import org.exoplatform.portal.config.DataStorage; import org.exoplatform.portal.config.model.ApplicationState; +import org.exoplatform.portal.config.model.ApplicationType; import org.exoplatform.portal.config.model.Properties; -import org.exoplatform.portal.webui.container.UIContainer; import org.exoplatform.portal.webui.util.Util; import org.exoplatform.web.WebAppController; import org.exoplatform.web.application.gadget.GadgetApplication; @@ -41,10 +41,7 @@ import java.util.Random; import java.util.UUID; -/** - * Created by The eXo Platform SAS Author : dang.tung tungcnw(a)gmail.com May 06, - * 2008 - */ +/** Created by The eXo Platform SAS Author : dang.tung tungcnw(a)gmail.com May 06, 2008 */ @ComponentConfig(template = "system:/groovy/portal/webui/application/UIGadget.gtmpl", events = { @EventConfig(listeners = UIGadget.SaveUserPrefActionListener.class), @EventConfig(listeners = UIGadget.SetNoCacheActionListener.class), @@ -90,7 +87,7 @@ /** * Initializes a newly created <code>UIGadget</code> object - * + * * @throws Exception if can't initialize object */ public UIGadget() @@ -157,7 +154,7 @@ /** * Gets name of gadget application - * + * * @return the string represents name of gadget application */ public String getApplicationName() @@ -166,9 +163,8 @@ } /** - * Gets Properties of gadget application such as locationX, locationY in - * desktop page - * + * Gets Properties of gadget application such as locationX, locationY in desktop page + * * @return all properties of gadget application * @see org.exoplatform.portal.config.model.Application * @see org.exoplatform.portal.config.model.Properties @@ -176,14 +172,15 @@ public Properties getProperties() { if (properties_ == null) + { properties_ = new Properties(); + } return properties_; } /** - * Sets Properties of gadget application such as locationX, locationY in - * desktop page - * + * Sets Properties of gadget application such as locationX, locationY in desktop page + * * @param properties Properties that is the properties of gadget application * @see org.exoplatform.portal.config.model.Properties * @see org.exoplatform.portal.config.model.Application @@ -226,7 +223,7 @@ /** * Gets GadgetApplication by GadgedRegistryService - * + * * @return Gadget Application * @throws Exception */ @@ -257,9 +254,8 @@ /** * Gets Url of gadget application, it saved before by GadgetRegistryService - * - * @return url of gadget application, such as - * "http://www.google.com/ig/modules/horoscope.xml" + * + * @return url of gadget application, such as "http://www.google.com/ig/modules/horoscope.xml" */ public String getUrl() { @@ -274,9 +270,11 @@ private GadgetRegistryService getGadgetRegistryService() { if (gadgetRegistryService == null) + { gadgetRegistryService = (GadgetRegistryService)ExoContainerContext.getCurrentContainer().getComponentInstanceOfType( GadgetRegistryService.class); + } return gadgetRegistryService; } @@ -336,7 +334,9 @@ public String getView() { if (view != null) + { return view; + } return HOME_VIEW; } @@ -347,7 +347,7 @@ /** * Gets user preference of gadget application - * + * * @return the string represents user preference of gadget application * @throws Exception * @throws Exception when can't convert object to string @@ -355,14 +355,13 @@ public String getUserPref() throws Exception { DataStorage service = getApplicationComponent(DataStorage.class); - org.exoplatform.portal.pom.spi.gadget.Gadget pp = service.load(state); + org.exoplatform.portal.pom.spi.gadget.Gadget pp = service.load(state, ApplicationType.GADGET); return pp != null ? pp.getUserPref() : null; } /** - * Initializes a newly created <code>SaveUserPrefActionListener</code> - * object - * + * Initializes a newly created <code>SaveUserPrefActionListener</code> object + * * @throws Exception if can't initialize object */ static public class SaveUserPrefActionListener extends EventListener<UIGadget> Modified: portal/branches/wsrp-integration/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalForm.java =================================================================== --- portal/branches/wsrp-integration/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalForm.java 2009-12-20 10:23:34 UTC (rev 1078) +++ portal/branches/wsrp-integration/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalForm.java 2009-12-20 15:05:20 UTC (rev 1079) @@ -50,8 +50,8 @@ import org.exoplatform.webui.core.model.SelectItemCategory; import org.exoplatform.webui.core.model.SelectItemOption; import org.exoplatform.webui.event.Event; +import org.exoplatform.webui.event.Event.Phase; import org.exoplatform.webui.event.EventListener; -import org.exoplatform.webui.event.Event.Phase; import org.exoplatform.webui.form.UIFormInputItemSelector; import org.exoplatform.webui.form.UIFormInputSet; import org.exoplatform.webui.form.UIFormSelectBox; @@ -61,8 +61,8 @@ import org.exoplatform.webui.form.validator.MandatoryValidator; import org.exoplatform.webui.form.validator.StringLengthValidator; import org.exoplatform.webui.organization.UIListPermissionSelector; +import org.exoplatform.webui.organization.UIListPermissionSelector.EmptyIteratorValidator; import org.exoplatform.webui.organization.UIPermissionSelector; -import org.exoplatform.webui.organization.UIListPermissionSelector.EmptyIteratorValidator; import java.util.ArrayList; import java.util.Collection; @@ -105,7 +105,7 @@ setSelectedTab(uiTemplateInput.getId()); createDefaultItem(); - UIFormInputSet uiPortalSetting = this.<UIFormInputSet> getChildById("PortalSetting"); + UIFormInputSet uiPortalSetting = this.<UIFormInputSet>getChildById("PortalSetting"); UIFormStringInput uiNameInput = uiPortalSetting.getUIStringInput(FIELD_NAME); uiNameInput.setEditable(true); @@ -142,9 +142,22 @@ UserPortalConfigService service = this.getApplicationComponent(UserPortalConfigService.class); PortalRequestContext prContext = Util.getPortalRequestContext(); - UserPortalConfig userConfig = service.getUserPortalConfig(getPortalOwner(), prContext.getRemoteUser()); - UIPortal editPortal = this.createUIComponent(UIPortal.class, null, null); - PortalDataMapper.toUIPortal(editPortal, userConfig); + UIPortal editPortal = null; + UIPortalApplication uiPortalApp = Util.getUIPortalApplication(); + UIEditInlineWorkspace uiEditWS = uiPortalApp.<UIWorkingWorkspace>getChildById(UIPortalApplication.UI_WORKING_WS_ID). + getChild(UIEditInlineWorkspace.class); + if (uiPortalApp.getModeState() != UIPortalApplication.NORMAL_MODE && + uiEditWS != null && uiEditWS.getUIComponent() != null && + (uiEditWS.getUIComponent() instanceof UIPortal)) + { + editPortal = (UIPortal)uiEditWS.getUIComponent(); + } + else + { + UserPortalConfig userConfig = service.getUserPortalConfig(getPortalOwner(), prContext.getRemoteUser()); + editPortal = this.createUIComponent(UIPortal.class, null, null); + PortalDataMapper.toUIPortal(editPortal, userConfig); + } invokeGetBindingBean(editPortal); ((UIFormStringInput)getChild(UIFormInputSet.class).getChildById(FIELD_NAME)) @@ -252,14 +265,14 @@ public void execute(Event<UIPortalForm> event) throws Exception { UIPortalForm uiForm = event.getSource(); - + UserPortalConfigService service = uiForm.getApplicationComponent(UserPortalConfigService.class); PortalRequestContext prContext = Util.getPortalRequestContext(); UserPortalConfig userConfig = service.getUserPortalConfig(uiForm.getPortalOwner(), prContext.getRemoteUser()); UIPortal uiPortal = uiForm.createUIComponent(UIPortal.class, null, null); PortalDataMapper.toUIPortal(uiPortal, userConfig); - + UIPortalApplication uiPortalApp = (UIPortalApplication)prContext.getUIApplication(); uiForm.invokeSetBindingBean(uiPortal); //uiPortal.refreshNavigation(localeConfigService.getLocaleConfig(uiPortal.getLocale()).getLocale()) ; @@ -274,9 +287,9 @@ UIWorkingWorkspace uiWorkingWS = uiPortalApp.findFirstComponentOfType(UIWorkingWorkspace.class); UIEditInlineWorkspace uiEditWS = uiWorkingWS.getChild(UIEditInlineWorkspace.class); UIPortal editPortal = (UIPortal)uiEditWS.getUIComponent(); - uiForm.invokeSetBindingBean(editPortal); + uiForm.invokeSetBindingBean(editPortal); } - + UIMaskWorkspace uiMaskWorkspace = uiForm.getParent(); uiMaskWorkspace.setUIComponent(null); event.getRequestContext().addUIComponentToUpdateByAjax(uiMaskWorkspace); Modified: portal/branches/wsrp-integration/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIPortalApplication.java =================================================================== --- portal/branches/wsrp-integration/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIPortalApplication.java 2009-12-20 10:23:34 UTC (rev 1078) +++ portal/branches/wsrp-integration/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIPortalApplication.java 2009-12-20 15:05:20 UTC (rev 1079) @@ -1,16 +1,16 @@ /** * 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 @@ -57,13 +57,11 @@ import java.util.Set; /** - * This extends the UIApplication and hence is a sibling of UIPortletApplication - * (used by any eXo Portlets as the Parent class to build the portlet component - * tree). The UIPortalApplication is responsible to build its subtree according - * to some configuration parameters. If all components are displayed it is - * composed of 2 UI components: -UIWorkingWorkSpace: the right part that can - * display the normal or webos portal layouts - * - UIPopupWindow: a popup window that display or not + * This extends the UIApplication and hence is a sibling of UIPortletApplication (used by any eXo Portlets as the Parent + * class to build the portlet component tree). The UIPortalApplication is responsible to build its subtree according to + * some configuration parameters. If all components are displayed it is composed of 2 UI components: + * -UIWorkingWorkSpace: the right part that can display the normal or webos portal layouts - UIPopupWindow: a popup + * window that display or not */ @ComponentConfig(lifecycle = UIPortalApplicationLifecycle.class, template = "system:/groovy/portal/webui/workspace/UIPortalApplication.gtmpl") public class UIPortalApplication extends UIApplication @@ -101,16 +99,13 @@ private boolean isSessionOpen = false; /** - * The constructor of this class is used to build the tree of UI components - * that will be aggregated in the portal page. 1) The component is stored in - * the current PortalRequestContext ThreadLocal 2) The configuration for the - * portal associated with the current user request is extracted from the - * PortalRequestContext 3) Then according to the context path, either a public - * or private portal is initiated. Usually a public portal does not contain - * the left column and only the private one has it. 4) The skin to use is - * setup 5) Finally, the current component is associated with the current - * portal owner - * + * The constructor of this class is used to build the tree of UI components that will be aggregated in the portal + * page. 1) The component is stored in the current PortalRequestContext ThreadLocal 2) The configuration for the + * portal associated with the current user request is extracted from the PortalRequestContext 3) Then according to + * the context path, either a public or private portal is initiated. Usually a public portal does not contain the + * left column and only the private one has it. 4) The skin to use is setup 5) Finally, the current component is + * associated with the current portal owner + * * @throws Exception */ public UIPortalApplication() throws Exception @@ -119,7 +114,9 @@ PortalRequestContext context = PortalRequestContext.getCurrentInstance(); userPortalConfig_ = (UserPortalConfig)context.getAttribute(UserPortalConfig.class); if (userPortalConfig_ == null) + { throw new Exception("Can't load user portal config"); + } // dang.tung - set portal language by user preference -> browser -> default // ------------------------------------------------------------------------------ @@ -134,15 +131,13 @@ if (userProfile != null) { portalLanguage = userProfile.getUserInfoMap().get("user.language"); - if(portalLanguage == null) - { - portalLanguage = "en"; - } } else { if (log.isWarnEnabled()) + { log.warn("Could not load user profile for " + user + ". Using default portal locale."); + } } } localeConfig = localeConfigService.getLocaleConfig(portalLanguage); @@ -166,7 +161,9 @@ String currentSkin = userPortalConfig_.getPortalConfig().getSkin(); if (currentSkin != null && currentSkin.trim().length() > 0) + { skin_ = currentSkin; + } setOwner(context.getPortalOwner()); } @@ -211,9 +208,8 @@ } /** - * @deprecated use the Mode State instead - * * @return True if the Portal is not in the normal mode + * @deprecated use the Mode State instead */ public boolean isEditing() { @@ -285,13 +281,11 @@ } /** - * Returns a list of portlets skin that have to be added in the HTML head tag. - * The skin can directly point to a real css file (this is the case of all the - * porlet included in a page) or point to a servlet that agregates different - * portlet CSS files into one to lower the number of HTTP calls (this is the - * case in production as all the portlets included in a portal, and hence - * there on everypage are merged into a single CSS file) - * + * Returns a list of portlets skin that have to be added in the HTML head tag. The skin can directly point to a real + * css file (this is the case of all the porlet included in a page) or point to a servlet that agregates different + * portlet CSS files into one to lower the number of HTTP calls (this is the case in production as all the portlets + * included in a portal, and hence there on everypage are merged into a single CSS file) + * * @return the portlet skins */ public Set<Skin> getPortletSkins() @@ -341,11 +335,10 @@ } /** - * The central area is called the WorkingWorkspace. It is composed of: 1) A - * UIPortal child which is filled with portal data using the PortalDataMapper - * helper tool 2) A UIPortalToolPanel which is not rendered by default A + * The central area is called the WorkingWorkspace. It is composed of: 1) A UIPortal child which is filled with + * portal data using the PortalDataMapper helper tool 2) A UIPortalToolPanel which is not rendered by default A * UIMaskWorkspace is also added to provide powerfull focus only popups - * + * * @throws Exception */ private void addWorkingWorkspace() throws Exception @@ -380,13 +373,11 @@ } /** - * The processDecode() method is doing 3 actions: 1) if the nodePath is null - * (case of the first request) a call to super.processDecode(context) is made - * and we end the method here 2) if the nodePath exist but is equals to the - * current one then we also call super and stops here 3) if the requested - * nodePath is not equals to the current one , then an event of type - * PageNodeEvent.CHANGE_PAGE_NODE is sent to the asociated EventListener; a - * call to super is then done + * The processDecode() method is doing 3 actions: 1) if the nodePath is null (case of the first request) a call to + * super.processDecode(context) is made and we end the method here 2) if the nodePath exist but is equals to the + * current one then we also call super and stops here 3) if the requested nodePath is not equals to the current one , + * then an event of type PageNodeEvent.CHANGE_PAGE_NODE is sent to the asociated EventListener; a call to super is + * then done */ public void processDecode(WebuiRequestContext context) throws Exception { @@ -405,23 +396,17 @@ } /** - * The processrender() method handles the creation of the returned HTML either - * for a full page render or in the case of an AJAX call The first request, - * Ajax is not enabled (means no ajaxRequest parameter in the request) and - * hence the super.processRender() method is called. This will hence call the - * processrender() of the Lifecycle object as this method is not overidden in - * UIPortalApplicationLifecycle. There we simply render the bounded template - * (groovy usually). Note that bounded template are also defined in component - * annotations, so for the current class it is UIPortalApplication.gtmpl On - * second calls, request have the "ajaxRequest" parameter set to true in the - * URL. In that case the algorithm is a bit more complex: a) The list of - * components that should be updated is extracted using the - * context.getUIComponentToUpdateByAjax() method. That list was setup during - * the process action phase b) Portlets and other UI components to update are - * split in 2 different lists c) Portlets full content are returned and set - * with the tag <div class="PortalResponse"> d) Block to updates (which are UI - * components) are set within the <div class="PortalResponseData"> tag e) Then - * the scripts and the skins to reload are set in the <div + * The processrender() method handles the creation of the returned HTML either for a full page render or in the case + * of an AJAX call The first request, Ajax is not enabled (means no ajaxRequest parameter in the request) and hence + * the super.processRender() method is called. This will hence call the processrender() of the Lifecycle object as + * this method is not overidden in UIPortalApplicationLifecycle. There we simply render the bounded template (groovy + * usually). Note that bounded template are also defined in component annotations, so for the current class it is + * UIPortalApplication.gtmpl On second calls, request have the "ajaxRequest" parameter set to true in the URL. In + * that case the algorithm is a bit more complex: a) The list of components that should be updated is extracted using + * the context.getUIComponentToUpdateByAjax() method. That list was setup during the process action phase b) Portlets + * and other UI components to update are split in 2 different lists c) Portlets full content are returned and set + * with the tag <div class="PortalResponse"> d) Block to updates (which are UI components) are set within the <div + * class="PortalResponseData"> tag e) Then the scripts and the skins to reload are set in the <div * class="PortalResponseScript"> */ public void processRender(WebuiRequestContext context) throws Exception @@ -439,7 +424,9 @@ UIMaskWorkspace uiMaskWS = getChildById(UIPortalApplication.UI_MASK_WS_ID); if (uiMaskWS.isUpdated()) + { pcontext.addUIComponentToUpdateByAjax(uiMaskWS); + } if (getUIPopupMessages().hasMessage()) { pcontext.addUIComponentToUpdateByAjax(getUIPopupMessages()); @@ -454,9 +441,13 @@ for (UIComponent uicomponent : list) { if (uicomponent instanceof UIPortlet) + { uiPortlets.add((UIPortlet)uicomponent); + } else + { uiDataComponents.add(uicomponent); + } } } w.write("<div class=\"PortalResponse\">"); @@ -464,7 +455,9 @@ for (UIComponent uicomponent : uiDataComponents) { if (log.isDebugEnabled()) + { log.debug("AJAX call: Need to refresh the UI component " + uicomponent.getName()); + } renderBlockToUpdate(uicomponent, context, w); } w.write("</div>"); @@ -474,7 +467,9 @@ for (UIPortlet uiPortlet : uiPortlets) { if (log.isDebugEnabled()) + { log.debug("AJAX call: Need to refresh the Portlet " + uiPortlet.getId()); + } w.write("<div class=\"PortletResponse\" style=\"display: none\">"); w.append("<div class=\"PortletResponsePortletId\">" + uiPortlet.getId() + "</div>"); @@ -511,7 +506,9 @@ private String getAddSkinScript(Set<UIComponent> updateComponents) { if (updateComponents == null) + { return null; + } List<UIPortlet> uiportlets = new ArrayList<UIPortlet>(); for (UIComponent uicomponent : updateComponents) { @@ -539,7 +536,9 @@ { SkinConfig skinConfig = skinService.getSkin(skinId, skin_); if (skinConfig != null) + { skins.add(skinConfig); + } } } StringBuilder b = new StringBuilder(1000);