August 2011 - gatein-commits - Jboss List Archives

by do-not-reply＠jboss.org

Author: julien_viet Date: 2011-08-13 03:48:38 -0400 (Sat, 13 Aug 2011) New Revision: 7067 Modified: maven/dep/trunk/pom.xml Log: [maven-release-plugin] prepare release 1.1.0-Beta06 Modified: maven/dep/trunk/pom.xml =================================================================== --- maven/dep/trunk/pom.xml 2011-08-13 07:47:35 UTC (rev 7066) +++ maven/dep/trunk/pom.xml 2011-08-13 07:48:38 UTC (rev 7067) @@ -8,7 +8,7 @@ <groupId>org.gatein</groupId> <artifactId>gatein-dep</artifactId> - <version>1.1.0-Beta06-SNAPSHOT</version> + <version>1.1.0-Beta06</version> <packaging>pom</packaging> <parent> @@ -18,9 +18,9 @@ </parent> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/maven/dep/trunk/</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/maven/dep/trunk/</developerConnection> - <url>http://fisheye.jboss.org/browse/gatein/maven/dep/trunk/</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/maven/dep/tags/1.1.0-Beta06</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/maven/dep/tags/1.1.0-Beta06</developerConnection> + <url>http://fisheye.jboss.org/browse/gatein/maven/dep/tags/1.1.0-Beta06</url> </scm> <properties>

13 years, 4 months

1
0
0 / 0

gatein SVN: r7066 - maven/dep/trunk.

by do-not-reply＠jboss.org

Author: julien_viet Date: 2011-08-13 03:47:35 -0400 (Sat, 13 Aug 2011) New Revision: 7066 Modified: maven/dep/trunk/pom.xml Log: GTNMAVEN-31 : Adding missing dependencies in gatein-dep Modified: maven/dep/trunk/pom.xml =================================================================== --- maven/dep/trunk/pom.xml 2011-08-13 06:32:51 UTC (rev 7065) +++ maven/dep/trunk/pom.xml 2011-08-13 07:47:35 UTC (rev 7066) @@ -64,6 +64,7 @@ <version.oauth.core_oauth-provider>20100527</version.oauth.core_oauth-provider> <version.oauth.core_oauth-httpclient4>20090913</version.oauth.core_oauth-httpclient4> <version.caja.caja>r4251</version.caja.caja> + <version.caja.json>r1</version.caja.json> <version.caja.htmlparser>r4209</version.caja.htmlparser> <version.jibx>1.2.2</version.jibx> <version.antlr>2.7.6rc1</version.antlr> @@ -334,6 +335,11 @@ <version>${version.apache.commons-httpclient}</version> </dependency> <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpcore</artifactId> + <version>${version.apache.commons-httpclient}</version> + </dependency> + <dependency> <artifactId>commons-betwixt</artifactId> <groupId>commons-betwixt</groupId> <version>${version.apache.commons-betwixt}</version> @@ -667,6 +673,11 @@ </dependency> <dependency> <groupId>caja</groupId> + <artifactId>json_simple</artifactId> + <version>${version.caja.json}</version> + </dependency> + <dependency> + <groupId>caja</groupId> <artifactId>htmlparser</artifactId> <version>${version.caja.htmlparser}</version> <exclusions>

13 years, 4 months

1
0
0 / 0

gatein SVN: r7065 - in epp/portal/tags: EPP_5_2_0_Dev02 and 109 other directories.

by do-not-reply＠jboss.org

