[gatein-commits] gatein SVN: r5878 - in portal/branches/wsrp-extraction: wsrp-integration and 40 other directories.

Author: chris.laprun(a)jboss.com Date: 2011-02-14 10:03:03 -0500 (Mon, 14 Feb 2011) New Revision: 5878 Added: portal/branches/wsrp-extraction/wsrp-integration/ portal/branches/wsrp-extraction/wsrp-integration/extension-component/ portal/branches/wsrp-extraction/wsrp-integration/extension-component/pom.xml portal/branches/wsrp-extraction/wsrp-integration/extension-component/src/ portal/branches/wsrp-extraction/wsrp-integration/extension-component/src/main/ portal/branches/wsrp-extraction/wsrp-integration/extension-component/src/main/java/ portal/branches/wsrp-extraction/wsrp-integration/extension-component/src/main/java/org/ portal/branches/wsrp-extraction/wsrp-integration/extension-component/src/main/java/org/gatein/ portal/branches/wsrp-extraction/wsrp-integration/extension-component/src/main/java/org/gatein/integration/ portal/branches/wsrp-extraction/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/ portal/branches/wsrp-extraction/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/SessionEventListenerAndBroadcaster.java portal/branches/wsrp-extraction/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/WSRPServiceIntegration.java portal/branches/wsrp-extraction/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/jcr/ portal/branches/wsrp-extraction/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/jcr/JCRPersister.java portal/branches/wsrp-extraction/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/structure/ portal/branches/wsrp-extraction/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/structure/MOPConsumerStructureProvider.java portal/branches/wsrp-extraction/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/structure/MOPPortalStructureAccess.java portal/branches/wsrp-extraction/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/structure/PortalStructureAccess.java portal/branches/wsrp-extraction/wsrp-integration/extension-component/src/main/resources/ portal/branches/wsrp-extraction/wsrp-integration/extension-component/src/main/resources/conf/ portal/branches/wsrp-extraction/wsrp-integration/extension-component/src/main/resources/conf/wsrp-producer-config.xml portal/branches/wsrp-extraction/wsrp-integration/extension-component/src/test/ portal/branches/wsrp-extraction/wsrp-integration/extension-component/src/test/java/ portal/branches/wsrp-extraction/wsrp-integration/extension-component/src/test/java/org/ portal/branches/wsrp-extraction/wsrp-integration/extension-component/src/test/java/org/gatein/ portal/branches/wsrp-extraction/wsrp-integration/extension-component/src/test/java/org/gatein/integration/ portal/branches/wsrp-extraction/wsrp-integration/extension-component/src/test/java/org/gatein/integration/wsrp/ portal/branches/wsrp-extraction/wsrp-integration/extension-component/src/test/java/org/gatein/integration/wsrp/structure/ portal/branches/wsrp-extraction/wsrp-integration/extension-component/src/test/java/org/gatein/integration/wsrp/structure/MOPConsumerStructureProviderTestCase.java portal/branches/wsrp-extraction/wsrp-integration/extension-config/ portal/branches/wsrp-extraction/wsrp-integration/extension-config/pom.xml portal/branches/wsrp-extraction/wsrp-integration/extension-config/src/ portal/branches/wsrp-extraction/wsrp-integration/extension-config/src/main/ portal/branches/wsrp-extraction/wsrp-integration/extension-config/src/main/resources/ portal/branches/wsrp-extraction/wsrp-integration/extension-config/src/main/resources/conf/ portal/branches/wsrp-extraction/wsrp-integration/extension-config/src/main/resources/conf/configuration.xml portal/branches/wsrp-extraction/wsrp-integration/extension-ear/ portal/branches/wsrp-extraction/wsrp-integration/extension-ear/pom.xml portal/branches/wsrp-extraction/wsrp-integration/extension-ear/src/ portal/branches/wsrp-extraction/wsrp-integration/extension-ear/src/main/ portal/branches/wsrp-extraction/wsrp-integration/extension-ear/src/main/application/ portal/branches/wsrp-extraction/wsrp-integration/extension-ear/src/main/application/META-INF/ portal/branches/wsrp-extraction/wsrp-integration/extension-ear/src/main/application/META-INF/jboss-scanning.xml portal/branches/wsrp-extraction/wsrp-integration/extension-war/ portal/branches/wsrp-extraction/wsrp-integration/extension-war/pom.xml portal/branches/wsrp-extraction/wsrp-integration/extension-war/src/ portal/branches/wsrp-extraction/wsrp-integration/extension-war/src/main/ portal/branches/wsrp-extraction/wsrp-integration/extension-war/src/main/webapp/ portal/branches/wsrp-extraction/wsrp-integration/extension-war/src/main/webapp/WEB-INF/ portal/branches/wsrp-extraction/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/ portal/branches/wsrp-extraction/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/configuration.xml portal/branches/wsrp-extraction/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/ portal/branches/wsrp-extraction/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/consumers-configuration-nodetypes.xml portal/branches/wsrp-extraction/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/jcr-configuration.xml portal/branches/wsrp-extraction/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/migration-nodetypes.xml portal/branches/wsrp-extraction/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/portal/ portal/branches/wsrp-extraction/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/portal/group/ portal/branches/wsrp-extraction/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/portal/group/platform/ portal/branches/wsrp-extraction/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/portal/group/platform/administrators/ portal/branches/wsrp-extraction/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/portal/group/platform/administrators/navigation.xml portal/branches/wsrp-extraction/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/portal/group/platform/administrators/pages.xml portal/branches/wsrp-extraction/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/producer-configuration-nodetypes.xml portal/branches/wsrp-extraction/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/producer-pc-nodetypes.xml portal/branches/wsrp-extraction/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/producer-registrations-nodetypes.xml portal/branches/wsrp-extraction/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/repository-configuration.xml portal/branches/wsrp-extraction/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/wsrp-configuration.xml portal/branches/wsrp-extraction/wsrp-integration/extension-war/src/main/webapp/WEB-INF/web.xml portal/branches/wsrp-extraction/wsrp-integration/pom.xml Modified: portal/branches/wsrp-extraction/pom.xml Log: - GTNWSRP-200, GTNPORTAL-911: Re-added WSRP integration code as an extension. Was originally planning to create a separate component from both GateIn and WSRP codebases but it's easier to manage this way. Note that the extension is currently really weak and needs a lot of improvements, though this might not be possible with the extension mechanism as it currently is. :( Modified: portal/branches/wsrp-extraction/pom.xml =================================================================== --- portal/branches/wsrp-extraction/pom.xml 2011-02-14 11:10:18 UTC (rev 5877) +++ portal/branches/wsrp-extraction/pom.xml 2011-02-14 15:03:03 UTC (rev 5878) @@ -1,26 +1,29 @@ <!-- + ~ JBoss, a division of Red Hat + ~ Copyright 2011, Red Hat Middleware, LLC, and individual + ~ contributors as indicated by the @authors tag. See the + ~ copyright.txt in the distribution for a full listing of + ~ individual contributors. + ~ + ~ 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. + --> - Copyright (C) 2009 eXo Platform SAS. +<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"> - 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. - ---> - -<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> @@ -47,6 +50,7 @@ <org.gatein.common.version>2.0.3-GA</org.gatein.common.version> <org.gatein.wci.version>2.1.0-Alpha02</org.gatein.wci.version> <org.gatein.pc.version>2.3.0-Alpha01</org.gatein.pc.version> + <org.gatein.wsrp.version>2.1.0-Alpha01-SNAPSHOT</org.gatein.wsrp.version> <org.picketlink.idm>1.1.8.CR01</org.picketlink.idm> <org.gatein.mop.version>1.0.3-GA</org.gatein.mop.version> <org.slf4j.version>1.5.6</org.slf4j.version> @@ -82,6 +86,7 @@ <module>starter</module> <module>packaging</module> <module>testsuite</module> + <module>wsrp-integration</module> </modules> <dependencyManagement> @@ -138,14 +143,14 @@ <artifactId>exo.kernel.component.common</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> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </exclusion> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -168,345 +173,345 @@ <artifactId>exo.kernel.container</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> + <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.ext.cache.impl.jboss.v3</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> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.component.ext.cache.impl.jboss.v3</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.mc-int</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> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.mc-int</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.mc-kernel-extras</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> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.mc-kernel-extras</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.core</groupId> - <artifactId>exo.core.component.organization.api</artifactId> - <version>${org.exoplatform.core.version}</version> - <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - </exclusions> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.organization.api</artifactId> + <version>${org.exoplatform.core.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.core</groupId> - <artifactId>exo.core.component.xml-processing</artifactId> - <version>${org.exoplatform.core.version}</version> - <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - </exclusions> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.xml-processing</artifactId> + <version>${org.exoplatform.core.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.core</groupId> <artifactId>exo.core.component.database</artifactId> <version>${org.exoplatform.core.version}</version> <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </exclusion> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> </exclusions> </dependency> <dependency> - <groupId>org.exoplatform.core</groupId> - <artifactId>exo.core.component.ldap</artifactId> - <version>${org.exoplatform.core.version}</version> - <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - </exclusions> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.ldap</artifactId> + <version>${org.exoplatform.core.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.core</groupId> <artifactId>exo.core.component.organization.jdbc</artifactId> <version>${org.exoplatform.core.version}</version> <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </exclusion> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> </exclusions> </dependency> <dependency> - <groupId>org.exoplatform.core</groupId> - <artifactId>exo.core.component.organization.ldap</artifactId> - <version>${org.exoplatform.core.version}</version> - <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - </exclusions> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.organization.ldap</artifactId> + <version>${org.exoplatform.core.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.core</groupId> - <artifactId>exo.core.component.security.core</artifactId> - <version>${org.exoplatform.core.version}</version> - <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - </exclusions> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.security.core</artifactId> + <version>${org.exoplatform.core.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.core</groupId> - <artifactId>exo.core.component.document</artifactId> - <version>${org.exoplatform.core.version}</version> - <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - </exclusions> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.document</artifactId> + <version>${org.exoplatform.core.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.jcr</groupId> - <artifactId>exo.jcr.component.core</artifactId> - <version>${org.exoplatform.jcr.version}</version> - <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - </exclusions> + <groupId>org.exoplatform.jcr</groupId> + <artifactId>exo.jcr.component.core</artifactId> + <version>${org.exoplatform.jcr.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.jcr</groupId> - <artifactId>exo.jcr.framework.command</artifactId> - <version>${org.exoplatform.jcr.version}</version> - <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - </exclusions> + <groupId>org.exoplatform.jcr</groupId> + <artifactId>exo.jcr.framework.command</artifactId> + <version>${org.exoplatform.jcr.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.jcr</groupId> <artifactId>exo.jcr.component.ext</artifactId> <version>${org.exoplatform.jcr.version}</version> <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </exclusion> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> </exclusions> </dependency> <dependency> - <groupId>org.exoplatform.jcr</groupId> - <artifactId>exo.jcr.component.webdav</artifactId> - <version>${org.exoplatform.jcr.version}</version> - <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - </exclusions> + <groupId>org.exoplatform.jcr</groupId> + <artifactId>exo.jcr.component.webdav</artifactId> + <version>${org.exoplatform.jcr.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.jcr</groupId> - <artifactId>exo.jcr.framework.web</artifactId> - <version>${org.exoplatform.jcr.version}</version> - <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - </exclusions> + <groupId>org.exoplatform.jcr</groupId> + <artifactId>exo.jcr.framework.web</artifactId> + <version>${org.exoplatform.jcr.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.jcr</groupId> - <artifactId>exo.jcr.component.ftp</artifactId> - <version>${org.exoplatform.jcr.version}</version> - <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - </exclusions> + <groupId>org.exoplatform.jcr</groupId> + <artifactId>exo.jcr.component.ftp</artifactId> + <version>${org.exoplatform.jcr.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.ws</groupId> - <artifactId>exo.ws.commons</artifactId> - <version>${org.exoplatform.ws.version}</version> - <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - </exclusions> + <dependency> + <groupId>org.exoplatform.ws</groupId> + <artifactId>exo.ws.commons</artifactId> + <version>${org.exoplatform.ws.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.ws</groupId> - <artifactId>exo.ws.frameworks.servlet</artifactId> - <version>${org.exoplatform.ws.version}</version> - <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - </exclusions> + <groupId>org.exoplatform.ws</groupId> + <artifactId>exo.ws.frameworks.servlet</artifactId> + <version>${org.exoplatform.ws.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.ws</groupId> - <artifactId>exo.ws.rest.ext</artifactId> - <version>${org.exoplatform.ws.version}</version> - <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - </exclusions> + <groupId>org.exoplatform.ws</groupId> + <artifactId>exo.ws.rest.ext</artifactId> + <version>${org.exoplatform.ws.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.ws</groupId> - <artifactId>exo.ws.rest.core</artifactId> - <version>${org.exoplatform.ws.version}</version> - <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - </exclusions> + <groupId>org.exoplatform.ws</groupId> + <artifactId>exo.ws.rest.core</artifactId> + <version>${org.exoplatform.ws.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.ws</groupId> - <artifactId>exo.ws.frameworks.json</artifactId> - <version>${org.exoplatform.ws.version}</version> - <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - </exclusions> + <groupId>org.exoplatform.ws</groupId> + <artifactId>exo.ws.frameworks.json</artifactId> + <version>${org.exoplatform.ws.version}</version> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </exclusion> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + </exclusions> </dependency> <!-- GateIn components --> @@ -590,222 +595,272 @@ <artifactId>mop-core</artifactId> <version>${org.gatein.mop.version}</version> </dependency> + <!-- WSRP --> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-producer-lib</artifactId> + <scope>provided</scope> + <version>${org.gatein.wsrp.version}</version> + </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-consumer</artifactId> + <scope>provided</scope> + <version>${org.gatein.wsrp.version}</version> + </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-jcr-impl</artifactId> + <scope>provided</scope> + <version>${org.gatein.wsrp.version}</version> + </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-integration-api</artifactId> + <scope>provided</scope> + <version>${org.gatein.wsrp.version}</version> + </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-common</artifactId> + <scope>provided</scope> + <version>${org.gatein.wsrp.version}</version> + </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-wsrp1-ws</artifactId> + <scope>provided</scope> + <version>${org.gatein.wsrp.version}</version> + </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-wsrp2-ws</artifactId> + <scope>provided</scope> + <version>${org.gatein.wsrp.version}</version> + </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-wss-jboss5</artifactId> + <scope>provided</scope> + <version>${org.gatein.wsrp.version}</version> + </dependency> - <!-- GateIn --> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.common</artifactId> - <version>3.2.0-Beta01-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.web</artifactId> - <version>3.2.0-Beta01-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.web.controller</artifactId> - <version>3.2.0-Beta01-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.web.security</artifactId> - <version>3.2.0-Beta01-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.web.server</artifactId> - <version>3.2.0-Beta01-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.web.api</artifactId> - <version>3.2.0-Beta01-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.web.resources</artifactId> - <version>3.2.0-Beta01-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.portal</artifactId> - <version>3.2.0-Beta01-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.portal</artifactId> - <version>3.2.0-Beta01-SNAPSHOT</version> - <type>test-jar</type> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.pc</artifactId> - <version>3.2.0-Beta01-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.identity</artifactId> - <version>3.2.0-Beta01-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.resources</artifactId> - <version>3.2.0-Beta01-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.application-registry</artifactId> - <version>3.2.0-Beta01-SNAPSHOT</version> - </dependency> - <!--<dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.xml-parser</artifactId> - <version>3.2.0-Beta01-SNAPSHOT</version> - </dependency>--> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.scripting</artifactId> - <version>3.2.0-Beta01-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.management</artifactId> - <version>3.2.0-Beta01-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.webui.framework</artifactId> - <version>3.2.0-Beta01-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.webui.portlet</artifactId> - <version>3.2.0-Beta01-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.webui.portal</artifactId> - <version>3.2.0-Beta01-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.webui.eXo</artifactId> - <version>3.2.0-Beta01-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.webui.core</artifactId> - <version>3.2.0-Beta01-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.webui.dashboard</artifactId> - <version>3.2.0-Beta01-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.gadgets-core</artifactId> - <version>3.2.0-Beta01-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.test.core</artifactId> - <version>3.2.0-Beta01-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.test.core</artifactId> - <version>3.2.0-Beta01-SNAPSHOT</version> - <type>test-jar</type> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.test.jcr</artifactId> - <version>3.2.0-Beta01-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.test.jcr</artifactId> - <version>3.2.0-Beta01-SNAPSHOT</version> - <type>test-jar</type> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.test.organization</artifactId> - <version>3.2.0-Beta01-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.test.organization</artifactId> - <version>3.2.0-Beta01-SNAPSHOT</version> - <type>test-jar</type> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>gatein.portal.component.wsrp</artifactId> - <version>3.2.0-Beta01-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.server.jboss.plugin</artifactId> - <version>3.2.0-Beta01-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.web.portal</artifactId> - <version>3.2.0-Beta01-SNAPSHOT</version> - <type>war</type> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.gadgets-server</artifactId> - <version>3.2.0-Beta01-SNAPSHOT</version> - <type>war</type> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.eXoGadgets</artifactId> - <version>3.2.0-Beta01-SNAPSHOT</version> - <type>war</type> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.portlet.web</artifactId> - <version>3.2.0-Beta01-SNAPSHOT</version> - <type>war</type> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.web.rest</artifactId> - <version>3.2.0-Beta01-SNAPSHOT</version> - <type>war</type> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.portlet.exoadmin</artifactId> - <version>3.2.0-Beta01-SNAPSHOT</version> - <type>war</type> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.web.eXoResources</artifactId> - <version>3.2.0-Beta01-SNAPSHOT</version> - <type>war</type> - </dependency> - <dependency> - <groupId>org.gatein.portal.examples.skins</groupId> - <artifactId>gatein-sample-skin</artifactId> - <version>3.2.0-Beta01-SNAPSHOT</version> - <type>war</type> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.portlet.dashboard</artifactId> - <version>3.2.0-Beta01-SNAPSHOT</version> - <type>war</type> - </dependency> + <!-- GateIn --> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.common</artifactId> + <version>3.2.0-Beta01-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.web</artifactId> + <version>3.2.0-Beta01-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.web.controller</artifactId> + <version>3.2.0-Beta01-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.web.security</artifactId> + <version>3.2.0-Beta01-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.web.server</artifactId> + <version>3.2.0-Beta01-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.web.api</artifactId> + <version>3.2.0-Beta01-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.web.resources</artifactId> + <version>3.2.0-Beta01-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.portal</artifactId> + <version>3.2.0-Beta01-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.portal</artifactId> + <version>3.2.0-Beta01-SNAPSHOT</version> + <type>test-jar</type> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.pc</artifactId> + <version>3.2.0-Beta01-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.identity</artifactId> + <version>3.2.0-Beta01-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.resources</artifactId> + <version>3.2.0-Beta01-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.application-registry</artifactId> + <version>3.2.0-Beta01-SNAPSHOT</version> + </dependency> + <!--<dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.xml-parser</artifactId> + <version>3.2.0-Beta01-SNAPSHOT</version> + </dependency>--> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.scripting</artifactId> + <version>3.2.0-Beta01-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.management</artifactId> + <version>3.2.0-Beta01-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.webui.framework</artifactId> + <version>3.2.0-Beta01-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.webui.portlet</artifactId> + <version>3.2.0-Beta01-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.webui.portal</artifactId> + <version>3.2.0-Beta01-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.webui.eXo</artifactId> + <version>3.2.0-Beta01-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.webui.core</artifactId> + <version>3.2.0-Beta01-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.webui.dashboard</artifactId> + <version>3.2.0-Beta01-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.gadgets-core</artifactId> + <version>3.2.0-Beta01-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.test.core</artifactId> + <version>3.2.0-Beta01-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.test.core</artifactId> + <version>3.2.0-Beta01-SNAPSHOT</version> + <type>test-jar</type> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.test.jcr</artifactId> + <version>3.2.0-Beta01-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.test.jcr</artifactId> + <version>3.2.0-Beta01-SNAPSHOT</version> + <type>test-jar</type> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.test.organization</artifactId> + <version>3.2.0-Beta01-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.test.organization</artifactId> + <version>3.2.0-Beta01-SNAPSHOT</version> + <type>test-jar</type> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>gatein.portal.component.wsrp</artifactId> + <version>3.2.0-Beta01-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.server.jboss.plugin</artifactId> + <version>3.2.0-Beta01-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.web.portal</artifactId> + <version>3.2.0-Beta01-SNAPSHOT</version> + <type>war</type> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.gadgets-server</artifactId> + <version>3.2.0-Beta01-SNAPSHOT</version> + <type>war</type> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.eXoGadgets</artifactId> + <version>3.2.0-Beta01-SNAPSHOT</version> + <type>war</type> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.portlet.web</artifactId> + <version>3.2.0-Beta01-SNAPSHOT</version> + <type>war</type> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.web.rest</artifactId> + <version>3.2.0-Beta01-SNAPSHOT</version> + <type>war</type> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.portlet.exoadmin</artifactId> + <version>3.2.0-Beta01-SNAPSHOT</version> + <type>war</type> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.web.eXoResources</artifactId> + <version>3.2.0-Beta01-SNAPSHOT</version> + <type>war</type> + </dependency> + <dependency> + <groupId>org.gatein.portal.examples.skins</groupId> + <artifactId>gatein-sample-skin</artifactId> + <version>3.2.0-Beta01-SNAPSHOT</version> + <type>war</type> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.portlet.dashboard</artifactId> + <version>3.2.0-Beta01-SNAPSHOT</version> + <type>war</type> + </dependency> + <!-- Reflext --> <dependency> <groupId>org.reflext</groupId> @@ -882,14 +937,14 @@ <artifactId>picketlink-idm-hibernate</artifactId> <version>${org.picketlink.idm}</version> <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </exclusion> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -907,11 +962,11 @@ <artifactId>picketlink-idm-cache</artifactId> <version>${org.picketlink.idm}</version> </dependency> - <dependency> - <groupId>org.picketlink.idm</groupId> - <artifactId>picketlink-idm-spi</artifactId> - <version>${org.picketlink.idm}</version> - </dependency> + <dependency> + <groupId>org.picketlink.idm</groupId> + <artifactId>picketlink-idm-spi</artifactId> + <version>${org.picketlink.idm}</version> + </dependency> <dependency> <groupId>javax.portlet</groupId> @@ -935,40 +990,40 @@ <version>${org.slf4j.version}</version> </dependency> <dependency> - <groupId>commons-beanutils</groupId> - <artifactId>commons-beanutils</artifactId> - <version>1.8.0</version> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + <version>1.8.0</version> </dependency> <dependency> - <groupId>commons-chain</groupId> - <artifactId>commons-chain</artifactId> - <version>1.0</version> + <groupId>commons-chain</groupId> + <artifactId>commons-chain</artifactId> + <version>1.0</version> </dependency> <dependency> - <groupId>commons-codec</groupId> - <artifactId>commons-codec</artifactId> - <version>1.3</version> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + <version>1.3</version> </dependency> <dependency> - <groupId>commons-fileupload</groupId> - <artifactId>commons-fileupload</artifactId> - <version>1.2.1</version> + <groupId>commons-fileupload</groupId> + <artifactId>commons-fileupload</artifactId> + <version>1.2.1</version> </dependency> <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>1.0.4</version> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.0.4</version> </dependency> <dependency> - <groupId>commons-pool</groupId> - <artifactId>commons-pool</artifactId> - <version>1.2</version> - <exclusions> - <exclusion> - <groupId>xerces</groupId> - <artifactId>xerces</artifactId> - </exclusion> - </exclusions> + <groupId>commons-pool</groupId> + <artifactId>commons-pool</artifactId> + <version>1.2</version> + <exclusions> + <exclusion> + <groupId>xerces</groupId> + <artifactId>xerces</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>commons-dbcp</groupId> @@ -1069,9 +1124,9 @@ <version>2.0</version> </dependency> <dependency> - <groupId>com.google.code.guice</groupId> - <artifactId>guice-jmx</artifactId> - <version>2.0</version> + <groupId>com.google.code.guice</groupId> + <artifactId>guice-jmx</artifactId> + <version>2.0</version> </dependency> <dependency> <groupId>rome</groupId> @@ -1103,11 +1158,11 @@ <artifactId>htmlparser</artifactId> <version>1.0.7</version> </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.14</version> - </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.14</version> + </dependency> <dependency> <groupId>org.gatein.shindig</groupId> @@ -1145,11 +1200,11 @@ <artifactId>simplecaptcha</artifactId> <version>${nl.captcha.simplecaptcha.version}</version> </dependency> - <!-- needed for the IBM jdk, should be remove in the future when IBM fixes its jdk (see GTNPORTAL-636) --> + <!-- needed for the IBM jdk, should be remove in the future when IBM fixes its jdk (see GTNPORTAL-636) --> <dependency> - <groupId>net.jcip</groupId> - <artifactId>jcip-annotations</artifactId> - <version>${jcip.version}</version> + <groupId>net.jcip</groupId> + <artifactId>jcip-annotations</artifactId> + <version>${jcip.version}</version> </dependency> </dependencies> @@ -1228,13 +1283,13 @@ memory option properties. This should be removed when we can just set the compiler properties --> <!-- we need to specify this as building GateIn can cause memory problems with some JDKs (ie IBM) --> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <fork>true</fork> - <meminitial>256m</meminitial> - <maxmem>1024m</maxmem> - </configuration> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <fork>true</fork> + <meminitial>256m</meminitial> + <maxmem>1024m</maxmem> + </configuration> </plugin> </plugins> </pluginManagement> @@ -1248,11 +1303,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> @@ -1265,126 +1321,126 @@ </plugins> </build> - <profiles> - <profile> - <id>hsqldb</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <dependencies> - <dependency> - <groupId>hsqldb</groupId> - <artifactId>hsqldb</artifactId> - <scope>test</scope> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <systemProperties> - <property> - <name>java.util.logging.config.class</name> - <value>org.exoplatform.component.test.logging.LogConfigurator</value> - </property> - <property> - <name>com.arjuna.ats.arjuna.objectstore.objectStoreDir</name> - <value>${project.build.directory}</value> - </property> - <property> - <name>gatein.test.datasource.driver</name> - <value>org.hsqldb.jdbcDriver</value> - </property> - <property> - <name>gatein.test.datasource.url</name> - <value>jdbc:hsqldb:mem:gateindb</value> - </property> - <property> - <name>gatein.test.datasource.username</name> - <value>sa</value> - </property> - <property> - <name>gatein.test.datasource.password</name> - <value /> - </property> - </systemProperties> - </configuration> - </plugin> - </plugins> - </build> - </profile> - <profile> - <id>mysql5</id> - <dependencies> - <dependency> - <groupId>mysql</groupId> - <artifactId>mysql-connector-java</artifactId> - <version>5.1.6</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.14</version> - <scope>test</scope> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <systemProperties> - <property> - <name>java.util.logging.config.class</name> - <value>org.exoplatform.component.test.logging.LogConfigurator</value> - </property> - <property> - <name>com.arjuna.ats.arjuna.objectstore.objectStoreDir</name> - <value>${project.build.directory}</value> - </property> - <property> - <name>gatein.test.datasource.driver</name> - <value>com.mysql.jdbc.Driver</value> - </property> - <property> - <name>gatein.test.datasource.url</name> - <value>jdbc:mysql://10.37.129.4/gatein?createDatabaseIfNotExist=true&amp;useUnicode=true&amp;characterEncoding=utf-8</value> - </property> - <property> - <name>gatein.test.datasource.username</name> - <value>root</value> - </property> - <property> - <name>gatein.test.datasource.password</name> - <value>a</value> - </property> - </systemProperties> - </configuration> - </plugin> - </plugins> - </build> - </profile> - </profiles> + <profiles> + <profile> + <id>hsqldb</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <dependencies> + <dependency> + <groupId>hsqldb</groupId> + <artifactId>hsqldb</artifactId> + <scope>test</scope> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <systemProperties> + <property> + <name>java.util.logging.config.class</name> + <value>org.exoplatform.component.test.logging.LogConfigurator</value> + </property> + <property> + <name>com.arjuna.ats.arjuna.objectstore.objectStoreDir</name> + <value>${project.build.directory}</value> + </property> + <property> + <name>gatein.test.datasource.driver</name> + <value>org.hsqldb.jdbcDriver</value> + </property> + <property> + <name>gatein.test.datasource.url</name> + <value>jdbc:hsqldb:mem:gateindb</value> + </property> + <property> + <name>gatein.test.datasource.username</name> + <value>sa</value> + </property> + <property> + <name>gatein.test.datasource.password</name> + <value/> + </property> + </systemProperties> + </configuration> + </plugin> + </plugins> + </build> + </profile> + <profile> + <id>mysql5</id> + <dependencies> + <dependency> + <groupId>mysql</groupId> + <artifactId>mysql-connector-java</artifactId> + <version>5.1.6</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.14</version> + <scope>test</scope> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <systemProperties> + <property> + <name>java.util.logging.config.class</name> + <value>org.exoplatform.component.test.logging.LogConfigurator</value> + </property> + <property> + <name>com.arjuna.ats.arjuna.objectstore.objectStoreDir</name> + <value>${project.build.directory}</value> + </property> + <property> + <name>gatein.test.datasource.driver</name> + <value>com.mysql.jdbc.Driver</value> + </property> + <property> + <name>gatein.test.datasource.url</name> + <value>jdbc:mysql://10.37.129.4/gatein?createDatabaseIfNotExist=true&amp;useUnicode=true&amp;characterEncoding=utf-8</value> + </property> + <property> + <name>gatein.test.datasource.username</name> + <value>root</value> + </property> + <property> + <name>gatein.test.datasource.password</name> + <value>a</value> + </property> + </systemProperties> + </configuration> + </plugin> + </plugins> + </build> + </profile> + </profiles> <!-- To be removed and replaced by settings in user config --> <repositories> <repository> - <id>jboss-public-repository-group</id> - <name>JBoss Public Maven Repository Group</name> - <url>https://repository.jboss.org/nexus/content/groups/public/</url> - <layout>default</layout> - <releases> - <enabled>true</enabled> - <updatePolicy>never</updatePolicy> - </releases> - <snapshots> - <enabled>true</enabled> - <updatePolicy>never</updatePolicy> - </snapshots> + <id>jboss-public-repository-group</id> + <name>JBoss Public Maven Repository Group</name> + <url>https://repository.jboss.org/nexus/content/groups/public/</url> + <layout>default</layout> + <releases> + <enabled>true</enabled> + <updatePolicy>never</updatePolicy> + </releases> + <snapshots> + <enabled>true</enabled> + <updatePolicy>never</updatePolicy> + </snapshots> </repository> <repository> <id>oauth</id> @@ -1410,30 +1466,30 @@ <id>exo-int</id> <url>http://maven2.exoplatform.org/rest/maven2</url> <releases> - <enabled>true</enabled> + <enabled>true</enabled> </releases> <snapshots> - <enabled>false</enabled> + <enabled>false</enabled> </snapshots> </repository> </repositories> - <pluginRepositories> - <pluginRepository> - <id>jboss-public-repository-group</id> - <name>JBoss Public Maven Repository Group</name> - <url>https://repository.jboss.org/nexus/content/groups/public/</url> - <layout>default</layout> - <releases> + <pluginRepositories> + <pluginRepository> + <id>jboss-public-repository-group</id> + <name>JBoss Public Maven Repository Group</name> + <url>https://repository.jboss.org/nexus/content/groups/public/</url> + <layout>default</layout> + <releases> <enabled>true</enabled> <updatePolicy>never</updatePolicy> - </releases> - <snapshots> + </releases> + <snapshots> <enabled>true</enabled> <updatePolicy>never</updatePolicy> - </snapshots> - </pluginRepository> + </snapshots> + </pluginRepository> <pluginRepository> <id>java.net</id> <url>http://download.java.net/maven/2</url> Property changes on: portal/branches/wsrp-extraction/wsrp-integration ___________________________________________________________________ Added: svn:ignore + *.iml .idea Property changes on: portal/branches/wsrp-extraction/wsrp-integration/extension-component ___________________________________________________________________ Added: svn:ignore + *.iml .idea Added: portal/branches/wsrp-extraction/wsrp-integration/extension-component/pom.xml =================================================================== --- portal/branches/wsrp-extraction/wsrp-integration/extension-component/pom.xml (rev 0) +++ portal/branches/wsrp-extraction/wsrp-integration/extension-component/pom.xml 2011-02-14 15:03:03 UTC (rev 5878) @@ -0,0 +1,110 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ JBoss, a division of Red Hat + ~ Copyright 2011, Red Hat Middleware, LLC, and individual + ~ contributors as indicated by the @authors tag. See the + ~ copyright.txt in the distribution for a full listing of + ~ individual contributors. + ~ + ~ 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. + --> + +<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/xsd/maven-4.0.0.xsd"> + <parent> + <artifactId>gatein-wsrp-integration-parent</artifactId> + <groupId>org.gatein.integration</groupId> + <version>1.0.0-Beta01-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + + <artifactId>extension-component</artifactId> + <packaging>jar</packaging> + <name>GateIn WSRP Integration extension component</name> + + <dependencies> + <!-- WSRP jars are in packaging/module.js --> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-producer-lib</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-consumer</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-jcr-impl</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.gatein.mop</groupId> + <artifactId>mop-api</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-integration-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.gatein.pc</groupId> + <artifactId>pc-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.gatein.pc</groupId> + <artifactId>pc-portlet</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.container</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.pc</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.common</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.portal</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.gatein.wci</groupId> + <artifactId>wci-wci</artifactId> + </dependency> + + <!-- tests --> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> + <version>1.8.5</version> + <scope>test</scope> + </dependency> + </dependencies> + +</project> \ No newline at end of file Property changes on: portal/branches/wsrp-extraction/wsrp-integration/extension-component/src ___________________________________________________________________ Added: svn:ignore + *.iml .idea Property changes on: portal/branches/wsrp-extraction/wsrp-integration/extension-component/src/main ___________________________________________________________________ Added: svn:ignore + *.iml .idea Property changes on: portal/branches/wsrp-extraction/wsrp-integration/extension-component/src/main/java ___________________________________________________________________ Added: svn:ignore + *.iml .idea Property changes on: portal/branches/wsrp-extraction/wsrp-integration/extension-component/src/main/java/org ___________________________________________________________________ Added: svn:ignore + *.iml .idea Property changes on: portal/branches/wsrp-extraction/wsrp-integration/extension-component/src/main/java/org/gatein ___________________________________________________________________ Added: svn:ignore + *.iml .idea Property changes on: portal/branches/wsrp-extraction/wsrp-integration/extension-component/src/main/java/org/gatein/integration ___________________________________________________________________ Added: svn:ignore + *.iml .idea Property changes on: portal/branches/wsrp-extraction/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp ___________________________________________________________________ Added: svn:ignore + *.iml .idea Added: portal/branches/wsrp-extraction/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/SessionEventListenerAndBroadcaster.java =================================================================== --- portal/branches/wsrp-extraction/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/SessionEventListenerAndBroadcaster.java (rev 0) +++ portal/branches/wsrp-extraction/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/SessionEventListenerAndBroadcaster.java 2011-02-14 15:03:03 UTC (rev 5878) @@ -0,0 +1,109 @@ +/* + * JBoss, a division of Red Hat + * Copyright 2011, Red Hat Middleware, LLC, and individual + * contributors as indicated by the @authors tag. See the + * copyright.txt in the distribution for a full listing of + * individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + +package org.gatein.integration.wsrp; + +import org.exoplatform.container.PortalContainer; +import org.exoplatform.services.listener.Event; +import org.exoplatform.services.listener.Listener; +import org.gatein.wsrp.api.session.SessionEvent; +import org.gatein.wsrp.api.session.SessionEventBroadcaster; +import org.gatein.wsrp.api.session.SessionEventListener; + +import javax.servlet.http.HttpSession; +import javax.servlet.http.HttpSessionEvent; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; + +/** + * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> + * @version $Revision$ + */ +public class SessionEventListenerAndBroadcaster extends Listener<PortalContainer, HttpSessionEvent> implements SessionEventBroadcaster +{ + private Map<String, SessionEventListener> listeners = new ConcurrentHashMap<String, SessionEventListener>(); + private static final String SESSION_CREATED = "org.exoplatform.web.GenericHttpListener.sessionCreated"; + private static final String SESSION_DESTROYED = "org.exoplatform.web.GenericHttpListener.sessionDestroyed"; + + public void registerListener(String listenerId, SessionEventListener listener) + { + listeners.put(listenerId, listener); + } + + public void unregisterListener(String listenerId) + { + listeners.remove(listenerId); + } + + public void notifyListenersOf(SessionEvent event) + { + for (SessionEventListener listener : listeners.values()) + { + listener.onSessionEvent(event); + } + } + + @Override + public void onEvent(Event<PortalContainer, HttpSessionEvent> event) throws Exception + { + String eventName = event.getEventName(); + SessionEvent.SessionEventType eventType; + if (SESSION_CREATED.equals(eventName)) + { + eventType = SessionEvent.SessionEventType.SESSION_CREATED; + } + else if (SESSION_DESTROYED.equals(eventName)) + { + eventType = SessionEvent.SessionEventType.SESSION_DESTROYED; + } + else + { + // do nothing + return; + } + + notifyListenersOf(new SimpleSessionEvent(eventType, event.getData().getSession())); + } + + private static class SimpleSessionEvent implements SessionEvent + { + private SessionEventType eventType; + private HttpSession session; + + private SimpleSessionEvent(SessionEventType eventType, HttpSession session) + { + this.eventType = eventType; + this.session = session; + } + + public SessionEventType getType() + { + return eventType; + } + + public HttpSession getSession() + { + return session; + } + } +} Added: portal/branches/wsrp-extraction/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/WSRPServiceIntegration.java =================================================================== --- portal/branches/wsrp-extraction/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/WSRPServiceIntegration.java (rev 0) +++ portal/branches/wsrp-extraction/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/WSRPServiceIntegration.java 2011-02-14 15:03:03 UTC (rev 5878) @@ -0,0 +1,390 @@ +/* + * JBoss, a division of Red Hat + * Copyright 2011, Red Hat Middleware, LLC, and individual + * contributors as indicated by the @authors tag. See the + * copyright.txt in the distribution for a full listing of + * individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + +package org.gatein.integration.wsrp; + +import org.exoplatform.container.ExoContainer; +import org.exoplatform.container.ExoContainerContext; +import org.exoplatform.container.configuration.ConfigurationManager; +import org.exoplatform.container.xml.InitParams; +import org.exoplatform.portal.config.DataStorage; +import org.exoplatform.portal.pc.ExoKernelIntegration; +import org.exoplatform.portal.pom.config.POMSessionManager; +import org.exoplatform.services.jcr.ext.hierarchy.NodeHierarchyCreator; +import org.exoplatform.services.listener.ListenerService; +import org.gatein.common.logging.Logger; +import org.gatein.common.logging.LoggerFactory; +import org.gatein.integration.wsrp.jcr.JCRPersister; +import org.gatein.integration.wsrp.structure.MOPConsumerStructureProvider; +import org.gatein.integration.wsrp.structure.MOPPortalStructureAccess; +import org.gatein.integration.wsrp.structure.PortalStructureAccess; +import org.gatein.pc.api.PortletInvoker; +import org.gatein.pc.federation.FederatingPortletInvoker; +import org.gatein.pc.portlet.PortletInvokerInterceptor; +import org.gatein.pc.portlet.aspects.EventPayloadInterceptor; +import org.gatein.pc.portlet.container.ContainerPortletInvoker; +import org.gatein.pc.portlet.impl.state.StateConverterV0; +import org.gatein.pc.portlet.impl.state.StateManagementPolicyService; +import org.gatein.pc.portlet.state.StateConverter; +import org.gatein.pc.portlet.state.producer.PortletStatePersistenceManager; +import org.gatein.pc.portlet.state.producer.ProducerPortletInvoker; +import org.gatein.registration.RegistrationManager; +import org.gatein.registration.RegistrationPersistenceManager; +import org.gatein.registration.impl.RegistrationManagerImpl; +import org.gatein.wci.ServletContainer; +import org.gatein.wci.ServletContainerFactory; +import org.gatein.wci.WebApp; +import org.gatein.wci.WebAppEvent; +import org.gatein.wci.WebAppLifeCycleEvent; +import org.gatein.wci.WebAppListener; +import org.gatein.wci.impl.DefaultServletContainerFactory; +import org.gatein.wsrp.WSRPConstants; +import org.gatein.wsrp.consumer.migration.JCRMigrationService; +import org.gatein.wsrp.consumer.migration.MigrationService; +import org.gatein.wsrp.consumer.registry.ActivatingNullInvokerHandler; +import org.gatein.wsrp.consumer.registry.ConsumerRegistry; +import org.gatein.wsrp.consumer.registry.JCRConsumerRegistry; +import org.gatein.wsrp.payload.WSRPEventPayloadInterceptor; +import org.gatein.wsrp.producer.ProducerHolder; +import org.gatein.wsrp.producer.WSRPProducer; +import org.gatein.wsrp.producer.config.JCRProducerConfigurationService; +import org.gatein.wsrp.producer.config.ProducerConfigurationService; +import org.gatein.wsrp.producer.invoker.RegistrationCheckingPortletInvoker; +import org.gatein.wsrp.producer.state.JCRPortletStatePersistenceManager; +import org.gatein.wsrp.registration.JCRRegistrationPersistenceManager; +import org.picocontainer.Startable; + +import javax.servlet.ServletContext; +import java.io.InputStream; + +/** + * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> + * @version $Revision$ + */ +public class WSRPServiceIntegration implements Startable, WebAppListener +{ + private static final Logger log = LoggerFactory.getLogger(WSRPServiceIntegration.class); + + private static final String CLASSPATH = "classpath:/"; + private static final String PRODUCER_CONFIG_LOCATION = "producerConfigLocation"; + private static final String CONSUMERS_CONFIG_LOCATION = "consumersConfigLocation"; + + private final InputStream configurationIS; + private final String producerConfigLocation; + private WSRPProducer producer; + + private ConsumerRegistry consumerRegistry; + private ExoContainer container; + private final ExoKernelIntegration exoKernelIntegration; + private final boolean bypass; + private static final String WSRP_ADMIN_GUI_CONTEXT_PATH = "/wsrp-admin-gui"; + + public WSRPServiceIntegration(ExoContainerContext context, InitParams params, ConfigurationManager configurationManager, + ExoKernelIntegration pc, NodeHierarchyCreator nhc) throws Exception + { + // IMPORTANT: even though NodeHierarchyCreator is not used anywhere in the code, it's still needed for pico + // to properly make sure that this service is started after the PC one. Yes, Pico is crap. :/ + + // todo: we currently only allow the service to go through initialization if we are running in the default portal + // as this service is not meant to work with extensions yet... + String consumersConfigLocation; + if ("portal".equals(context.getName())) + { + if (params != null) + { + producerConfigLocation = params.getValueParam(PRODUCER_CONFIG_LOCATION).getValue(); + consumersConfigLocation = params.getValueParam(CONSUMERS_CONFIG_LOCATION).getValue(); + } + else + { + throw new IllegalArgumentException("Improperly configured service: missing values for " + + PRODUCER_CONFIG_LOCATION + "and " + CONSUMERS_CONFIG_LOCATION); + } + + configurationIS = configurationManager.getInputStream(CLASSPATH + producerConfigLocation); + + container = context.getContainer(); + + exoKernelIntegration = pc; + + bypass = false; + } + else + { + log.info("The WSRP service can only be started in the default portal context. WSRP was not started for '" + + context.getName() + "'"); + + producerConfigLocation = null; + consumersConfigLocation = null; + configurationIS = null; + exoKernelIntegration = null; + bypass = true; + } + } + + public void start() + { + if (!bypass) + { + startProducer(); + startConsumers(); + + // listen for web app events so that we can inject services into WSRP admin UI "cleanly" + // todo: this service injection should really be done using CDI... :/ + ServletContainerFactory factory = DefaultServletContainerFactory.getInstance(); + ServletContainer servletContainer = factory.getServletContainer(); + servletContainer.addWebAppListener(this); + + log.info("WSRP Service version '" + WSRPConstants.WSRP_SERVICE_VERSION + "' started"); + } + } + + private void startProducer() + { + + JCRProducerConfigurationService producerConfigurationService; + try + { + JCRPersister persister = new JCRPersister(container, JCRPersister.WSRP_WORKSPACE_NAME); + persister.initializeBuilderFor(JCRProducerConfigurationService.mappingClasses); + + producerConfigurationService = new JCRProducerConfigurationService(persister); + producerConfigurationService.setDefaultConfigurationIS(configurationIS); + producerConfigurationService.reloadConfiguration(); + } + catch (Exception e) + { + throw new RuntimeException("Couldn't load WSRP producer configuration from " + producerConfigLocation, e); + } + container.registerComponentInstance(ProducerConfigurationService.class, producerConfigurationService); + + RegistrationPersistenceManager registrationPersistenceManager; + try + { + JCRPersister persister = new JCRPersister(container, JCRPersister.WSRP_WORKSPACE_NAME); + persister.initializeBuilderFor(JCRRegistrationPersistenceManager.mappingClasses); + + registrationPersistenceManager = new JCRRegistrationPersistenceManager(persister); + } + catch (Exception e) + { + throw new RuntimeException("Couldn't instantiate RegistrationPersistenceManager", e); + } + RegistrationManager registrationManager = new RegistrationManagerImpl(); + registrationManager.setPersistenceManager(registrationPersistenceManager); + + // retrieve container portlet invoker from eXo kernel + ContainerPortletInvoker containerPortletInvoker = + (ContainerPortletInvoker)container.getComponentInstanceOfType(ContainerPortletInvoker.class); + + // iterate over the container stack so that we can insert the WSRP-specific event payload interceptor + PortletInvokerInterceptor previous = containerPortletInvoker; + PortletInvokerInterceptor next = previous; + do + { + PortletInvoker invoker = previous.getNext(); + if (invoker instanceof EventPayloadInterceptor) + { + // create a new WSRPEventPayloadInterceptor and make its next one the current event payload invoker + WSRPEventPayloadInterceptor eventPayloadInterceptor = new WSRPEventPayloadInterceptor(); + eventPayloadInterceptor.setNext(invoker); + + // replace the current event payload interceptor by the WSRP-specific one + previous.setNext(eventPayloadInterceptor); + + // we're done + break; + } + else + { + previous = next; + if (invoker instanceof PortletInvokerInterceptor) + { + next = (PortletInvokerInterceptor)invoker; + } + else + { + next = null; + } + } + } + while (next != null); + + // The producer persistence manager + PortletStatePersistenceManager producerPersistenceManager; + try + { + JCRPersister persister = new JCRPersister(container, JCRPersister.PORTLET_STATES_WORKSPACE_NAME); + persister.initializeBuilderFor(JCRPortletStatePersistenceManager.mappingClasses); + + producerPersistenceManager = new JCRPortletStatePersistenceManager(persister); + } + catch (Exception e) + { + throw new RuntimeException("Couldn't instantiate PortletStatePersistenceManager", e); + } + + // The producer state management policy + StateManagementPolicyService producerStateManagementPolicy = new StateManagementPolicyService(); + producerStateManagementPolicy.setPersistLocally(true); + + // The producer state converter + StateConverter producerStateConverter = new StateConverterV0(); + + // The producer portlet invoker + ProducerPortletInvoker producerPortletInvoker = new ProducerPortletInvoker(); + producerPortletInvoker.setNext(containerPortletInvoker); + producerPortletInvoker.setPersistenceManager(producerPersistenceManager); + producerPortletInvoker.setStateManagementPolicy(producerStateManagementPolicy); + producerPortletInvoker.setStateConverter(producerStateConverter); + + RegistrationCheckingPortletInvoker wsrpPortletInvoker = new RegistrationCheckingPortletInvoker(); + wsrpPortletInvoker.setNext(producerPortletInvoker); + wsrpPortletInvoker.setRegistrationManager(registrationManager); + + + // create and wire WSRP producer + producer = ProducerHolder.getProducer(true); + producer.setPortletInvoker(wsrpPortletInvoker); + producer.setRegistrationManager(registrationManager); + producer.setConfigurationService(producerConfigurationService); + exoKernelIntegration.getPortletApplicationRegistry().addListener(producer); + + producer.start(); + } + + private void startConsumers() + { + // retrieve federating portlet invoker from container + FederatingPortletInvoker federatingPortletInvoker = + (FederatingPortletInvoker)container.getComponentInstanceOfType(FederatingPortletInvoker.class); + + // add our Session event listener to the ListenerService for use in org.exoplatform.web.GenericHttpListener + ListenerService listenerService = (ListenerService)container.getComponentInstanceOfType(ListenerService.class); + SessionEventListenerAndBroadcaster sessionEventBroadcaster = new SessionEventListenerAndBroadcaster(); + + // events from org.exoplatform.web.GenericHttpListener + listenerService.addListener("org.exoplatform.web.GenericHttpListener.sessionCreated", sessionEventBroadcaster); + listenerService.addListener("org.exoplatform.web.GenericHttpListener.sessionDestroyed", sessionEventBroadcaster); + + try + { + JCRPersister persister = new JCRPersister(container, JCRPersister.WSRP_WORKSPACE_NAME); + persister.initializeBuilderFor(JCRConsumerRegistry.mappingClasses); + + consumerRegistry = new JCRConsumerRegistry(persister); + consumerRegistry.setFederatingPortletInvoker(federatingPortletInvoker); + consumerRegistry.setSessionEventBroadcaster(sessionEventBroadcaster); + + // create ConsumerStructureProvider and register it to listen to page events + POMSessionManager sessionManager = (POMSessionManager)container.getComponentInstanceOfType(POMSessionManager.class); + PortalStructureAccess structureAccess = new MOPPortalStructureAccess(sessionManager); + MOPConsumerStructureProvider structureprovider = new MOPConsumerStructureProvider(structureAccess); + listenerService.addListener(DataStorage.PAGE_CREATED, structureprovider); + listenerService.addListener(DataStorage.PAGE_REMOVED, structureprovider); + listenerService.addListener(DataStorage.PAGE_UPDATED, structureprovider); + + // migration service + persister = new JCRPersister(container, JCRPersister.WSRP_WORKSPACE_NAME); + persister.initializeBuilderFor(JCRMigrationService.mappingClasses); + + MigrationService migrationService = new JCRMigrationService(persister); + migrationService.setStructureProvider(structureprovider); + consumerRegistry.setMigrationService(migrationService); + + consumerRegistry.start(); + + // set up a NullInvokerHandler so that when a remote producer is queried, we can start it if needed + ActivatingNullInvokerHandler handler = new ActivatingNullInvokerHandler(); + handler.setConsumerRegistry(consumerRegistry); + federatingPortletInvoker.setNullInvokerHandler(handler); + } + catch (Exception e) + { + throw new RuntimeException("Couldn't start WSRP consumers registry.", e); + } + container.registerComponentInstance(ConsumerRegistry.class, consumerRegistry); + } + + public void stop() + { + if (!bypass) + { + // stop listening to web app events + ServletContainerFactory factory = DefaultServletContainerFactory.getInstance(); + ServletContainer servletContainer = factory.getServletContainer(); + servletContainer.removeWebAppListener(this); + + stopProducer(); + stopConsumers(); + } + } + + private void stopProducer() + { + producer.stop(); + + producer = null; + } + + private void stopConsumers() + { + try + { + consumerRegistry.stop(); + } + catch (Exception e) + { + throw new RuntimeException("Couldn't stop WSRP consumers registry.", e); + } + + consumerRegistry = null; + } + + public void onEvent(WebAppEvent event) + { + if (event instanceof WebAppLifeCycleEvent) + { + WebAppLifeCycleEvent lifeCycleEvent = (WebAppLifeCycleEvent)event; + WebApp webApp = event.getWebApp(); + ServletContext context = webApp.getServletContext(); + + // if we see the WSRP admin GUI being deployed or undeployed, inject or remove services + if (WSRP_ADMIN_GUI_CONTEXT_PATH.equals(webApp.getContextPath())) + { + switch (lifeCycleEvent.getType()) + { + case WebAppLifeCycleEvent.ADDED: + context.setAttribute("ConsumerRegistry", consumerRegistry); + context.setAttribute("ProducerConfigurationService", producer.getConfigurationService()); + break; + case WebAppLifeCycleEvent.REMOVED: + context.removeAttribute("ConsumerRegistry"); + context.removeAttribute("ProducerConfigurationService"); + break; + } + } + } + } + +} \ No newline at end of file Property changes on: portal/branches/wsrp-extraction/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/jcr ___________________________________________________________________ Added: svn:ignore + *.iml .idea Added: portal/branches/wsrp-extraction/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/jcr/JCRPersister.java =================================================================== --- portal/branches/wsrp-extraction/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/jcr/JCRPersister.java (rev 0) +++ portal/branches/wsrp-extraction/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/jcr/JCRPersister.java 2011-02-14 15:03:03 UTC (rev 5878) @@ -0,0 +1,344 @@ +/* + * JBoss, a division of Red Hat + * Copyright 2011, Red Hat Middleware, LLC, and individual + * contributors as indicated by the @authors tag. See the + * copyright.txt in the distribution for a full listing of + * individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + +package org.gatein.integration.wsrp.jcr; + +import org.chromattic.api.Chromattic; +import org.chromattic.api.ChromatticBuilder; +import org.chromattic.api.ChromatticSession; +import org.chromattic.api.format.FormatterContext; +import org.chromattic.api.format.ObjectFormatter; +import org.chromattic.spi.jcr.SessionLifeCycle; +import org.exoplatform.container.ExoContainer; +import org.exoplatform.container.ExoContainerContext; +import org.exoplatform.services.jcr.RepositoryService; +import org.exoplatform.services.jcr.core.ManageableRepository; +import org.exoplatform.services.jcr.ext.common.SessionProvider; +import org.gatein.common.util.ParameterValidation; +import org.gatein.wsrp.jcr.ChromatticPersister; +import org.gatein.wsrp.jcr.mapping.BaseMapping; + +import javax.jcr.Credentials; +import javax.jcr.RepositoryException; +import javax.jcr.Session; +import java.lang.reflect.ParameterizedType; +import java.lang.reflect.Type; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> + * @version $Revision$ + */ +public class JCRPersister implements ChromatticPersister +{ + private Chromattic chrome; + public static final String WSRP_WORKSPACE_NAME = "wsrp-system"; + public static final String PORTLET_STATES_WORKSPACE_NAME = "pc-system"; + private static final String REPOSITORY_NAME = "repository"; + private String workspaceName; + private Map<Class, Class<? extends BaseMapping>> modelToMapping; + + private ThreadLocal<ChromatticSession> sessionHolder = new ThreadLocal<ChromatticSession>(); + + public JCRPersister(ExoContainer container, String workspaceName) + { + this.workspaceName = workspaceName; + } + + public void initializeBuilderFor(List<Class> mappingClasses) throws Exception + { + ChromatticBuilder builder = ChromatticBuilder.create(); + builder.setOptionValue(ChromatticBuilder.INSTRUMENTOR_CLASSNAME, "org.chromattic.apt.InstrumentorImpl"); + if (PORTLET_STATES_WORKSPACE_NAME.equals(workspaceName)) + { + builder.setOptionValue(ChromatticBuilder.SESSION_LIFECYCLE_CLASSNAME, PortletStatesSessionLifeCycle.class.getName()); + } + else if (WSRP_WORKSPACE_NAME.equals(workspaceName)) + { + builder.setOptionValue(ChromatticBuilder.SESSION_LIFECYCLE_CLASSNAME, WSRPSessionLifeCycle.class.getName()); + } + else + { + throw new IllegalArgumentException("Unknown workspace name: '" + workspaceName + "'"); + } + + modelToMapping = new HashMap<Class, Class<? extends BaseMapping>>(mappingClasses.size()); + for (Class mappingClass : mappingClasses) + { + if (BaseMapping.class.isAssignableFrom(mappingClass)) + { + Type[] interfaces = mappingClass.getGenericInterfaces(); + if (ParameterValidation.existsAndIsNotEmpty(interfaces)) + { + Class type = (Class)((ParameterizedType)interfaces[0]).getActualTypeArguments()[0]; + modelToMapping.put(type, mappingClass); + } + } + builder.add(mappingClass); + } + + chrome = builder.build(); + } + + public ChromatticSession getSession() + { + ChromatticSession chromatticSession = sessionHolder.get(); + if (chromatticSession == null) + { + ChromatticSession session = chrome.openSession(); + sessionHolder.set(session); + return session; + } + else + { + return chromatticSession; + } + } + + public void closeSession(boolean save) + { + ChromatticSession session = getOpenedSessionOrFail(); + if (save) + { + synchronized (this) + { + session.save(); + } + } + session.close(); + sessionHolder.set(null); + } + + private ChromatticSession getOpenedSessionOrFail() + { + ChromatticSession session = sessionHolder.get(); + if (session == null) + { + throw new IllegalStateException("Cannot close the session as it hasn't been opened first!"); + } + return session; + } + + public synchronized void save() + { + getOpenedSessionOrFail().save(); + } + + public <T> boolean delete(T toDelete, org.gatein.wsrp.jcr.StoresByPathManager<T> manager) + { + Class<? extends Object> modelClass = toDelete.getClass(); + Class<? extends BaseMapping> baseMappingClass = modelToMapping.get(modelClass); + if (baseMappingClass == null) + { + throw new IllegalArgumentException("Cannot find a mapping class for " + modelClass.getName()); + } + + ChromatticSession session = getSession(); + + Object old = session.findByPath(baseMappingClass, manager.getChildPath(toDelete)); + + if (old != null) + { + session.remove(old); + closeSession(true); + return true; + } + else + { + closeSession(false); + return false; + } + } + + public static class WSRPSessionLifeCycle implements SessionLifeCycle + { + private ManageableRepository repository; + private SessionProvider provider; + + public WSRPSessionLifeCycle() + { + try + { + ExoContainer container = ExoContainerContext.getCurrentContainer(); + RepositoryService repoService = (RepositoryService)container.getComponentInstanceOfType(RepositoryService.class); + repository = repoService.getRepository(REPOSITORY_NAME); + } + catch (Exception e) + { + throw new RuntimeException(e); + } + + provider = SessionProvider.createSystemProvider(); + } + + public Session login() throws RepositoryException + { + return provider.getSession(WSRP_WORKSPACE_NAME, repository); + } + + public Session login(String s) throws RepositoryException + { + throw new UnsupportedOperationException(); + } + + public Session login(Credentials credentials, String s) throws RepositoryException + { + throw new UnsupportedOperationException(); + } + + public Session login(Credentials credentials) throws RepositoryException + { + throw new UnsupportedOperationException(); + } + + public void save(Session session) throws RepositoryException + { + session.save(); + } + + public void close(Session session) + { + session.logout(); + } + } + + public static class PortletStatesSessionLifeCycle implements SessionLifeCycle + { + private ManageableRepository repository; + private SessionProvider provider; + + public PortletStatesSessionLifeCycle() + { + try + { + ExoContainer container = ExoContainerContext.getCurrentContainer(); + RepositoryService repoService = (RepositoryService)container.getComponentInstanceOfType(RepositoryService.class); + repository = repoService.getRepository(REPOSITORY_NAME); + } + catch (Exception e) + { + throw new RuntimeException(e); + } + + provider = SessionProvider.createSystemProvider(); + } + + public Session login() throws RepositoryException + { + return provider.getSession(PORTLET_STATES_WORKSPACE_NAME, repository); + } + + public Session login(String s) throws RepositoryException + { + throw new UnsupportedOperationException(); + } + + public Session login(Credentials credentials, String s) throws RepositoryException + { + throw new UnsupportedOperationException(); + } + + public Session login(Credentials credentials) throws RepositoryException + { + throw new UnsupportedOperationException(); + } + + public void save(Session session) throws RepositoryException + { + session.save(); + } + + public void close(Session session) + { + session.logout(); + } + } + + public static class QNameFormatter implements ObjectFormatter + { + private static final String OPEN_BRACE_REPLACEMENT = "-__"; + private static final String CLOSE_BRACE_REPLACEMENT = "__-"; + private static final String COLON_REPLACEMENT = "_-_"; + private static final String CLOSE_BRACE = "}"; + private static final String OPEN_BRACE = "{"; + private static final String COLON = ":"; + + public String decodeNodeName(FormatterContext formatterContext, String s) + { + return decode(s); + } + + public String encodeNodeName(FormatterContext formatterContext, String s) + { + return encode(s); + } + + public String decodePropertyName(FormatterContext formatterContext, String s) + { + return decode(s); + } + + public String encodePropertyName(FormatterContext formatterContext, String s) + { + return encode(s); + } + + public static String decode(String s) + { + return s.replace(CLOSE_BRACE_REPLACEMENT, CLOSE_BRACE).replace(OPEN_BRACE_REPLACEMENT, OPEN_BRACE).replace(COLON_REPLACEMENT, COLON); + } + + public static String encode(String s) + { + return s.replace(OPEN_BRACE, OPEN_BRACE_REPLACEMENT).replace(CLOSE_BRACE, CLOSE_BRACE_REPLACEMENT).replace(COLON, COLON_REPLACEMENT); + } + } + + public static class PortletNameFormatter implements ObjectFormatter + { + public static final String SLASH_REPLACEMENT = "-_-"; + private static final String SLASH = "/"; + + public String decodeNodeName(FormatterContext formatterContext, String s) + { + return decode(s); + } + + public static String decode(String s) + { + return s.replace(SLASH_REPLACEMENT, SLASH); + } + + public String encodeNodeName(FormatterContext formatterContext, String s) throws IllegalArgumentException, NullPointerException + { + return encode(s); + } + + public static String encode(String s) + { + return s.replace(SLASH, SLASH_REPLACEMENT); + } + } +} Property changes on: portal/branches/wsrp-extraction/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/structure ___________________________________________________________________ Added: svn:ignore + *.iml .idea Added: portal/branches/wsrp-extraction/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/structure/MOPConsumerStructureProvider.java =================================================================== --- portal/branches/wsrp-extraction/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/structure/MOPConsumerStructureProvider.java (rev 0) +++ portal/branches/wsrp-extraction/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/structure/MOPConsumerStructureProvider.java 2011-02-14 15:03:03 UTC (rev 5878) @@ -0,0 +1,308 @@ +/* + * JBoss, a division of Red Hat + * Copyright 2011, Red Hat Middleware, LLC, and individual + * contributors as indicated by the @authors tag. See the + * copyright.txt in the distribution for a full listing of + * individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + +package org.gatein.integration.wsrp.structure; + +import org.exoplatform.portal.config.DataStorage; +import org.exoplatform.portal.mop.Described; +import org.exoplatform.portal.pom.spi.wsrp.WSRP; +import org.exoplatform.services.listener.Event; +import org.exoplatform.services.listener.Listener; +import org.gatein.common.util.ParameterValidation; +import org.gatein.mop.api.content.Customization; +import org.gatein.mop.api.workspace.ObjectType; +import org.gatein.mop.api.workspace.Page; +import org.gatein.mop.api.workspace.ui.UIComponent; +import org.gatein.mop.api.workspace.ui.UIContainer; +import org.gatein.mop.api.workspace.ui.UIWindow; +import org.gatein.pc.api.PortletContext; +import org.gatein.pc.api.PortletStateType; +import org.gatein.pc.api.StatefulPortletContext; +import org.gatein.wsrp.api.context.ConsumerStructureProvider; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; + +/** + * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> + * @version $Revision$ + */ +public class MOPConsumerStructureProvider extends Listener<DataStorage, org.exoplatform.portal.config.model.Page> implements ConsumerStructureProvider +{ + private final PortalStructureAccess structureAccess; + private Map<String, PageInfo> pageInfos; + private boolean pagesHaveBeenInitialized; + + public MOPConsumerStructureProvider(PortalStructureAccess structureAccess) + { + ParameterValidation.throwIllegalArgExceptionIfNull(structureAccess, "PortalStructureAccess"); + + this.structureAccess = structureAccess; + pageInfos = new HashMap<String, PageInfo>(); + } + + public List<String> getPageIdentifiers() + { + if (!pagesHaveBeenInitialized) + { + // initialize page information + Collection<Page> pages = structureAccess.getPages(); + for (Page page : pages) + { + addPage(page); + } + + pagesHaveBeenInitialized = true; + } + + LinkedList<String> identifiers = new LinkedList<String>(pageInfos.keySet()); + Collections.sort(identifiers); + return identifiers; + } + + private void addPage(Page page) + { + Described described = page.adapt(Described.class); + PageInfo pageInfo = new PageInfo(page.getObjectId(), described.getName(), page.getName()); + pageInfos.put(pageInfo.getName(), pageInfo); + UIContainer container = page.getRootComponent(); + processContainer(container, pageInfo); + + Collection<Page> children = page.getChildren(); + if (ParameterValidation.existsAndIsNotEmpty(children)) + { + for (Page child : children) + { + addPage(child); + } + } + } + + public List<String> getWindowIdentifiersFor(String pageId) + { + PageInfo pageInfo = pageInfos.get(pageId); + if (pageInfo == null) + { + throw new IllegalArgumentException("Page '" + pageId + "' does not exist."); + } + + return pageInfo.getChildrenWindows(); + } + + private void processContainer(UIContainer container, PageInfo pageInfo) + { + if (container != null) + { + List<UIComponent> components = container.getComponents(); + for (UIComponent component : components) + { + ObjectType<? extends UIComponent> type = component.getObjectType(); + if (ObjectType.WINDOW.equals(type)) + { + Described described = component.adapt(Described.class); + String name = described.getName(); + + pageInfo.addWindow(name, component.getObjectId()); + } + else if (ObjectType.CONTAINER.equals(type)) + { + processContainer((UIContainer)component, pageInfo); + } + else + { + // ignore + } + } + } + } + + public void assignPortletToWindow(PortletContext portletContext, String windowId, String pageId, String exportedPortletHandle) + { + PageInfo pageInfo = pageInfos.get(pageId); + String uuid = pageInfo.getWindowUUID(windowId); + ParameterValidation.throwIllegalArgExceptionIfNull(uuid, "UUID for " + windowId); + + // get the window + UIWindow window = structureAccess.getWindowFrom(uuid); + + // construct the new customization state + WSRP wsrp = new WSRP(); + String portletId = portletContext.getId(); + wsrp.setPortletId(portletId); + if (portletContext instanceof StatefulPortletContext) + { + StatefulPortletContext context = (StatefulPortletContext)portletContext; + if (PortletStateType.OPAQUE.equals(context.getType())) + { + wsrp.setState((byte[])context.getState()); + } + else + { + throw new IllegalArgumentException("Don't know how to deal with state: " + context.getState()); + } + } + + // destroy existing customization as otherwise re-customizing will fail + Customization<?> customization = window.getCustomization(); + customization.destroy(); + + // and re-customize + window.customize(WSRP.CONTENT_TYPE, portletId, wsrp); + + // Change the window's name so that it's less confusing to users + Described described = window.adapt(Described.class); + String newName = exportedPortletHandle + " (remote)"; + described.setName(newName); // should be the same as ApplicationRegistryService.REMOTE_DISPLAY_NAME_SUFFIX + + // update window mappings + pageInfo.updateWindowName(windowId, newName); + + structureAccess.saveChangesTo(window); + } + + @Override + public void onEvent(Event<DataStorage, org.exoplatform.portal.config.model.Page> event) throws Exception + { + String eventName = event.getEventName(); + + // get the MOP page from the event data + org.exoplatform.portal.config.model.Page portalPage = event.getData(); + Page page = structureAccess.getPageFrom(portalPage); + + if (page == null && DataStorage.PAGE_REMOVED.equals(eventName)) + { + // if we try to remove a page, when we get this event, the page has already been removed from JCR + // so we need to work around that fact by retrieving the corresponding PageInfo from the portal page title + // which should match the Described name and check that it matches the internal name before removing it + removePage(portalPage.getTitle(), portalPage.getName()); + + return; + } + + if (page != null) + { + if (DataStorage.PAGE_CREATED.equals(eventName)) + { + // add information for new page + addPage(page); + } + else if (DataStorage.PAGE_UPDATED.equals(eventName)) + { + removePage(page); + addPage(page); + } + } + } + + private void removePage(Page page) + { + Described described = page.adapt(Described.class); + String name = described.getName(); + + removePage(name, page.getName()); + } + + private void removePage(String name, String internalName) + { + PageInfo pageInfo = pageInfos.get(name); + if (pageInfo != null && internalName.equals(pageInfo.getInternalName())) + { + // remove page info + pageInfos.remove(name); + } + } + + private static class PageInfo + { + private final String uuid; + private final Map<String, String> childrenWindows = new HashMap<String, String>(); + + /** Name as provided by Described */ + private final String name; + + /** Name as automatically generated */ + private final String internalName; + + private PageInfo(String uuid, String name, String internalName) + { + this.uuid = uuid; + this.name = name; + this.internalName = internalName; + } + + public String getUUID() + { + return uuid; + } + + public String getInternalName() + { + return internalName; + } + + public List<String> getChildrenWindows() + { + return new ArrayList<String>(childrenWindows.keySet()); + } + + public void addWindow(String windowName, String uuid) + { + // add suffix in case we have several windows with the same name in the page + if (childrenWindows.containsKey(windowName)) + { + if (windowName.endsWith("|")) + { + windowName += "|"; + } + else + { + windowName += windowName + " |"; + } + } + + childrenWindows.put(windowName, uuid); + } + + public void updateWindowName(String oldWindowName, String newWindowName) + { + String windowUUID = getWindowUUID(oldWindowName); + childrenWindows.remove(oldWindowName); + childrenWindows.put(newWindowName, windowUUID); + } + + public String getName() + { + return name; + } + + public String getWindowUUID(String windowId) + { + return childrenWindows.get(windowId); + } + } +} Added: portal/branches/wsrp-extraction/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/structure/MOPPortalStructureAccess.java =================================================================== --- portal/branches/wsrp-extraction/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/structure/MOPPortalStructureAccess.java (rev 0) +++ portal/branches/wsrp-extraction/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/structure/MOPPortalStructureAccess.java 2011-02-14 15:03:03 UTC (rev 5878) @@ -0,0 +1,111 @@ +/* + * JBoss, a division of Red Hat + * Copyright 2011, Red Hat Middleware, LLC, and individual + * contributors as indicated by the @authors tag. See the + * copyright.txt in the distribution for a full listing of + * individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + +package org.gatein.integration.wsrp.structure; + +import org.exoplatform.portal.pom.config.POMSession; +import org.exoplatform.portal.pom.config.POMSessionManager; +import org.exoplatform.portal.pom.data.Mapper; +import org.exoplatform.portal.pom.data.PageKey; +import org.gatein.mop.api.workspace.ObjectType; +import org.gatein.mop.api.workspace.Page; +import org.gatein.mop.api.workspace.Site; +import org.gatein.mop.api.workspace.Workspace; +import org.gatein.mop.api.workspace.ui.UIWindow; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + +/** + * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> + * @version $Revision$ + */ +public class MOPPortalStructureAccess implements PortalStructureAccess +{ + private static final String PAGES_CHILD_NAME = "pages"; + private final POMSessionManager pomManager; + + public MOPPortalStructureAccess(POMSessionManager pomManager) + { + this.pomManager = pomManager; + } + + public Collection<Page> getPages() + { + POMSession session = pomManager.getSession(); + Workspace workspace = session.getWorkspace(); + Collection<Site> sites = workspace.getSites(ObjectType.PORTAL_SITE); + + List<Page> pages = new ArrayList<Page>(sites.size() * 10); + + for (Site site : sites) + { + Page pagesRoot = getPagesFrom(site); + if (pagesRoot != null) + { + Collection<Page> children = pagesRoot.getChildren(); + for (Page child : children) + { + pages.add(child); + } + } + } + + return pages; + } + + public UIWindow getWindowFrom(String uuid) + { + POMSession session = pomManager.getSession(); + return session.findObjectById(ObjectType.WINDOW, uuid); + } + + public void saveChangesTo(UIWindow window) + { + POMSession session = pomManager.getSession(); + + // mark page for cache invalidation otherwise DataCache will use the previous customization id when trying to set + // the portlet state in UIPortlet.setState and will not find it resulting in an error + Page page = window.getPage(); + session.scheduleForEviction(new PageKey("portal", page.getSite().getName(), page.getName())); + + // save + session.close(true); + } + + public Page getPageFrom(org.exoplatform.portal.config.model.Page portalPage) + { + POMSession session = pomManager.getSession(); + Site site = session.getWorkspace().getSite(Mapper.parseSiteType(portalPage.getOwnerType()), portalPage.getOwnerId()); + return getPagesFrom(site).getChild(portalPage.getName()); + } + + private Page getPagesFrom(Site site) + { + // a site contains a root page with templates and pages + // more info at http://code.google.com/p/chromattic/wiki/MOPUseCases + + return site.getRootPage().getChild(PAGES_CHILD_NAME); + } +} Added: portal/branches/wsrp-extraction/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/structure/PortalStructureAccess.java =================================================================== --- portal/branches/wsrp-extraction/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/structure/PortalStructureAccess.java (rev 0) +++ portal/branches/wsrp-extraction/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/structure/PortalStructureAccess.java 2011-02-14 15:03:03 UTC (rev 5878) @@ -0,0 +1,44 @@ +/* + * JBoss, a division of Red Hat + * Copyright 2011, Red Hat Middleware, LLC, and individual + * contributors as indicated by the @authors tag. See the + * copyright.txt in the distribution for a full listing of + * individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + +package org.gatein.integration.wsrp.structure; + +import org.gatein.mop.api.workspace.Page; +import org.gatein.mop.api.workspace.ui.UIWindow; + +import java.util.Collection; + +/** + * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> + * @version $Revision$ + */ +public interface PortalStructureAccess +{ + Collection<Page> getPages(); + + UIWindow getWindowFrom(String uuid); + + void saveChangesTo(UIWindow window); + + Page getPageFrom(org.exoplatform.portal.config.model.Page portalPage); +} Property changes on: portal/branches/wsrp-extraction/wsrp-integration/extension-component/src/main/resources ___________________________________________________________________ Added: svn:ignore + *.iml .idea Property changes on: portal/branches/wsrp-extraction/wsrp-integration/extension-component/src/main/resources/conf ___________________________________________________________________ Added: svn:ignore + *.iml .idea Added: portal/branches/wsrp-extraction/wsrp-integration/extension-component/src/main/resources/conf/wsrp-producer-config.xml =================================================================== --- portal/branches/wsrp-extraction/wsrp-integration/extension-component/src/main/resources/conf/wsrp-producer-config.xml (rev 0) +++ portal/branches/wsrp-extraction/wsrp-integration/extension-component/src/main/resources/conf/wsrp-producer-config.xml 2011-02-14 15:03:03 UTC (rev 5878) @@ -0,0 +1,35 @@ +<!-- + ~ JBoss, a division of Red Hat + ~ Copyright 2011, Red Hat Middleware, LLC, and individual + ~ contributors as indicated by the @authors tag. See the + ~ copyright.txt in the distribution for a full listing of + ~ individual contributors. + ~ + ~ 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 using registration with default registration property validator. --> +<producer-configuration xmlns="urn:jboss:portal:wsrp:producer:v2_7" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="urn:jboss:portal:wsrp:producer:v2_7 http://www.jboss.org/portal/xsd/jboss-wsrp-producer_2_7.xsd"> + <registration-configuration fullServiceDescriptionRequiresRegistration="true"> + <registration-property-validator>org.gatein.registration.policies.DefaultRegistrationPropertyValidator + </registration-property-validator> + </registration-configuration> +</producer-configuration> + + <!-- Configuration without registration --> + <!--<producer-configuration/>--> \ No newline at end of file Property changes on: portal/branches/wsrp-extraction/wsrp-integration/extension-component/src/test ___________________________________________________________________ Added: svn:ignore + *.iml .idea Property changes on: portal/branches/wsrp-extraction/wsrp-integration/extension-component/src/test/java ___________________________________________________________________ Added: svn:ignore + *.iml .idea Property changes on: portal/branches/wsrp-extraction/wsrp-integration/extension-component/src/test/java/org ___________________________________________________________________ Added: svn:ignore + *.iml .idea Property changes on: portal/branches/wsrp-extraction/wsrp-integration/extension-component/src/test/java/org/gatein ___________________________________________________________________ Added: svn:ignore + *.iml .idea Property changes on: portal/branches/wsrp-extraction/wsrp-integration/extension-component/src/test/java/org/gatein/integration ___________________________________________________________________ Added: svn:ignore + *.iml .idea Property changes on: portal/branches/wsrp-extraction/wsrp-integration/extension-component/src/test/java/org/gatein/integration/wsrp ___________________________________________________________________ Added: svn:ignore + *.iml .idea Property changes on: portal/branches/wsrp-extraction/wsrp-integration/extension-component/src/test/java/org/gatein/integration/wsrp/structure ___________________________________________________________________ Added: svn:ignore + *.iml .idea Added: portal/branches/wsrp-extraction/wsrp-integration/extension-component/src/test/java/org/gatein/integration/wsrp/structure/MOPConsumerStructureProviderTestCase.java =================================================================== --- portal/branches/wsrp-extraction/wsrp-integration/extension-component/src/test/java/org/gatein/integration/wsrp/structure/MOPConsumerStructureProviderTestCase.java (rev 0) +++ portal/branches/wsrp-extraction/wsrp-integration/extension-component/src/test/java/org/gatein/integration/wsrp/structure/MOPConsumerStructureProviderTestCase.java 2011-02-14 15:03:03 UTC (rev 5878) @@ -0,0 +1,302 @@ +/* + * JBoss, a division of Red Hat + * Copyright 2011, Red Hat Middleware, LLC, and individual + * contributors as indicated by the @authors tag. See the + * copyright.txt in the distribution for a full listing of + * individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + +package org.gatein.integration.wsrp.structure; + +import junit.framework.TestCase; +import org.exoplatform.portal.config.DataStorage; +import org.exoplatform.portal.mop.Described; +import org.exoplatform.portal.pom.spi.wsrp.WSRP; +import org.exoplatform.services.listener.Event; +import org.gatein.mop.api.content.Customization; +import org.gatein.mop.api.workspace.ObjectType; +import org.gatein.mop.api.workspace.Page; +import org.gatein.mop.api.workspace.ui.UIComponent; +import org.gatein.mop.api.workspace.ui.UIContainer; +import org.gatein.mop.api.workspace.ui.UIWindow; +import org.gatein.pc.api.PortletContext; +import org.mockito.invocation.InvocationOnMock; +import org.mockito.stubbing.Answer; + +import java.util.ArrayList; +import java.util.List; + +import static org.mockito.Mockito.*; + +/** + * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> + * @version $Revision$ + */ +public class MOPConsumerStructureProviderTestCase extends TestCase +{ + private MOPConsumerStructureProvider provider; + private PortalStructureAccess structureAccess; + private Page page1; + + public void testGetPageIdentifiers() + { + List<String> pageIdentifiers = provider.getPageIdentifiers(); + assertEquals(5, pageIdentifiers.size()); + assertTrue(pageIdentifiers.contains("page1")); + assertTrue(pageIdentifiers.contains("page11")); + assertTrue(pageIdentifiers.contains("page12")); + assertTrue(pageIdentifiers.contains("page2")); + assertTrue(pageIdentifiers.contains("page21")); + } + + public void testGetWindowIdentifiersForInexistingPage() + { + try + { + provider.getWindowIdentifiersFor("inexisting"); + fail("Cannot retrieve windows for an inexistent page"); + } + catch (IllegalArgumentException e) + { + // expected + } + } + + public void testGetWindowIdentifiersFor() + { + checkWindows("page1", "window11", "window12"); + checkWindows("page2"); + checkWindows("page11", "window111", "window112"); + checkWindows("page12", "window121"); + checkWindows("page21", "window211"); + } + + public void testAssignPortletToWindow() + { + String newCustomizationId = "new"; + String newWindowName = "portlet"; + provider.assignPortletToWindow(PortletContext.createPortletContext(newCustomizationId), "window11", "page1", newWindowName); + verify(structureAccess).getWindowFrom(getIdFor("window11")); + + UIWindow window11 = structureAccess.getWindowFrom(getIdFor("window11")); + verify(structureAccess).saveChangesTo(window11); + + Described described = window11.adapt(Described.class); + verify(described).setName(newWindowName + " (remote)"); + + WSRP state = new WSRP(); + state.setPortletId(newCustomizationId); + verify(window11).customize(WSRP.CONTENT_TYPE, newCustomizationId, state); + + Customization<?> customization = window11.getCustomization(); + assertEquals(WSRP.CONTENT_TYPE, customization.getType()); + } + + public void testPageCreationEvent() throws Exception + { + Page foo = createPage("foo", new String[]{"foo1"}, new String[]{"windowfoo1"}); + Page foo1 = foo.getChild("foo1"); + addWindows(foo1, "windowfoo11"); + org.exoplatform.portal.config.model.Page portalPage = mock(org.exoplatform.portal.config.model.Page.class); + when(structureAccess.getPageFrom(portalPage)).thenReturn(foo); + + int pageNumber = provider.getPageIdentifiers().size(); + + provider.onEvent(new Event<DataStorage, org.exoplatform.portal.config.model.Page>(DataStorage.PAGE_CREATED, null, portalPage)); + + List<String> identifiers = provider.getPageIdentifiers(); + assertEquals(pageNumber + 2, identifiers.size()); + assertTrue(identifiers.contains("foo")); + assertTrue(identifiers.contains("foo1")); + + checkWindows("foo", "windowfoo1"); + checkWindows("foo1", "windowfoo11"); + + assertEquals(foo1.getRootComponent().get("windowfoo11"), structureAccess.getWindowFrom(getIdFor("windowfoo11"))); + } + + public void testPageDeletionEvent() throws Exception + { + String pageToRemove = "page1"; + + org.exoplatform.portal.config.model.Page portalPage = mock(org.exoplatform.portal.config.model.Page.class); + when(portalPage.getName()).thenReturn(createInternalNameFrom(pageToRemove)); + when(portalPage.getTitle()).thenReturn(pageToRemove); + + // on delete, we actually get the event after the page has been removed from JCR so we don't have an actual page + when(structureAccess.getPageFrom(portalPage)).thenReturn(null); + + int pageNumber = provider.getPageIdentifiers().size(); + + provider.onEvent(new Event<DataStorage, org.exoplatform.portal.config.model.Page>(DataStorage.PAGE_REMOVED, null, portalPage)); + + List<String> identifiers = provider.getPageIdentifiers(); + assertEquals(pageNumber - 1, identifiers.size()); + // deleting a page doesn't delete its children, see GTNPORTAL-1630 + assertFalse(identifiers.contains(pageToRemove)); + assertTrue(identifiers.contains("page11")); + assertTrue(identifiers.contains("page12")); + } + + public void testPageUpdatedEvent() throws Exception + { + // todo! + } + + @Override + protected void setUp() throws Exception + { + structureAccess = mock(PortalStructureAccess.class); + + page1 = createPage("page1", new String[]{"page11", "page12"}, new String[]{"window11", "window12"}); + Page page2 = createPage("page2", new String[]{"page21"}, null); + + Page page11 = page1.getChild("page11"); + addWindows(page11, "window111", "window112"); + + Page page12 = page1.getChild("page12"); + addWindows(page12, "window121"); + + Page page21 = page2.getChild("page21"); + addWindows(page21, "window211"); + + ArrayList<Page> pages = new ArrayList<Page>(); + pages.add(page1); + pages.add(page11); + pages.add(page12); + pages.add(page2); + pages.add(page21); + when(structureAccess.getPages()).thenReturn(pages); + + provider = new MOPConsumerStructureProvider(structureAccess); + + // needed to initialize state + provider.getPageIdentifiers(); + } + + private void checkWindows(final String pageName, String... windowNames) + { + List<String> windows = provider.getWindowIdentifiersFor(pageName); + + if (windowNames != null) + { + assertEquals(windowNames.length, windows.size()); + for (String windowName : windowNames) + { + assertTrue(windows.contains(windowName)); + } + } + } + + private Page createPage(String name, String[] childrenPages, String[] windowNames) + { + Page page = mock(Page.class); + + when(page.getName()).thenReturn(createInternalNameFrom(name)); + + // mock call to adapt + Described described = mock(Described.class); + when(described.getName()).thenReturn(name); + + when(page.adapt(Described.class)).thenReturn(described); + + if (childrenPages != null) + { + List<Page> children = new ArrayList<Page>(childrenPages.length); + for (String pageId : childrenPages) + { + Page childPage = createPage(pageId, null, null); + when(page.getChild(pageId)).thenReturn(childPage); + children.add(childPage); + } + + when(page.getChildren()).thenReturn(children); + } + + addWindows(page, windowNames); + + return page; + } + + private String createInternalNameFrom(String name) + { + return name + "internal"; + } + + private void addWindows(Page page, String... windowNames) + { + if (windowNames != null) + { + // mock page container + UIContainer root = mock(UIContainer.class); + when(page.getRootComponent()).thenReturn(root); + + // for each provided window name, create a mock UIWindow... + List<UIComponent> children = new ArrayList<UIComponent>(windowNames.length); + for (String windowName : windowNames) + { + UIWindow window = mock(UIWindow.class); + when(window.getName()).thenThrow(new RuntimeException("Window.getName returns the internal name, not the human readable one")); + when(window.getObjectId()).thenReturn(getIdFor(windowName)); + + // need to use thenAnswer instead of thenReturn here because it doesn't play well with generics + when(window.getObjectType()).thenAnswer(new Answer<Object>() + { + public Object answer(InvocationOnMock invocationOnMock) throws Throwable + { + return ObjectType.WINDOW; + } + }); + + // mock call to adapt + Described described = mock(Described.class); + when(described.getName()).thenReturn(windowName); + + when(window.adapt(Described.class)).thenReturn(described); + + // mock Customization + final Customization<WSRP> customization = mock(Customization.class); + when(customization.getType()).thenReturn(WSRP.CONTENT_TYPE); + when(window.getCustomization()).thenAnswer(new Answer<Object>() + { + public Object answer(InvocationOnMock invocationOnMock) throws Throwable + { + return customization; + } + }); + + // add it to the list of windows for this page + children.add(window); + + // make sure that we return the window when we ask for it from its uuid + when(structureAccess.getWindowFrom(getIdFor(windowName))).thenReturn(window); + + // make sure that we return the window if we ask the root component for it + when(root.get(windowName)).thenReturn(window); + } + + // the container should return the list of windows when asked for its components + when(root.getComponents()).thenReturn(children); + } + } + + private String getIdFor(String windowName) + { + return windowName + "Id"; + } +} Property changes on: portal/branches/wsrp-extraction/wsrp-integration/extension-config ___________________________________________________________________ Added: svn:ignore + *.iml .idea Added: portal/branches/wsrp-extraction/wsrp-integration/extension-config/pom.xml =================================================================== --- portal/branches/wsrp-extraction/wsrp-integration/extension-config/pom.xml (rev 0) +++ portal/branches/wsrp-extraction/wsrp-integration/extension-config/pom.xml 2011-02-14 15:03:03 UTC (rev 5878) @@ -0,0 +1,41 @@ +<!-- + ~ JBoss, a division of Red Hat + ~ Copyright 2011, Red Hat Middleware, LLC, and individual + ~ contributors as indicated by the @authors tag. See the + ~ copyright.txt in the distribution for a full listing of + ~ individual contributors. + ~ + ~ 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. + --> + +<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> + <artifactId>gatein-wsrp-integration-parent</artifactId> + <groupId>org.gatein.integration</groupId> + <version>1.0.0-Beta01-SNAPSHOT</version> + </parent> + + <artifactId>extension-config</artifactId> + <name>GateIn WSRP Integration extension config</name> + + + <build> + <finalName>extension-config</finalName> + </build> + +</project> \ No newline at end of file Property changes on: portal/branches/wsrp-extraction/wsrp-integration/extension-config/src ___________________________________________________________________ Added: svn:ignore + *.iml .idea Property changes on: portal/branches/wsrp-extraction/wsrp-integration/extension-config/src/main ___________________________________________________________________ Added: svn:ignore + *.iml .idea Property changes on: portal/branches/wsrp-extraction/wsrp-integration/extension-config/src/main/resources ___________________________________________________________________ Added: svn:ignore + *.iml .idea Property changes on: portal/branches/wsrp-extraction/wsrp-integration/extension-config/src/main/resources/conf ___________________________________________________________________ Added: svn:ignore + *.iml .idea Added: portal/branches/wsrp-extraction/wsrp-integration/extension-config/src/main/resources/conf/configuration.xml =================================================================== --- portal/branches/wsrp-extraction/wsrp-integration/extension-config/src/main/resources/conf/configuration.xml (rev 0) +++ portal/branches/wsrp-extraction/wsrp-integration/extension-config/src/main/resources/conf/configuration.xml 2011-02-14 15:03:03 UTC (rev 5878) @@ -0,0 +1,59 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ JBoss, a division of Red Hat + ~ Copyright 2011, Red Hat Middleware, LLC, and individual + ~ contributors as indicated by the @authors tag. See the + ~ copyright.txt in the distribution for a full listing of + ~ individual contributors. + ~ + ~ 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"> + <external-component-plugins> + <!-- The full qualified name of the PortalContainerConfig --> + <target-component>org.exoplatform.container.definition.PortalContainerConfig</target-component> + <component-plugin> + <!-- The name of the plugin --> + <name>Change PortalContainer Definitions</name> + <!-- The name of the method to call on the PortalContainerConfig in order to register the changes on the PortalContainerDefinitions --> + <set-method>registerChangePlugin</set-method> + <!-- The full qualified name of the PortalContainerDefinitionChangePlugin --> + <type>org.exoplatform.container.definition.PortalContainerDefinitionChangePlugin</type> + <init-params> + <value-param> + <name>apply.default</name> + <value>true</value> + </value-param> + <object-param> + <name>change</name> + <object type="org.exoplatform.container.definition.PortalContainerDefinitionChange$AddDependencies"> + <!-- The list of name of the dependencies to add --> + <field name="dependencies"> + <collection type="java.util.ArrayList"> + <value profiles="jboss"> + <string>gatein-wsrp-integration</string> + </value> + </collection> + </field> + </object> + </object-param> + </init-params> + </component-plugin> + </external-component-plugins> +</configuration> \ No newline at end of file Property changes on: portal/branches/wsrp-extraction/wsrp-integration/extension-ear ___________________________________________________________________ Added: svn:ignore + *.iml .idea Added: portal/branches/wsrp-extraction/wsrp-integration/extension-ear/pom.xml =================================================================== --- portal/branches/wsrp-extraction/wsrp-integration/extension-ear/pom.xml (rev 0) +++ portal/branches/wsrp-extraction/wsrp-integration/extension-ear/pom.xml 2011-02-14 15:03:03 UTC (rev 5878) @@ -0,0 +1,185 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ JBoss, a division of Red Hat + ~ Copyright 2011, Red Hat Middleware, LLC, and individual + ~ contributors as indicated by the @authors tag. See the + ~ copyright.txt in the distribution for a full listing of + ~ individual contributors. + ~ + ~ 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. + --> + +<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/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <artifactId>gatein-wsrp-integration-parent</artifactId> + <groupId>org.gatein.integration</groupId> + <version>1.0.0-Beta01-SNAPSHOT</version> + </parent> + + <artifactId>extension-ear</artifactId> + <packaging>ear</packaging> + + <name>GateIn WSRP Integration extension EAR</name> + + <dependencies> + <dependency> + <groupId>org.gatein.integration</groupId> + <artifactId>extension-config</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.gatein.integration</groupId> + <artifactId>extension-war</artifactId> + <version>${project.version}</version> + <type>war</type> + </dependency> + <dependency> + <groupId>org.gatein.integration</groupId> + <artifactId>extension-component</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-admin-gui</artifactId> + <version>${org.gatein.wsrp.version}</version> + <type>war</type> + </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-producer</artifactId> + <version>${org.gatein.wsrp.version}</version> + <type>war</type> + </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-producer-lib</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-consumer</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-jcr-impl</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-common</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-wsrp1-ws</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-wsrp2-ws</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-integration-api</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-wss-jboss5</artifactId> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.6</source> + <target>1.6</target> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-ear-plugin</artifactId> + <configuration> + <displayName>gatein-wsrp-integration</displayName> + <defaultLibBundleDir>lib</defaultLibBundleDir> + <modules> + <webModule> + <groupId>org.gatein.integration</groupId> + <artifactId>extension-war</artifactId> + <contextRoot>gatein-wsrp-integration</contextRoot> + </webModule> + <webModule> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-producer</artifactId> + <contextRoot>wsrp-producer</contextRoot> + </webModule> + <webModule> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-admin-gui</artifactId> + <contextRoot>wsrp-admin-gui</contextRoot> + </webModule> + <jarModule> + <groupId>org.gatein.integration</groupId> + <artifactId>extension-config</artifactId> + <includeInApplicationXml>true</includeInApplicationXml> + <bundleDir>/</bundleDir> + </jarModule> + <jarModule> + <groupId>org.gatein.integration</groupId> + <artifactId>extension-component</artifactId> + <includeInApplicationXml>true</includeInApplicationXml> + <bundleDir>/</bundleDir> + </jarModule> + <jarModule> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-producer-lib</artifactId> + </jarModule> + <jarModule> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-consumer</artifactId> + </jarModule> + <jarModule> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-jcr-impl</artifactId> + </jarModule> + <jarModule> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-common</artifactId> + </jarModule> + <jarModule> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-wsrp1-ws</artifactId> + </jarModule> + <jarModule> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-wsrp2-ws</artifactId> + </jarModule> + <jarModule> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-integration-api</artifactId> + </jarModule> + <jarModule> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-wss-jboss5</artifactId> + </jarModule> + </modules> + </configuration> + </plugin> + </plugins> + <finalName>gatein-wsrp-integration</finalName> + </build> + +</project> Property changes on: portal/branches/wsrp-extraction/wsrp-integration/extension-ear/src ___________________________________________________________________ Added: svn:ignore + *.iml .idea Property changes on: portal/branches/wsrp-extraction/wsrp-integration/extension-ear/src/main ___________________________________________________________________ Added: svn:ignore + *.iml .idea Property changes on: portal/branches/wsrp-extraction/wsrp-integration/extension-ear/src/main/application ___________________________________________________________________ Added: svn:ignore + *.iml .idea Property changes on: portal/branches/wsrp-extraction/wsrp-integration/extension-ear/src/main/application/META-INF ___________________________________________________________________ Added: svn:ignore + *.iml .idea Added: portal/branches/wsrp-extraction/wsrp-integration/extension-ear/src/main/application/META-INF/jboss-scanning.xml =================================================================== --- portal/branches/wsrp-extraction/wsrp-integration/extension-ear/src/main/application/META-INF/jboss-scanning.xml (rev 0) +++ portal/branches/wsrp-extraction/wsrp-integration/extension-ear/src/main/application/META-INF/jboss-scanning.xml 2011-02-14 15:03:03 UTC (rev 5878) @@ -0,0 +1,25 @@ +<!-- + ~ JBoss, a division of Red Hat + ~ Copyright 2011, Red Hat Middleware, LLC, and individual + ~ contributors as indicated by the @authors tag. See the + ~ copyright.txt in the distribution for a full listing of + ~ individual contributors. + ~ + ~ 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. + --> + +<scanning xmlns="urn:jboss:scanning:1.0"> +</scanning> \ No newline at end of file Property changes on: portal/branches/wsrp-extraction/wsrp-integration/extension-war ___________________________________________________________________ Added: svn:ignore + *.iml .idea Added: portal/branches/wsrp-extraction/wsrp-integration/extension-war/pom.xml =================================================================== --- portal/branches/wsrp-extraction/wsrp-integration/extension-war/pom.xml (rev 0) +++ portal/branches/wsrp-extraction/wsrp-integration/extension-war/pom.xml 2011-02-14 15:03:03 UTC (rev 5878) @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ JBoss, a division of Red Hat + ~ Copyright 2011, Red Hat Middleware, LLC, and individual + ~ contributors as indicated by the @authors tag. See the + ~ copyright.txt in the distribution for a full listing of + ~ individual contributors. + ~ + ~ 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. + --> + +<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/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <artifactId>gatein-wsrp-integration-parent</artifactId> + <groupId>org.gatein.integration</groupId> + <version>1.0.0-Beta01-SNAPSHOT</version> + </parent> + + <artifactId>extension-war</artifactId> + <packaging>war</packaging> + + <name>GateIn WSRP Integration extension WAR</name> + + <build> + <finalName>gatein-wsrp-integration</finalName> + </build> + +</project> Property changes on: portal/branches/wsrp-extraction/wsrp-integration/extension-war/src ___________________________________________________________________ Added: svn:ignore + *.iml .idea Property changes on: portal/branches/wsrp-extraction/wsrp-integration/extension-war/src/main ___________________________________________________________________ Added: svn:ignore + *.iml .idea Property changes on: portal/branches/wsrp-extraction/wsrp-integration/extension-war/src/main/webapp ___________________________________________________________________ Added: svn:ignore + *.iml .idea Property changes on: portal/branches/wsrp-extraction/wsrp-integration/extension-war/src/main/webapp/WEB-INF ___________________________________________________________________ Added: svn:ignore + *.iml .idea Property changes on: portal/branches/wsrp-extraction/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf ___________________________________________________________________ Added: svn:ignore + *.iml .idea Added: portal/branches/wsrp-extraction/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/configuration.xml =================================================================== --- portal/branches/wsrp-extraction/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/configuration.xml (rev 0) +++ portal/branches/wsrp-extraction/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/configuration.xml 2011-02-14 15:03:03 UTC (rev 5878) @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<!-- + ~ JBoss, a division of Red Hat + ~ Copyright 2011, Red Hat Middleware, LLC, and individual + ~ contributors as indicated by the @authors tag. See the + ~ copyright.txt in the distribution for a full listing of + ~ individual contributors. + ~ + ~ 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"> + <import profiles="jboss">war:/conf/wsrp/wsrp-configuration.xml</import> + <import profiles="jboss">war:/conf/wsrp/jcr-configuration.xml</import> +</configuration> Property changes on: portal/branches/wsrp-extraction/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp ___________________________________________________________________ Added: svn:ignore + *.iml .idea Added: portal/branches/wsrp-extraction/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/consumers-configuration-nodetypes.xml =================================================================== --- portal/branches/wsrp-extraction/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/consumers-configuration-nodetypes.xml (rev 0) +++ portal/branches/wsrp-extraction/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/consumers-configuration-nodetypes.xml 2011-02-14 15:03:03 UTC (rev 5878) @@ -0,0 +1,187 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> + +<!-- + ~ JBoss, a division of Red Hat + ~ Copyright 2011, Red Hat Middleware, LLC, and individual + ~ contributors as indicated by the @authors tag. See the + ~ copyright.txt in the distribution for a full listing of + ~ individual contributors. + ~ + ~ 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. + --> + +<nodeTypes xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" + xmlns:jcr="http://www.jcp.org/jcr/1.0"> + + <nodeType name="wsrp:producerinfos" isMixin="false" hasOrderableChildNodes="true" primaryItemName=""> + <supertypes> + <supertype>nt:base</supertype> + <supertype>mix:referenceable</supertype> + </supertypes> + <childNodeDefinitions> + <childNodeDefinition name="*" defaultPrimaryType="wsrp:producerinfo" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" sameNameSiblings="false"> + <requiredPrimaryTypes> + <requiredPrimaryType>wsrp:producerinfo</requiredPrimaryType> + </requiredPrimaryTypes> + </childNodeDefinition> + </childNodeDefinitions> + </nodeType> + + <nodeType name="wsrp:producerinfo" isMixin="false" hasOrderableChildNodes="true" primaryItemName=""> + <supertypes> + <supertype>nt:base</supertype> + <supertype>mix:referenceable</supertype> + </supertypes> + <propertyDefinitions> + <propertyDefinition name="producerid" requiredType="String" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + <propertyDefinition name="cache" requiredType="Integer" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + <propertyDefinition name="active" requiredType="boolean" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + </propertyDefinitions> + <childNodeDefinitions> + <childNodeDefinition name="endpoint" defaultPrimaryType="wsrp:endpointinfo" autoCreated="true" + mandatory="false" + onParentVersion="COPY" protected="false" sameNameSiblings="false"> + <requiredPrimaryTypes> + <requiredPrimaryType>wsrp:endpointinfo</requiredPrimaryType> + </requiredPrimaryTypes> + </childNodeDefinition> + <childNodeDefinition name="registration" defaultPrimaryType="wsrp:registrationinfo" autoCreated="true" + mandatory="false" + onParentVersion="COPY" protected="false" sameNameSiblings="false"> + <requiredPrimaryTypes> + <requiredPrimaryType>wsrp:registrationinfo</requiredPrimaryType> + </requiredPrimaryTypes> + </childNodeDefinition> + </childNodeDefinitions> + </nodeType> + + <nodeType name="wsrp:endpointinfo" isMixin="false" hasOrderableChildNodes="false" primaryItemName=""> + <supertypes> + <supertype>nt:base</supertype> + <supertype>mix:referenceable</supertype> + </supertypes> + <propertyDefinitions> + <propertyDefinition name="wsdlurl" requiredType="String" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + <propertyDefinition name="timeout" requiredType="Integer" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + </propertyDefinitions> + </nodeType> + + <nodeType name="wsrp:registrationinfo" isMixin="false" hasOrderableChildNodes="true" primaryItemName=""> + <supertypes> + <supertype>nt:base</supertype> + <supertype>mix:referenceable</supertype> + </supertypes> + <propertyDefinitions> + <propertyDefinition name="consumername" requiredType="String" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + <propertyDefinition name="handle" requiredType="String" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + <propertyDefinition name="state" requiredType="Binary" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + </propertyDefinitions> + <childNodeDefinitions> + <childNodeDefinition name="*" defaultPrimaryType="wsrp:registrationproperty" autoCreated="false" + mandatory="false" + onParentVersion="COPY" protected="false" sameNameSiblings="false"> + <requiredPrimaryTypes> + <requiredPrimaryType>wsrp:registrationproperty</requiredPrimaryType> + </requiredPrimaryTypes> + </childNodeDefinition> + </childNodeDefinitions> + </nodeType> + + <nodeType name="wsrp:registrationproperty" isMixin="false" hasOrderableChildNodes="true" primaryItemName=""> + <supertypes> + <supertype>nt:base</supertype> + <supertype>mix:referenceable</supertype> + </supertypes> + <propertyDefinitions> + <propertyDefinition name="name" requiredType="String" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + <propertyDefinition name="value" requiredType="String" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + <propertyDefinition name="status" requiredType="Integer" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + </propertyDefinitions> + <childNodeDefinitions> + <childNodeDefinition name="description" defaultPrimaryType="" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" sameNameSiblings="false"> + <requiredPrimaryTypes> + <requiredPrimaryType>wsrp:registrationpropertydescription</requiredPrimaryType> + </requiredPrimaryTypes> + </childNodeDefinition> + </childNodeDefinitions> + </nodeType> + + <nodeType name="wsrp:registrationpropertydescription" isMixin="false" hasOrderableChildNodes="true" + primaryItemName=""> + <supertypes> + <supertype>nt:base</supertype> + <supertype>mix:referenceable</supertype> + </supertypes> + <propertyDefinitions> + <propertyDefinition name="name" requiredType="String" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + <propertyDefinition name="type" requiredType="String" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + <propertyDefinition name="description" requiredType="String" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + <propertyDefinition name="hint" requiredType="String" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + <propertyDefinition name="label" requiredType="String" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + </propertyDefinitions> + </nodeType> + +</nodeTypes> \ No newline at end of file Added: portal/branches/wsrp-extraction/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/jcr-configuration.xml =================================================================== --- portal/branches/wsrp-extraction/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/jcr-configuration.xml (rev 0) +++ portal/branches/wsrp-extraction/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/jcr-configuration.xml 2011-02-14 15:03:03 UTC (rev 5878) @@ -0,0 +1,48 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<!-- + ~ JBoss, a division of Red Hat + ~ Copyright 2011, Red Hat Middleware, LLC, and individual + ~ contributors as indicated by the @authors tag. See the + ~ copyright.txt in the distribution for a full listing of + ~ individual contributors. + ~ + ~ 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"> + + <external-component-plugins> + <!-- The full qualified name of the RepositoryServiceConfiguration --> + <target-component>org.exoplatform.services.jcr.config.RepositoryServiceConfiguration</target-component> + <component-plugin> + <!-- The name of the plugin --> + <name>Sample RepositoryServiceConfiguration Plugin</name> + <!-- The name of the method to call on the RepositoryServiceConfiguration in order to add the RepositoryServiceConfigurations --> + <set-method>addConfig</set-method> + <!-- The full qualified name of the RepositoryServiceConfigurationPlugin --> + <type>org.exoplatform.services.jcr.impl.config.RepositoryServiceConfigurationPlugin</type> + <init-params> + <value-param> + <name>conf-path</name> + <description>JCR configuration file</description> + <value>war:/conf/wsrp/repository-configuration.xml</value> + </value-param> + </init-params> + </component-plugin> + </external-component-plugins> +</configuration> Added: portal/branches/wsrp-extraction/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/migration-nodetypes.xml =================================================================== --- portal/branches/wsrp-extraction/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/migration-nodetypes.xml (rev 0) +++ portal/branches/wsrp-extraction/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/migration-nodetypes.xml 2011-02-14 15:03:03 UTC (rev 5878) @@ -0,0 +1,114 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> + +<!-- + ~ JBoss, a division of Red Hat + ~ Copyright 2011, Red Hat Middleware, LLC, and individual + ~ contributors as indicated by the @authors tag. See the + ~ copyright.txt in the distribution for a full listing of + ~ individual contributors. + ~ + ~ 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. + --> + +<nodeTypes xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" + xmlns:jcr="http://www.jcp.org/jcr/1.0"> + + <nodeType name="wsrp:exportinfos" isMixin="false" hasOrderableChildNodes="true" primaryItemName=""> + <supertypes> + <supertype>nt:base</supertype> + <supertype>mix:referenceable</supertype> + </supertypes> + <childNodeDefinitions> + <childNodeDefinition name="*" defaultPrimaryType="wsrp:exportinfo" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" sameNameSiblings="false"> + <requiredPrimaryTypes> + <requiredPrimaryType>wsrp:exportinfo</requiredPrimaryType> + </requiredPrimaryTypes> + </childNodeDefinition> + </childNodeDefinitions> + </nodeType> + + <nodeType name="wsrp:exportinfo" isMixin="false" hasOrderableChildNodes="true" primaryItemName=""> + <supertypes> + <supertype>nt:base</supertype> + <supertype>mix:referenceable</supertype> + </supertypes> + <propertyDefinitions> + <propertyDefinition name="exporttime" requiredType="Long" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + <propertyDefinition name="expirationtime" requiredType="Long" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + <propertyDefinition name="exportcontext" requiredType="Binary" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + </propertyDefinitions> + <childNodeDefinitions> + <childNodeDefinition name="*" defaultPrimaryType="wsrp:exportedstate" autoCreated="false" + mandatory="false" + onParentVersion="COPY" protected="false" sameNameSiblings="false"> + <requiredPrimaryTypes> + <requiredPrimaryType>wsrp:exportedstate</requiredPrimaryType> + </requiredPrimaryTypes> + </childNodeDefinition> + <childNodeDefinition name="*" defaultPrimaryType="wsrp:exporterror" autoCreated="false" + mandatory="false" + onParentVersion="COPY" protected="false" sameNameSiblings="false"> + <requiredPrimaryTypes> + <requiredPrimaryType>wsrp:exporterror</requiredPrimaryType> + </requiredPrimaryTypes> + </childNodeDefinition> + </childNodeDefinitions> + </nodeType> + + <nodeType name="wsrp:exportedstate" isMixin="false" primaryItemName=""> + <supertypes> + <supertype>nt:base</supertype> + <supertype>mix:referenceable</supertype> + </supertypes> + <propertyDefinitions> + <propertyDefinition name="handle" requiredType="String" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + <propertyDefinition name="state" requiredType="Binary" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + </propertyDefinitions> + </nodeType> + + <nodeType name="wsrp:exporterror" isMixin="false" primaryItemName=""> + <supertypes> + <supertype>nt:base</supertype> + <supertype>mix:referenceable</supertype> + </supertypes> + <propertyDefinitions> + <propertyDefinition name="errorcode" requiredType="String" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + <propertyDefinition name="handles" requiredType="String" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + </propertyDefinitions> + </nodeType> +</nodeTypes> \ No newline at end of file Property changes on: portal/branches/wsrp-extraction/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/portal ___________________________________________________________________ Added: svn:ignore + *.iml .idea Property changes on: portal/branches/wsrp-extraction/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/portal/group ___________________________________________________________________ Added: svn:ignore + *.iml .idea Property changes on: portal/branches/wsrp-extraction/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/portal/group/platform ___________________________________________________________________ Added: svn:ignore + *.iml .idea Property changes on: portal/branches/wsrp-extraction/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/portal/group/platform/administrators ___________________________________________________________________ Added: svn:ignore + *.iml .idea Added: portal/branches/wsrp-extraction/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/portal/group/platform/administrators/navigation.xml =================================================================== --- portal/branches/wsrp-extraction/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/portal/group/platform/administrators/navigation.xml (rev 0) +++ portal/branches/wsrp-extraction/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/portal/group/platform/administrators/navigation.xml 2011-02-14 15:03:03 UTC (rev 5878) @@ -0,0 +1,47 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<!-- + ~ JBoss, a division of Red Hat + ~ Copyright 2011, Red Hat Middleware, LLC, and individual + ~ contributors as indicated by the @authors tag. See the + ~ copyright.txt in the distribution for a full listing of + ~ individual contributors. + ~ + ~ 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. + --> + +<node-navigation + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> + <priority>2</priority> + + <page-nodes> + <!-- TODO: enable when the extension mechanism can handle child nodes properly --> + <!-- <node> + <uri>administration</uri> + <name>administration</name> + <label>#{administration.title}</label> --> + <node> + <!-- <uri>administration/wsrpConfiguration</uri> --> + <uri>wsrpConfiguration</uri> + <name>wsrpConfiguration</name> + <!-- TODO: add a proper i18n label here --> + <label>WSRP</label> + <page-reference>group::/platform/administrators::wsrpConfiguration</page-reference> + </node> + <!-- </node> --> + </page-nodes> +</node-navigation> Added: portal/branches/wsrp-extraction/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/portal/group/platform/administrators/pages.xml =================================================================== --- portal/branches/wsrp-extraction/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/portal/group/platform/administrators/pages.xml (rev 0) +++ portal/branches/wsrp-extraction/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/portal/group/platform/administrators/pages.xml 2011-02-14 15:03:03 UTC (rev 5878) @@ -0,0 +1,46 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<!-- + ~ JBoss, a division of Red Hat + ~ Copyright 2011, Red Hat Middleware, LLC, and individual + ~ contributors as indicated by the @authors tag. See the + ~ copyright.txt in the distribution for a full listing of + ~ individual contributors. + ~ + ~ 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. + --> + +<page-set + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> + + <page> + <name>wsrpConfiguration</name> + <title>WSRP Admin</title> + <access-permissions>manager:/platform/administrators</access-permissions> + <edit-permission>manager:/platform/administrators</edit-permission> + <portlet-application> + <portlet> + <application-ref>wsrp-admin-gui</application-ref> + <portlet-ref>WSRPConfigurationPortlet</portlet-ref> + </portlet> + <title>WSRP Admin</title> + <access-permissions>manager:/platform/administrators</access-permissions> + <show-info-bar>false</show-info-bar> + </portlet-application> + </page> + +</page-set> Added: portal/branches/wsrp-extraction/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/producer-configuration-nodetypes.xml =================================================================== --- portal/branches/wsrp-extraction/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/producer-configuration-nodetypes.xml (rev 0) +++ portal/branches/wsrp-extraction/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/producer-configuration-nodetypes.xml 2011-02-14 15:03:03 UTC (rev 5878) @@ -0,0 +1,141 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> + +<!-- + ~ JBoss, a division of Red Hat + ~ Copyright 2011, Red Hat Middleware, LLC, and individual + ~ contributors as indicated by the @authors tag. See the + ~ copyright.txt in the distribution for a full listing of + ~ individual contributors. + ~ + ~ 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. + --> + +<nodeTypes xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" + xmlns:jcr="http://www.jcp.org/jcr/1.0"> + + <nodeType name="wsrp:producerconfiguration" isMixin="false" hasOrderableChildNodes="true" primaryItemName=""> + <supertypes> + <supertype>nt:base</supertype> + <supertype>mix:referenceable</supertype> + </supertypes> + <propertyDefinitions> + <propertyDefinition name="strictmode" requiredType="boolean" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + </propertyDefinitions> + <childNodeDefinitions> + <childNodeDefinition name="registrationrequirements" defaultPrimaryType="wsrp:registrationrequirements" + autoCreated="true" mandatory="false" onParentVersion="COPY" protected="false" + sameNameSiblings="false"> + <requiredPrimaryTypes> + <requiredPrimaryType>wsrp:registrationrequirements</requiredPrimaryType> + </requiredPrimaryTypes> + </childNodeDefinition> + </childNodeDefinitions> + </nodeType> + + <nodeType name="wsrp:registrationrequirements" isMixin="false" hasOrderableChildNodes="true" primaryItemName=""> + <supertypes> + <supertype>nt:base</supertype> + <supertype>mix:referenceable</supertype> + </supertypes> + <propertyDefinitions> + <propertyDefinition name="registrationrequired" requiredType="boolean" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + <propertyDefinition name="registrationrequiredforfulldescription" requiredType="boolean" autoCreated="false" + mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + <propertyDefinition name="policyclassname" requiredType="String" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + <propertyDefinition name="validatorclassname" requiredType="String" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + </propertyDefinitions> + <childNodeDefinitions> + <childNodeDefinition name="*" defaultPrimaryType="wsrp:registrationpropertydescription" autoCreated="false" + mandatory="false" + onParentVersion="COPY" protected="false" sameNameSiblings="false"> + <requiredPrimaryTypes> + <requiredPrimaryType>wsrp:registrationpropertydescription</requiredPrimaryType> + </requiredPrimaryTypes> + </childNodeDefinition> + </childNodeDefinitions> + </nodeType> + + <nodeType name="wsrp:registrationproperty" isMixin="false" hasOrderableChildNodes="true" primaryItemName=""> + <supertypes> + <supertype>nt:base</supertype> + <supertype>mix:referenceable</supertype> + </supertypes> + <propertyDefinitions> + <propertyDefinition name="value" requiredType="String" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + <propertyDefinition name="status" requiredType="String" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + </propertyDefinitions> + <childNodeDefinitions> + <childNodeDefinition name="description" defaultPrimaryType="" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" sameNameSiblings="false"> + <requiredPrimaryTypes> + <requiredPrimaryType>wsrp:registrationpropertydescription</requiredPrimaryType> + </requiredPrimaryTypes> + </childNodeDefinition> + </childNodeDefinitions> + </nodeType> + + <nodeType name="wsrp:registrationpropertydescription" isMixin="false" hasOrderableChildNodes="true" + primaryItemName=""> + <supertypes> + <supertype>nt:base</supertype> + <supertype>mix:referenceable</supertype> + </supertypes> + <propertyDefinitions> + <propertyDefinition name="name" requiredType="String" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + <propertyDefinition name="type" requiredType="String" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + <propertyDefinition name="description" requiredType="String" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + <propertyDefinition name="hint" requiredType="String" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + <propertyDefinition name="label" requiredType="String" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + </propertyDefinitions> + </nodeType> + +</nodeTypes> \ No newline at end of file Added: portal/branches/wsrp-extraction/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/producer-pc-nodetypes.xml =================================================================== --- portal/branches/wsrp-extraction/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/producer-pc-nodetypes.xml (rev 0) +++ portal/branches/wsrp-extraction/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/producer-pc-nodetypes.xml 2011-02-14 15:03:03 UTC (rev 5878) @@ -0,0 +1,86 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ JBoss, a division of Red Hat + ~ Copyright 2011, Red Hat Middleware, LLC, and individual + ~ contributors as indicated by the @authors tag. See the + ~ copyright.txt in the distribution for a full listing of + ~ individual contributors. + ~ + ~ 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. + --> + +<nodeTypes xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" + xmlns:jcr="http://www.jcp.org/jcr/1.0"> + <nodeType name="pc:producerstates" isMixin="false" hasOrderableChildNodes="false"> + <supertypes> + <supertype>nt:base</supertype> + <supertype>mix:referenceable</supertype> + </supertypes> + <propertyDefinitions/> + <childNodeDefinitions> + <childNodeDefinition name="*" defaultPrimaryType="" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" sameNameSiblings="false"> + <requiredPrimaryTypes> + <requiredPrimaryType>pc:statecontext</requiredPrimaryType> + </requiredPrimaryTypes> + </childNodeDefinition> + </childNodeDefinitions> + </nodeType> + + <nodeType name="pc:statecontext" isMixin="false" hasOrderableChildNodes="false"> + <supertypes> + <supertype>nt:base</supertype> + <supertype>mix:referenceable</supertype> + </supertypes> + <propertyDefinitions> + <propertyDefinition name="id" requiredType="String" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + </propertyDefinitions> + <childNodeDefinitions> + <childNodeDefinition name="state" defaultPrimaryType="pc:state" autoCreated="true" mandatory="false" + onParentVersion="COPY" protected="false" sameNameSiblings="false"> + <requiredPrimaryTypes> + <requiredPrimaryType>pc:state</requiredPrimaryType> + </requiredPrimaryTypes> + </childNodeDefinition> + </childNodeDefinitions> + </nodeType> + + <nodeType name="pc:state" isMixin="false" hasOrderableChildNodes="false"> + <supertypes> + <supertype>nt:base</supertype> + <supertype>mix:referenceable</supertype> + </supertypes> + <propertyDefinitions> + <propertyDefinition name="pc:portletid" requiredType="String" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + <propertyDefinition name="pc:terminationtime" requiredType="Date" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + <propertyDefinition name="*" requiredType="undefined" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + </propertyDefinitions> + <childNodeDefinitions/> + </nodeType> + +</nodeTypes> Added: portal/branches/wsrp-extraction/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/producer-registrations-nodetypes.xml =================================================================== --- portal/branches/wsrp-extraction/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/producer-registrations-nodetypes.xml (rev 0) +++ portal/branches/wsrp-extraction/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/producer-registrations-nodetypes.xml 2011-02-14 15:03:03 UTC (rev 5878) @@ -0,0 +1,198 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> + +<!-- + ~ JBoss, a division of Red Hat + ~ Copyright 2011, Red Hat Middleware, LLC, and individual + ~ contributors as indicated by the @authors tag. See the + ~ copyright.txt in the distribution for a full listing of + ~ individual contributors. + ~ + ~ 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. + --> + +<nodeTypes xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" + xmlns:jcr="http://www.jcp.org/jcr/1.0"> + + <nodeType name="wsrp:consumersandgroups" isMixin="false" hasOrderableChildNodes="true" primaryItemName=""> + <supertypes> + <supertype>nt:base</supertype> + <supertype>mix:referenceable</supertype> + </supertypes> + <childNodeDefinitions> + <childNodeDefinition name="*" defaultPrimaryType="wsrp:consumer" + autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" + sameNameSiblings="false"> + <requiredPrimaryTypes> + <requiredPrimaryType>wsrp:consumer</requiredPrimaryType> + </requiredPrimaryTypes> + </childNodeDefinition> + <childNodeDefinition name="*" defaultPrimaryType="wsrp:consumergroup" + autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" + sameNameSiblings="false"> + <requiredPrimaryTypes> + <requiredPrimaryType>wsrp:consumergroup</requiredPrimaryType> + </requiredPrimaryTypes> + </childNodeDefinition> + </childNodeDefinitions> + </nodeType> + + <nodeType name="wsrp:consumer" isMixin="false" hasOrderableChildNodes="true" primaryItemName=""> + <supertypes> + <supertype>nt:base</supertype> + <supertype>mix:referenceable</supertype> + </supertypes> + <propertyDefinitions> + <propertyDefinition name="name" requiredType="String" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + <propertyDefinition name="id" requiredType="String" autoCreated="false" + mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + <propertyDefinition name="consumeragent" requiredType="String" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + <propertyDefinition name="status" requiredType="String" + autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + <propertyDefinition name="group" requiredType="Path" autoCreated="false" mandatory="false" + onParentVersion="COPY" + protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + </propertyDefinitions> + <childNodeDefinitions> + <childNodeDefinition name="*" defaultPrimaryType="wsrp:registration" autoCreated="false" + mandatory="false" + onParentVersion="COPY" protected="false" sameNameSiblings="false"> + <requiredPrimaryTypes> + <requiredPrimaryType>wsrp:registration</requiredPrimaryType> + </requiredPrimaryTypes> + </childNodeDefinition> + <childNodeDefinition name="capabilities" defaultPrimaryType="wsrp:consumercapabilities" autoCreated="true" + mandatory="false" + onParentVersion="COPY" protected="false" sameNameSiblings="false"> + <requiredPrimaryTypes> + <requiredPrimaryType>wsrp:consumercapabilities</requiredPrimaryType> + </requiredPrimaryTypes> + </childNodeDefinition> + </childNodeDefinitions> + </nodeType> + + <nodeType name="wsrp:registration" isMixin="false" hasOrderableChildNodes="true" primaryItemName=""> + <supertypes> + <supertype>nt:base</supertype> + <supertype>mix:referenceable</supertype> + </supertypes> + <propertyDefinitions> + <propertyDefinition name="status" requiredType="String" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + <propertyDefinition name="registrationhandle" requiredType="String" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + <propertyDefinition name="portlethandles" requiredType="String" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="true"> + </propertyDefinition> + </propertyDefinitions> + <childNodeDefinitions> + <childNodeDefinition name="properties" defaultPrimaryType="wsrp:registrationproperties" autoCreated="false" + mandatory="false" onParentVersion="COPY" protected="false" sameNameSiblings="false"> + <requiredPrimaryTypes> + <requiredPrimaryType>wsrp:registrationproperties</requiredPrimaryType> + </requiredPrimaryTypes> + </childNodeDefinition> + </childNodeDefinitions> + </nodeType> + + <nodeType name="wsrp:registrationproperties" isMixin="false" hasOrderableChildNodes="true" primaryItemName=""> + <supertypes> + <supertype>nt:base</supertype> + <supertype>mix:referenceable</supertype> + </supertypes> + <!-- residual properties so that we can store an arbritrary number of registration properties --> + <propertyDefinitions> + <propertyDefinition name="*" requiredType="undefined" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + </propertyDefinitions> + </nodeType> + + <nodeType name="wsrp:consumergroup" isMixin="false" hasOrderableChildNodes="true" primaryItemName=""> + <supertypes> + <supertype>nt:base</supertype> + <supertype>mix:referenceable</supertype> + </supertypes> + <propertyDefinitions> + <propertyDefinition name="name" requiredType="String" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + <propertyDefinition name="status" requiredType="String" + autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + </propertyDefinitions> + <childNodeDefinitions> + <childNodeDefinition name="*" defaultPrimaryType="wsrp:consumer" autoCreated="false" + mandatory="false" + onParentVersion="COPY" protected="false" sameNameSiblings="false"> + <requiredPrimaryTypes> + <requiredPrimaryType>wsrp:consumer</requiredPrimaryType> + </requiredPrimaryTypes> + </childNodeDefinition> + </childNodeDefinitions> + </nodeType> + + <nodeType name="wsrp:consumercapabilities" isMixin="false" hasOrderableChildNodes="true" primaryItemName=""> + <supertypes> + <supertype>nt:base</supertype> + <supertype>mix:referenceable</supertype> + </supertypes> + <propertyDefinitions> + <propertyDefinition name="modes" requiredType="String" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="true"> + <valueConstraints/> + </propertyDefinition> + <propertyDefinition name="windowstates" requiredType="String" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="true"> + <valueConstraints/> + </propertyDefinition> + <propertyDefinition name="userscopes" requiredType="String" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="true"> + <valueConstraints/> + </propertyDefinition> + <propertyDefinition name="userprofiledata" requiredType="String" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="true"> + <valueConstraints/> + </propertyDefinition> + <propertyDefinition name="supportsgetmethod" requiredType="boolean" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + </propertyDefinitions> + </nodeType> + +</nodeTypes> \ No newline at end of file Added: portal/branches/wsrp-extraction/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/repository-configuration.xml =================================================================== --- portal/branches/wsrp-extraction/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/repository-configuration.xml (rev 0) +++ portal/branches/wsrp-extraction/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/repository-configuration.xml 2011-02-14 15:03:03 UTC (rev 5878) @@ -0,0 +1,176 @@ +<!-- + ~ JBoss, a division of Red Hat + ~ Copyright 2011, Red Hat Middleware, LLC, and individual + ~ contributors as indicated by the @authors tag. See the + ~ copyright.txt in the distribution for a full listing of + ~ individual contributors. + ~ + ~ 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. + --> + +<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> + <!-- WSRP --> + <workspace name="wsrp-system"> + <container + class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer"> + <properties> + <property name="source-name" value="${gatein.jcr.datasource.name}${container.name.suffix}"/> + <property name="dialect" value="${gatein.jcr.datasource.dialect}"/> + <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/wsrp${container.name.suffix}"/> + </properties> + <value-storages> + <value-storage id="wsrp-system" + class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> + <properties> + <property name="path" value="${gatein.jcr.storage.data.dir}/wsrp${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" + class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> + <properties> + <property name="jbosscache-configuration" value="${gatein.jcr.cache.config}"/> + <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}"/> + <property name="jgroups-multiplexer-stack" value="true"/> + <property name="jbosscache-cluster-name" value="jcr-${container.name.suffix}-wsrp-system"/> + </properties> + </cache> + <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> + <properties> + <property name="index-dir" + value="${gatein.jcr.index.data.dir}/wsrp-system${container.name.suffix}"/> + <property name="changesfilter-class" value="${gatein.jcr.index.changefilterclass}"/> + <property name="jbosscache-configuration" value="${gatein.jcr.index.cache.config}"/> + <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}"/> + <property name="jgroups-multiplexer-stack" value="true"/> + <property name="jbosscache-cluster-name" value="jcrindexer-${container.name.suffix}-wsrp-system"/> + <property name="max-volatile-time" value="60"/> + </properties> + </query-handler> + <lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManagerImpl"> + <properties> + <property name="time-out" value="15m"/> + <property name="jbosscache-configuration" value="${gatein.jcr.lock.cache.config}"/> + <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}"/> + <property name="jgroups-multiplexer-stack" value="true"/> + <property name="jbosscache-cluster-name" value="jcrlock-${container.name.suffix}-wsrp-system"/> + <property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlock_wsrp_system"/> + <property name="jbosscache-cl-cache.jdbc.table.create" value="true"/> + <property name="jbosscache-cl-cache.jdbc.table.drop" value="false"/> + <property name="jbosscache-cl-cache.jdbc.table.primarykey" value="pk"/> + <property name="jbosscache-cl-cache.jdbc.fqn.column" value="fqn"/> + <property name="jbosscache-cl-cache.jdbc.node.column" value="node"/> + <property name="jbosscache-cl-cache.jdbc.parent.column" value="parent"/> + <property name="jbosscache-cl-cache.jdbc.datasource" + value="${gatein.jcr.datasource.name}${container.name.suffix}"/> + </properties> + </lock-manager> + </workspace> + + <!-- Producer portlet states --> + <workspace name="pc-system"> + <container + class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer"> + <properties> + <property name="source-name" value="${gatein.jcr.datasource.name}${container.name.suffix}"/> + <property name="dialect" value="${gatein.jcr.datasource.dialect}"/> + <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/pc${container.name.suffix}"/> + </properties> + <value-storages> + <value-storage id="pc-system" + class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> + <properties> + <property name="path" value="${gatein.jcr.storage.data.dir}/pc${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" + class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> + <properties> + <property name="jbosscache-configuration" value="${gatein.jcr.cache.config}"/> + <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}"/> + <property name="jgroups-multiplexer-stack" value="true"/> + <property name="jbosscache-cluster-name" value="jcr-${container.name.suffix}-pc-system"/> + </properties> + </cache> + <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> + <properties> + <property name="index-dir" value="${gatein.jcr.index.data.dir}/pc-system${container.name.suffix}"/> + <property name="changesfilter-class" value="${gatein.jcr.index.changefilterclass}"/> + <property name="jbosscache-configuration" value="${gatein.jcr.index.cache.config}"/> + <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}"/> + <property name="jgroups-multiplexer-stack" value="true"/> + <property name="jbosscache-cluster-name" value="jcrindexer-${container.name.suffix}-pc-system"/> + <property name="max-volatile-time" value="60"/> + </properties> + </query-handler> + <lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManagerImpl"> + <properties> + <property name="time-out" value="15m"/> + <property name="jbosscache-configuration" value="${gatein.jcr.lock.cache.config}"/> + <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}"/> + <property name="jgroups-multiplexer-stack" value="true"/> + <property name="jbosscache-cluster-name" value="jcrlock-${container.name.suffix}-pc-system"/> + <property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlock_portlet_state_system"/> + <property name="jbosscache-cl-cache.jdbc.table.create" value="true"/> + <property name="jbosscache-cl-cache.jdbc.table.drop" value="false"/> + <property name="jbosscache-cl-cache.jdbc.table.primarykey" value="pk"/> + <property name="jbosscache-cl-cache.jdbc.fqn.column" value="fqn"/> + <property name="jbosscache-cl-cache.jdbc.node.column" value="node"/> + <property name="jbosscache-cl-cache.jdbc.parent.column" value="parent"/> + <property name="jbosscache-cl-cache.jdbc.datasource" + value="${gatein.jcr.datasource.name}${container.name.suffix}"/> + </properties> + </lock-manager> + </workspace> + </workspaces> + </repository> + </repositories> +</repository-service> Added: portal/branches/wsrp-extraction/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/wsrp-configuration.xml =================================================================== --- portal/branches/wsrp-extraction/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/wsrp-configuration.xml (rev 0) +++ portal/branches/wsrp-extraction/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/wsrp-configuration.xml 2011-02-14 15:03:03 UTC (rev 5878) @@ -0,0 +1,223 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<!-- + ~ JBoss, a division of Red Hat + ~ Copyright 2011, Red Hat Middleware, LLC, and individual + ~ contributors as indicated by the @authors tag. See the + ~ copyright.txt in the distribution for a full listing of + ~ individual contributors. + ~ + ~ 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.gatein.integration.wsrp.WSRPServiceIntegration</key> + <type>org.gatein.integration.wsrp.WSRPServiceIntegration</type> + <init-params> + <value-param> + <name>producerConfigLocation</name> + <description>Location of the default producer configuration file</description> + <value>conf/wsrp-producer-config.xml</value> + </value-param> + <value-param> + <name>consumersConfigLocation</name> + <description>Location of the default consumers configuration file</description> + <value>conf/wsrp-consumers-config.xml</value> + </value-param> + </init-params> + </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="wsrp" value="http://www.gatein.org/jcr/wsrp/1.0/"/> + <property name="pc" value="http://www.gatein.org/jcr/pc/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>war:/conf/wsrp/consumers-configuration-nodetypes.xml</value> + <value>war:/conf/wsrp/producer-configuration-nodetypes.xml</value> + <value>war:/conf/wsrp/producer-registrations-nodetypes.xml</value> + <value>war:/conf/wsrp/producer-pc-nodetypes.xml</value> + <value>war:/conf/wsrp/migration-nodetypes.xml</value> + </values-param> + </init-params> + </component-plugin> + </external-component-plugins> + + <external-component-plugins> + <target-component>org.exoplatform.application.registry.ApplicationRegistryService</target-component> + <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>WSRP</string> + </field> + <field name="displayName"> + <string>WSRP</string> + </field> + <field name="description"> + <string>WSRP 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>WSRPConfigurationPortlet</string> + </field> + <field name="categoryName"> + <string>WSRP</string> + </field> + <field name="displayName"> + <string>WSRP Configuration</string> + </field> + <field name="description"> + <string>WSRP Configuration</string> + </field> + <field name="type"> + <string>portlet</string> + </field> + <field name="contentId"> + <string>wsrp-admin-gui/WSRPConfigurationPortlet</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> + </init-params> + </component-plugin> + </external-component-plugins> + + <external-component-plugins> + <target-component>org.exoplatform.portal.config.UserPortalConfigService</target-component> + <component-plugin> + <!-- The name of the plugin --> + <name>new.portal.config.user.listener</name> + <!-- The name of the method to call on the UserPortalConfigService in order to register the NewPortalConfigs --> + <set-method>initListener</set-method> + <!-- The full qualified name of the NewPortalConfigListener --> + <type>org.exoplatform.portal.config.NewPortalConfigListener</type> + <description>this listener init the portal configuration</description> + <init-params> + <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> + </collection> + </field> + <field name="ownerType"> + <string>group</string> + </field> + <field name="templateLocation"> + <string>war:/conf/wsrp/portal</string> + </field> + </object> + </object-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.commons.chromattic.ChromatticLifeCycle</type> + <init-params> + <value-param> + <name>domain-name</name> + <value>wsrp</value> + </value-param> + <value-param> + <name>workspace-name</name> + <value>wsrp-system</value> + </value-param> + <values-param> + <name>entities</name> + <value>org.gatein.integration.wsrp.state.mapping.RegistrationPropertyDescriptionMapping</value> + <value>org.gatein.integration.wsrp.state.consumer.mapping.ProducerInfoMapping</value> + <value>org.gatein.integration.wsrp.state.consumer.mapping.ProducerInfosMapping</value> + <value>org.gatein.integration.wsrp.state.consumer.mapping.RegistrationInfoMapping</value> + <value>org.gatein.integration.wsrp.state.consumer.mapping.RegistrationPropertyMapping</value> + <value>org.gatein.integration.wsrp.state.consumer.mapping.EndpointInfoMapping</value> + <value>org.gatein.integration.wsrp.state.producer.configuration.mapping.ProducerConfigurationMapping</value> + <value>org.gatein.integration.wsrp.state.producer.configuration.mapping.RegistrationRequirementsMapping</value> + <value>org.gatein.integration.wsrp.state.producer.registrations.mapping.ConsumerCapabilitiesMapping</value> + <value>org.gatein.integration.wsrp.state.producer.registrations.mapping.ConsumerGroupMapping</value> + <value>org.gatein.integration.wsrp.state.producer.registrations.mapping.ConsumerMapping</value> + <value>org.gatein.integration.wsrp.state.producer.registrations.mapping.ConsumersAndGroupsMapping</value> + <value>org.gatein.integration.wsrp.state.producer.registrations.mapping.RegistrationMapping</value> + <value>org.gatein.integration.wsrp.state.producer.registrations.mapping.RegistrationPropertiesMapping</value> + </values-param> + </init-params> + </component-plugin> + </external-component-plugins>--> + +</configuration> Added: portal/branches/wsrp-extraction/wsrp-integration/extension-war/src/main/webapp/WEB-INF/web.xml =================================================================== --- portal/branches/wsrp-extraction/wsrp-integration/extension-war/src/main/webapp/WEB-INF/web.xml (rev 0) +++ portal/branches/wsrp-extraction/wsrp-integration/extension-war/src/main/webapp/WEB-INF/web.xml 2011-02-14 15:03:03 UTC (rev 5878) @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ JBoss, a division of Red Hat + ~ Copyright 2011, Red Hat Middleware, LLC, and individual + ~ contributors as indicated by the @authors tag. See the + ~ copyright.txt in the distribution for a full listing of + ~ individual contributors. + ~ + ~ 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. + --> + +<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" + id="WebApp_ID" version="2.5"> + + <display-name>gatein-wsrp-integration</display-name> + + <!-- ================================================================== --> + <!-- LISTENER --> + <!-- ================================================================== --> + <listener> + <listener-class>org.exoplatform.container.web.PortalContainerConfigOwner</listener-class> + </listener> +</web-app> \ No newline at end of file Added: portal/branches/wsrp-extraction/wsrp-integration/pom.xml =================================================================== --- portal/branches/wsrp-extraction/wsrp-integration/pom.xml (rev 0) +++ portal/branches/wsrp-extraction/wsrp-integration/pom.xml 2011-02-14 15:03:03 UTC (rev 5878) @@ -0,0 +1,49 @@ +<!-- + ~ JBoss, a division of Red Hat + ~ Copyright 2011, Red Hat Middleware, LLC, and individual + ~ contributors as indicated by the @authors tag. See the + ~ copyright.txt in the distribution for a full listing of + ~ individual contributors. + ~ + ~ 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. + --> + +<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> + + <name>GateIn WSRP Integration</name> + + <groupId>org.gatein.integration</groupId> + <artifactId>gatein-wsrp-integration-parent</artifactId> + <version>1.0.0-Beta01-SNAPSHOT</version> + + <packaging>pom</packaging> + + <parent> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.parent</artifactId> + <version>3.2.0-Beta01-SNAPSHOT</version> + </parent> + + <description>GateIn WSRP Integration extension parent</description> + <modules> + <module>extension-ear</module> + <module>extension-config</module> + <module>extension-war</module> + <module>extension-component</module> + </modules> +</project> \ No newline at end of file