Author: hfnukal Date: 2011-08-13 02:32:51 -0400 (Sat, 13 Aug 2011) New Revision: 7065 Added: epp/portal/tags/EPP_5_2_0_Dev02/ epp/portal/tags/EPP_5_2_0_Dev02/component/ epp/portal/tags/EPP_5_2_0_Dev02/component/application-registry/ epp/portal/tags/EPP_5_2_0_Dev02/component/common/ epp/portal/tags/EPP_5_2_0_Dev02/component/identity/ epp/portal/tags/EPP_5_2_0_Dev02/component/management/ epp/portal/tags/EPP_5_2_0_Dev02/component/pc/ epp/portal/tags/EPP_5_2_0_Dev02/component/pom.xml epp/portal/tags/EPP_5_2_0_Dev02/component/portal/ epp/portal/tags/EPP_5_2_0_Dev02/component/resources/ epp/portal/tags/EPP_5_2_0_Dev02/component/scripting/ epp/portal/tags/EPP_5_2_0_Dev02/component/test/ epp/portal/tags/EPP_5_2_0_Dev02/component/web/ epp/portal/tags/EPP_5_2_0_Dev02/distribution/jboss-epp/serverAddon/gatein.ear/pom.xml epp/portal/tags/EPP_5_2_0_Dev02/distribution/jboss-epp/serverAddon/pom.xml epp/portal/tags/EPP_5_2_0_Dev02/distribution/jboss-epp/src/assemble.xml epp/portal/tags/EPP_5_2_0_Dev02/pom.xml epp/portal/tags/EPP_5_2_0_Dev02/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/background/ArrowDown.gif epp/portal/tags/EPP_5_2_0_Dev02/web/portal/src/main/webapp/WEB-INF/conf/admin/ epp/portal/tags/EPP_5_2_0_Dev02/web/portal/src/main/webapp/WEB-INF/conf/configuration.xml epp/portal/tags/EPP_5_2_0_Dev02/web/portal/src/main/webapp/groovy/portal/webui/container/UIColumnContainer.gtmpl epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/extension-component/pom.xml epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/WSRPServiceIntegration.java epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/structure/MOPConsumerStructureProvider.java epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/extension-component/src/main/resources/conf/wsrp-producer-config.xml epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/extension-component/src/test/java/org/gatein/integration/wsrp/structure/MOPConsumerStructureProviderTestCase.java epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/extension-config/pom.xml epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/extension-config/src/main/resources/conf/configuration.xml epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/extension-ear-as5/ epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/extension-ear/src/main/application/META-INF/jboss-scanning.xml epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/configuration.xml epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/consumers-configuration-nodetypes.xml epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/migration-nodetypes.xml epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/producer-configuration-nodetypes.xml epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/producer-registrations-nodetypes.xml epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/wsrp-configuration.xml epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/extension-war/src/main/webapp/WEB-INF/web.xml epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/extension-war/web/ epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/extension-war/web/portal/src/main/webapp/WEB-INF/conf/admin/admin-configuration.xml epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/pom.xml Removed: epp/portal/tags/EPP_5_2_0_Dev02/component/ epp/portal/tags/EPP_5_2_0_Dev02/component/application-registry/ epp/portal/tags/EPP_5_2_0_Dev02/component/common/ epp/portal/tags/EPP_5_2_0_Dev02/component/identity/ epp/portal/tags/EPP_5_2_0_Dev02/component/management/ epp/portal/tags/EPP_5_2_0_Dev02/component/pc/ epp/portal/tags/EPP_5_2_0_Dev02/component/pom.xml epp/portal/tags/EPP_5_2_0_Dev02/component/portal/ epp/portal/tags/EPP_5_2_0_Dev02/component/resources/ epp/portal/tags/EPP_5_2_0_Dev02/component/scripting/ epp/portal/tags/EPP_5_2_0_Dev02/component/test/ epp/portal/tags/EPP_5_2_0_Dev02/component/web/ epp/portal/tags/EPP_5_2_0_Dev02/distribution/jboss-epp/serverAddon/gatein.ear/pom.xml epp/portal/tags/EPP_5_2_0_Dev02/distribution/jboss-epp/serverAddon/pom.xml epp/portal/tags/EPP_5_2_0_Dev02/distribution/jboss-epp/src/assemble.xml epp/portal/tags/EPP_5_2_0_Dev02/pom.xml epp/portal/tags/EPP_5_2_0_Dev02/web/portal/src/main/webapp/WEB-INF/conf/configuration.xml epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/extension-component/pom.xml epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/WSRPServiceIntegration.java epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/structure/MOPConsumerStructureProvider.java epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/extension-component/src/main/resources/conf/wsrp-producer-config.xml epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/extension-component/src/test/java/org/gatein/integration/wsrp/structure/MOPConsumerStructureProviderTestCase.java epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/extension-config/pom.xml epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/extension-config/src/main/resources/conf/configuration.xml epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/extension-ear/src/main/application/META-INF/jboss-scanning.xml epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/configuration.xml epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/consumers-configuration-nodetypes.xml epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/migration-nodetypes.xml epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/producer-configuration-nodetypes.xml epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/producer-registrations-nodetypes.xml epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/wsrp-configuration.xml epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/extension-war/src/main/webapp/WEB-INF/web.xml epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/pom.xml Modified: epp/portal/tags/EPP_5_2_0_Dev02/component/application-registry/pom.xml epp/portal/tags/EPP_5_2_0_Dev02/component/common/pom.xml epp/portal/tags/EPP_5_2_0_Dev02/component/identity/pom.xml epp/portal/tags/EPP_5_2_0_Dev02/component/management/pom.xml epp/portal/tags/EPP_5_2_0_Dev02/component/pc/pom.xml epp/portal/tags/EPP_5_2_0_Dev02/component/portal/pom.xml epp/portal/tags/EPP_5_2_0_Dev02/component/resources/pom.xml epp/portal/tags/EPP_5_2_0_Dev02/component/scripting/pom.xml epp/portal/tags/EPP_5_2_0_Dev02/component/test/core/pom.xml epp/portal/tags/EPP_5_2_0_Dev02/component/test/jcr/pom.xml epp/portal/tags/EPP_5_2_0_Dev02/component/test/organization/pom.xml epp/portal/tags/EPP_5_2_0_Dev02/component/test/pom.xml epp/portal/tags/EPP_5_2_0_Dev02/component/web/api/pom.xml epp/portal/tags/EPP_5_2_0_Dev02/component/web/controller/pom.xml epp/portal/tags/EPP_5_2_0_Dev02/component/web/pom.xml epp/portal/tags/EPP_5_2_0_Dev02/component/web/resources/pom.xml epp/portal/tags/EPP_5_2_0_Dev02/component/web/security/pom.xml epp/portal/tags/EPP_5_2_0_Dev02/component/web/server/pom.xml epp/portal/tags/EPP_5_2_0_Dev02/distribution/jboss-epp/examples/pom.xml epp/portal/tags/EPP_5_2_0_Dev02/distribution/jboss-epp/pom.xml epp/portal/tags/EPP_5_2_0_Dev02/distribution/jboss-epp/portletbridge/pom.xml epp/portal/tags/EPP_5_2_0_Dev02/distribution/jboss-epp/serverAddon/integration.war/pom.xml epp/portal/tags/EPP_5_2_0_Dev02/distribution/pom.xml epp/portal/tags/EPP_5_2_0_Dev02/examples/extension/config/pom.xml epp/portal/tags/EPP_5_2_0_Dev02/examples/extension/ear/pom.xml epp/portal/tags/EPP_5_2_0_Dev02/examples/extension/jar/pom.xml epp/portal/tags/EPP_5_2_0_Dev02/examples/extension/pom.xml epp/portal/tags/EPP_5_2_0_Dev02/examples/extension/war/pom.xml epp/portal/tags/EPP_5_2_0_Dev02/examples/pom.xml epp/portal/tags/EPP_5_2_0_Dev02/examples/portal/config/pom.xml epp/portal/tags/EPP_5_2_0_Dev02/examples/portal/ear/pom.xml epp/portal/tags/EPP_5_2_0_Dev02/examples/portal/jar/pom.xml epp/portal/tags/EPP_5_2_0_Dev02/examples/portal/pom.xml epp/portal/tags/EPP_5_2_0_Dev02/examples/portal/rest-war/pom.xml epp/portal/tags/EPP_5_2_0_Dev02/examples/portal/war/pom.xml epp/portal/tags/EPP_5_2_0_Dev02/examples/portlets/api/pom.xml epp/portal/tags/EPP_5_2_0_Dev02/examples/portlets/jsfhellouser/pom.xml epp/portal/tags/EPP_5_2_0_Dev02/examples/portlets/jsphellouser/pom.xml epp/portal/tags/EPP_5_2_0_Dev02/examples/portlets/pom.xml epp/portal/tags/EPP_5_2_0_Dev02/examples/portlets/simplesthelloworld/pom.xml epp/portal/tags/EPP_5_2_0_Dev02/examples/portlets/struts-jpetstore/pom.xml epp/portal/tags/EPP_5_2_0_Dev02/examples/skins/pom.xml epp/portal/tags/EPP_5_2_0_Dev02/examples/skins/simpleskin/pom.xml epp/portal/tags/EPP_5_2_0_Dev02/gadgets/core/pom.xml epp/portal/tags/EPP_5_2_0_Dev02/gadgets/eXoGadgets/pom.xml epp/portal/tags/EPP_5_2_0_Dev02/gadgets/pom.xml epp/portal/tags/EPP_5_2_0_Dev02/gadgets/server/pom.xml epp/portal/tags/EPP_5_2_0_Dev02/packaging/jboss-as/ear/pom.xml epp/portal/tags/EPP_5_2_0_Dev02/packaging/jboss-as/integration.war/pom.xml epp/portal/tags/EPP_5_2_0_Dev02/packaging/jboss-as/pkg/pom.xml epp/portal/tags/EPP_5_2_0_Dev02/packaging/jboss-as/pom.xml epp/portal/tags/EPP_5_2_0_Dev02/packaging/jetty/pkg/pom.xml epp/portal/tags/EPP_5_2_0_Dev02/packaging/jetty/pom.xml epp/portal/tags/EPP_5_2_0_Dev02/packaging/module/pom.xml epp/portal/tags/EPP_5_2_0_Dev02/packaging/pkg/pom.xml epp/portal/tags/EPP_5_2_0_Dev02/packaging/pom.xml epp/portal/tags/EPP_5_2_0_Dev02/packaging/product/pom.xml epp/portal/tags/EPP_5_2_0_Dev02/packaging/reports/pom.xml epp/portal/tags/EPP_5_2_0_Dev02/portlet/dashboard/pom.xml epp/portal/tags/EPP_5_2_0_Dev02/portlet/exoadmin/pom.xml epp/portal/tags/EPP_5_2_0_Dev02/portlet/pom.xml epp/portal/tags/EPP_5_2_0_Dev02/portlet/web/pom.xml epp/portal/tags/EPP_5_2_0_Dev02/server/jboss/patch-ear/pom.xml epp/portal/tags/EPP_5_2_0_Dev02/server/jboss/patch-ear/src/main/jboss/server/default/deploy/gatein.ear/integration.war/pom.xml epp/portal/tags/EPP_5_2_0_Dev02/server/jboss/plugin/pom.xml epp/portal/tags/EPP_5_2_0_Dev02/server/jboss/pom.xml epp/portal/tags/EPP_5_2_0_Dev02/server/pom.xml epp/portal/tags/EPP_5_2_0_Dev02/starter/ear/pom.xml epp/portal/tags/EPP_5_2_0_Dev02/starter/jar/pom.xml epp/portal/tags/EPP_5_2_0_Dev02/starter/pom.xml epp/portal/tags/EPP_5_2_0_Dev02/starter/war/pom.xml epp/portal/tags/EPP_5_2_0_Dev02/testsuite/htmlunit-tests/pom.xml epp/portal/tags/EPP_5_2_0_Dev02/testsuite/pom.xml epp/portal/tags/EPP_5_2_0_Dev02/testsuite/selenium-snifftests/pom.xml epp/portal/tags/EPP_5_2_0_Dev02/testsuite/webuibasedsamples/pom.xml epp/portal/tags/EPP_5_2_0_Dev02/web/eXoResources/pom.xml epp/portal/tags/EPP_5_2_0_Dev02/web/pom.xml epp/portal/tags/EPP_5_2_0_Dev02/web/portal/pom.xml epp/portal/tags/EPP_5_2_0_Dev02/web/rest/pom.xml epp/portal/tags/EPP_5_2_0_Dev02/webui/core/pom.xml epp/portal/tags/EPP_5_2_0_Dev02/webui/dashboard/pom.xml epp/portal/tags/EPP_5_2_0_Dev02/webui/eXo/pom.xml epp/portal/tags/EPP_5_2_0_Dev02/webui/framework/pom.xml epp/portal/tags/EPP_5_2_0_Dev02/webui/pom.xml epp/portal/tags/EPP_5_2_0_Dev02/webui/portal/pom.xml epp/portal/tags/EPP_5_2_0_Dev02/webui/portlet/pom.xml epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/extension-ear-as5/pom.xml epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/extension-ear/pom.xml epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/extension-war/pom.xml Log: Tag release 5.2.0.DEV02 Property changes on: epp/portal/tags/EPP_5_2_0_Dev02 ___________________________________________________________________ Added: svn:ignore + *.iml .idea *.ipr Added: svn:mergeinfo + /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795:5868 /portal/branches/branch-GTNPORTAL-1592:4866,4894 /portal/branches/branch-GTNPORTAL-1643:5002,5063,5167 /portal/branches/branch-GTNPORTAL-1700:5348,5363,5402,5445 /portal/branches/branch-GTNPORTAL-1731:5622,5668 /portal/branches/branch-GTNPORTAL-1745:5765 /portal/branches/branch-GTNPORTAL-1822:5943,5952 /portal/branches/branch-GTNPORTAL-1832:6030,6063 /portal/branches/branch-GTNPORTAL-1872:6400,6551 /portal/branches/branch-GTNPORTAL-1872/webui/portal/src/main/java/org/exoplatform/portal/webui/page:6551 /portal/branches/branch-GTNPORTAL-1921:6603 /portal/branches/branch-GTNPORTAL-1963:6904,6915-6916 /portal/branches/decoupled-webos:6214-6243 /portal/branches/gatein-management:6920-6958 /portal/branches/global-portlet-metadata:6298-6384 /portal/branches/site-describability:6171-6235 /portal/branches/wsrp-extraction:5828-6031 /portal/trunk:4891,4965,5744,5822,5856-5857,5859,5880,5943,5984,6010,6033,6044,6067,6075,6077,6136,6153,6157-6158,6168,6196,6201-6203,6205-6206,6261,6292,6388-6389,6398,6424,6434,6437,6440,6443,6449,6452,6573,6783-6784,6875,6912-6913,6960 Modified: epp/portal/tags/EPP_5_2_0_Dev02/component/application-registry/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/application-registry/pom.xml 2011-08-09 23:32:42 UTC (rev 7035) +++ epp/portal/tags/EPP_5_2_0_Dev02/component/application-registry/pom.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV02</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/tags/EPP_5_2_0_Dev02/component/common/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/common/pom.xml 2011-08-09 23:32:42 UTC (rev 7035) +++ epp/portal/tags/EPP_5_2_0_Dev02/component/common/pom.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV02</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>exo.portal.component.common</artifactId> Modified: epp/portal/tags/EPP_5_2_0_Dev02/component/identity/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/identity/pom.xml 2011-08-09 23:32:42 UTC (rev 7035) +++ epp/portal/tags/EPP_5_2_0_Dev02/component/identity/pom.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV02</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/tags/EPP_5_2_0_Dev02/component/management/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/management/pom.xml 2011-08-09 23:32:42 UTC (rev 7035) +++ epp/portal/tags/EPP_5_2_0_Dev02/component/management/pom.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -21,7 +21,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV02</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/tags/EPP_5_2_0_Dev02/component/pc/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/pc/pom.xml 2011-08-09 23:32:42 UTC (rev 7035) +++ epp/portal/tags/EPP_5_2_0_Dev02/component/pc/pom.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV02</version> </parent> <modelVersion>4.0.0</modelVersion> Deleted: epp/portal/tags/EPP_5_2_0_Dev02/component/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/pom.xml 2011-08-13 04:07:17 UTC (rev 7064) +++ epp/portal/tags/EPP_5_2_0_Dev02/component/pom.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -1,50 +0,0 @@ - - -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> - </parent> - - <artifactId>exo.portal.component</artifactId> - <packaging>pom</packaging> - - <name>GateIn Portal Component</name> - - <modules> - <module>test</module> - <module>common</module> - <module>pc</module> - <module>resources</module> - <module>application-registry</module> - <module>portal</module> - <module>web</module> - <module>scripting</module> - <module>management</module> - <module>identity</module> - </modules> - -</project> Copied: epp/portal/tags/EPP_5_2_0_Dev02/component/pom.xml (from rev 7035, epp/portal/branches/EPP_5_2_Branch/component/pom.xml) =================================================================== --- epp/portal/tags/EPP_5_2_0_Dev02/component/pom.xml (rev 0) +++ epp/portal/tags/EPP_5_2_0_Dev02/component/pom.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -0,0 +1,50 @@ + + +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.parent</artifactId> + <version>5.2.0-epp-DEV02</version> + </parent> + + <artifactId>exo.portal.component</artifactId> + <packaging>pom</packaging> + + <name>GateIn Portal Component</name> + + <modules> + <module>test</module> + <module>common</module> + <module>pc</module> + <module>resources</module> + <module>application-registry</module> + <module>portal</module> + <module>web</module> + <module>scripting</module> + <module>management</module> + <module>identity</module> + </modules> + +</project> Modified: epp/portal/tags/EPP_5_2_0_Dev02/component/portal/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/portal/pom.xml 2011-08-09 23:32:42 UTC (rev 7035) +++ epp/portal/tags/EPP_5_2_0_Dev02/component/portal/pom.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV02</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/tags/EPP_5_2_0_Dev02/component/resources/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/resources/pom.xml 2011-08-09 23:32:42 UTC (rev 7035) +++ epp/portal/tags/EPP_5_2_0_Dev02/component/resources/pom.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV02</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/tags/EPP_5_2_0_Dev02/component/scripting/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/scripting/pom.xml 2011-08-09 23:32:42 UTC (rev 7035) +++ epp/portal/tags/EPP_5_2_0_Dev02/component/scripting/pom.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV02</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/tags/EPP_5_2_0_Dev02/component/test/core/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/test/core/pom.xml 2011-08-09 23:32:42 UTC (rev 7035) +++ epp/portal/tags/EPP_5_2_0_Dev02/component/test/core/pom.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -22,7 +22,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.test</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV02</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/tags/EPP_5_2_0_Dev02/component/test/jcr/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/test/jcr/pom.xml 2011-08-09 23:32:42 UTC (rev 7035) +++ epp/portal/tags/EPP_5_2_0_Dev02/component/test/jcr/pom.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -22,7 +22,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.test</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV02</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/tags/EPP_5_2_0_Dev02/component/test/organization/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/test/organization/pom.xml 2011-08-09 23:32:42 UTC (rev 7035) +++ epp/portal/tags/EPP_5_2_0_Dev02/component/test/organization/pom.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -22,7 +22,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.test</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV02</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/tags/EPP_5_2_0_Dev02/component/test/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/test/pom.xml 2011-08-09 23:32:42 UTC (rev 7035) +++ epp/portal/tags/EPP_5_2_0_Dev02/component/test/pom.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -22,7 +22,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV02</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/tags/EPP_5_2_0_Dev02/component/web/api/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/web/api/pom.xml 2011-08-09 23:32:42 UTC (rev 7035) +++ epp/portal/tags/EPP_5_2_0_Dev02/component/web/api/pom.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -21,7 +21,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV02</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/tags/EPP_5_2_0_Dev02/component/web/controller/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/web/controller/pom.xml 2011-08-09 23:32:42 UTC (rev 7035) +++ epp/portal/tags/EPP_5_2_0_Dev02/component/web/controller/pom.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -21,7 +21,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV02</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/tags/EPP_5_2_0_Dev02/component/web/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/web/pom.xml 2011-08-09 23:32:42 UTC (rev 7035) +++ epp/portal/tags/EPP_5_2_0_Dev02/component/web/pom.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV02</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/tags/EPP_5_2_0_Dev02/component/web/resources/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/web/resources/pom.xml 2011-08-09 23:32:42 UTC (rev 7035) +++ epp/portal/tags/EPP_5_2_0_Dev02/component/web/resources/pom.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -21,7 +21,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV02</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/tags/EPP_5_2_0_Dev02/component/web/security/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/web/security/pom.xml 2011-08-09 23:32:42 UTC (rev 7035) +++ epp/portal/tags/EPP_5_2_0_Dev02/component/web/security/pom.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -21,7 +21,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV02</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/tags/EPP_5_2_0_Dev02/component/web/server/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/web/server/pom.xml 2011-08-09 23:32:42 UTC (rev 7035) +++ epp/portal/tags/EPP_5_2_0_Dev02/component/web/server/pom.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -21,7 +21,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV02</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/tags/EPP_5_2_0_Dev02/distribution/jboss-epp/examples/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/examples/pom.xml 2011-08-09 23:32:42 UTC (rev 7035) +++ epp/portal/tags/EPP_5_2_0_Dev02/distribution/jboss-epp/examples/pom.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -5,7 +5,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>distribution.parent</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV02</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: epp/portal/tags/EPP_5_2_0_Dev02/distribution/jboss-epp/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/pom.xml 2011-08-09 23:32:42 UTC (rev 7035) +++ epp/portal/tags/EPP_5_2_0_Dev02/distribution/jboss-epp/pom.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -7,7 +7,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>distribution.parent</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV02</version> </parent> <artifactId>distribution</artifactId> Modified: epp/portal/tags/EPP_5_2_0_Dev02/distribution/jboss-epp/portletbridge/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/portletbridge/pom.xml 2011-08-09 23:32:42 UTC (rev 7035) +++ epp/portal/tags/EPP_5_2_0_Dev02/distribution/jboss-epp/portletbridge/pom.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -5,7 +5,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>distribution.parent</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV02</version> <relativePath>../../pom.xml</relativePath> </parent> Deleted: epp/portal/tags/EPP_5_2_0_Dev02/distribution/jboss-epp/serverAddon/gatein.ear/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/gatein.ear/pom.xml 2011-08-09 23:32:42 UTC (rev 7035) +++ epp/portal/tags/EPP_5_2_0_Dev02/distribution/jboss-epp/serverAddon/gatein.ear/pom.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -1,1500 +0,0 @@ - -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.exoplatform.portal</groupId> - <artifactId>distribution.parent</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> - <relativePath>../../../pom.xml</relativePath> - </parent> - <artifactId>gatein</artifactId> - <packaging>ear</packaging> - <name>GateIn EAR</name> - <description>GateIn EAR</description> - - <dependencies> -  - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.web.portal</artifactId> - <version>${project.version}</version> - <type>war</type> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.web.eXoResources</artifactId> - <version>${project.version}</version> - <type>war</type> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.portlet.dashboard</artifactId> - <version>${project.version}</version> - <type>war</type> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.portlet.exoadmin</artifactId> - <version>${project.version}</version> - <type>war</type> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.web.rest</artifactId> - <version>${project.version}</version> - <type>war</type> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.eXoGadgets</artifactId> - <version>${project.version}</version> - <type>war</type> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.gadgets-server</artifactId> - <version>${project.version}</version> - <type>war</type> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.portlet.web</artifactId> - <version>${project.version}</version> - <type>war</type> - </dependency> -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>integration</artifactId> - <version>${project.version}</version> - <type>war</type> - </dependency> - - -  - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.common</artifactId> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.web.security</artifactId> - <exclusions> - <exclusion> - <artifactId>reflext.apt</artifactId> - <groupId>org.reflext</groupId> - </exclusion> - <exclusion> - <artifactId>servlet-api</artifactId> - <groupId>javax.servlet</groupId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.web.controller</artifactId> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.web.server</artifactId> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.web.api</artifactId> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.web.resources</artifactId> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.portal</artifactId> - <exclusions> - <exclusion> - <artifactId>jaxb-api</artifactId> - <groupId>javax.xml.bind</groupId> - </exclusion> - <exclusion> - <artifactId>jaxb-impl</artifactId> - <groupId>com.sun.xml.bind</groupId> - </exclusion> - <exclusion> - <artifactId>log4j</artifactId> - <groupId>log4j</groupId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.pc</artifactId> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.identity</artifactId> - <exclusions> - <exclusion> - <artifactId>hibernate-annotations</artifactId> - <groupId>org.hibernate</groupId> - </exclusion> - <exclusion> - <artifactId>hibernate-core</artifactId> - <groupId>org.hibernate</groupId> - </exclusion> - <exclusion> - <artifactId>hibernate-cglib-repack</artifactId> - <groupId>org.hibernate</groupId> - </exclusion> - <exclusion> - <artifactId>javassist</artifactId> - <groupId>javassist</groupId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.resources</artifactId> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.application-registry</artifactId> - </dependency> - - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.scripting</artifactId> - <exclusions> - <exclusion> - <artifactId>ant</artifactId> - <groupId>org.apache.ant</groupId> - </exclusion> - <exclusion> - <artifactId>ant-launcher</artifactId> - <groupId>org.apache.ant</groupId> - </exclusion> - <exclusion> - <artifactId>junit</artifactId> - <groupId>junit</groupId> - </exclusion> - <exclusion> - <artifactId>jline</artifactId> - <groupId>jline</groupId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.management</artifactId> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.webui.framework</artifactId> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.webui.portlet</artifactId> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.webui.portal</artifactId> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.webui.eXo</artifactId> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.webui.core</artifactId> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.webui.dashboard</artifactId> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.gadgets-core</artifactId> - </dependency> - - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.server.jboss.plugin</artifactId> - </dependency> - - -  - <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.commons</artifactId> - <exclusions> - <exclusion> - <artifactId>commons-logging</artifactId> - <groupId>commons-logging</groupId> - </exclusion> - <exclusion> - <artifactId>slf4j-api</artifactId> - <groupId>org.slf4j</groupId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.component.cache</artifactId> - <exclusions> - <exclusion> - <artifactId>junit</artifactId> - <groupId>junit</groupId> - </exclusion> - <exclusion> - <artifactId>exo.tool.framework.junit</artifactId> - <groupId>org.exoplatform.tool</groupId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.component.command</artifactId> - <exclusions> - <exclusion> - <artifactId>commons-logging</artifactId> - <groupId>commons-logging</groupId> - </exclusion> - <exclusion> - <artifactId>xml-apis</artifactId> - <groupId>xml-apis</groupId> - </exclusion> - <exclusion> - <artifactId>commons-collections</artifactId> - <groupId>commons-collections</groupId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.component.common</artifactId> - <exclusions> - <exclusion> - <artifactId>junit</artifactId> - <groupId>junit</groupId> - </exclusion> - <exclusion> - <artifactId>carol</artifactId> - <groupId>org.objectweb.carol</groupId> - </exclusion> - <exclusion> - <artifactId>commons-logging</artifactId> - <groupId>commons-logging</groupId> - </exclusion> - <exclusion> - <artifactId>exo.tool.framework.junit</artifactId> - <groupId>org.exoplatform.tool</groupId> - </exclusion> - <exclusion> - <artifactId>howl-logger</artifactId> - <groupId>howl</groupId> - </exclusion> - <exclusion> - <artifactId>jmock</artifactId> - <groupId>jmock</groupId> - </exclusion> - <exclusion> - <artifactId>jotm_jrmp_stubs</artifactId> - <groupId>jotm</groupId> - </exclusion> - <exclusion> - <artifactId>jotm</artifactId> - <groupId>jotm</groupId> - </exclusion> - <exclusion> - <artifactId>jta</artifactId> - <groupId>javax.transaction</groupId> - </exclusion> - <exclusion> - <artifactId>mail</artifactId> - <groupId>javax.mail</groupId> - </exclusion> - <exclusion> - <artifactId>quartz</artifactId> - <groupId>quartz</groupId> - </exclusion> - <exclusion> - <artifactId>xstream</artifactId> - <groupId>xstream</groupId> - </exclusion> - <exclusion> - <artifactId>activation</artifactId> - <groupId>javax.activation</groupId> - </exclusion> - </exclusions> - </dependency> - - - <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.container</artifactId> - <exclusions> - <exclusion> - <artifactId>bcel</artifactId> - <groupId>bcel</groupId> - </exclusion> - <exclusion> - <artifactId>commons-logging</artifactId> - <groupId>commons-logging</groupId> - </exclusion> - <exclusion> - <artifactId>exo.tool.framework.junit</artifactId> - <groupId>org.exoplatform.tool</groupId> - </exclusion> - <exclusion> - <artifactId>jibx-extras</artifactId> - <groupId>org.jibx</groupId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.component.ext.cache.impl.jboss.v3</artifactId> - <exclusions> - <exclusion> - <artifactId>commons-logging</artifactId> - <groupId>commons-logging</groupId> - </exclusion> - <exclusion> - <artifactId>exo.tool.framework.junit</artifactId> - <groupId>org.exoplatform.tool</groupId> - </exclusion> - <exclusion> - <artifactId>jboss-transaction-api</artifactId> - <groupId>org.jboss.javaee</groupId> - </exclusion> - <exclusion> - <artifactId>jboss-common-core</artifactId> - <groupId>org.jboss</groupId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.mc-int</artifactId> - <exclusions> - <exclusion> - <artifactId>ant</artifactId> - <groupId>org.apache.ant</groupId> - </exclusion> - <exclusion> - <artifactId>jaxb-api</artifactId> - <groupId>sun-jaxb</groupId> - </exclusion> - <exclusion> - <artifactId>jboss-deployers-structure-spi</artifactId> - <groupId>org.jboss.deployers</groupId> - </exclusion> - <exclusion> - <artifactId>jboss-deployers-spi</artifactId> - <groupId>org.jboss.deployers</groupId> - </exclusion> - <exclusion> - <artifactId>jboss-classloading-spi</artifactId> - <groupId>org.jboss.integration</groupId> - </exclusion> - <exclusion> - <artifactId>jboss-logging-spi</artifactId> - <groupId>org.jboss.logging</groupId> - </exclusion> - <exclusion> - <artifactId>jboss-dependency</artifactId> - <groupId>org.jboss.microcontainer</groupId> - </exclusion> - <exclusion> - <artifactId>jboss-mdr</artifactId> - <groupId>org.jboss</groupId> - </exclusion> - <exclusion> - <artifactId>jboss-reflect</artifactId> - <groupId>org.jboss</groupId> - </exclusion> - <exclusion> - <artifactId>jboss-kernel</artifactId> - <groupId>org.jboss.microcontainer</groupId> - </exclusion> - <exclusion> - <artifactId>jboss-deployers-impl</artifactId> - <groupId>org.jboss.deployers</groupId> - </exclusion> - <exclusion> - <artifactId>jboss-aop-mc-int</artifactId> - <groupId>org.jboss.microcontainer</groupId> - </exclusion> - <exclusion> - <artifactId>jboss-deployers-vfs-spi</artifactId> - <groupId>org.jboss.deployers</groupId> - </exclusion> - <exclusion> - <artifactId>jboss-vfs</artifactId> - <groupId>org.jboss</groupId> - </exclusion> - <exclusion> - <artifactId>jboss-deployers-vfs</artifactId> - <groupId>org.jboss.deployers</groupId> - </exclusion> - <exclusion> - <artifactId>jboss-deployers-core-spi</artifactId> - <groupId>org.jboss.deployers</groupId> - </exclusion> - <exclusion> - <artifactId>jboss-common-core</artifactId> - <groupId>org.jboss</groupId> - </exclusion> - <exclusion> - <artifactId>jboss-classloader</artifactId> - <groupId>org.jboss.cl</groupId> - </exclusion> - <exclusion> - <artifactId>servlet-api</artifactId> - <groupId>javax.servlet</groupId> - </exclusion> - <exclusion> - <artifactId>xml-apis</artifactId> - <groupId>apache-xerces</groupId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.mc-kernel-extras</artifactId> - <exclusions> - <exclusion> - <artifactId>jboss-kernel</artifactId> - <groupId>org.jboss.microcontainer</groupId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.exoplatform.core</groupId> - <artifactId>exo.core.component.organization.api</artifactId> - <exclusions> - <exclusion> - <artifactId>commons-logging</artifactId> - <groupId>commons-logging</groupId> - </exclusion> - <exclusion> - <artifactId>xdoclet</artifactId> - <groupId>xdoclet</groupId> - </exclusion> - <exclusion> - <artifactId>xdoclet-xdoclet-module</artifactId> - <groupId>xdoclet</groupId> - </exclusion> - <exclusion> - <artifactId>xdoclet-hibernate-module</artifactId> - <groupId>xdoclet</groupId> - </exclusion> - <exclusion> - <artifactId>xjavadoc</artifactId> - <groupId>xdoclet</groupId> - </exclusion> - <exclusion> - <artifactId>xstream</artifactId> - <groupId>xstream</groupId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.exoplatform.core</groupId> - <artifactId>exo.core.component.database</artifactId> - <exclusions> - <exclusion> - <artifactId>antlr</artifactId> - <groupId>antlr</groupId> - </exclusion> - <exclusion> - <artifactId>ejb3-persistence</artifactId> - <groupId>org.hibernate</groupId> - </exclusion> - <exclusion> - <artifactId>exo.tool.framework.junit</artifactId> - <groupId>org.exoplatform.tool</groupId> - </exclusion> - <exclusion> - <artifactId>hibernate-annotations</artifactId> - <groupId>org.hibernate</groupId> - </exclusion> - <exclusion> - <artifactId>hibernate-core</artifactId> - <groupId>org.hibernate</groupId> - </exclusion> - <exclusion> - <artifactId>jta</artifactId> - <groupId>javax.transaction</groupId> - </exclusion> - <exclusion> - <artifactId>pull-parser</artifactId> - <groupId>pull-parser</groupId> - </exclusion> - <exclusion> - <artifactId>xapool</artifactId> - <groupId>com.experlog</groupId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.exoplatform.core</groupId> - <artifactId>exo.core.component.ldap</artifactId> - <exclusions> - <exclusion> - <artifactId>exo.tool.framework.junit</artifactId> - <groupId>org.exoplatform.tool</groupId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.exoplatform.core</groupId> - <artifactId>exo.core.component.organization.jdbc</artifactId> - <exclusions> - <exclusion> - <artifactId>exo.tool.framework.junit</artifactId> - <groupId>org.exoplatform.tool</groupId> - </exclusion> - <exclusion> - <artifactId>hibernate-core</artifactId> - <groupId>org.hibernate</groupId> - </exclusion> - <exclusion> - <artifactId>xstream</artifactId> - <groupId>xstream</groupId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.exoplatform.core</groupId> - <artifactId>exo.core.component.organization.ldap</artifactId> - </dependency> - <dependency> - <groupId>org.exoplatform.core</groupId> - <artifactId>exo.core.component.security.core</artifactId> - <exclusions> - <exclusion> - <artifactId>servlet-api</artifactId> - <groupId>javax.servlet</groupId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.exoplatform.core</groupId> - <artifactId>exo.core.component.document</artifactId> - <exclusions> - <exclusion> - <artifactId>commons-logging</artifactId> - <groupId>commons-logging</groupId> - </exclusion> - <exclusion> - <artifactId>exo.tool.framework.junit</artifactId> - <groupId>org.exoplatform.tool</groupId> - </exclusion> - <exclusion> - <artifactId>fontbox</artifactId> - <groupId>org.apache.pdfbox</groupId> - </exclusion> - <exclusion> - <artifactId>geronimo-stax-api_1.0_spec</artifactId> - <groupId>org.apache.geronimo.specs</groupId> - </exclusion> - <exclusion> - <artifactId>jempbox</artifactId> - <groupId>org.apache.pdfbox</groupId> - </exclusion> - <exclusion> - <artifactId>stax-api</artifactId> - <groupId>stax</groupId> - </exclusion> - <exclusion> - <artifactId>xml-apis</artifactId> - <groupId>xml-apis</groupId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.exoplatform.jcr</groupId> - <artifactId>exo.jcr.component.core</artifactId> - <exclusions> - <exclusion> - <artifactId>commons-logging</artifactId> - <groupId>commons-logging</groupId> - </exclusion> - <exclusion> - <artifactId>jbossjts</artifactId> - <groupId>jboss.jbossts</groupId> - </exclusion> - <exclusion> - <artifactId>jbossts-common</artifactId> - <groupId>jboss.jbossts</groupId> - </exclusion> - <exclusion> - <artifactId>jta</artifactId> - <groupId>javax.transaction</groupId> - </exclusion> - <exclusion> - <artifactId>slf4j-api</artifactId> - <groupId>org.slf4j</groupId> - </exclusion> - <exclusion> - <artifactId>slf4j-jdk14</artifactId> - <groupId>org.slf4j</groupId> - </exclusion> - <exclusion> - <artifactId>stax-api</artifactId> - <groupId>javax.xml.stream</groupId> - </exclusion> - <exclusion> - <artifactId>stax-api</artifactId> - <groupId>stax</groupId> - </exclusion> - <exclusion> - <artifactId>xml-apis</artifactId> - <groupId>xml-apis</groupId> - </exclusion> - <exclusion> - <artifactId>commons-collections</artifactId> - <groupId>commons-collections</groupId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.exoplatform.jcr</groupId> - <artifactId>exo.jcr.component.ext</artifactId> - <exclusions> - <exclusion> - <artifactId>junit</artifactId> - <groupId>junit</groupId> - </exclusion> - <exclusion> - <artifactId>jtidy</artifactId> - <groupId>jtidy</groupId> - </exclusion> - <exclusion> - <artifactId>servlet-api</artifactId> - <groupId>javax.servlet</groupId> - </exclusion> - <exclusion> - <artifactId>stax-api</artifactId> - <groupId>javax.xml.stream</groupId> - </exclusion> - <exclusion> - <artifactId>xml-apis</artifactId> - <groupId>xml-apis</groupId> - </exclusion> - <exclusion> - <artifactId>commons-collections</artifactId> - <groupId>commons-collections</groupId> - </exclusion> - <exclusion> - <artifactId>exo.core.component.script.groovy</artifactId> - <groupId>org.exoplatform.core</groupId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.exoplatform.jcr</groupId> - <artifactId>exo.jcr.component.webdav</artifactId> - <exclusions> - <exclusion> - <artifactId>jtidy</artifactId> - <groupId>jtidy</groupId> - </exclusion> - <exclusion> - <artifactId>servlet-api</artifactId> - <groupId>javax.servlet</groupId> - </exclusion> - <exclusion> - <artifactId>stax-api</artifactId> - <groupId>javax.xml.stream</groupId> - </exclusion> - <exclusion> - <artifactId>xml-apis</artifactId> - <groupId>xml-apis</groupId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.exoplatform.jcr</groupId> - <artifactId>exo.jcr.framework.web</artifactId> - <exclusions> - <exclusion> - <artifactId>xml-apis</artifactId> - <groupId>xml-apis</groupId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.exoplatform.jcr</groupId> - <artifactId>exo.jcr.component.ftp</artifactId> - </dependency> - <dependency> - <groupId>org.exoplatform.ws</groupId> - <artifactId>exo.ws.frameworks.servlet</artifactId> - <exclusions> - <exclusion> - <artifactId>servlet-api</artifactId> - <groupId>javax.servlet</groupId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.exoplatform.ws</groupId> - <artifactId>exo.ws.rest.core</artifactId> - <exclusions> - <exclusion> - <artifactId>jaxb-api</artifactId> - <groupId>javax.xml.bind</groupId> - </exclusion> - <exclusion> - <artifactId>jtidy</artifactId> - <groupId>jtidy</groupId> - </exclusion> - <exclusion> - <artifactId>mail</artifactId> - <groupId>javax.mail</groupId> - </exclusion> - <exclusion> - <artifactId>servlet-api</artifactId> - <groupId>javax.servlet</groupId> - </exclusion> - <exclusion> - <artifactId>stax-api</artifactId> - <groupId>javax.xml.stream</groupId> - </exclusion> - <exclusion> - <artifactId>activation</artifactId> - <groupId>javax.activation</groupId> - </exclusion> - </exclusions> - </dependency> - - -  - <dependency> - <groupId>org.gatein.common</groupId> - <artifactId>common-logging</artifactId> - <exclusions> - <exclusion> - <artifactId>slf4j-api</artifactId> - <groupId>org.slf4j</groupId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.gatein.common</groupId> - <artifactId>common-common</artifactId> - <exclusions> - <exclusion> - <artifactId>junit</artifactId> - <groupId>junit</groupId> - </exclusion> - <exclusion> - <artifactId>commons-logging</artifactId> - <groupId>commons-logging</groupId> - </exclusion> - <exclusion> - <artifactId>jboss-logging-spi</artifactId> - <groupId>org.jboss.logging</groupId> - </exclusion> - <exclusion> - <artifactId>jboss-vfs</artifactId> - <groupId>org.jboss</groupId> - </exclusion> - <exclusion> - <artifactId>servlet-api</artifactId> - <groupId>javax.servlet</groupId> - </exclusion> - <exclusion> - <artifactId>activation</artifactId> - <groupId>javax.activation</groupId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>commons-digester</groupId> - <artifactId>commons-digester</artifactId> - <version>1.8.1</version> - <exclusions> - <exclusion> - <artifactId>commons-logging</artifactId> - <groupId>commons-logging</groupId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>commons-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> - <version>3.1</version> - <exclusions> - <exclusion> - <artifactId>commons-logging</artifactId> - <groupId>commons-logging</groupId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.gatein.wci</groupId> - <artifactId>wci-wci</artifactId> - </dependency> - <dependency> - <groupId>org.gatein.wci</groupId> - <artifactId>wci-exo</artifactId> - </dependency> - <dependency> - <groupId>org.gatein.wci</groupId> - <artifactId>wci-tomcat6</artifactId> - <exclusions> - <exclusion> - <artifactId>wci-tomcat</artifactId> - <groupId>org.gatein.wci</groupId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.gatein.pc</groupId> - <artifactId>pc-bridge</artifactId> - </dependency> - <dependency> - <groupId>org.gatein.pc</groupId> - <artifactId>pc-federation</artifactId> - </dependency> - <dependency> - <groupId>org.gatein.pc</groupId> - <artifactId>pc-mc</artifactId> - <exclusions> - <exclusion> - <artifactId>junit</artifactId> - <groupId>junit</groupId> - </exclusion> - <exclusion> - <artifactId>jaxb-api</artifactId> - <groupId>sun-jaxb</groupId> - </exclusion> - <exclusion> - <artifactId>jboss-logging-spi</artifactId> - <groupId>org.jboss.logging</groupId> - </exclusion> - <exclusion> - <artifactId>jboss-reflect</artifactId> - <groupId>org.jboss</groupId> - </exclusion> - <exclusion> - <artifactId>jboss-unit</artifactId> - <groupId>org.jboss.unit</groupId> - </exclusion> - <exclusion> - <artifactId>jboss-common-core</artifactId> - <groupId>org.jboss</groupId> - </exclusion> - <exclusion> - <artifactId>xml-apis</artifactId> - <groupId>apache-xerces</groupId> - </exclusion> - <exclusion> - <artifactId>dtdparser121</artifactId> - <groupId>wutka-dtdparser</groupId> - </exclusion> - <exclusion> - <artifactId>xercesImpl</artifactId> - <groupId>apache-xerces</groupId> - </exclusion> - <exclusion> - <artifactId>jbossxb</artifactId> - <groupId>org.jboss</groupId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.gatein.pc</groupId> - <artifactId>pc-portlet</artifactId> - <exclusions> - <exclusion> - <artifactId>jsp-api</artifactId> - <groupId>javax.servlet.jsp</groupId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.gatein.pc</groupId> - <artifactId>pc-api</artifactId> - <exclusions> - <exclusion> - <artifactId>jaxb-api</artifactId> - <groupId>sun-jaxb</groupId> - </exclusion> - <exclusion> - <artifactId>log4j</artifactId> - <groupId>log4j</groupId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.gatein.pc</groupId> - <artifactId>pc-controller</artifactId> - <exclusions> - <exclusion> - <artifactId>xml-apis</artifactId> - <groupId>apache-xerces</groupId> - </exclusion> - <exclusion> - <artifactId>resolver</artifactId> - <groupId>apache-xerces</groupId> - </exclusion> - <exclusion> - <artifactId>xercesImpl</artifactId> - <groupId>apache-xerces</groupId> - </exclusion> - </exclusions> - </dependency> - -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  - <dependency> - <groupId>org.gatein.mop</groupId> - <artifactId>mop-api</artifactId> - </dependency> - <dependency> - <groupId>org.gatein.mop</groupId> - <artifactId>mop-spi</artifactId> - </dependency> - <dependency> - <groupId>org.gatein.mop</groupId> - <artifactId>mop-core</artifactId> - <exclusions> - <exclusion> - <artifactId>slf4j-api</artifactId> - <groupId>org.slf4j</groupId> - </exclusion> - </exclusions> - </dependency> - - -  - <dependency> - <groupId>org.chromattic</groupId> - <artifactId>chromattic.api</artifactId> - </dependency> - <dependency> - <groupId>org.chromattic</groupId> - <artifactId>chromattic.spi</artifactId> - </dependency> - <dependency> - <groupId>org.chromattic</groupId> - <artifactId>chromattic.core</artifactId> - <exclusions> - <exclusion> - <artifactId>slf4j-api</artifactId> - <groupId>org.slf4j</groupId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.chromattic</groupId> - <artifactId>chromattic.ext</artifactId> - </dependency> - -  - <dependency> - <groupId>org.gatein.shindig</groupId> - <artifactId>shindig-gadgets</artifactId> - <exclusions> - <exclusion> - <artifactId>xml-apis</artifactId> - <groupId>xml-apis</groupId> - </exclusion> - <exclusion> - <artifactId>htmlparser</artifactId> - <groupId>nu.validator.htmlparser</groupId> - </exclusion> - <exclusion> - <artifactId>oauth</artifactId> - <groupId>net.oauth.core</groupId> - </exclusion> - <exclusion> - <artifactId>oauth-consumer</artifactId> - <groupId>net.oauth.core</groupId> - </exclusion> - <exclusion> - <artifactId>oauth-httpclient3</artifactId> - <groupId>net.oauth.core</groupId> - </exclusion> - <exclusion> - <artifactId>xercesImpl</artifactId> - <groupId>xerces</groupId> - </exclusion> - <exclusion> - <artifactId>jdom</artifactId> - <groupId>org.jdom</groupId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.gatein.shindig</groupId> - <artifactId>shindig-features</artifactId> - </dependency> - <dependency> - <groupId>org.gatein.shindig</groupId> - <artifactId>shindig-common</artifactId> - <exclusions> - <exclusion> - <artifactId>commons-logging</artifactId> - <groupId>commons-logging</groupId> - </exclusion> - <exclusion> - <artifactId>commons-beanutils-core</artifactId> - <groupId>commons-beanutils</groupId> - </exclusion> - <exclusion> - <artifactId>commons-betwixt</artifactId> - <groupId>commons-betwixt</groupId> - </exclusion> - <exclusion> - <artifactId>commons-collections</artifactId> - <groupId>commons-collections</groupId> - </exclusion> - <exclusion> - <artifactId>ezmorph</artifactId> - <groupId>net.sf.ezmorph</groupId> - </exclusion> - <exclusion> - <artifactId>json-lib</artifactId> - <groupId>net.sf.json-lib</groupId> - </exclusion> - <exclusion> - <artifactId>oauth</artifactId> - <groupId>net.oauth.core</groupId> - </exclusion> - <exclusion> - <artifactId>xpp3_min</artifactId> - <groupId>xpp3</groupId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.gatein.shindig</groupId> - <artifactId>shindig-social-api</artifactId> - <exclusions> - <exclusion> - <artifactId>commons-logging</artifactId> - <groupId>commons-logging</groupId> - </exclusion> - <exclusion> - <artifactId>geronimo-stax-api_1.0_spec</artifactId> - <groupId>org.apache.geronimo.specs</groupId> - </exclusion> - <exclusion> - <artifactId>xml-apis</artifactId> - <groupId>xml-apis</groupId> - </exclusion> - <exclusion> - <artifactId>commons-betwixt</artifactId> - <groupId>commons-betwixt</groupId> - </exclusion> - <exclusion> - <artifactId>commons-collections</artifactId> - <groupId>commons-collections</groupId> - </exclusion> - <exclusion> - <artifactId>ezmorph</artifactId> - <groupId>net.sf.ezmorph</groupId> - </exclusion> - <exclusion> - <artifactId>json-lib</artifactId> - <groupId>net.sf.json-lib</groupId> - </exclusion> - <exclusion> - <artifactId>oauth</artifactId> - <groupId>net.oauth.core</groupId> - </exclusion> - <exclusion> - <artifactId>oauth-consumer</artifactId> - <groupId>net.oauth.core</groupId> - </exclusion> - <exclusion> - <artifactId>oauth-provider</artifactId> - <groupId>net.oauth.core</groupId> - </exclusion> - <exclusion> - <artifactId>oauth-httpclient3</artifactId> - <groupId>net.oauth.core</groupId> - </exclusion> - <exclusion> - <artifactId>xpp3_min</artifactId> - <groupId>xpp3</groupId> - </exclusion> - </exclusions> - </dependency> - -  - <dependency> - <groupId>net.oauth</groupId> - <artifactId>core</artifactId> - <exclusions> - <exclusion> - <artifactId>servlet-api</artifactId> - <groupId>javax.servlet</groupId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>javax.activation</groupId> - <artifactId>activation</artifactId> - <version>1.1.1</version> - </dependency> - -  - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-jbosscache2</artifactId> - <version>3.3.2.GA</version> - <exclusions> - <exclusion> - <artifactId>slf4j-api</artifactId> - <groupId>org.slf4j</groupId> - </exclusion> - <exclusion> - <artifactId>jta</artifactId> - <groupId>javax.transaction</groupId> - </exclusion> - <exclusion> - <artifactId>hibernate-core</artifactId> - <groupId>org.hibernate</groupId> - </exclusion> - </exclusions> - </dependency> -  - <dependency> - <groupId>net.jcip</groupId> - <artifactId>jcip-annotations</artifactId> - <version>${jcip.version}</version> - </dependency> - - <dependency> - <groupId>rhino</groupId> - <artifactId>js</artifactId> - <version>${rhino.version}</version> - </dependency> - -  - <dependency> - <groupId>org.jboss.cache</groupId> - <artifactId>jbosscache-core</artifactId> - <version>3.2.7.GA</version> - <exclusions> - <exclusion> - <artifactId>jboss-transaction-api</artifactId> - <groupId>org.jboss.javaee</groupId> - </exclusion> - <exclusion> - <artifactId>jboss-common-core</artifactId> - <groupId>org.jboss</groupId> - </exclusion> - <exclusion> - <artifactId>commons-logging</artifactId> - <groupId>commons-logging</groupId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <artifactId>slf4j-jdk14</artifactId> - <groupId>org.slf4j</groupId> - <type>jar</type> - <version>1.5.6</version> - <scope>provided</scope> - <exclusions> - <exclusion> - <artifactId>slf4j-api</artifactId> - <groupId>org.slf4j</groupId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <artifactId>asm</artifactId> - <groupId>asm</groupId> - <type>jar</type> - <version>1.5.3</version> - </dependency> - </dependencies> - - <build> - <finalName>gatein</finalName> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-ear-plugin</artifactId> - <configuration> - <displayName>GateIn portal</displayName> - <defaultLibBundleDir>lib</defaultLibBundleDir> - <archive> - <manifest> - <addClasspath>true</addClasspath> - </manifest> - </archive> - - <modules> -  - <webModule> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.web.eXoResources</artifactId> - <contextRoot>eXoResources</contextRoot> - <bundleFileName>01eXoResources.war</bundleFileName> - <unpack>true</unpack> - </webModule> - <webModule> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.web.portal</artifactId> - <contextRoot>portal</contextRoot> - <bundleFileName>02portal.war</bundleFileName> - <unpack>true</unpack> - </webModule> - <webModule> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.portlet.dashboard</artifactId> - <contextRoot>dashboard</contextRoot> - <bundleFileName>dashboard.war</bundleFileName> - </webModule> -  -  -  -  -  -  - <webModule> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.portlet.exoadmin</artifactId> - <contextRoot>exoadmin</contextRoot> - <bundleFileName>exoadmin.war</bundleFileName> - </webModule> - <webModule> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.web.rest</artifactId> - <contextRoot>rest</contextRoot> - <bundleFileName>rest.war</bundleFileName> - </webModule> - <webModule> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.eXoGadgets</artifactId> - <contextRoot>eXoGadgets</contextRoot> - <bundleFileName>eXoGadgets.war</bundleFileName> - </webModule> - <webModule> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.portlet.web</artifactId> - <contextRoot>web</contextRoot> - <bundleFileName>web.war</bundleFileName> - </webModule> - <webModule> - <groupId>org.exoplatform.portal</groupId> - <artifactId>integration</artifactId> - <contextRoot>integration</contextRoot> - <bundleFileName>integration.war</bundleFileName> - <unpack>true</unpack> - </webModule> -  -  -  -  -  -  - <webModule> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.gadgets-server</artifactId> - <contextRoot>eXoGadgetServer</contextRoot> - <bundleFileName>eXoGadgetServer.war</bundleFileName> - </webModule> - </modules> - </configuration> - </plugin> - </plugins> - </build> -  - <repositories> - <repository> - <id>mead</id> - <url>http://download.devel.redhat.com/brewroot/repos/jboss-epp-5-build/latest/...</url> - <releases> - <enabled>true</enabled> - </releases> - <snapshots> - <enabled>false</enabled> - </snapshots> - </repository> - <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> - </repository> - <repository> - <id>oauth</id> - <url>http://oauth.googlecode.com/svn/code/maven</url> - <releases> - <enabled>true</enabled> - </releases> - <snapshots> - <enabled>false</enabled> - </snapshots> - </repository> - <repository> - <id>java.net</id> - <url>http://download.java.net/maven/2</url> - <releases> - <enabled>true</enabled> - </releases> - <snapshots> - <enabled>false</enabled> - </snapshots> - </repository> - <repository> - <id>exo-int</id> - <url>http://repository.exoplatform.org/content/groups/public</url> - <releases> - <enabled>true</enabled> - </releases> - <snapshots> - <enabled>false</enabled> - </snapshots> - </repository> - </repositories> -</project> \ No newline at end of file Copied: epp/portal/tags/EPP_5_2_0_Dev02/distribution/jboss-epp/serverAddon/gatein.ear/pom.xml (from rev 7039, epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/gatein.ear/pom.xml) =================================================================== --- epp/portal/tags/EPP_5_2_0_Dev02/distribution/jboss-epp/serverAddon/gatein.ear/pom.xml (rev 0) +++ epp/portal/tags/EPP_5_2_0_Dev02/distribution/jboss-epp/serverAddon/gatein.ear/pom.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -0,0 +1,1516 @@ + +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.exoplatform.portal</groupId> + <artifactId>distribution.parent</artifactId> + <version>5.2.0-epp-DEV02</version> + <relativePath>../../../pom.xml</relativePath> + </parent> + <artifactId>gatein</artifactId> + <packaging>ear</packaging> + <name>GateIn EAR</name> + <description>GateIn EAR</description> + + <dependencies> +  + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.web.portal</artifactId> + <version>${project.version}</version> + <type>war</type> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.web.eXoResources</artifactId> + <version>${project.version}</version> + <type>war</type> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.portlet.dashboard</artifactId> + <version>${project.version}</version> + <type>war</type> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.portlet.exoadmin</artifactId> + <version>${project.version}</version> + <type>war</type> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.web.rest</artifactId> + <version>${project.version}</version> + <type>war</type> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.eXoGadgets</artifactId> + <version>${project.version}</version> + <type>war</type> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.gadgets-server</artifactId> + <version>${project.version}</version> + <type>war</type> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.portlet.web</artifactId> + <version>${project.version}</version> + <type>war</type> + </dependency> +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>integration</artifactId> + <version>${project.version}</version> + <type>war</type> + </dependency> + + +  + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.common</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.web.security</artifactId> + <exclusions> + <exclusion> + <artifactId>reflext.apt</artifactId> + <groupId>org.reflext</groupId> + </exclusion> + <exclusion> + <artifactId>servlet-api</artifactId> + <groupId>javax.servlet</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.web.controller</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.web.server</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.web.api</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.web.resources</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.portal</artifactId> + <exclusions> + <exclusion> + <artifactId>jaxb-api</artifactId> + <groupId>javax.xml.bind</groupId> + </exclusion> + <exclusion> + <artifactId>jaxb-impl</artifactId> + <groupId>com.sun.xml.bind</groupId> + </exclusion> + <exclusion> + <artifactId>log4j</artifactId> + <groupId>log4j</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.pc</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.identity</artifactId> + <exclusions> + <exclusion> + <artifactId>hibernate-annotations</artifactId> + <groupId>org.hibernate</groupId> + </exclusion> + <exclusion> + <artifactId>hibernate-core</artifactId> + <groupId>org.hibernate</groupId> + </exclusion> + <exclusion> + <artifactId>hibernate-cglib-repack</artifactId> + <groupId>org.hibernate</groupId> + </exclusion> + <exclusion> + <artifactId>javassist</artifactId> + <groupId>javassist</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.resources</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.application-registry</artifactId> + </dependency> + + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.scripting</artifactId> + <exclusions> + <exclusion> + <artifactId>ant</artifactId> + <groupId>org.apache.ant</groupId> + </exclusion> + <exclusion> + <artifactId>ant-launcher</artifactId> + <groupId>org.apache.ant</groupId> + </exclusion> + <exclusion> + <artifactId>junit</artifactId> + <groupId>junit</groupId> + </exclusion> + <exclusion> + <artifactId>jline</artifactId> + <groupId>jline</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.management</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.webui.framework</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.webui.portlet</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.webui.portal</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.webui.eXo</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.webui.core</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.webui.dashboard</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.gadgets-core</artifactId> + </dependency> + + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.server.jboss.plugin</artifactId> + </dependency> + + +  + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.commons</artifactId> + <exclusions> + <exclusion> + <artifactId>commons-logging</artifactId> + <groupId>commons-logging</groupId> + </exclusion> + <exclusion> + <artifactId>slf4j-api</artifactId> + <groupId>org.slf4j</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.component.cache</artifactId> + <exclusions> + <exclusion> + <artifactId>junit</artifactId> + <groupId>junit</groupId> + </exclusion> + <exclusion> + <artifactId>exo.tool.framework.junit</artifactId> + <groupId>org.exoplatform.tool</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.component.command</artifactId> + <exclusions> + <exclusion> + <artifactId>commons-logging</artifactId> + <groupId>commons-logging</groupId> + </exclusion> + <exclusion> + <artifactId>xml-apis</artifactId> + <groupId>xml-apis</groupId> + </exclusion> + <exclusion> + <artifactId>commons-collections</artifactId> + <groupId>commons-collections</groupId> + </exclusion> + <exclusion> + <artifactId>infinispan-cachestore-jdbc</artifactId> + <groupId>org.infinispan</groupId> + </exclusion> + <exclusion> + <artifactId>infinispan-core</artifactId> + <groupId>org.infinispan</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.component.common</artifactId> + <exclusions> + <exclusion> + <artifactId>junit</artifactId> + <groupId>junit</groupId> + </exclusion> + <exclusion> + <artifactId>carol</artifactId> + <groupId>org.objectweb.carol</groupId> + </exclusion> + <exclusion> + <artifactId>commons-logging</artifactId> + <groupId>commons-logging</groupId> + </exclusion> + <exclusion> + <artifactId>exo.tool.framework.junit</artifactId> + <groupId>org.exoplatform.tool</groupId> + </exclusion> + <exclusion> + <artifactId>howl-logger</artifactId> + <groupId>howl</groupId> + </exclusion> + <exclusion> + <artifactId>jmock</artifactId> + <groupId>jmock</groupId> + </exclusion> + <exclusion> + <artifactId>jotm_jrmp_stubs</artifactId> + <groupId>jotm</groupId> + </exclusion> + <exclusion> + <artifactId>jotm</artifactId> + <groupId>jotm</groupId> + </exclusion> + <exclusion> + <artifactId>jta</artifactId> + <groupId>javax.transaction</groupId> + </exclusion> + <exclusion> + <artifactId>mail</artifactId> + <groupId>javax.mail</groupId> + </exclusion> + <exclusion> + <artifactId>quartz</artifactId> + <groupId>quartz</groupId> + </exclusion> + <exclusion> + <artifactId>xstream</artifactId> + <groupId>xstream</groupId> + </exclusion> + <exclusion> + <artifactId>activation</artifactId> + <groupId>javax.activation</groupId> + </exclusion> + </exclusions> + </dependency> + + + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.container</artifactId> + <exclusions> + <exclusion> + <artifactId>bcel</artifactId> + <groupId>bcel</groupId> + </exclusion> + <exclusion> + <artifactId>commons-logging</artifactId> + <groupId>commons-logging</groupId> + </exclusion> + <exclusion> + <artifactId>exo.tool.framework.junit</artifactId> + <groupId>org.exoplatform.tool</groupId> + </exclusion> + <exclusion> + <artifactId>jibx-extras</artifactId> + <groupId>org.jibx</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.component.ext.cache.impl.jboss.v3</artifactId> + <exclusions> + <exclusion> + <artifactId>commons-logging</artifactId> + <groupId>commons-logging</groupId> + </exclusion> + <exclusion> + <artifactId>exo.tool.framework.junit</artifactId> + <groupId>org.exoplatform.tool</groupId> + </exclusion> + <exclusion> + <artifactId>jboss-transaction-api</artifactId> + <groupId>org.jboss.javaee</groupId> + </exclusion> + <exclusion> + <artifactId>jboss-common-core</artifactId> + <groupId>org.jboss</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.mc-int</artifactId> + <exclusions> + <exclusion> + <artifactId>ant</artifactId> + <groupId>org.apache.ant</groupId> + </exclusion> + <exclusion> + <artifactId>jaxb-api</artifactId> + <groupId>sun-jaxb</groupId> + </exclusion> + <exclusion> + <artifactId>jboss-deployers-structure-spi</artifactId> + <groupId>org.jboss.deployers</groupId> + </exclusion> + <exclusion> + <artifactId>jboss-deployers-spi</artifactId> + <groupId>org.jboss.deployers</groupId> + </exclusion> + <exclusion> + <artifactId>jboss-classloading-spi</artifactId> + <groupId>org.jboss.integration</groupId> + </exclusion> + <exclusion> + <artifactId>jboss-logging-spi</artifactId> + <groupId>org.jboss.logging</groupId> + </exclusion> + <exclusion> + <artifactId>jboss-dependency</artifactId> + <groupId>org.jboss.microcontainer</groupId> + </exclusion> + <exclusion> + <artifactId>jboss-mdr</artifactId> + <groupId>org.jboss</groupId> + </exclusion> + <exclusion> + <artifactId>jboss-reflect</artifactId> + <groupId>org.jboss</groupId> + </exclusion> + <exclusion> + <artifactId>jboss-kernel</artifactId> + <groupId>org.jboss.microcontainer</groupId> + </exclusion> + <exclusion> + <artifactId>jboss-deployers-impl</artifactId> + <groupId>org.jboss.deployers</groupId> + </exclusion> + <exclusion> + <artifactId>jboss-aop-mc-int</artifactId> + <groupId>org.jboss.microcontainer</groupId> + </exclusion> + <exclusion> + <artifactId>jboss-deployers-vfs-spi</artifactId> + <groupId>org.jboss.deployers</groupId> + </exclusion> + <exclusion> + <artifactId>jboss-vfs</artifactId> + <groupId>org.jboss</groupId> + </exclusion> + <exclusion> + <artifactId>jboss-deployers-vfs</artifactId> + <groupId>org.jboss.deployers</groupId> + </exclusion> + <exclusion> + <artifactId>jboss-deployers-core-spi</artifactId> + <groupId>org.jboss.deployers</groupId> + </exclusion> + <exclusion> + <artifactId>jboss-common-core</artifactId> + <groupId>org.jboss</groupId> + </exclusion> + <exclusion> + <artifactId>jboss-classloader</artifactId> + <groupId>org.jboss.cl</groupId> + </exclusion> + <exclusion> + <artifactId>servlet-api</artifactId> + <groupId>javax.servlet</groupId> + </exclusion> + <exclusion> + <artifactId>xml-apis</artifactId> + <groupId>apache-xerces</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.mc-kernel-extras</artifactId> + <exclusions> + <exclusion> + <artifactId>jboss-kernel</artifactId> + <groupId>org.jboss.microcontainer</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.organization.api</artifactId> + <exclusions> + <exclusion> + <artifactId>commons-logging</artifactId> + <groupId>commons-logging</groupId> + </exclusion> + <exclusion> + <artifactId>xdoclet</artifactId> + <groupId>xdoclet</groupId> + </exclusion> + <exclusion> + <artifactId>xdoclet-xdoclet-module</artifactId> + <groupId>xdoclet</groupId> + </exclusion> + <exclusion> + <artifactId>xdoclet-hibernate-module</artifactId> + <groupId>xdoclet</groupId> + </exclusion> + <exclusion> + <artifactId>xjavadoc</artifactId> + <groupId>xdoclet</groupId> + </exclusion> + <exclusion> + <artifactId>xstream</artifactId> + <groupId>xstream</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.database</artifactId> + <exclusions> + <exclusion> + <artifactId>antlr</artifactId> + <groupId>antlr</groupId> + </exclusion> + <exclusion> + <artifactId>ejb3-persistence</artifactId> + <groupId>org.hibernate</groupId> + </exclusion> + <exclusion> + <artifactId>exo.tool.framework.junit</artifactId> + <groupId>org.exoplatform.tool</groupId> + </exclusion> + <exclusion> + <artifactId>hibernate-annotations</artifactId> + <groupId>org.hibernate</groupId> + </exclusion> + <exclusion> + <artifactId>hibernate-core</artifactId> + <groupId>org.hibernate</groupId> + </exclusion> + <exclusion> + <artifactId>jta</artifactId> + <groupId>javax.transaction</groupId> + </exclusion> + <exclusion> + <artifactId>pull-parser</artifactId> + <groupId>pull-parser</groupId> + </exclusion> + <exclusion> + <artifactId>xapool</artifactId> + <groupId>com.experlog</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.ldap</artifactId> + <exclusions> + <exclusion> + <artifactId>exo.tool.framework.junit</artifactId> + <groupId>org.exoplatform.tool</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.organization.jdbc</artifactId> + <exclusions> + <exclusion> + <artifactId>exo.tool.framework.junit</artifactId> + <groupId>org.exoplatform.tool</groupId> + </exclusion> + <exclusion> + <artifactId>hibernate-core</artifactId> + <groupId>org.hibernate</groupId> + </exclusion> + <exclusion> + <artifactId>xstream</artifactId> + <groupId>xstream</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.organization.ldap</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.security.core</artifactId> + <exclusions> + <exclusion> + <artifactId>servlet-api</artifactId> + <groupId>javax.servlet</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.document</artifactId> + <exclusions> + <exclusion> + <artifactId>commons-logging</artifactId> + <groupId>commons-logging</groupId> + </exclusion> + <exclusion> + <artifactId>exo.tool.framework.junit</artifactId> + <groupId>org.exoplatform.tool</groupId> + </exclusion> + <exclusion> + <artifactId>fontbox</artifactId> + <groupId>org.apache.pdfbox</groupId> + </exclusion> + <exclusion> + <artifactId>geronimo-stax-api_1.0_spec</artifactId> + <groupId>org.apache.geronimo.specs</groupId> + </exclusion> + <exclusion> + <artifactId>jempbox</artifactId> + <groupId>org.apache.pdfbox</groupId> + </exclusion> + <exclusion> + <artifactId>stax-api</artifactId> + <groupId>stax</groupId> + </exclusion> + <exclusion> + <artifactId>xml-apis</artifactId> + <groupId>xml-apis</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.exoplatform.jcr</groupId> + <artifactId>exo.jcr.component.core</artifactId> + <exclusions> + <exclusion> + <artifactId>commons-logging</artifactId> + <groupId>commons-logging</groupId> + </exclusion> + <exclusion> + <artifactId>jbossjts</artifactId> + <groupId>jboss.jbossts</groupId> + </exclusion> + <exclusion> + <artifactId>jbossts-common</artifactId> + <groupId>jboss.jbossts</groupId> + </exclusion> + <exclusion> + <artifactId>jta</artifactId> + <groupId>javax.transaction</groupId> + </exclusion> + <exclusion> + <artifactId>slf4j-api</artifactId> + <groupId>org.slf4j</groupId> + </exclusion> + <exclusion> + <artifactId>slf4j-jdk14</artifactId> + <groupId>org.slf4j</groupId> + </exclusion> + <exclusion> + <artifactId>stax-api</artifactId> + <groupId>javax.xml.stream</groupId> + </exclusion> + <exclusion> + <artifactId>stax-api</artifactId> + <groupId>stax</groupId> + </exclusion> + <exclusion> + <artifactId>xml-apis</artifactId> + <groupId>xml-apis</groupId> + </exclusion> + <exclusion> + <artifactId>commons-collections</artifactId> + <groupId>commons-collections</groupId> + </exclusion> + <exclusion> + <artifactId>infinispan-core</artifactId> + <groupId>org.infinispan</groupId> + </exclusion> + <exclusion> + <artifactId>infinispan-cachestore-jdbc</artifactId> + <groupId>org.infinispan</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.exoplatform.jcr</groupId> + <artifactId>exo.jcr.component.ext</artifactId> + <exclusions> + <exclusion> + <artifactId>junit</artifactId> + <groupId>junit</groupId> + </exclusion> + <exclusion> + <artifactId>jtidy</artifactId> + <groupId>jtidy</groupId> + </exclusion> + <exclusion> + <artifactId>servlet-api</artifactId> + <groupId>javax.servlet</groupId> + </exclusion> + <exclusion> + <artifactId>stax-api</artifactId> + <groupId>javax.xml.stream</groupId> + </exclusion> + <exclusion> + <artifactId>xml-apis</artifactId> + <groupId>xml-apis</groupId> + </exclusion> + <exclusion> + <artifactId>commons-collections</artifactId> + <groupId>commons-collections</groupId> + </exclusion> + <exclusion> + <artifactId>exo.core.component.script.groovy</artifactId> + <groupId>org.exoplatform.core</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.exoplatform.jcr</groupId> + <artifactId>exo.jcr.component.webdav</artifactId> + <exclusions> + <exclusion> + <artifactId>jtidy</artifactId> + <groupId>jtidy</groupId> + </exclusion> + <exclusion> + <artifactId>servlet-api</artifactId> + <groupId>javax.servlet</groupId> + </exclusion> + <exclusion> + <artifactId>stax-api</artifactId> + <groupId>javax.xml.stream</groupId> + </exclusion> + <exclusion> + <artifactId>xml-apis</artifactId> + <groupId>xml-apis</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.exoplatform.jcr</groupId> + <artifactId>exo.jcr.framework.web</artifactId> + <exclusions> + <exclusion> + <artifactId>xml-apis</artifactId> + <groupId>xml-apis</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.exoplatform.jcr</groupId> + <artifactId>exo.jcr.component.ftp</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.ws</groupId> + <artifactId>exo.ws.frameworks.servlet</artifactId> + <exclusions> + <exclusion> + <artifactId>servlet-api</artifactId> + <groupId>javax.servlet</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.exoplatform.ws</groupId> + <artifactId>exo.ws.rest.core</artifactId> + <exclusions> + <exclusion> + <artifactId>jaxb-api</artifactId> + <groupId>javax.xml.bind</groupId> + </exclusion> + <exclusion> + <artifactId>jtidy</artifactId> + <groupId>jtidy</groupId> + </exclusion> + <exclusion> + <artifactId>mail</artifactId> + <groupId>javax.mail</groupId> + </exclusion> + <exclusion> + <artifactId>servlet-api</artifactId> + <groupId>javax.servlet</groupId> + </exclusion> + <exclusion> + <artifactId>stax-api</artifactId> + <groupId>javax.xml.stream</groupId> + </exclusion> + <exclusion> + <artifactId>activation</artifactId> + <groupId>javax.activation</groupId> + </exclusion> + </exclusions> + </dependency> + + +  + <dependency> + <groupId>org.gatein.common</groupId> + <artifactId>common-logging</artifactId> + <exclusions> + <exclusion> + <artifactId>slf4j-api</artifactId> + <groupId>org.slf4j</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.gatein.common</groupId> + <artifactId>common-common</artifactId> + <exclusions> + <exclusion> + <artifactId>junit</artifactId> + <groupId>junit</groupId> + </exclusion> + <exclusion> + <artifactId>commons-logging</artifactId> + <groupId>commons-logging</groupId> + </exclusion> + <exclusion> + <artifactId>jboss-logging-spi</artifactId> + <groupId>org.jboss.logging</groupId> + </exclusion> + <exclusion> + <artifactId>jboss-vfs</artifactId> + <groupId>org.jboss</groupId> + </exclusion> + <exclusion> + <artifactId>servlet-api</artifactId> + <groupId>javax.servlet</groupId> + </exclusion> + <exclusion> + <artifactId>activation</artifactId> + <groupId>javax.activation</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>commons-digester</groupId> + <artifactId>commons-digester</artifactId> + <version>1.8.1</version> + <exclusions> + <exclusion> + <artifactId>commons-logging</artifactId> + <groupId>commons-logging</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>commons-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + <version>3.1</version> + <exclusions> + <exclusion> + <artifactId>commons-logging</artifactId> + <groupId>commons-logging</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.gatein.wci</groupId> + <artifactId>wci-wci</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.wci</groupId> + <artifactId>wci-exo</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.wci</groupId> + <artifactId>wci-tomcat6</artifactId> + <exclusions> + <exclusion> + <artifactId>wci-tomcat</artifactId> + <groupId>org.gatein.wci</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.gatein.pc</groupId> + <artifactId>pc-bridge</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.pc</groupId> + <artifactId>pc-federation</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.pc</groupId> + <artifactId>pc-mc</artifactId> + <exclusions> + <exclusion> + <artifactId>junit</artifactId> + <groupId>junit</groupId> + </exclusion> + <exclusion> + <artifactId>jaxb-api</artifactId> + <groupId>sun-jaxb</groupId> + </exclusion> + <exclusion> + <artifactId>jboss-logging-spi</artifactId> + <groupId>org.jboss.logging</groupId> + </exclusion> + <exclusion> + <artifactId>jboss-reflect</artifactId> + <groupId>org.jboss</groupId> + </exclusion> + <exclusion> + <artifactId>jboss-unit</artifactId> + <groupId>org.jboss.unit</groupId> + </exclusion> + <exclusion> + <artifactId>jboss-common-core</artifactId> + <groupId>org.jboss</groupId> + </exclusion> + <exclusion> + <artifactId>xml-apis</artifactId> + <groupId>apache-xerces</groupId> + </exclusion> + <exclusion> + <artifactId>dtdparser121</artifactId> + <groupId>wutka-dtdparser</groupId> + </exclusion> + <exclusion> + <artifactId>xercesImpl</artifactId> + <groupId>apache-xerces</groupId> + </exclusion> + <exclusion> + <artifactId>jbossxb</artifactId> + <groupId>org.jboss</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.gatein.pc</groupId> + <artifactId>pc-portlet</artifactId> + <exclusions> + <exclusion> + <artifactId>jsp-api</artifactId> + <groupId>javax.servlet.jsp</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.gatein.pc</groupId> + <artifactId>pc-api</artifactId> + <exclusions> + <exclusion> + <artifactId>jaxb-api</artifactId> + <groupId>sun-jaxb</groupId> + </exclusion> + <exclusion> + <artifactId>log4j</artifactId> + <groupId>log4j</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.gatein.pc</groupId> + <artifactId>pc-controller</artifactId> + <exclusions> + <exclusion> + <artifactId>xml-apis</artifactId> + <groupId>apache-xerces</groupId> + </exclusion> + <exclusion> + <artifactId>resolver</artifactId> + <groupId>apache-xerces</groupId> + </exclusion> + <exclusion> + <artifactId>xercesImpl</artifactId> + <groupId>apache-xerces</groupId> + </exclusion> + </exclusions> + </dependency> + +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  + <dependency> + <groupId>org.gatein.mop</groupId> + <artifactId>mop-api</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.mop</groupId> + <artifactId>mop-spi</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.mop</groupId> + <artifactId>mop-core</artifactId> + <exclusions> + <exclusion> + <artifactId>slf4j-api</artifactId> + <groupId>org.slf4j</groupId> + </exclusion> + </exclusions> + </dependency> + + +  + <dependency> + <groupId>org.chromattic</groupId> + <artifactId>chromattic.api</artifactId> + </dependency> + <dependency> + <groupId>org.chromattic</groupId> + <artifactId>chromattic.spi</artifactId> + </dependency> + <dependency> + <groupId>org.chromattic</groupId> + <artifactId>chromattic.core</artifactId> + <exclusions> + <exclusion> + <artifactId>slf4j-api</artifactId> + <groupId>org.slf4j</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.chromattic</groupId> + <artifactId>chromattic.ext</artifactId> + </dependency> + +  + <dependency> + <groupId>org.gatein.shindig</groupId> + <artifactId>shindig-gadgets</artifactId> + <exclusions> + <exclusion> + <artifactId>xml-apis</artifactId> + <groupId>xml-apis</groupId> + </exclusion> + <exclusion> + <artifactId>htmlparser</artifactId> + <groupId>nu.validator.htmlparser</groupId> + </exclusion> + <exclusion> + <artifactId>oauth</artifactId> + <groupId>net.oauth.core</groupId> + </exclusion> + <exclusion> + <artifactId>oauth-consumer</artifactId> + <groupId>net.oauth.core</groupId> + </exclusion> + <exclusion> + <artifactId>oauth-httpclient3</artifactId> + <groupId>net.oauth.core</groupId> + </exclusion> + <exclusion> + <artifactId>xercesImpl</artifactId> + <groupId>xerces</groupId> + </exclusion> + <exclusion> + <artifactId>jdom</artifactId> + <groupId>org.jdom</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.gatein.shindig</groupId> + <artifactId>shindig-features</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.shindig</groupId> + <artifactId>shindig-common</artifactId> + <exclusions> + <exclusion> + <artifactId>commons-logging</artifactId> + <groupId>commons-logging</groupId> + </exclusion> + <exclusion> + <artifactId>commons-beanutils-core</artifactId> + <groupId>commons-beanutils</groupId> + </exclusion> + <exclusion> + <artifactId>commons-betwixt</artifactId> + <groupId>commons-betwixt</groupId> + </exclusion> + <exclusion> + <artifactId>commons-collections</artifactId> + <groupId>commons-collections</groupId> + </exclusion> + <exclusion> + <artifactId>ezmorph</artifactId> + <groupId>net.sf.ezmorph</groupId> + </exclusion> + <exclusion> + <artifactId>json-lib</artifactId> + <groupId>net.sf.json-lib</groupId> + </exclusion> + <exclusion> + <artifactId>oauth</artifactId> + <groupId>net.oauth.core</groupId> + </exclusion> + <exclusion> + <artifactId>xpp3_min</artifactId> + <groupId>xpp3</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.gatein.shindig</groupId> + <artifactId>shindig-social-api</artifactId> + <exclusions> + <exclusion> + <artifactId>commons-logging</artifactId> + <groupId>commons-logging</groupId> + </exclusion> + <exclusion> + <artifactId>geronimo-stax-api_1.0_spec</artifactId> + <groupId>org.apache.geronimo.specs</groupId> + </exclusion> + <exclusion> + <artifactId>xml-apis</artifactId> + <groupId>xml-apis</groupId> + </exclusion> + <exclusion> + <artifactId>commons-betwixt</artifactId> + <groupId>commons-betwixt</groupId> + </exclusion> + <exclusion> + <artifactId>commons-collections</artifactId> + <groupId>commons-collections</groupId> + </exclusion> + <exclusion> + <artifactId>ezmorph</artifactId> + <groupId>net.sf.ezmorph</groupId> + </exclusion> + <exclusion> + <artifactId>json-lib</artifactId> + <groupId>net.sf.json-lib</groupId> + </exclusion> + <exclusion> + <artifactId>oauth</artifactId> + <groupId>net.oauth.core</groupId> + </exclusion> + <exclusion> + <artifactId>oauth-consumer</artifactId> + <groupId>net.oauth.core</groupId> + </exclusion> + <exclusion> + <artifactId>oauth-provider</artifactId> + <groupId>net.oauth.core</groupId> + </exclusion> + <exclusion> + <artifactId>oauth-httpclient3</artifactId> + <groupId>net.oauth.core</groupId> + </exclusion> + <exclusion> + <artifactId>xpp3_min</artifactId> + <groupId>xpp3</groupId> + </exclusion> + </exclusions> + </dependency> + +  + <dependency> + <groupId>net.oauth</groupId> + <artifactId>core</artifactId> + <exclusions> + <exclusion> + <artifactId>servlet-api</artifactId> + <groupId>javax.servlet</groupId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>javax.activation</groupId> + <artifactId>activation</artifactId> + <version>1.1.1</version> + </dependency> + +  + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-jbosscache2</artifactId> + <version>3.3.2.GA</version> + <exclusions> + <exclusion> + <artifactId>slf4j-api</artifactId> + <groupId>org.slf4j</groupId> + </exclusion> + <exclusion> + <artifactId>jta</artifactId> + <groupId>javax.transaction</groupId> + </exclusion> + <exclusion> + <artifactId>hibernate-core</artifactId> + <groupId>org.hibernate</groupId> + </exclusion> + </exclusions> + </dependency> +  + <dependency> + <groupId>net.jcip</groupId> + <artifactId>jcip-annotations</artifactId> + <version>${jcip.version}</version> + </dependency> + + <dependency> + <groupId>rhino</groupId> + <artifactId>js</artifactId> + <version>${rhino.version}</version> + </dependency> + +  + <dependency> + <groupId>org.jboss.cache</groupId> + <artifactId>jbosscache-core</artifactId> + <version>3.2.7.GA</version> + <exclusions> + <exclusion> + <artifactId>jboss-transaction-api</artifactId> + <groupId>org.jboss.javaee</groupId> + </exclusion> + <exclusion> + <artifactId>jboss-common-core</artifactId> + <groupId>org.jboss</groupId> + </exclusion> + <exclusion> + <artifactId>commons-logging</artifactId> + <groupId>commons-logging</groupId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <artifactId>slf4j-jdk14</artifactId> + <groupId>org.slf4j</groupId> + <type>jar</type> + <version>1.5.6</version> + <scope>provided</scope> + <exclusions> + <exclusion> + <artifactId>slf4j-api</artifactId> + <groupId>org.slf4j</groupId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <artifactId>asm</artifactId> + <groupId>asm</groupId> + <type>jar</type> + <version>1.5.3</version> + </dependency> + </dependencies> + + <build> + <finalName>gatein</finalName> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-ear-plugin</artifactId> + <configuration> + <displayName>GateIn portal</displayName> + <defaultLibBundleDir>lib</defaultLibBundleDir> + <archive> + <manifest> + <addClasspath>true</addClasspath> + </manifest> + </archive> + + <modules> +  + <webModule> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.web.eXoResources</artifactId> + <contextRoot>eXoResources</contextRoot> + <bundleFileName>01eXoResources.war</bundleFileName> + <unpack>true</unpack> + </webModule> + <webModule> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.web.portal</artifactId> + <contextRoot>portal</contextRoot> + <bundleFileName>02portal.war</bundleFileName> + <unpack>true</unpack> + </webModule> + <webModule> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.portlet.dashboard</artifactId> + <contextRoot>dashboard</contextRoot> + <bundleFileName>dashboard.war</bundleFileName> + </webModule> +  +  +  +  +  +  + <webModule> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.portlet.exoadmin</artifactId> + <contextRoot>exoadmin</contextRoot> + <bundleFileName>exoadmin.war</bundleFileName> + </webModule> + <webModule> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.web.rest</artifactId> + <contextRoot>rest</contextRoot> + <bundleFileName>rest.war</bundleFileName> + </webModule> + <webModule> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.eXoGadgets</artifactId> + <contextRoot>eXoGadgets</contextRoot> + <bundleFileName>eXoGadgets.war</bundleFileName> + </webModule> + <webModule> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.portlet.web</artifactId> + <contextRoot>web</contextRoot> + <bundleFileName>web.war</bundleFileName> + </webModule> + <webModule> + <groupId>org.exoplatform.portal</groupId> + <artifactId>integration</artifactId> + <contextRoot>integration</contextRoot> + <bundleFileName>integration.war</bundleFileName> + <unpack>true</unpack> + </webModule> +  +  +  +  +  +  + <webModule> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.gadgets-server</artifactId> + <contextRoot>eXoGadgetServer</contextRoot> + <bundleFileName>eXoGadgetServer.war</bundleFileName> + </webModule> + </modules> + </configuration> + </plugin> + </plugins> + </build> +  + <repositories> + <repository> + <id>mead</id> + <url>http://download.devel.redhat.com/brewroot/repos/jboss-epp-5-build/latest/...</url> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>false</enabled> + </snapshots> + </repository> + <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> + </repository> + <repository> + <id>oauth</id> + <url>http://oauth.googlecode.com/svn/code/maven</url> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>false</enabled> + </snapshots> + </repository> + <repository> + <id>java.net</id> + <url>http://download.java.net/maven/2</url> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>false</enabled> + </snapshots> + </repository> + <repository> + <id>exo-int</id> + <url>http://repository.exoplatform.org/content/groups/public</url> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>false</enabled> + </snapshots> + </repository> + </repositories> +</project> \ No newline at end of file Modified: epp/portal/tags/EPP_5_2_0_Dev02/distribution/jboss-epp/serverAddon/integration.war/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/integration.war/pom.xml 2011-08-09 23:32:42 UTC (rev 7035) +++ epp/portal/tags/EPP_5_2_0_Dev02/distribution/jboss-epp/serverAddon/integration.war/pom.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -4,7 +4,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>distribution.parent</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV02</version> <relativePath>../../../pom.xml</relativePath> </parent> <artifactId>integration</artifactId> Deleted: epp/portal/tags/EPP_5_2_0_Dev02/distribution/jboss-epp/serverAddon/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/pom.xml 2011-08-09 23:32:42 UTC (rev 7035) +++ epp/portal/tags/EPP_5_2_0_Dev02/distribution/jboss-epp/serverAddon/pom.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -1,65 +0,0 @@ - -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.exoplatform.portal</groupId> - <artifactId>distribution.parent</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> - <relativePath>../../pom.xml</relativePath> - </parent> - - <groupId>org.exoplatform.portal.distribution.deploy</groupId> - <artifactId>serverAddon</artifactId> - <packaging>pom</packaging> - <name>Deploy serverAddon</name> - - <modules> - <module>integration.war</module> - <module>gatein.ear</module> - </modules> - - <dependencies> - - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>starter-gatein</artifactId> - <version>${project.version}</version> - <type>ear</type> - </dependency> - <dependency> - <?move gatein-wsrp-integration.ear?> - <groupId>org.gatein.integration</groupId> - <artifactId>extension-ear</artifactId> - <type>ear</type> - <version>${project.version}</version> - </dependency> - - </dependencies> - - <build> - <plugins> - - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <id>bin</id> - <phase>compile</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <appendAssemblyId>false</appendAssemblyId> - <descriptors> - <descriptor>src/assemble.xml</descriptor> - </descriptors> - </configuration> - </execution> - </executions> - </plugin> - - </plugins> - </build> - -</project> Copied: epp/portal/tags/EPP_5_2_0_Dev02/distribution/jboss-epp/serverAddon/pom.xml (from rev 7064, epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/pom.xml) =================================================================== --- epp/portal/tags/EPP_5_2_0_Dev02/distribution/jboss-epp/serverAddon/pom.xml (rev 0) +++ epp/portal/tags/EPP_5_2_0_Dev02/distribution/jboss-epp/serverAddon/pom.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -0,0 +1,66 @@ + +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.exoplatform.portal</groupId> + <artifactId>distribution.parent</artifactId> + <version>5.2.0-epp-DEV02</version> + <relativePath>../../pom.xml</relativePath> + </parent> + + <groupId>org.exoplatform.portal.distribution.deploy</groupId> + <artifactId>serverAddon</artifactId> + <packaging>pom</packaging> + <name>Deploy serverAddon</name> + + <modules> + <module>integration.war</module> + <module>gatein.ear</module> + </modules> + + <dependencies> + + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>starter-gatein</artifactId> + <version>${project.version}</version> + <type>ear</type> + </dependency> +  + <dependency> + <?move gatein-wsrp-integration.ear?> + <groupId>org.gatein.integration</groupId> + <artifactId>extension-ear-as5</artifactId> + <type>ear</type> + <version>${project.version}</version> + </dependency> + + </dependencies> + + <build> + <plugins> + + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>bin</id> + <phase>compile</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <appendAssemblyId>false</appendAssemblyId> + <descriptors> + <descriptor>src/assemble.xml</descriptor> + </descriptors> + </configuration> + </execution> + </executions> + </plugin> + + </plugins> + </build> + +</project> Deleted: epp/portal/tags/EPP_5_2_0_Dev02/distribution/jboss-epp/src/assemble.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/assemble.xml 2011-08-09 23:32:42 UTC (rev 7035) +++ epp/portal/tags/EPP_5_2_0_Dev02/distribution/jboss-epp/src/assemble.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -1,101 +0,0 @@ - -<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd"> - <id>bin</id> - <formats> - <format>dir</format> - </formats> - <includeBaseDirectory>false</includeBaseDirectory> - - <dependencySets> - - - <dependencySet> - <includes> - <include>*.distribution.deploy:*:zip</include> - </includes> - <excludes> - <exclude>*:hibernate-core:3.3.2.GA:jar</exclude> - <exclude>*:jaxb-api:2.1:jar</exclude> - <exclude>*:stax-api:1.0:jar</exclude> - </excludes> - <outputDirectory>${eap.dir}/jboss-as/server/default</outputDirectory> - <unpack>true</unpack> - </dependencySet> - - <dependencySet> - <includes> - <include>*.distribution.deploy:*:zip</include> - </includes> - <excludes> - <exclude>*:hibernate-core:3.3.2.GA:jar</exclude> - <exclude>*:jaxb-api:2.1:jar</exclude> - <exclude>*:stax-api:1.0:jar</exclude> - -  - <exclude>*:hibernate-jbosscache2:3.3.2.GA:jar</exclude> - <exclude>*:jbosscache-core:3.2.6.GA:jar</exclude> - <exclude>*:jgroups:2.6.13.GA:jar</exclude> - </excludes> - <outputDirectory>${eap.dir}/jboss-as/server/all</outputDirectory> - <unpack>true</unpack> - </dependencySet> - - <dependencySet> - <includes> - <include>*.distribution.deploy:*:zip</include> - </includes> - <excludes> - <exclude>*:hibernate-core:3.3.2.GA:jar</exclude> - <exclude>*:jaxb-api:2.1:jar</exclude> - <exclude>*:stax-api:1.0:jar</exclude> - -  - <exclude>*:hibernate-jbosscache2:3.3.2.GA:jar</exclude> - <exclude>*:jbosscache-core:3.2.6.GA:jar</exclude> - <exclude>*:jgroups:2.6.13.GA:jar</exclude> - </excludes> - <outputDirectory>${eap.dir}/jboss-as/server/production</outputDirectory> - <unpack>true</unpack> - </dependencySet> - - -  - <dependencySet> - <includes> - <include>*.distribution.root:*:zip</include> - </includes> - <outputDirectory>${eap.dir}/${artifact.artifactId}</outputDirectory> - <unpack>true</unpack> - </dependencySet> - -  - <dependencySet> - <includes> - <include>org.gatein.sso:*:zip</include> - </includes> - <outputDirectory>${eap.dir}</outputDirectory> - <unpack>true</unpack> - </dependencySet> - -  - <dependencySet> - <includes> - <include>*.distribution:examples:zip</include> - </includes> - <outputDirectory>${eap.dir}/jboss-as/docs/examples/portal</outputDirectory> - <unpack>true</unpack> - </dependencySet> - -  - <dependencySet> - <includes> - <include>${eap.groupId}:jboss-eap:zip</include> - </includes> - <outputDirectory></outputDirectory> - <unpack>true</unpack> - </dependencySet> - - </dependencySets> -</assembly> \ No newline at end of file Copied: epp/portal/tags/EPP_5_2_0_Dev02/distribution/jboss-epp/src/assemble.xml (from rev 7039, epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/assemble.xml) =================================================================== --- epp/portal/tags/EPP_5_2_0_Dev02/distribution/jboss-epp/src/assemble.xml (rev 0) +++ epp/portal/tags/EPP_5_2_0_Dev02/distribution/jboss-epp/src/assemble.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -0,0 +1,107 @@ + +<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd"> + <id>bin</id> + <formats> + <format>dir</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + + <dependencySets> + + + <dependencySet> + <includes> + <include>*.distribution.deploy:*:zip</include> + </includes> + <outputDirectory>${eap.dir}/jboss-as/server/default</outputDirectory> + <unpack>true</unpack> + <unpackOptions> + <excludes> + <exclude>**/hibernate-core*</exclude> + <exclude>**/jaxb-api*</exclude> + <exclude>**/stax-api*</exclude> + </excludes> + </unpackOptions> + </dependencySet> + + <dependencySet> + <includes> + <include>*.distribution.deploy:*:zip</include> + </includes> + <outputDirectory>${eap.dir}/jboss-as/server/all</outputDirectory> + <unpack>true</unpack> + <unpackOptions> + <excludes> + <exclude>**/hibernate-core*</exclude> + <exclude>**/jaxb-api*</exclude> + <exclude>**/stax-api*</exclude> + +  + <exclude>**/hibernate-jbosscache2*</exclude> + <exclude>**/jbosscache-core*</exclude> + <exclude>**/jgroups*</exclude> + </excludes> + </unpackOptions> + </dependencySet> + + <dependencySet> + <includes> + <include>*.distribution.deploy:*:zip</include> + </includes> + <outputDirectory>${eap.dir}/jboss-as/server/production</outputDirectory> + <unpack>true</unpack> + <unpackOptions> + <excludes> + <exclude>**/hibernate-core*</exclude> + <exclude>**/jaxb-api*</exclude> + <exclude>**/stax-api*</exclude> + +  + <exclude>**/hibernate-jbosscache2*</exclude> + <exclude>**/jbosscache-core*</exclude> + <exclude>**/jgroups*</exclude> + </excludes> + </unpackOptions> + </dependencySet> + + +  + <dependencySet> + <includes> + <include>*.distribution.root:*:zip</include> + </includes> + <outputDirectory>${eap.dir}/${artifact.artifactId}</outputDirectory> + <unpack>true</unpack> + </dependencySet> + +  + <dependencySet> + <includes> + <include>org.gatein.sso:*:zip</include> + </includes> + <outputDirectory>${eap.dir}</outputDirectory> + <unpack>true</unpack> + </dependencySet> + +  + <dependencySet> + <includes> + <include>*.distribution:examples:zip</include> + </includes> + <outputDirectory>${eap.dir}/jboss-as/docs/examples/portal</outputDirectory> + <unpack>true</unpack> + </dependencySet> + +  + <dependencySet> + <includes> + <include>${eap.groupId}:jboss-eap:zip</include> + </includes> + <outputDirectory></outputDirectory> + <unpack>true</unpack> + </dependencySet> + + </dependencySets> +</assembly> \ No newline at end of file Modified: epp/portal/tags/EPP_5_2_0_Dev02/distribution/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/pom.xml 2011-08-09 23:32:42 UTC (rev 7035) +++ epp/portal/tags/EPP_5_2_0_Dev02/distribution/pom.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -7,7 +7,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV02</version> </parent> <artifactId>distribution.parent</artifactId> Modified: epp/portal/tags/EPP_5_2_0_Dev02/examples/extension/config/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/extension/config/pom.xml 2011-08-09 23:32:42 UTC (rev 7035) +++ epp/portal/tags/EPP_5_2_0_Dev02/examples/extension/config/pom.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV02</version> <relativePath>../../../pom.xml</relativePath> </parent> Modified: epp/portal/tags/EPP_5_2_0_Dev02/examples/extension/ear/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/extension/ear/pom.xml 2011-08-09 23:32:42 UTC (rev 7035) +++ epp/portal/tags/EPP_5_2_0_Dev02/examples/extension/ear/pom.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV02</version> <relativePath>../../../pom.xml</relativePath> </parent> @@ -38,23 +38,23 @@ <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.sample.extension.config</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV02</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.sample.extension.jar</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV02</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web.api</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV02</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.sample.extension.war</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV02</version> <type>war</type> </dependency> </dependencies> Modified: epp/portal/tags/EPP_5_2_0_Dev02/examples/extension/jar/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/extension/jar/pom.xml 2011-08-09 23:32:42 UTC (rev 7035) +++ epp/portal/tags/EPP_5_2_0_Dev02/examples/extension/jar/pom.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV02</version> <relativePath>../../../pom.xml</relativePath> </parent> Modified: epp/portal/tags/EPP_5_2_0_Dev02/examples/extension/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/extension/pom.xml 2011-08-09 23:32:42 UTC (rev 7035) +++ epp/portal/tags/EPP_5_2_0_Dev02/examples/extension/pom.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -24,7 +24,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV02</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: epp/portal/tags/EPP_5_2_0_Dev02/examples/extension/war/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/extension/war/pom.xml 2011-08-09 23:32:42 UTC (rev 7035) +++ epp/portal/tags/EPP_5_2_0_Dev02/examples/extension/war/pom.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV02</version> <relativePath>../../../pom.xml</relativePath> </parent> Modified: epp/portal/tags/EPP_5_2_0_Dev02/examples/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/pom.xml 2011-08-09 23:32:42 UTC (rev 7035) +++ epp/portal/tags/EPP_5_2_0_Dev02/examples/pom.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -26,7 +26,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV02</version> </parent> <artifactId>exo.portal.sample</artifactId> Modified: epp/portal/tags/EPP_5_2_0_Dev02/examples/portal/config/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/portal/config/pom.xml 2011-08-09 23:32:42 UTC (rev 7035) +++ epp/portal/tags/EPP_5_2_0_Dev02/examples/portal/config/pom.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV02</version> <relativePath>../../../pom.xml</relativePath> </parent> Modified: epp/portal/tags/EPP_5_2_0_Dev02/examples/portal/ear/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/portal/ear/pom.xml 2011-08-09 23:32:42 UTC (rev 7035) +++ epp/portal/tags/EPP_5_2_0_Dev02/examples/portal/ear/pom.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV02</version> <relativePath>../../../pom.xml</relativePath> </parent> @@ -38,29 +38,29 @@ <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.sample.portal.config</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV02</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.sample.portal.jar</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV02</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web.api</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV02</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.sample.portal.war</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV02</version> <type>war</type> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.sample.portal.rest-war</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV02</version> <type>war</type> </dependency> </dependencies> Modified: epp/portal/tags/EPP_5_2_0_Dev02/examples/portal/jar/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/portal/jar/pom.xml 2011-08-09 23:32:42 UTC (rev 7035) +++ epp/portal/tags/EPP_5_2_0_Dev02/examples/portal/jar/pom.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV02</version> <relativePath>../../../pom.xml</relativePath> </parent> Modified: epp/portal/tags/EPP_5_2_0_Dev02/examples/portal/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/portal/pom.xml 2011-08-09 23:32:42 UTC (rev 7035) +++ epp/portal/tags/EPP_5_2_0_Dev02/examples/portal/pom.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -24,7 +24,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV02</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: epp/portal/tags/EPP_5_2_0_Dev02/examples/portal/rest-war/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/portal/rest-war/pom.xml 2011-08-09 23:32:42 UTC (rev 7035) +++ epp/portal/tags/EPP_5_2_0_Dev02/examples/portal/rest-war/pom.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV02</version> <relativePath>../../../pom.xml</relativePath> </parent> Modified: epp/portal/tags/EPP_5_2_0_Dev02/examples/portal/war/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/portal/war/pom.xml 2011-08-09 23:32:42 UTC (rev 7035) +++ epp/portal/tags/EPP_5_2_0_Dev02/examples/portal/war/pom.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV02</version> <relativePath>../../../pom.xml</relativePath> </parent> Modified: epp/portal/tags/EPP_5_2_0_Dev02/examples/portlets/api/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/portlets/api/pom.xml 2011-08-09 23:32:42 UTC (rev 7035) +++ epp/portal/tags/EPP_5_2_0_Dev02/examples/portlets/api/pom.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -9,7 +9,7 @@ <parent> <groupId>org.gatein.portal.examples.portlets</groupId> <artifactId>portlets-parent</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV02</version> </parent> <artifactId>gatein-api</artifactId> Modified: epp/portal/tags/EPP_5_2_0_Dev02/examples/portlets/jsfhellouser/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/portlets/jsfhellouser/pom.xml 2011-08-09 23:32:42 UTC (rev 7035) +++ epp/portal/tags/EPP_5_2_0_Dev02/examples/portlets/jsfhellouser/pom.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -9,7 +9,7 @@ <parent> <groupId>org.gatein.portal.examples.portlets</groupId> <artifactId>portlets-parent</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV02</version> </parent> <artifactId>gatein-jsf-hellouser</artifactId> Modified: epp/portal/tags/EPP_5_2_0_Dev02/examples/portlets/jsphellouser/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/portlets/jsphellouser/pom.xml 2011-08-09 23:32:42 UTC (rev 7035) +++ epp/portal/tags/EPP_5_2_0_Dev02/examples/portlets/jsphellouser/pom.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -9,7 +9,7 @@ <parent> <groupId>org.gatein.portal.examples.portlets</groupId> <artifactId>portlets-parent</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV02</version> </parent> <artifactId>gatein-jsp-hellouser</artifactId> Modified: epp/portal/tags/EPP_5_2_0_Dev02/examples/portlets/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/portlets/pom.xml 2011-08-09 23:32:42 UTC (rev 7035) +++ epp/portal/tags/EPP_5_2_0_Dev02/examples/portlets/pom.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -5,7 +5,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV02</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: epp/portal/tags/EPP_5_2_0_Dev02/examples/portlets/simplesthelloworld/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/portlets/simplesthelloworld/pom.xml 2011-08-09 23:32:42 UTC (rev 7035) +++ epp/portal/tags/EPP_5_2_0_Dev02/examples/portlets/simplesthelloworld/pom.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -9,7 +9,7 @@ <parent> <groupId>org.gatein.portal.examples.portlets</groupId> <artifactId>portlets-parent</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV02</version> </parent> <artifactId>gatein-simplest-helloworld</artifactId> Modified: epp/portal/tags/EPP_5_2_0_Dev02/examples/portlets/struts-jpetstore/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/portlets/struts-jpetstore/pom.xml 2011-08-09 23:32:42 UTC (rev 7035) +++ epp/portal/tags/EPP_5_2_0_Dev02/examples/portlets/struts-jpetstore/pom.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -5,7 +5,7 @@ <parent> <groupId>org.gatein.portal.examples.portlets</groupId> <artifactId>portlets-parent</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV02</version> </parent> <artifactId>struts-jpetstore</artifactId> Modified: epp/portal/tags/EPP_5_2_0_Dev02/examples/skins/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/skins/pom.xml 2011-08-09 23:32:42 UTC (rev 7035) +++ epp/portal/tags/EPP_5_2_0_Dev02/examples/skins/pom.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -5,7 +5,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV02</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: epp/portal/tags/EPP_5_2_0_Dev02/examples/skins/simpleskin/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/pom.xml 2011-08-09 23:32:42 UTC (rev 7035) +++ epp/portal/tags/EPP_5_2_0_Dev02/examples/skins/simpleskin/pom.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -25,7 +25,7 @@ <parent> <groupId>org.gatein.portal.examples.skins</groupId> <artifactId>skins-parent</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV02</version> </parent> <artifactId>gatein-sample-skin</artifactId> Modified: epp/portal/tags/EPP_5_2_0_Dev02/gadgets/core/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/gadgets/core/pom.xml 2011-08-09 23:32:42 UTC (rev 7035) +++ epp/portal/tags/EPP_5_2_0_Dev02/gadgets/core/pom.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -14,7 +14,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.gadgets</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV02</version> </parent> <artifactId>exo.portal.gadgets-core</artifactId> Modified: epp/portal/tags/EPP_5_2_0_Dev02/gadgets/eXoGadgets/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/pom.xml 2011-08-09 23:32:42 UTC (rev 7035) +++ epp/portal/tags/EPP_5_2_0_Dev02/gadgets/eXoGadgets/pom.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.gadgets</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV02</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/tags/EPP_5_2_0_Dev02/gadgets/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/gadgets/pom.xml 2011-08-09 23:32:42 UTC (rev 7035) +++ epp/portal/tags/EPP_5_2_0_Dev02/gadgets/pom.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -24,7 +24,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV02</version> </parent> <artifactId>exo.portal.gadgets</artifactId> Modified: epp/portal/tags/EPP_5_2_0_Dev02/gadgets/server/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/gadgets/server/pom.xml 2011-08-09 23:32:42 UTC (rev 7035) +++ epp/portal/tags/EPP_5_2_0_Dev02/gadgets/server/pom.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -25,7 +25,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.gadgets</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV02</version> </parent> <artifactId>exo.portal.gadgets-server</artifactId> Modified: epp/portal/tags/EPP_5_2_0_Dev02/packaging/jboss-as/ear/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/packaging/jboss-as/ear/pom.xml 2011-08-09 23:32:42 UTC (rev 7035) +++ epp/portal/tags/EPP_5_2_0_Dev02/packaging/jboss-as/ear/pom.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -4,7 +4,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV02</version> </parent> <artifactId>exo.portal.packaging.jboss-as.ear</artifactId> <packaging>ear</packaging> Modified: epp/portal/tags/EPP_5_2_0_Dev02/packaging/jboss-as/integration.war/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/packaging/jboss-as/integration.war/pom.xml 2011-08-09 23:32:42 UTC (rev 7035) +++ epp/portal/tags/EPP_5_2_0_Dev02/packaging/jboss-as/integration.war/pom.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -4,7 +4,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV02</version> </parent> <artifactId>exo.portal.packaging.jboss-as.integration</artifactId> <packaging>war</packaging> Modified: epp/portal/tags/EPP_5_2_0_Dev02/packaging/jboss-as/pkg/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/packaging/jboss-as/pkg/pom.xml 2011-08-09 23:32:42 UTC (rev 7035) +++ epp/portal/tags/EPP_5_2_0_Dev02/packaging/jboss-as/pkg/pom.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -6,7 +6,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV02</version> </parent> <artifactId>exo.portal.packaging.jboss-as.pkg</artifactId> <packaging>pom</packaging> Modified: epp/portal/tags/EPP_5_2_0_Dev02/packaging/jboss-as/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/packaging/jboss-as/pom.xml 2011-08-09 23:32:42 UTC (rev 7035) +++ epp/portal/tags/EPP_5_2_0_Dev02/packaging/jboss-as/pom.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -5,7 +5,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV02</version> </parent> <artifactId>exo.portal.packaging.jboss-as</artifactId> <packaging>pom</packaging> Modified: epp/portal/tags/EPP_5_2_0_Dev02/packaging/jetty/pkg/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/pom.xml 2011-08-09 23:32:42 UTC (rev 7035) +++ epp/portal/tags/EPP_5_2_0_Dev02/packaging/jetty/pkg/pom.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -8,7 +8,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV02</version> </parent> <artifactId>exo.portal.packaging.jetty.pkg</artifactId> <packaging>pom</packaging> Modified: epp/portal/tags/EPP_5_2_0_Dev02/packaging/jetty/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pom.xml 2011-08-09 23:32:42 UTC (rev 7035) +++ epp/portal/tags/EPP_5_2_0_Dev02/packaging/jetty/pom.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -5,7 +5,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV02</version> </parent> <artifactId>exo.portal.packaging.jetty</artifactId> <packaging>pom</packaging> Modified: epp/portal/tags/EPP_5_2_0_Dev02/packaging/module/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/packaging/module/pom.xml 2011-08-09 23:32:42 UTC (rev 7035) +++ epp/portal/tags/EPP_5_2_0_Dev02/packaging/module/pom.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.packaging</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV02</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/tags/EPP_5_2_0_Dev02/packaging/pkg/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/packaging/pkg/pom.xml 2011-08-09 23:32:42 UTC (rev 7035) +++ epp/portal/tags/EPP_5_2_0_Dev02/packaging/pkg/pom.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.packaging</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV02</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -67,13 +67,13 @@ <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>portal.packaging.module</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV02</version> <type>js</type> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>portal.packaging.product</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV02</version> <type>js</type> </dependency> </dependencies> Modified: epp/portal/tags/EPP_5_2_0_Dev02/packaging/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/packaging/pom.xml 2011-08-09 23:32:42 UTC (rev 7035) +++ epp/portal/tags/EPP_5_2_0_Dev02/packaging/pom.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV02</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/tags/EPP_5_2_0_Dev02/packaging/product/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/packaging/product/pom.xml 2011-08-09 23:32:42 UTC (rev 7035) +++ epp/portal/tags/EPP_5_2_0_Dev02/packaging/product/pom.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.packaging</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV02</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/tags/EPP_5_2_0_Dev02/packaging/reports/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/packaging/reports/pom.xml 2011-08-09 23:32:42 UTC (rev 7035) +++ epp/portal/tags/EPP_5_2_0_Dev02/packaging/reports/pom.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.packaging</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV02</version> </parent> <modelVersion>4.0.0</modelVersion> Deleted: epp/portal/tags/EPP_5_2_0_Dev02/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/pom.xml 2011-08-09 23:32:42 UTC (rev 7035) +++ epp/portal/tags/EPP_5_2_0_Dev02/pom.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -1,1236 +0,0 @@ - - -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.gatein</groupId> - <artifactId>gatein-parent</artifactId> - <version>1.0.2-GA</version> - </parent> - - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> - <packaging>pom</packaging> - - <name>EPP GateIn - Portal - ${project.version}</name> - - <properties> - <org.exoplatform.kernel.version>2.3.0-CR2</org.exoplatform.kernel.version> - <org.exoplatform.core.version>2.4.0-CR2</org.exoplatform.core.version> - <org.exoplatform.ws.version>2.2.0-CR2</org.exoplatform.ws.version> - <org.exoplatform.jcr.version>1.14.0-CR2</org.exoplatform.jcr.version> - <org.jibx.version>1.2.1</org.jibx.version> - <org.shindig.version>1.0-r790473-Patch06</org.shindig.version> - <nl.captcha.simplecaptcha.version>1.1.1-GA-Patch01</nl.captcha.simplecaptcha.version> - <org.gatein.common.version>2.0.4-Beta03</org.gatein.common.version> - <org.gatein.wci.version>2.1.0-Beta04</org.gatein.wci.version> - <org.gatein.pc.version>2.3.0-Beta04</org.gatein.pc.version> - <org.picketlink.idm>1.3.0.Alpha03</org.picketlink.idm> - <org.gatein.wsrp.version>2.1.0-Beta04</org.gatein.wsrp.version> - <org.gatein.mop.version>1.1.0-Beta05</org.gatein.mop.version> - <org.slf4j.version>1.5.8</org.slf4j.version> - <commons-pool.version>1.5.5</commons-pool.version> - <rhino.version>1.6R5</rhino.version> - <org.codehaus.groovy.version>1.7.6</org.codehaus.groovy.version> - <javax.servlet.version>2.5</javax.servlet.version> - <version.chromattic>1.1.0-beta6</version.chromattic> - <version.reflect>1.1.0-beta12</version.reflect> - <jcip.version>1.0</jcip.version> - -  -  -  - -  - <jdk.min.version>1.6</jdk.min.version> - </properties> - - <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/epp/portal/branches/EPP_5_2...</connection> - <developerConnection>scm:svn:http://svn.jboss.org/repos/gatein/epp/portal/branches/EPP_5_2_Branch</developerConnection> - <url>http://fisheye.jboss.org/browse/gatein/epp/portal/branches/EPP_5_2_Branch</url> - </scm> - - <modules> - <module>component</module> - <module>gadgets</module> - <module>webui</module> - <module>portlet</module> - <module>web</module> - <module>server</module> - <module>wsrp-integration</module> - <module>examples</module> - <module>starter</module> - <module>packaging</module> - <module>testsuite</module> - <module>distribution</module> - </modules> - - <dependencyManagement> - <dependencies> - -  - <dependency> - <groupId>org.gatein</groupId> - <artifactId>gatein-dep</artifactId> - <version>1.1.0-Beta04</version> - <type>pom</type> - <scope>import</scope> - </dependency> - -  - <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.commons</artifactId> - <version>${org.exoplatform.kernel.version}</version> - <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.component.cache</artifactId> - <version>${org.exoplatform.kernel.version}</version> - </dependency> - <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.component.command</artifactId> - <version>${org.exoplatform.kernel.version}</version> - </dependency> - <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.component.common</artifactId> - <version>${org.exoplatform.kernel.version}</version> - <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.component.remote</artifactId> - <version>${org.exoplatform.kernel.version}</version> - </dependency> - <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.container</artifactId> - <version>${org.exoplatform.kernel.version}</version> - <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.component.ext.cache.impl.jboss.v3</artifactId> - <version>${org.exoplatform.kernel.version}</version> - </dependency> - <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.mc-int</artifactId> - <version>${org.exoplatform.kernel.version}</version> - </dependency> - <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.mc-kernel-extras</artifactId> - <version>${org.exoplatform.kernel.version}</version> - </dependency> - <dependency> - <groupId>org.exoplatform.core</groupId> - <artifactId>exo.core.component.organization.api</artifactId> - <version>${org.exoplatform.core.version}</version> - </dependency> - <dependency> - <groupId>org.exoplatform.core</groupId> - <artifactId>exo.core.component.database</artifactId> - <version>${org.exoplatform.core.version}</version> - <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.ldap</artifactId> - <version>${org.exoplatform.core.version}</version> - </dependency> - <dependency> - <groupId>org.exoplatform.core</groupId> - <artifactId>exo.core.component.organization.jdbc</artifactId> - <version>${org.exoplatform.core.version}</version> - <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.ldap</artifactId> - <version>${org.exoplatform.core.version}</version> - </dependency> - <dependency> - <groupId>org.exoplatform.core</groupId> - <artifactId>exo.core.component.security.core</artifactId> - <version>${org.exoplatform.core.version}</version> - </dependency> - <dependency> - <groupId>org.exoplatform.core</groupId> - <artifactId>exo.core.component.document</artifactId> - <version>${org.exoplatform.core.version}</version> - </dependency> - <dependency> - <groupId>org.exoplatform.jcr</groupId> - <artifactId>exo.jcr.component.core</artifactId> - <version>${org.exoplatform.jcr.version}</version> - </dependency> - <dependency> - <groupId>org.exoplatform.jcr</groupId> - <artifactId>exo.jcr.framework.command</artifactId> - <version>${org.exoplatform.jcr.version}</version> - </dependency> - <dependency> - <groupId>org.exoplatform.jcr</groupId> - <artifactId>exo.jcr.component.ext</artifactId> - <version>${org.exoplatform.jcr.version}</version> - <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.webdav</artifactId> - <version>${org.exoplatform.jcr.version}</version> - </dependency> - <dependency> - <groupId>org.exoplatform.jcr</groupId> - <artifactId>exo.jcr.framework.web</artifactId> - <version>${org.exoplatform.jcr.version}</version> - </dependency> - <dependency> - <groupId>org.exoplatform.jcr</groupId> - <artifactId>exo.jcr.component.ftp</artifactId> - <version>${org.exoplatform.jcr.version}</version> - </dependency> - <dependency> - <groupId>org.exoplatform.ws</groupId> - <artifactId>exo.ws.commons</artifactId> - <version>${org.exoplatform.ws.version}</version> - </dependency> - <dependency> - <groupId>org.exoplatform.ws</groupId> - <artifactId>exo.ws.frameworks.servlet</artifactId> - <version>${org.exoplatform.ws.version}</version> - </dependency> - <dependency> - <groupId>org.exoplatform.ws</groupId> - <artifactId>exo.ws.rest.ext</artifactId> - <version>${org.exoplatform.ws.version}</version> - </dependency> - <dependency> - <groupId>org.exoplatform.ws</groupId> - <artifactId>exo.ws.rest.core</artifactId> - <version>${org.exoplatform.ws.version}</version> - </dependency> - <dependency> - <groupId>org.exoplatform.ws</groupId> - <artifactId>exo.ws.frameworks.json</artifactId> - <version>${org.exoplatform.ws.version}</version> - </dependency> - -  - <dependency> - <groupId>org.gatein.common</groupId> - <artifactId>common-logging</artifactId> - <version>${org.gatein.common.version}</version> - </dependency> - <dependency> - <groupId>org.gatein.common</groupId> - <artifactId>common-common</artifactId> - <version>${org.gatein.common.version}</version> - </dependency> - <dependency> - <groupId>org.gatein.wci</groupId> - <artifactId>wci-wci</artifactId> - <version>${org.gatein.wci.version}</version> - </dependency> - <dependency> - <groupId>org.gatein.wci</groupId> - <artifactId>wci-exo</artifactId> - <version>${org.gatein.wci.version}</version> - </dependency> - <dependency> - <groupId>org.gatein.wci</groupId> - <artifactId>wci-tomcat6</artifactId> - <version>${org.gatein.wci.version}</version> - </dependency> - <dependency> - <groupId>org.gatein.wci</groupId> - <artifactId>wci-tomcat7</artifactId> - <version>${org.gatein.wci.version}</version> - </dependency> - <dependency> - <groupId>org.gatein.wci</groupId> - <artifactId>wci-jetty</artifactId> - <version>${org.gatein.wci.version}</version> - </dependency> - <dependency> - <groupId>org.gatein.pc</groupId> - <artifactId>pc-bridge</artifactId> - <version>${org.gatein.pc.version}</version> - </dependency> - <dependency> - <groupId>org.gatein.pc</groupId> - <artifactId>pc-federation</artifactId> - <version>${org.gatein.pc.version}</version> - </dependency> - <dependency> - <groupId>org.gatein.pc</groupId> - <artifactId>pc-mc</artifactId> - <version>${org.gatein.pc.version}</version> - </dependency> - <dependency> - <groupId>org.gatein.pc</groupId> - <artifactId>pc-portlet</artifactId> - <version>${org.gatein.pc.version}</version> - </dependency> - <dependency> - <groupId>org.gatein.pc</groupId> - <artifactId>pc-api</artifactId> - <version>${org.gatein.pc.version}</version> - </dependency> - <dependency> - <groupId>org.gatein.pc</groupId> - <artifactId>pc-controller</artifactId> - <version>${org.gatein.pc.version}</version> - </dependency> - <dependency> - <groupId>org.gatein.mop</groupId> - <artifactId>mop-api</artifactId> - <version>${org.gatein.mop.version}</version> - </dependency> - <dependency> - <groupId>org.gatein.mop</groupId> - <artifactId>mop-spi</artifactId> - <version>${org.gatein.mop.version}</version> - </dependency> - <dependency> - <groupId>org.gatein.mop</groupId> - <artifactId>mop-core</artifactId> - <version>${org.gatein.mop.version}</version> - </dependency> -  - <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> - <exclusions> - <exclusion> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-core</artifactId> - </exclusion> - </exclusions> - </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</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> - -  - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.common</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.web</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.web.controller</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.web.security</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.web.server</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.web.api</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.web.resources</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.portal</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.portal</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> - <type>test-jar</type> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.pc</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.identity</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.resources</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.application-registry</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.xml-parser</artifactId> - <version>5.1.0-epp-ER01-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.scripting</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.management</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.webui.framework</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.webui.portlet</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.webui.portal</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.webui.eXo</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.webui.core</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.webui.dashboard</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.gadgets-core</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.test.core</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.test.core</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> - <type>test-jar</type> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.test.jcr</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.test.jcr</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> - <type>test-jar</type> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.test.organization</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.test.organization</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> - <type>test-jar</type> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>gatein.portal.component.wsrp</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.server.jboss.plugin</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.server.tomcat.plugin</artifactId> - <version>5.1.0-epp-ER01-SNAPSHOT</version> - </dependency> - -  - <dependency> - <groupId>org.chromattic</groupId> - <artifactId>chromattic.apt</artifactId> - <version>${version.chromattic}</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.chromattic</groupId> - <artifactId>chromattic.api</artifactId> - <version>${version.chromattic}</version> - </dependency> - <dependency> - <groupId>org.chromattic</groupId> - <artifactId>chromattic.spi</artifactId> - <version>${version.chromattic}</version> - </dependency> - <dependency> - <groupId>org.chromattic</groupId> - <artifactId>chromattic.core</artifactId> - <version>${version.chromattic}</version> - </dependency> - <dependency> - <groupId>org.chromattic</groupId> - <artifactId>chromattic.ext</artifactId> - <version>${version.chromattic}</version> - </dependency> - -  - <dependency> - <groupId>org.picketlink.idm</groupId> - <artifactId>picketlink-idm-core</artifactId> - <version>${org.picketlink.idm}</version> - </dependency> - <dependency> - <groupId>org.picketlink.idm</groupId> - <artifactId>picketlink-idm-hibernate</artifactId> - <version>${org.picketlink.idm}</version> - <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.picketlink.idm</groupId> - <artifactId>picketlink-idm-ldap</artifactId> - <version>${org.picketlink.idm}</version> - </dependency> - <dependency> - <groupId>org.picketlink.idm</groupId> - <artifactId>picketlink-idm-cache</artifactId> - <version>${org.picketlink.idm}</version> - </dependency> - - <dependency> - <groupId>javax.portlet</groupId> - <artifactId>portlet-api</artifactId> - <version>2.0</version> - </dependency> - <dependency> - <groupId>org.jboss.jbossas</groupId> - <artifactId>jboss-as-tomcat</artifactId> - <version>5.1.0.GA</version> - </dependency> - - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <version>${org.slf4j.version}</version> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-jdk14</artifactId> - <version>${org.slf4j.version}</version> - </dependency> - <dependency> - <groupId>commons-beanutils</groupId> - <artifactId>commons-beanutils</artifactId> - <version>1.8.3</version> - </dependency> - <dependency> - <groupId>commons-chain</groupId> - <artifactId>commons-chain</artifactId> - <version>1.2</version> - </dependency> - <dependency> - <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> - </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>1.1.1</version> - </dependency> - <dependency> - <groupId>commons-pool</groupId> - <artifactId>commons-pool</artifactId> - <version>1.5.5</version> - <exclusions> - <exclusion> - <groupId>xerces</groupId> - <artifactId>xerces</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>commons-dbcp</groupId> - <artifactId>commons-dbcp</artifactId> - <version>1.4</version> - <exclusions> - <exclusion> - <groupId>xerces</groupId> - <artifactId>xercesImpl</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - <version>1.4</version> - </dependency> - <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - <version>3.2.1</version> - </dependency> - <dependency> - <groupId>commons-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> - <version>3.0</version> - </dependency> - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - <version>2.6</version> - </dependency> - <dependency> - <groupId>commons-digester</groupId> - <artifactId>commons-digester</artifactId> - <version>1.7</version> - </dependency> - - <dependency> - <groupId>org.json</groupId> - <artifactId>json</artifactId> - <version>20070829</version> - </dependency> - <dependency> - <groupId>org.hsqldb</groupId> - <artifactId>hsqldb</artifactId> - <version>2.0.0</version> - </dependency> - <dependency> - <groupId>javax.resource</groupId> - <artifactId>connector-api</artifactId> - <version>1.5</version> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>${javax.servlet.version}</version> - </dependency> - <dependency> - <groupId>rhino</groupId> - <artifactId>js</artifactId> - <version>${rhino.version}</version> - </dependency> - <dependency> - <groupId>org.codehaus.groovy</groupId> - <artifactId>groovy-all</artifactId> - <version>${org.codehaus.groovy.version}</version> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.1</version> - </dependency> - - <dependency> - <groupId>caja</groupId> - <artifactId>caja</artifactId> - <version>r3375</version> - </dependency> - <dependency> - <groupId>caja</groupId> - <artifactId>json_simple</artifactId> - <version>r1</version> - </dependency> - <dependency> - <groupId>net.oauth</groupId> - <artifactId>core</artifactId> - <version>20080621</version> - </dependency> - <dependency> - <groupId>com.google.collections</groupId> - <artifactId>google-collections</artifactId> - <version>1.0-rc2</version> - </dependency> - <dependency> - <groupId>com.google.code.guice</groupId> - <artifactId>guice</artifactId> - <version>2.0</version> - </dependency> - <dependency> - <groupId>com.google.code.guice</groupId> - <artifactId>guice-jmx</artifactId> - <version>2.0</version> - </dependency> - <dependency> - <groupId>rome</groupId> - <artifactId>rome</artifactId> - <version>0.9</version> - </dependency> - <dependency> - <groupId>com.ibm.icu</groupId> - <artifactId>icu4j</artifactId> - <version>3.8</version> - </dependency> - <dependency> - <groupId>net.sourceforge.nekohtml</groupId> - <artifactId>nekohtml</artifactId> - <version>1.9.9</version> - </dependency> - <dependency> - <groupId>xerces</groupId> - <artifactId>xercesImpl</artifactId> - <version>2.9.1</version> - </dependency> - <dependency> - <groupId>jaxen</groupId> - <artifactId>jaxen</artifactId> - <version>1.1.1</version> - </dependency> - <dependency> - <groupId>nu.validator.htmlparser</groupId> - <artifactId>htmlparser</artifactId> - <version>1.0.7</version> - </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.16</version> - </dependency> - - <dependency> - <groupId>com.google.javascript</groupId> - <artifactId>closure-compiler</artifactId> - <version>r706</version> - </dependency> - - <dependency> - <groupId>org.gatein.shindig</groupId> - <artifactId>shindig-gadgets</artifactId> - <version>${org.shindig.version}</version> - </dependency> - <dependency> - <groupId>org.gatein.shindig</groupId> - <artifactId>shindig-features</artifactId> - <version>${org.shindig.version}</version> - </dependency> - <dependency> - <groupId>org.gatein.shindig</groupId> - <artifactId>shindig-common</artifactId> - <version>${org.shindig.version}</version> - </dependency> - <dependency> - <groupId>org.gatein.shindig</groupId> - <artifactId>shindig-server</artifactId> - <version>${org.shindig.version}</version> - </dependency> - <dependency> - <groupId>org.gatein.shindig</groupId> - <artifactId>shindig-server</artifactId> - <version>${org.shindig.version}</version> - <type>war</type> - </dependency> - <dependency> - <groupId>org.gatein.shindig</groupId> - <artifactId>shindig-social-api</artifactId> - <version>${org.shindig.version}</version> - </dependency> - <dependency> - <groupId>org.gatein.captcha</groupId> - <artifactId>simplecaptcha</artifactId> - <version>${nl.captcha.simplecaptcha.version}</version> - </dependency> -  - <dependency> - <groupId>net.jcip</groupId> - <artifactId>jcip-annotations</artifactId> - <version>${jcip.version}</version> - </dependency> - - </dependencies> - - </dependencyManagement> - - <dependencies> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-jdk14</artifactId> - <version>${org.slf4j.version}</version> - <scope>test</scope> - </dependency> - </dependencies> - - <build> - <resources> - <resource> - <directory>src/main/java</directory> - <includes> - <include>**/*.properties</include> - <include>**/*.xml</include> - <include>**/*.xsd</include> - </includes> - </resource> - <resource> - <directory>src/main/resources</directory> - <includes> - <include>**/*.*</include> - </includes> - </resource> - </resources> - <testResources> - <testResource> - <directory>src/test/resources</directory> - <includes> - <include>**/*.*</include> - </includes> - </testResource> - </testResources> - <pluginManagement> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>exec-maven-plugin</artifactId> - <version>1.1.1</version> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <version>1.4</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <argLine>-Xms512m -Xmx512m</argLine> - <systemProperties> - <property> - <name>org.apache.commons.logging.Log</name> - <value>org.apache.commons.logging.impl.SimpleLog</value> - </property> - <property> - <name>org.apache.commons.logging.simplelog.defaultlog</name> - <value>info</value> - </property> - <property> - <name>org.apache.commons.logging.simplelog.log.[eXo]</name> - <value>debug</value> - </property> - <property> - <name>org.apache.commons.logging.simplelog.log.net.hibernate</name> - <value>warn</value> - </property> - <property> - <name>java.naming.factory.initial</name> - <value>org.exoplatform.services.naming.SimpleContextFactory</value> - </property> - </systemProperties> - </configuration> - </plugin> -  -  - <plugin> - <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> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>compile</id> - <phase>compile</phase> - <configuration> - <tasks> - <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" /> - </fileset> - <globmapper from="*_en.properties" to="*.properties" /> - </copy> - </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.3.2</version> - <configuration> - <source>1.6</source> - <target>1.6</target> - </configuration> - </plugin> - </plugins> - </build> - - <profiles> - <profile> - <id>hsqldb</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <dependencies> - <dependency> - <groupId>org.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.16</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&useUnicode=true&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> - -  - <repositories> - <repository> - <id>mead</id> - <url>http://download.devel.redhat.com/brewroot/repos/jboss-epp-5-build/latest/...</url> - <releases> - <enabled>true</enabled> - </releases> - <snapshots> - <enabled>false</enabled> - </snapshots> - </repository> - <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> - </repository> - <repository> - <id>oauth</id> - <url>http://oauth.googlecode.com/svn/code/maven</url> - <releases> - <enabled>true</enabled> - </releases> - <snapshots> - <enabled>false</enabled> - </snapshots> - </repository> - <repository> - <id>java.net</id> - <url>http://download.java.net/maven/2</url> - <releases> - <enabled>true</enabled> - </releases> - <snapshots> - <enabled>false</enabled> - </snapshots> - </repository> - <repository> - <id>exo-int</id> - <url>http://repository.exoplatform.org/content/groups/public</url> - <releases> - <enabled>true</enabled> - </releases> - <snapshots> - <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> - <enabled>true</enabled> - <updatePolicy>never</updatePolicy> - </releases> - <snapshots> - <enabled>true</enabled> - <updatePolicy>never</updatePolicy> - </snapshots> - </pluginRepository> - <pluginRepository> - <id>java.net</id> - <url>http://download.java.net/maven/2</url> - <releases> - <enabled>true</enabled> - </releases> - <snapshots> - <enabled>false</enabled> - </snapshots> - </pluginRepository> - - </pluginRepositories> -</project> Copied: epp/portal/tags/EPP_5_2_0_Dev02/pom.xml (from rev 7064, epp/portal/branches/EPP_5_2_Branch/pom.xml) =================================================================== --- epp/portal/tags/EPP_5_2_0_Dev02/pom.xml (rev 0) +++ epp/portal/tags/EPP_5_2_0_Dev02/pom.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -0,0 +1,1236 @@ + + +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.gatein</groupId> + <artifactId>gatein-parent</artifactId> + <version>1.0.2-GA</version> + </parent> + + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.parent</artifactId> + <version>5.2.0-epp-DEV02</version> + <packaging>pom</packaging> + + <name>EPP GateIn - Portal - ${project.version}</name> + + <properties> + <org.exoplatform.kernel.version>2.3.0-CR2</org.exoplatform.kernel.version> + <org.exoplatform.core.version>2.4.0-CR2</org.exoplatform.core.version> + <org.exoplatform.ws.version>2.2.0-CR2</org.exoplatform.ws.version> + <org.exoplatform.jcr.version>1.14.0-CR2</org.exoplatform.jcr.version> + <org.jibx.version>1.2.1</org.jibx.version> + <org.shindig.version>1.0-r790473-Patch06</org.shindig.version> + <nl.captcha.simplecaptcha.version>1.1.1-GA-Patch01</nl.captcha.simplecaptcha.version> + <org.gatein.common.version>2.0.4-Beta03</org.gatein.common.version> + <org.gatein.wci.version>2.1.0-Beta04</org.gatein.wci.version> + <org.gatein.pc.version>2.3.0-Beta04</org.gatein.pc.version> + <org.picketlink.idm>1.3.0.Alpha03</org.picketlink.idm> + <org.gatein.wsrp.version>2.1.0-Beta04</org.gatein.wsrp.version> + <org.gatein.mop.version>1.1.0-Beta05</org.gatein.mop.version> + <org.slf4j.version>1.5.8</org.slf4j.version> + <commons-pool.version>1.5.5</commons-pool.version> + <rhino.version>1.6R5</rhino.version> + <org.codehaus.groovy.version>1.7.6</org.codehaus.groovy.version> + <javax.servlet.version>2.5</javax.servlet.version> + <version.chromattic>1.1.0-beta6</version.chromattic> + <version.reflect>1.1.0-beta12</version.reflect> + <jcip.version>1.0</jcip.version> + +  +  +  + +  + <jdk.min.version>1.6</jdk.min.version> + </properties> + + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/epp/portal/branches/EPP_5_2...</connection> + <developerConnection>scm:svn:http://svn.jboss.org/repos/gatein/epp/portal/branches/EPP_5_2_Branch</developerConnection> + <url>http://fisheye.jboss.org/browse/gatein/epp/portal/branches/EPP_5_2_Branch</url> + </scm> + + <modules> + <module>component</module> + <module>gadgets</module> + <module>webui</module> + <module>portlet</module> + <module>web</module> + <module>server</module> + <module>examples</module> + <module>starter</module> + <module>packaging</module> + <module>wsrp-integration</module> + <module>testsuite</module> + <module>distribution</module> + </modules> + + <dependencyManagement> + <dependencies> + +  + <dependency> + <groupId>org.gatein</groupId> + <artifactId>gatein-dep</artifactId> + <version>1.1.0-Beta04</version> + <type>pom</type> + <scope>import</scope> + </dependency> + +  + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.commons</artifactId> + <version>${org.exoplatform.kernel.version}</version> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </exclusion> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.component.cache</artifactId> + <version>${org.exoplatform.kernel.version}</version> + </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.component.command</artifactId> + <version>${org.exoplatform.kernel.version}</version> + </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.component.common</artifactId> + <version>${org.exoplatform.kernel.version}</version> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </exclusion> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.component.remote</artifactId> + <version>${org.exoplatform.kernel.version}</version> + </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.container</artifactId> + <version>${org.exoplatform.kernel.version}</version> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </exclusion> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.component.ext.cache.impl.jboss.v3</artifactId> + <version>${org.exoplatform.kernel.version}</version> + </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.mc-int</artifactId> + <version>${org.exoplatform.kernel.version}</version> + </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.mc-kernel-extras</artifactId> + <version>${org.exoplatform.kernel.version}</version> + </dependency> + <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.organization.api</artifactId> + <version>${org.exoplatform.core.version}</version> + </dependency> + <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.database</artifactId> + <version>${org.exoplatform.core.version}</version> + <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.ldap</artifactId> + <version>${org.exoplatform.core.version}</version> + </dependency> + <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.organization.jdbc</artifactId> + <version>${org.exoplatform.core.version}</version> + <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.ldap</artifactId> + <version>${org.exoplatform.core.version}</version> + </dependency> + <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.security.core</artifactId> + <version>${org.exoplatform.core.version}</version> + </dependency> + <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.document</artifactId> + <version>${org.exoplatform.core.version}</version> + </dependency> + <dependency> + <groupId>org.exoplatform.jcr</groupId> + <artifactId>exo.jcr.component.core</artifactId> + <version>${org.exoplatform.jcr.version}</version> + </dependency> + <dependency> + <groupId>org.exoplatform.jcr</groupId> + <artifactId>exo.jcr.framework.command</artifactId> + <version>${org.exoplatform.jcr.version}</version> + </dependency> + <dependency> + <groupId>org.exoplatform.jcr</groupId> + <artifactId>exo.jcr.component.ext</artifactId> + <version>${org.exoplatform.jcr.version}</version> + <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.webdav</artifactId> + <version>${org.exoplatform.jcr.version}</version> + </dependency> + <dependency> + <groupId>org.exoplatform.jcr</groupId> + <artifactId>exo.jcr.framework.web</artifactId> + <version>${org.exoplatform.jcr.version}</version> + </dependency> + <dependency> + <groupId>org.exoplatform.jcr</groupId> + <artifactId>exo.jcr.component.ftp</artifactId> + <version>${org.exoplatform.jcr.version}</version> + </dependency> + <dependency> + <groupId>org.exoplatform.ws</groupId> + <artifactId>exo.ws.commons</artifactId> + <version>${org.exoplatform.ws.version}</version> + </dependency> + <dependency> + <groupId>org.exoplatform.ws</groupId> + <artifactId>exo.ws.frameworks.servlet</artifactId> + <version>${org.exoplatform.ws.version}</version> + </dependency> + <dependency> + <groupId>org.exoplatform.ws</groupId> + <artifactId>exo.ws.rest.ext</artifactId> + <version>${org.exoplatform.ws.version}</version> + </dependency> + <dependency> + <groupId>org.exoplatform.ws</groupId> + <artifactId>exo.ws.rest.core</artifactId> + <version>${org.exoplatform.ws.version}</version> + </dependency> + <dependency> + <groupId>org.exoplatform.ws</groupId> + <artifactId>exo.ws.frameworks.json</artifactId> + <version>${org.exoplatform.ws.version}</version> + </dependency> + +  + <dependency> + <groupId>org.gatein.common</groupId> + <artifactId>common-logging</artifactId> + <version>${org.gatein.common.version}</version> + </dependency> + <dependency> + <groupId>org.gatein.common</groupId> + <artifactId>common-common</artifactId> + <version>${org.gatein.common.version}</version> + </dependency> + <dependency> + <groupId>org.gatein.wci</groupId> + <artifactId>wci-wci</artifactId> + <version>${org.gatein.wci.version}</version> + </dependency> + <dependency> + <groupId>org.gatein.wci</groupId> + <artifactId>wci-exo</artifactId> + <version>${org.gatein.wci.version}</version> + </dependency> + <dependency> + <groupId>org.gatein.wci</groupId> + <artifactId>wci-tomcat6</artifactId> + <version>${org.gatein.wci.version}</version> + </dependency> + <dependency> + <groupId>org.gatein.wci</groupId> + <artifactId>wci-tomcat7</artifactId> + <version>${org.gatein.wci.version}</version> + </dependency> + <dependency> + <groupId>org.gatein.wci</groupId> + <artifactId>wci-jetty</artifactId> + <version>${org.gatein.wci.version}</version> + </dependency> + <dependency> + <groupId>org.gatein.pc</groupId> + <artifactId>pc-bridge</artifactId> + <version>${org.gatein.pc.version}</version> + </dependency> + <dependency> + <groupId>org.gatein.pc</groupId> + <artifactId>pc-federation</artifactId> + <version>${org.gatein.pc.version}</version> + </dependency> + <dependency> + <groupId>org.gatein.pc</groupId> + <artifactId>pc-mc</artifactId> + <version>${org.gatein.pc.version}</version> + </dependency> + <dependency> + <groupId>org.gatein.pc</groupId> + <artifactId>pc-portlet</artifactId> + <version>${org.gatein.pc.version}</version> + </dependency> + <dependency> + <groupId>org.gatein.pc</groupId> + <artifactId>pc-api</artifactId> + <version>${org.gatein.pc.version}</version> + </dependency> + <dependency> + <groupId>org.gatein.pc</groupId> + <artifactId>pc-controller</artifactId> + <version>${org.gatein.pc.version}</version> + </dependency> + <dependency> + <groupId>org.gatein.mop</groupId> + <artifactId>mop-api</artifactId> + <version>${org.gatein.mop.version}</version> + </dependency> + <dependency> + <groupId>org.gatein.mop</groupId> + <artifactId>mop-spi</artifactId> + <version>${org.gatein.mop.version}</version> + </dependency> + <dependency> + <groupId>org.gatein.mop</groupId> + <artifactId>mop-core</artifactId> + <version>${org.gatein.mop.version}</version> + </dependency> +  + <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> + <exclusions> + <exclusion> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> + </exclusion> + </exclusions> + </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</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> + +  + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.common</artifactId> + <version>5.2.0-epp-DEV02</version> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.web</artifactId> + <version>5.2.0-epp-DEV02</version> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.web.controller</artifactId> + <version>5.2.0-epp-DEV02</version> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.web.security</artifactId> + <version>5.2.0-epp-DEV02</version> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.web.server</artifactId> + <version>5.2.0-epp-DEV02</version> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.web.api</artifactId> + <version>5.2.0-epp-DEV02</version> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.web.resources</artifactId> + <version>5.2.0-epp-DEV02</version> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.portal</artifactId> + <version>5.2.0-epp-DEV02</version> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.portal</artifactId> + <version>5.2.0-epp-DEV02</version> + <type>test-jar</type> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.pc</artifactId> + <version>5.2.0-epp-DEV02</version> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.identity</artifactId> + <version>5.2.0-epp-DEV02</version> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.resources</artifactId> + <version>5.2.0-epp-DEV02</version> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.application-registry</artifactId> + <version>5.2.0-epp-DEV02</version> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.xml-parser</artifactId> + <version>5.1.0-epp-DEV02</version> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.scripting</artifactId> + <version>5.2.0-epp-DEV02</version> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.management</artifactId> + <version>5.2.0-epp-DEV02</version> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.webui.framework</artifactId> + <version>5.2.0-epp-DEV02</version> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.webui.portlet</artifactId> + <version>5.2.0-epp-DEV02</version> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.webui.portal</artifactId> + <version>5.2.0-epp-DEV02</version> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.webui.eXo</artifactId> + <version>5.2.0-epp-DEV02</version> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.webui.core</artifactId> + <version>5.2.0-epp-DEV02</version> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.webui.dashboard</artifactId> + <version>5.2.0-epp-DEV02</version> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.gadgets-core</artifactId> + <version>5.2.0-epp-DEV02</version> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.test.core</artifactId> + <version>5.2.0-epp-DEV02</version> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.test.core</artifactId> + <version>5.2.0-epp-DEV02</version> + <type>test-jar</type> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.test.jcr</artifactId> + <version>5.2.0-epp-DEV02</version> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.test.jcr</artifactId> + <version>5.2.0-epp-DEV02</version> + <type>test-jar</type> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.test.organization</artifactId> + <version>5.2.0-epp-DEV02</version> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.test.organization</artifactId> + <version>5.2.0-epp-DEV02</version> + <type>test-jar</type> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>gatein.portal.component.wsrp</artifactId> + <version>5.2.0-epp-DEV02</version> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.server.jboss.plugin</artifactId> + <version>5.2.0-epp-DEV02</version> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.server.tomcat.plugin</artifactId> + <version>5.1.0-epp-DEV02</version> + </dependency> + +  + <dependency> + <groupId>org.chromattic</groupId> + <artifactId>chromattic.apt</artifactId> + <version>${version.chromattic}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.chromattic</groupId> + <artifactId>chromattic.api</artifactId> + <version>${version.chromattic}</version> + </dependency> + <dependency> + <groupId>org.chromattic</groupId> + <artifactId>chromattic.spi</artifactId> + <version>${version.chromattic}</version> + </dependency> + <dependency> + <groupId>org.chromattic</groupId> + <artifactId>chromattic.core</artifactId> + <version>${version.chromattic}</version> + </dependency> + <dependency> + <groupId>org.chromattic</groupId> + <artifactId>chromattic.ext</artifactId> + <version>${version.chromattic}</version> + </dependency> + +  + <dependency> + <groupId>org.picketlink.idm</groupId> + <artifactId>picketlink-idm-core</artifactId> + <version>${org.picketlink.idm}</version> + </dependency> + <dependency> + <groupId>org.picketlink.idm</groupId> + <artifactId>picketlink-idm-hibernate</artifactId> + <version>${org.picketlink.idm}</version> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </exclusion> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.picketlink.idm</groupId> + <artifactId>picketlink-idm-ldap</artifactId> + <version>${org.picketlink.idm}</version> + </dependency> + <dependency> + <groupId>org.picketlink.idm</groupId> + <artifactId>picketlink-idm-cache</artifactId> + <version>${org.picketlink.idm}</version> + </dependency> + + <dependency> + <groupId>javax.portlet</groupId> + <artifactId>portlet-api</artifactId> + <version>2.0</version> + </dependency> + <dependency> + <groupId>org.jboss.jbossas</groupId> + <artifactId>jboss-as-tomcat</artifactId> + <version>5.1.0.GA</version> + </dependency> + + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>${org.slf4j.version}</version> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-jdk14</artifactId> + <version>${org.slf4j.version}</version> + </dependency> + <dependency> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + <version>1.8.3</version> + </dependency> + <dependency> + <groupId>commons-chain</groupId> + <artifactId>commons-chain</artifactId> + <version>1.2</version> + </dependency> + <dependency> + <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> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.1.1</version> + </dependency> + <dependency> + <groupId>commons-pool</groupId> + <artifactId>commons-pool</artifactId> + <version>1.5.5</version> + <exclusions> + <exclusion> + <groupId>xerces</groupId> + <artifactId>xerces</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>commons-dbcp</groupId> + <artifactId>commons-dbcp</artifactId> + <version>1.4</version> + <exclusions> + <exclusion> + <groupId>xerces</groupId> + <artifactId>xercesImpl</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <version>1.4</version> + </dependency> + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <version>3.2.1</version> + </dependency> + <dependency> + <groupId>commons-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + <version>3.0</version> + </dependency> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>2.6</version> + </dependency> + <dependency> + <groupId>commons-digester</groupId> + <artifactId>commons-digester</artifactId> + <version>1.7</version> + </dependency> + + <dependency> + <groupId>org.json</groupId> + <artifactId>json</artifactId> + <version>20070829</version> + </dependency> + <dependency> + <groupId>org.hsqldb</groupId> + <artifactId>hsqldb</artifactId> + <version>2.0.0</version> + </dependency> + <dependency> + <groupId>javax.resource</groupId> + <artifactId>connector-api</artifactId> + <version>1.5</version> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>${javax.servlet.version}</version> + </dependency> + <dependency> + <groupId>rhino</groupId> + <artifactId>js</artifactId> + <version>${rhino.version}</version> + </dependency> + <dependency> + <groupId>org.codehaus.groovy</groupId> + <artifactId>groovy-all</artifactId> + <version>${org.codehaus.groovy.version}</version> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.1</version> + </dependency> + + <dependency> + <groupId>caja</groupId> + <artifactId>caja</artifactId> + <version>r3375</version> + </dependency> + <dependency> + <groupId>caja</groupId> + <artifactId>json_simple</artifactId> + <version>r1</version> + </dependency> + <dependency> + <groupId>net.oauth</groupId> + <artifactId>core</artifactId> + <version>20080621</version> + </dependency> + <dependency> + <groupId>com.google.collections</groupId> + <artifactId>google-collections</artifactId> + <version>1.0-rc2</version> + </dependency> + <dependency> + <groupId>com.google.code.guice</groupId> + <artifactId>guice</artifactId> + <version>2.0</version> + </dependency> + <dependency> + <groupId>com.google.code.guice</groupId> + <artifactId>guice-jmx</artifactId> + <version>2.0</version> + </dependency> + <dependency> + <groupId>rome</groupId> + <artifactId>rome</artifactId> + <version>0.9</version> + </dependency> + <dependency> + <groupId>com.ibm.icu</groupId> + <artifactId>icu4j</artifactId> + <version>3.8</version> + </dependency> + <dependency> + <groupId>net.sourceforge.nekohtml</groupId> + <artifactId>nekohtml</artifactId> + <version>1.9.9</version> + </dependency> + <dependency> + <groupId>xerces</groupId> + <artifactId>xercesImpl</artifactId> + <version>2.9.1</version> + </dependency> + <dependency> + <groupId>jaxen</groupId> + <artifactId>jaxen</artifactId> + <version>1.1.1</version> + </dependency> + <dependency> + <groupId>nu.validator.htmlparser</groupId> + <artifactId>htmlparser</artifactId> + <version>1.0.7</version> + </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.16</version> + </dependency> + + <dependency> + <groupId>com.google.javascript</groupId> + <artifactId>closure-compiler</artifactId> + <version>r706</version> + </dependency> + + <dependency> + <groupId>org.gatein.shindig</groupId> + <artifactId>shindig-gadgets</artifactId> + <version>${org.shindig.version}</version> + </dependency> + <dependency> + <groupId>org.gatein.shindig</groupId> + <artifactId>shindig-features</artifactId> + <version>${org.shindig.version}</version> + </dependency> + <dependency> + <groupId>org.gatein.shindig</groupId> + <artifactId>shindig-common</artifactId> + <version>${org.shindig.version}</version> + </dependency> + <dependency> + <groupId>org.gatein.shindig</groupId> + <artifactId>shindig-server</artifactId> + <version>${org.shindig.version}</version> + </dependency> + <dependency> + <groupId>org.gatein.shindig</groupId> + <artifactId>shindig-server</artifactId> + <version>${org.shindig.version}</version> + <type>war</type> + </dependency> + <dependency> + <groupId>org.gatein.shindig</groupId> + <artifactId>shindig-social-api</artifactId> + <version>${org.shindig.version}</version> + </dependency> + <dependency> + <groupId>org.gatein.captcha</groupId> + <artifactId>simplecaptcha</artifactId> + <version>${nl.captcha.simplecaptcha.version}</version> + </dependency> +  + <dependency> + <groupId>net.jcip</groupId> + <artifactId>jcip-annotations</artifactId> + <version>${jcip.version}</version> + </dependency> + + </dependencies> + + </dependencyManagement> + + <dependencies> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-jdk14</artifactId> + <version>${org.slf4j.version}</version> + <scope>test</scope> + </dependency> + </dependencies> + + <build> + <resources> + <resource> + <directory>src/main/java</directory> + <includes> + <include>**/*.properties</include> + <include>**/*.xml</include> + <include>**/*.xsd</include> + </includes> + </resource> + <resource> + <directory>src/main/resources</directory> + <includes> + <include>**/*.*</include> + </includes> + </resource> + </resources> + <testResources> + <testResource> + <directory>src/test/resources</directory> + <includes> + <include>**/*.*</include> + </includes> + </testResource> + </testResources> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>exec-maven-plugin</artifactId> + <version>1.1.1</version> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <version>1.4</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <argLine>-Xms512m -Xmx512m</argLine> + <systemProperties> + <property> + <name>org.apache.commons.logging.Log</name> + <value>org.apache.commons.logging.impl.SimpleLog</value> + </property> + <property> + <name>org.apache.commons.logging.simplelog.defaultlog</name> + <value>info</value> + </property> + <property> + <name>org.apache.commons.logging.simplelog.log.[eXo]</name> + <value>debug</value> + </property> + <property> + <name>org.apache.commons.logging.simplelog.log.net.hibernate</name> + <value>warn</value> + </property> + <property> + <name>java.naming.factory.initial</name> + <value>org.exoplatform.services.naming.SimpleContextFactory</value> + </property> + </systemProperties> + </configuration> + </plugin> +  +  + <plugin> + <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> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>compile</id> + <phase>compile</phase> + <configuration> + <tasks> + <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" /> + </fileset> + <globmapper from="*_en.properties" to="*.properties" /> + </copy> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>2.3.2</version> + <configuration> + <source>1.6</source> + <target>1.6</target> + </configuration> + </plugin> + </plugins> + </build> + + <profiles> + <profile> + <id>hsqldb</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <dependencies> + <dependency> + <groupId>org.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.16</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&useUnicode=true&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> + +  + <repositories> + <repository> + <id>mead</id> + <url>http://download.devel.redhat.com/brewroot/repos/jboss-epp-5-build/latest/...</url> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>false</enabled> + </snapshots> + </repository> + <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> + </repository> + <repository> + <id>oauth</id> + <url>http://oauth.googlecode.com/svn/code/maven</url> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>false</enabled> + </snapshots> + </repository> + <repository> + <id>java.net</id> + <url>http://download.java.net/maven/2</url> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>false</enabled> + </snapshots> + </repository> + <repository> + <id>exo-int</id> + <url>http://repository.exoplatform.org/content/groups/public</url> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <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> + <enabled>true</enabled> + <updatePolicy>never</updatePolicy> + </releases> + <snapshots> + <enabled>true</enabled> + <updatePolicy>never</updatePolicy> + </snapshots> + </pluginRepository> + <pluginRepository> + <id>java.net</id> + <url>http://download.java.net/maven/2</url> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>false</enabled> + </snapshots> + </pluginRepository> + + </pluginRepositories> +</project> Modified: epp/portal/tags/EPP_5_2_0_Dev02/portlet/dashboard/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/portlet/dashboard/pom.xml 2011-08-09 23:32:42 UTC (rev 7035) +++ epp/portal/tags/EPP_5_2_0_Dev02/portlet/dashboard/pom.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.portlet</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV02</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/tags/EPP_5_2_0_Dev02/portlet/exoadmin/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/pom.xml 2011-08-09 23:32:42 UTC (rev 7035) +++ epp/portal/tags/EPP_5_2_0_Dev02/portlet/exoadmin/pom.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.portlet</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV02</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/tags/EPP_5_2_0_Dev02/portlet/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/portlet/pom.xml 2011-08-09 23:32:42 UTC (rev 7035) +++ epp/portal/tags/EPP_5_2_0_Dev02/portlet/pom.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -26,7 +26,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV02</version> </parent> <artifactId>exo.portal.portlet</artifactId> Modified: epp/portal/tags/EPP_5_2_0_Dev02/portlet/web/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/portlet/web/pom.xml 2011-08-09 23:32:42 UTC (rev 7035) +++ epp/portal/tags/EPP_5_2_0_Dev02/portlet/web/pom.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.portlet</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV02</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/tags/EPP_5_2_0_Dev02/server/jboss/patch-ear/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/server/jboss/patch-ear/pom.xml 2011-08-09 23:32:42 UTC (rev 7035) +++ epp/portal/tags/EPP_5_2_0_Dev02/server/jboss/patch-ear/pom.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.server.jboss</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV02</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/tags/EPP_5_2_0_Dev02/server/jboss/patch-ear/src/main/jboss/server/default/deploy/gatein.ear/integration.war/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/server/jboss/patch-ear/src/main/jboss/server/default/deploy/gatein.ear/integration.war/pom.xml 2011-08-09 23:32:42 UTC (rev 7035) +++ epp/portal/tags/EPP_5_2_0_Dev02/server/jboss/patch-ear/src/main/jboss/server/default/deploy/gatein.ear/integration.war/pom.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -4,7 +4,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV02</version> </parent> <artifactId>exo.portal.packaging.jboss-as.integration</artifactId> <packaging>war</packaging> Modified: epp/portal/tags/EPP_5_2_0_Dev02/server/jboss/plugin/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/server/jboss/plugin/pom.xml 2011-08-09 23:32:42 UTC (rev 7035) +++ epp/portal/tags/EPP_5_2_0_Dev02/server/jboss/plugin/pom.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.server.jboss</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV02</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/tags/EPP_5_2_0_Dev02/server/jboss/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/server/jboss/pom.xml 2011-08-09 23:32:42 UTC (rev 7035) +++ epp/portal/tags/EPP_5_2_0_Dev02/server/jboss/pom.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -26,7 +26,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.server</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV02</version> </parent> <artifactId>exo.portal.server.jboss</artifactId> Modified: epp/portal/tags/EPP_5_2_0_Dev02/server/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/server/pom.xml 2011-08-09 23:32:42 UTC (rev 7035) +++ epp/portal/tags/EPP_5_2_0_Dev02/server/pom.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -26,7 +26,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV02</version> </parent> <artifactId>exo.portal.server</artifactId> Modified: epp/portal/tags/EPP_5_2_0_Dev02/starter/ear/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/starter/ear/pom.xml 2011-08-09 23:32:42 UTC (rev 7035) +++ epp/portal/tags/EPP_5_2_0_Dev02/starter/ear/pom.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV02</version> <relativePath>../../pom.xml</relativePath> </parent> @@ -38,7 +38,7 @@ <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.starter.war</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV02</version> <type>war</type> </dependency> </dependencies> Modified: epp/portal/tags/EPP_5_2_0_Dev02/starter/jar/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/starter/jar/pom.xml 2011-08-09 23:32:42 UTC (rev 7035) +++ epp/portal/tags/EPP_5_2_0_Dev02/starter/jar/pom.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV02</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: epp/portal/tags/EPP_5_2_0_Dev02/starter/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/starter/pom.xml 2011-08-09 23:32:42 UTC (rev 7035) +++ epp/portal/tags/EPP_5_2_0_Dev02/starter/pom.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -24,7 +24,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV02</version> </parent> <artifactId>exo.portal.starter.root</artifactId> Modified: epp/portal/tags/EPP_5_2_0_Dev02/starter/war/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/starter/war/pom.xml 2011-08-09 23:32:42 UTC (rev 7035) +++ epp/portal/tags/EPP_5_2_0_Dev02/starter/war/pom.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV02</version> <relativePath>../../pom.xml</relativePath> </parent> @@ -51,7 +51,7 @@ <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.starter.jar</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV02</version> </dependency> </dependencies> </project> Modified: epp/portal/tags/EPP_5_2_0_Dev02/testsuite/htmlunit-tests/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/testsuite/htmlunit-tests/pom.xml 2011-08-09 23:32:42 UTC (rev 7035) +++ epp/portal/tags/EPP_5_2_0_Dev02/testsuite/htmlunit-tests/pom.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -26,7 +26,7 @@ <groupId>org.jboss.gatein</groupId> <artifactId>gatein.tests.htmlunit</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV02</version> <packaging>jar</packaging> <name>HTMLUnit Tests for GateIn</name> <description>HTMLUnit Tests for GateIn</description> Modified: epp/portal/tags/EPP_5_2_0_Dev02/testsuite/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/testsuite/pom.xml 2011-08-09 23:32:42 UTC (rev 7035) +++ epp/portal/tags/EPP_5_2_0_Dev02/testsuite/pom.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -3,7 +3,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV02</version> </parent> <artifactId>exo.portal.testsuite</artifactId> Modified: epp/portal/tags/EPP_5_2_0_Dev02/testsuite/selenium-snifftests/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/testsuite/selenium-snifftests/pom.xml 2011-08-09 23:32:42 UTC (rev 7035) +++ epp/portal/tags/EPP_5_2_0_Dev02/testsuite/selenium-snifftests/pom.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -3,7 +3,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.testsuite</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV02</version> </parent> <artifactId>exo.portal.selenium.snifftests</artifactId> Modified: epp/portal/tags/EPP_5_2_0_Dev02/testsuite/webuibasedsamples/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/testsuite/webuibasedsamples/pom.xml 2011-08-09 23:32:42 UTC (rev 7035) +++ epp/portal/tags/EPP_5_2_0_Dev02/testsuite/webuibasedsamples/pom.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -3,7 +3,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.testsuite</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV02</version> </parent> <artifactId>exo.webui.based.samples</artifactId> Modified: epp/portal/tags/EPP_5_2_0_Dev02/web/eXoResources/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/eXoResources/pom.xml 2011-08-09 23:32:42 UTC (rev 7035) +++ epp/portal/tags/EPP_5_2_0_Dev02/web/eXoResources/pom.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.web</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV02</version> </parent> <modelVersion>4.0.0</modelVersion> Copied: epp/portal/tags/EPP_5_2_0_Dev02/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/background/ArrowDown.gif (from rev 7036, epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/background/ArrowDown.gif) =================================================================== (Binary files differ) Modified: epp/portal/tags/EPP_5_2_0_Dev02/web/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/pom.xml 2011-08-09 23:32:42 UTC (rev 7035) +++ epp/portal/tags/EPP_5_2_0_Dev02/web/pom.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -26,7 +26,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV02</version> </parent> <artifactId>exo.portal.web</artifactId> Modified: epp/portal/tags/EPP_5_2_0_Dev02/web/portal/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/portal/pom.xml 2011-08-09 23:32:42 UTC (rev 7035) +++ epp/portal/tags/EPP_5_2_0_Dev02/web/portal/pom.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.web</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV02</version> </parent> <modelVersion>4.0.0</modelVersion> Deleted: epp/portal/tags/EPP_5_2_0_Dev02/web/portal/src/main/webapp/WEB-INF/conf/configuration.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/configuration.xml 2011-08-09 23:32:42 UTC (rev 7035) +++ epp/portal/tags/EPP_5_2_0_Dev02/web/portal/src/main/webapp/WEB-INF/conf/configuration.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -1,62 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> - - -<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>war:/conf/common/common-configuration.xml</import> - <import>war:/conf/common/resource-compressor-configuration.xml</import> - <import>war:/conf/common/portlet-container-configuration.xml</import> - <import profiles="jboss">war:/conf/wsrp/wsrp-configuration.xml</import> - <import>war:/conf/common/logs-configuration.xml</import> - <import>war:/conf/common/autologin-configuration.xml</import> - <import>war:/conf/common/remindpwd-configuration.xml</import> - <import>war:/conf/jcr/jcr-configuration.xml</import> - - - -  - <import>war:/conf/organization/idm-configuration.xml</import> - -  -  -  -  -  -  -  -  - - <import>war:/conf/organization/organization-configuration.xml</import> - <import>war:/conf/jcr/component-plugins-configuration.xml</import> - <import>war:/conf/mail/portal-mail-configuration.xml</import> - <import>war:/conf/portal/portal-configuration.xml</import> - <import>war:/conf/portal/application-registry-configuration.xml</import> - -  - <import>war:/conf/admin/admin-configuration.xml</import> -</configuration> Copied: epp/portal/tags/EPP_5_2_0_Dev02/web/portal/src/main/webapp/WEB-INF/conf/configuration.xml (from rev 7064, epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/configuration.xml) =================================================================== --- epp/portal/tags/EPP_5_2_0_Dev02/web/portal/src/main/webapp/WEB-INF/conf/configuration.xml (rev 0) +++ epp/portal/tags/EPP_5_2_0_Dev02/web/portal/src/main/webapp/WEB-INF/conf/configuration.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -0,0 +1,61 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> + + +<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>war:/conf/common/common-configuration.xml</import> + <import>war:/conf/common/resource-compressor-configuration.xml</import> + <import>war:/conf/common/portlet-container-configuration.xml</import> + <import>war:/conf/common/logs-configuration.xml</import> + <import>war:/conf/common/autologin-configuration.xml</import> + <import>war:/conf/common/remindpwd-configuration.xml</import> + <import>war:/conf/jcr/jcr-configuration.xml</import> + + + +  + <import>war:/conf/organization/idm-configuration.xml</import> + +  +  +  +  +  +  +  +  + + <import>war:/conf/organization/organization-configuration.xml</import> + <import>war:/conf/jcr/component-plugins-configuration.xml</import> + <import>war:/conf/mail/portal-mail-configuration.xml</import> + <import>war:/conf/portal/portal-configuration.xml</import> + <import>war:/conf/portal/application-registry-configuration.xml</import> + +  + <import>war:/conf/admin/admin-configuration.xml</import> +</configuration> Copied: epp/portal/tags/EPP_5_2_0_Dev02/web/portal/src/main/webapp/groovy/portal/webui/container/UIColumnContainer.gtmpl (from rev 7036, epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/container/UIColumnContainer.gtmpl) =================================================================== --- epp/portal/tags/EPP_5_2_0_Dev02/web/portal/src/main/webapp/groovy/portal/webui/container/UIColumnContainer.gtmpl (rev 0) +++ epp/portal/tags/EPP_5_2_0_Dev02/web/portal/src/main/webapp/groovy/portal/webui/container/UIColumnContainer.gtmpl 2011-08-13 06:32:51 UTC (rev 7065) @@ -0,0 +1,131 @@ +<% + import org.exoplatform.commons.utils.ExpressionUtil; + import org.exoplatform.portal.webui.workspace.UIPortalApplication; + import org.exoplatform.webui.core.UIComponent; + //import org.exoplatform.webui.config.Event; + + def rcontext = _ctx.getRequestContext(); + ResourceBundle res = rcontext.getApplicationResourceBundle(); + + UIPortalApplication uiPortalApp = rcontext.getUIApplication(); + boolean hasPermission = uicomponent.hasPermission(); + if(!uiPortalApp.isEditing() && !hasPermission) return; + + String cssStyle = ""; + String uiComponentWidth = uicomponent.getWidth(); + String uiComponentHeight = uicomponent.getHeight(); + if(uiComponentWidth != null || uiComponentHeight != null) cssStyle = "style=\""; + if(uiComponentHeight != null) cssStyle += "height: "+uiComponentHeight+";" + if(cssStyle.length() > 0) cssStyle += "\""; + + /** Trim the prefix UIContainer- if any, this hardcoded part is needed to update nested container via Ajax */ + String componentId = uicomponent.getId(); + if(componentId.startsWith("UIContainer-")){ + uicomponent.setId(componentId.substring("UIContainer-".length())); + } +%> + +<div class="UIContainer UIColumnContainer <%=uiPortalApp.isEditing()?"EdittingContainer":""%> <%=hasPermission?"": "ProtectedContainer"%>" + id="${uicomponent.id}" ${cssStyle} + onmouseover="eXo.portal.UIPortal.blockOnMouseOver(event, this, true);" + onmouseout="eXo.portal.UIPortal.blockOnMouseOver(event, this, false);"> + <div class="NormalContainerBlock"> + <div class="LeftContainerBlock"> + <div class="RightContainerBlock UIComponentBlock"> + + <% + int portalMode = uiPortalApp.getModeState(); + if(portalMode == uiPortalApp.CONTAINER_BLOCK_EDIT_MODE || portalMode == UIPortalApplication.APP_BLOCK_EDIT_MODE){ + %> + <div class="LAYOUT-CONTAINER LAYOUT-BLOCK"> + <%} else {%> + <div class="VIEW-CONTAINER VIEW-BLOCK"> + <%} %> + <%if(hasPermission) {%> + <div class="UIRowContainer <%=(portalMode != UIPortalApplication.NORMAL_MODE && uicomponent.getChildren().size() == 0) ? "EmptyContainer" : ""%>"> + <div> + <%uicomponent.renderChildren();%> + </div> + </div> + <%} else out.print("<div class='ProtectedContent'>"+_ctx.appRes("UIPortlet.label.protectedContent")+"</div>");%> + </div> + + <%if(portalMode != UIPortalApplication.NORMAL_MODE){%> + <div class="EDITION-BLOCK EDITION-CONTAINER" style="display: none;"> + <div style="position: relative;"> + <div style="position: absolute; top: -86px;"> + + <div class="NewLayer" style="display: none; visibility: hidden;"><span></span></div> + <div class="CONTROL-CONTAINER CONTROL-BLOCK" style="position: absolute; top: -6px;"> + <%/*Begin InfoBar*/%> + <div class="UIInfoBar"> + <div class="BlueRoundedStyle"> + <div class="LeftBar"> + <div class="RightBar"> + <div class="MiddleBar"> + <div class="FixHeight ClearFix"> + <div class="DragControlArea" title="<%=_ctx.appRes("UIColumnContainer.title.DragControlArea")%>" onmousedown="eXo.portal.PortalDragDrop.init.call(this,event);"><span></span></div> + <% + String showCategory = "eXo.webui.UIPopupSelectCategory.show(this, event)"; + String strTitle = uicomponent.getTitle() != null ? + ExpressionUtil.getExpressionValue(res, uicomponent.getTitle()) : + _ctx.appRes("UIColumnContainer.title.Container"); + %> + <div class="ContainerIcon"><%=hasPermission ? strTitle : _ctx.appRes("UIPortlet.label.protectedContent")%></div> + <%if(hasPermission) {%> + <div class="ControlIcon ArrowDownIcon" onclick="$showCategory" title="<%= _ctx.appRes("UIColumnContainer.tooltip.insertColumn") %>"> + <% /*Begin Popup Menu*/ %> + <div style="position: relative; width: 100%"> + <div class="UIPopupCategory" style="display: none;"> + <div class="PopupCategoryDecorator"> + <div class="PopupCategoryTL"> + <div class="PopupCategoryTR"> + <div class="PopupCategoryTC"><span></span></div> + </div> + </div> + <div class="PopupCategoryML"> + <div class="PopupCategoryMR"> + <div class="PopupCategoryMC"> + <a class="CategoryItem" href="<%= uicomponent.event("InsertColumn", org.exoplatform.portal.webui.container.UIColumnContainer.INSERT_BEFORE) %>" title="<%= _ctx.appRes("UIColumnContainer.tooltip.insertLeft") %>"> + <div class="CategoryItemLabel"><%= _ctx.appRes("UIColumnContainer.label.insertLeft") %></div> + </a> + <a class="CategoryItem" href="<%= uicomponent.event("InsertColumn", org.exoplatform.portal.webui.container.UIColumnContainer.INSERT_AFTER) %>" title="<%= _ctx.appRes("UIColumnContainer.tooltip.insertRight") %>"> + <div class="CategoryItemLabel"><%= _ctx.appRes("UIColumnContainer.label.insertRight") %></div> + </a> + </div> + </div> + </div> + <div class="PopupCategoryBL"> + <div class="PopupCategoryBR"> + <div class="PopupCategoryBC"><span></span></div> + </div> + </div> + </div> + </div> + </div> + <% /*End Popup Menu*/ %> + </div> + <a href="<%=uicomponent.event("EditContainer")%>;eXo.portal.UIPortal.changeComposerSaveButton()" class="EditContainerIcon" title="<%=_ctx.appRes("UIColumnContainer.tooltip.editContainer")%>"><span></span></a> + <a href="<%=uicomponent.event("DeleteComponent")%>" class="DeleteContainerIcon" title="<%=_ctx.appRes("UIColumnContainer.tooltip.closeContainer")%>"><span></span></a> + + <%}%> + + </div> + </div> + </div> + </div> + </div> + </div> + <%/*End InfoBar*/ %> + </div> + + </div> + </div> + </div> + <%} %> + + </div> + </div> + </div> +</div> + Modified: epp/portal/tags/EPP_5_2_0_Dev02/web/rest/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/rest/pom.xml 2011-08-09 23:32:42 UTC (rev 7035) +++ epp/portal/tags/EPP_5_2_0_Dev02/web/rest/pom.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.web</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV02</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/tags/EPP_5_2_0_Dev02/webui/core/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/webui/core/pom.xml 2011-08-09 23:32:42 UTC (rev 7035) +++ epp/portal/tags/EPP_5_2_0_Dev02/webui/core/pom.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV02</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/tags/EPP_5_2_0_Dev02/webui/dashboard/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/webui/dashboard/pom.xml 2011-08-09 23:32:42 UTC (rev 7035) +++ epp/portal/tags/EPP_5_2_0_Dev02/webui/dashboard/pom.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV02</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/tags/EPP_5_2_0_Dev02/webui/eXo/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/webui/eXo/pom.xml 2011-08-09 23:32:42 UTC (rev 7035) +++ epp/portal/tags/EPP_5_2_0_Dev02/webui/eXo/pom.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV02</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/tags/EPP_5_2_0_Dev02/webui/framework/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/webui/framework/pom.xml 2011-08-09 23:32:42 UTC (rev 7035) +++ epp/portal/tags/EPP_5_2_0_Dev02/webui/framework/pom.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV02</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/tags/EPP_5_2_0_Dev02/webui/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/webui/pom.xml 2011-08-09 23:32:42 UTC (rev 7035) +++ epp/portal/tags/EPP_5_2_0_Dev02/webui/pom.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -26,7 +26,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV02</version> </parent> <artifactId>exo.portal.webui</artifactId> Modified: epp/portal/tags/EPP_5_2_0_Dev02/webui/portal/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/webui/portal/pom.xml 2011-08-09 23:32:42 UTC (rev 7035) +++ epp/portal/tags/EPP_5_2_0_Dev02/webui/portal/pom.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV02</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/tags/EPP_5_2_0_Dev02/webui/portlet/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/webui/portlet/pom.xml 2011-08-09 23:32:42 UTC (rev 7035) +++ epp/portal/tags/EPP_5_2_0_Dev02/webui/portlet/pom.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV02</version> </parent> <modelVersion>4.0.0</modelVersion> Deleted: epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/extension-component/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-component/pom.xml 2011-08-09 23:32:42 UTC (rev 7035) +++ epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/extension-component/pom.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -1,148 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <parent> - <artifactId>gatein-wsrp-integration-parent</artifactId> - <groupId>org.gatein.integration</groupId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - - <artifactId>extension-component</artifactId> - <packaging>jar</packaging> - <name>GateIn WSRP Integration extension component</name> - - <dependencies> -  - <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> - <exclusions> - <exclusion> - <groupId>apache-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> - </exclusion> - </exclusions> - </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> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-integration-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-wss-jboss5</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-wss</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> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.ws.native</groupId> - <artifactId>jbossws-native-core</artifactId> - <version>3.1.2.GA</version> - <scope>provided</scope> - <exclusions> - <exclusion> - <groupId>wscommons-policy</groupId> - <artifactId>policy</artifactId> - </exclusion> - </exclusions> - </dependency> - -  - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - <version>1.8.5</version> - <scope>test</scope> - </dependency> - </dependencies> - - <build> - <resources> - <resource> - <directory>src/main/resources</directory> - </resource> - </resources> - </build> - -</project> Copied: epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/extension-component/pom.xml (from rev 7064, epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-component/pom.xml) =================================================================== --- epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/extension-component/pom.xml (rev 0) +++ epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/extension-component/pom.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -0,0 +1,129 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <parent> + <artifactId>gatein-wsrp-integration-parent</artifactId> + <groupId>org.gatein.integration</groupId> + <version>5.2.0-epp-DEV02</version> + </parent> + <modelVersion>4.0.0</modelVersion> + + <artifactId>extension-component</artifactId> + <packaging>jar</packaging> + <name>GateIn WSRP Integration extension component</name> + + <dependencies> +  + <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.wsrp</groupId> + <artifactId>wsrp-wss-jboss5</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> + <dependency> + <groupId>org.jboss.ws.native</groupId> + <artifactId>jbossws-native-core</artifactId> + <version>3.1.2.GA</version> + <scope>provided</scope> + </dependency> + +  + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> + <version>1.8.5</version> + <scope>test</scope> + </dependency> + </dependencies> + + <build> + <resources> + <resource> + <directory>src/main/resources</directory> + </resource> + </resources> + </build> + +</project> Deleted: epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/WSRPServiceIntegration.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/WSRPServiceIntegration.java 2011-08-09 23:32:42 UTC (rev 7035) +++ epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/WSRPServiceIntegration.java 2011-08-13 06:32:51 UTC (rev 7065) @@ -1,390 +0,0 @@ -/* - * 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 Copied: epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/WSRPServiceIntegration.java (from rev 7064, epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/WSRPServiceIntegration.java) =================================================================== --- epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/WSRPServiceIntegration.java (rev 0) +++ epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/WSRPServiceIntegration.java 2011-08-13 06:32:51 UTC (rev 7065) @@ -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; + } + } + } + } + +} Deleted: epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/structure/MOPConsumerStructureProvider.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/structure/MOPConsumerStructureProvider.java 2011-08-09 23:32:42 UTC (rev 7035) +++ epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/structure/MOPConsumerStructureProvider.java 2011-08-13 06:32:51 UTC (rev 7065) @@ -1,311 +0,0 @@ -/* - * 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) - { - - if(windowName==null) windowName=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); - } - } -} Copied: epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/structure/MOPConsumerStructureProvider.java (from rev 7064, epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/structure/MOPConsumerStructureProvider.java) =================================================================== --- epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/structure/MOPConsumerStructureProvider.java (rev 0) +++ epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/structure/MOPConsumerStructureProvider.java 2011-08-13 06:32:51 UTC (rev 7065) @@ -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); + } + } +} Deleted: epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/extension-component/src/main/resources/conf/wsrp-producer-config.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-component/src/main/resources/conf/wsrp-producer-config.xml 2011-08-09 23:32:42 UTC (rev 7035) +++ epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/extension-component/src/main/resources/conf/wsrp-producer-config.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -1,35 +0,0 @@ - - - -<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> - -  -  \ No newline at end of file Copied: epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/extension-component/src/main/resources/conf/wsrp-producer-config.xml (from rev 7064, epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-component/src/main/resources/conf/wsrp-producer-config.xml) =================================================================== --- epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/extension-component/src/main/resources/conf/wsrp-producer-config.xml (rev 0) +++ epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/extension-component/src/main/resources/conf/wsrp-producer-config.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -0,0 +1,35 @@ + + + +<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> + +  +  Deleted: epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/extension-component/src/test/java/org/gatein/integration/wsrp/structure/MOPConsumerStructureProviderTestCase.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-component/src/test/java/org/gatein/integration/wsrp/structure/MOPConsumerStructureProviderTestCase.java 2011-08-09 23:32:42 UTC (rev 7035) +++ epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/extension-component/src/test/java/org/gatein/integration/wsrp/structure/MOPConsumerStructureProviderTestCase.java 2011-08-13 06:32:51 UTC (rev 7065) @@ -1,302 +0,0 @@ -/* - * 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 = "/app.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"; - } -} Copied: epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/extension-component/src/test/java/org/gatein/integration/wsrp/structure/MOPConsumerStructureProviderTestCase.java (from rev 7064, epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-component/src/test/java/org/gatein/integration/wsrp/structure/MOPConsumerStructureProviderTestCase.java) =================================================================== --- epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/extension-component/src/test/java/org/gatein/integration/wsrp/structure/MOPConsumerStructureProviderTestCase.java (rev 0) +++ epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/extension-component/src/test/java/org/gatein/integration/wsrp/structure/MOPConsumerStructureProviderTestCase.java 2011-08-13 06:32:51 UTC (rev 7065) @@ -0,0 +1,303 @@ +/* + * 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 = "/app.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"; + } +} Deleted: epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/extension-config/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-config/pom.xml 2011-08-09 23:32:42 UTC (rev 7035) +++ epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/extension-config/pom.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -1,41 +0,0 @@ - - -<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>5.2.0-epp-DEV02-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 Copied: epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/extension-config/pom.xml (from rev 7064, epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-config/pom.xml) =================================================================== --- epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/extension-config/pom.xml (rev 0) +++ epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/extension-config/pom.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -0,0 +1,41 @@ + + +<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>5.2.0-epp-DEV02</version> + </parent> + + <artifactId>extension-config</artifactId> + <name>GateIn WSRP Integration extension config</name> + + + <build> + <finalName>extension-config</finalName> + </build> + +</project> Deleted: epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/extension-config/src/main/resources/conf/configuration.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-config/src/main/resources/conf/configuration.xml 2011-08-09 23:32:42 UTC (rev 7035) +++ epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/extension-config/src/main/resources/conf/configuration.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -1,59 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<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> -  - <target-component>org.exoplatform.container.definition.PortalContainerConfig</target-component> - <component-plugin> -  - <name>Change PortalContainer Definitions</name> -  - <set-method>registerChangePlugin</set-method> -  - <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"> -  - <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 Copied: epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/extension-config/src/main/resources/conf/configuration.xml (from rev 7064, epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-config/src/main/resources/conf/configuration.xml) =================================================================== --- epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/extension-config/src/main/resources/conf/configuration.xml (rev 0) +++ epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/extension-config/src/main/resources/conf/configuration.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -0,0 +1,59 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<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> +  + <target-component>org.exoplatform.container.definition.PortalContainerConfig</target-component> + <component-plugin> +  + <name>Change PortalContainer Definitions</name> +  + <set-method>registerChangePlugin</set-method> +  + <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"> +  + <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> Modified: epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/extension-ear/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear/pom.xml 2011-08-09 23:32:42 UTC (rev 7035) +++ epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/extension-ear/pom.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -28,7 +28,7 @@ <parent> <artifactId>gatein-wsrp-integration-parent</artifactId> <groupId>org.gatein.integration</groupId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV02</version> </parent> <artifactId>extension-ear</artifactId> Deleted: epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/extension-ear/src/main/application/META-INF/jboss-scanning.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear/src/main/application/META-INF/jboss-scanning.xml 2011-08-09 23:32:42 UTC (rev 7035) +++ epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/extension-ear/src/main/application/META-INF/jboss-scanning.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -1,25 +0,0 @@ - - -<scanning xmlns="urn:jboss:scanning:1.0"> -</scanning> \ No newline at end of file Copied: epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/extension-ear/src/main/application/META-INF/jboss-scanning.xml (from rev 7064, epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear/src/main/application/META-INF/jboss-scanning.xml) =================================================================== --- epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/extension-ear/src/main/application/META-INF/jboss-scanning.xml (rev 0) +++ epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/extension-ear/src/main/application/META-INF/jboss-scanning.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -0,0 +1,25 @@ + + +<scanning xmlns="urn:jboss:scanning:1.0"> +</scanning> Modified: epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/extension-ear-as5/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear-as5/pom.xml 2011-08-13 04:07:17 UTC (rev 7064) +++ epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/extension-ear-as5/pom.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -27,7 +27,7 @@ <parent> <groupId>org.gatein.integration</groupId> <artifactId>gatein-wsrp-integration-parent</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV02</version> </parent> <artifactId>extension-ear-as5</artifactId> Modified: epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/extension-war/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-war/pom.xml 2011-08-09 23:32:42 UTC (rev 7035) +++ epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/extension-war/pom.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -28,7 +28,7 @@ <parent> <artifactId>gatein-wsrp-integration-parent</artifactId> <groupId>org.gatein.integration</groupId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV02</version> </parent> <artifactId>extension-war</artifactId> Deleted: epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/configuration.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/configuration.xml 2011-08-09 23:32:42 UTC (rev 7035) +++ epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/configuration.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -1,34 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> - - -<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> - -  - <import>war:/conf/admin/admin-configuration.xml</import> -</configuration> Copied: epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/configuration.xml (from rev 7064, epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/configuration.xml) =================================================================== --- epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/configuration.xml (rev 0) +++ epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/configuration.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> + + +<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> Deleted: epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/consumers-configuration-nodetypes.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/consumers-configuration-nodetypes.xml 2011-08-09 23:32:42 UTC (rev 7035) +++ epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/consumers-configuration-nodetypes.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -1,191 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> - - - -<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> - <propertyDefinition name="enablewss" requiredType="boolean" 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 Copied: epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/consumers-configuration-nodetypes.xml (from rev 7064, epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/consumers-configuration-nodetypes.xml) =================================================================== --- epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/consumers-configuration-nodetypes.xml (rev 0) +++ epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/consumers-configuration-nodetypes.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -0,0 +1,191 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> + + + +<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> + <propertyDefinition name="enablewss" requiredType="boolean" 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> Deleted: epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/migration-nodetypes.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/migration-nodetypes.xml 2011-08-09 23:32:42 UTC (rev 7035) +++ epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/migration-nodetypes.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -1,114 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> - - - -<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 Copied: epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/migration-nodetypes.xml (from rev 7064, epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/migration-nodetypes.xml) =================================================================== --- epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/migration-nodetypes.xml (rev 0) +++ epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/migration-nodetypes.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -0,0 +1,114 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> + + + +<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> Deleted: epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/producer-configuration-nodetypes.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/producer-configuration-nodetypes.xml 2011-08-09 23:32:42 UTC (rev 7035) +++ epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/producer-configuration-nodetypes.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -1,141 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> - - - -<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 Copied: epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/producer-configuration-nodetypes.xml (from rev 7064, epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/producer-configuration-nodetypes.xml) =================================================================== --- epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/producer-configuration-nodetypes.xml (rev 0) +++ epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/producer-configuration-nodetypes.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -0,0 +1,141 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> + + + +<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> Deleted: epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/producer-registrations-nodetypes.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/producer-registrations-nodetypes.xml 2011-08-09 23:32:42 UTC (rev 7035) +++ epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/producer-registrations-nodetypes.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -1,198 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> - - - -<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> -  - <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 Copied: epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/producer-registrations-nodetypes.xml (from rev 7064, epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/producer-registrations-nodetypes.xml) =================================================================== --- epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/producer-registrations-nodetypes.xml (rev 0) +++ epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/producer-registrations-nodetypes.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -0,0 +1,198 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> + + + +<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> +  + <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> Deleted: epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/wsrp-configuration.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/wsrp-configuration.xml 2011-08-09 23:32:42 UTC (rev 7035) +++ epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/wsrp-configuration.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -1,229 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> - - -<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> - -  - <component> - <type>org.gatein.portal.wsrp.wss.JBoss5WSSServiceIntegration</type> - </component> - - - <external-component-plugins> - <target-component>org.exoplatform.services.jcr.RepositoryService</target-component> - <component-plugin> - <name>add.namespaces</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.jcr.impl.AddNamespacesPlugin</type> - <init-params> - <properties-param> - <name>namespaces</name> - <property name="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> -  - <name>new.portal.config.user.listener</name> -  - <set-method>initListener</set-method> -  - <type>org.exoplatform.portal.config.NewPortalConfigListener</type> - <description>this listener init the portal configuration</description> - <init-params> - <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> - - -  - -</configuration> Copied: epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/wsrp-configuration.xml (from rev 7064, epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/wsrp-configuration.xml) =================================================================== --- epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/wsrp-configuration.xml (rev 0) +++ epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/wsrp-configuration.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -0,0 +1,223 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> + + +<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> +  + <name>new.portal.config.user.listener</name> +  + <set-method>initListener</set-method> +  + <type>org.exoplatform.portal.config.NewPortalConfigListener</type> + <description>this listener init the portal configuration</description> + <init-params> + <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> + + +  + +</configuration> Deleted: epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/extension-war/src/main/webapp/WEB-INF/web.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-war/src/main/webapp/WEB-INF/web.xml 2011-08-09 23:32:42 UTC (rev 7035) +++ epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/extension-war/src/main/webapp/WEB-INF/web.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -1,38 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<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-class>org.exoplatform.container.web.PortalContainerConfigOwner</listener-class> - </listener> -</web-app> \ No newline at end of file Copied: epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/extension-war/src/main/webapp/WEB-INF/web.xml (from rev 7064, epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-war/src/main/webapp/WEB-INF/web.xml) =================================================================== --- epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/extension-war/src/main/webapp/WEB-INF/web.xml (rev 0) +++ epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/extension-war/src/main/webapp/WEB-INF/web.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<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-class>org.exoplatform.container.web.PortalContainerConfigOwner</listener-class> + </listener> +</web-app> Copied: epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/extension-war/web/portal/src/main/webapp/WEB-INF/conf/admin/admin-configuration.xml (from rev 7064, epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-war/web/portal/src/main/webapp/WEB-INF/conf/admin/admin-configuration.xml) =================================================================== Deleted: epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/pom.xml 2011-08-09 23:32:42 UTC (rev 7035) +++ epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/pom.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -1,106 +0,0 @@ - - -<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> - - <packaging>pom</packaging> - - <parent> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> - </parent> - - <description>GateIn WSRP Integration extension parent</description> - - <profiles> - <profile> - <id>default</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <modules> - <module>extension-config</module> - <module>extension-component</module> - <module>extension-war</module> - <module>extension-ear-as5</module> - <module>extension-ear-as6</module> - </modules> - </profile> - <profile> - <id>pkg-tomcat</id> - <modules/> - </profile> - <profile> - <id>pkg-tomcat7</id> - <modules/> - </profile> - <profile> - <id>pkg-jetty</id> - <modules/> - </profile> - <profile> - <id>pkg-jbossas</id> - <modules> - <module>extension-config</module> - <module>extension-component</module> - <module>extension-war</module> - <module>extension-ear-as5</module> - </modules> - </profile> - <profile> - <id>pkg-jbossas6</id> - <modules> - <module>extension-config</module> - <module>extension-component</module> - <module>extension-war</module> - <module>extension-ear-as6</module> - </modules> - </profile> - <profile> - <id>pkg-jbossas5</id> - <modules> - <module>extension-config</module> - <module>extension-component</module> - <module>extension-war</module> - <module>extension-ear-as5</module> - </modules> - </profile> - <profile> - <id>epp-distribution</id> - <modules> - <module>extension-config</module> - <module>extension-component</module> - <module>extension-war</module> - <module>extension-ear</module> - </modules> - </profile> - </profiles> -</project> \ No newline at end of file Copied: epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/pom.xml (from rev 7064, epp/portal/branches/EPP_5_2_Branch/wsrp-integration/pom.xml) =================================================================== --- epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/pom.xml (rev 0) +++ epp/portal/tags/EPP_5_2_0_Dev02/wsrp-integration/pom.xml 2011-08-13 06:32:51 UTC (rev 7065) @@ -0,0 +1,49 @@ + + +<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> + + <packaging>pom</packaging> + + <parent> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.parent</artifactId> + <version>5.2.0-epp-DEV02</version> + </parent> + + <description>GateIn WSRP Integration extension parent</description> + <modules> + <module>extension-config</module> + <module>extension-component</module> + <module>extension-war</module> + <module>extension-ear</module> + <module>extension-ear-as5</module> + </modules> +</project>

13 years, 4 months

1
0
0 / 0

gatein SVN: r7064 - in epp/portal/branches/EPP_5_2_Branch: component and 23 other directories.

by do-not-reply＠jboss.org

Author: hfnukal Date: 2011-08-13 00:07:17 -0400 (Sat, 13 Aug 2011) New Revision: 7064 Added: epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear-as5/ epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear-as5/pom.xml epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear-as5/src/ epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear-as5/src/main/ epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear-as5/src/main/application/ epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear-as5/src/main/application/META-INF/ epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear-as5/src/main/application/META-INF/gatein-wsse-consumer.xml epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear-as5/src/main/application/META-INF/jboss-scanning.xml epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear-as5/src/main/application/lib/ epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear-as5/src/main/application/lib/jboss5integration.jar/ epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear-as5/src/main/application/lib/jboss5integration.jar/conf/ epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear-as5/src/main/application/lib/jboss5integration.jar/conf/configuration.xml epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-war/web/portal/src/main/webapp/WEB-INF/conf/admin/admin-configuration.xml Modified: epp/portal/branches/EPP_5_2_Branch/component/ epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/pom.xml epp/portal/branches/EPP_5_2_Branch/pom.xml epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/configuration.xml epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-component/pom.xml epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/WSRPServiceIntegration.java epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/structure/MOPConsumerStructureProvider.java epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-component/src/main/resources/conf/wsrp-producer-config.xml epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-component/src/test/java/org/gatein/integration/wsrp/structure/MOPConsumerStructureProviderTestCase.java epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-config/pom.xml epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-config/src/main/resources/conf/configuration.xml epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear/src/main/application/META-INF/jboss-scanning.xml epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/configuration.xml epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/consumers-configuration-nodetypes.xml epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/migration-nodetypes.xml epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/producer-configuration-nodetypes.xml epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/producer-registrations-nodetypes.xml epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/wsrp-configuration.xml epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-war/src/main/webapp/WEB-INF/web.xml epp/portal/branches/EPP_5_2_Branch/wsrp-integration/pom.xml Log: JBEPP-972 Upgrade WSRP Component to the latest Property changes on: epp/portal/branches/EPP_5_2_Branch/component ___________________________________________________________________ Modified: svn:mergeinfo - /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795/component:5868 /portal/branches/branch-GTNPORTAL-1592/component:4894 /portal/branches/branch-GTNPORTAL-1643/component:5002,5063,5167 /portal/branches/branch-GTNPORTAL-1700/component:5348,5363,5402,5445 /portal/branches/branch-GTNPORTAL-1731/component:5622,5668 /portal/branches/branch-GTNPORTAL-1745/component:5765 /portal/branches/branch-GTNPORTAL-1822/component:5943,5952 /portal/branches/branch-GTNPORTAL-1832/component:6030,6063 /portal/branches/branch-GTNPORTAL-1872/component:6400,6551 /portal/branches/branch-GTNPORTAL-1921/component:6603 /portal/branches/branch-GTNPORTAL-1963/component:6904,6915-6916 /portal/trunk/component:4891,5744,5822,5943,6031,6033,6168,6196,6201-6203,6205-6206,6437,6440,6449,6452,6573,6783-6784 + /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795/component:5868 /portal/branches/branch-GTNPORTAL-1592/component:4894 /portal/branches/branch-GTNPORTAL-1643/component:5002,5063,5167 /portal/branches/branch-GTNPORTAL-1700/component:5348,5363,5402,5445 /portal/branches/branch-GTNPORTAL-1731/component:5622,5668 /portal/branches/branch-GTNPORTAL-1745/component:5765 /portal/branches/branch-GTNPORTAL-1822/component:5943,5952 /portal/branches/branch-GTNPORTAL-1832/component:6030,6063 /portal/branches/branch-GTNPORTAL-1872/component:6400,6551 /portal/branches/branch-GTNPORTAL-1921/component:6603 /portal/branches/branch-GTNPORTAL-1963/component:6904,6915-6916 /portal/trunk/component:4891,5744,5822,5943,6031,6033,6168,6196,6201-6203,6205-6206,6292,6437,6440,6449,6452,6573,6783-6784 Modified: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/pom.xml 2011-08-13 04:00:59 UTC (rev 7063) +++ epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/pom.xml 2011-08-13 04:07:17 UTC (rev 7064) @@ -27,14 +27,15 @@ <version>${project.version}</version> <type>ear</type> </dependency> - <dependency> - <?move gatein-wsrp-integration.ear?> - <groupId>org.gatein.integration</groupId> - <artifactId>extension-ear</artifactId> - <type>ear</type> - <version>${project.version}</version> - </dependency> - +  + <dependency> + <?move gatein-wsrp-integration.ear?> + <groupId>org.gatein.integration</groupId> + <artifactId>extension-ear-as5</artifactId> + <type>ear</type> + <version>${project.version}</version> + </dependency> + </dependencies> <build> Modified: epp/portal/branches/EPP_5_2_Branch/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/pom.xml 2011-08-13 04:00:59 UTC (rev 7063) +++ epp/portal/branches/EPP_5_2_Branch/pom.xml 2011-08-13 04:07:17 UTC (rev 7064) @@ -80,10 +80,10 @@ <module>portlet</module> <module>web</module> <module>server</module> - <module>wsrp-integration</module> <module>examples</module> <module>starter</module> <module>packaging</module> + <module>wsrp-integration</module> <module>testsuite</module> <module>distribution</module> </modules> Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/configuration.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/configuration.xml 2011-08-13 04:00:59 UTC (rev 7063) +++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/configuration.xml 2011-08-13 04:07:17 UTC (rev 7064) @@ -27,7 +27,6 @@ <import>war:/conf/common/common-configuration.xml</import> <import>war:/conf/common/resource-compressor-configuration.xml</import> <import>war:/conf/common/portlet-container-configuration.xml</import> - <import profiles="jboss">war:/conf/wsrp/wsrp-configuration.xml</import> <import>war:/conf/common/logs-configuration.xml</import> <import>war:/conf/common/autologin-configuration.xml</import> <import>war:/conf/common/remindpwd-configuration.xml</import> Modified: epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-component/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-component/pom.xml 2011-08-13 04:00:59 UTC (rev 7063) +++ epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-component/pom.xml 2011-08-13 04:07:17 UTC (rev 7064) @@ -47,12 +47,6 @@ <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp-consumer</artifactId> <scope>provided</scope> - <exclusions> - <exclusion> - <groupId>apache-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.gatein.wsrp</groupId> @@ -62,7 +56,6 @@ <dependency> <groupId>org.gatein.mop</groupId> <artifactId>mop-api</artifactId> - <scope>provided</scope> </dependency> <dependency> <groupId>org.gatein.wsrp</groupId> @@ -75,11 +68,6 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-wss</artifactId> - <scope>provided</scope> - </dependency> - <dependency> <groupId>org.gatein.pc</groupId> <artifactId>pc-api</artifactId> <scope>provided</scope> @@ -113,19 +101,12 @@ <dependency> <groupId>org.gatein.wci</groupId> <artifactId>wci-wci</artifactId> - <scope>provided</scope> </dependency> <dependency> <groupId>org.jboss.ws.native</groupId> <artifactId>jbossws-native-core</artifactId> <version>3.1.2.GA</version> <scope>provided</scope> - <exclusions> - <exclusion> - <groupId>wscommons-policy</groupId> - <artifactId>policy</artifactId> - </exclusion> - </exclusions> </dependency>  Modified: epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/WSRPServiceIntegration.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/WSRPServiceIntegration.java 2011-08-13 04:00:59 UTC (rev 7063) +++ epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/WSRPServiceIntegration.java 2011-08-13 04:07:17 UTC (rev 7064) @@ -387,4 +387,4 @@ } } -} \ No newline at end of file +} Modified: epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/structure/MOPConsumerStructureProvider.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/structure/MOPConsumerStructureProvider.java 2011-08-13 04:00:59 UTC (rev 7063) +++ epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/structure/MOPConsumerStructureProvider.java 2011-08-13 04:07:17 UTC (rev 7064) @@ -272,9 +272,6 @@ public void addWindow(String windowName, String uuid) { - - if(windowName==null) windowName=uuid; - // add suffix in case we have several windows with the same name in the page if (childrenWindows.containsKey(windowName)) { Modified: epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-component/src/main/resources/conf/wsrp-producer-config.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-component/src/main/resources/conf/wsrp-producer-config.xml 2011-08-13 04:00:59 UTC (rev 7063) +++ epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-component/src/main/resources/conf/wsrp-producer-config.xml 2011-08-13 04:07:17 UTC (rev 7064) @@ -32,4 +32,4 @@ </producer-configuration>  -  \ No newline at end of file +  Modified: epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-component/src/test/java/org/gatein/integration/wsrp/structure/MOPConsumerStructureProviderTestCase.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-component/src/test/java/org/gatein/integration/wsrp/structure/MOPConsumerStructureProviderTestCase.java 2011-08-13 04:00:59 UTC (rev 7063) +++ epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-component/src/test/java/org/gatein/integration/wsrp/structure/MOPConsumerStructureProviderTestCase.java 2011-08-13 04:07:17 UTC (rev 7064) @@ -47,7 +47,8 @@ * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> * @version $Revision$ */ -public class MOPConsumerStructureProviderTestCase extends TestCase +public class + MOPConsumerStructureProviderTestCase extends TestCase { private MOPConsumerStructureProvider provider; private PortalStructureAccess structureAccess; Modified: epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-config/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-config/pom.xml 2011-08-13 04:00:59 UTC (rev 7063) +++ epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-config/pom.xml 2011-08-13 04:07:17 UTC (rev 7064) @@ -38,4 +38,4 @@ <finalName>extension-config</finalName> </build> -</project> \ No newline at end of file +</project> Modified: epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-config/src/main/resources/conf/configuration.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-config/src/main/resources/conf/configuration.xml 2011-08-13 04:00:59 UTC (rev 7063) +++ epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-config/src/main/resources/conf/configuration.xml 2011-08-13 04:07:17 UTC (rev 7064) @@ -56,4 +56,4 @@ </init-params> </component-plugin> </external-component-plugins> -</configuration> \ No newline at end of file +</configuration> Modified: epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear/src/main/application/META-INF/jboss-scanning.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear/src/main/application/META-INF/jboss-scanning.xml 2011-08-13 04:00:59 UTC (rev 7063) +++ epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear/src/main/application/META-INF/jboss-scanning.xml 2011-08-13 04:07:17 UTC (rev 7064) @@ -22,4 +22,4 @@ --> <scanning xmlns="urn:jboss:scanning:1.0"> -</scanning> \ No newline at end of file +</scanning> Added: epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear-as5/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear-as5/pom.xml (rev 0) +++ epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear-as5/pom.xml 2011-08-13 04:07:17 UTC (rev 7064) @@ -0,0 +1,198 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.gatein.integration</groupId> + <artifactId>gatein-wsrp-integration-parent</artifactId> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> + </parent> + + <artifactId>extension-ear-as5</artifactId> + <packaging>ear</packaging> + + <name>GateIn WSRP Integration extension EAR for JBoss AS 5</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-jb5wss</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> + <exclusions> + <exclusion> + <groupId>apache-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + </exclusion> + </exclusions> + </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> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-wss</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-jb5wss</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> + <jarModule> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-wss</artifactId> + </jarModule> + </modules> + </configuration> + </plugin> + </plugins> + <finalName>gatein-wsrp-integration</finalName> + </build> + +</project> Added: epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear-as5/src/main/application/META-INF/gatein-wsse-consumer.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear-as5/src/main/application/META-INF/gatein-wsse-consumer.xml (rev 0) +++ epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear-as5/src/main/application/META-INF/gatein-wsse-consumer.xml 2011-08-13 04:07:17 UTC (rev 7064) @@ -0,0 +1,8 @@ + <jboss-ws-security xmlns="http://www.jboss.com/ws-security/config" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.jboss.com/ws-security/config + http://www.jboss.com/ws-security/schema/jboss-ws-security_1_0.xsd"> + +  + +</jboss-ws-security> Added: epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear-as5/src/main/application/META-INF/jboss-scanning.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear-as5/src/main/application/META-INF/jboss-scanning.xml (rev 0) +++ epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear-as5/src/main/application/META-INF/jboss-scanning.xml 2011-08-13 04:07:17 UTC (rev 7064) @@ -0,0 +1,25 @@ + + +<scanning xmlns="urn:jboss:scanning:1.0"> +</scanning> \ No newline at end of file Added: epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear-as5/src/main/application/lib/jboss5integration.jar/conf/configuration.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear-as5/src/main/application/lib/jboss5integration.jar/conf/configuration.xml (rev 0) +++ epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear-as5/src/main/application/lib/jboss5integration.jar/conf/configuration.xml 2011-08-13 04:07:17 UTC (rev 7064) @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> + + +<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> + <type>org.gatein.integration.wsrp.wss.JBoss5WSSServiceIntegration</type> + </component> + +</configuration> Modified: epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/configuration.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/configuration.xml 2011-08-13 04:00:59 UTC (rev 7063) +++ epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/configuration.xml 2011-08-13 04:07:17 UTC (rev 7064) @@ -28,7 +28,4 @@ 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> - -  - <import>war:/conf/admin/admin-configuration.xml</import> </configuration> Modified: epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/consumers-configuration-nodetypes.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/consumers-configuration-nodetypes.xml 2011-08-13 04:00:59 UTC (rev 7063) +++ epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/consumers-configuration-nodetypes.xml 2011-08-13 04:07:17 UTC (rev 7064) @@ -188,4 +188,4 @@ </propertyDefinitions> </nodeType> -</nodeTypes> \ No newline at end of file +</nodeTypes> Modified: epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/migration-nodetypes.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/migration-nodetypes.xml 2011-08-13 04:00:59 UTC (rev 7063) +++ epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/migration-nodetypes.xml 2011-08-13 04:07:17 UTC (rev 7064) @@ -111,4 +111,4 @@ </propertyDefinition> </propertyDefinitions> </nodeType> -</nodeTypes> \ No newline at end of file +</nodeTypes> Modified: epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/producer-configuration-nodetypes.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/producer-configuration-nodetypes.xml 2011-08-13 04:00:59 UTC (rev 7063) +++ epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/producer-configuration-nodetypes.xml 2011-08-13 04:07:17 UTC (rev 7064) @@ -138,4 +138,4 @@ </propertyDefinitions> </nodeType> -</nodeTypes> \ No newline at end of file +</nodeTypes> Modified: epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/producer-registrations-nodetypes.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/producer-registrations-nodetypes.xml 2011-08-13 04:00:59 UTC (rev 7063) +++ epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/producer-registrations-nodetypes.xml 2011-08-13 04:07:17 UTC (rev 7064) @@ -195,4 +195,4 @@ </propertyDefinitions> </nodeType> -</nodeTypes> \ No newline at end of file +</nodeTypes> Modified: epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/wsrp-configuration.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/wsrp-configuration.xml 2011-08-13 04:00:59 UTC (rev 7063) +++ epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/wsrp-configuration.xml 2011-08-13 04:07:17 UTC (rev 7064) @@ -44,12 +44,6 @@ </init-params> </component> -  - <component> - <type>org.gatein.portal.wsrp.wss.JBoss5WSSServiceIntegration</type> - </component> - - <external-component-plugins> <target-component>org.exoplatform.services.jcr.RepositoryService</target-component> <component-plugin> Modified: epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-war/src/main/webapp/WEB-INF/web.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-war/src/main/webapp/WEB-INF/web.xml 2011-08-13 04:00:59 UTC (rev 7063) +++ epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-war/src/main/webapp/WEB-INF/web.xml 2011-08-13 04:07:17 UTC (rev 7064) @@ -35,4 +35,4 @@ <listener> <listener-class>org.exoplatform.container.web.PortalContainerConfigOwner</listener-class> </listener> -</web-app> \ No newline at end of file +</web-app> Added: epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-war/web/portal/src/main/webapp/WEB-INF/conf/admin/admin-configuration.xml =================================================================== Modified: epp/portal/branches/EPP_5_2_Branch/wsrp-integration/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/pom.xml 2011-08-13 04:00:59 UTC (rev 7063) +++ epp/portal/branches/EPP_5_2_Branch/wsrp-integration/pom.xml 2011-08-13 04:07:17 UTC (rev 7064) @@ -39,68 +39,11 @@ </parent> <description>GateIn WSRP Integration extension parent</description> - - <profiles> - <profile> - <id>default</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <modules> - <module>extension-config</module> - <module>extension-component</module> - <module>extension-war</module> - <module>extension-ear-as5</module> - <module>extension-ear-as6</module> - </modules> - </profile> - <profile> - <id>pkg-tomcat</id> - <modules/> - </profile> - <profile> - <id>pkg-tomcat7</id> - <modules/> - </profile> - <profile> - <id>pkg-jetty</id> - <modules/> - </profile> - <profile> - <id>pkg-jbossas</id> - <modules> - <module>extension-config</module> - <module>extension-component</module> - <module>extension-war</module> - <module>extension-ear-as5</module> - </modules> - </profile> - <profile> - <id>pkg-jbossas6</id> - <modules> - <module>extension-config</module> - <module>extension-component</module> - <module>extension-war</module> - <module>extension-ear-as6</module> - </modules> - </profile> - <profile> - <id>pkg-jbossas5</id> - <modules> - <module>extension-config</module> - <module>extension-component</module> - <module>extension-war</module> - <module>extension-ear-as5</module> - </modules> - </profile> - <profile> - <id>epp-distribution</id> - <modules> - <module>extension-config</module> - <module>extension-component</module> - <module>extension-war</module> - <module>extension-ear</module> - </modules> - </profile> - </profiles> -</project> \ No newline at end of file + <modules> + <module>extension-config</module> + <module>extension-component</module> + <module>extension-war</module> + <module>extension-ear</module> + <module>extension-ear-as5</module> + </modules> +</project>

13 years, 4 months

1
0
0 / 0

gatein SVN: r7063 - in epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-war: web and 6 other directories.

by do-not-reply＠jboss.org

Author: hfnukal Date: 2011-08-13 00:00:59 -0400 (Sat, 13 Aug 2011) New Revision: 7063 Added: epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-war/web/ epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-war/web/portal/ epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-war/web/portal/src/ epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-war/web/portal/src/main/ epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-war/web/portal/src/main/webapp/ epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-war/web/portal/src/main/webapp/WEB-INF/ epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-war/web/portal/src/main/webapp/WEB-INF/conf/ epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-war/web/portal/src/main/webapp/WEB-INF/conf/admin/ Log: JBEPP-1037 Can we also get the work done for GTNPORTAL-1706 in, please? (r6010 and r6136)

13 years, 4 months

1
0
0 / 0

gatein SVN: r7062 - epp/portal/branches.

by do-not-reply＠jboss.org

Author: ghjboss Date: 2011-08-12 15:59:51 -0400 (Fri, 12 Aug 2011) New Revision: 7062 Added: epp/portal/branches/EPP_5_1_0_GA_JBEPP-1071/ Log: create branch for the support patch https://issues.jboss.org/browse/JBEPP-1071

13 years, 4 months

1
0
0 / 0

gatein SVN: r7061 - in portal/trunk/component/portal/src: main/java/org/exoplatform/portal/mop/importer and 1 other directories.

by do-not-reply＠jboss.org

Author: nscavell Date: 2011-08-12 15:48:51 -0400 (Fri, 12 Aug 2011) New Revision: 7061 Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/mop/description/DescriptionServiceImpl.java portal/trunk/component/portal/src/main/java/org/exoplatform/portal/mop/importer/NavigationFragmentImporter.java portal/trunk/component/portal/src/test/java/org/exoplatform/portal/mop/importer/TestNavigationImporter.java Log: GTNPORTAL-2000: Navigation Importer doesn't update extended labels during import. Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/mop/description/DescriptionServiceImpl.java =================================================================== --- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/mop/description/DescriptionServiceImpl.java 2011-08-12 14:07:17 UTC (rev 7060) +++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/mop/description/DescriptionServiceImpl.java 2011-08-12 19:48:51 UTC (rev 7061) @@ -187,10 +187,15 @@ { cache.removeState(new CacheKey(locale, id)); } - for (Map.Entry<Locale, Described.State> entry : descriptions.entrySet()) + + // Interface specifies it allows a null description map + if (descriptions != null) { - Described described = able.addI18NMixin(Described.class, entry.getKey()); - described.setState(entry.getValue()); + for (Map.Entry<Locale, Described.State> entry : descriptions.entrySet()) + { + Described described = able.addI18NMixin(Described.class, entry.getKey()); + described.setState(entry.getValue()); + } } } } Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/mop/importer/NavigationFragmentImporter.java =================================================================== --- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/mop/importer/NavigationFragmentImporter.java 2011-08-12 14:07:17 UTC (rev 7060) +++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/mop/importer/NavigationFragmentImporter.java 2011-08-12 19:48:51 UTC (rev 7061) @@ -257,7 +257,7 @@ // if (config.updatedSame) { - dstChild.setState(srcChild.getState()); + update(srcChild, dstChild, labelMap); } // @@ -280,7 +280,7 @@ { if (config.updatedSame) { - dstChild.setState(srcChild.getState()); + update(srcChild, dstChild, labelMap); } previousChild = dstChild; } @@ -362,4 +362,39 @@ // return child; } + + private void update(PageNode src, NodeContext<?> target, + Map<NodeContext<?>, Map<Locale, Described.State>> labelMap) + { + target.setState(src.getState()); + + // Update extended labels if necessary + I18NString labels = src.getLabels(); + Map<Locale, Described.State> description; + if (labels.isSimple()) + { + description = null; + } + else if (labels.isEmpty()) + { + description = null; + } + else + { + description = new HashMap<Locale, Described.State>(); + for (Map.Entry<Locale, String> entry : labels.getExtended(portalLocale).entrySet()) + { + description.put(entry.getKey(), new Described.State(entry.getValue(), null)); + } + } + + if (description != null) + { + labelMap.put(target, description); + } + else + { + labelMap.put(target, Collections.<Locale, Described.State>emptyMap()); + } + } } Modified: portal/trunk/component/portal/src/test/java/org/exoplatform/portal/mop/importer/TestNavigationImporter.java =================================================================== --- portal/trunk/component/portal/src/test/java/org/exoplatform/portal/mop/importer/TestNavigationImporter.java 2011-08-12 14:07:17 UTC (rev 7060) +++ portal/trunk/component/portal/src/test/java/org/exoplatform/portal/mop/importer/TestNavigationImporter.java 2011-08-12 19:48:51 UTC (rev 7061) @@ -338,6 +338,84 @@ Map<Locale, Described.State> cDesc = descriptionService.getDescriptions(c.getId()); assertNull(cDesc); assertEquals("c_en", c.getState().getLabel()); + + //----------------- Now test extended labels merge -----------------// + src = new PageNavigation("portal", "extended_label").addFragment(fragment().add(node("a"), node("b"), node("c")).build()); + fragment = src.getFragment(); + fragment.getNode("a").setLabels(new I18NString(new LocalizedString("a_it", Locale.ITALIAN), new LocalizedString("a_de", Locale.GERMAN))); + fragment.getNode("b").setLabels(new I18NString(new LocalizedString("foo_b_en"), new LocalizedString("b_it", Locale.ITALIAN))); + fragment.getNode("c").setLabels(new I18NString(new LocalizedString("foo_c_en"))); + src.setOwnerId("extended_label"); + + importer = new NavigationImporter(Locale.ENGLISH, ImportMode.MERGE, src, service, descriptionService); + importer.perform(); + + // + ctx = service.loadNavigation(SiteKey.portal("extended_label")); + node = service.loadNode(NodeModel.SELF_MODEL, ctx, Scope.ALL, null).getNode(); + + // The fully explicit case + a = (NodeContext<?>)node.getNode("a"); + aDesc = descriptionService.getDescriptions(a.getId()); + assertNotNull(aDesc); + assertEquals(Tools.toSet(Locale.ITALIAN, Locale.GERMAN), aDesc.keySet()); + assertEquals(new Described.State("a_it", null), aDesc.get(Locale.ITALIAN)); + assertEquals(new Described.State("a_de", null), aDesc.get(Locale.GERMAN)); + assertNull(a.getState().getLabel()); + + // No explicit language means to use the portal locale + b = (NodeContext<?>)node.getNode("b"); + bDesc = descriptionService.getDescriptions(b.getId()); + assertNotNull(bDesc); + assertEquals(Tools.toSet(Locale.ENGLISH, Locale.ITALIAN), bDesc.keySet()); + assertEquals(new Described.State("foo_b_en", null), bDesc.get(Locale.ENGLISH)); + assertEquals(new Described.State("b_it", null), bDesc.get(Locale.ITALIAN)); + assertNull(b.getState().getLabel()); + + // The simple use case : one single label without the xml:lang attribute + c = (NodeContext<?>)node.getNode("c"); + cDesc = descriptionService.getDescriptions(c.getId()); + assertNull(cDesc); + assertEquals("foo_c_en", c.getState().getLabel()); + + //----------------- Now test extended labels overwrite -----------------// + src = new PageNavigation("portal", "extended_label").addFragment(fragment().add(node("a"), node("b"), node("c")).build()); + fragment = src.getFragment(); + fragment.getNode("a").setLabels(new I18NString(new LocalizedString("bar_a_en", Locale.ENGLISH), new LocalizedString("bar_a_fr", Locale.FRENCH))); + fragment.getNode("b").setLabels(new I18NString(new LocalizedString("bar_b_en"), new LocalizedString("bar_b_fr", Locale.FRENCH))); + fragment.getNode("c").setLabels(new I18NString(new LocalizedString("bar_c_en"))); + src.setOwnerId("extended_label"); + + importer = new NavigationImporter(Locale.ENGLISH, ImportMode.OVERWRITE, src, service, descriptionService); + importer.perform(); + + // + ctx = service.loadNavigation(SiteKey.portal("extended_label")); + node = service.loadNode(NodeModel.SELF_MODEL, ctx, Scope.ALL, null).getNode(); + + // The fully explicit case + a = (NodeContext<?>)node.getNode("a"); + aDesc = descriptionService.getDescriptions(a.getId()); + assertNotNull(aDesc); + assertEquals(Tools.toSet(Locale.ENGLISH, Locale.FRENCH), aDesc.keySet()); + assertEquals(new Described.State("bar_a_en", null), aDesc.get(Locale.ENGLISH)); + assertEquals(new Described.State("bar_a_fr", null), aDesc.get(Locale.FRENCH)); + assertNull(a.getState().getLabel()); + + // No explicit language means to use the portal locale + b = (NodeContext<?>)node.getNode("b"); + bDesc = descriptionService.getDescriptions(b.getId()); + assertNotNull(bDesc); + assertEquals(Tools.toSet(Locale.ENGLISH, Locale.FRENCH), bDesc.keySet()); + assertEquals(new Described.State("bar_b_en", null), bDesc.get(Locale.ENGLISH)); + assertEquals(new Described.State("bar_b_fr", null), bDesc.get(Locale.FRENCH)); + assertNull(b.getState().getLabel()); + + // The simple use case : one single label without the xml:lang attribute + c = (NodeContext<?>)node.getNode("c"); + cDesc = descriptionService.getDescriptions(c.getId()); + assertNull(cDesc); + assertEquals("bar_c_en", c.getState().getLabel()); } public void testFullNavigation()

13 years, 4 months

1
0
0 / 0

gatein SVN: r7060 - maven/dep/trunk.

by do-not-reply＠jboss.org

Author: julien_viet Date: 2011-08-12 10:07:17 -0400 (Fri, 12 Aug 2011) New Revision: 7060 Modified: maven/dep/trunk/pom.xml Log: [maven-release-plugin] prepare for next development iteration Modified: maven/dep/trunk/pom.xml =================================================================== --- maven/dep/trunk/pom.xml 2011-08-12 14:07:09 UTC (rev 7059) +++ maven/dep/trunk/pom.xml 2011-08-12 14:07:17 UTC (rev 7060) @@ -8,7 +8,7 @@ <groupId>org.gatein</groupId> <artifactId>gatein-dep</artifactId> - <version>1.1.0-Beta05</version> + <version>1.1.0-Beta06-SNAPSHOT</version> <packaging>pom</packaging> <parent> @@ -18,9 +18,9 @@ </parent> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/maven/dep/tags/1.1.0-Beta05</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/maven/dep/tags/1.1.0-Beta05</developerConnection> - <url>http://fisheye.jboss.org/browse/gatein/maven/dep/tags/1.1.0-Beta05</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/maven/dep/trunk/</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/maven/dep/trunk/</developerConnection> + <url>http://fisheye.jboss.org/browse/gatein/maven/dep/trunk/</url> </scm> <properties>

13 years, 4 months

1
0
0 / 0

gatein SVN: r7059 - maven/dep/tags.

by do-not-reply＠jboss.org

Author: julien_viet Date: 2011-08-12 10:07:09 -0400 (Fri, 12 Aug 2011) New Revision: 7059 Added: maven/dep/tags/1.1.0-Beta05/ Log: [maven-release-plugin] copy for tag 1.1.0-Beta05

13 years, 4 months

1
0
0 / 0

gatein SVN: r7058 - maven/dep/trunk.

by do-not-reply＠jboss.org

Author: julien_viet Date: 2011-08-12 10:06:47 -0400 (Fri, 12 Aug 2011) New Revision: 7058 Modified: maven/dep/trunk/pom.xml Log: [maven-release-plugin] prepare release 1.1.0-Beta05 Modified: maven/dep/trunk/pom.xml =================================================================== --- maven/dep/trunk/pom.xml 2011-08-12 14:06:21 UTC (rev 7057) +++ maven/dep/trunk/pom.xml 2011-08-12 14:06:47 UTC (rev 7058) @@ -8,7 +8,7 @@ <groupId>org.gatein</groupId> <artifactId>gatein-dep</artifactId> - <version>1.1.0-Beta05-SNAPSHOT</version> + <version>1.1.0-Beta05</version> <packaging>pom</packaging> <parent> @@ -18,9 +18,9 @@ </parent> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/maven/dep/trunk/</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/maven/dep/trunk/</developerConnection> - <url>http://fisheye.jboss.org/browse/gatein/maven/dep/trunk/</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/maven/dep/tags/1.1.0-Beta05</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/maven/dep/tags/1.1.0-Beta05</developerConnection> + <url>http://fisheye.jboss.org/browse/gatein/maven/dep/tags/1.1.0-Beta05</url> </scm> <properties>

13 years, 4 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

gatein-commits August 2011