November 2010 - gatein-commits - Jboss List Archives

gatein SVN: r5280 - in exo/portal/branches/3.1.x: component and 71 other directories.

by do-not-reply＠jboss.org

Author: aheritier Date: 2010-11-25 12:54:46 -0500 (Thu, 25 Nov 2010) New Revision: 5280 Modified: exo/portal/branches/3.1.x/component/application-registry/pom.xml exo/portal/branches/3.1.x/component/common/pom.xml exo/portal/branches/3.1.x/component/dashboard/pom.xml exo/portal/branches/3.1.x/component/identity/pom.xml exo/portal/branches/3.1.x/component/management/pom.xml exo/portal/branches/3.1.x/component/pc/pom.xml exo/portal/branches/3.1.x/component/pom.xml exo/portal/branches/3.1.x/component/portal/pom.xml exo/portal/branches/3.1.x/component/resources/pom.xml exo/portal/branches/3.1.x/component/scripting/pom.xml exo/portal/branches/3.1.x/component/test/core/pom.xml exo/portal/branches/3.1.x/component/test/jcr/pom.xml exo/portal/branches/3.1.x/component/test/organization/pom.xml exo/portal/branches/3.1.x/component/test/pom.xml exo/portal/branches/3.1.x/component/web/pom.xml exo/portal/branches/3.1.x/component/wsrp/pom.xml exo/portal/branches/3.1.x/docs/pom.xml exo/portal/branches/3.1.x/docs/reference-guide/pom.xml exo/portal/branches/3.1.x/docs/user-guide/pom.xml exo/portal/branches/3.1.x/examples/extension/config/pom.xml exo/portal/branches/3.1.x/examples/extension/ear/pom.xml exo/portal/branches/3.1.x/examples/extension/jar/pom.xml exo/portal/branches/3.1.x/examples/extension/pom.xml exo/portal/branches/3.1.x/examples/extension/war/pom.xml exo/portal/branches/3.1.x/examples/pom.xml exo/portal/branches/3.1.x/examples/portal/config/pom.xml exo/portal/branches/3.1.x/examples/portal/ear/pom.xml exo/portal/branches/3.1.x/examples/portal/jar/pom.xml exo/portal/branches/3.1.x/examples/portal/pom.xml exo/portal/branches/3.1.x/examples/portal/rest-war/pom.xml exo/portal/branches/3.1.x/examples/portal/war/pom.xml exo/portal/branches/3.1.x/examples/portlets/jsfhellouser/pom.xml exo/portal/branches/3.1.x/examples/portlets/jsphellouser/pom.xml exo/portal/branches/3.1.x/examples/portlets/pom.xml exo/portal/branches/3.1.x/examples/portlets/simplesthelloworld/pom.xml exo/portal/branches/3.1.x/examples/portlets/struts-jpetstore/pom.xml exo/portal/branches/3.1.x/examples/skins/pom.xml exo/portal/branches/3.1.x/examples/skins/simpleskin/pom.xml exo/portal/branches/3.1.x/gadgets/core/pom.xml exo/portal/branches/3.1.x/gadgets/eXoGadgets/pom.xml exo/portal/branches/3.1.x/gadgets/pom.xml exo/portal/branches/3.1.x/gadgets/server/pom.xml exo/portal/branches/3.1.x/packaging/module/pom.xml exo/portal/branches/3.1.x/packaging/pkg/pom.xml exo/portal/branches/3.1.x/packaging/pom.xml exo/portal/branches/3.1.x/packaging/product/pom.xml exo/portal/branches/3.1.x/packaging/reports/pom.xml exo/portal/branches/3.1.x/pom.xml exo/portal/branches/3.1.x/portlet/dashboard/pom.xml exo/portal/branches/3.1.x/portlet/exoadmin/pom.xml exo/portal/branches/3.1.x/portlet/pom.xml exo/portal/branches/3.1.x/portlet/web/pom.xml exo/portal/branches/3.1.x/server/jboss/patch-ear/pom.xml exo/portal/branches/3.1.x/server/jboss/plugin/pom.xml exo/portal/branches/3.1.x/server/jboss/pom.xml exo/portal/branches/3.1.x/server/pom.xml exo/portal/branches/3.1.x/server/tomcat/patch/pom.xml exo/portal/branches/3.1.x/server/tomcat/plugin/pom.xml exo/portal/branches/3.1.x/server/tomcat/pom.xml exo/portal/branches/3.1.x/starter/ear/pom.xml exo/portal/branches/3.1.x/starter/pom.xml exo/portal/branches/3.1.x/starter/war/pom.xml exo/portal/branches/3.1.x/testsuite/pom.xml exo/portal/branches/3.1.x/testsuite/selenium-snifftests/pom.xml exo/portal/branches/3.1.x/testsuite/webuibasedsamples/pom.xml exo/portal/branches/3.1.x/web/eXoResources/pom.xml exo/portal/branches/3.1.x/web/pom.xml exo/portal/branches/3.1.x/web/portal/pom.xml exo/portal/branches/3.1.x/web/rest/pom.xml exo/portal/branches/3.1.x/webui/core/pom.xml exo/portal/branches/3.1.x/webui/eXo/pom.xml exo/portal/branches/3.1.x/webui/pom.xml exo/portal/branches/3.1.x/webui/portal/pom.xml Log: [maven-release-plugin] prepare for next development iteration Modified: exo/portal/branches/3.1.x/component/application-registry/pom.xml =================================================================== --- exo/portal/branches/3.1.x/component/application-registry/pom.xml 2010-11-25 17:52:46 UTC (rev 5279) +++ exo/portal/branches/3.1.x/component/application-registry/pom.xml 2010-11-25 17:54:46 UTC (rev 5280) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>3.1.6-CR01-PLF</version> + <version>3.1.6-PLF-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: exo/portal/branches/3.1.x/component/common/pom.xml =================================================================== --- exo/portal/branches/3.1.x/component/common/pom.xml 2010-11-25 17:52:46 UTC (rev 5279) +++ exo/portal/branches/3.1.x/component/common/pom.xml 2010-11-25 17:54:46 UTC (rev 5280) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>3.1.6-CR01-PLF</version> + <version>3.1.6-PLF-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>exo.portal.component.common</artifactId> Modified: exo/portal/branches/3.1.x/component/dashboard/pom.xml =================================================================== --- exo/portal/branches/3.1.x/component/dashboard/pom.xml 2010-11-25 17:52:46 UTC (rev 5279) +++ exo/portal/branches/3.1.x/component/dashboard/pom.xml 2010-11-25 17:54:46 UTC (rev 5280) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>3.1.6-CR01-PLF</version> + <version>3.1.6-PLF-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: exo/portal/branches/3.1.x/component/identity/pom.xml =================================================================== --- exo/portal/branches/3.1.x/component/identity/pom.xml 2010-11-25 17:52:46 UTC (rev 5279) +++ exo/portal/branches/3.1.x/component/identity/pom.xml 2010-11-25 17:54:46 UTC (rev 5280) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>3.1.6-CR01-PLF</version> + <version>3.1.6-PLF-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: exo/portal/branches/3.1.x/component/management/pom.xml =================================================================== --- exo/portal/branches/3.1.x/component/management/pom.xml 2010-11-25 17:52:46 UTC (rev 5279) +++ exo/portal/branches/3.1.x/component/management/pom.xml 2010-11-25 17:54:46 UTC (rev 5280) @@ -21,7 +21,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>3.1.6-CR01-PLF</version> + <version>3.1.6-PLF-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: exo/portal/branches/3.1.x/component/pc/pom.xml =================================================================== --- exo/portal/branches/3.1.x/component/pc/pom.xml 2010-11-25 17:52:46 UTC (rev 5279) +++ exo/portal/branches/3.1.x/component/pc/pom.xml 2010-11-25 17:54:46 UTC (rev 5280) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>3.1.6-CR01-PLF</version> + <version>3.1.6-PLF-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: exo/portal/branches/3.1.x/component/pom.xml =================================================================== --- exo/portal/branches/3.1.x/component/pom.xml 2010-11-25 17:52:46 UTC (rev 5279) +++ exo/portal/branches/3.1.x/component/pom.xml 2010-11-25 17:54:46 UTC (rev 5280) @@ -26,7 +26,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>3.1.6-CR01-PLF</version> + <version>3.1.6-PLF-SNAPSHOT</version> </parent> <artifactId>exo.portal.component</artifactId> Modified: exo/portal/branches/3.1.x/component/portal/pom.xml =================================================================== --- exo/portal/branches/3.1.x/component/portal/pom.xml 2010-11-25 17:52:46 UTC (rev 5279) +++ exo/portal/branches/3.1.x/component/portal/pom.xml 2010-11-25 17:54:46 UTC (rev 5280) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>3.1.6-CR01-PLF</version> + <version>3.1.6-PLF-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: exo/portal/branches/3.1.x/component/resources/pom.xml =================================================================== --- exo/portal/branches/3.1.x/component/resources/pom.xml 2010-11-25 17:52:46 UTC (rev 5279) +++ exo/portal/branches/3.1.x/component/resources/pom.xml 2010-11-25 17:54:46 UTC (rev 5280) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>3.1.6-CR01-PLF</version> + <version>3.1.6-PLF-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: exo/portal/branches/3.1.x/component/scripting/pom.xml =================================================================== --- exo/portal/branches/3.1.x/component/scripting/pom.xml 2010-11-25 17:52:46 UTC (rev 5279) +++ exo/portal/branches/3.1.x/component/scripting/pom.xml 2010-11-25 17:54:46 UTC (rev 5280) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>3.1.6-CR01-PLF</version> + <version>3.1.6-PLF-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: exo/portal/branches/3.1.x/component/test/core/pom.xml =================================================================== --- exo/portal/branches/3.1.x/component/test/core/pom.xml 2010-11-25 17:52:46 UTC (rev 5279) +++ exo/portal/branches/3.1.x/component/test/core/pom.xml 2010-11-25 17:54:46 UTC (rev 5280) @@ -22,7 +22,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.test</artifactId> - <version>3.1.6-CR01-PLF</version> + <version>3.1.6-PLF-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: exo/portal/branches/3.1.x/component/test/jcr/pom.xml =================================================================== --- exo/portal/branches/3.1.x/component/test/jcr/pom.xml 2010-11-25 17:52:46 UTC (rev 5279) +++ exo/portal/branches/3.1.x/component/test/jcr/pom.xml 2010-11-25 17:54:46 UTC (rev 5280) @@ -22,7 +22,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.test</artifactId> - <version>3.1.6-CR01-PLF</version> + <version>3.1.6-PLF-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: exo/portal/branches/3.1.x/component/test/organization/pom.xml =================================================================== --- exo/portal/branches/3.1.x/component/test/organization/pom.xml 2010-11-25 17:52:46 UTC (rev 5279) +++ exo/portal/branches/3.1.x/component/test/organization/pom.xml 2010-11-25 17:54:46 UTC (rev 5280) @@ -22,7 +22,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.test</artifactId> - <version>3.1.6-CR01-PLF</version> + <version>3.1.6-PLF-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: exo/portal/branches/3.1.x/component/test/pom.xml =================================================================== --- exo/portal/branches/3.1.x/component/test/pom.xml 2010-11-25 17:52:46 UTC (rev 5279) +++ exo/portal/branches/3.1.x/component/test/pom.xml 2010-11-25 17:54:46 UTC (rev 5280) @@ -22,7 +22,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>3.1.6-CR01-PLF</version> + <version>3.1.6-PLF-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: exo/portal/branches/3.1.x/component/web/pom.xml =================================================================== --- exo/portal/branches/3.1.x/component/web/pom.xml 2010-11-25 17:52:46 UTC (rev 5279) +++ exo/portal/branches/3.1.x/component/web/pom.xml 2010-11-25 17:54:46 UTC (rev 5280) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>3.1.6-CR01-PLF</version> + <version>3.1.6-PLF-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: exo/portal/branches/3.1.x/component/wsrp/pom.xml =================================================================== --- exo/portal/branches/3.1.x/component/wsrp/pom.xml 2010-11-25 17:52:46 UTC (rev 5279) +++ exo/portal/branches/3.1.x/component/wsrp/pom.xml 2010-11-25 17:54:46 UTC (rev 5280) @@ -25,7 +25,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>3.1.6-CR01-PLF</version> + <version>3.1.6-PLF-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: exo/portal/branches/3.1.x/docs/pom.xml =================================================================== --- exo/portal/branches/3.1.x/docs/pom.xml 2010-11-25 17:52:46 UTC (rev 5279) +++ exo/portal/branches/3.1.x/docs/pom.xml 2010-11-25 17:54:46 UTC (rev 5280) @@ -25,7 +25,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>3.1.6-CR01-PLF</version> + <version>3.1.6-PLF-SNAPSHOT</version> </parent> <groupId>org.gatein.doc</groupId> Modified: exo/portal/branches/3.1.x/docs/reference-guide/pom.xml =================================================================== --- exo/portal/branches/3.1.x/docs/reference-guide/pom.xml 2010-11-25 17:52:46 UTC (rev 5279) +++ exo/portal/branches/3.1.x/docs/reference-guide/pom.xml 2010-11-25 17:54:46 UTC (rev 5280) @@ -26,7 +26,7 @@ <parent> <groupId>org.gatein.doc</groupId> <artifactId>docs-aggregator</artifactId> - <version>3.1.6-CR01-PLF</version> + <version>3.1.6-PLF-SNAPSHOT</version> </parent> <groupId>org.gatein.doc</groupId> Modified: exo/portal/branches/3.1.x/docs/user-guide/pom.xml =================================================================== --- exo/portal/branches/3.1.x/docs/user-guide/pom.xml 2010-11-25 17:52:46 UTC (rev 5279) +++ exo/portal/branches/3.1.x/docs/user-guide/pom.xml 2010-11-25 17:54:46 UTC (rev 5280) @@ -26,7 +26,7 @@ <parent> <groupId>org.gatein.doc</groupId> <artifactId>docs-aggregator</artifactId> - <version>3.1.6-CR01-PLF</version> + <version>3.1.6-PLF-SNAPSHOT</version> </parent> <artifactId>gatein-user-guide-en</artifactId> Modified: exo/portal/branches/3.1.x/examples/extension/config/pom.xml =================================================================== --- exo/portal/branches/3.1.x/examples/extension/config/pom.xml 2010-11-25 17:52:46 UTC (rev 5279) +++ exo/portal/branches/3.1.x/examples/extension/config/pom.xml 2010-11-25 17:54:46 UTC (rev 5280) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>3.1.6-CR01-PLF</version> + <version>3.1.6-PLF-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: exo/portal/branches/3.1.x/examples/extension/ear/pom.xml =================================================================== --- exo/portal/branches/3.1.x/examples/extension/ear/pom.xml 2010-11-25 17:52:46 UTC (rev 5279) +++ exo/portal/branches/3.1.x/examples/extension/ear/pom.xml 2010-11-25 17:54:46 UTC (rev 5280) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>3.1.6-CR01-PLF</version> + <version>3.1.6-PLF-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -37,23 +37,23 @@ <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.sample.extension.config</artifactId> - <version>3.1.6-CR01-PLF</version> + <version>3.1.6-PLF-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.sample.extension.jar</artifactId> - <version>3.1.6-CR01-PLF</version> + <version>3.1.6-PLF-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web</artifactId> - <version>3.1.6-CR01-PLF</version> + <version>3.1.6-PLF-SNAPSHOT</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.sample.extension.war</artifactId> - <version>3.1.6-CR01-PLF</version> + <version>3.1.6-PLF-SNAPSHOT</version> <type>war</type> </dependency> </dependencies> Modified: exo/portal/branches/3.1.x/examples/extension/jar/pom.xml =================================================================== --- exo/portal/branches/3.1.x/examples/extension/jar/pom.xml 2010-11-25 17:52:46 UTC (rev 5279) +++ exo/portal/branches/3.1.x/examples/extension/jar/pom.xml 2010-11-25 17:54:46 UTC (rev 5280) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>3.1.6-CR01-PLF</version> + <version>3.1.6-PLF-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: exo/portal/branches/3.1.x/examples/extension/pom.xml =================================================================== --- exo/portal/branches/3.1.x/examples/extension/pom.xml 2010-11-25 17:52:46 UTC (rev 5279) +++ exo/portal/branches/3.1.x/examples/extension/pom.xml 2010-11-25 17:54:46 UTC (rev 5280) @@ -24,7 +24,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>3.1.6-CR01-PLF</version> + <version>3.1.6-PLF-SNAPSHOT</version> </parent> <artifactId>exo.portal.sample.extension.root</artifactId> Modified: exo/portal/branches/3.1.x/examples/extension/war/pom.xml =================================================================== --- exo/portal/branches/3.1.x/examples/extension/war/pom.xml 2010-11-25 17:52:46 UTC (rev 5279) +++ exo/portal/branches/3.1.x/examples/extension/war/pom.xml 2010-11-25 17:54:46 UTC (rev 5280) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>3.1.6-CR01-PLF</version> + <version>3.1.6-PLF-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: exo/portal/branches/3.1.x/examples/pom.xml =================================================================== --- exo/portal/branches/3.1.x/examples/pom.xml 2010-11-25 17:52:46 UTC (rev 5279) +++ exo/portal/branches/3.1.x/examples/pom.xml 2010-11-25 17:54:46 UTC (rev 5280) @@ -26,7 +26,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>3.1.6-CR01-PLF</version> + <version>3.1.6-PLF-SNAPSHOT</version> </parent> <artifactId>exo.portal.sample</artifactId> Modified: exo/portal/branches/3.1.x/examples/portal/config/pom.xml =================================================================== --- exo/portal/branches/3.1.x/examples/portal/config/pom.xml 2010-11-25 17:52:46 UTC (rev 5279) +++ exo/portal/branches/3.1.x/examples/portal/config/pom.xml 2010-11-25 17:54:46 UTC (rev 5280) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>3.1.6-CR01-PLF</version> + <version>3.1.6-PLF-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: exo/portal/branches/3.1.x/examples/portal/ear/pom.xml =================================================================== --- exo/portal/branches/3.1.x/examples/portal/ear/pom.xml 2010-11-25 17:52:46 UTC (rev 5279) +++ exo/portal/branches/3.1.x/examples/portal/ear/pom.xml 2010-11-25 17:54:46 UTC (rev 5280) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>3.1.6-CR01-PLF</version> + <version>3.1.6-PLF-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -37,29 +37,29 @@ <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.sample.portal.config</artifactId> - <version>3.1.6-CR01-PLF</version> + <version>3.1.6-PLF-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.sample.portal.jar</artifactId> - <version>3.1.6-CR01-PLF</version> + <version>3.1.6-PLF-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web</artifactId> - <version>3.1.6-CR01-PLF</version> + <version>3.1.6-PLF-SNAPSHOT</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.sample.portal.war</artifactId> - <version>3.1.6-CR01-PLF</version> + <version>3.1.6-PLF-SNAPSHOT</version> <type>war</type> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.sample.portal.rest-war</artifactId> - <version>3.1.6-CR01-PLF</version> + <version>3.1.6-PLF-SNAPSHOT</version> <type>war</type> </dependency> </dependencies> Modified: exo/portal/branches/3.1.x/examples/portal/jar/pom.xml =================================================================== --- exo/portal/branches/3.1.x/examples/portal/jar/pom.xml 2010-11-25 17:52:46 UTC (rev 5279) +++ exo/portal/branches/3.1.x/examples/portal/jar/pom.xml 2010-11-25 17:54:46 UTC (rev 5280) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>3.1.6-CR01-PLF</version> + <version>3.1.6-PLF-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: exo/portal/branches/3.1.x/examples/portal/pom.xml =================================================================== --- exo/portal/branches/3.1.x/examples/portal/pom.xml 2010-11-25 17:52:46 UTC (rev 5279) +++ exo/portal/branches/3.1.x/examples/portal/pom.xml 2010-11-25 17:54:46 UTC (rev 5280) @@ -24,7 +24,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>3.1.6-CR01-PLF</version> + <version>3.1.6-PLF-SNAPSHOT</version> </parent> <artifactId>exo.portal.sample.portal.root</artifactId> Modified: exo/portal/branches/3.1.x/examples/portal/rest-war/pom.xml =================================================================== --- exo/portal/branches/3.1.x/examples/portal/rest-war/pom.xml 2010-11-25 17:52:46 UTC (rev 5279) +++ exo/portal/branches/3.1.x/examples/portal/rest-war/pom.xml 2010-11-25 17:54:46 UTC (rev 5280) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>3.1.6-CR01-PLF</version> + <version>3.1.6-PLF-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: exo/portal/branches/3.1.x/examples/portal/war/pom.xml =================================================================== --- exo/portal/branches/3.1.x/examples/portal/war/pom.xml 2010-11-25 17:52:46 UTC (rev 5279) +++ exo/portal/branches/3.1.x/examples/portal/war/pom.xml 2010-11-25 17:54:46 UTC (rev 5280) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>3.1.6-CR01-PLF</version> + <version>3.1.6-PLF-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: exo/portal/branches/3.1.x/examples/portlets/jsfhellouser/pom.xml =================================================================== --- exo/portal/branches/3.1.x/examples/portlets/jsfhellouser/pom.xml 2010-11-25 17:52:46 UTC (rev 5279) +++ exo/portal/branches/3.1.x/examples/portlets/jsfhellouser/pom.xml 2010-11-25 17:54:46 UTC (rev 5280) @@ -9,7 +9,7 @@ <parent> <groupId>org.gatein.portal.examples.portlets</groupId> <artifactId>parent</artifactId> - <version>3.1.6-CR01-PLF</version> + <version>3.1.6-PLF-SNAPSHOT</version> </parent> <artifactId>gatein-jsf-hellouser</artifactId> Modified: exo/portal/branches/3.1.x/examples/portlets/jsphellouser/pom.xml =================================================================== --- exo/portal/branches/3.1.x/examples/portlets/jsphellouser/pom.xml 2010-11-25 17:52:46 UTC (rev 5279) +++ exo/portal/branches/3.1.x/examples/portlets/jsphellouser/pom.xml 2010-11-25 17:54:46 UTC (rev 5280) @@ -9,7 +9,7 @@ <parent> <groupId>org.gatein.portal.examples.portlets</groupId> <artifactId>parent</artifactId> - <version>3.1.6-CR01-PLF</version> + <version>3.1.6-PLF-SNAPSHOT</version> </parent> <artifactId>gatein-jsp-hellouser</artifactId> Modified: exo/portal/branches/3.1.x/examples/portlets/pom.xml =================================================================== --- exo/portal/branches/3.1.x/examples/portlets/pom.xml 2010-11-25 17:52:46 UTC (rev 5279) +++ exo/portal/branches/3.1.x/examples/portlets/pom.xml 2010-11-25 17:54:46 UTC (rev 5280) @@ -5,7 +5,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>3.1.6-CR01-PLF</version> + <version>3.1.6-PLF-SNAPSHOT</version> </parent> <groupId>org.gatein.portal.examples.portlets</groupId> Modified: exo/portal/branches/3.1.x/examples/portlets/simplesthelloworld/pom.xml =================================================================== --- exo/portal/branches/3.1.x/examples/portlets/simplesthelloworld/pom.xml 2010-11-25 17:52:46 UTC (rev 5279) +++ exo/portal/branches/3.1.x/examples/portlets/simplesthelloworld/pom.xml 2010-11-25 17:54:46 UTC (rev 5280) @@ -9,7 +9,7 @@ <parent> <groupId>org.gatein.portal.examples.portlets</groupId> <artifactId>parent</artifactId> - <version>3.1.6-CR01-PLF</version> + <version>3.1.6-PLF-SNAPSHOT</version> </parent> <artifactId>gatein-simplest-helloworld</artifactId> Modified: exo/portal/branches/3.1.x/examples/portlets/struts-jpetstore/pom.xml =================================================================== --- exo/portal/branches/3.1.x/examples/portlets/struts-jpetstore/pom.xml 2010-11-25 17:52:46 UTC (rev 5279) +++ exo/portal/branches/3.1.x/examples/portlets/struts-jpetstore/pom.xml 2010-11-25 17:54:46 UTC (rev 5280) @@ -5,7 +5,7 @@ <parent> <groupId>org.gatein.portal.examples.portlets</groupId> <artifactId>parent</artifactId> - <version>3.1.6-CR01-PLF</version> + <version>3.1.6-PLF-SNAPSHOT</version> </parent> <artifactId>struts-jpetstore</artifactId> Modified: exo/portal/branches/3.1.x/examples/skins/pom.xml =================================================================== --- exo/portal/branches/3.1.x/examples/skins/pom.xml 2010-11-25 17:52:46 UTC (rev 5279) +++ exo/portal/branches/3.1.x/examples/skins/pom.xml 2010-11-25 17:54:46 UTC (rev 5280) @@ -5,7 +5,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>3.1.6-CR01-PLF</version> + <version>3.1.6-PLF-SNAPSHOT</version> </parent> <groupId>org.gatein.portal.examples.skins</groupId> Modified: exo/portal/branches/3.1.x/examples/skins/simpleskin/pom.xml =================================================================== --- exo/portal/branches/3.1.x/examples/skins/simpleskin/pom.xml 2010-11-25 17:52:46 UTC (rev 5279) +++ exo/portal/branches/3.1.x/examples/skins/simpleskin/pom.xml 2010-11-25 17:54:46 UTC (rev 5280) @@ -25,7 +25,7 @@ <parent> <groupId>org.gatein.portal.examples.skins</groupId> <artifactId>parent</artifactId> - <version>3.1.6-CR01-PLF</version> + <version>3.1.6-PLF-SNAPSHOT</version> </parent> <artifactId>gatein-sample-skin</artifactId> Modified: exo/portal/branches/3.1.x/gadgets/core/pom.xml =================================================================== --- exo/portal/branches/3.1.x/gadgets/core/pom.xml 2010-11-25 17:52:46 UTC (rev 5279) +++ exo/portal/branches/3.1.x/gadgets/core/pom.xml 2010-11-25 17:54:46 UTC (rev 5280) @@ -14,7 +14,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.gadgets</artifactId> - <version>3.1.6-CR01-PLF</version> + <version>3.1.6-PLF-SNAPSHOT</version> </parent> <artifactId>exo.portal.gadgets-core</artifactId> Modified: exo/portal/branches/3.1.x/gadgets/eXoGadgets/pom.xml =================================================================== --- exo/portal/branches/3.1.x/gadgets/eXoGadgets/pom.xml 2010-11-25 17:52:46 UTC (rev 5279) +++ exo/portal/branches/3.1.x/gadgets/eXoGadgets/pom.xml 2010-11-25 17:54:46 UTC (rev 5280) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.gadgets</artifactId> - <version>3.1.6-CR01-PLF</version> + <version>3.1.6-PLF-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: exo/portal/branches/3.1.x/gadgets/pom.xml =================================================================== --- exo/portal/branches/3.1.x/gadgets/pom.xml 2010-11-25 17:52:46 UTC (rev 5279) +++ exo/portal/branches/3.1.x/gadgets/pom.xml 2010-11-25 17:54:46 UTC (rev 5280) @@ -24,7 +24,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>3.1.6-CR01-PLF</version> + <version>3.1.6-PLF-SNAPSHOT</version> </parent> <artifactId>exo.portal.gadgets</artifactId> Modified: exo/portal/branches/3.1.x/gadgets/server/pom.xml =================================================================== --- exo/portal/branches/3.1.x/gadgets/server/pom.xml 2010-11-25 17:52:46 UTC (rev 5279) +++ exo/portal/branches/3.1.x/gadgets/server/pom.xml 2010-11-25 17:54:46 UTC (rev 5280) @@ -25,7 +25,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.gadgets</artifactId> - <version>3.1.6-CR01-PLF</version> + <version>3.1.6-PLF-SNAPSHOT</version> </parent> <artifactId>exo.portal.gadgets-server</artifactId> Modified: exo/portal/branches/3.1.x/packaging/module/pom.xml =================================================================== --- exo/portal/branches/3.1.x/packaging/module/pom.xml 2010-11-25 17:52:46 UTC (rev 5279) +++ exo/portal/branches/3.1.x/packaging/module/pom.xml 2010-11-25 17:54:46 UTC (rev 5280) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.packaging</artifactId> - <version>3.1.6-CR01-PLF</version> + <version>3.1.6-PLF-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: exo/portal/branches/3.1.x/packaging/pkg/pom.xml =================================================================== --- exo/portal/branches/3.1.x/packaging/pkg/pom.xml 2010-11-25 17:52:46 UTC (rev 5279) +++ exo/portal/branches/3.1.x/packaging/pkg/pom.xml 2010-11-25 17:54:46 UTC (rev 5280) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.packaging</artifactId> - <version>3.1.6-CR01-PLF</version> + <version>3.1.6-PLF-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -72,19 +72,19 @@ <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>portal.packaging.module</artifactId> - <version>3.1.6-CR01-PLF</version> + <version>3.1.6-PLF-SNAPSHOT</version> <type>js</type> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>portal.packaging.product</artifactId> - <version>3.1.6-CR01-PLF</version> + <version>3.1.6-PLF-SNAPSHOT</version> <type>js</type> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.server.jboss.patch-ear</artifactId> - <version>3.1.6-CR01-PLF</version> + <version>3.1.6-PLF-SNAPSHOT</version> </dependency>  Modified: exo/portal/branches/3.1.x/packaging/pom.xml =================================================================== --- exo/portal/branches/3.1.x/packaging/pom.xml 2010-11-25 17:52:46 UTC (rev 5279) +++ exo/portal/branches/3.1.x/packaging/pom.xml 2010-11-25 17:54:46 UTC (rev 5280) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>3.1.6-CR01-PLF</version> + <version>3.1.6-PLF-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: exo/portal/branches/3.1.x/packaging/product/pom.xml =================================================================== --- exo/portal/branches/3.1.x/packaging/product/pom.xml 2010-11-25 17:52:46 UTC (rev 5279) +++ exo/portal/branches/3.1.x/packaging/product/pom.xml 2010-11-25 17:54:46 UTC (rev 5280) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.packaging</artifactId> - <version>3.1.6-CR01-PLF</version> + <version>3.1.6-PLF-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: exo/portal/branches/3.1.x/packaging/reports/pom.xml =================================================================== --- exo/portal/branches/3.1.x/packaging/reports/pom.xml 2010-11-25 17:52:46 UTC (rev 5279) +++ exo/portal/branches/3.1.x/packaging/reports/pom.xml 2010-11-25 17:54:46 UTC (rev 5280) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.packaging</artifactId> - <version>3.1.6-CR01-PLF</version> + <version>3.1.6-PLF-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: exo/portal/branches/3.1.x/pom.xml =================================================================== --- exo/portal/branches/3.1.x/pom.xml 2010-11-25 17:52:46 UTC (rev 5279) +++ exo/portal/branches/3.1.x/pom.xml 2010-11-25 17:54:46 UTC (rev 5280) @@ -31,7 +31,7 @@ <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>3.1.6-CR01-PLF</version> + <version>3.1.6-PLF-SNAPSHOT</version> <packaging>pom</packaging> <name>GateIn - Portal</name> @@ -101,9 +101,9 @@ </distributionManagement> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/exo/portal/tags/3.1.6-CR01-PLF</connection> - <developerConnection>scm:svn:http://svn.jboss.org/repos/gatein/exo/portal/tags/3.1.6-CR01-PLF</developerConnection> - <url>http://fisheye.jboss.org/browse/gatein/exo/portal/tags/3.1.6-CR01-PLF</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/exo/portal/branches/3.1.x</connection> + <developerConnection>scm:svn:http://svn.jboss.org/repos/gatein/exo/portal/branches/3.1.x</developerConnection> + <url>http://fisheye.jboss.org/browse/gatein/exo/portal/branches/3.1.x</url> </scm> <modules> @@ -341,43 +341,43 @@ <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.common</artifactId> - <version>3.1.6-CR01-PLF</version> + <version>3.1.6-PLF-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web</artifactId> - <version>3.1.6-CR01-PLF</version> + <version>3.1.6-PLF-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.portal</artifactId> - <version>3.1.6-CR01-PLF</version> + <version>3.1.6-PLF-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.portal</artifactId> - <version>3.1.6-CR01-PLF</version> + <version>3.1.6-PLF-SNAPSHOT</version> <type>test-jar</type> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.pc</artifactId> - <version>3.1.6-CR01-PLF</version> + <version>3.1.6-PLF-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.identity</artifactId> - <version>3.1.6-CR01-PLF</version> + <version>3.1.6-PLF-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.resources</artifactId> - <version>3.1.6-CR01-PLF</version> + <version>3.1.6-PLF-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.application-registry</artifactId> - <version>3.1.6-CR01-PLF</version> + <version>3.1.6-PLF-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> @@ -387,64 +387,64 @@ <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.scripting</artifactId> - <version>3.1.6-CR01-PLF</version> + <version>3.1.6-PLF-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.dashboard</artifactId> - <version>3.1.6-CR01-PLF</version> + <version>3.1.6-PLF-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui.portal</artifactId> - <version>3.1.6-CR01-PLF</version> + <version>3.1.6-PLF-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui.eXo</artifactId> - <version>3.1.6-CR01-PLF</version> + <version>3.1.6-PLF-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui.core</artifactId> - <version>3.1.6-CR01-PLF</version> + <version>3.1.6-PLF-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.gadgets-core</artifactId> - <version>3.1.6-CR01-PLF</version> + <version>3.1.6-PLF-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.test.core</artifactId> - <version>3.1.6-CR01-PLF</version> + <version>3.1.6-PLF-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.test.core</artifactId> - <version>3.1.6-CR01-PLF</version> + <version>3.1.6-PLF-SNAPSHOT</version> <type>test-jar</type> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.test.jcr</artifactId> - <version>3.1.6-CR01-PLF</version> + <version>3.1.6-PLF-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.test.jcr</artifactId> - <version>3.1.6-CR01-PLF</version> + <version>3.1.6-PLF-SNAPSHOT</version> <type>test-jar</type> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.test.organization</artifactId> - <version>3.1.6-CR01-PLF</version> + <version>3.1.6-PLF-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.test.organization</artifactId> - <version>3.1.6-CR01-PLF</version> + <version>3.1.6-PLF-SNAPSHOT</version> <type>test-jar</type> </dependency> Modified: exo/portal/branches/3.1.x/portlet/dashboard/pom.xml =================================================================== --- exo/portal/branches/3.1.x/portlet/dashboard/pom.xml 2010-11-25 17:52:46 UTC (rev 5279) +++ exo/portal/branches/3.1.x/portlet/dashboard/pom.xml 2010-11-25 17:54:46 UTC (rev 5280) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.portlet</artifactId> - <version>3.1.6-CR01-PLF</version> + <version>3.1.6-PLF-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: exo/portal/branches/3.1.x/portlet/exoadmin/pom.xml =================================================================== --- exo/portal/branches/3.1.x/portlet/exoadmin/pom.xml 2010-11-25 17:52:46 UTC (rev 5279) +++ exo/portal/branches/3.1.x/portlet/exoadmin/pom.xml 2010-11-25 17:54:46 UTC (rev 5280) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.portlet</artifactId> - <version>3.1.6-CR01-PLF</version> + <version>3.1.6-PLF-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: exo/portal/branches/3.1.x/portlet/pom.xml =================================================================== --- exo/portal/branches/3.1.x/portlet/pom.xml 2010-11-25 17:52:46 UTC (rev 5279) +++ exo/portal/branches/3.1.x/portlet/pom.xml 2010-11-25 17:54:46 UTC (rev 5280) @@ -26,7 +26,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>3.1.6-CR01-PLF</version> + <version>3.1.6-PLF-SNAPSHOT</version> </parent> <artifactId>exo.portal.portlet</artifactId> Modified: exo/portal/branches/3.1.x/portlet/web/pom.xml =================================================================== --- exo/portal/branches/3.1.x/portlet/web/pom.xml 2010-11-25 17:52:46 UTC (rev 5279) +++ exo/portal/branches/3.1.x/portlet/web/pom.xml 2010-11-25 17:54:46 UTC (rev 5280) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.portlet</artifactId> - <version>3.1.6-CR01-PLF</version> + <version>3.1.6-PLF-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: exo/portal/branches/3.1.x/server/jboss/patch-ear/pom.xml =================================================================== --- exo/portal/branches/3.1.x/server/jboss/patch-ear/pom.xml 2010-11-25 17:52:46 UTC (rev 5279) +++ exo/portal/branches/3.1.x/server/jboss/patch-ear/pom.xml 2010-11-25 17:54:46 UTC (rev 5280) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.server.jboss</artifactId> - <version>3.1.6-CR01-PLF</version> + <version>3.1.6-PLF-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: exo/portal/branches/3.1.x/server/jboss/plugin/pom.xml =================================================================== --- exo/portal/branches/3.1.x/server/jboss/plugin/pom.xml 2010-11-25 17:52:46 UTC (rev 5279) +++ exo/portal/branches/3.1.x/server/jboss/plugin/pom.xml 2010-11-25 17:54:46 UTC (rev 5280) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.server.jboss</artifactId> - <version>3.1.6-CR01-PLF</version> + <version>3.1.6-PLF-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: exo/portal/branches/3.1.x/server/jboss/pom.xml =================================================================== --- exo/portal/branches/3.1.x/server/jboss/pom.xml 2010-11-25 17:52:46 UTC (rev 5279) +++ exo/portal/branches/3.1.x/server/jboss/pom.xml 2010-11-25 17:54:46 UTC (rev 5280) @@ -26,7 +26,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.server</artifactId> - <version>3.1.6-CR01-PLF</version> + <version>3.1.6-PLF-SNAPSHOT</version> </parent> <artifactId>exo.portal.server.jboss</artifactId> Modified: exo/portal/branches/3.1.x/server/pom.xml =================================================================== --- exo/portal/branches/3.1.x/server/pom.xml 2010-11-25 17:52:46 UTC (rev 5279) +++ exo/portal/branches/3.1.x/server/pom.xml 2010-11-25 17:54:46 UTC (rev 5280) @@ -26,7 +26,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>3.1.6-CR01-PLF</version> + <version>3.1.6-PLF-SNAPSHOT</version> </parent> <artifactId>exo.portal.server</artifactId> Modified: exo/portal/branches/3.1.x/server/tomcat/patch/pom.xml =================================================================== --- exo/portal/branches/3.1.x/server/tomcat/patch/pom.xml 2010-11-25 17:52:46 UTC (rev 5279) +++ exo/portal/branches/3.1.x/server/tomcat/patch/pom.xml 2010-11-25 17:54:46 UTC (rev 5280) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.server.tomcat</artifactId> - <version>3.1.6-CR01-PLF</version> + <version>3.1.6-PLF-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: exo/portal/branches/3.1.x/server/tomcat/plugin/pom.xml =================================================================== --- exo/portal/branches/3.1.x/server/tomcat/plugin/pom.xml 2010-11-25 17:52:46 UTC (rev 5279) +++ exo/portal/branches/3.1.x/server/tomcat/plugin/pom.xml 2010-11-25 17:54:46 UTC (rev 5280) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.server.tomcat</artifactId> - <version>3.1.6-CR01-PLF</version> + <version>3.1.6-PLF-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: exo/portal/branches/3.1.x/server/tomcat/pom.xml =================================================================== --- exo/portal/branches/3.1.x/server/tomcat/pom.xml 2010-11-25 17:52:46 UTC (rev 5279) +++ exo/portal/branches/3.1.x/server/tomcat/pom.xml 2010-11-25 17:54:46 UTC (rev 5280) @@ -26,7 +26,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.server</artifactId> - <version>3.1.6-CR01-PLF</version> + <version>3.1.6-PLF-SNAPSHOT</version> </parent> <artifactId>exo.portal.server.tomcat</artifactId> Modified: exo/portal/branches/3.1.x/starter/ear/pom.xml =================================================================== --- exo/portal/branches/3.1.x/starter/ear/pom.xml 2010-11-25 17:52:46 UTC (rev 5279) +++ exo/portal/branches/3.1.x/starter/ear/pom.xml 2010-11-25 17:54:46 UTC (rev 5280) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>3.1.6-CR01-PLF</version> + <version>3.1.6-PLF-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -37,7 +37,7 @@ <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.starter.war</artifactId> - <version>3.1.6-CR01-PLF</version> + <version>3.1.6-PLF-SNAPSHOT</version> <type>war</type> </dependency> </dependencies> Modified: exo/portal/branches/3.1.x/starter/pom.xml =================================================================== --- exo/portal/branches/3.1.x/starter/pom.xml 2010-11-25 17:52:46 UTC (rev 5279) +++ exo/portal/branches/3.1.x/starter/pom.xml 2010-11-25 17:54:46 UTC (rev 5280) @@ -24,7 +24,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>3.1.6-CR01-PLF</version> + <version>3.1.6-PLF-SNAPSHOT</version> </parent> <artifactId>exo.portal.starter.root</artifactId> Modified: exo/portal/branches/3.1.x/starter/war/pom.xml =================================================================== --- exo/portal/branches/3.1.x/starter/war/pom.xml 2010-11-25 17:52:46 UTC (rev 5279) +++ exo/portal/branches/3.1.x/starter/war/pom.xml 2010-11-25 17:54:46 UTC (rev 5280) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>3.1.6-CR01-PLF</version> + <version>3.1.6-PLF-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: exo/portal/branches/3.1.x/testsuite/pom.xml =================================================================== --- exo/portal/branches/3.1.x/testsuite/pom.xml 2010-11-25 17:52:46 UTC (rev 5279) +++ exo/portal/branches/3.1.x/testsuite/pom.xml 2010-11-25 17:54:46 UTC (rev 5280) @@ -3,7 +3,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>3.1.6-CR01-PLF</version> + <version>3.1.6-PLF-SNAPSHOT</version> </parent> <artifactId>exo.portal.testsuite</artifactId> Modified: exo/portal/branches/3.1.x/testsuite/selenium-snifftests/pom.xml =================================================================== --- exo/portal/branches/3.1.x/testsuite/selenium-snifftests/pom.xml 2010-11-25 17:52:46 UTC (rev 5279) +++ exo/portal/branches/3.1.x/testsuite/selenium-snifftests/pom.xml 2010-11-25 17:54:46 UTC (rev 5280) @@ -3,7 +3,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.testsuite</artifactId> - <version>3.1.6-CR01-PLF</version> + <version>3.1.6-PLF-SNAPSHOT</version> </parent> <artifactId>exo.portal.selenium.snifftests</artifactId> Modified: exo/portal/branches/3.1.x/testsuite/webuibasedsamples/pom.xml =================================================================== --- exo/portal/branches/3.1.x/testsuite/webuibasedsamples/pom.xml 2010-11-25 17:52:46 UTC (rev 5279) +++ exo/portal/branches/3.1.x/testsuite/webuibasedsamples/pom.xml 2010-11-25 17:54:46 UTC (rev 5280) @@ -3,7 +3,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.testsuite</artifactId> - <version>3.1.6-CR01-PLF</version> + <version>3.1.6-PLF-SNAPSHOT</version> </parent> <artifactId>exo.webui.based.samples</artifactId> Modified: exo/portal/branches/3.1.x/web/eXoResources/pom.xml =================================================================== --- exo/portal/branches/3.1.x/web/eXoResources/pom.xml 2010-11-25 17:52:46 UTC (rev 5279) +++ exo/portal/branches/3.1.x/web/eXoResources/pom.xml 2010-11-25 17:54:46 UTC (rev 5280) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.web</artifactId> - <version>3.1.6-CR01-PLF</version> + <version>3.1.6-PLF-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: exo/portal/branches/3.1.x/web/pom.xml =================================================================== --- exo/portal/branches/3.1.x/web/pom.xml 2010-11-25 17:52:46 UTC (rev 5279) +++ exo/portal/branches/3.1.x/web/pom.xml 2010-11-25 17:54:46 UTC (rev 5280) @@ -26,7 +26,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>3.1.6-CR01-PLF</version> + <version>3.1.6-PLF-SNAPSHOT</version> </parent> <artifactId>exo.portal.web</artifactId> Modified: exo/portal/branches/3.1.x/web/portal/pom.xml =================================================================== --- exo/portal/branches/3.1.x/web/portal/pom.xml 2010-11-25 17:52:46 UTC (rev 5279) +++ exo/portal/branches/3.1.x/web/portal/pom.xml 2010-11-25 17:54:46 UTC (rev 5280) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.web</artifactId> - <version>3.1.6-CR01-PLF</version> + <version>3.1.6-PLF-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: exo/portal/branches/3.1.x/web/rest/pom.xml =================================================================== --- exo/portal/branches/3.1.x/web/rest/pom.xml 2010-11-25 17:52:46 UTC (rev 5279) +++ exo/portal/branches/3.1.x/web/rest/pom.xml 2010-11-25 17:54:46 UTC (rev 5280) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.web</artifactId> - <version>3.1.6-CR01-PLF</version> + <version>3.1.6-PLF-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: exo/portal/branches/3.1.x/webui/core/pom.xml =================================================================== --- exo/portal/branches/3.1.x/webui/core/pom.xml 2010-11-25 17:52:46 UTC (rev 5279) +++ exo/portal/branches/3.1.x/webui/core/pom.xml 2010-11-25 17:54:46 UTC (rev 5280) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui</artifactId> - <version>3.1.6-CR01-PLF</version> + <version>3.1.6-PLF-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: exo/portal/branches/3.1.x/webui/eXo/pom.xml =================================================================== --- exo/portal/branches/3.1.x/webui/eXo/pom.xml 2010-11-25 17:52:46 UTC (rev 5279) +++ exo/portal/branches/3.1.x/webui/eXo/pom.xml 2010-11-25 17:54:46 UTC (rev 5280) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui</artifactId> - <version>3.1.6-CR01-PLF</version> + <version>3.1.6-PLF-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: exo/portal/branches/3.1.x/webui/pom.xml =================================================================== --- exo/portal/branches/3.1.x/webui/pom.xml 2010-11-25 17:52:46 UTC (rev 5279) +++ exo/portal/branches/3.1.x/webui/pom.xml 2010-11-25 17:54:46 UTC (rev 5280) @@ -26,7 +26,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>3.1.6-CR01-PLF</version> + <version>3.1.6-PLF-SNAPSHOT</version> </parent> <artifactId>exo.portal.webui</artifactId> Modified: exo/portal/branches/3.1.x/webui/portal/pom.xml =================================================================== --- exo/portal/branches/3.1.x/webui/portal/pom.xml 2010-11-25 17:52:46 UTC (rev 5279) +++ exo/portal/branches/3.1.x/webui/portal/pom.xml 2010-11-25 17:54:46 UTC (rev 5280) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui</artifactId> - <version>3.1.6-CR01-PLF</version> + <version>3.1.6-PLF-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion>

14 years, 1 month

1
0
0 / 0

gatein SVN: r5279 - exo/portal/tags.

by do-not-reply＠jboss.org

Author: aheritier Date: 2010-11-25 12:52:46 -0500 (Thu, 25 Nov 2010) New Revision: 5279 Added: exo/portal/tags/3.1.6-CR01-PLF/ Log: [maven-scm] copy for tag 3.1.6-CR01-PLF Copied: exo/portal/tags/3.1.6-CR01-PLF (from rev 5278, exo/portal/branches/3.1.x)

14 years, 1 month

1
0
0 / 0

gatein SVN: r5278 - in exo/portal/branches/3.1.x: component and 71 other directories.

by do-not-reply＠jboss.org

Author: aheritier Date: 2010-11-25 12:48:29 -0500 (Thu, 25 Nov 2010) New Revision: 5278 Modified: exo/portal/branches/3.1.x/component/application-registry/pom.xml exo/portal/branches/3.1.x/component/common/pom.xml exo/portal/branches/3.1.x/component/dashboard/pom.xml exo/portal/branches/3.1.x/component/identity/pom.xml exo/portal/branches/3.1.x/component/management/pom.xml exo/portal/branches/3.1.x/component/pc/pom.xml exo/portal/branches/3.1.x/component/pom.xml exo/portal/branches/3.1.x/component/portal/pom.xml exo/portal/branches/3.1.x/component/resources/pom.xml exo/portal/branches/3.1.x/component/scripting/pom.xml exo/portal/branches/3.1.x/component/test/core/pom.xml exo/portal/branches/3.1.x/component/test/jcr/pom.xml exo/portal/branches/3.1.x/component/test/organization/pom.xml exo/portal/branches/3.1.x/component/test/pom.xml exo/portal/branches/3.1.x/component/web/pom.xml exo/portal/branches/3.1.x/component/wsrp/pom.xml exo/portal/branches/3.1.x/docs/pom.xml exo/portal/branches/3.1.x/docs/reference-guide/pom.xml exo/portal/branches/3.1.x/docs/user-guide/pom.xml exo/portal/branches/3.1.x/examples/extension/config/pom.xml exo/portal/branches/3.1.x/examples/extension/ear/pom.xml exo/portal/branches/3.1.x/examples/extension/jar/pom.xml exo/portal/branches/3.1.x/examples/extension/pom.xml exo/portal/branches/3.1.x/examples/extension/war/pom.xml exo/portal/branches/3.1.x/examples/pom.xml exo/portal/branches/3.1.x/examples/portal/config/pom.xml exo/portal/branches/3.1.x/examples/portal/ear/pom.xml exo/portal/branches/3.1.x/examples/portal/jar/pom.xml exo/portal/branches/3.1.x/examples/portal/pom.xml exo/portal/branches/3.1.x/examples/portal/rest-war/pom.xml exo/portal/branches/3.1.x/examples/portal/war/pom.xml exo/portal/branches/3.1.x/examples/portlets/jsfhellouser/pom.xml exo/portal/branches/3.1.x/examples/portlets/jsphellouser/pom.xml exo/portal/branches/3.1.x/examples/portlets/pom.xml exo/portal/branches/3.1.x/examples/portlets/simplesthelloworld/pom.xml exo/portal/branches/3.1.x/examples/portlets/struts-jpetstore/pom.xml exo/portal/branches/3.1.x/examples/skins/pom.xml exo/portal/branches/3.1.x/examples/skins/simpleskin/pom.xml exo/portal/branches/3.1.x/gadgets/core/pom.xml exo/portal/branches/3.1.x/gadgets/eXoGadgets/pom.xml exo/portal/branches/3.1.x/gadgets/pom.xml exo/portal/branches/3.1.x/gadgets/server/pom.xml exo/portal/branches/3.1.x/packaging/module/pom.xml exo/portal/branches/3.1.x/packaging/pkg/pom.xml exo/portal/branches/3.1.x/packaging/pom.xml exo/portal/branches/3.1.x/packaging/product/pom.xml exo/portal/branches/3.1.x/packaging/reports/pom.xml exo/portal/branches/3.1.x/pom.xml exo/portal/branches/3.1.x/portlet/dashboard/pom.xml exo/portal/branches/3.1.x/portlet/exoadmin/pom.xml exo/portal/branches/3.1.x/portlet/pom.xml exo/portal/branches/3.1.x/portlet/web/pom.xml exo/portal/branches/3.1.x/server/jboss/patch-ear/pom.xml exo/portal/branches/3.1.x/server/jboss/plugin/pom.xml exo/portal/branches/3.1.x/server/jboss/pom.xml exo/portal/branches/3.1.x/server/pom.xml exo/portal/branches/3.1.x/server/tomcat/patch/pom.xml exo/portal/branches/3.1.x/server/tomcat/plugin/pom.xml exo/portal/branches/3.1.x/server/tomcat/pom.xml exo/portal/branches/3.1.x/starter/ear/pom.xml exo/portal/branches/3.1.x/starter/pom.xml exo/portal/branches/3.1.x/starter/war/pom.xml exo/portal/branches/3.1.x/testsuite/pom.xml exo/portal/branches/3.1.x/testsuite/selenium-snifftests/pom.xml exo/portal/branches/3.1.x/testsuite/webuibasedsamples/pom.xml exo/portal/branches/3.1.x/web/eXoResources/pom.xml exo/portal/branches/3.1.x/web/pom.xml exo/portal/branches/3.1.x/web/portal/pom.xml exo/portal/branches/3.1.x/web/rest/pom.xml exo/portal/branches/3.1.x/webui/core/pom.xml exo/portal/branches/3.1.x/webui/eXo/pom.xml exo/portal/branches/3.1.x/webui/pom.xml exo/portal/branches/3.1.x/webui/portal/pom.xml Log: [maven-release-plugin] prepare release 3.1.6-CR01-PLF Modified: exo/portal/branches/3.1.x/component/application-registry/pom.xml =================================================================== --- exo/portal/branches/3.1.x/component/application-registry/pom.xml 2010-11-25 17:34:12 UTC (rev 5277) +++ exo/portal/branches/3.1.x/component/application-registry/pom.xml 2010-11-25 17:48:29 UTC (rev 5278) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>3.1.6-PLF-SNAPSHOT</version> + <version>3.1.6-CR01-PLF</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: exo/portal/branches/3.1.x/component/common/pom.xml =================================================================== --- exo/portal/branches/3.1.x/component/common/pom.xml 2010-11-25 17:34:12 UTC (rev 5277) +++ exo/portal/branches/3.1.x/component/common/pom.xml 2010-11-25 17:48:29 UTC (rev 5278) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>3.1.6-PLF-SNAPSHOT</version> + <version>3.1.6-CR01-PLF</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>exo.portal.component.common</artifactId> Modified: exo/portal/branches/3.1.x/component/dashboard/pom.xml =================================================================== --- exo/portal/branches/3.1.x/component/dashboard/pom.xml 2010-11-25 17:34:12 UTC (rev 5277) +++ exo/portal/branches/3.1.x/component/dashboard/pom.xml 2010-11-25 17:48:29 UTC (rev 5278) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>3.1.6-PLF-SNAPSHOT</version> + <version>3.1.6-CR01-PLF</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: exo/portal/branches/3.1.x/component/identity/pom.xml =================================================================== --- exo/portal/branches/3.1.x/component/identity/pom.xml 2010-11-25 17:34:12 UTC (rev 5277) +++ exo/portal/branches/3.1.x/component/identity/pom.xml 2010-11-25 17:48:29 UTC (rev 5278) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>3.1.6-PLF-SNAPSHOT</version> + <version>3.1.6-CR01-PLF</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: exo/portal/branches/3.1.x/component/management/pom.xml =================================================================== --- exo/portal/branches/3.1.x/component/management/pom.xml 2010-11-25 17:34:12 UTC (rev 5277) +++ exo/portal/branches/3.1.x/component/management/pom.xml 2010-11-25 17:48:29 UTC (rev 5278) @@ -21,7 +21,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>3.1.6-PLF-SNAPSHOT</version> + <version>3.1.6-CR01-PLF</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: exo/portal/branches/3.1.x/component/pc/pom.xml =================================================================== --- exo/portal/branches/3.1.x/component/pc/pom.xml 2010-11-25 17:34:12 UTC (rev 5277) +++ exo/portal/branches/3.1.x/component/pc/pom.xml 2010-11-25 17:48:29 UTC (rev 5278) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>3.1.6-PLF-SNAPSHOT</version> + <version>3.1.6-CR01-PLF</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: exo/portal/branches/3.1.x/component/pom.xml =================================================================== --- exo/portal/branches/3.1.x/component/pom.xml 2010-11-25 17:34:12 UTC (rev 5277) +++ exo/portal/branches/3.1.x/component/pom.xml 2010-11-25 17:48:29 UTC (rev 5278) @@ -26,7 +26,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>3.1.6-PLF-SNAPSHOT</version> + <version>3.1.6-CR01-PLF</version> </parent> <artifactId>exo.portal.component</artifactId> Modified: exo/portal/branches/3.1.x/component/portal/pom.xml =================================================================== --- exo/portal/branches/3.1.x/component/portal/pom.xml 2010-11-25 17:34:12 UTC (rev 5277) +++ exo/portal/branches/3.1.x/component/portal/pom.xml 2010-11-25 17:48:29 UTC (rev 5278) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>3.1.6-PLF-SNAPSHOT</version> + <version>3.1.6-CR01-PLF</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: exo/portal/branches/3.1.x/component/resources/pom.xml =================================================================== --- exo/portal/branches/3.1.x/component/resources/pom.xml 2010-11-25 17:34:12 UTC (rev 5277) +++ exo/portal/branches/3.1.x/component/resources/pom.xml 2010-11-25 17:48:29 UTC (rev 5278) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>3.1.6-PLF-SNAPSHOT</version> + <version>3.1.6-CR01-PLF</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: exo/portal/branches/3.1.x/component/scripting/pom.xml =================================================================== --- exo/portal/branches/3.1.x/component/scripting/pom.xml 2010-11-25 17:34:12 UTC (rev 5277) +++ exo/portal/branches/3.1.x/component/scripting/pom.xml 2010-11-25 17:48:29 UTC (rev 5278) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>3.1.6-PLF-SNAPSHOT</version> + <version>3.1.6-CR01-PLF</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: exo/portal/branches/3.1.x/component/test/core/pom.xml =================================================================== --- exo/portal/branches/3.1.x/component/test/core/pom.xml 2010-11-25 17:34:12 UTC (rev 5277) +++ exo/portal/branches/3.1.x/component/test/core/pom.xml 2010-11-25 17:48:29 UTC (rev 5278) @@ -22,7 +22,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.test</artifactId> - <version>3.1.6-PLF-SNAPSHOT</version> + <version>3.1.6-CR01-PLF</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: exo/portal/branches/3.1.x/component/test/jcr/pom.xml =================================================================== --- exo/portal/branches/3.1.x/component/test/jcr/pom.xml 2010-11-25 17:34:12 UTC (rev 5277) +++ exo/portal/branches/3.1.x/component/test/jcr/pom.xml 2010-11-25 17:48:29 UTC (rev 5278) @@ -22,7 +22,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.test</artifactId> - <version>3.1.6-PLF-SNAPSHOT</version> + <version>3.1.6-CR01-PLF</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: exo/portal/branches/3.1.x/component/test/organization/pom.xml =================================================================== --- exo/portal/branches/3.1.x/component/test/organization/pom.xml 2010-11-25 17:34:12 UTC (rev 5277) +++ exo/portal/branches/3.1.x/component/test/organization/pom.xml 2010-11-25 17:48:29 UTC (rev 5278) @@ -22,7 +22,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.test</artifactId> - <version>3.1.6-PLF-SNAPSHOT</version> + <version>3.1.6-CR01-PLF</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: exo/portal/branches/3.1.x/component/test/pom.xml =================================================================== --- exo/portal/branches/3.1.x/component/test/pom.xml 2010-11-25 17:34:12 UTC (rev 5277) +++ exo/portal/branches/3.1.x/component/test/pom.xml 2010-11-25 17:48:29 UTC (rev 5278) @@ -22,7 +22,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>3.1.6-PLF-SNAPSHOT</version> + <version>3.1.6-CR01-PLF</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: exo/portal/branches/3.1.x/component/web/pom.xml =================================================================== --- exo/portal/branches/3.1.x/component/web/pom.xml 2010-11-25 17:34:12 UTC (rev 5277) +++ exo/portal/branches/3.1.x/component/web/pom.xml 2010-11-25 17:48:29 UTC (rev 5278) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>3.1.6-PLF-SNAPSHOT</version> + <version>3.1.6-CR01-PLF</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: exo/portal/branches/3.1.x/component/wsrp/pom.xml =================================================================== --- exo/portal/branches/3.1.x/component/wsrp/pom.xml 2010-11-25 17:34:12 UTC (rev 5277) +++ exo/portal/branches/3.1.x/component/wsrp/pom.xml 2010-11-25 17:48:29 UTC (rev 5278) @@ -25,7 +25,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>3.1.6-PLF-SNAPSHOT</version> + <version>3.1.6-CR01-PLF</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: exo/portal/branches/3.1.x/docs/pom.xml =================================================================== --- exo/portal/branches/3.1.x/docs/pom.xml 2010-11-25 17:34:12 UTC (rev 5277) +++ exo/portal/branches/3.1.x/docs/pom.xml 2010-11-25 17:48:29 UTC (rev 5278) @@ -25,7 +25,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>3.1.6-PLF-SNAPSHOT</version> + <version>3.1.6-CR01-PLF</version> </parent> <groupId>org.gatein.doc</groupId> Modified: exo/portal/branches/3.1.x/docs/reference-guide/pom.xml =================================================================== --- exo/portal/branches/3.1.x/docs/reference-guide/pom.xml 2010-11-25 17:34:12 UTC (rev 5277) +++ exo/portal/branches/3.1.x/docs/reference-guide/pom.xml 2010-11-25 17:48:29 UTC (rev 5278) @@ -26,7 +26,7 @@ <parent> <groupId>org.gatein.doc</groupId> <artifactId>docs-aggregator</artifactId> - <version>3.1.6-PLF-SNAPSHOT</version> + <version>3.1.6-CR01-PLF</version> </parent> <groupId>org.gatein.doc</groupId> Modified: exo/portal/branches/3.1.x/docs/user-guide/pom.xml =================================================================== --- exo/portal/branches/3.1.x/docs/user-guide/pom.xml 2010-11-25 17:34:12 UTC (rev 5277) +++ exo/portal/branches/3.1.x/docs/user-guide/pom.xml 2010-11-25 17:48:29 UTC (rev 5278) @@ -26,7 +26,7 @@ <parent> <groupId>org.gatein.doc</groupId> <artifactId>docs-aggregator</artifactId> - <version>3.1.6-PLF-SNAPSHOT</version> + <version>3.1.6-CR01-PLF</version> </parent> <artifactId>gatein-user-guide-en</artifactId> Modified: exo/portal/branches/3.1.x/examples/extension/config/pom.xml =================================================================== --- exo/portal/branches/3.1.x/examples/extension/config/pom.xml 2010-11-25 17:34:12 UTC (rev 5277) +++ exo/portal/branches/3.1.x/examples/extension/config/pom.xml 2010-11-25 17:48:29 UTC (rev 5278) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>3.1.6-PLF-SNAPSHOT</version> + <version>3.1.6-CR01-PLF</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: exo/portal/branches/3.1.x/examples/extension/ear/pom.xml =================================================================== --- exo/portal/branches/3.1.x/examples/extension/ear/pom.xml 2010-11-25 17:34:12 UTC (rev 5277) +++ exo/portal/branches/3.1.x/examples/extension/ear/pom.xml 2010-11-25 17:48:29 UTC (rev 5278) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>3.1.6-PLF-SNAPSHOT</version> + <version>3.1.6-CR01-PLF</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -37,23 +37,23 @@ <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.sample.extension.config</artifactId> - <version>3.1.6-PLF-SNAPSHOT</version> + <version>3.1.6-CR01-PLF</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.sample.extension.jar</artifactId> - <version>3.1.6-PLF-SNAPSHOT</version> + <version>3.1.6-CR01-PLF</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web</artifactId> - <version>3.1.6-PLF-SNAPSHOT</version> + <version>3.1.6-CR01-PLF</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.sample.extension.war</artifactId> - <version>3.1.6-PLF-SNAPSHOT</version> + <version>3.1.6-CR01-PLF</version> <type>war</type> </dependency> </dependencies> Modified: exo/portal/branches/3.1.x/examples/extension/jar/pom.xml =================================================================== --- exo/portal/branches/3.1.x/examples/extension/jar/pom.xml 2010-11-25 17:34:12 UTC (rev 5277) +++ exo/portal/branches/3.1.x/examples/extension/jar/pom.xml 2010-11-25 17:48:29 UTC (rev 5278) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>3.1.6-PLF-SNAPSHOT</version> + <version>3.1.6-CR01-PLF</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: exo/portal/branches/3.1.x/examples/extension/pom.xml =================================================================== --- exo/portal/branches/3.1.x/examples/extension/pom.xml 2010-11-25 17:34:12 UTC (rev 5277) +++ exo/portal/branches/3.1.x/examples/extension/pom.xml 2010-11-25 17:48:29 UTC (rev 5278) @@ -24,7 +24,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>3.1.6-PLF-SNAPSHOT</version> + <version>3.1.6-CR01-PLF</version> </parent> <artifactId>exo.portal.sample.extension.root</artifactId> Modified: exo/portal/branches/3.1.x/examples/extension/war/pom.xml =================================================================== --- exo/portal/branches/3.1.x/examples/extension/war/pom.xml 2010-11-25 17:34:12 UTC (rev 5277) +++ exo/portal/branches/3.1.x/examples/extension/war/pom.xml 2010-11-25 17:48:29 UTC (rev 5278) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>3.1.6-PLF-SNAPSHOT</version> + <version>3.1.6-CR01-PLF</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: exo/portal/branches/3.1.x/examples/pom.xml =================================================================== --- exo/portal/branches/3.1.x/examples/pom.xml 2010-11-25 17:34:12 UTC (rev 5277) +++ exo/portal/branches/3.1.x/examples/pom.xml 2010-11-25 17:48:29 UTC (rev 5278) @@ -26,7 +26,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>3.1.6-PLF-SNAPSHOT</version> + <version>3.1.6-CR01-PLF</version> </parent> <artifactId>exo.portal.sample</artifactId> Modified: exo/portal/branches/3.1.x/examples/portal/config/pom.xml =================================================================== --- exo/portal/branches/3.1.x/examples/portal/config/pom.xml 2010-11-25 17:34:12 UTC (rev 5277) +++ exo/portal/branches/3.1.x/examples/portal/config/pom.xml 2010-11-25 17:48:29 UTC (rev 5278) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>3.1.6-PLF-SNAPSHOT</version> + <version>3.1.6-CR01-PLF</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: exo/portal/branches/3.1.x/examples/portal/ear/pom.xml =================================================================== --- exo/portal/branches/3.1.x/examples/portal/ear/pom.xml 2010-11-25 17:34:12 UTC (rev 5277) +++ exo/portal/branches/3.1.x/examples/portal/ear/pom.xml 2010-11-25 17:48:29 UTC (rev 5278) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>3.1.6-PLF-SNAPSHOT</version> + <version>3.1.6-CR01-PLF</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -37,29 +37,29 @@ <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.sample.portal.config</artifactId> - <version>3.1.6-PLF-SNAPSHOT</version> + <version>3.1.6-CR01-PLF</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.sample.portal.jar</artifactId> - <version>3.1.6-PLF-SNAPSHOT</version> + <version>3.1.6-CR01-PLF</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web</artifactId> - <version>3.1.6-PLF-SNAPSHOT</version> + <version>3.1.6-CR01-PLF</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.sample.portal.war</artifactId> - <version>3.1.6-PLF-SNAPSHOT</version> + <version>3.1.6-CR01-PLF</version> <type>war</type> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.sample.portal.rest-war</artifactId> - <version>3.1.6-PLF-SNAPSHOT</version> + <version>3.1.6-CR01-PLF</version> <type>war</type> </dependency> </dependencies> Modified: exo/portal/branches/3.1.x/examples/portal/jar/pom.xml =================================================================== --- exo/portal/branches/3.1.x/examples/portal/jar/pom.xml 2010-11-25 17:34:12 UTC (rev 5277) +++ exo/portal/branches/3.1.x/examples/portal/jar/pom.xml 2010-11-25 17:48:29 UTC (rev 5278) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>3.1.6-PLF-SNAPSHOT</version> + <version>3.1.6-CR01-PLF</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: exo/portal/branches/3.1.x/examples/portal/pom.xml =================================================================== --- exo/portal/branches/3.1.x/examples/portal/pom.xml 2010-11-25 17:34:12 UTC (rev 5277) +++ exo/portal/branches/3.1.x/examples/portal/pom.xml 2010-11-25 17:48:29 UTC (rev 5278) @@ -24,7 +24,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>3.1.6-PLF-SNAPSHOT</version> + <version>3.1.6-CR01-PLF</version> </parent> <artifactId>exo.portal.sample.portal.root</artifactId> Modified: exo/portal/branches/3.1.x/examples/portal/rest-war/pom.xml =================================================================== --- exo/portal/branches/3.1.x/examples/portal/rest-war/pom.xml 2010-11-25 17:34:12 UTC (rev 5277) +++ exo/portal/branches/3.1.x/examples/portal/rest-war/pom.xml 2010-11-25 17:48:29 UTC (rev 5278) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>3.1.6-PLF-SNAPSHOT</version> + <version>3.1.6-CR01-PLF</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: exo/portal/branches/3.1.x/examples/portal/war/pom.xml =================================================================== --- exo/portal/branches/3.1.x/examples/portal/war/pom.xml 2010-11-25 17:34:12 UTC (rev 5277) +++ exo/portal/branches/3.1.x/examples/portal/war/pom.xml 2010-11-25 17:48:29 UTC (rev 5278) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>3.1.6-PLF-SNAPSHOT</version> + <version>3.1.6-CR01-PLF</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: exo/portal/branches/3.1.x/examples/portlets/jsfhellouser/pom.xml =================================================================== --- exo/portal/branches/3.1.x/examples/portlets/jsfhellouser/pom.xml 2010-11-25 17:34:12 UTC (rev 5277) +++ exo/portal/branches/3.1.x/examples/portlets/jsfhellouser/pom.xml 2010-11-25 17:48:29 UTC (rev 5278) @@ -9,7 +9,7 @@ <parent> <groupId>org.gatein.portal.examples.portlets</groupId> <artifactId>parent</artifactId> - <version>3.1.6-PLF-SNAPSHOT</version> + <version>3.1.6-CR01-PLF</version> </parent> <artifactId>gatein-jsf-hellouser</artifactId> Modified: exo/portal/branches/3.1.x/examples/portlets/jsphellouser/pom.xml =================================================================== --- exo/portal/branches/3.1.x/examples/portlets/jsphellouser/pom.xml 2010-11-25 17:34:12 UTC (rev 5277) +++ exo/portal/branches/3.1.x/examples/portlets/jsphellouser/pom.xml 2010-11-25 17:48:29 UTC (rev 5278) @@ -9,7 +9,7 @@ <parent> <groupId>org.gatein.portal.examples.portlets</groupId> <artifactId>parent</artifactId> - <version>3.1.6-PLF-SNAPSHOT</version> + <version>3.1.6-CR01-PLF</version> </parent> <artifactId>gatein-jsp-hellouser</artifactId> Modified: exo/portal/branches/3.1.x/examples/portlets/pom.xml =================================================================== --- exo/portal/branches/3.1.x/examples/portlets/pom.xml 2010-11-25 17:34:12 UTC (rev 5277) +++ exo/portal/branches/3.1.x/examples/portlets/pom.xml 2010-11-25 17:48:29 UTC (rev 5278) @@ -5,7 +5,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>3.1.6-PLF-SNAPSHOT</version> + <version>3.1.6-CR01-PLF</version> </parent> <groupId>org.gatein.portal.examples.portlets</groupId> Modified: exo/portal/branches/3.1.x/examples/portlets/simplesthelloworld/pom.xml =================================================================== --- exo/portal/branches/3.1.x/examples/portlets/simplesthelloworld/pom.xml 2010-11-25 17:34:12 UTC (rev 5277) +++ exo/portal/branches/3.1.x/examples/portlets/simplesthelloworld/pom.xml 2010-11-25 17:48:29 UTC (rev 5278) @@ -9,7 +9,7 @@ <parent> <groupId>org.gatein.portal.examples.portlets</groupId> <artifactId>parent</artifactId> - <version>3.1.6-PLF-SNAPSHOT</version> + <version>3.1.6-CR01-PLF</version> </parent> <artifactId>gatein-simplest-helloworld</artifactId> Modified: exo/portal/branches/3.1.x/examples/portlets/struts-jpetstore/pom.xml =================================================================== --- exo/portal/branches/3.1.x/examples/portlets/struts-jpetstore/pom.xml 2010-11-25 17:34:12 UTC (rev 5277) +++ exo/portal/branches/3.1.x/examples/portlets/struts-jpetstore/pom.xml 2010-11-25 17:48:29 UTC (rev 5278) @@ -5,7 +5,7 @@ <parent> <groupId>org.gatein.portal.examples.portlets</groupId> <artifactId>parent</artifactId> - <version>3.1.6-PLF-SNAPSHOT</version> + <version>3.1.6-CR01-PLF</version> </parent> <artifactId>struts-jpetstore</artifactId> Modified: exo/portal/branches/3.1.x/examples/skins/pom.xml =================================================================== --- exo/portal/branches/3.1.x/examples/skins/pom.xml 2010-11-25 17:34:12 UTC (rev 5277) +++ exo/portal/branches/3.1.x/examples/skins/pom.xml 2010-11-25 17:48:29 UTC (rev 5278) @@ -5,7 +5,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>3.1.6-PLF-SNAPSHOT</version> + <version>3.1.6-CR01-PLF</version> </parent> <groupId>org.gatein.portal.examples.skins</groupId> Modified: exo/portal/branches/3.1.x/examples/skins/simpleskin/pom.xml =================================================================== --- exo/portal/branches/3.1.x/examples/skins/simpleskin/pom.xml 2010-11-25 17:34:12 UTC (rev 5277) +++ exo/portal/branches/3.1.x/examples/skins/simpleskin/pom.xml 2010-11-25 17:48:29 UTC (rev 5278) @@ -25,7 +25,7 @@ <parent> <groupId>org.gatein.portal.examples.skins</groupId> <artifactId>parent</artifactId> - <version>3.1.6-PLF-SNAPSHOT</version> + <version>3.1.6-CR01-PLF</version> </parent> <artifactId>gatein-sample-skin</artifactId> Modified: exo/portal/branches/3.1.x/gadgets/core/pom.xml =================================================================== --- exo/portal/branches/3.1.x/gadgets/core/pom.xml 2010-11-25 17:34:12 UTC (rev 5277) +++ exo/portal/branches/3.1.x/gadgets/core/pom.xml 2010-11-25 17:48:29 UTC (rev 5278) @@ -14,7 +14,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.gadgets</artifactId> - <version>3.1.6-PLF-SNAPSHOT</version> + <version>3.1.6-CR01-PLF</version> </parent> <artifactId>exo.portal.gadgets-core</artifactId> Modified: exo/portal/branches/3.1.x/gadgets/eXoGadgets/pom.xml =================================================================== --- exo/portal/branches/3.1.x/gadgets/eXoGadgets/pom.xml 2010-11-25 17:34:12 UTC (rev 5277) +++ exo/portal/branches/3.1.x/gadgets/eXoGadgets/pom.xml 2010-11-25 17:48:29 UTC (rev 5278) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.gadgets</artifactId> - <version>3.1.6-PLF-SNAPSHOT</version> + <version>3.1.6-CR01-PLF</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: exo/portal/branches/3.1.x/gadgets/pom.xml =================================================================== --- exo/portal/branches/3.1.x/gadgets/pom.xml 2010-11-25 17:34:12 UTC (rev 5277) +++ exo/portal/branches/3.1.x/gadgets/pom.xml 2010-11-25 17:48:29 UTC (rev 5278) @@ -24,7 +24,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>3.1.6-PLF-SNAPSHOT</version> + <version>3.1.6-CR01-PLF</version> </parent> <artifactId>exo.portal.gadgets</artifactId> Modified: exo/portal/branches/3.1.x/gadgets/server/pom.xml =================================================================== --- exo/portal/branches/3.1.x/gadgets/server/pom.xml 2010-11-25 17:34:12 UTC (rev 5277) +++ exo/portal/branches/3.1.x/gadgets/server/pom.xml 2010-11-25 17:48:29 UTC (rev 5278) @@ -25,7 +25,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.gadgets</artifactId> - <version>3.1.6-PLF-SNAPSHOT</version> + <version>3.1.6-CR01-PLF</version> </parent> <artifactId>exo.portal.gadgets-server</artifactId> Modified: exo/portal/branches/3.1.x/packaging/module/pom.xml =================================================================== --- exo/portal/branches/3.1.x/packaging/module/pom.xml 2010-11-25 17:34:12 UTC (rev 5277) +++ exo/portal/branches/3.1.x/packaging/module/pom.xml 2010-11-25 17:48:29 UTC (rev 5278) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.packaging</artifactId> - <version>3.1.6-PLF-SNAPSHOT</version> + <version>3.1.6-CR01-PLF</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: exo/portal/branches/3.1.x/packaging/pkg/pom.xml =================================================================== --- exo/portal/branches/3.1.x/packaging/pkg/pom.xml 2010-11-25 17:34:12 UTC (rev 5277) +++ exo/portal/branches/3.1.x/packaging/pkg/pom.xml 2010-11-25 17:48:29 UTC (rev 5278) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.packaging</artifactId> - <version>3.1.6-PLF-SNAPSHOT</version> + <version>3.1.6-CR01-PLF</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -72,19 +72,19 @@ <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>portal.packaging.module</artifactId> - <version>3.1.6-PLF-SNAPSHOT</version> + <version>3.1.6-CR01-PLF</version> <type>js</type> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>portal.packaging.product</artifactId> - <version>3.1.6-PLF-SNAPSHOT</version> + <version>3.1.6-CR01-PLF</version> <type>js</type> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.server.jboss.patch-ear</artifactId> - <version>3.1.6-PLF-SNAPSHOT</version> + <version>3.1.6-CR01-PLF</version> </dependency>  Modified: exo/portal/branches/3.1.x/packaging/pom.xml =================================================================== --- exo/portal/branches/3.1.x/packaging/pom.xml 2010-11-25 17:34:12 UTC (rev 5277) +++ exo/portal/branches/3.1.x/packaging/pom.xml 2010-11-25 17:48:29 UTC (rev 5278) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>3.1.6-PLF-SNAPSHOT</version> + <version>3.1.6-CR01-PLF</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: exo/portal/branches/3.1.x/packaging/product/pom.xml =================================================================== --- exo/portal/branches/3.1.x/packaging/product/pom.xml 2010-11-25 17:34:12 UTC (rev 5277) +++ exo/portal/branches/3.1.x/packaging/product/pom.xml 2010-11-25 17:48:29 UTC (rev 5278) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.packaging</artifactId> - <version>3.1.6-PLF-SNAPSHOT</version> + <version>3.1.6-CR01-PLF</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: exo/portal/branches/3.1.x/packaging/reports/pom.xml =================================================================== --- exo/portal/branches/3.1.x/packaging/reports/pom.xml 2010-11-25 17:34:12 UTC (rev 5277) +++ exo/portal/branches/3.1.x/packaging/reports/pom.xml 2010-11-25 17:48:29 UTC (rev 5278) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.packaging</artifactId> - <version>3.1.6-PLF-SNAPSHOT</version> + <version>3.1.6-CR01-PLF</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: exo/portal/branches/3.1.x/pom.xml =================================================================== --- exo/portal/branches/3.1.x/pom.xml 2010-11-25 17:34:12 UTC (rev 5277) +++ exo/portal/branches/3.1.x/pom.xml 2010-11-25 17:48:29 UTC (rev 5278) @@ -31,7 +31,7 @@ <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>3.1.6-PLF-SNAPSHOT</version> + <version>3.1.6-CR01-PLF</version> <packaging>pom</packaging> <name>GateIn - Portal</name> @@ -101,9 +101,9 @@ </distributionManagement> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/exo/portal/branches/3.1.x</connection> - <developerConnection>scm:svn:http://svn.jboss.org/repos/gatein/exo/portal/branches/3.1.x</developerConnection> - <url>http://fisheye.jboss.org/browse/gatein/exo/portal/branches/3.1.x</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/exo/portal/tags/3.1.6-CR01-PLF</connection> + <developerConnection>scm:svn:http://svn.jboss.org/repos/gatein/exo/portal/tags/3.1.6-CR01-PLF</developerConnection> + <url>http://fisheye.jboss.org/browse/gatein/exo/portal/tags/3.1.6-CR01-PLF</url> </scm> <modules> @@ -341,43 +341,43 @@ <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.common</artifactId> - <version>3.1.6-PLF-SNAPSHOT</version> + <version>3.1.6-CR01-PLF</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web</artifactId> - <version>3.1.6-PLF-SNAPSHOT</version> + <version>3.1.6-CR01-PLF</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.portal</artifactId> - <version>3.1.6-PLF-SNAPSHOT</version> + <version>3.1.6-CR01-PLF</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.portal</artifactId> - <version>3.1.6-PLF-SNAPSHOT</version> + <version>3.1.6-CR01-PLF</version> <type>test-jar</type> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.pc</artifactId> - <version>3.1.6-PLF-SNAPSHOT</version> + <version>3.1.6-CR01-PLF</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.identity</artifactId> - <version>3.1.6-PLF-SNAPSHOT</version> + <version>3.1.6-CR01-PLF</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.resources</artifactId> - <version>3.1.6-PLF-SNAPSHOT</version> + <version>3.1.6-CR01-PLF</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.application-registry</artifactId> - <version>3.1.6-PLF-SNAPSHOT</version> + <version>3.1.6-CR01-PLF</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> @@ -387,64 +387,64 @@ <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.scripting</artifactId> - <version>3.1.6-PLF-SNAPSHOT</version> + <version>3.1.6-CR01-PLF</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.dashboard</artifactId> - <version>3.1.6-PLF-SNAPSHOT</version> + <version>3.1.6-CR01-PLF</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui.portal</artifactId> - <version>3.1.6-PLF-SNAPSHOT</version> + <version>3.1.6-CR01-PLF</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui.eXo</artifactId> - <version>3.1.6-PLF-SNAPSHOT</version> + <version>3.1.6-CR01-PLF</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui.core</artifactId> - <version>3.1.6-PLF-SNAPSHOT</version> + <version>3.1.6-CR01-PLF</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.gadgets-core</artifactId> - <version>3.1.6-PLF-SNAPSHOT</version> + <version>3.1.6-CR01-PLF</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.test.core</artifactId> - <version>3.1.6-PLF-SNAPSHOT</version> + <version>3.1.6-CR01-PLF</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.test.core</artifactId> - <version>3.1.6-PLF-SNAPSHOT</version> + <version>3.1.6-CR01-PLF</version> <type>test-jar</type> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.test.jcr</artifactId> - <version>3.1.6-PLF-SNAPSHOT</version> + <version>3.1.6-CR01-PLF</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.test.jcr</artifactId> - <version>3.1.6-PLF-SNAPSHOT</version> + <version>3.1.6-CR01-PLF</version> <type>test-jar</type> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.test.organization</artifactId> - <version>3.1.6-PLF-SNAPSHOT</version> + <version>3.1.6-CR01-PLF</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.test.organization</artifactId> - <version>3.1.6-PLF-SNAPSHOT</version> + <version>3.1.6-CR01-PLF</version> <type>test-jar</type> </dependency> Modified: exo/portal/branches/3.1.x/portlet/dashboard/pom.xml =================================================================== --- exo/portal/branches/3.1.x/portlet/dashboard/pom.xml 2010-11-25 17:34:12 UTC (rev 5277) +++ exo/portal/branches/3.1.x/portlet/dashboard/pom.xml 2010-11-25 17:48:29 UTC (rev 5278) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.portlet</artifactId> - <version>3.1.6-PLF-SNAPSHOT</version> + <version>3.1.6-CR01-PLF</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: exo/portal/branches/3.1.x/portlet/exoadmin/pom.xml =================================================================== --- exo/portal/branches/3.1.x/portlet/exoadmin/pom.xml 2010-11-25 17:34:12 UTC (rev 5277) +++ exo/portal/branches/3.1.x/portlet/exoadmin/pom.xml 2010-11-25 17:48:29 UTC (rev 5278) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.portlet</artifactId> - <version>3.1.6-PLF-SNAPSHOT</version> + <version>3.1.6-CR01-PLF</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: exo/portal/branches/3.1.x/portlet/pom.xml =================================================================== --- exo/portal/branches/3.1.x/portlet/pom.xml 2010-11-25 17:34:12 UTC (rev 5277) +++ exo/portal/branches/3.1.x/portlet/pom.xml 2010-11-25 17:48:29 UTC (rev 5278) @@ -26,7 +26,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>3.1.6-PLF-SNAPSHOT</version> + <version>3.1.6-CR01-PLF</version> </parent> <artifactId>exo.portal.portlet</artifactId> Modified: exo/portal/branches/3.1.x/portlet/web/pom.xml =================================================================== --- exo/portal/branches/3.1.x/portlet/web/pom.xml 2010-11-25 17:34:12 UTC (rev 5277) +++ exo/portal/branches/3.1.x/portlet/web/pom.xml 2010-11-25 17:48:29 UTC (rev 5278) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.portlet</artifactId> - <version>3.1.6-PLF-SNAPSHOT</version> + <version>3.1.6-CR01-PLF</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: exo/portal/branches/3.1.x/server/jboss/patch-ear/pom.xml =================================================================== --- exo/portal/branches/3.1.x/server/jboss/patch-ear/pom.xml 2010-11-25 17:34:12 UTC (rev 5277) +++ exo/portal/branches/3.1.x/server/jboss/patch-ear/pom.xml 2010-11-25 17:48:29 UTC (rev 5278) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.server.jboss</artifactId> - <version>3.1.6-PLF-SNAPSHOT</version> + <version>3.1.6-CR01-PLF</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: exo/portal/branches/3.1.x/server/jboss/plugin/pom.xml =================================================================== --- exo/portal/branches/3.1.x/server/jboss/plugin/pom.xml 2010-11-25 17:34:12 UTC (rev 5277) +++ exo/portal/branches/3.1.x/server/jboss/plugin/pom.xml 2010-11-25 17:48:29 UTC (rev 5278) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.server.jboss</artifactId> - <version>3.1.6-PLF-SNAPSHOT</version> + <version>3.1.6-CR01-PLF</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: exo/portal/branches/3.1.x/server/jboss/pom.xml =================================================================== --- exo/portal/branches/3.1.x/server/jboss/pom.xml 2010-11-25 17:34:12 UTC (rev 5277) +++ exo/portal/branches/3.1.x/server/jboss/pom.xml 2010-11-25 17:48:29 UTC (rev 5278) @@ -26,7 +26,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.server</artifactId> - <version>3.1.6-PLF-SNAPSHOT</version> + <version>3.1.6-CR01-PLF</version> </parent> <artifactId>exo.portal.server.jboss</artifactId> Modified: exo/portal/branches/3.1.x/server/pom.xml =================================================================== --- exo/portal/branches/3.1.x/server/pom.xml 2010-11-25 17:34:12 UTC (rev 5277) +++ exo/portal/branches/3.1.x/server/pom.xml 2010-11-25 17:48:29 UTC (rev 5278) @@ -26,7 +26,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>3.1.6-PLF-SNAPSHOT</version> + <version>3.1.6-CR01-PLF</version> </parent> <artifactId>exo.portal.server</artifactId> Modified: exo/portal/branches/3.1.x/server/tomcat/patch/pom.xml =================================================================== --- exo/portal/branches/3.1.x/server/tomcat/patch/pom.xml 2010-11-25 17:34:12 UTC (rev 5277) +++ exo/portal/branches/3.1.x/server/tomcat/patch/pom.xml 2010-11-25 17:48:29 UTC (rev 5278) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.server.tomcat</artifactId> - <version>3.1.6-PLF-SNAPSHOT</version> + <version>3.1.6-CR01-PLF</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: exo/portal/branches/3.1.x/server/tomcat/plugin/pom.xml =================================================================== --- exo/portal/branches/3.1.x/server/tomcat/plugin/pom.xml 2010-11-25 17:34:12 UTC (rev 5277) +++ exo/portal/branches/3.1.x/server/tomcat/plugin/pom.xml 2010-11-25 17:48:29 UTC (rev 5278) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.server.tomcat</artifactId> - <version>3.1.6-PLF-SNAPSHOT</version> + <version>3.1.6-CR01-PLF</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: exo/portal/branches/3.1.x/server/tomcat/pom.xml =================================================================== --- exo/portal/branches/3.1.x/server/tomcat/pom.xml 2010-11-25 17:34:12 UTC (rev 5277) +++ exo/portal/branches/3.1.x/server/tomcat/pom.xml 2010-11-25 17:48:29 UTC (rev 5278) @@ -26,7 +26,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.server</artifactId> - <version>3.1.6-PLF-SNAPSHOT</version> + <version>3.1.6-CR01-PLF</version> </parent> <artifactId>exo.portal.server.tomcat</artifactId> Modified: exo/portal/branches/3.1.x/starter/ear/pom.xml =================================================================== --- exo/portal/branches/3.1.x/starter/ear/pom.xml 2010-11-25 17:34:12 UTC (rev 5277) +++ exo/portal/branches/3.1.x/starter/ear/pom.xml 2010-11-25 17:48:29 UTC (rev 5278) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>3.1.6-PLF-SNAPSHOT</version> + <version>3.1.6-CR01-PLF</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -37,7 +37,7 @@ <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.starter.war</artifactId> - <version>3.1.6-PLF-SNAPSHOT</version> + <version>3.1.6-CR01-PLF</version> <type>war</type> </dependency> </dependencies> Modified: exo/portal/branches/3.1.x/starter/pom.xml =================================================================== --- exo/portal/branches/3.1.x/starter/pom.xml 2010-11-25 17:34:12 UTC (rev 5277) +++ exo/portal/branches/3.1.x/starter/pom.xml 2010-11-25 17:48:29 UTC (rev 5278) @@ -24,7 +24,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>3.1.6-PLF-SNAPSHOT</version> + <version>3.1.6-CR01-PLF</version> </parent> <artifactId>exo.portal.starter.root</artifactId> Modified: exo/portal/branches/3.1.x/starter/war/pom.xml =================================================================== --- exo/portal/branches/3.1.x/starter/war/pom.xml 2010-11-25 17:34:12 UTC (rev 5277) +++ exo/portal/branches/3.1.x/starter/war/pom.xml 2010-11-25 17:48:29 UTC (rev 5278) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>3.1.6-PLF-SNAPSHOT</version> + <version>3.1.6-CR01-PLF</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: exo/portal/branches/3.1.x/testsuite/pom.xml =================================================================== --- exo/portal/branches/3.1.x/testsuite/pom.xml 2010-11-25 17:34:12 UTC (rev 5277) +++ exo/portal/branches/3.1.x/testsuite/pom.xml 2010-11-25 17:48:29 UTC (rev 5278) @@ -3,7 +3,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>3.1.6-PLF-SNAPSHOT</version> + <version>3.1.6-CR01-PLF</version> </parent> <artifactId>exo.portal.testsuite</artifactId> Modified: exo/portal/branches/3.1.x/testsuite/selenium-snifftests/pom.xml =================================================================== --- exo/portal/branches/3.1.x/testsuite/selenium-snifftests/pom.xml 2010-11-25 17:34:12 UTC (rev 5277) +++ exo/portal/branches/3.1.x/testsuite/selenium-snifftests/pom.xml 2010-11-25 17:48:29 UTC (rev 5278) @@ -3,7 +3,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.testsuite</artifactId> - <version>3.1.6-PLF-SNAPSHOT</version> + <version>3.1.6-CR01-PLF</version> </parent> <artifactId>exo.portal.selenium.snifftests</artifactId> Modified: exo/portal/branches/3.1.x/testsuite/webuibasedsamples/pom.xml =================================================================== --- exo/portal/branches/3.1.x/testsuite/webuibasedsamples/pom.xml 2010-11-25 17:34:12 UTC (rev 5277) +++ exo/portal/branches/3.1.x/testsuite/webuibasedsamples/pom.xml 2010-11-25 17:48:29 UTC (rev 5278) @@ -3,7 +3,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.testsuite</artifactId> - <version>3.1.6-PLF-SNAPSHOT</version> + <version>3.1.6-CR01-PLF</version> </parent> <artifactId>exo.webui.based.samples</artifactId> Modified: exo/portal/branches/3.1.x/web/eXoResources/pom.xml =================================================================== --- exo/portal/branches/3.1.x/web/eXoResources/pom.xml 2010-11-25 17:34:12 UTC (rev 5277) +++ exo/portal/branches/3.1.x/web/eXoResources/pom.xml 2010-11-25 17:48:29 UTC (rev 5278) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.web</artifactId> - <version>3.1.6-PLF-SNAPSHOT</version> + <version>3.1.6-CR01-PLF</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: exo/portal/branches/3.1.x/web/pom.xml =================================================================== --- exo/portal/branches/3.1.x/web/pom.xml 2010-11-25 17:34:12 UTC (rev 5277) +++ exo/portal/branches/3.1.x/web/pom.xml 2010-11-25 17:48:29 UTC (rev 5278) @@ -26,7 +26,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>3.1.6-PLF-SNAPSHOT</version> + <version>3.1.6-CR01-PLF</version> </parent> <artifactId>exo.portal.web</artifactId> Modified: exo/portal/branches/3.1.x/web/portal/pom.xml =================================================================== --- exo/portal/branches/3.1.x/web/portal/pom.xml 2010-11-25 17:34:12 UTC (rev 5277) +++ exo/portal/branches/3.1.x/web/portal/pom.xml 2010-11-25 17:48:29 UTC (rev 5278) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.web</artifactId> - <version>3.1.6-PLF-SNAPSHOT</version> + <version>3.1.6-CR01-PLF</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: exo/portal/branches/3.1.x/web/rest/pom.xml =================================================================== --- exo/portal/branches/3.1.x/web/rest/pom.xml 2010-11-25 17:34:12 UTC (rev 5277) +++ exo/portal/branches/3.1.x/web/rest/pom.xml 2010-11-25 17:48:29 UTC (rev 5278) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.web</artifactId> - <version>3.1.6-PLF-SNAPSHOT</version> + <version>3.1.6-CR01-PLF</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: exo/portal/branches/3.1.x/webui/core/pom.xml =================================================================== --- exo/portal/branches/3.1.x/webui/core/pom.xml 2010-11-25 17:34:12 UTC (rev 5277) +++ exo/portal/branches/3.1.x/webui/core/pom.xml 2010-11-25 17:48:29 UTC (rev 5278) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui</artifactId> - <version>3.1.6-PLF-SNAPSHOT</version> + <version>3.1.6-CR01-PLF</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: exo/portal/branches/3.1.x/webui/eXo/pom.xml =================================================================== --- exo/portal/branches/3.1.x/webui/eXo/pom.xml 2010-11-25 17:34:12 UTC (rev 5277) +++ exo/portal/branches/3.1.x/webui/eXo/pom.xml 2010-11-25 17:48:29 UTC (rev 5278) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui</artifactId> - <version>3.1.6-PLF-SNAPSHOT</version> + <version>3.1.6-CR01-PLF</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: exo/portal/branches/3.1.x/webui/pom.xml =================================================================== --- exo/portal/branches/3.1.x/webui/pom.xml 2010-11-25 17:34:12 UTC (rev 5277) +++ exo/portal/branches/3.1.x/webui/pom.xml 2010-11-25 17:48:29 UTC (rev 5278) @@ -26,7 +26,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>3.1.6-PLF-SNAPSHOT</version> + <version>3.1.6-CR01-PLF</version> </parent> <artifactId>exo.portal.webui</artifactId> Modified: exo/portal/branches/3.1.x/webui/portal/pom.xml =================================================================== --- exo/portal/branches/3.1.x/webui/portal/pom.xml 2010-11-25 17:34:12 UTC (rev 5277) +++ exo/portal/branches/3.1.x/webui/portal/pom.xml 2010-11-25 17:48:29 UTC (rev 5278) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui</artifactId> - <version>3.1.6-PLF-SNAPSHOT</version> + <version>3.1.6-CR01-PLF</version> </parent> <modelVersion>4.0.0</modelVersion>

14 years, 1 month

1
0
0 / 0

gatein SVN: r5277 - exo/portal/branches/3.1.x.

by do-not-reply＠jboss.org

Author: aheritier Date: 2010-11-25 12:34:12 -0500 (Thu, 25 Nov 2010) New Revision: 5277 Modified: exo/portal/branches/3.1.x/pom.xml Log: EXOGTN-188 : Upgrade cf versions to latest 6-CR02 releases Modified: exo/portal/branches/3.1.x/pom.xml =================================================================== --- exo/portal/branches/3.1.x/pom.xml 2010-11-25 17:08:47 UTC (rev 5276) +++ exo/portal/branches/3.1.x/pom.xml 2010-11-25 17:34:12 UTC (rev 5277) @@ -37,10 +37,10 @@ <name>GateIn - Portal</name> <properties> - <org.exoplatform.kernel.version>2.2.6-GA-SNAPSHOT</org.exoplatform.kernel.version> - <org.exoplatform.core.version>2.3.6-GA-SNAPSHOT</org.exoplatform.core.version> - <org.exoplatform.ws.version>2.1.6-GA-SNAPSHOT</org.exoplatform.ws.version> - <org.exoplatform.jcr.version>1.12.6-GA-SNAPSHOT</org.exoplatform.jcr.version> + <org.exoplatform.kernel.version>2.2.6-CR02</org.exoplatform.kernel.version> + <org.exoplatform.core.version>2.3.6-CR02</org.exoplatform.core.version> + <org.exoplatform.ws.version>2.1.6-CR02</org.exoplatform.ws.version> + <org.exoplatform.jcr.version>1.12.6-CR02</org.exoplatform.jcr.version> <org.jibx.version>1.2.1</org.jibx.version> <org.shindig.version>1.0-r790473-Patch04</org.shindig.version> <nl.captcha.simplecaptcha.version>1.1.1-GA-Patch01</nl.captcha.simplecaptcha.version>

14 years, 1 month

1
0
0 / 0

gatein SVN: r5276 - in exo/portal/branches/standalone: component/portal/src/main/java/org/exoplatform/portal/pom/config and 7 other directories.

by do-not-reply＠jboss.org

Author: phuong_vu Date: 2010-11-25 12:08:47 -0500 (Thu, 25 Nov 2010) New Revision: 5276 Added: exo/portal/branches/standalone/web/portal/src/main/webapp/WEB-INF/standalone-webui-configuration.xml exo/portal/branches/standalone/web/portal/src/main/webapp/groovy/portal/webui/application/UIStandaloneAppContainer.gtmpl exo/portal/branches/standalone/web/portal/src/main/webapp/groovy/portal/webui/application/UIStandaloneGadget.gtmpl exo/portal/branches/standalone/webui/portal/src/main/java/org/exoplatform/portal/application/StandaloneAppRequestContext.java exo/portal/branches/standalone/webui/portal/src/main/java/org/exoplatform/portal/application/StandaloneAppRequestHandler.java exo/portal/branches/standalone/webui/portal/src/main/java/org/exoplatform/portal/application/StandaloneAppStateManager.java exo/portal/branches/standalone/webui/portal/src/main/java/org/exoplatform/portal/application/StandaloneApplication.java exo/portal/branches/standalone/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIStandaloneAppContainer.java exo/portal/branches/standalone/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIStandaloneGadget.java exo/portal/branches/standalone/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIStandaloneApplication.java exo/portal/branches/standalone/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIStandaloneApplicationLifecycle.java Modified: exo/portal/branches/standalone/component/portal/src/main/java/org/exoplatform/portal/config/DataStorage.java exo/portal/branches/standalone/component/portal/src/main/java/org/exoplatform/portal/config/DataStorageImpl.java exo/portal/branches/standalone/component/portal/src/main/java/org/exoplatform/portal/pom/config/POMDataStorage.java exo/portal/branches/standalone/component/portal/src/main/java/org/exoplatform/portal/pom/data/Mapper.java exo/portal/branches/standalone/component/portal/src/main/java/org/exoplatform/portal/pom/data/ModelDataStorage.java exo/portal/branches/standalone/web/portal/src/main/webapp/WEB-INF/web.xml exo/portal/branches/standalone/web/portal/src/main/webapp/groovy/portal/webui/application/UIGadget.gtmpl exo/portal/branches/standalone/web/portal/src/main/webapp/groovy/portal/webui/workspace/UIPortalApplication.gtmpl exo/portal/branches/standalone/webui/portal/src/main/java/org/exoplatform/portal/application/PortalController.java exo/portal/branches/standalone/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestHandler.java Log: EXOGTN-171 Support the portal standalone mode to show an application (gadget for now) standalone Modified: exo/portal/branches/standalone/component/portal/src/main/java/org/exoplatform/portal/config/DataStorage.java =================================================================== --- exo/portal/branches/standalone/component/portal/src/main/java/org/exoplatform/portal/config/DataStorage.java 2010-11-25 16:37:48 UTC (rev 5275) +++ exo/portal/branches/standalone/component/portal/src/main/java/org/exoplatform/portal/config/DataStorage.java 2010-11-25 17:08:47 UTC (rev 5276) @@ -19,21 +19,23 @@ package org.exoplatform.portal.config; +import java.util.Comparator; +import java.util.List; +import java.util.Map; + import org.exoplatform.commons.utils.LazyPageList; import org.exoplatform.commons.utils.ListAccess; import org.exoplatform.portal.application.PortletPreferences; +import org.exoplatform.portal.config.model.Application; import org.exoplatform.portal.config.model.ApplicationState; import org.exoplatform.portal.config.model.ApplicationType; import org.exoplatform.portal.config.model.Container; import org.exoplatform.portal.config.model.Dashboard; -import org.exoplatform.portal.pom.data.ModelChange; import org.exoplatform.portal.config.model.Page; import org.exoplatform.portal.config.model.PageNavigation; import org.exoplatform.portal.config.model.PortalConfig; +import org.exoplatform.portal.pom.data.ModelChange; -import java.util.Comparator; -import java.util.List; - /** * Created by The eXo Platform SAS * Apr 19, 2007 @@ -144,4 +146,15 @@ * @throws Exception any exception */ public List<String> getAllPortalNames() throws Exception; + + /** + * Returns info on site holding workspace object specified by applicationStorageId + * + * @param applicationStorageId + * @return + * @throws Exception + */ + public Map<String, String> getSiteInfo(String applicationStorageId) throws Exception; + + public <S> Application<S> getApplicationModel(String applicationStorageId) throws Exception; } \ No newline at end of file Modified: exo/portal/branches/standalone/component/portal/src/main/java/org/exoplatform/portal/config/DataStorageImpl.java =================================================================== --- exo/portal/branches/standalone/component/portal/src/main/java/org/exoplatform/portal/config/DataStorageImpl.java 2010-11-25 16:37:48 UTC (rev 5275) +++ exo/portal/branches/standalone/component/portal/src/main/java/org/exoplatform/portal/config/DataStorageImpl.java 2010-11-25 17:08:47 UTC (rev 5276) @@ -18,9 +18,18 @@ */ package org.exoplatform.portal.config; +import java.lang.reflect.Array; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; + import org.exoplatform.commons.utils.LazyPageList; import org.exoplatform.commons.utils.ListAccess; import org.exoplatform.portal.application.PortletPreferences; +import org.exoplatform.portal.config.model.Application; import org.exoplatform.portal.config.model.ApplicationState; import org.exoplatform.portal.config.model.ApplicationType; import org.exoplatform.portal.config.model.Container; @@ -29,6 +38,7 @@ import org.exoplatform.portal.config.model.Page; import org.exoplatform.portal.config.model.PageNavigation; import org.exoplatform.portal.config.model.PortalConfig; +import org.exoplatform.portal.pom.data.ApplicationData; import org.exoplatform.portal.pom.data.DashboardData; import org.exoplatform.portal.pom.data.ModelChange; import org.exoplatform.portal.pom.data.ModelData; @@ -41,9 +51,6 @@ import org.exoplatform.portal.pom.data.PortalKey; import org.exoplatform.services.listener.ListenerService; -import java.lang.reflect.Array; -import java.util.*; - /** * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> * @version $Revision$ @@ -52,7 +59,7 @@ { /** . */ private ModelDataStorage delegate; - + private ListenerService listenerServ_ ; public DataStorageImpl(ModelDataStorage delegate, ListenerService listenerServ) @@ -85,7 +92,7 @@ delegate.save(config.build()); listenerServ_.broadcast(PORTAL_CONFIG_UPDATED, this, config); } - + public void remove(PortalConfig config) throws Exception { delegate.remove(config.build()); @@ -104,7 +111,7 @@ listenerServ_.broadcast(PAGE_UPDATED, this, page); return changes; } - + public void remove(Page page) throws Exception { delegate.remove(page.build()); @@ -174,7 +181,7 @@ final Query<O> q; final Class<D> dataType; - + final Comparator<O> cp; Bilto(Query<O> q, Class<D> dataType) @@ -183,7 +190,7 @@ this.dataType = dataType; this.cp = null; } - + Bilto(Query<O> q, Class<D> dataType, Comparator<O> cp) { this.q = q; @@ -217,9 +224,9 @@ return pages; } }; - } - + } + private List<D> sort(List<D> list, final Comparator<O> comparator) { List<D> tmpList = new ArrayList<D>(); for (int i=0; i<list.size();i++) { @@ -235,9 +242,9 @@ O o2 = create(d2); return comparator.compare(o1, o2); } - + }); - return tmpList; + return tmpList; } } @@ -340,4 +347,24 @@ { delegate.saveDashboard(dashboard.build()); } + + public Map<String, String> getSiteInfo(String applicationStorageId) + throws Exception { + // TODO Auto-generated method stub + return delegate.getSiteInfo(applicationStorageId); + } + + public <S> Application<S> getApplicationModel(String applicationStorageId) + throws Exception { + // TODO Auto-generated method stub + try { + ApplicationData<S> applicationData = delegate + .getApplicationData(applicationStorageId); + return new Application<S>(applicationData); + } catch (NoSuchDataException ex) + { + //TODO: Throw something else + throw ex; + } + } } Modified: exo/portal/branches/standalone/component/portal/src/main/java/org/exoplatform/portal/pom/config/POMDataStorage.java =================================================================== --- exo/portal/branches/standalone/component/portal/src/main/java/org/exoplatform/portal/pom/config/POMDataStorage.java 2010-11-25 16:37:48 UTC (rev 5275) +++ exo/portal/branches/standalone/component/portal/src/main/java/org/exoplatform/portal/pom/config/POMDataStorage.java 2010-11-25 17:08:47 UTC (rev 5276) @@ -19,10 +19,18 @@ package org.exoplatform.portal.pom.config; +import java.io.ByteArrayInputStream; +import java.util.Comparator; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.UUID; + import org.exoplatform.commons.utils.IOUtil; import org.exoplatform.commons.utils.LazyPageList; import org.exoplatform.container.configuration.ConfigurationManager; import org.exoplatform.portal.application.PortletPreferences; +import org.exoplatform.portal.config.NoSuchDataException; import org.exoplatform.portal.config.Query; import org.exoplatform.portal.config.model.Application; import org.exoplatform.portal.config.model.ApplicationState; @@ -39,7 +47,9 @@ import org.exoplatform.portal.pom.config.tasks.PortletPreferencesTask; import org.exoplatform.portal.pom.config.tasks.PreferencesTask; import org.exoplatform.portal.pom.config.tasks.SearchTask; +import org.exoplatform.portal.pom.data.ApplicationData; import org.exoplatform.portal.pom.data.DashboardData; +import org.exoplatform.portal.pom.data.Mapper; import org.exoplatform.portal.pom.data.ModelChange; import org.exoplatform.portal.pom.data.ModelDataStorage; import org.exoplatform.portal.pom.data.NavigationData; @@ -48,16 +58,15 @@ import org.exoplatform.portal.pom.data.PageKey; import org.exoplatform.portal.pom.data.PortalData; import org.exoplatform.portal.pom.data.PortalKey; +import org.gatein.mop.api.workspace.ObjectType; +import org.gatein.mop.api.workspace.Site; +import org.gatein.mop.api.workspace.WorkspaceObject; +import org.gatein.mop.api.workspace.ui.UIComponent; +import org.gatein.mop.api.workspace.ui.UIWindow; import org.jibx.runtime.BindingDirectory; import org.jibx.runtime.IBindingFactory; -import org.jibx.runtime.IUnmarshallingContext; import org.jibx.runtime.impl.UnmarshallingContext; -import java.io.ByteArrayInputStream; -import java.util.Comparator; -import java.util.List; -import java.util.UUID; - /** * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> * @version $Revision$ @@ -313,4 +322,60 @@ } }); } + + @Override + public Map<String, String> getSiteInfo(String workspaceObjectId) + throws Exception { + + POMSession session = pomMgr.getSession(); + + WorkspaceObject workspaceObject = session.findObjectById(workspaceObjectId); + + if(workspaceObject instanceof UIComponent) + { + Site site = ((UIComponent)workspaceObject).getPage().getSite(); + ObjectType<? extends Site> siteType = site.getObjectType(); + + Map<String, String> returnedMap = new HashMap<String, String>(); + + //Put the siteType on returned map + if(siteType == ObjectType.PORTAL_SITE) + { + returnedMap.put("siteType", "portal"); + } + else if(siteType == ObjectType.GROUP_SITE) + { + returnedMap.put("siteType", "group"); + }else if(siteType == ObjectType.USER_SITE) + { + returnedMap.put("siteType", "user"); + } + + //Put the siteOwner on returned map + returnedMap.put("siteOwner", site.getName()); + + return returnedMap; + } + + throw new Exception("The provided ID is not associated with an application"); + } + + @Override + public <S> ApplicationData<S> getApplicationData(String applicationStorageId) + throws Exception { + // TODO Auto-generated method stub + + POMSession session = pomMgr.getSession(); + WorkspaceObject workspaceObject = session.findObjectById(applicationStorageId); + + if(workspaceObject instanceof UIWindow) + { + UIWindow application = (UIWindow)workspaceObject; + Mapper mapper = new Mapper(session); + + ApplicationData data = mapper.load(application); + return data; + } + throw new NoSuchDataException("Could not load the application data specified by the ID: " + applicationStorageId); + } } Modified: exo/portal/branches/standalone/component/portal/src/main/java/org/exoplatform/portal/pom/data/Mapper.java =================================================================== --- exo/portal/branches/standalone/component/portal/src/main/java/org/exoplatform/portal/pom/data/Mapper.java 2010-11-25 16:37:48 UTC (rev 5275) +++ exo/portal/branches/standalone/component/portal/src/main/java/org/exoplatform/portal/pom/data/Mapper.java 2010-11-25 17:08:47 UTC (rev 5276) @@ -915,7 +915,7 @@ } } - private <S> ApplicationData<S> load(UIWindow src) + public <S> ApplicationData<S> load(UIWindow src) { Attributes attrs = src.getAttributes(); Modified: exo/portal/branches/standalone/component/portal/src/main/java/org/exoplatform/portal/pom/data/ModelDataStorage.java =================================================================== --- exo/portal/branches/standalone/component/portal/src/main/java/org/exoplatform/portal/pom/data/ModelDataStorage.java 2010-11-25 16:37:48 UTC (rev 5275) +++ exo/portal/branches/standalone/component/portal/src/main/java/org/exoplatform/portal/pom/data/ModelDataStorage.java 2010-11-25 17:08:47 UTC (rev 5276) @@ -19,19 +19,17 @@ package org.exoplatform.portal.pom.data; +import java.util.Comparator; +import java.util.List; +import java.util.Map; + import org.exoplatform.commons.utils.LazyPageList; import org.exoplatform.portal.application.PortletPreferences; import org.exoplatform.portal.config.Query; import org.exoplatform.portal.config.model.ApplicationState; import org.exoplatform.portal.config.model.ApplicationType; import org.exoplatform.portal.config.model.Container; -import org.exoplatform.portal.pom.data.ModelChange; -import org.exoplatform.portal.pom.data.PageData; -import org.exoplatform.portal.pom.data.PortalData; -import java.util.Comparator; -import java.util.List; - /** * Created by The eXo Platform SAS * Apr 19, 2007 @@ -109,4 +107,9 @@ public void saveDashboard(DashboardData dashboard) throws Exception; public void save() throws Exception; + + public Map<String, String> getSiteInfo(String workspaceObjectId) throws Exception; + + public <S> ApplicationData<S> getApplicationData(String applicationStorageId) throws Exception; + } \ No newline at end of file Added: exo/portal/branches/standalone/web/portal/src/main/webapp/WEB-INF/standalone-webui-configuration.xml =================================================================== --- exo/portal/branches/standalone/web/portal/src/main/webapp/WEB-INF/standalone-webui-configuration.xml (rev 0) +++ exo/portal/branches/standalone/web/portal/src/main/webapp/WEB-INF/standalone-webui-configuration.xml 2010-11-25 17:08:47 UTC (rev 5276) @@ -0,0 +1,55 @@ + + +<webui-configuration> + <application> + <init-params> + <param> + <name>application.resource.bundle</name> + <value>locale.portal.expression, locale.portal.services, locale.portal.webui</value> + </param> + </init-params> + + <ui-component-root>org.exoplatform.portal.webui.workspace.UIStandaloneApplication</ui-component-root> + <state-manager>org.exoplatform.portal.application.StandaloneAppStateManager</state-manager> + + <application-lifecycle-listeners> + <listener>org.exoplatform.portal.application.UserSiteLifeCycle</listener> +  + <listener>org.exoplatform.portal.application.PortalApplicationLifecycle</listener> + <listener>org.exoplatform.webui.application.MonitorApplicationLifecycle</listener> + <listener>org.exoplatform.portal.application.UserProfileLifecycle</listener> + <listener>org.exoplatform.portal.application.concurrent.PortalConcurrencyMonitorLifecycle</listener> + </application-lifecycle-listeners> + + <events> + <event> + <event-name>portal.application.lifecycle.event</event-name> + <listener>org.exoplatform.webui.event.ConsoleEventMonitorListener</listener> + </event> + + <event> + <event-name>portal.execution.lifecycle.event</event-name> + <listener>org.exoplatform.webui.event.ConsoleEventMonitorListener</listener> + </event> + </events> + </application> +</webui-configuration> Modified: exo/portal/branches/standalone/web/portal/src/main/webapp/WEB-INF/web.xml =================================================================== --- exo/portal/branches/standalone/web/portal/src/main/webapp/WEB-INF/web.xml 2010-11-25 16:37:48 UTC (rev 5275) +++ exo/portal/branches/standalone/web/portal/src/main/webapp/WEB-INF/web.xml 2010-11-25 17:08:47 UTC (rev 5276) @@ -186,6 +186,10 @@ <param-name>webui.configuration</param-name> <param-value>app:/WEB-INF/webui-configuration.xml</param-value> </init-param> + <init-param> + <param-name>standalone.webui.configuration</param-name> + <param-value>app:/WEB-INF/standalone-webui-configuration.xml</param-value> + </init-param> <load-on-startup>1</load-on-startup> </servlet> @@ -281,7 +285,10 @@ <servlet-name>GateInServlet</servlet-name> <url-pattern>/gateinservlet</url-pattern> </servlet-mapping> - + <servlet-mapping> + <servlet-name>portal</servlet-name> + <url-pattern>/StandaloneApplication/*</url-pattern> + </servlet-mapping> <session-config> <session-timeout>30</session-timeout> </session-config> @@ -320,6 +327,20 @@ <transport-guarantee>NONE</transport-guarantee> </user-data-constraint> </security-constraint> + <security-constraint> + <web-resource-collection> + <web-resource-name>user authentication</web-resource-name> + <url-pattern>/StandaloneApplication/*</url-pattern> + <http-method>POST</http-method> + <http-method>GET</http-method> + </web-resource-collection> + <auth-constraint> + <role-name>users</role-name> + </auth-constraint> + <user-data-constraint> + <transport-guarantee>NONE</transport-guarantee> + </user-data-constraint> + </security-constraint> <login-config> <auth-method>FORM</auth-method> <realm-name>gatein-domain</realm-name> Modified: exo/portal/branches/standalone/web/portal/src/main/webapp/groovy/portal/webui/application/UIGadget.gtmpl =================================================================== --- exo/portal/branches/standalone/web/portal/src/main/webapp/groovy/portal/webui/application/UIGadget.gtmpl 2010-11-25 16:37:48 UTC (rev 5275) +++ exo/portal/branches/standalone/web/portal/src/main/webapp/groovy/portal/webui/application/UIGadget.gtmpl 2010-11-25 17:08:47 UTC (rev 5276) @@ -1,8 +1,16 @@ -<% +<% import org.exoplatform.web.application.JavascriptManager; import org.exoplatform.portal.webui.application.GadgetUtil; + import org.exoplatform.portal.application.PortalRequestContext; + import javax.servlet.http.HttpSession; + import org.exoplatform.portal.config.model.PersistentApplicationState; + import org.exoplatform.portal.pom.spi.gadget.Gadget; + import javax.portlet.PortletRequest; + import javax.portlet.PortletResponse; def rcontext = _ctx.getRequestContext(); + def portalRC = rcontext.getParentAppRequestContext(); + HttpSession httpSession = portalRC.getRequest().getSession(true); JavascriptManager jsmanager = rcontext.getJavascriptManager(); def hostName = GadgetUtil.getRelGadgetServerUrl(); def url = uicomponent.getUrl(); @@ -26,8 +34,19 @@ String unminiTitle = _ctx.appRes("UIGadget.tooltip.Unminimize"); String maxiTitle = _ctx.appRes("UIGadget.tooltip.Maximize"); String unmaxiTitle = _ctx.appRes("UIGadget.tooltip.Unmaximize"); + + def portletRequest = rcontext.getRequest(); + def scheme = portletRequest.getScheme(); + def serverName = portletRequest.getServerName(); + def port = portletRequest.getServerPort(); + def standaloneURL = scheme + "://" + serverName + ":" + port + rcontext.getPortalContextPath(); + standaloneURL += "/StandaloneApplication/" + uicomponent.getStorageId(); + + def portletResponse = rcontext.getResponse(); + standaloneURL = portletResponse.encodeURL(standaloneURL); %> <div class="UIGadget" id="$id" style="left: $posX; top: $posY; z-Index: $zIndex; width: 100%" > + <a style="display:none" href="$standaloneURL"></a> <div class="GadgetControl" style="visibility: visible;"> <div class="LeftControlBar"> <div class="RightControlBar"> @@ -67,4 +86,4 @@ </div> </div> <div class="UIMask" style="display: none; border:solid 1px red"><span></span></div> -</div> \ No newline at end of file +</div> Added: exo/portal/branches/standalone/web/portal/src/main/webapp/groovy/portal/webui/application/UIStandaloneAppContainer.gtmpl =================================================================== --- exo/portal/branches/standalone/web/portal/src/main/webapp/groovy/portal/webui/application/UIStandaloneAppContainer.gtmpl (rev 0) +++ exo/portal/branches/standalone/web/portal/src/main/webapp/groovy/portal/webui/application/UIStandaloneAppContainer.gtmpl 2010-11-25 17:08:47 UTC (rev 5276) @@ -0,0 +1,14 @@ +<div class="UIStandaloneAppContainer" id="<%=uicomponent.getId()%>"> +<% + if (uicomponent.isLossData()) { + print("Can not render this gadget</div>"); + return; + } + if (uicomponent.currApp != null) { + uicomponent.renderChild(uicomponent.currApp); + } else { +%> + <div class="Icon">Not have permission</div> + <div class="Icon"><a href="<%=uicomponent.url("Logout")%>">Login with other UserName</a> </div> +<% } %> +</div> Added: exo/portal/branches/standalone/web/portal/src/main/webapp/groovy/portal/webui/application/UIStandaloneGadget.gtmpl =================================================================== --- exo/portal/branches/standalone/web/portal/src/main/webapp/groovy/portal/webui/application/UIStandaloneGadget.gtmpl (rev 0) +++ exo/portal/branches/standalone/web/portal/src/main/webapp/groovy/portal/webui/application/UIStandaloneGadget.gtmpl 2010-11-25 17:08:47 UTC (rev 5276) @@ -0,0 +1,27 @@ +<% + import org.exoplatform.web.application.JavascriptManager; + import org.exoplatform.portal.webui.application.GadgetUtil; + def rcontext = _ctx.getRequestContext(); + JavascriptManager jsmanager = rcontext.getJavascriptManager(); + def hostName = GadgetUtil.getRelGadgetServerUrl(); + def url = uicomponent.getUrl(); + def metadata = uicomponent.getMetadata(); + def posX = uicomponent.getProperties().getIntValue("locationX") + "px"; + def posY = uicomponent.getProperties().getIntValue("locationY") + "px"; + def zIndex = uicomponent.getProperties().getIntValue("zIndex"); + def id = uicomponent.getId(); + def isDev = uicomponent.isGadgetDeveloper(); + def noCache = uicomponent.isNoCache(); + def isDebug = uicomponent.isDebug(); + def view = uicomponent.getView(); + def userPref = uicomponent.getUserPref(); + jsmanager.importJavascript("eXo.gadget.UIGadget"); + jsmanager.addCustomizedOnLoadScript("eXo.gadget.UIGadget.createGadget('$url','content-$id', $metadata, $userPref, '$view', '$hostName', " + (isDev ? 1 : 0) + + ", " + (isDebug ? 1 : 0) + ", " + (noCache ? 1 : 0) + ");"); +%> +<div class="UIGadget" id="$id" style="left: $posX; top: $posY; z-Index: $zIndex; width: 100%" > + <div class="GadgetControl" style="visibility: visible; "> + </div> + <div id="content-$id"></div> + <div class="UIMask" style="display: none; border:solid 1px red"><span></span></div> +</div> Modified: exo/portal/branches/standalone/web/portal/src/main/webapp/groovy/portal/webui/workspace/UIPortalApplication.gtmpl =================================================================== --- exo/portal/branches/standalone/web/portal/src/main/webapp/groovy/portal/webui/workspace/UIPortalApplication.gtmpl 2010-11-25 16:37:48 UTC (rev 5275) +++ exo/portal/branches/standalone/web/portal/src/main/webapp/groovy/portal/webui/workspace/UIPortalApplication.gtmpl 2010-11-25 17:08:47 UTC (rev 5276) @@ -81,7 +81,7 @@ eXo.portal.portalMode = <%= uicomponent.getModeState() %>; eXo.session.level = "$sessionAliveLevel"; eXo.session.canKeepState = $canKeepState; - eXo.session.isOpen = $uicomponent.isSessionOpen ; + eXo.session.isOpen = <%=uicomponent.isSessionOpen()%> ; eXo.session.itvTime = ${((PortalRequestContext)rcontext).getRequest().getSession().getMaxInactiveInterval()} ; </script> <script type="text/javascript" src="/eXoResources/javascript/eXo/i18n/I18NMessage.js"></script> Modified: exo/portal/branches/standalone/webui/portal/src/main/java/org/exoplatform/portal/application/PortalController.java =================================================================== --- exo/portal/branches/standalone/webui/portal/src/main/java/org/exoplatform/portal/application/PortalController.java 2010-11-25 16:37:48 UTC (rev 5275) +++ exo/portal/branches/standalone/webui/portal/src/main/java/org/exoplatform/portal/application/PortalController.java 2010-11-25 17:08:47 UTC (rev 5276) @@ -77,6 +77,11 @@ application.onInit(); controller.addApplication(application); controller.register(new PortalRequestHandler()); + + StandaloneApplication standaloneApplication = new StandaloneApplication(config); + standaloneApplication.onInit(); + controller.addApplication(standaloneApplication); + controller.register(new StandaloneAppRequestHandler()); log.info("The WebAppController has been successfully initialized for the portal '" + portalContainer.getName() + "'"); } Modified: exo/portal/branches/standalone/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestHandler.java =================================================================== --- exo/portal/branches/standalone/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestHandler.java 2010-11-25 16:37:48 UTC (rev 5275) +++ exo/portal/branches/standalone/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestHandler.java 2010-11-25 17:08:47 UTC (rev 5276) @@ -77,7 +77,6 @@ * 12) Release the context from the thread * */ - @SuppressWarnings("unchecked") public void execute(WebAppController controller, HttpServletRequest req, HttpServletResponse res) throws Exception { log.debug("Session ID = " + req.getSession().getId()); @@ -89,6 +88,12 @@ res.sendRedirect(req.getContextPath()); return; } + processRequest(context, app); + } + + @SuppressWarnings("unchecked") + protected void processRequest(PortalRequestContext context, PortalApplication app) throws Exception + { WebuiRequestContext.setCurrentInstance(context); List<ApplicationLifecycle> lifecycles = app.getApplicationLifecycle(); try Added: exo/portal/branches/standalone/webui/portal/src/main/java/org/exoplatform/portal/application/StandaloneAppRequestContext.java =================================================================== --- exo/portal/branches/standalone/webui/portal/src/main/java/org/exoplatform/portal/application/StandaloneAppRequestContext.java (rev 0) +++ exo/portal/branches/standalone/webui/portal/src/main/java/org/exoplatform/portal/application/StandaloneAppRequestContext.java 2010-11-25 17:08:47 UTC (rev 5276) @@ -0,0 +1,94 @@ +/** + * Copyright (C) 2009 eXo Platform SAS. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + +package org.exoplatform.portal.application; + +import org.exoplatform.portal.webui.application.UIStandaloneGadget; +import org.exoplatform.portal.webui.workspace.UIStandaloneApplication; +import org.exoplatform.services.log.ExoLogger; +import org.exoplatform.services.log.Log; +import org.exoplatform.services.resources.Orientation; +import org.exoplatform.webui.application.WebuiApplication; +import org.exoplatform.webui.core.UIApplication; +import java.util.Locale; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +public class StandaloneAppRequestContext extends PortalRequestContext +{ + private String storageId; + protected static Log log = ExoLogger.getLogger(StandaloneAppRequestContext.class); + + public StandaloneAppRequestContext(WebuiApplication app, HttpServletRequest req, HttpServletResponse res) + throws Exception + { + super(app, req, res); + int idx = (req.getServletPath() + req.getContextPath()).length() + 1; + if (idx <= getRequestURI().length()) + { + storageId = getRequestURI().substring(idx); + } + else + { + storageId = ""; + } + } + + public String getStorageId() + { + return storageId; + } + + public String getTitle() throws Exception + { + String title = null; + UIApplication uiApp = getUIApplication(); + UIStandaloneGadget aloneGadget = uiApp.findFirstComponentOfType(UIStandaloneGadget.class); + if (aloneGadget != null) + { + title = aloneGadget.getApplicationName(); + } + + if (title == null) + { + title = ""; + } + return title; + } + + public Orientation getOrientation() + { + return ((UIStandaloneApplication)uiApplication_).getOrientation(); + } + + public Locale getLocale() + { + return ((UIStandaloneApplication)uiApplication_).getLocale(); + } + + public String getPortalOwner() + { + return null; + } + + public String getNodePath() + { + throw new UnsupportedOperationException(); + } +} Added: exo/portal/branches/standalone/webui/portal/src/main/java/org/exoplatform/portal/application/StandaloneAppRequestHandler.java =================================================================== --- exo/portal/branches/standalone/webui/portal/src/main/java/org/exoplatform/portal/application/StandaloneAppRequestHandler.java (rev 0) +++ exo/portal/branches/standalone/webui/portal/src/main/java/org/exoplatform/portal/application/StandaloneAppRequestHandler.java 2010-11-25 17:08:47 UTC (rev 5276) @@ -0,0 +1,51 @@ +/** + * Copyright (C) 2009 eXo Platform SAS. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + +package org.exoplatform.portal.application; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.exoplatform.web.WebAppController; + + +public class StandaloneAppRequestHandler extends PortalRequestHandler +{ + + private String[] PATHS = {"/StandaloneApplication"}; + + public String[] getPath() + { + return PATHS; + } + + public void execute(WebAppController controller, HttpServletRequest req, HttpServletResponse res) throws Exception + { + log.debug("Session ID = " + req.getSession().getId()); + res.setHeader("Cache-Control", "no-cache"); + + StandaloneApplication app = controller.getApplication(StandaloneApplication.STANDALONE_APPLICATION_ID); + StandaloneAppRequestContext context = new StandaloneAppRequestContext(app, req, res); +// if (context.getPortalOwner().length() == 0) { +// res.sendRedirect(req.getContextPath()); +// return; +// } + processRequest(context, app); + } +} Added: exo/portal/branches/standalone/webui/portal/src/main/java/org/exoplatform/portal/application/StandaloneAppStateManager.java =================================================================== --- exo/portal/branches/standalone/webui/portal/src/main/java/org/exoplatform/portal/application/StandaloneAppStateManager.java (rev 0) +++ exo/portal/branches/standalone/webui/portal/src/main/java/org/exoplatform/portal/application/StandaloneAppStateManager.java 2010-11-25 17:08:47 UTC (rev 5276) @@ -0,0 +1,127 @@ +/** + * Copyright (C) 2009 eXo Platform SAS. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + +package org.exoplatform.portal.application; + +import org.exoplatform.commons.utils.Safe; +import org.exoplatform.portal.application.replication.ApplicationState; +import org.exoplatform.webui.application.ConfigurationManager; +import org.exoplatform.webui.application.StateManager; +import org.exoplatform.webui.application.WebuiApplication; +import org.exoplatform.webui.application.WebuiRequestContext; +import org.exoplatform.webui.core.UIApplication; +import org.gatein.common.logging.Logger; +import org.gatein.common.logging.LoggerFactory; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpSession; + +public class StandaloneAppStateManager extends StateManager +{ + + /** . */ + protected static final String APPLICATION_KEY = "StandaloneApp"; + + /** . */ + private static final Logger log = LoggerFactory.getLogger(StandaloneAppStateManager.class); + + @Override + public UIApplication restoreUIRootComponent(WebuiRequestContext context) throws Exception + { + context.setStateManager(this); + + // + WebuiApplication app = (WebuiApplication)context.getApplication(); + + // + ApplicationState appState = null; + HttpSession session = getSession(context); + if (session != null) + { + appState = (ApplicationState)session.getAttribute(APPLICATION_KEY); + } + + // + + // + UIApplication uiapp = null; + if (appState != null) + { + if (Safe.equals(context.getRemoteUser(), appState.getUserName())) + { + uiapp = appState.getApplication(); + } + } + + // + if (appState != null) + { + log.debug("Found application " + APPLICATION_KEY + " :" + appState.getApplication()); + } + else + { + log.debug("Application " + APPLICATION_KEY + " not found"); + } + + // + if (uiapp == null) + { + ConfigurationManager cmanager = app.getConfigurationManager(); + String uirootClass = cmanager.getApplication().getUIRootComponent(); + Class<? extends UIApplication> type = (Class<UIApplication>) Thread.currentThread().getContextClassLoader().loadClass(uirootClass); + uiapp = app.createUIComponent(type, null, null, context); + } + + // + return uiapp; + } + + @Override + public void storeUIRootComponent(final WebuiRequestContext context) throws Exception + { + UIApplication uiapp = context.getUIApplication(); + + // + if (uiapp != null) + { + HttpSession session = getSession(context); + + // At this point if it returns null it means that it was not possible to create a session + // because the session might be invalidated and the response is already commited to the client. + // That situation happens during a logout that invalidates the HttpSession + if (session != null) + { + log.debug("Storing application " + APPLICATION_KEY); + session.setAttribute(APPLICATION_KEY, new ApplicationState(uiapp, context.getRemoteUser())); + } + } + } + + @Override + public void expire(String sessionId, WebuiApplication app) throws Exception + { + // For now do nothing.... + } + + protected HttpSession getSession(WebuiRequestContext webuiRC) + { + StandaloneAppRequestContext staRC = (StandaloneAppRequestContext)webuiRC; + HttpServletRequest req = staRC.getRequest(); + return req.getSession(false); + } +} Added: exo/portal/branches/standalone/webui/portal/src/main/java/org/exoplatform/portal/application/StandaloneApplication.java =================================================================== --- exo/portal/branches/standalone/webui/portal/src/main/java/org/exoplatform/portal/application/StandaloneApplication.java (rev 0) +++ exo/portal/branches/standalone/webui/portal/src/main/java/org/exoplatform/portal/application/StandaloneApplication.java 2010-11-25 17:08:47 UTC (rev 5276) @@ -0,0 +1,44 @@ +/** + * Copyright (C) 2009 eXo Platform SAS. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + +package org.exoplatform.portal.application; + +import javax.servlet.ServletConfig; + +public class StandaloneApplication extends PortalApplication +{ + + final static public String STANDALONE_APPLICATION_ID = "StandaloneApplication"; + + public StandaloneApplication(ServletConfig config) throws Exception + { + super(config); + } + + + public String getApplicationId() + { + return STANDALONE_APPLICATION_ID; + } + + public String getApplicationInitParam(String name) + { + return getServletConfig().getInitParameter("standalone." + name); + } +} Added: exo/portal/branches/standalone/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIStandaloneAppContainer.java =================================================================== --- exo/portal/branches/standalone/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIStandaloneAppContainer.java (rev 0) +++ exo/portal/branches/standalone/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIStandaloneAppContainer.java 2010-11-25 17:08:47 UTC (rev 5276) @@ -0,0 +1,181 @@ +/** + * Copyright (C) 2009 eXo Platform SAS. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + +package org.exoplatform.portal.webui.application; + +import org.exoplatform.portal.application.StandaloneAppRequestContext; +import org.exoplatform.portal.config.DataStorage; +import org.exoplatform.portal.config.model.Application; +import org.exoplatform.portal.config.model.PortalConfig; +import org.exoplatform.portal.pom.spi.gadget.Gadget; +import org.exoplatform.portal.webui.util.PortalDataMapper; +import org.exoplatform.services.security.ConversationState; +import org.exoplatform.web.login.InitiateLoginServlet; +import org.exoplatform.web.security.security.AbstractTokenService; +import org.exoplatform.web.security.security.CookieTokenService; +import org.exoplatform.webui.application.WebuiRequestContext; +import org.exoplatform.webui.config.annotation.ComponentConfig; +import org.exoplatform.webui.config.annotation.EventConfig; +import org.exoplatform.webui.core.UIComponent; +import org.exoplatform.webui.core.UIContainer; +import org.exoplatform.webui.event.Event; +import org.exoplatform.webui.event.EventListener; +import java.util.Map; +import javax.servlet.http.Cookie; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +@ComponentConfig(template = "system:/groovy/portal/webui/application/UIStandaloneAppContainer.gtmpl", events = { + @EventConfig(listeners = UIStandaloneAppContainer.LogoutActionListener.class)}) +public class UIStandaloneAppContainer extends UIContainer +{ + private boolean lossData; + private UIStandaloneGadget currApp; + + public String getCurrStorageId() + { + if (currApp != null) + { + return currApp.getStorageId(); + } + return null; + } + + public void setCurrStorageId(String storageId) throws Exception + { + //New app, so we reset the lossData status + lossData = false; + + currApp = getChildByStorageId(storageId); + if (currApp != null) + { + return; + } + + DataStorage ds = getApplicationComponent(DataStorage.class); + Map<String, String> siteInfo; + try + { + siteInfo = ds.getSiteInfo(storageId); + } + catch (Exception ex) + { + lossData = true; + return; + } + + String siteType = null; + String siteOwner = null; + if (siteInfo != null) + { + siteType = siteInfo.get("siteType"); + siteOwner = siteInfo.get("siteOwner"); + } + ConversationState currentState = ConversationState.getCurrent(); + if (PortalConfig.USER_TYPE.equals(siteType) && currentState.getIdentity().getUserId().equals(siteOwner)) + { + Application<Gadget> gadgetModel = ds.getApplicationModel(storageId); + UIStandaloneGadget staGadget = createUIComponent(UIStandaloneGadget.class, null, null); + staGadget.setStorageId(storageId); + PortalDataMapper.toUIGadget(staGadget, gadgetModel); + addChild(staGadget); + currApp = staGadget; + } + } + + private UIStandaloneGadget getChildByStorageId(String storageId) + { + for (UIComponent child : getChildren()) + { + if (child instanceof UIStandaloneGadget) + { + UIStandaloneGadget gadget = (UIStandaloneGadget)child; + if (gadget.getStorageId().equals(storageId)) + { + return gadget; + } + } + } + return null; + } + + public boolean isLossData() + { + return lossData; + } + + @Override + public void processRender(WebuiRequestContext context) throws Exception + { + if (!lossData) + { + if (currApp != null && currApp.isLossData()) + { + removeChildById(currApp.getId()); + currApp = null; + lossData = true; + } + } + super.processRender(context); + } + + static public class LogoutActionListener extends EventListener<UIComponent> + { + public void execute(Event<UIComponent> event) throws Exception + { + StandaloneAppRequestContext staReqContext = (StandaloneAppRequestContext)event.getRequestContext(); + HttpServletRequest req = staReqContext.getRequest(); + HttpServletResponse res = staReqContext.getResponse(); + + //Delete the token from JCR + String token = getTokenCookie(req); + if (token != null) + { + AbstractTokenService tokenService = AbstractTokenService.getInstance(CookieTokenService.class); + tokenService.deleteToken(token); + } + + req.getSession().invalidate(); + Cookie cookie = new Cookie(InitiateLoginServlet.COOKIE_NAME, ""); + cookie.setPath(req.getContextPath()); + cookie.setMaxAge(0); + res.addCookie(cookie); + + res.sendRedirect(req.getRequestURI()); + staReqContext.setResponseComplete(true); + } + + private String getTokenCookie(HttpServletRequest req) + { + Cookie[] cookies = req.getCookies(); + if (cookies != null) + { + for (Cookie cookie : cookies) + { + if (InitiateLoginServlet.COOKIE_NAME.equals(cookie.getName())) + { + return cookie.getValue(); + } + } + } + return null; + } + + } +} Added: exo/portal/branches/standalone/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIStandaloneGadget.java =================================================================== --- exo/portal/branches/standalone/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIStandaloneGadget.java (rev 0) +++ exo/portal/branches/standalone/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIStandaloneGadget.java 2010-11-25 17:08:47 UTC (rev 5276) @@ -0,0 +1,65 @@ +/** + * Copyright (C) 2009 eXo Platform SAS. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + +package org.exoplatform.portal.webui.application; + +import org.exoplatform.portal.config.DataStorage; +import org.exoplatform.webui.config.annotation.ComponentConfig; +import org.exoplatform.webui.config.annotation.EventConfig; +import org.exoplatform.webui.core.UIComponent; +import org.exoplatform.webui.event.Event; +import org.exoplatform.webui.event.EventListener; + +@ComponentConfig(template = "system:/groovy/portal/webui/application/UIStandaloneGadget.gtmpl", events = { + @EventConfig(listeners = UIStandaloneGadget.SaveUserPrefActionListener.class)}) +public class UIStandaloneGadget extends UIGadget +{ + + @Override + public boolean isLossData() + { + DataStorage ds = getApplicationComponent(DataStorage.class); + try + { + ds.getId(getState()); + } + catch (Exception e) + { + return true; + } + return super.isLossData(); + } + + static public class SaveUserPrefActionListener extends EventListener<UIStandaloneGadget> + { + public void execute(Event<UIStandaloneGadget> event) throws Exception + { + UIStandaloneGadget uiGadget = event.getSource(); + + try + { + uiGadget.addUserPref(event.getRequestContext().getRequestParameter("userPref")); + } + catch(Exception e) + { + event.getRequestContext().addUIComponentToUpdateByAjax(uiGadget.<UIComponent>getParent()); + } + } + } +} Added: exo/portal/branches/standalone/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIStandaloneApplication.java =================================================================== --- exo/portal/branches/standalone/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIStandaloneApplication.java (rev 0) +++ exo/portal/branches/standalone/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIStandaloneApplication.java 2010-11-25 17:08:47 UTC (rev 5276) @@ -0,0 +1,239 @@ +/** + * Copyright (C) 2009 eXo Platform SAS. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + +package org.exoplatform.portal.webui.workspace; + +import org.exoplatform.portal.application.PortalRequestContext; +import org.exoplatform.portal.application.StandaloneAppRequestContext; +import org.exoplatform.portal.config.DataStorage; +import org.exoplatform.portal.config.model.PortalConfig; +import org.exoplatform.portal.resource.Skin; +import org.exoplatform.portal.resource.SkinService; +import org.exoplatform.portal.webui.application.UIStandaloneAppContainer; +import org.exoplatform.services.resources.Orientation; +import org.exoplatform.services.security.ConversationState; +import org.exoplatform.web.application.javascript.JavascriptConfigService; +import org.exoplatform.web.login.InitiateLoginServlet; +import org.exoplatform.web.security.security.AbstractTokenService; +import org.exoplatform.web.security.security.CookieTokenService; +import org.exoplatform.webui.application.WebuiRequestContext; +import org.exoplatform.webui.config.annotation.ComponentConfig; +import org.exoplatform.webui.config.annotation.EventConfig; +import org.exoplatform.webui.core.UIApplication; +import org.exoplatform.webui.core.UIComponent; +import org.exoplatform.webui.event.Event; +import org.exoplatform.webui.event.EventListener; +import java.io.Writer; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashSet; +import java.util.Locale; +import java.util.Map; +import java.util.Set; +import javax.servlet.http.Cookie; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +@ComponentConfig(lifecycle = UIStandaloneApplicationLifecycle.class, template = "system:/groovy/portal/webui/workspace/UIPortalApplication.gtmpl") +public class UIStandaloneApplication extends UIApplication +{ + public static final int NORMAL_MODE = 0; + + //modeState, locale, skin_, orientation will be used when we display portlet in standalone mode + private int modeState = NORMAL_MODE; + + private Locale locale_ = Locale.ENGLISH; + + private String skin_ = "Default"; + + private Orientation orientation_ = Orientation.LT; + + private boolean isSessionOpen = false; + + public UIStandaloneApplication() throws Exception + { + addChild(UIStandaloneAppContainer.class, null, null); + } + + //Temporary need this, don't want to render UIPopupMessage + public void renderChildren() throws Exception + { + WebuiRequestContext context = WebuiRequestContext.getCurrentInstance(); + super.renderChildren(context); + } + + @Override + public void processDecode(WebuiRequestContext context) throws Exception + { + String storageId = ((StandaloneAppRequestContext)context).getStorageId(); + + UIStandaloneAppContainer staContaner = getChild(UIStandaloneAppContainer.class); + if (!storageId.equals(staContaner.getCurrStorageId()) ) + { + staContaner.setCurrStorageId(storageId); + } + super.processDecode(context); + } + + public void processRender(WebuiRequestContext context) throws Exception + { + Writer w = context.getWriter(); + + // + if (!context.useAjax()) + { + super.processRender(context); + } + else + { + PortalRequestContext pcontext = (PortalRequestContext)context; + +// if (getUIPopupMessages().hasMessage()) +// { +// pcontext.addUIComponentToUpdateByAjax(getUIPopupMessages()); +// } + + Set<UIComponent> list = context.getUIComponentToUpdateByAjax(); +// List<UIPortlet> uiPortlets = new ArrayList<UIPortlet>(3); +// List<UIComponent> uiDataComponents = new ArrayList<UIComponent>(5); + +// if (list != null) +// { +// for (UIComponent uicomponent : list) +// { +// if (uicomponent instanceof UIPortlet) +// uiPortlets.add((UIPortlet)uicomponent); +// else +// uiDataComponents.add(uicomponent); +// } +// } + w.write("<div class=\"PortalResponse\">"); + w.write("<div class=\"PortalResponseData\">"); + if (list != null) + { + for (UIComponent uicomponent : list) + { + if (log.isDebugEnabled()) + { + log.debug("AJAX call: Need to refresh the UI component " + uicomponent.getName()); + } + renderBlockToUpdate(uicomponent, context, w); + } + } + w.write("</div>"); + +// if (!context.getFullRender()) +// { +// for (UIPortlet uiPortlet : uiPortlets) +// { +// if (log.isDebugEnabled()) +// log.debug("AJAX call: Need to refresh the Portlet " + uiPortlet.getId()); +// +// w.write("<div class=\"PortletResponse\" style=\"display: none\">"); +// w.append("<div class=\"PortletResponsePortletId\">" + uiPortlet.getId() + "</div>"); +// w.append("<div class=\"PortletResponseData\">"); +// +// /* +// * If the portlet is using our UI framework or supports it then +// * it will return a set of block to updates. If there is not +// * block to update the javascript client will see that as a full +// * refresh of the content part +// */ +// uiPortlet.processRender(context); +// +// w.append("</div>"); +// w.append("<div class=\"PortletResponseScript\"></div>"); +// w.write("</div>"); +// } +// } + + w.write("<div class=\"PortalResponseScript\">"); + pcontext.getJavascriptManager().writeJavascript(w); + w.write("eXo.core.Browser.onLoad();\n"); + pcontext.getJavascriptManager().writeCustomizedOnLoadScript(w); + w.write("</div>"); + w.write("</div>"); + } + } + + public Collection<String> getJavascriptURLs() + { + JavascriptConfigService service = getApplicationComponent(JavascriptConfigService.class); + return service.getAvailableScriptsPaths(); + } + + public Collection<Skin> getPortalSkins() + { + SkinService skinService = getApplicationComponent(SkinService.class); + Collection<Skin> skins = new ArrayList<Skin>(skinService.getPortalSkins(skin_)); +// Collection<Skin> skins = new ArrayList<Skin>(); + return skins; + } + + public Set<Skin> getPortletSkins() + { + Set<Skin> skins = new HashSet<Skin>(); + return skins; + } + + public boolean isSessionOpen() + { + return isSessionOpen; + } + + public void setSessionOpen(boolean isSessionOpen) + { + this.isSessionOpen = isSessionOpen; + } + + public String getSkin() + { + return skin_; + } + + public Orientation getOrientation() + { + return orientation_; + } + + public void setOrientation(Orientation orientation) + { + this.orientation_ = orientation; + } + + public Locale getLocale() + { + return locale_; + } + + public void setLocale(Locale locale) + { + locale_ = locale; + } + + public void setModeState(int mode) + { + this.modeState = mode; + } + + public int getModeState() + { + return modeState; + } +} Added: exo/portal/branches/standalone/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIStandaloneApplicationLifecycle.java =================================================================== --- exo/portal/branches/standalone/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIStandaloneApplicationLifecycle.java (rev 0) +++ exo/portal/branches/standalone/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIStandaloneApplicationLifecycle.java 2010-11-25 17:08:47 UTC (rev 5276) @@ -0,0 +1,132 @@ +/** + * Copyright (C) 2009 eXo Platform SAS. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + +package org.exoplatform.portal.webui.workspace; + +import java.io.IOException; +import java.io.OutputStream; + +import org.exoplatform.commons.utils.PortalPrinter; +import org.exoplatform.portal.application.PortalRequestContext; +import org.exoplatform.portal.webui.application.UIStandaloneAppContainer; +import org.exoplatform.resolver.ResourceResolver; +import org.exoplatform.webui.application.WebuiRequestContext; +import org.exoplatform.webui.core.UIComponent; +import org.exoplatform.webui.core.lifecycle.Lifecycle; +import org.exoplatform.webui.core.lifecycle.WebuiBindingContext; + +/** + * Created by The eXo Platform SAS + * May 8, 2006 + */ +public class UIStandaloneApplicationLifecycle extends Lifecycle<UIStandaloneApplication> +{ + + public void processDecode(UIStandaloneApplication uicomponent, WebuiRequestContext context) throws Exception + { + String componentId = context.getRequestParameter(context.getUIComponentIdParameterName()); + if (componentId == null) + { + return; + } + UIComponent uiTarget = uicomponent.findComponentById(componentId); + if (uiTarget == null) + { + context.addUIComponentToUpdateByAjax(uicomponent.getChild(UIStandaloneAppContainer.class)); + return; + } + if (uiTarget == uicomponent) + { + super.processDecode(uicomponent, context); + } + uiTarget.processDecode(context); + } + + public void processAction(UIStandaloneApplication uicomponent, WebuiRequestContext context) throws Exception + { + String componentId = context.getRequestParameter(context.getUIComponentIdParameterName()); + if (componentId == null) + { + return; + } + UIComponent uiTarget = uicomponent.findComponentById(componentId); + if (uiTarget == null) + { + return; + } + if (uiTarget == uicomponent) + { + super.processAction(uicomponent, context); + } + uiTarget.processAction(context); + } + + public void processRender(UIStandaloneApplication uicomponent, + WebuiRequestContext context) throws Exception + { + + PortalRequestContext prc = (PortalRequestContext)context; + OutputStream responseOutputStream = prc.getResponse().getOutputStream(); + + PortalPrinter parentWriter = new PortalPrinter(responseOutputStream, true, 5000); + PortalPrinter childWriter = new PortalPrinter(responseOutputStream, true, 25000, true); + + context.setWriter(childWriter); + processRender(uicomponent, context, "system:/groovy/portal/webui/workspace/UIPortalApplicationChildren.gtmpl"); + + context.setWriter(parentWriter); + processRender(uicomponent, context, "system:/groovy/portal/webui/workspace/UIPortalApplication.gtmpl"); + + try + { + //flush the parent writer to the output stream so that we are really to accept the child content + parentWriter.flushOutputStream(); + //now that the parent has been flushed, we can flush the contents of the child to the output + childWriter.flushOutputStream(); + } + catch (IOException ioe) + { + //We want to ignore the ClientAbortException since this is caused by the users + //browser closing the connection and is not something we should be logging. + if (!ioe.getClass().toString().contains("ClientAbortException")) + { + throw ioe; + } + + } + } + + public void processRender(UIStandaloneApplication uicomponent, WebuiRequestContext context, String template) throws Exception + { + // Fail if we have no template + if (template == null) + { + throw new IllegalStateException("uicomponent " + uicomponent + " with class " + uicomponent.getClass().getName() + + " has no template for rendering"); + } + + // + ResourceResolver resolver = uicomponent.getTemplateResourceResolver(context, template); + WebuiBindingContext bcontext = new WebuiBindingContext(resolver, context.getWriter(), uicomponent, context); + bcontext.put(UIComponent.UICOMPONENT, uicomponent); + bcontext.put(uicomponent.getUIComponentName(), uicomponent); + renderTemplate(template, bcontext); + } + +}

14 years, 1 month

1
0
0 / 0

gatein SVN: r5275 - in portal/trunk/docs/reference-guide/en/modules: PortalDevelopment and 1 other directory.

by do-not-reply＠jboss.org

Author: mstruk Date: 2010-11-25 11:37:48 -0500 (Thu, 25 Nov 2010) New Revision: 5275 Added: portal/trunk/docs/reference-guide/en/modules/PortalDevelopment/LocalizationConfiguration.xml Modified: portal/trunk/docs/reference-guide/en/modules/PortalDevelopment.xml Log: GTNPORTAL-1694 Add LocalePolicy documentation to Reference Guide Added: portal/trunk/docs/reference-guide/en/modules/PortalDevelopment/LocalizationConfiguration.xml =================================================================== --- portal/trunk/docs/reference-guide/en/modules/PortalDevelopment/LocalizationConfiguration.xml (rev 0) +++ portal/trunk/docs/reference-guide/en/modules/PortalDevelopment/LocalizationConfiguration.xml 2010-11-25 16:37:48 UTC (rev 5275) @@ -0,0 +1,274 @@ +<?xml version='1.0' encoding='utf-8' ?> +<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [ +<!ENTITY % BOOK_ENTITIES SYSTEM "../../Reference_Guide.ent"> +%BOOK_ENTITIES; +]> + +<section id="sect-Reference_Guide-Localization_Configuration-Pluggable_Locale_Policy"> + <title>Pluggable Locale Policy</title> + + <para>Every request processed by every portlet is invoked within a context of current <literal>Locale</literal>. + Current <literal>Locale</literal> can be retrieved by calling <literal>getLocale()</literal> method of + <literal>javax.portlet.PortletRequest</literal> interface. + </para> + <para>The exact algorithm for determining the current <literal>Locale</literal> is not specified by Portlet Specification, + and is left to portlet containers to implement the way they deem most appropriate. + </para> + <para>In &PRODUCT; each portal instance has a default language which can be used to present content for new users. + Another option is to use each user’s browser language preference, provided it matches one of the available + localizations that &PRODUCT; supports, and only fallback to portal default language if no match is found. + Every user, while visiting a portal, has an option to change the language of the user interface by using a Language chooser. + The choice can be remembered for the duration of the session, or it can be remembered for a longer period using a browser cookie, + or - for registered and logged-in users - it can be saved into user’s profile. + </para> + <para>So, we can see that there is more than one way to determine the <literal>Locale</literal> to be used for displaying a portal page + to the user. For this reason the mechanism for determining the current <literal>Locale</literal> of the request + is pluggable in &PRODUCT;, so the exact algorithm can be customized. + </para> + + <section id="sect-Reference_Guide-Localization_Configuration-Pluggable_Locale_Policy-Locale_Policy_API"> + <title>LocalePolicy API</title> + + <para>Customization is achieved by using LocalePolicy API, which is a simple API consisting of one interface, + and one class: + </para> + <itemizedlist> + <listitem> + <para><literal>org.exoplatform.services.resources.LocalePolicy</literal> interface</para> + </listitem> + <listitem> + <para><literal>org.exoplatform.services.resources.LocaleContextInfo</literal> class</para> + </listitem> + </itemizedlist> + + <para><literal>LocalePolicy</literal> interface defines a single method that’s invoked on the installed + <literal>LocalePolicy</literal> service implementation: + </para> + + <programlisting><![CDATA[public interface LocalePolicy +{ + public Locale determineLocale(LocaleContextInfo localeContext); +}]]> + </programlisting> + <para><literal>Locale</literal> returned by determineLocale() method is the <literal>Locale</literal> + that will be returned to portlets when they call <literal>javax.portlet.PortletRequest.getLocale()</literal> method. + </para> + <para>The returned <literal>Locale</literal> has to be one of the locales supported by portal, + otherwise it will fallback to portal-default <literal>Locale</literal>. + </para> + + <para>The supported locales are listed in <filename>gatein.ear/02portal.war/WEB-INF/conf/common/locales-config.xml</filename> file + as described in <xref linkend="sect-Reference_Guide-Internationalization_Configuration-Locales_configuration"/> . + </para> + + <para>The <literal>determineLocale()</literal> method takes a parameter of type <literal>LocaleContextInfo</literal>, + which represents a compilation of preferred locales from different sources - user’s profile, portal default, + browser language settings, current session, browser cookie … All these different sources of <literal>Locale</literal> + configuration or preference are used as input to <literal>LocalePolicy</literal> implementation + that decides which <literal>Locale</literal> should be used. + </para> + + </section> + <section id="sect-Reference_Guide-Localization_Configuration-Pluggable_Locale_Policy-Default_LocalePolicy"> + <title>Default <literal>LocalePolicy</literal></title> + <para>By default, <literal>org.exoplatform.portal.application.localization.DefaultLocalePolicyService</literal> - an implementation + of <literal>LocalePolicy</literal> - is installed to provide the default behaviour. + This, however, can easily be extended and overriden. A completely new implementation can also be written from scratch. + </para> + <para><literal>DefaultLocalePolicyService</literal> treats logged-in users slightly differently than anonymous users. + Logged-in users have a profile that can contain language preference, while anonymous users don't. + </para> + <para>Here is an algorithm used for anonymous users.</para> + <procedure> + <title>An algorithm for anonymous users</title> + <step> + <para> + Iterate over <literal>LocaleContextInfo</literal> properties in the following order: + </para> + <itemizedlist> + <listitem> + <para><literal>cookieLocales</literal></para> + </listitem> + <listitem> + <para><literal>sessionLocale</literal></para> + </listitem> + <listitem> + <para><literal>browserLocales</literal></para> + </listitem> + <listitem> + <para><literal>portalLocale</literal></para> + </listitem> + </itemizedlist> + </step> + <step> + <para>Get each property's value - if it's a collection, get the first value. + </para> + </step> + <step> + <para>If value is one of the supported locales return it as a result. + </para> + </step> + <step> + <para>If value is not in the supported locales set, try to remove country information, + and check if a language matching locale is in the list of supported locales. + If so, return it as a result. + </para> + </step> + <step> + <para>Otherwise, continue with the next property. + </para> + </step> + </procedure> + <para>If no supported locale is found the return locale eventually defaults to <literal>portalLocale</literal>. + </para> + <para>The algorithm for logged-in users is virtually the same except that the first <literal>Locale</literal> + source checked is user's profile.</para> + <procedure> + <title>An algorithm for logged-in users</title> + <step> + <para> + Iterate over <literal>LocaleContextInfo</literal> properties in the following order: + </para> + <itemizedlist> + <listitem> + <para><literal>userProfile</literal></para> + </listitem> + <listitem> + <para><literal>cookieLocales</literal></para> + </listitem> + <listitem> + <para><literal>sessionLocale</literal></para> + </listitem> + <listitem> + <para><literal>browserLocales</literal></para> + </listitem> + <listitem> + <para><literal>portalLocale</literal></para> + </listitem> + </itemizedlist> + </step> + <step> + <para>The rest is the same as for anonymous users ...</para> + </step> + </procedure> + + </section> + <section id="sect-Reference_Guide-Localization_Configuration-Pluggable_Locale_Policy-Custom_LocalePolicy"> + <title>Custom <literal>LocalePolicy</literal></title> + <para>The easiest way to customize the <literal>LocalePolicy</literal> is to extend <literal>DefaultLocalePolicyService</literal>. + The study of its source code will be required. There is ample JavaDoc that provides thorough information. + Most customizations will involve simply overriding one or more of its protected methods. + </para> + <para> + An example of a customization is an already provided <literal>NoBrowserLocalePolicyService</literal>. + By overriding just one method, it skips any use of browser language preference. + </para> + <programlisting><![CDATA[public class NoBrowserLocalePolicyService extends DefaultLocalePolicyService +{ + /** + * Override super method with no-op. + * + * @param context locale context info available to implementations in order to determine appropriate Locale + * @return null + */ + @Override + protected Locale getLocaleConfigFromBrowser(LocaleContextInfo context) + { + return null; + } +}]]> + </programlisting> + </section> + + <section id="sect-Reference_Guide-Localization_Configuration-Pluggable_Locale_Policy-Configuration"> + <title>LocalePolicy Configuration</title> + + <para>The <literal>LocalePolicy</literal> framework is enabled for portlets by configuring LocalizationLifecycle class in portal's webui configuration file: + <filename>gatein.ear/02portal.war/WEB-INF/webui-configuration.xml</filename>:</para> + + <programlisting role="XML"><![CDATA[ <application-lifecycle-listeners> + ... + <listener>org.exoplatform.portal.application.localization.LocalizationLifecycle</listener> + </application-lifecycle-listeners>]]> + </programlisting> + + <para>The default <literal>LocalePolicy</literal> implementation is installed as GateIn Kernel portal service via + <filename>gatein.ear/lib/exo.portal.webui.portal-VERSION.jar/conf/portal/configuration.xml</filename>. + </para> + <para>The following fragment is responsible for installing the service: + </para> + <programlisting role="XML"><![CDATA[ <component> + <key>org.exoplatform.services.resources.LocalePolicy</key> + <type>org.exoplatform.portal.application.localization.DefaultLocalePolicyService</type> + </component>]]> + </programlisting> + <para>Besides implementing <literal>LocalePolicy</literal>, the service class also needs to implement + <literal>org.picocontainer.Startable</literal> interface in order to get installed. + </para> + <para>This configuration file should not be changed. The configuration in it can be overriden by placing it into portal's .war file: + <filename>gatein.ear/02portal.war/WEB-INF/conf/configuration.xml</filename> (usually as another file included into this one). + </para> + </section> + + <section id="sect-Reference_Guide-Localization_Configuration-Pluggable_Locale_Policy-Non_bridged"> + <title>Keeping non-bridged resources in sync with current Locale</title> + <para>In portals all the resources that are not portlets themselves but are accessed through portlets - reading + data through <literal>PortletRequest</literal>, and writing to <literal>PortletResponse</literal> - are + referred to as 'bridged'. Any resources that are accessed directly, bypassing portal filters and servlets, + are referred to as 'non-bridged'. + </para> + <para>Non-bridged servlets, and .jsps have no access to <literal>PortalRequest</literal>. They don't use + <literal>PortletRequest.getLocale()</literal> to determine current <literal>Locale</literal>. + Instead, they use <literal>ServletRequest.getLocale()</literal> which is subject to precise semantics + defined by Servlet specification - it reflects browser's language preference. + </para> + <para>In other words, non-bridged resources don't have a notion of current <literal>Locale</literal> + in the same sense that portlets do. The result is that when mixing portlets and non-bridged resources there + may be a localization mismatch - an inconsistency in the language used by different resources composing your portal + page. + </para> + <para>This problem is addressed by <literal>LocalizationFilter</literal>. This is a filter that changes the behaviour + of <literal>ServletRequest.getLocale()</literal> method so that it behaves the same way as + <literal>PortletRequest.getLocale()</literal>. That way even localization of servlets, and .jsps + accessed in a non-bridged manner can stay in sync with portlet localization. + </para> + <para><literal>LocalizationFilter</literal> is installed through portal's web.xml file: <filename>gatein.ear/02portal.war/WEB-INF/web.xml</filename> + </para> + <programlisting role="XML"><![CDATA[ <filter> + <filter-name>LocalizationFilter</filter-name> + <filter-class>org.exoplatform.portal.application.localization.LocalizationFilter</filter-class> + </filter> + + ... + + <filter-mapping> + <filter-name>LocalizationFilter</filter-name> + <url-pattern>/*</url-pattern> + <dispatcher>INCLUDE</dispatcher> + <dispatcher>FORWARD</dispatcher> + <dispatcher>REQUEST</dispatcher> + <dispatcher>ERROR</dispatcher> + </filter-mapping>]]> + </programlisting> + <para>There is a tiny limitation with this mechanism in that it is unable to determine the current portal, + and consequently its default language. As a result the portalLocale defaults to <literal>English</literal>, but can be configured + to something else by using filter's <literal>PortalLocale</literal> init param. For example: + </para> + <programlisting role="XML"><![CDATA[ <filter> + <filter-name>LocalizationFilter</filter-name> + <filter-class>org.exoplatform.portal.application.localization.LocalizationFilter</filter-class> + <init-param> + <param-name>PortalLocale</param-name> + <param-value>fr_FR</param-value> + </init-param> + </filter> ]]> + </programlisting> + <para>By default, <literal>LocalizationFilter</literal> is applied very broadly to cover all the resources automatically. + &PRODUCT; uses some non-bridged .jsps that require <literal>LocalizationFilter</literal>, so narrowing + the mapping to *.jsp is enough for &PRODUCT; to still function correctly. Additionally deployed portlets, + and portal applications, however, may require broader mapping to cover their non-bridged resources. + </para> + <para>Narrowing the mapping might improve performance. This is something to consider, when optimizing for speed. + </para> + </section> + </section> \ No newline at end of file Modified: portal/trunk/docs/reference-guide/en/modules/PortalDevelopment.xml =================================================================== --- portal/trunk/docs/reference-guide/en/modules/PortalDevelopment.xml 2010-11-25 16:30:36 UTC (rev 5274) +++ portal/trunk/docs/reference-guide/en/modules/PortalDevelopment.xml 2010-11-25 16:37:48 UTC (rev 5275) @@ -11,6 +11,7 @@ <xi:include href="PortalDevelopment/DefaultPortalPermissionConfiguration.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> <xi:include href="PortalDevelopment/DefaultPortalNavigationConfiguration.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> <xi:include href="PortalDevelopment/InternationalizationConfiguration.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> + <xi:include href="PortalDevelopment/LocalizationConfiguration.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> <xi:include href="PortalDevelopment/RTLFramework.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> <xi:include href="PortalDevelopment/XMLResourceBundles.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> <xi:include href="PortalDevelopment/JavascriptInterApplicationCommunication.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />

14 years, 1 month

1
0
0 / 0

gatein SVN: r5274 - in components/wsrp/trunk/consumer/src: test and 3 other directories.

by do-not-reply＠jboss.org

Author: chris.laprun(a)jboss.com Date: 2010-11-25 11:30:36 -0500 (Thu, 25 Nov 2010) New Revision: 5274 Added: components/wsrp/trunk/consumer/src/test/resources/ components/wsrp/trunk/consumer/src/test/resources/wsdl/ components/wsrp/trunk/consumer/src/test/resources/wsdl/extra-ports.wsdl components/wsrp/trunk/consumer/src/test/resources/wsdl/missing-mandatory.wsdl components/wsrp/trunk/consumer/src/test/resources/wsdl/missing-registration-non-std-ns.wsdl components/wsrp/trunk/consumer/src/test/resources/wsdl/wsrp-2.0-bindings.wsdl components/wsrp/trunk/consumer/src/test/resources/wsdl/wsrp-2.0-extra.xsd components/wsrp/trunk/consumer/src/test/resources/wsdl/wsrp-2.0-interfaces.wsdl components/wsrp/trunk/consumer/src/test/resources/wsdl/wsrp-2.0-services.wsdl components/wsrp/trunk/consumer/src/test/resources/wsdl/wsrp-2.0-types.xsd Modified: components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/services/SOAPServiceFactory.java components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/consumer/services/SOAPServiceFactoryTestCase.java Log: - GTNWSRP-172: Do not fail if we can't find an optional port. Corollary: fail if we can't find a mandatory one. - GNTWSRP-173: Do not force a known target namespace as it's outside of the WSRP specification. - Updated and added more tests. Modified: components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/services/SOAPServiceFactory.java =================================================================== --- components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/services/SOAPServiceFactory.java 2010-11-25 16:16:06 UTC (rev 5273) +++ components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/services/SOAPServiceFactory.java 2010-11-25 16:30:36 UTC (rev 5274) @@ -86,9 +86,7 @@ private boolean isV2 = false; private Service wsService; - private static final String WSRP_V1_URN = "urn:oasis:names:tc:wsrp:v1:wsdl"; private static final String WSRP_V1_BINDING = "urn:oasis:names:tc:wsrp:v1:bind"; - private static final String WSRP_V2_URN = "urn:oasis:names:tc:wsrp:v2:wsdl"; private static final String WSRP_V2_BINDING = "urn:oasis:names:tc:wsrp:v2:bind"; private String markupURL; @@ -157,7 +155,15 @@ refresh(false); - Object service = wsService.getPort(clazz); + Object service = null; + try + { + service = wsService.getPort(clazz); + } + catch (Exception e) + { + log.debug("No port available for " + clazz, e); + } // String portAddress = null; @@ -295,17 +301,45 @@ { wsService = Service.create(wsdlURL, wsrp2); - WSRPV2MarkupPortType markupPortType = wsService.getPort(WSRPV2MarkupPortType.class); - markupURL = (String)((BindingProvider)markupPortType).getRequestContext().get(BindingProvider.ENDPOINT_ADDRESS_PROPERTY); + Class portTypeClass = null; + try + { + portTypeClass = WSRPV2MarkupPortType.class; + WSRPV2MarkupPortType markupPortType = wsService.getPort(WSRPV2MarkupPortType.class); + markupURL = (String)((BindingProvider)markupPortType).getRequestContext().get(BindingProvider.ENDPOINT_ADDRESS_PROPERTY); - WSRPV2ServiceDescriptionPortType sdPort = wsService.getPort(WSRPV2ServiceDescriptionPortType.class); - serviceDescriptionURL = (String)((BindingProvider)sdPort).getRequestContext().get(BindingProvider.ENDPOINT_ADDRESS_PROPERTY); + portTypeClass = WSRPV2ServiceDescriptionPortType.class; + WSRPV2ServiceDescriptionPortType sdPort = wsService.getPort(WSRPV2ServiceDescriptionPortType.class); + serviceDescriptionURL = (String)((BindingProvider)sdPort).getRequestContext().get(BindingProvider.ENDPOINT_ADDRESS_PROPERTY); + } + catch (Exception e) + { + setFailed(true); + throw new IllegalArgumentException("Mandatory WSRP 2 port " + + portTypeClass.getName() + " was not found for WSDL at " + wsdlDefinitionURL, e); + } - WSRPV2PortletManagementPortType managementPortType = wsService.getPort(WSRPV2PortletManagementPortType.class); - portletManagementURL = (String)((BindingProvider)managementPortType).getRequestContext().get(BindingProvider.ENDPOINT_ADDRESS_PROPERTY); + try + { + WSRPV2PortletManagementPortType managementPortType = wsService.getPort(WSRPV2PortletManagementPortType.class); + portletManagementURL = (String)((BindingProvider)managementPortType).getRequestContext().get(BindingProvider.ENDPOINT_ADDRESS_PROPERTY); + } + catch (Exception e) + { + log.debug("PortletManagement port was not available for WSDL at " + wsdlDefinitionURL, e); + portletManagementURL = null; + } - WSRPV2RegistrationPortType registrationPortType = wsService.getPort(WSRPV2RegistrationPortType.class); - registrationURL = (String)((BindingProvider)registrationPortType).getRequestContext().get(BindingProvider.ENDPOINT_ADDRESS_PROPERTY); + try + { + WSRPV2RegistrationPortType registrationPortType = wsService.getPort(WSRPV2RegistrationPortType.class); + registrationURL = (String)((BindingProvider)registrationPortType).getRequestContext().get(BindingProvider.ENDPOINT_ADDRESS_PROPERTY); + } + catch (Exception e) + { + log.debug("Registration port was not available for WSDL at " + wsdlDefinitionURL, e); + registrationURL = null; + } setFailed(false); setAvailable(true); @@ -315,17 +349,44 @@ { wsService = Service.create(wsdlURL, wsrp1); - WSRPV1MarkupPortType markupPortType = wsService.getPort(WSRPV1MarkupPortType.class); - markupURL = (String)((BindingProvider)markupPortType).getRequestContext().get(BindingProvider.ENDPOINT_ADDRESS_PROPERTY); + Class portTypeClass = null; + try + { + portTypeClass = WSRPV1MarkupPortType.class; + WSRPV1MarkupPortType markupPortType = wsService.getPort(WSRPV1MarkupPortType.class); + markupURL = (String)((BindingProvider)markupPortType).getRequestContext().get(BindingProvider.ENDPOINT_ADDRESS_PROPERTY); - WSRPV1ServiceDescriptionPortType sdPort = wsService.getPort(WSRPV1ServiceDescriptionPortType.class); - serviceDescriptionURL = (String)((BindingProvider)sdPort).getRequestContext().get(BindingProvider.ENDPOINT_ADDRESS_PROPERTY); + portTypeClass = WSRPV1ServiceDescriptionPortType.class; + WSRPV1ServiceDescriptionPortType sdPort = wsService.getPort(WSRPV1ServiceDescriptionPortType.class); + serviceDescriptionURL = (String)((BindingProvider)sdPort).getRequestContext().get(BindingProvider.ENDPOINT_ADDRESS_PROPERTY); + } + catch (Exception e) + { + setFailed(true); + throw new IllegalArgumentException("Mandatory WSRP 1 port " + portTypeClass.getName() + " was not found for WSDL at " + wsdlDefinitionURL, e); + } - WSRPV1PortletManagementPortType managementPortType = wsService.getPort(WSRPV1PortletManagementPortType.class); - portletManagementURL = (String)((BindingProvider)managementPortType).getRequestContext().get(BindingProvider.ENDPOINT_ADDRESS_PROPERTY); + try + { + WSRPV1PortletManagementPortType managementPortType = wsService.getPort(WSRPV1PortletManagementPortType.class); + portletManagementURL = (String)((BindingProvider)managementPortType).getRequestContext().get(BindingProvider.ENDPOINT_ADDRESS_PROPERTY); + } + catch (Exception e) + { + log.debug("PortletManagement port was not available for WSDL at: " + wsdlDefinitionURL, e); + portletManagementURL = null; + } - WSRPV1RegistrationPortType registrationPortType = wsService.getPort(WSRPV1RegistrationPortType.class); - registrationURL = (String)((BindingProvider)registrationPortType).getRequestContext().get(BindingProvider.ENDPOINT_ADDRESS_PROPERTY); + try + { + WSRPV1RegistrationPortType registrationPortType = wsService.getPort(WSRPV1RegistrationPortType.class); + registrationURL = (String)((BindingProvider)registrationPortType).getRequestContext().get(BindingProvider.ENDPOINT_ADDRESS_PROPERTY); + } + catch (Exception e) + { + log.debug("Registration port was not available for WSDL at: " + wsdlDefinitionURL, e); + registrationURL = null; + } setFailed(false); setAvailable(true); @@ -461,49 +522,42 @@ } QName wsrp1 = null, wsrp2 = null; + String ns = definition.getTargetNamespace(); for (QName name : services.keySet()) { - String ns = name.getNamespaceURI(); javax.wsdl.Service service = services.get(name); // if the namespace is using one of the WSRP-defined ones, we have a potential candidate - if (WSRP_V1_URN.equals(ns) || WSRP_V2_URN.equals(ns)) + // but we need to check that the port namespaces to really know which version of the service we've found + // this is needed for http://www.netunitysoftware.com/wsrp2interop/WsrpProducer.asmx?Operation=... + // where the WSRP1 service name has the WSRP2 global target namespace so we need more processing :( + Map<String, Port> ports = service.getPorts(); + String bindingNSURI = null; + for (Port port : ports.values()) { - // but we need to check that the port namespaces to really know which version of the service we've found - // this is needed for http://www.netunitysoftware.com/wsrp2interop/WsrpProducer.asmx?Operation=... - // where the WSRP1 service name has the WSRP2 global target namespace so we need more processing :( - Map<String, Port> ports = service.getPorts(); - String bindingNSURI = null; - for (Port port : ports.values()) + QName bindingName = port.getBinding().getQName(); + String newBindingNS = bindingName.getNamespaceURI(); + if (WSRP_V1_BINDING.equals(newBindingNS) || WSRP_V2_BINDING.equals(newBindingNS)) { - QName bindingName = port.getBinding().getQName(); - String newBindingNS = bindingName.getNamespaceURI(); - if (WSRP_V1_BINDING.equals(newBindingNS) || WSRP_V2_BINDING.equals(newBindingNS)) + if (bindingNSURI != null && !bindingNSURI.equals(newBindingNS)) { - if (bindingNSURI != null && !bindingNSURI.equals(newBindingNS)) - { - throw new WSDLException(WSDLException.OTHER_ERROR, "Inconsistent NS in port bindings. Aborting."); - } - bindingNSURI = newBindingNS; + throw new WSDLException(WSDLException.OTHER_ERROR, "Inconsistent NS in port bindings. Aborting."); } - else - { - log.debug("Unknown binding namespace: " + newBindingNS + ". Ignoring binding: " + bindingName); - } + bindingNSURI = newBindingNS; } - if (WSRP_V1_BINDING.equals(bindingNSURI)) + else { - wsrp1 = checkPotentialServiceName(wsrp1, name, ns); + log.debug("Unknown binding namespace: " + newBindingNS + ". Ignoring binding: " + bindingName); } - else if (WSRP_V2_BINDING.equals(bindingNSURI)) - { - wsrp2 = checkPotentialServiceName(wsrp2, name, ns); - } } - else + if (WSRP_V1_BINDING.equals(bindingNSURI)) { - log.debug("Unknown service namespace: " + ns); + wsrp1 = checkPotentialServiceName(wsrp1, name, ns); } + else if (WSRP_V2_BINDING.equals(bindingNSURI)) + { + wsrp2 = checkPotentialServiceName(wsrp2, name, ns); + } } wsrp2ServiceQName = wsrp2; Modified: components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/consumer/services/SOAPServiceFactoryTestCase.java =================================================================== --- components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/consumer/services/SOAPServiceFactoryTestCase.java 2010-11-25 16:16:06 UTC (rev 5273) +++ components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/consumer/services/SOAPServiceFactoryTestCase.java 2010-11-25 16:30:36 UTC (rev 5274) @@ -35,6 +35,7 @@ import org.oasis.wsrp.v2.WSRPV2ServiceDescriptionPortType; import javax.wsdl.WSDLException; +import java.net.URL; /** * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> @@ -52,12 +53,40 @@ factory = new SOAPServiceFactory(); } - /*public void testV2ServiceWithExtraPorts() throws Exception + private String getWSDLURL(String fileName) { - factory.setWsdlDefinitionURL("http://stacks3.mw.lab.eng.bos.redhat.com:7001/wsrp/producer/wsrp-2.0/mark..."); + URL url = Thread.currentThread().getContextClassLoader().getResource(fileName); + return url.toExternalForm(); + } + + public void testMissingMandatoryPort() throws Exception + { + factory.setWsdlDefinitionURL(getWSDLURL("wsdl/missing-mandatory.wsdl")); + try + { + checkPorts(WSRP2_PORT_TYPES); + fail(); + } + catch (IllegalArgumentException e) + { + // expected + } + } + + public void testV2ServiceWithExtraPorts() throws Exception + { + factory.setWsdlDefinitionURL(getWSDLURL("wsdl/extra-ports.wsdl")); checkPorts(WSRP2_PORT_TYPES); - }*/ + } + public void testWebsphere() throws Exception + { + factory.setWsdlDefinitionURL(getWSDLURL("wsdl/missing-registration-non-std-ns.wsdl")); + + // missing-registration-non-std-ns.wsdl doesn't contain registration port + checkPorts(WSRPV2MarkupPortType.class, WSRPV2ServiceDescriptionPortType.class, WSRPV2PortletManagementPortType.class); + } + public void testSimpleV2Service() throws Exception { factory.setWsdlDefinitionURL("http://www.netunitysoftware.com/wsrp2interop/WsrpProducer.asmx?Operation=..."); @@ -88,11 +117,11 @@ { assertTrue(e instanceof WSDLException); WSDLException wsdlEx = (WSDLException)e; - assertEquals(WSDLException.INVALID_WSDL, wsdlEx.getFaultCode()); + assertEquals(WSDLException.OTHER_ERROR, wsdlEx.getFaultCode()); } } - private void checkPorts(Class[] ports) throws Exception + private void checkPorts(Class... ports) throws Exception { for (Class portClass : ports) { Added: components/wsrp/trunk/consumer/src/test/resources/wsdl/extra-ports.wsdl =================================================================== --- components/wsrp/trunk/consumer/src/test/resources/wsdl/extra-ports.wsdl (rev 0) +++ components/wsrp/trunk/consumer/src/test/resources/wsdl/extra-ports.wsdl 2010-11-25 16:30:36 UTC (rev 5274) @@ -0,0 +1,68 @@ +<?xml version='1.0' encoding='UTF-8'?> + + +<s0:definitions targetNamespace="urn:oasis:names:tc:wsrp:v2:wsdl" xmlns="" xmlns:s0="http://schemas.xmlsoap.org/wsdl/" + xmlns:s1="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..." + xmlns:s2="urn:oasis:names:tc:wsrp:v2:bind" xmlns:s3="http://schemas.xmlsoap.org/wsdl/soap/" + xmlns:s4="urn:bea:wsrp:ext:v2:bind" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy"> + <s0:import + location="http://stacks3.mw.lab.eng.bos.redhat.com:7001/wsrp/producer/wsrp-2.0/mark..." + namespace="urn:oasis:names:tc:wsrp:v2:bind"/> + <s0:import + location="http://stacks3.mw.lab.eng.bos.redhat.com:7001/wsrp/producer/wsrp-2.0/mark..." + namespace="urn:bea:wsrp:ext:v2:bind"/> + <wsp:UsingPolicy s0:Required="true"/> + <wsp:Policy s1:Id="ProducerDefaultPolicy"> + <wsp:All> + <wssp:Identity xmlns:wssp="http://www.bea.com/wls90/security/policy"> + <wssp:SupportedTokens> + <wssp:SecurityToken + TokenType="http://docs.oasis-open.org/wss/2004/01/oasis-2004-01-saml-token-profile-1..."> + <wssp:Claims> + <wssp:ConfirmationMethod>sender-vouches</wssp:ConfirmationMethod> + </wssp:Claims> + </wssp:SecurityToken> + </wssp:SupportedTokens> + </wssp:Identity> + </wsp:All> + </wsp:Policy> + <s0:service name="WSRP_v2_Service"> + <s0:port binding="s2:WSRP_v2_Markup_Binding_SOAP" name="WSRP_v2_Markup_Service"> + <s3:address location="http://stacks3.mw.lab.eng.bos.redhat.com:7001/wsrp/producer/wsrp-2.0/markup"/> + </s0:port> + <s0:port binding="s2:WSRP_v2_ServiceDescription_Binding_SOAP" name="WSRP_v2_ServiceDescription_Service"> + <s3:address + location="http://stacks3.mw.lab.eng.bos.redhat.com:7001/wsrp/producer/wsrp-2.0/serv..."/> + </s0:port> + <s0:port binding="s2:WSRP_v2_Registration_Binding_SOAP" name="WSRP_v2_Registration_Service"> + <s3:address location="http://stacks3.mw.lab.eng.bos.redhat.com:7001/wsrp/producer/wsrp-2.0/regi..."/> + </s0:port> + <s0:port binding="s2:WSRP_v2_PortletManagement_Binding_SOAP" name="WSRP_v2_PortletManagement_Service"> + <s3:address location="http://stacks3.mw.lab.eng.bos.redhat.com:7001/wsrp/producer/wsrp-2.0/port..."/> + </s0:port> + <s0:port binding="s4:WLP_WSRP_v2_Markup_Ext_Binding_SOAP" name="WLP_WSRP_v2_Ext_Service"> + <s3:address location="http://stacks3.mw.lab.eng.bos.redhat.com:7001/wsrp/producer/wsrp-wlp-ext-..."/> + </s0:port> + </s0:service> +</s0:definitions> \ No newline at end of file Added: components/wsrp/trunk/consumer/src/test/resources/wsdl/missing-mandatory.wsdl =================================================================== --- components/wsrp/trunk/consumer/src/test/resources/wsdl/missing-mandatory.wsdl (rev 0) +++ components/wsrp/trunk/consumer/src/test/resources/wsdl/missing-mandatory.wsdl 2010-11-25 16:30:36 UTC (rev 5274) @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<wsdl:definitions targetNamespace="http://www.ibm.com/xmlns/prod/websphere/portal/wsrp/wsdl" + xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" + xmlns:v2bind="urn:oasis:names:tc:wsrp:v2:bind" xmlns="http://schemas.xmlsoap.org/wsdl/"> + <import namespace="urn:oasis:names:tc:wsrp:v2:bind" location="wsrp-2.0-bindings.wsdl"/> + <wsdl:service name="WSRPService_v2"> + <wsdl:port binding="v2bind:WSRP_v2_Markup_Binding_SOAP" name="WSRPBaseService"> + <soap:address location="http://127.0.0.1:12101/wsrp/WSRPBaseService_v2"/> + </wsdl:port> + </wsdl:service> +</wsdl:definitions> Added: components/wsrp/trunk/consumer/src/test/resources/wsdl/missing-registration-non-std-ns.wsdl =================================================================== --- components/wsrp/trunk/consumer/src/test/resources/wsdl/missing-registration-non-std-ns.wsdl (rev 0) +++ components/wsrp/trunk/consumer/src/test/resources/wsdl/missing-registration-non-std-ns.wsdl 2010-11-25 16:30:36 UTC (rev 5274) @@ -0,0 +1,40 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<wsdl:definitions targetNamespace="http://www.ibm.com/xmlns/prod/websphere/portal/wsrp/wsdl" + xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" + xmlns:v2bind="urn:oasis:names:tc:wsrp:v2:bind" xmlns="http://schemas.xmlsoap.org/wsdl/"> + <import namespace="urn:oasis:names:tc:wsrp:v2:bind" location="wsrp-2.0-bindings.wsdl"/> + <wsdl:service name="WSRPService_v2"> + <wsdl:port binding="v2bind:WSRP_v2_Markup_Binding_SOAP" name="WSRPBaseService"> + <soap:address location="http://127.0.0.1:12101/wsrp/WSRPBaseService_v2"/> + </wsdl:port> + <wsdl:port binding="v2bind:WSRP_v2_ServiceDescription_Binding_SOAP" name="WSRPServiceDescriptionService"> + <soap:address location="http://127.0.0.1:12101/wsrp/WSRPServiceDescriptionService_v2"/> + </wsdl:port> + <wsdl:port binding="v2bind:WSRP_v2_PortletManagement_Binding_SOAP" name="WSRPPortletManagementService"> + <soap:address location="http://127.0.0.1:12101/wsrp/WSRPPortletManagementService_v2"/> + </wsdl:port> + </wsdl:service> +</wsdl:definitions> Copied: components/wsrp/trunk/consumer/src/test/resources/wsdl/wsrp-2.0-bindings.wsdl (from rev 5270, components/wsrp/trunk/wsrp-producer-war/src/main/webapp/WEB-INF/wsdl/wsrp-2.0-bindings.wsdl) =================================================================== --- components/wsrp/trunk/consumer/src/test/resources/wsdl/wsrp-2.0-bindings.wsdl (rev 0) +++ components/wsrp/trunk/consumer/src/test/resources/wsdl/wsrp-2.0-bindings.wsdl 2010-11-25 16:30:36 UTC (rev 5274) @@ -0,0 +1,959 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<wsdl:definitions targetNamespace="urn:oasis:names:tc:wsrp:v2:bind" + xmlns:bind="urn:oasis:names:tc:wsrp:v2:bind" + xmlns:intf="urn:oasis:names:tc:wsrp:v2:intf" + + xmlns="http://schemas.xmlsoap.org/wsdl/" + + xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"> + +  + + <import namespace="urn:oasis:names:tc:wsrp:v2:intf" location="wsrp-2.0-interfaces.wsdl"/> + + <wsdl:binding name="WSRP_v2_Markup_Binding_SOAP" type="intf:WSRP_v2_Markup_PortType"> + <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> + + <wsdl:operation name="getMarkup"> + <soap:operation soapAction="urn:oasis:names:tc:wsrp:v2:getMarkup"/> + <wsdl:input name="getMarkup"> + <soap:body use="literal"/> + </wsdl:input> + <wsdl:output name="getMarkupResponse"> + <soap:body use="literal"/> + </wsdl:output> + <wsdl:fault name="AccessDenied"> + <soap:fault name="AccessDenied" use="literal"/> + </wsdl:fault> + <wsdl:fault name="InconsistentParameters"> + <soap:fault name="InconsistentParameters" use="literal"/> + </wsdl:fault> + <wsdl:fault name="InvalidCookie"> + <soap:fault name="InvalidCookie" use="literal"/> + </wsdl:fault> + <wsdl:fault name="InvalidHandle"> + <soap:fault name="InvalidHandle" use="literal"/> + </wsdl:fault> + <wsdl:fault name="InvalidRegistration"> + <soap:fault name="InvalidRegistration" use="literal"/> + </wsdl:fault> + <wsdl:fault name="InvalidSession"> + <soap:fault name="InvalidSession" use="literal"/> + </wsdl:fault> + <wsdl:fault name="InvalidUserCategory"> + <soap:fault name="InvalidUserCategory" use="literal"/> + </wsdl:fault> + <wsdl:fault name="MissingParameters"> + <soap:fault name="MissingParameters" use="literal"/> + </wsdl:fault> + <wsdl:fault name="ModifyRegistrationRequired"> + <soap:fault name="ModifyRegistrationRequired" use="literal"/> + </wsdl:fault> + <wsdl:fault name="OperationFailed"> + <soap:fault name="OperationFailed" use="literal"/> + </wsdl:fault> + <wsdl:fault name="ResourceSuspended"> + <soap:fault name="ResourceSuspended" use="literal"/> + </wsdl:fault> + <wsdl:fault name="UnsupportedLocale"> + <soap:fault name="UnsupportedLocale" use="literal"/> + </wsdl:fault> + <wsdl:fault name="UnsupportedMimeType"> + <soap:fault name="UnsupportedMimeType" use="literal"/> + </wsdl:fault> + <wsdl:fault name="UnsupportedMode"> + <soap:fault name="UnsupportedMode" use="literal"/> + </wsdl:fault> + <wsdl:fault name="UnsupportedWindowState"> + <soap:fault name="UnsupportedWindowState" use="literal"/> + </wsdl:fault> + </wsdl:operation> + + <wsdl:operation name="getResource"> + <soap:operation soapAction="urn:oasis:names:tc:wsrp:v2:getResource"/> + <wsdl:input name="getResource"> + <soap:body use="literal"/> + </wsdl:input> + <wsdl:output name="getResourceResponse"> + <soap:body use="literal"/> + </wsdl:output> + <wsdl:fault name="AccessDenied"> + <soap:fault name="AccessDenied" use="literal"/> + </wsdl:fault> + <wsdl:fault name="InconsistentParameters"> + <soap:fault name="InconsistentParameters" use="literal"/> + </wsdl:fault> + <wsdl:fault name="InvalidCookie"> + <soap:fault name="InvalidCookie" use="literal"/> + </wsdl:fault> + <wsdl:fault name="InvalidHandle"> + <soap:fault name="InvalidHandle" use="literal"/> + </wsdl:fault> + <wsdl:fault name="InvalidRegistration"> + <soap:fault name="InvalidRegistration" use="literal"/> + </wsdl:fault> + <wsdl:fault name="InvalidSession"> + <soap:fault name="InvalidSession" use="literal"/> + </wsdl:fault> + <wsdl:fault name="InvalidUserCategory"> + <soap:fault name="InvalidUserCategory" use="literal"/> + </wsdl:fault> + <wsdl:fault name="MissingParameters"> + <soap:fault name="MissingParameters" use="literal"/> + </wsdl:fault> + <wsdl:fault name="ModifyRegistrationRequired"> + <soap:fault name="ModifyRegistrationRequired" use="literal"/> + </wsdl:fault> + <wsdl:fault name="OperationFailed"> + <soap:fault name="OperationFailed" use="literal"/> + </wsdl:fault> + <wsdl:fault name="OperationNotSupported"> + <soap:fault name="OperationNotSupported" use="literal"/> + </wsdl:fault> + <wsdl:fault name="ResourceSuspended"> + <soap:fault name="ResourceSuspended" use="literal"/> + </wsdl:fault> + <wsdl:fault name="UnsupportedLocale"> + <soap:fault name="UnsupportedLocale" use="literal"/> + </wsdl:fault> + <wsdl:fault name="UnsupportedMimeType"> + <soap:fault name="UnsupportedMimeType" use="literal"/> + </wsdl:fault> + <wsdl:fault name="UnsupportedMode"> + <soap:fault name="UnsupportedMode" use="literal"/> + </wsdl:fault> + <wsdl:fault name="UnsupportedWindowState"> + <soap:fault name="UnsupportedWindowState" use="literal"/> + </wsdl:fault> + </wsdl:operation> + + <wsdl:operation name="performBlockingInteraction"> + <soap:operation soapAction="urn:oasis:names:tc:wsrp:v2:performBlockingInteraction"/> + <wsdl:input name="performBlockingInteraction"> + <soap:body use="literal"/> + </wsdl:input> + <wsdl:output name="performBlockingInteractionResponse"> + <soap:body use="literal"/> + </wsdl:output> + <wsdl:fault name="AccessDenied"> + <soap:fault name="AccessDenied" use="literal"/> + </wsdl:fault> + <wsdl:fault name="InconsistentParameters"> + <soap:fault name="InconsistentParameters" use="literal"/> + </wsdl:fault> + <wsdl:fault name="InvalidCookie"> + <soap:fault name="InvalidCookie" use="literal"/> + </wsdl:fault> + <wsdl:fault name="InvalidHandle"> + <soap:fault name="InvalidHandle" use="literal"/> + </wsdl:fault> + <wsdl:fault name="InvalidRegistration"> + <soap:fault name="InvalidRegistration" use="literal"/> + </wsdl:fault> + <wsdl:fault name="InvalidSession"> + <soap:fault name="InvalidSession" use="literal"/> + </wsdl:fault> + <wsdl:fault name="InvalidUserCategory"> + <soap:fault name="InvalidUserCategory" use="literal"/> + </wsdl:fault> + <wsdl:fault name="MissingParameters"> + <soap:fault name="MissingParameters" use="literal"/> + </wsdl:fault> + <wsdl:fault name="ModifyRegistrationRequired"> + <soap:fault name="ModifyRegistrationRequired" use="literal"/> + </wsdl:fault> + <wsdl:fault name="OperationFailed"> + <soap:fault name="OperationFailed" use="literal"/> + </wsdl:fault> + <wsdl:fault name="PortletStateChangeRequired"> + <soap:fault name="PortletStateChangeRequired" use="literal"/> + </wsdl:fault> + <wsdl:fault name="ResourceSuspended"> + <soap:fault name="ResourceSuspended" use="literal"/> + </wsdl:fault> + <wsdl:fault name="UnsupportedLocale"> + <soap:fault name="UnsupportedLocale" use="literal"/> + </wsdl:fault> + <wsdl:fault name="UnsupportedMimeType"> + <soap:fault name="UnsupportedMimeType" use="literal"/> + </wsdl:fault> + <wsdl:fault name="UnsupportedMode"> + <soap:fault name="UnsupportedMode" use="literal"/> + </wsdl:fault> + <wsdl:fault name="UnsupportedWindowState"> + <soap:fault name="UnsupportedWindowState" use="literal"/> + </wsdl:fault> + </wsdl:operation> + + <wsdl:operation name="handleEvents"> + <soap:operation soapAction="urn:oasis:names:tc:wsrp:v2:handleEvents"/> + <wsdl:input name="handleEvents"> + <soap:body use="literal"/> + </wsdl:input> + <wsdl:output name="handleEventsResponse"> + <soap:body use="literal"/> + </wsdl:output> + <wsdl:fault name="AccessDenied"> + <soap:fault name="AccessDenied" use="literal"/> + </wsdl:fault> + <wsdl:fault name="InconsistentParameters"> + <soap:fault name="InconsistentParameters" use="literal"/> + </wsdl:fault> + <wsdl:fault name="InvalidCookie"> + <soap:fault name="InvalidCookie" use="literal"/> + </wsdl:fault> + <wsdl:fault name="InvalidHandle"> + <soap:fault name="InvalidHandle" use="literal"/> + </wsdl:fault> + <wsdl:fault name="InvalidRegistration"> + <soap:fault name="InvalidRegistration" use="literal"/> + </wsdl:fault> + <wsdl:fault name="InvalidSession"> + <soap:fault name="InvalidSession" use="literal"/> + </wsdl:fault> + <wsdl:fault name="InvalidUserCategory"> + <soap:fault name="InvalidUserCategory" use="literal"/> + </wsdl:fault> + <wsdl:fault name="MissingParameters"> + <soap:fault name="MissingParameters" use="literal"/> + </wsdl:fault> + <wsdl:fault name="ModifyRegistrationRequired"> + <soap:fault name="ModifyRegistrationRequired" use="literal"/> + </wsdl:fault> + <wsdl:fault name="OperationFailed"> + <soap:fault name="OperationFailed" use="literal"/> + </wsdl:fault> + <wsdl:fault name="OperationNotSupported"> + <soap:fault name="OperationNotSupported" use="literal"/> + </wsdl:fault> + <wsdl:fault name="PortletStateChangeRequired"> + <soap:fault name="PortletStateChangeRequired" use="literal"/> + </wsdl:fault> + <wsdl:fault name="ResourceSuspended"> + <soap:fault name="ResourceSuspended" use="literal"/> + </wsdl:fault> + <wsdl:fault name="UnsupportedLocale"> + <soap:fault name="UnsupportedLocale" use="literal"/> + </wsdl:fault> + <wsdl:fault name="UnsupportedMimeType"> + <soap:fault name="UnsupportedMimeType" use="literal"/> + </wsdl:fault> + <wsdl:fault name="UnsupportedMode"> + <soap:fault name="UnsupportedMode" use="literal"/> + </wsdl:fault> + <wsdl:fault name="UnsupportedWindowState"> + <soap:fault name="UnsupportedWindowState" use="literal"/> + </wsdl:fault> + </wsdl:operation> + + <wsdl:operation name="releaseSessions"> + <soap:operation soapAction="urn:oasis:names:tc:wsrp:v2:releaseSessions"/> + <wsdl:input name="releaseSessions"> + <soap:body use="literal"/> + </wsdl:input> + <wsdl:output name="releaseSessionsResponse"> + <soap:body use="literal"/> + </wsdl:output> + <wsdl:fault name="AccessDenied"> + <soap:fault name="AccessDenied" use="literal"/> + </wsdl:fault> + <wsdl:fault name="InvalidRegistration"> + <soap:fault name="InvalidRegistration" use="literal"/> + </wsdl:fault> + <wsdl:fault name="MissingParameters"> + <soap:fault name="MissingParameters" use="literal"/> + </wsdl:fault> + <wsdl:fault name="ModifyRegistrationRequired"> + <soap:fault name="ModifyRegistrationRequired" use="literal"/> + </wsdl:fault> + <wsdl:fault name="OperationFailed"> + <soap:fault name="OperationFailed" use="literal"/> + </wsdl:fault> + <wsdl:fault name="OperationNotSupported"> + <soap:fault name="OperationNotSupported" use="literal"/> + </wsdl:fault> + <wsdl:fault name="ResourceSuspended"> + <soap:fault name="ResourceSuspended" use="literal"/> + </wsdl:fault> + </wsdl:operation> + + <wsdl:operation name="initCookie"> + <soap:operation soapAction="urn:oasis:names:tc:wsrp:v2:initCookie"/> + <wsdl:input name="initCookie"> + <soap:body use="literal"/> + </wsdl:input> + <wsdl:output name="initCookieResponse"> + <soap:body use="literal"/> + </wsdl:output> + <wsdl:fault name="AccessDenied"> + <soap:fault name="AccessDenied" use="literal"/> + </wsdl:fault> + <wsdl:fault name="InvalidRegistration"> + <soap:fault name="InvalidRegistration" use="literal"/> + </wsdl:fault> + <wsdl:fault name="ModifyRegistrationRequired"> + <soap:fault name="ModifyRegistrationRequired" use="literal"/> + </wsdl:fault> + <wsdl:fault name="OperationFailed"> + <soap:fault name="OperationFailed" use="literal"/> + </wsdl:fault> + <wsdl:fault name="OperationNotSupported"> + <soap:fault name="OperationNotSupported" use="literal"/> + </wsdl:fault> + <wsdl:fault name="ResourceSuspended"> + <soap:fault name="ResourceSuspended" use="literal"/> + </wsdl:fault> + </wsdl:operation> + </wsdl:binding> + + + <wsdl:binding name="WSRP_v2_ServiceDescription_Binding_SOAP" type="intf:WSRP_v2_ServiceDescription_PortType"> + <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> + + <wsdl:operation name="getServiceDescription"> + <soap:operation soapAction="urn:oasis:names:tc:wsrp:v2:getServiceDescription"/> + <wsdl:input name="getServiceDescription"> + <soap:body use="literal"/> + </wsdl:input> + <wsdl:output name="getServiceDescriptionResponse"> + <soap:body use="literal"/> + </wsdl:output> + <wsdl:fault name="InvalidRegistration"> + <soap:fault name="InvalidRegistration" use="literal"/> + </wsdl:fault> + <wsdl:fault name="ModifyRegistrationRequired"> + <soap:fault name="ModifyRegistrationRequired" use="literal"/> + </wsdl:fault> + <wsdl:fault name="OperationFailed"> + <soap:fault name="OperationFailed" use="literal"/> + </wsdl:fault> + <wsdl:fault name="ResourceSuspended"> + <soap:fault name="ResourceSuspended" use="literal"/> + </wsdl:fault> + </wsdl:operation> + </wsdl:binding> + + <wsdl:binding name="WSRP_v2_PortletManagement_Binding_SOAP" type="intf:WSRP_v2_PortletManagement_PortType"> + <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> + + <wsdl:operation name="getPortletDescription"> + <soap:operation soapAction="urn:oasis:names:tc:wsrp:v2:getPortletDescription"/> + <wsdl:input name="getPortletDescription"> + <soap:body use="literal"/> + </wsdl:input> + <wsdl:output name="getPortletDescriptionResponse"> + <soap:body use="literal"/> + </wsdl:output> + <wsdl:fault name="AccessDenied"> + <soap:fault name="AccessDenied" use="literal"/> + </wsdl:fault> + <wsdl:fault name="InconsistentParameters"> + <soap:fault name="InconsistentParameters" use="literal"/> + </wsdl:fault> + <wsdl:fault name="InvalidHandle"> + <soap:fault name="InvalidHandle" use="literal"/> + </wsdl:fault> + <wsdl:fault name="InvalidRegistration"> + <soap:fault name="InvalidRegistration" use="literal"/> + </wsdl:fault> + <wsdl:fault name="InvalidUserCategory"> + <soap:fault name="InvalidUserCategory" use="literal"/> + </wsdl:fault> + <wsdl:fault name="MissingParameters"> + <soap:fault name="MissingParameters" use="literal"/> + </wsdl:fault> + <wsdl:fault name="ModifyRegistrationRequired"> + <soap:fault name="ModifyRegistrationRequired" use="literal"/> + </wsdl:fault> + <wsdl:fault name="OperationFailed"> + <soap:fault name="OperationFailed" use="literal"/> + </wsdl:fault> + <wsdl:fault name="OperationNotSupported"> + <soap:fault name="OperationNotSupported" use="literal"/> + </wsdl:fault> + <wsdl:fault name="ResourceSuspended"> + <soap:fault name="ResourceSuspended" use="literal"/> + </wsdl:fault> + </wsdl:operation> + + <wsdl:operation name="clonePortlet"> + <soap:operation soapAction="urn:oasis:names:tc:wsrp:v2:clonePortlet"/> + <wsdl:input name="clonePortlet"> + <soap:body use="literal"/> + </wsdl:input> + <wsdl:output name="clonePortletResponse"> + <soap:body use="literal"/> + </wsdl:output> + <wsdl:fault name="AccessDenied"> + <soap:fault name="AccessDenied" use="literal"/> + </wsdl:fault> + <wsdl:fault name="InconsistentParameters"> + <soap:fault name="InconsistentParameters" use="literal"/> + </wsdl:fault> + <wsdl:fault name="InvalidHandle"> + <soap:fault name="InvalidHandle" use="literal"/> + </wsdl:fault> + <wsdl:fault name="InvalidRegistration"> + <soap:fault name="InvalidRegistration" use="literal"/> + </wsdl:fault> + <wsdl:fault name="InvalidUserCategory"> + <soap:fault name="InvalidUserCategory" use="literal"/> + </wsdl:fault> + <wsdl:fault name="MissingParameters"> + <soap:fault name="MissingParameters" use="literal"/> + </wsdl:fault> + <wsdl:fault name="ModifyRegistrationRequired"> + <soap:fault name="ModifyRegistrationRequired" use="literal"/> + </wsdl:fault> + <wsdl:fault name="OperationFailed"> + <soap:fault name="OperationFailed" use="literal"/> + </wsdl:fault> + <wsdl:fault name="OperationNotSupported"> + <soap:fault name="OperationNotSupported" use="literal"/> + </wsdl:fault> + <wsdl:fault name="ResourceSuspended"> + <soap:fault name="ResourceSuspended" use="literal"/> + </wsdl:fault> + </wsdl:operation> + + <wsdl:operation name="destroyPortlets"> + <soap:operation soapAction="urn:oasis:names:tc:wsrp:v2:destroyPortlets"/> + <wsdl:input name="destroyPortlets"> + <soap:body use="literal"/> + </wsdl:input> + <wsdl:output name="destroyPortletsResponse"> + <soap:body use="literal"/> + </wsdl:output> + <wsdl:fault name="InconsistentParameters"> + <soap:fault name="InconsistentParameters" use="literal"/> + </wsdl:fault> + <wsdl:fault name="InvalidRegistration"> + <soap:fault name="InvalidRegistration" use="literal"/> + </wsdl:fault> + <wsdl:fault name="MissingParameters"> + <soap:fault name="MissingParameters" use="literal"/> + </wsdl:fault> + <wsdl:fault name="ModifyRegistrationRequired"> + <soap:fault name="ModifyRegistrationRequired" use="literal"/> + </wsdl:fault> + <wsdl:fault name="OperationFailed"> + <soap:fault name="OperationFailed" use="literal"/> + </wsdl:fault> + <wsdl:fault name="OperationNotSupported"> + <soap:fault name="OperationNotSupported" use="literal"/> + </wsdl:fault> + <wsdl:fault name="ResourceSuspended"> + <soap:fault name="ResourceSuspended" use="literal"/> + </wsdl:fault> + </wsdl:operation> + + <wsdl:operation name="getPortletsLifetime"> + <soap:operation soapAction="urn:oasis:names:tc:wsrp:v2:getPortletsLifetime"/> + <wsdl:input name="getPortletsLifetime"> + <soap:body use="literal"/> + </wsdl:input> + <wsdl:output name="getPortletsLifetimeResponse"> + <soap:body use="literal"/> + </wsdl:output> + <wsdl:fault name="AccessDenied"> + <soap:fault name="AccessDenied" use="literal"/> + </wsdl:fault> + <wsdl:fault name="InconsistentParameters"> + <soap:fault name="InconsistentParameters" use="literal"/> + </wsdl:fault> + <wsdl:fault name="InvalidHandle"> + <soap:fault name="InvalidHandle" use="literal"/> + </wsdl:fault> + <wsdl:fault name="InvalidRegistration"> + <soap:fault name="InvalidRegistration" use="literal"/> + </wsdl:fault> + <wsdl:fault name="ModifyRegistrationRequired"> + <soap:fault name="ModifyRegistrationRequired" use="literal"/> + </wsdl:fault> + <wsdl:fault name="OperationFailed"> + <soap:fault name="OperationFailed" use="literal"/> + </wsdl:fault> + <wsdl:fault name="OperationNotSupported"> + <soap:fault name="OperationNotSupported" use="literal"/> + </wsdl:fault> + <wsdl:fault name="ResourceSuspended"> + <soap:fault name="ResourceSuspended" use="literal"/> + </wsdl:fault> + </wsdl:operation> + + <wsdl:operation name="setPortletsLifetime"> + <soap:operation soapAction="urn:oasis:names:tc:wsrp:v2:setPortletsLifetime"/> + <wsdl:input name="setPortletsLifetime"> + <soap:body use="literal"/> + </wsdl:input> + <wsdl:output name="setPortletsLifetimeResponse"> + <soap:body use="literal"/> + </wsdl:output> + <wsdl:fault name="AccessDenied"> + <soap:fault name="AccessDenied" use="literal"/> + </wsdl:fault> + <wsdl:fault name="InconsistentParameters"> + <soap:fault name="InconsistentParameters" use="literal"/> + </wsdl:fault> + <wsdl:fault name="InvalidHandle"> + <soap:fault name="InvalidHandle" use="literal"/> + </wsdl:fault> + <wsdl:fault name="InvalidRegistration"> + <soap:fault name="InvalidRegistration" use="literal"/> + </wsdl:fault> + <wsdl:fault name="ModifyRegistrationRequired"> + <soap:fault name="ModifyRegistrationRequired" use="literal"/> + </wsdl:fault> + <wsdl:fault name="OperationFailed"> + <soap:fault name="OperationFailed" use="literal"/> + </wsdl:fault> + <wsdl:fault name="OperationNotSupported"> + <soap:fault name="OperationNotSupported" use="literal"/> + </wsdl:fault> + <wsdl:fault name="ResourceSuspended"> + <soap:fault name="ResourceSuspended" use="literal"/> + </wsdl:fault> + </wsdl:operation> + + <wsdl:operation name="copyPortlets"> + <soap:operation soapAction="urn:oasis:names:tc:wsrp:v2:copyPortlets"/> + <wsdl:input name="copyPortlets"> + <soap:body use="literal"/> + </wsdl:input> + <wsdl:output name="copyPortletsResponse"> + <soap:body use="literal"/> + </wsdl:output> + <wsdl:fault name="AccessDenied"> + <soap:fault name="AccessDenied" use="literal"/> + </wsdl:fault> + <wsdl:fault name="InconsistentParameters"> + <soap:fault name="InconsistentParameters" use="literal"/> + </wsdl:fault> + <wsdl:fault name="InvalidHandle"> + <soap:fault name="InvalidHandle" use="literal"/> + </wsdl:fault> + <wsdl:fault name="InvalidRegistration"> + <soap:fault name="InvalidRegistration" use="literal"/> + </wsdl:fault> + <wsdl:fault name="InvalidUserCategory"> + <soap:fault name="InvalidUserCategory" use="literal"/> + </wsdl:fault> + <wsdl:fault name="MissingParameters"> + <soap:fault name="MissingParameters" use="literal"/> + </wsdl:fault> + <wsdl:fault name="ModifyRegistrationRequired"> + <soap:fault name="ModifyRegistrationRequired" use="literal"/> + </wsdl:fault> + <wsdl:fault name="OperationFailed"> + <soap:fault name="OperationFailed" use="literal"/> + </wsdl:fault> + <wsdl:fault name="OperationNotSupported"> + <soap:fault name="OperationNotSupported" use="literal"/> + </wsdl:fault> + <wsdl:fault name="ResourceSuspended"> + <soap:fault name="ResourceSuspended" use="literal"/> + </wsdl:fault> + </wsdl:operation> + + <wsdl:operation name="exportPortlets"> + <soap:operation soapAction="urn:oasis:names:tc:wsrp:v2:exportPortlet"/> + <wsdl:input name="exportPortlets"> + <soap:body use="literal"/> + </wsdl:input> + <wsdl:output name="exportPortletsResponse"> + <soap:body use="literal"/> + </wsdl:output> + <wsdl:fault name="AccessDenied"> + <soap:fault name="AccessDenied" use="literal"/> + </wsdl:fault> + <wsdl:fault name="InconsistentParameters"> + <soap:fault name="InconsistentParameters" use="literal"/> + </wsdl:fault> + <wsdl:fault name="InvalidHandle"> + <soap:fault name="InvalidHandle" use="literal"/> + </wsdl:fault> + <wsdl:fault name="InvalidRegistration"> + <soap:fault name="InvalidRegistration" use="literal"/> + </wsdl:fault> + <wsdl:fault name="InvalidUserCategory"> + <soap:fault name="InvalidUserCategory" use="literal"/> + </wsdl:fault> + <wsdl:fault name="MissingParameters"> + <soap:fault name="MissingParameters" use="literal"/> + </wsdl:fault> + <wsdl:fault name="ModifyRegistrationRequired"> + <soap:fault name="ModifyRegistrationRequired" use="literal"/> + </wsdl:fault> + <wsdl:fault name="OperationFailed"> + <soap:fault name="OperationFailed" use="literal"/> + </wsdl:fault> + <wsdl:fault name="OperationNotSupported"> + <soap:fault name="OperationNotSupported" use="literal"/> + </wsdl:fault> + <wsdl:fault name="ResourceSuspended"> + <soap:fault name="ResourceSuspended" use="literal"/> + </wsdl:fault> + <wsdl:fault name="ExportByValueNotSupported"> + <soap:fault name="ExportByValueNotSupported" use="literal"/> + </wsdl:fault> + </wsdl:operation> + + <wsdl:operation name="importPortlets"> + <soap:operation soapAction="urn:oasis:names:tc:wsrp:v2:importPortlet"/> + <wsdl:input name="importPortlets"> + <soap:body use="literal"/> + </wsdl:input> + <wsdl:output name="importPortletsResponse"> + <soap:body use="literal"/> + </wsdl:output> + <wsdl:fault name="AccessDenied"> + <soap:fault name="AccessDenied" use="literal"/> + </wsdl:fault> + <wsdl:fault name="InconsistentParameters"> + <soap:fault name="InconsistentParameters" use="literal"/> + </wsdl:fault> + <wsdl:fault name="InvalidRegistration"> + <soap:fault name="InvalidRegistration" use="literal"/> + </wsdl:fault> + <wsdl:fault name="InvalidUserCategory"> + <soap:fault name="InvalidUserCategory" use="literal"/> + </wsdl:fault> + <wsdl:fault name="MissingParameters"> + <soap:fault name="MissingParameters" use="literal"/> + </wsdl:fault> + <wsdl:fault name="ModifyRegistrationRequired"> + <soap:fault name="ModifyRegistrationRequired" use="literal"/> + </wsdl:fault> + <wsdl:fault name="OperationFailed"> + <soap:fault name="OperationFailed" use="literal"/> + </wsdl:fault> + <wsdl:fault name="OperationNotSupported"> + <soap:fault name="OperationNotSupported" use="literal"/> + </wsdl:fault> + <wsdl:fault name="ResourceSuspended"> + <soap:fault name="ResourceSuspended" use="literal"/> + </wsdl:fault> + <wsdl:fault name="ExportNoLongerValid"> + <soap:fault name="ExportNoLongerValid" use="literal"/> + </wsdl:fault> + </wsdl:operation> + + <wsdl:operation name="releaseExport"> + <soap:operation soapAction="urn:oasis:names:tc:wsrp:v2:importPortlet"/> + <wsdl:input name="releaseExport"> + <soap:body use="literal"/> + </wsdl:input> + <wsdl:output name="releaseExportResponse"> + <soap:body use="literal"/> + </wsdl:output> + </wsdl:operation> + + <wsdl:operation name="setExportLifetime"> + <soap:operation soapAction="urn:oasis:names:tc:wsrp:v2:setExportLifetime"/> + <wsdl:input name="setExportLifetime"> + <soap:body use="literal"/> + </wsdl:input> + <wsdl:output name="setExportLifetimeResponse"> + <soap:body use="literal"/> + </wsdl:output> + <wsdl:fault name="AccessDenied"> + <soap:fault name="AccessDenied" use="literal"/> + </wsdl:fault> + <wsdl:fault name="InvalidHandle"> + <soap:fault name="InvalidHandle" use="literal"/> + </wsdl:fault> + <wsdl:fault name="InvalidRegistration"> + <soap:fault name="InvalidRegistration" use="literal"/> + </wsdl:fault> + <wsdl:fault name="ModifyRegistrationRequired"> + <soap:fault name="ModifyRegistrationRequired" use="literal"/> + </wsdl:fault> + <wsdl:fault name="OperationFailed"> + <soap:fault name="OperationFailed" use="literal"/> + </wsdl:fault> + <wsdl:fault name="OperationNotSupported"> + <soap:fault name="OperationNotSupported" use="literal"/> + </wsdl:fault> + <wsdl:fault name="ResourceSuspended"> + <soap:fault name="ResourceSuspended" use="literal"/> + </wsdl:fault> + </wsdl:operation> + + <wsdl:operation name="setPortletProperties"> + <soap:operation soapAction="urn:oasis:names:tc:wsrp:v2:setPortletProperties"/> + <wsdl:input name="setPortletProperties"> + <soap:body use="literal"/> + </wsdl:input> + <wsdl:output name="setPortletPropertiesResponse"> + <soap:body use="literal"/> + </wsdl:output> + <wsdl:fault name="AccessDenied"> + <soap:fault name="AccessDenied" use="literal"/> + </wsdl:fault> + <wsdl:fault name="InconsistentParameters"> + <soap:fault name="InconsistentParameters" use="literal"/> + </wsdl:fault> + <wsdl:fault name="InvalidHandle"> + <soap:fault name="InvalidHandle" use="literal"/> + </wsdl:fault> + <wsdl:fault name="InvalidRegistration"> + <soap:fault name="InvalidRegistration" use="literal"/> + </wsdl:fault> + <wsdl:fault name="InvalidUserCategory"> + <soap:fault name="InvalidUserCategory" use="literal"/> + </wsdl:fault> + <wsdl:fault name="MissingParameters"> + <soap:fault name="MissingParameters" use="literal"/> + </wsdl:fault> + <wsdl:fault name="ModifyRegistrationRequired"> + <soap:fault name="ModifyRegistrationRequired" use="literal"/> + </wsdl:fault> + <wsdl:fault name="OperationFailed"> + <soap:fault name="OperationFailed" use="literal"/> + </wsdl:fault> + <wsdl:fault name="OperationNotSupported"> + <soap:fault name="OperationNotSupported" use="literal"/> + </wsdl:fault> + <wsdl:fault name="ResourceSuspended"> + <soap:fault name="ResourceSuspended" use="literal"/> + </wsdl:fault> + </wsdl:operation> + + <wsdl:operation name="getPortletProperties"> + <soap:operation soapAction="urn:oasis:names:tc:wsrp:v2:getPortletProperties"/> + <wsdl:input name="getPortletProperties"> + <soap:body use="literal"/> + </wsdl:input> + <wsdl:output name="getPortletPropertiesResponse"> + <soap:body use="literal"/> + </wsdl:output> + <wsdl:fault name="AccessDenied"> + <soap:fault name="AccessDenied" use="literal"/> + </wsdl:fault> + <wsdl:fault name="InconsistentParameters"> + <soap:fault name="InconsistentParameters" use="literal"/> + </wsdl:fault> + <wsdl:fault name="InvalidHandle"> + <soap:fault name="InvalidHandle" use="literal"/> + </wsdl:fault> + <wsdl:fault name="InvalidRegistration"> + <soap:fault name="InvalidRegistration" use="literal"/> + </wsdl:fault> + <wsdl:fault name="InvalidUserCategory"> + <soap:fault name="InvalidUserCategory" use="literal"/> + </wsdl:fault> + <wsdl:fault name="MissingParameters"> + <soap:fault name="MissingParameters" use="literal"/> + </wsdl:fault> + <wsdl:fault name="ModifyRegistrationRequired"> + <soap:fault name="ModifyRegistrationRequired" use="literal"/> + </wsdl:fault> + <wsdl:fault name="OperationFailed"> + <soap:fault name="OperationFailed" use="literal"/> + </wsdl:fault> + <wsdl:fault name="OperationNotSupported"> + <soap:fault name="OperationNotSupported" use="literal"/> + </wsdl:fault> + <wsdl:fault name="ResourceSuspended"> + <soap:fault name="ResourceSuspended" use="literal"/> + </wsdl:fault> + </wsdl:operation> + + <wsdl:operation name="getPortletPropertyDescription"> + <soap:operation soapAction="urn:oasis:names:tc:wsrp:v2:getPortletPropertyDescription"/> + <wsdl:input name="getPortletPropertyDescription"> + <soap:body use="literal"/> + </wsdl:input> + <wsdl:output name="getPortletPropertyDescriptionResponse"> + <soap:body use="literal"/> + </wsdl:output> + <wsdl:fault name="AccessDenied"> + <soap:fault name="AccessDenied" use="literal"/> + </wsdl:fault> + <wsdl:fault name="InconsistentParameters"> + <soap:fault name="InconsistentParameters" use="literal"/> + </wsdl:fault> + <wsdl:fault name="InvalidHandle"> + <soap:fault name="InvalidHandle" use="literal"/> + </wsdl:fault> + <wsdl:fault name="InvalidRegistration"> + <soap:fault name="InvalidRegistration" use="literal"/> + </wsdl:fault> + <wsdl:fault name="InvalidUserCategory"> + <soap:fault name="InvalidUserCategory" use="literal"/> + </wsdl:fault> + <wsdl:fault name="MissingParameters"> + <soap:fault name="MissingParameters" use="literal"/> + </wsdl:fault> + <wsdl:fault name="ModifyRegistrationRequired"> + <soap:fault name="ModifyRegistrationRequired" use="literal"/> + </wsdl:fault> + <wsdl:fault name="OperationFailed"> + <soap:fault name="OperationFailed" use="literal"/> + </wsdl:fault> + <wsdl:fault name="OperationNotSupported"> + <soap:fault name="OperationNotSupported" use="literal"/> + </wsdl:fault> + <wsdl:fault name="ResourceSuspended"> + <soap:fault name="ResourceSuspended" use="literal"/> + </wsdl:fault> + </wsdl:operation> + </wsdl:binding> + + <wsdl:binding name="WSRP_v2_Registration_Binding_SOAP" type="intf:WSRP_v2_Registration_PortType"> + <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> + + <wsdl:operation name="register"> + <soap:operation soapAction="urn:oasis:names:tc:wsrp:v2:register"/> + <wsdl:input name="register"> + <soap:body use="literal"/> + </wsdl:input> + <wsdl:output name="registerResponse"> + <soap:body use="literal"/> + </wsdl:output> + <wsdl:fault name="MissingParameters"> + <soap:fault name="MissingParameters" use="literal"/> + </wsdl:fault> + <wsdl:fault name="OperationFailed"> + <soap:fault name="OperationFailed" use="literal"/> + </wsdl:fault> + <wsdl:fault name="OperationNotSupported"> + <soap:fault name="OperationNotSupported" use="literal"/> + </wsdl:fault> + </wsdl:operation> + + <wsdl:operation name="deregister"> + <soap:operation soapAction="urn:oasis:names:tc:wsrp:v2:deregister"/> + <wsdl:input name="deregister"> + <soap:body use="literal"/> + </wsdl:input> + <wsdl:output name="deregisterResponse"> + <soap:body use="literal"/> + </wsdl:output> + <wsdl:fault name="InvalidRegistration"> + <soap:fault name="InvalidRegistration" use="literal"/> + </wsdl:fault> + <wsdl:fault name="OperationFailed"> + <soap:fault name="OperationFailed" use="literal"/> + </wsdl:fault> + <wsdl:fault name="OperationNotSupported"> + <soap:fault name="OperationNotSupported" use="literal"/> + </wsdl:fault> + <wsdl:fault name="ResourceSuspended"> + <soap:fault name="ResourceSuspended" use="literal"/> + </wsdl:fault> + </wsdl:operation> + + <wsdl:operation name="modifyRegistration"> + <soap:operation soapAction="urn:oasis:names:tc:wsrp:v2:modifyRegistration"/> + <wsdl:input name="modifyRegistration"> + <soap:body use="literal"/> + </wsdl:input> + <wsdl:output name="modifyRegistrationResponse"> + <soap:body use="literal"/> + </wsdl:output> + <wsdl:fault name="InvalidRegistration"> + <soap:fault name="InvalidRegistration" use="literal"/> + </wsdl:fault> + <wsdl:fault name="MissingParameters"> + <soap:fault name="MissingParameters" use="literal"/> + </wsdl:fault> + <wsdl:fault name="OperationFailed"> + <soap:fault name="OperationFailed" use="literal"/> + </wsdl:fault> + <wsdl:fault name="OperationNotSupported"> + <soap:fault name="OperationNotSupported" use="literal"/> + </wsdl:fault> + <wsdl:fault name="ResourceSuspended"> + <soap:fault name="ResourceSuspended" use="literal"/> + </wsdl:fault> + </wsdl:operation> + + <wsdl:operation name="getRegistrationLifetime"> + <soap:operation soapAction="urn:oasis:names:tc:wsrp:v2:getRegistrationLifetime"/> + <wsdl:input name="getRegistrationLifetime"> + <soap:body use="literal"/> + </wsdl:input> + <wsdl:output name="getRegistrationLifetimeResponse"> + <soap:body use="literal"/> + </wsdl:output> + <wsdl:fault name="AccessDenied"> + <soap:fault name="AccessDenied" use="literal"/> + </wsdl:fault> + <wsdl:fault name="InvalidHandle"> + <soap:fault name="InvalidHandle" use="literal"/> + </wsdl:fault> + <wsdl:fault name="InvalidRegistration"> + <soap:fault name="InvalidRegistration" use="literal"/> + </wsdl:fault> + <wsdl:fault name="ModifyRegistrationRequired"> + <soap:fault name="ModifyRegistrationRequired" use="literal"/> + </wsdl:fault> + <wsdl:fault name="OperationFailed"> + <soap:fault name="OperationFailed" use="literal"/> + </wsdl:fault> + <wsdl:fault name="OperationNotSupported"> + <soap:fault name="OperationNotSupported" use="literal"/> + </wsdl:fault> + <wsdl:fault name="ResourceSuspended"> + <soap:fault name="ResourceSuspended" use="literal"/> + </wsdl:fault> + </wsdl:operation> + + <wsdl:operation name="setRegistrationLifetime"> + <soap:operation soapAction="urn:oasis:names:tc:wsrp:v2:setRegistrationLifetime"/> + <wsdl:input name="setRegistrationLifetime"> + <soap:body use="literal"/> + </wsdl:input> + <wsdl:output name="setRegistrationLifetimeResponse"> + <soap:body use="literal"/> + </wsdl:output> + <wsdl:fault name="AccessDenied"> + <soap:fault name="AccessDenied" use="literal"/> + </wsdl:fault> + <wsdl:fault name="InvalidHandle"> + <soap:fault name="InvalidHandle" use="literal"/> + </wsdl:fault> + <wsdl:fault name="InvalidRegistration"> + <soap:fault name="InvalidRegistration" use="literal"/> + </wsdl:fault> + <wsdl:fault name="ModifyRegistrationRequired"> + <soap:fault name="ModifyRegistrationRequired" use="literal"/> + </wsdl:fault> + <wsdl:fault name="OperationFailed"> + <soap:fault name="OperationFailed" use="literal"/> + </wsdl:fault> + <wsdl:fault name="OperationNotSupported"> + <soap:fault name="OperationNotSupported" use="literal"/> + </wsdl:fault> + <wsdl:fault name="ResourceSuspended"> + <soap:fault name="ResourceSuspended" use="literal"/> + </wsdl:fault> + </wsdl:operation> + </wsdl:binding> + +</wsdl:definitions> Copied: components/wsrp/trunk/consumer/src/test/resources/wsdl/wsrp-2.0-extra.xsd (from rev 5270, components/wsrp/trunk/wsrp-producer-war/src/main/webapp/WEB-INF/wsdl/wsrp-2.0-extra.xsd) =================================================================== --- components/wsrp/trunk/consumer/src/test/resources/wsdl/wsrp-2.0-extra.xsd (rev 0) +++ components/wsrp/trunk/consumer/src/test/resources/wsdl/wsrp-2.0-extra.xsd 2010-11-25 16:30:36 UTC (rev 5274) @@ -0,0 +1,97 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<schema targetNamespace="urn:oasis:names:tc:wsrp:extra" + xmlns:wsrp-extra="urn:oasis:names:tc:wsrp:extra" + xmlns:wsrpv2="urn:oasis:names:tc:wsrp:v2:types" + + xmlns="http://www.w3.org/2001/XMLSchema" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + + elementFormDefault="qualified"> + + + <import namespace="urn:oasis:names:tc:wsrp:v2:types" schemaLocation="wsrp-2.0-types.xsd"/> + +  + + <complexType name="QNamedString"> + <attribute name="qname" type="xsd:QName" use="required"/> + <attribute name="value" type="xsd:string" use="optional"/> +  + <anyAttribute/> + </complexType> + <element name="QNamedString" type="wsrp-extra:QNamedString"/> + + <complexType name="QNamedStringArray"> + <sequence> + <element name="QNamedString" type="wsrp-extra:QNamedString" minOccurs="0" maxOccurs="unbounded"/> + </sequence> + <anyAttribute/> + </complexType> + <element name="QNamedStringArray" type="wsrp-extra:QNamedStringArray"/> + + <complexType name="QNamedMultiValue"> + <sequence> + <element name="value" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/> + </sequence> + <attribute name="qname" type="xsd:QName" use="required"/> +  + <anyAttribute/> + </complexType> + <element name="QNamedMultiValue" type="wsrp-extra:QNamedMultiValue"/> + + <complexType name="QNamedMultiValueArray"> + <sequence> + <element name="QNamedMultiValue" type="wsrp-extra:QNamedMultiValue" minOccurs="0" maxOccurs="unbounded"/> + </sequence> + <anyAttribute/> + </complexType> + <element name="QNamedMultiValueArray" type="wsrp-extra:QNamedMultiValueArray"/> + + <complexType name="NamedMultiValue"> + <sequence> + <element name="value" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/> + </sequence> + <attribute name="name" type="xsd:string" use="required"/> + </complexType> + <element name="NamedMultiValue" type="wsrp-extra:NamedMultiValue"/> + + <complexType name="NamedMultiValueArray"> + <sequence> + <element name="NamedMultiValue" type="wsrp-extra:NamedMultiValue" minOccurs="0" maxOccurs="unbounded"/> + </sequence> + <anyAttribute/> + </complexType> + <element name="NamedMultiValueArray" type="wsrp-extra:NamedMultiValueArray"/> + +  + <element name="doctype" type="wsrp-extra:QNamedString"/> + + <element name="extendedURLParameters" type="wsrpv2:NamedStringArray"/> + + <element name="sharedResource" type="xsd:string"/> +  + +</schema> Copied: components/wsrp/trunk/consumer/src/test/resources/wsdl/wsrp-2.0-interfaces.wsdl (from rev 5270, components/wsrp/trunk/wsrp-producer-war/src/main/webapp/WEB-INF/wsdl/wsrp-2.0-interfaces.wsdl) =================================================================== --- components/wsrp/trunk/consumer/src/test/resources/wsdl/wsrp-2.0-interfaces.wsdl (rev 0) +++ components/wsrp/trunk/consumer/src/test/resources/wsdl/wsrp-2.0-interfaces.wsdl 2010-11-25 16:30:36 UTC (rev 5274) @@ -0,0 +1,662 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<wsdl:definitions targetNamespace="urn:oasis:names:tc:wsrp:v2:intf" + xmlns:types="urn:oasis:names:tc:wsrp:v2:types" + xmlns:intf="urn:oasis:names:tc:wsrp:v2:intf" + + xmlns="http://schemas.xmlsoap.org/wsdl/" + + xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + > + +  + + <wsdl:types> + <schema targetNamespace="urn:oasis:names:tc:wsrp:v2:intf" + xmlns="http://www.w3.org/2001/XMLSchema" + elementFormDefault="qualified"> + + <import namespace="urn:oasis:names:tc:wsrp:v2:types" schemaLocation="wsrp-2.0-types.xsd"/> + + </schema> + </wsdl:types> + + +  +  +  + + <wsdl:message name="AccessDenied"> + <wsdl:part name="fault" element="types:AccessDenied"/> + </wsdl:message> + + <wsdl:message name="InconsistentParameters"> + <wsdl:part name="fault" element="types:InconsistentParameters"/> + </wsdl:message> + + <wsdl:message name="InvalidCookie"> + <wsdl:part name="fault" element="types:InvalidCookie"/> + </wsdl:message> + + <wsdl:message name="InvalidHandle"> + <wsdl:part name="fault" element="types:InvalidHandle"/> + </wsdl:message> + + <wsdl:message name="InvalidRegistration"> + <wsdl:part name="fault" element="types:InvalidRegistration"/> + </wsdl:message> + + <wsdl:message name="InvalidSession"> + <wsdl:part name="fault" element="types:InvalidSession"/> + </wsdl:message> + + <wsdl:message name="InvalidUserCategory"> + <wsdl:part name="fault" element="types:InvalidUserCategory"/> + </wsdl:message> + + <wsdl:message name="ModifyRegistrationRequired"> + <wsdl:part name="fault" element="types:ModifyRegistrationRequired"/> + </wsdl:message> + + <wsdl:message name="MissingParameters"> + <wsdl:part name="fault" element="types:MissingParameters"/> + </wsdl:message> + + <wsdl:message name="OperationFailed"> + <wsdl:part name="fault" element="types:OperationFailed"/> + </wsdl:message> + + <wsdl:message name="OperationNotSupported"> + <wsdl:part name="fault" element="types:OperationNotSupported"/> + </wsdl:message> + + <wsdl:message name="PortletStateChangeRequired"> + <wsdl:part name="fault" element="types:PortletStateChangeRequired"/> + </wsdl:message> + + <wsdl:message name="ResourceSuspended"> + <wsdl:part name="fault" element="types:ResourceSuspended"/> + </wsdl:message> + + <wsdl:message name="UnsupportedMode"> + <wsdl:part name="fault" element="types:UnsupportedMode"/> + </wsdl:message> + + <wsdl:message name="UnsupportedLocale"> + <wsdl:part name="fault" element="types:UnsupportedLocale"/> + </wsdl:message> + + <wsdl:message name="UnsupportedMimeType"> + <wsdl:part name="fault" element="types:UnsupportedMimeType"/> + </wsdl:message> + + <wsdl:message name="UnsupportedWindowState"> + <wsdl:part name="fault" element="types:UnsupportedWindowState"/> + </wsdl:message> + + <wsdl:message name="ExportByValueNotSupported"> + <wsdl:part name="fault" element="types:ExportByValueNotSupported"/> + </wsdl:message> + + <wsdl:message name="ExportNoLongerValid"> + <wsdl:part name="fault" element="types:ExportNoLongerValid"/> + </wsdl:message> + + +  +  +  + + <wsdl:message name="getMarkup"> + <wsdl:part name="getMarkup" element="types:getMarkup"/> + </wsdl:message> + <wsdl:message name="getMarkupResponse"> + <wsdl:part name="getMarkupResponse" element="types:getMarkupResponse"/> + </wsdl:message> + + <wsdl:message name="getResource"> + <wsdl:part name="getResource" element="types:getResource"/> + </wsdl:message> + <wsdl:message name="getResourceResponse"> + <wsdl:part name="getResourceResponse" element="types:getResourceResponse"/> + </wsdl:message> + + <wsdl:message name="performBlockingInteraction"> + <wsdl:part name="performBlockingInteraction" element="types:performBlockingInteraction"/> + </wsdl:message> + <wsdl:message name="performBlockingInteractionResponse"> + <wsdl:part name="performBlockingInteractionResponse" element="types:performBlockingInteractionResponse"/> + </wsdl:message> + + <wsdl:message name="handleEvents"> + <wsdl:part name="handleEvents" element="types:handleEvents"/> + </wsdl:message> + <wsdl:message name="handleEventsResponse"> + <wsdl:part name="handleEventsResponse" element="types:handleEventsResponse"/> + </wsdl:message> + + <wsdl:message name="getServiceDescription"> + <wsdl:part name="getServiceDescription" element="types:getServiceDescription"/> + </wsdl:message> + <wsdl:message name="getServiceDescriptionResponse"> + <wsdl:part name="getServiceDescriptionResponse" element="types:getServiceDescriptionResponse"/> + </wsdl:message> + + <wsdl:message name="register"> + <wsdl:part name="register" element="types:register"/> + </wsdl:message> + <wsdl:message name="registerResponse"> + <wsdl:part name="registerResponse" element="types:registerResponse"/> + </wsdl:message> + + <wsdl:message name="deregister"> + <wsdl:part name="deregister" element="types:deregister"/> + </wsdl:message> + <wsdl:message name="deregisterResponse"> + <wsdl:part name="deregisterResponse" element="types:deregisterResponse"/> + </wsdl:message> + + <wsdl:message name="modifyRegistration"> + <wsdl:part name="modifyRegistration" element="types:modifyRegistration"/> + </wsdl:message> + <wsdl:message name="modifyRegistrationResponse"> + <wsdl:part name="modifyRegistrationResponse" element="types:modifyRegistrationResponse"/> + </wsdl:message> + + <wsdl:message name="getPortletDescription"> + <wsdl:part name="getPortletDescription" element="types:getPortletDescription"/> + </wsdl:message> + <wsdl:message name="getPortletDescriptionResponse"> + <wsdl:part name="getPortletDescriptionResponse" element="types:getPortletDescriptionResponse"/> + </wsdl:message> + + <wsdl:message name="clonePortlet"> + <wsdl:part name="clonePortlet" element="types:clonePortlet"/> + </wsdl:message> + <wsdl:message name="clonePortletResponse"> + <wsdl:part name="clonePortletResponse" element="types:clonePortletResponse"/> + </wsdl:message> + + <wsdl:message name="destroyPortlets"> + <wsdl:part name="destroyPortlets" element="types:destroyPortlets"/> + </wsdl:message> + <wsdl:message name="destroyPortletsResponse"> + <wsdl:part name="destroyPortletsResponse" element="types:destroyPortletsResponse"/> + </wsdl:message> + + <wsdl:message name="setPortletProperties"> + <wsdl:part name="setPortletProperties" element="types:setPortletProperties"/> + </wsdl:message> + <wsdl:message name="setPortletPropertiesResponse"> + <wsdl:part name="setPortletPropertiesResponse" element="types:setPortletPropertiesResponse"/> + </wsdl:message> + + <wsdl:message name="getPortletProperties"> + <wsdl:part name="getPortletProperties" element="types:getPortletProperties"/> + </wsdl:message> + <wsdl:message name="getPortletPropertiesResponse"> + <wsdl:part name="getPortletPropertiesResponse" element="types:getPortletPropertiesResponse"/> + </wsdl:message> + + <wsdl:message name="getPortletPropertyDescription"> + <wsdl:part name="getPortletPropertyDescription" element="types:getPortletPropertyDescription"/> + </wsdl:message> + <wsdl:message name="getPortletPropertyDescriptionResponse"> + <wsdl:part name="getPortletPropertyDescriptionResponse" element="types:getPortletPropertyDescriptionResponse"/> + </wsdl:message> + + <wsdl:message name="releaseSessions"> + <wsdl:part name="releaseSessions" element="types:releaseSessions"/> + </wsdl:message> + <wsdl:message name="releaseSessionsResponse"> + <wsdl:part name="releaseSessionsResponse" element="types:releaseSessionsResponse"/> + </wsdl:message> + + <wsdl:message name="initCookie"> + <wsdl:part name="initCookie" element="types:initCookie"/> + </wsdl:message> + <wsdl:message name="initCookieResponse"> + <wsdl:part name="initCookieResponse" element="types:initCookieResponse"/> + </wsdl:message> + + <wsdl:message name="copyPortlets"> + <wsdl:part name="copyPortlets" element="types:copyPortlets"/> + </wsdl:message> + <wsdl:message name="copyPortletsResponse"> + <wsdl:part name="copyPortletsResponse" element="types:copyPortletsResponse"/> + </wsdl:message> + + <wsdl:message name="exportPortlets"> + <wsdl:part name="exportPortlets" element="types:exportPortlets"/> + </wsdl:message> + <wsdl:message name="exportPortletsResponse"> + <wsdl:part name="exportPortletsResponse" element="types:exportPortletsResponse"/> + </wsdl:message> + + <wsdl:message name="importPortlets"> + <wsdl:part name="importPortlets" element="types:importPortlets"/> + </wsdl:message> + <wsdl:message name="importPortletsResponse"> + <wsdl:part name="importPortletsResponse" element="types:importPortletsResponse"/> + </wsdl:message> + + <wsdl:message name="releaseExport"> + <wsdl:part name="releaseExport" element="types:releaseExport"/> + </wsdl:message> + <wsdl:message name="releaseExportResponse"> + <wsdl:part name="releaseExportResponse" element="types:releaseExportResponse"/> + </wsdl:message> + + <wsdl:message name="setExportLifetime"> + <wsdl:part name="setExportLifetime" element="types:setExportLifetime"/> + </wsdl:message> + <wsdl:message name="setExportLifetimeResponse"> + <wsdl:part name="setExportLifetimeResponse" element="types:setExportLifetimeResponse"/> + </wsdl:message> + + <wsdl:message name="getRegistrationLifetime"> + <wsdl:part name="getRegistrationLifetime" element="types:getRegistrationLifetime"/> + </wsdl:message> + <wsdl:message name="getRegistrationLifetimeResponse"> + <wsdl:part name="getRegistrationLifetimeResponse" element="types:getRegistrationLifetimeResponse"/> + </wsdl:message> + + <wsdl:message name="setRegistrationLifetime"> + <wsdl:part name="setRegistrationLifetime" element="types:setRegistrationLifetime"/> + </wsdl:message> + <wsdl:message name="setRegistrationLifetimeResponse"> + <wsdl:part name="setRegistrationLifetimeResponse" element="types:setRegistrationLifetimeResponse"/> + </wsdl:message> + + <wsdl:message name="getPortletsLifetime"> + <wsdl:part name="getPortletsLifetime" element="types:getPortletsLifetime"/> + </wsdl:message> + <wsdl:message name="getPortletsLifetimeResponse"> + <wsdl:part name="getPortletsLifetimeResponse" element="types:getPortletsLifetimeResponse"/> + </wsdl:message> + + <wsdl:message name="setPortletsLifetime"> + <wsdl:part name="setPortletsLifetime" element="types:setPortletsLifetime"/> + </wsdl:message> + <wsdl:message name="setPortletsLifetimeResponse"> + <wsdl:part name="setPortletsLifetimeResponse" element="types:setPortletsLifetimeResponse"/> + </wsdl:message> + + <wsdl:portType name="WSRP_v2_Markup_PortType"> + <wsdl:operation name="getMarkup"> + <wsdl:input message="intf:getMarkup" name="getMarkup"/> + <wsdl:output message="intf:getMarkupResponse" name="getMarkupResponse"/> + <wsdl:fault message="intf:AccessDenied" name="AccessDenied"/> + <wsdl:fault message="intf:InconsistentParameters" name="InconsistentParameters"/> + <wsdl:fault message="intf:InvalidCookie" name="InvalidCookie"/> + <wsdl:fault message="intf:InvalidHandle" name="InvalidHandle"/> + <wsdl:fault message="intf:InvalidRegistration" name="InvalidRegistration"/> + <wsdl:fault message="intf:InvalidSession" name="InvalidSession"/> + <wsdl:fault message="intf:InvalidUserCategory" name="InvalidUserCategory"/> + <wsdl:fault message="intf:MissingParameters" name="MissingParameters"/> + <wsdl:fault message="intf:ModifyRegistrationRequired" name="ModifyRegistrationRequired"/> + <wsdl:fault message="intf:OperationFailed" name="OperationFailed"/> + <wsdl:fault message="intf:ResourceSuspended" name="ResourceSuspended"/> + <wsdl:fault message="intf:UnsupportedLocale" name="UnsupportedLocale"/> + <wsdl:fault message="intf:UnsupportedMimeType" name="UnsupportedMimeType"/> + <wsdl:fault message="intf:UnsupportedMode" name="UnsupportedMode"/> + <wsdl:fault message="intf:UnsupportedWindowState" name="UnsupportedWindowState"/> + </wsdl:operation> + + <wsdl:operation name="getResource"> + <wsdl:input message="intf:getResource" name="getResource"/> + <wsdl:output message="intf:getResourceResponse" name="getResourceResponse"/> + <wsdl:fault message="intf:AccessDenied" name="AccessDenied"/> + <wsdl:fault message="intf:InconsistentParameters" name="InconsistentParameters"/> + <wsdl:fault message="intf:InvalidCookie" name="InvalidCookie"/> + <wsdl:fault message="intf:InvalidHandle" name="InvalidHandle"/> + <wsdl:fault message="intf:InvalidRegistration" name="InvalidRegistration"/> + <wsdl:fault message="intf:InvalidSession" name="InvalidSession"/> + <wsdl:fault message="intf:InvalidUserCategory" name="InvalidUserCategory"/> + <wsdl:fault message="intf:MissingParameters" name="MissingParameters"/> + <wsdl:fault message="intf:ModifyRegistrationRequired" name="ModifyRegistrationRequired"/> + <wsdl:fault message="intf:OperationFailed" name="OperationFailed"/> + <wsdl:fault message="intf:OperationNotSupported" name="OperationNotSupported"/> + <wsdl:fault message="intf:ResourceSuspended" name="ResourceSuspended"/> + <wsdl:fault message="intf:UnsupportedLocale" name="UnsupportedLocale"/> + <wsdl:fault message="intf:UnsupportedMimeType" name="UnsupportedMimeType"/> + <wsdl:fault message="intf:UnsupportedMode" name="UnsupportedMode"/> + <wsdl:fault message="intf:UnsupportedWindowState" name="UnsupportedWindowState"/> + </wsdl:operation> + + <wsdl:operation name="performBlockingInteraction"> + <wsdl:input message="intf:performBlockingInteraction" name="performBlockingInteraction"/> + <wsdl:output message="intf:performBlockingInteractionResponse" name="performBlockingInteractionResponse"/> + <wsdl:fault message="intf:AccessDenied" name="AccessDenied"/> + <wsdl:fault message="intf:InconsistentParameters" name="InconsistentParameters"/> + <wsdl:fault message="intf:InvalidCookie" name="InvalidCookie"/> + <wsdl:fault message="intf:InvalidHandle" name="InvalidHandle"/> + <wsdl:fault message="intf:InvalidRegistration" name="InvalidRegistration"/> + <wsdl:fault message="intf:InvalidSession" name="InvalidSession"/> + <wsdl:fault message="intf:InvalidUserCategory" name="InvalidUserCategory"/> + <wsdl:fault message="intf:MissingParameters" name="MissingParameters"/> + <wsdl:fault message="intf:ModifyRegistrationRequired" name="ModifyRegistrationRequired"/> + <wsdl:fault message="intf:OperationFailed" name="OperationFailed"/> + <wsdl:fault message="intf:PortletStateChangeRequired" name="PortletStateChangeRequired"/> + <wsdl:fault message="intf:ResourceSuspended" name="ResourceSuspended"/> + <wsdl:fault message="intf:UnsupportedLocale" name="UnsupportedLocale"/> + <wsdl:fault message="intf:UnsupportedMimeType" name="UnsupportedMimeType"/> + <wsdl:fault message="intf:UnsupportedMode" name="UnsupportedMode"/> + <wsdl:fault message="intf:UnsupportedWindowState" name="UnsupportedWindowState"/> + </wsdl:operation> + + <wsdl:operation name="handleEvents"> + <wsdl:input message="intf:handleEvents" name="handleEvents"/> + <wsdl:output message="intf:handleEventsResponse" name="handleEventsResponse"/> + <wsdl:fault message="intf:AccessDenied" name="AccessDenied"/> + <wsdl:fault message="intf:InconsistentParameters" name="InconsistentParameters"/> + <wsdl:fault message="intf:InvalidCookie" name="InvalidCookie"/> + <wsdl:fault message="intf:InvalidHandle" name="InvalidHandle"/> + <wsdl:fault message="intf:InvalidRegistration" name="InvalidRegistration"/> + <wsdl:fault message="intf:InvalidSession" name="InvalidSession"/> + <wsdl:fault message="intf:InvalidUserCategory" name="InvalidUserCategory"/> + <wsdl:fault message="intf:MissingParameters" name="MissingParameters"/> + <wsdl:fault message="intf:ModifyRegistrationRequired" name="ModifyRegistrationRequired"/> + <wsdl:fault message="intf:OperationFailed" name="OperationFailed"/> + <wsdl:fault message="intf:OperationNotSupported" name="OperationNotSupported"/> + <wsdl:fault message="intf:PortletStateChangeRequired" name="PortletStateChangeRequired"/> + <wsdl:fault message="intf:ResourceSuspended" name="ResourceSuspended"/> + <wsdl:fault message="intf:UnsupportedLocale" name="UnsupportedLocale"/> + <wsdl:fault message="intf:UnsupportedMimeType" name="UnsupportedMimeType"/> + <wsdl:fault message="intf:UnsupportedMode" name="UnsupportedMode"/> + <wsdl:fault message="intf:UnsupportedWindowState" name="UnsupportedWindowState"/> + </wsdl:operation> + + <wsdl:operation name="initCookie"> + <wsdl:input message="intf:initCookie" name="initCookie"/> + <wsdl:output message="intf:initCookieResponse" name="initCookieResponse"/> + <wsdl:fault message="intf:AccessDenied" name="AccessDenied"/> + <wsdl:fault message="intf:InvalidRegistration" name="InvalidRegistration"/> + <wsdl:fault message="intf:ModifyRegistrationRequired" name="ModifyRegistrationRequired"/> + <wsdl:fault message="intf:OperationFailed" name="OperationFailed"/> + <wsdl:fault message="intf:OperationNotSupported" name="OperationNotSupported"/> + <wsdl:fault message="intf:ResourceSuspended" name="ResourceSuspended"/> + </wsdl:operation> + + <wsdl:operation name="releaseSessions"> + <wsdl:input message="intf:releaseSessions" name="releaseSessions"/> + <wsdl:output message="intf:releaseSessionsResponse" name="releaseSessionsResponse"/> + <wsdl:fault message="intf:AccessDenied" name="AccessDenied"/> + <wsdl:fault message="intf:InvalidRegistration" name="InvalidRegistration"/> + <wsdl:fault message="intf:MissingParameters" name="MissingParameters"/> + <wsdl:fault message="intf:ModifyRegistrationRequired" name="ModifyRegistrationRequired"/> + <wsdl:fault message="intf:OperationFailed" name="OperationFailed"/> + <wsdl:fault message="intf:OperationNotSupported" name="OperationNotSupported"/> + <wsdl:fault message="intf:ResourceSuspended" name="ResourceSuspended"/> + </wsdl:operation> + + </wsdl:portType> + + <wsdl:portType name="WSRP_v2_ServiceDescription_PortType"> + <wsdl:operation name="getServiceDescription"> + <wsdl:input message="intf:getServiceDescription" name="getServiceDescription"/> + <wsdl:output message="intf:getServiceDescriptionResponse" name="getServiceDescriptionResponse"/> + <wsdl:fault message="intf:InvalidRegistration" name="InvalidRegistration"/> + <wsdl:fault message="intf:ModifyRegistrationRequired" name="ModifyRegistrationRequired"/> + <wsdl:fault message="intf:OperationFailed" name="OperationFailed"/> + <wsdl:fault message="intf:ResourceSuspended" name="ResourceSuspended"/> + </wsdl:operation> + </wsdl:portType> + + <wsdl:portType name="WSRP_v2_Registration_PortType"> + <wsdl:operation name="register"> + <wsdl:input message="intf:register" name="register"/> + <wsdl:output message="intf:registerResponse" name="registerResponse"/> + <wsdl:fault message="intf:MissingParameters" name="MissingParameters"/> + <wsdl:fault message="intf:OperationFailed" name="OperationFailed"/> + <wsdl:fault message="intf:OperationNotSupported" name="OperationNotSupported"/> + </wsdl:operation> + + <wsdl:operation name="deregister"> + <wsdl:input message="intf:deregister" name="deregister"/> + <wsdl:output message="intf:deregisterResponse" name="deregisterResponse"/> + <wsdl:fault message="intf:InvalidRegistration" name="InvalidRegistration"/> + <wsdl:fault message="intf:OperationFailed" name="OperationFailed"/> + <wsdl:fault message="intf:OperationNotSupported" name="OperationNotSupported"/> + <wsdl:fault message="intf:ResourceSuspended" name="ResourceSuspended"/> + </wsdl:operation> + + <wsdl:operation name="modifyRegistration"> + <wsdl:input message="intf:modifyRegistration" name="modifyRegistration"/> + <wsdl:output message="intf:modifyRegistrationResponse" name="modifyRegistrationResponse"/> + <wsdl:fault message="intf:InvalidRegistration" name="InvalidRegistration"/> + <wsdl:fault message="intf:MissingParameters" name="MissingParameters"/> + <wsdl:fault message="intf:OperationFailed" name="OperationFailed"/> + <wsdl:fault message="intf:OperationNotSupported" name="OperationNotSupported"/> + <wsdl:fault message="intf:ResourceSuspended" name="ResourceSuspended"/> + </wsdl:operation> + + <wsdl:operation name="getRegistrationLifetime"> + <wsdl:input message="intf:getRegistrationLifetime" name="getRegistrationLifetime"/> + <wsdl:output message="intf:getRegistrationLifetimeResponse" name="getRegistrationLifetimeResponse"/> + <wsdl:fault message="intf:AccessDenied" name="AccessDenied"/> + <wsdl:fault message="intf:InvalidHandle" name="InvalidHandle"/> + <wsdl:fault message="intf:InvalidRegistration" name="InvalidRegistration"/> + <wsdl:fault message="intf:ModifyRegistrationRequired" name="ModifyRegistrationRequired"/> + <wsdl:fault message="intf:OperationFailed" name="OperationFailed"/> + <wsdl:fault message="intf:OperationNotSupported" name="OperationNotSupported"/> + <wsdl:fault message="intf:ResourceSuspended" name="ResourceSuspended"/> + </wsdl:operation> + + <wsdl:operation name="setRegistrationLifetime"> + <wsdl:input message="intf:setRegistrationLifetime" name="setRegistrationLifetime"/> + <wsdl:output message="intf:setRegistrationLifetimeResponse" name="setRegistrationLifetimeResponse"/> + <wsdl:fault message="intf:AccessDenied" name="AccessDenied"/> + <wsdl:fault message="intf:InvalidHandle" name="InvalidHandle"/> + <wsdl:fault message="intf:InvalidRegistration" name="InvalidRegistration"/> + <wsdl:fault message="intf:ModifyRegistrationRequired" name="ModifyRegistrationRequired"/> + <wsdl:fault message="intf:OperationFailed" name="OperationFailed"/> + <wsdl:fault message="intf:OperationNotSupported" name="OperationNotSupported"/> + <wsdl:fault message="intf:ResourceSuspended" name="ResourceSuspended"/> + </wsdl:operation> + + </wsdl:portType> + + <wsdl:portType name="WSRP_v2_PortletManagement_PortType"> + <wsdl:operation name="getPortletDescription"> + <wsdl:input message="intf:getPortletDescription" name="getPortletDescription"/> + <wsdl:output message="intf:getPortletDescriptionResponse" name="getPortletDescriptionResponse"/> + <wsdl:fault message="intf:AccessDenied" name="AccessDenied"/> + <wsdl:fault message="intf:InconsistentParameters" name="InconsistentParameters"/> + <wsdl:fault message="intf:InvalidHandle" name="InvalidHandle"/> + <wsdl:fault message="intf:InvalidRegistration" name="InvalidRegistration"/> + <wsdl:fault message="intf:InvalidUserCategory" name="InvalidUserCategory"/> + <wsdl:fault message="intf:MissingParameters" name="MissingParameters"/> + <wsdl:fault message="intf:ModifyRegistrationRequired" name="ModifyRegistrationRequired"/> + <wsdl:fault message="intf:OperationFailed" name="OperationFailed"/> + <wsdl:fault message="intf:OperationNotSupported" name="OperationNotSupported"/> + <wsdl:fault message="intf:ResourceSuspended" name="ResourceSuspended"/> + </wsdl:operation> + + <wsdl:operation name="clonePortlet"> + <wsdl:input message="intf:clonePortlet" name="clonePortlet"/> + <wsdl:output message="intf:clonePortletResponse" name="clonePortletResponse"/> + <wsdl:fault message="intf:AccessDenied" name="AccessDenied"/> + <wsdl:fault message="intf:InconsistentParameters" name="InconsistentParameters"/> + <wsdl:fault message="intf:InvalidHandle" name="InvalidHandle"/> + <wsdl:fault message="intf:InvalidRegistration" name="InvalidRegistration"/> + <wsdl:fault message="intf:InvalidUserCategory" name="InvalidUserCategory"/> + <wsdl:fault message="intf:MissingParameters" name="MissingParameters"/> + <wsdl:fault message="intf:ModifyRegistrationRequired" name="ModifyRegistrationRequired"/> + <wsdl:fault message="intf:OperationFailed" name="OperationFailed"/> + <wsdl:fault message="intf:OperationNotSupported" name="OperationNotSupported"/> + <wsdl:fault message="intf:ResourceSuspended" name="ResourceSuspended"/> + </wsdl:operation> + + <wsdl:operation name="destroyPortlets"> + <wsdl:input message="intf:destroyPortlets" name="destroyPortlets"/> + <wsdl:output message="intf:destroyPortletsResponse" name="destroyPortletsResponse"/> + <wsdl:fault message="intf:InconsistentParameters" name="InconsistentParameters"/> + <wsdl:fault message="intf:InvalidRegistration" name="InvalidRegistration"/> + <wsdl:fault message="intf:MissingParameters" name="MissingParameters"/> + <wsdl:fault message="intf:ModifyRegistrationRequired" name="ModifyRegistrationRequired"/> + <wsdl:fault message="intf:OperationFailed" name="OperationFailed"/> + <wsdl:fault message="intf:OperationNotSupported" name="OperationNotSupported"/> + <wsdl:fault message="intf:ResourceSuspended" name="ResourceSuspended"/> + </wsdl:operation> + + <wsdl:operation name="setPortletProperties"> + <wsdl:input message="intf:setPortletProperties" name="setPortletProperties"/> + <wsdl:output message="intf:setPortletPropertiesResponse" name="setPortletPropertiesResponse"/> + <wsdl:fault message="intf:AccessDenied" name="AccessDenied"/> + <wsdl:fault message="intf:InconsistentParameters" name="InconsistentParameters"/> + <wsdl:fault message="intf:InvalidHandle" name="InvalidHandle"/> + <wsdl:fault message="intf:InvalidRegistration" name="InvalidRegistration"/> + <wsdl:fault message="intf:InvalidUserCategory" name="InvalidUserCategory"/> + <wsdl:fault message="intf:MissingParameters" name="MissingParameters"/> + <wsdl:fault message="intf:ModifyRegistrationRequired" name="ModifyRegistrationRequired"/> + <wsdl:fault message="intf:OperationFailed" name="OperationFailed"/> + <wsdl:fault message="intf:OperationNotSupported" name="OperationNotSupported"/> + <wsdl:fault message="intf:ResourceSuspended" name="ResourceSuspended"/> + </wsdl:operation> + + <wsdl:operation name="getPortletProperties"> + <wsdl:input message="intf:getPortletProperties" name="getPortletProperties"/> + <wsdl:output message="intf:getPortletPropertiesResponse" name="getPortletPropertiesResponse"/> + <wsdl:fault message="intf:AccessDenied" name="AccessDenied"/> + <wsdl:fault message="intf:InconsistentParameters" name="InconsistentParameters"/> + <wsdl:fault message="intf:InvalidHandle" name="InvalidHandle"/> + <wsdl:fault message="intf:InvalidRegistration" name="InvalidRegistration"/> + <wsdl:fault message="intf:InvalidUserCategory" name="InvalidUserCategory"/> + <wsdl:fault message="intf:MissingParameters" name="MissingParameters"/> + <wsdl:fault message="intf:ModifyRegistrationRequired" name="ModifyRegistrationRequired"/> + <wsdl:fault message="intf:OperationFailed" name="OperationFailed"/> + <wsdl:fault message="intf:OperationNotSupported" name="OperationNotSupported"/> + <wsdl:fault message="intf:ResourceSuspended" name="ResourceSuspended"/> + </wsdl:operation> + + <wsdl:operation name="getPortletPropertyDescription"> + <wsdl:input message="intf:getPortletPropertyDescription" name="getPortletPropertyDescription"/> + <wsdl:output message="intf:getPortletPropertyDescriptionResponse" + name="getPortletPropertyDescriptionResponse"/> + <wsdl:fault message="intf:AccessDenied" name="AccessDenied"/> + <wsdl:fault message="intf:InconsistentParameters" name="InconsistentParameters"/> + <wsdl:fault message="intf:InvalidHandle" name="InvalidHandle"/> + <wsdl:fault message="intf:InvalidRegistration" name="InvalidRegistration"/> + <wsdl:fault message="intf:InvalidUserCategory" name="InvalidUserCategory"/> + <wsdl:fault message="intf:MissingParameters" name="MissingParameters"/> + <wsdl:fault message="intf:ModifyRegistrationRequired" name="ModifyRegistrationRequired"/> + <wsdl:fault message="intf:OperationFailed" name="OperationFailed"/> + <wsdl:fault message="intf:OperationNotSupported" name="OperationNotSupported"/> + <wsdl:fault message="intf:ResourceSuspended" name="ResourceSuspended"/> + </wsdl:operation> + + <wsdl:operation name="copyPortlets"> + <wsdl:input message="intf:copyPortlets" name="copyPortlets"/> + <wsdl:output message="intf:copyPortletsResponse" name="copyPortletsResponse"/> + <wsdl:fault message="intf:AccessDenied" name="AccessDenied"/> + <wsdl:fault message="intf:InconsistentParameters" name="InconsistentParameters"/> + <wsdl:fault message="intf:InvalidHandle" name="InvalidHandle"/> + <wsdl:fault message="intf:InvalidRegistration" name="InvalidRegistration"/> + <wsdl:fault message="intf:InvalidUserCategory" name="InvalidUserCategory"/> + <wsdl:fault message="intf:MissingParameters" name="MissingParameters"/> + <wsdl:fault message="intf:ModifyRegistrationRequired" name="ModifyRegistrationRequired"/> + <wsdl:fault message="intf:OperationFailed" name="OperationFailed"/> + <wsdl:fault message="intf:OperationNotSupported" name="OperationNotSupported"/> + <wsdl:fault message="intf:ResourceSuspended" name="ResourceSuspended"/> + </wsdl:operation> + + <wsdl:operation name="exportPortlets"> + <wsdl:input message="intf:exportPortlets" name="exportPortlets"/> + <wsdl:output message="intf:exportPortletsResponse" name="exportPortletsResponse"/> + <wsdl:fault message="intf:AccessDenied" name="AccessDenied"/> + <wsdl:fault message="intf:InconsistentParameters" name="InconsistentParameters"/> + <wsdl:fault message="intf:InvalidHandle" name="InvalidHandle"/> + <wsdl:fault message="intf:InvalidRegistration" name="InvalidRegistration"/> + <wsdl:fault message="intf:InvalidUserCategory" name="InvalidUserCategory"/> + <wsdl:fault message="intf:MissingParameters" name="MissingParameters"/> + <wsdl:fault message="intf:ModifyRegistrationRequired" name="ModifyRegistrationRequired"/> + <wsdl:fault message="intf:OperationFailed" name="OperationFailed"/> + <wsdl:fault message="intf:OperationNotSupported" name="OperationNotSupported"/> + <wsdl:fault message="intf:ResourceSuspended" name="ResourceSuspended"/> + <wsdl:fault message="intf:ExportByValueNotSupported" name="ExportByValueNotSupported"/> + </wsdl:operation> + + <wsdl:operation name="importPortlets"> + <wsdl:input message="intf:importPortlets" name="importPortlets"/> + <wsdl:output message="intf:importPortletsResponse" name="importPortletsResponse"/> + <wsdl:fault message="intf:AccessDenied" name="AccessDenied"/> + <wsdl:fault message="intf:InconsistentParameters" name="InconsistentParameters"/> + <wsdl:fault message="intf:InvalidRegistration" name="InvalidRegistration"/> + <wsdl:fault message="intf:InvalidUserCategory" name="InvalidUserCategory"/> + <wsdl:fault message="intf:MissingParameters" name="MissingParameters"/> + <wsdl:fault message="intf:ModifyRegistrationRequired" name="ModifyRegistrationRequired"/> + <wsdl:fault message="intf:OperationFailed" name="OperationFailed"/> + <wsdl:fault message="intf:OperationNotSupported" name="OperationNotSupported"/> + <wsdl:fault message="intf:ResourceSuspended" name="ResourceSuspended"/> + <wsdl:fault message="intf:ExportNoLongerValid" name="ExportNoLongerValid"/> + </wsdl:operation> + + <wsdl:operation name="releaseExport"> + <wsdl:input message="intf:releaseExport" name="releaseExport"/> + <wsdl:output message="intf:releaseExportResponse" name="releaseExportResponse"/> + </wsdl:operation> + + <wsdl:operation name="setExportLifetime"> + <wsdl:input message="intf:setExportLifetime" name="setExportLifetime"/> + <wsdl:output message="intf:setExportLifetimeResponse" name="setExportLifetimeResponse"/> + <wsdl:fault message="intf:AccessDenied" name="AccessDenied"/> + <wsdl:fault message="intf:InvalidHandle" name="InvalidHandle"/> + <wsdl:fault message="intf:InvalidRegistration" name="InvalidRegistration"/> + <wsdl:fault message="intf:ModifyRegistrationRequired" name="ModifyRegistrationRequired"/> + <wsdl:fault message="intf:OperationFailed" name="OperationFailed"/> + <wsdl:fault message="intf:OperationNotSupported" name="OperationNotSupported"/> + <wsdl:fault message="intf:ResourceSuspended" name="ResourceSuspended"/> + </wsdl:operation> + + <wsdl:operation name="getPortletsLifetime"> + <wsdl:input message="intf:getPortletsLifetime" name="getPortletsLifetime"/> + <wsdl:output message="intf:getPortletsLifetimeResponse" name="getPortletsLifetimeResponse"/> + <wsdl:fault message="intf:AccessDenied" name="AccessDenied"/> + <wsdl:fault message="intf:InconsistentParameters" name="InconsistentParameters"/> + <wsdl:fault message="intf:InvalidHandle" name="InvalidHandle"/> + <wsdl:fault message="intf:InvalidRegistration" name="InvalidRegistration"/> + <wsdl:fault message="intf:ModifyRegistrationRequired" name="ModifyRegistrationRequired"/> + <wsdl:fault message="intf:OperationFailed" name="OperationFailed"/> + <wsdl:fault message="intf:OperationNotSupported" name="OperationNotSupported"/> + <wsdl:fault message="intf:ResourceSuspended" name="ResourceSuspended"/> + </wsdl:operation> + + <wsdl:operation name="setPortletsLifetime"> + <wsdl:input message="intf:setPortletsLifetime" name="setPortletsLifetime"/> + <wsdl:output message="intf:setPortletsLifetimeResponse" name="setPortletsLifetimeResponse"/> + <wsdl:fault message="intf:AccessDenied" name="AccessDenied"/> + <wsdl:fault message="intf:InconsistentParameters" name="InconsistentParameters"/> + <wsdl:fault message="intf:InvalidHandle" name="InvalidHandle"/> + <wsdl:fault message="intf:InvalidRegistration" name="InvalidRegistration"/> + <wsdl:fault message="intf:ModifyRegistrationRequired" name="ModifyRegistrationRequired"/> + <wsdl:fault message="intf:OperationFailed" name="OperationFailed"/> + <wsdl:fault message="intf:OperationNotSupported" name="OperationNotSupported"/> + <wsdl:fault message="intf:ResourceSuspended" name="ResourceSuspended"/> + </wsdl:operation> + </wsdl:portType> +</wsdl:definitions> Copied: components/wsrp/trunk/consumer/src/test/resources/wsdl/wsrp-2.0-services.wsdl (from rev 5270, components/wsrp/trunk/wsrp-producer-war/src/main/webapp/WEB-INF/wsdl/wsrp-2.0-services.wsdl) =================================================================== --- components/wsrp/trunk/consumer/src/test/resources/wsdl/wsrp-2.0-services.wsdl (rev 0) +++ components/wsrp/trunk/consumer/src/test/resources/wsdl/wsrp-2.0-services.wsdl 2010-11-25 16:30:36 UTC (rev 5274) @@ -0,0 +1,49 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<wsdl:definitions targetNamespace="urn:oasis:names:tc:wsrp:v2:wsdl" + xmlns:bind="urn:oasis:names:tc:wsrp:v2:bind" + + xmlns="http://schemas.xmlsoap.org/wsdl/" + + xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"> + + <import namespace="urn:oasis:names:tc:wsrp:v2:bind" location="wsrp-2.0-bindings.wsdl"/> + + <wsdl:service name="WSRPService"> + <wsdl:port binding="bind:WSRP_v2_Markup_Binding_SOAP" name="WSRPMarkupService"> + <soap:address location="REPLACE_WITH_ACTUAL_URL"/> + </wsdl:port> + <wsdl:port binding="bind:WSRP_v2_ServiceDescription_Binding_SOAP" name="WSRPServiceDescriptionService"> + <soap:address location="REPLACE_WITH_ACTUAL_URL"/> + </wsdl:port> + <wsdl:port binding="bind:WSRP_v2_Registration_Binding_SOAP" name="WSRPRegistrationService"> + <soap:address location="REPLACE_WITH_ACTUAL_URL"/> + </wsdl:port> + <wsdl:port binding="bind:WSRP_v2_PortletManagement_Binding_SOAP" name="WSRPPortletManagementService"> + <soap:address location="REPLACE_WITH_ACTUAL_URL"/> + </wsdl:port> + </wsdl:service> +</wsdl:definitions> Copied: components/wsrp/trunk/consumer/src/test/resources/wsdl/wsrp-2.0-types.xsd (from rev 5270, components/wsrp/trunk/wsrp-producer-war/src/main/webapp/WEB-INF/wsdl/wsrp-2.0-types.xsd) =================================================================== --- components/wsrp/trunk/consumer/src/test/resources/wsdl/wsrp-2.0-types.xsd (rev 0) +++ components/wsrp/trunk/consumer/src/test/resources/wsdl/wsrp-2.0-types.xsd 2010-11-25 16:30:36 UTC (rev 5274) @@ -0,0 +1,1470 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<schema targetNamespace="urn:oasis:names:tc:wsrp:v2:types" + xmlns:types="urn:oasis:names:tc:wsrp:v2:types" + + xmlns="http://www.w3.org/2001/XMLSchema" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + + elementFormDefault="qualified"> + +  + + <import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="http://www.w3.org/2001/xml.xsd"/> + +  +  +  +  + <simpleType name="Handle"> + <restriction base="xsd:string"> + <xsd:minLength value="1"/> + <xsd:maxLength value="255"/> + </restriction> + </simpleType> + <element name="Handle" type="types:Handle"/> + +  + <simpleType name="ID"> + <restriction base="xsd:string"> + <xsd:minLength value="1"/> + <xsd:maxLength value="4096"/> + </restriction> + </simpleType> + <element name="ID" type="types:ID"/> + +  + <simpleType name="Key"> + <restriction base="xsd:string"> + <xsd:minLength value="1"/> + <xsd:maxLength value="255"/> + </restriction> + </simpleType> + <element name="Key" type="types:Key"/> + + <complexType name="Extension"> + <sequence> + <any namespace="##other" processContents="lax"/> + </sequence> + </complexType> + + <complexType name="ExtensionPart"> + <sequence> + <element name="extendedTypes" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/> + <element name="schemaType" type="types:ModelTypes" minOccurs="0"/> + <element name="extensions" type="types:Extension" minOccurs="0" maxOccurs="unbounded"/> + </sequence> + <attribute name="name" type="xsd:QName" use="required"/> + <attribute name="type" type="xsd:QName" use="required"/> + <attribute name="schemaLocation" type="xsd:anyURI" use="optional"/> + </complexType> + <element name="ExtensionPart" type="types:ExtensionPart"/> + + <complexType name="ExtensionDescription"> + <sequence> + <element name="parts" type="types:ExtensionPart" minOccurs="0" maxOccurs="unbounded"/> + <element name="aliases" type="xsd:QName" minOccurs="0" maxOccurs="unbounded"/> + <element name="description" type="types:LocalizedString" minOccurs="0"/> + <element name="label" type="types:LocalizedString" minOccurs="0"/> + <element name="hint" type="types:LocalizedString" minOccurs="0"/> + <element name="extensions" type="types:Extension" minOccurs="0" maxOccurs="unbounded"/> + </sequence> + <attribute name="name" type="xsd:QName" use="required"/> + </complexType> + <element name="ExtensionDescription" type="types:ExtensionDescription"/> + + <complexType name="LocalizedString"> + <sequence> + <element name="value" type="xsd:string"/> + </sequence> + <attribute ref="xml:lang" use="required"/> + <attribute name="resourceName" type="xsd:string" use="optional"/> + </complexType> + + <complexType name="ResourceList"> + <sequence> + <element name="resources" type="types:Resource" maxOccurs="unbounded"/> + <element name="extensions" type="types:Extension" minOccurs="0" maxOccurs="unbounded"/> + </sequence> + </complexType> + + <complexType name="Resource"> + <sequence> + <element name="values" type="types:ResourceValue" maxOccurs="unbounded"/> + <element name="extensions" type="types:Extension" minOccurs="0" maxOccurs="unbounded"/> + </sequence> + <attribute name="resourceName" type="xsd:string" use="required"/> + </complexType> + + <complexType name="ResourceValue"> + <sequence> + <element name="value" type="xsd:string"/> + <element name="extensions" type="types:Extension" minOccurs="0" maxOccurs="unbounded"/> + </sequence> + <attribute ref="xml:lang" use="required"/> + </complexType> + + <complexType name="NamedString"> + <sequence> + <element name="value" type="xsd:string" minOccurs="0"/> + </sequence> + <attribute name="name" type="xsd:string" use="required"/> + </complexType> + + <complexType name="NamedStringArray"> + <sequence> + <element name="NamedString" type="types:NamedString" minOccurs="0" maxOccurs="unbounded"/> + </sequence> + </complexType> + <element name="NamedStringArray" type="types:NamedStringArray"/> + +  +  +  + + <complexType name="RegistrationData"> + <sequence> + <element name="consumerName" type="xsd:string"/> + <element name="consumerAgent" type="xsd:string"/> + <element name="methodGetSupported" type="xsd:boolean"/> + <element name="consumerModes" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/> + <element name="consumerWindowStates" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/> + <element name="consumerUserScopes" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/> + <element name="extensionDescriptions" type="types:ExtensionDescription" minOccurs="0" maxOccurs="unbounded"/> + <element name="registrationProperties" type="types:Property" minOccurs="0" maxOccurs="unbounded"/> + <element name="resourceList" type="types:ResourceList" minOccurs="0"/> + <element name="extensions" type="types:Extension" minOccurs="0" maxOccurs="unbounded"/> + </sequence> + </complexType> + <element name="RegistrationData" type="types:RegistrationData"/> + + + <complexType name="RegistrationState"> + <sequence> + <element name="registrationState" type="xsd:base64Binary" minOccurs="0"/> + <element name="scheduledDestruction" type="types:Lifetime" minOccurs="0"/> + <element name="extensions" type="types:Extension" minOccurs="0" maxOccurs="unbounded"/> + </sequence> + </complexType> + <element name="RegistrationState" type="types:RegistrationState"/> + + <complexType name="RegistrationContext"> + <complexContent> + <extension base="types:RegistrationState"> + <sequence> + <element name="registrationHandle" type="xsd:string"/> + </sequence> + </extension> + </complexContent> + </complexType> + <element name="RegistrationContext" type="types:RegistrationContext"/> + + <complexType name="SessionContext"> + <sequence> + <element name="sessionID" type="xsd:string" minOccurs="0"/> + <element name="expires" type="xsd:int" minOccurs="0"/> + <element name="extensions" type="types:Extension" minOccurs="0" maxOccurs="unbounded"/> + </sequence> + </complexType> + <element name="SessionContext" type="types:SessionContext"/> + + <complexType name="SessionParams"> + <sequence> + <element name="extensions" type="types:Extension" minOccurs="0" maxOccurs="unbounded"/> + </sequence> + <attribute name="sessionID" type="xsd:string" use="optional"/> + </complexType> + <element name="SessionParams" type="types:SessionParams"/> + + <complexType name="RuntimeContext"> + <sequence> + <element name="userAuthentication" type="xsd:string"/> + <element name="portletInstanceKey" type="xsd:string"/> + <element name="namespacePrefix" type="xsd:string"/> + <element name="templates" type="types:Templates" minOccurs="0"/> + <element name="sessionParams" type="types:SessionParams" minOccurs="0"/> + <element name="pageState" type="xsd:string" minOccurs="0"/> + <element name="portletStates" type="xsd:string" minOccurs="0"/> + <element name="extensions" type="types:Extension" minOccurs="0" maxOccurs="unbounded"/> + </sequence> + </complexType> + <element name="RuntimeContext" type="types:RuntimeContext"/> + + <complexType name="ItemDescription"> + <sequence> + <element name="description" type="types:LocalizedString" nillable="true"/> + <element name="displayName" type="types:LocalizedString" minOccurs="0"/> + <element name="extensions" type="types:Extension" minOccurs="0" maxOccurs="unbounded"/> + </sequence> + <attribute name="itemName" type="xsd:string" use="required"/> + </complexType> + + <simpleType name="CookieProtocol"> + <restriction base="xsd:string"> + <enumeration value="none"/> + <enumeration value="perUser"/> + <enumeration value="perGroup"/> + </restriction> + </simpleType> + + <complexType name="ExportDescription"> + <sequence> + <element name="extensions" type="types:Extension" minOccurs="0" maxOccurs="unbounded"/> + </sequence> + <attribute name="recommendedExportSize" type="xsd:integer" use="optional"/> + </complexType> + <element name="ExportDescription" type="types:ExportDescription"/> + + <complexType name="ServiceDescription"> + <sequence> + <element name="requiresRegistration" type="xsd:boolean"/> + <element name="offeredPortlets" type="types:PortletDescription" minOccurs="0" maxOccurs="unbounded"/> + <element name="userCategoryDescriptions" type="types:ItemDescription" minOccurs="0" maxOccurs="unbounded"/> + <element name="extensionDescriptions" type="types:ExtensionDescription" minOccurs="0" maxOccurs="unbounded"/> + <element name="customWindowStateDescriptions" type="types:ItemDescription" minOccurs="0" + maxOccurs="unbounded"/> + <element name="customModeDescriptions" type="types:ItemDescription" minOccurs="0" maxOccurs="unbounded"/> + <element name="requiresInitCookie" type="types:CookieProtocol" default="none" minOccurs="0"/> + <element name="registrationPropertyDescription" type="types:ModelDescription" minOccurs="0"/> + <element name="locales" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/> + <element name="resourceList" type="types:ResourceList" minOccurs="0"/> + <element name="eventDescriptions" type="types:EventDescription" minOccurs="0" maxOccurs="unbounded"/> + <element name="schemaType" type="types:ModelTypes" minOccurs="0"/> + <element name="supportedOptions" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/> + <element name="exportDescription" type="types:ExportDescription" minOccurs="0"/> + <element name="mayReturnRegistrationState" type="xsd:boolean" minOccurs="0" default="false"/> + <element name="extensions" type="types:Extension" minOccurs="0" maxOccurs="unbounded"/> + </sequence> + </complexType> + <element name="ServiceDescription" type="types:ServiceDescription"/> + + <complexType name="Lifetime"> + <sequence> + <element name="extensions" type="types:Extension" minOccurs="0" maxOccurs="unbounded"/> + </sequence> +  + <attribute name="currentTime" type="xsd:dateTime" use="optional"/> + <attribute name="terminationTime" type="xsd:dateTime" use="optional"/> + <attribute name="refreshDuration" type="xsd:duration" use="optional"/> + </complexType> + <element name="Lifetime" type="types:Lifetime"/> + +  +  +  + + <complexType name="MarkupType"> + <sequence> + <element name="mimeType" type="xsd:string"/> + <element name="modes" type="xsd:string" maxOccurs="unbounded"/> + <element name="windowStates" type="xsd:string" maxOccurs="unbounded"/> + <element name="locales" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/> + <element name="extensions" type="types:Extension" minOccurs="0" maxOccurs="unbounded"/> + </sequence> + </complexType> + + <complexType name="PortletDescription"> + <sequence> + <element name="portletHandle" type="xsd:string"/> + <element name="markupTypes" type="types:MarkupType" maxOccurs="unbounded"/> + <element name="groupID" type="xsd:string" minOccurs="0"/> + <element name="description" type="types:LocalizedString" minOccurs="0"/> + <element name="shortTitle" type="types:LocalizedString" minOccurs="0"/> + <element name="title" type="types:LocalizedString" minOccurs="0"/> + <element name="displayName" type="types:LocalizedString" minOccurs="0"/> + <element name="keywords" type="types:LocalizedString" minOccurs="0" maxOccurs="unbounded"/> + <element name="publishedEvents" type="xsd:QName" minOccurs="0" maxOccurs="unbounded"/> + <element name="handledEvents" type="xsd:QName" minOccurs="0" maxOccurs="unbounded"/> + <element name="navigationalPublicValueDescriptions" type="types:ParameterDescription" minOccurs="0" + maxOccurs="unbounded"/> + <element name="userCategories" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/> + <element name="userProfileItems" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/> + <element name="portletManagedModes" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/> + <element name="usesMethodGet" type="xsd:boolean" default="false" minOccurs="0"/> + <element name="defaultMarkupSecure" type="xsd:boolean" default="false" minOccurs="0"/> + <element name="onlySecure" type="xsd:boolean" default="false" minOccurs="0"/> + <element name="userContextStoredInSession" type="xsd:boolean" default="false" minOccurs="0"/> + <element name="templatesStoredInSession" type="xsd:boolean" default="false" minOccurs="0"/> + <element name="hasUserSpecificState" type="xsd:boolean" default="false" minOccurs="0"/> + <element name="doesUrlTemplateProcessing" type="xsd:boolean" default="false" minOccurs="0"/> + <element name="mayReturnPortletState" type="xsd:boolean" default="false" minOccurs="0"/> + <element name="extensions" type="types:Extension" minOccurs="0" maxOccurs="unbounded"/> + </sequence> + <attribute name="portletID" type="xsd:string" use="optional"/> + </complexType> + + <complexType name="PortletDescriptionResponse"> + <sequence> + <element name="portletDescription" type="types:PortletDescription"/> + <element name="resourceList" type="types:ResourceList" minOccurs="0"/> + <element name="extensions" type="types:Extension" minOccurs="0" maxOccurs="unbounded"/> + </sequence> + </complexType> + + <complexType name="PortletContext"> + <sequence> + <element name="portletHandle" type="xsd:string"/> + <element name="portletState" type="xsd:base64Binary" minOccurs="0"/> + <element name="scheduledDestruction" type="types:Lifetime" minOccurs="0"/> + <element name="extensions" type="types:Extension" minOccurs="0" maxOccurs="unbounded"/> + </sequence> + </complexType> + <element name="PortletContext" type="types:PortletContext"/> + + <simpleType name="ErrorCodes"> + <restriction base="xsd:QName"> + <enumeration value="types:AccessDenied"/> + <enumeration value="types:ExportNoLongerValid"/> + <enumeration value="types:InconsistentParameters"/> + <enumeration value="types:InvalidRegistration"/> + <enumeration value="types:InvalidCookie"/> + <enumeration value="types:InvalidHandle"/> + <enumeration value="types:InvalidSession"/> + <enumeration value="types:InvalidUserCategory"/> + <enumeration value="types:ModifyRegistrationRequired"/> + <enumeration value="types:MissingParameters"/> + <enumeration value="types:OperationFailed"/> + <enumeration value="types:OperationNotSupported"/> + <enumeration value="types:ResourceSuspended"/> + <enumeration value="types:TooBusy"/> + <enumeration value="types:TooManyRequests"/> + </restriction> + </simpleType> + + <complexType name="BaseFailed"> + <sequence> + <element name="reason" type="types:LocalizedString" minOccurs="0"/> + <element name="resourceList" type="types:ResourceList" minOccurs="0"/> + <element name="extensions" type="types:Extension" minOccurs="0" maxOccurs="unbounded"/> + </sequence> + <attribute name="errorCode" type="types:ErrorCodes" use="required"/> + </complexType> + <element name="BaseFailed" type="types:BaseFailed"/> + + <complexType name="FailedPortlets"> + <complexContent> + <extension base="types:BaseFailed"> + <sequence> + <element name="portletHandles" type="xsd:string" maxOccurs="unbounded"/> + </sequence> + </extension> + </complexContent> + </complexType> + <element name="FailedPortlets" type="types:FailedPortlets"/> + + <complexType name="SetPortletLifetime"> + <sequence> + <element name="portletContext" type="types:PortletContext" maxOccurs="unbounded"/> + <element name="scheduledDestruction" type="types:Lifetime" minOccurs="0"/> + <element name="extensions" type="types:Extension" minOccurs="0" maxOccurs="unbounded"/> + </sequence> + </complexType> + <element name="setPortletLifetime" type="types:SetPortletLifetime"/> + + <complexType name="PortletLifetime"> + <sequence> + <element name="portletContext" type="types:PortletContext"/> + <element name="scheduledDestruction" type="types:Lifetime"/> + <element name="extensions" type="types:Extension" minOccurs="0" maxOccurs="unbounded"/> + </sequence> + </complexType> + <element name="PortletLifetime" type="types:PortletLifetime"/> + +  +  +  + + <complexType name="EventDescription"> + <sequence> + <element name="aliases" type="xsd:QName" minOccurs="0" maxOccurs="unbounded"/> + <element name="description" type="types:LocalizedString" minOccurs="0"/> + <element name="label" type="types:LocalizedString" minOccurs="0"/> + <element name="hint" type="types:LocalizedString" minOccurs="0"/> + <element name="schemaType" type="types:ModelTypes" minOccurs="0"/> + <element name="extensions" type="types:Extension" minOccurs="0" maxOccurs="unbounded"/> + </sequence> + <attribute name="name" type="xsd:QName" use="required"/> + <attribute name="type" type="xsd:QName" use="optional"/> + <attribute name="schemaLocation" type="xsd:anyURI" use="optional"/> + </complexType> + <element name="EventDescription" type="types:EventDescription"/> + + <complexType name="EventPayload"> + <sequence> + <element name="namedStringArray" type="types:NamedStringArray" minOccurs="0"/> + <any namespace="##other" minOccurs="0" processContents="lax"/> + </sequence> + </complexType> + <element name="EventPayload" type="types:EventPayload"/> + + <complexType name="Event"> + <sequence> + <element name="payload" type="types:EventPayload" minOccurs="0"/> + <element name="extensions" type="types:Extension" minOccurs="0" maxOccurs="unbounded"/> + </sequence> + <attribute name="name" type="xsd:QName" use="required"/> + <attribute name="type" type="xsd:QName" use="optional"/> + </complexType> + <element name="Event" type="types:Event"/> + + <complexType name="EventParams"> + <sequence> + <element name="events" type="types:Event" minOccurs="1" maxOccurs="unbounded"/> + <element name="extensions" type="types:Extension" minOccurs="0" maxOccurs="unbounded"/> + </sequence> + <attribute name="portletStateChange" type="types:StateChange" use="required"/> + </complexType> + <element name="EventParams" type="types:EventParams"/> + + <complexType name="HandleEventsFailed"> + <complexContent> + <extension base="types:BaseFailed"> + <sequence> + <element name="index" type="xsd:integer" maxOccurs="unbounded"/> + </sequence> + </extension> + </complexContent> + </complexType> + <element name="HandleEventsFailed" type="types:HandleEventsFailed"/> + +  +  +  + + <complexType name="NavigationalContext"> + <sequence> + <element name="publicValues" type="types:NamedString" minOccurs="0" maxOccurs="unbounded"/> + <element name="extensions" type="types:Extension" minOccurs="0" maxOccurs="unbounded"/> + </sequence> + <attribute name="opaqueValue" type="xsd:string" use="optional"/> + </complexType> + <element name="NavigationalContext" type="types:NavigationalContext"/> + + <complexType name="MimeRequest"> + <sequence> + <element name="secureClientCommunication" type="xsd:boolean"/> + <element name="locales" type="xsd:string" maxOccurs="unbounded"/> + <element name="mimeTypes" type="xsd:string" maxOccurs="unbounded"/> + <element name="mode" type="xsd:string"/> + <element name="windowState" type="xsd:string"/> + <element name="clientData" type="types:ClientData" minOccurs="0"/> + <element name="navigationalContext" type="types:NavigationalContext" minOccurs="0"/> + <element name="markupCharacterSets" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/> + <element name="validateTag" type="xsd:string" minOccurs="0"/> + <element name="validNewModes" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/> + <element name="validNewWindowStates" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/> + <element name="extensions" type="types:Extension" minOccurs="0" maxOccurs="unbounded"/> + </sequence> + </complexType> + <element name="MimeRequest" type="types:MimeRequest"/> + + <complexType name="MarkupParams"> + <complexContent> + <extension base="types:MimeRequest"> + <sequence/> + </extension> + </complexContent> + </complexType> + <element name="MarkupParams" type="types:MarkupParams"/> + + <complexType name="ResourceParams"> + <complexContent> + <extension base="types:MimeRequest"> + <sequence> + <element name="formParameters" type="types:NamedString" minOccurs="0" maxOccurs="unbounded"/> + <element name="uploadContexts" type="types:UploadContext" minOccurs="0" maxOccurs="unbounded"/> + </sequence> + <attribute name="resourceID" type="xsd:string" use="required"/> + <attribute name="portletStateChange" type="types:StateChange" use="required"/> + <attribute name="resourceState" type="xsd:string" use="optional"/> + <attribute name="resourceCacheability" type="xsd:string" use="optional"/> + </extension> + </complexContent> + </complexType> + <element name="ResourceParams" type="types:ResourceParams"/> + + <complexType name="MimeResponse"> + <sequence> + <element name="useCachedItem" type="xsd:boolean" default="false" minOccurs="0"/> + <element name="mimeType" type="xsd:string" minOccurs="0"/> + <element name="itemString" type="xsd:string" minOccurs="0"/> + <element name="itemBinary" type="xsd:base64Binary" minOccurs="0"/> + <element name="locale" type="xsd:string" minOccurs="0"/> + <element name="requiresRewriting" type="xsd:boolean" default="false" minOccurs="0"/> + <element name="cacheControl" type="types:CacheControl" minOccurs="0"/> + <element name="clientAttributes" type="types:NamedString" minOccurs="0" maxOccurs="unbounded"/> + <element name="extensions" type="types:Extension" minOccurs="0" maxOccurs="unbounded"/> + </sequence> + <attribute name="ccppProfileWarning" type="xsd:string" use="optional"/> + </complexType> + <element name="MimeResponse" type="types:MimeResponse"/> + + <complexType name="MarkupContext"> + <complexContent> + <extension base="types:MimeResponse"> + <sequence> + <element name="preferredTitle" type="xsd:string" minOccurs="0"/> + <element name="validNewModes" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/> + </sequence> + </extension> + </complexContent> + </complexType> + <element name="MarkupContext" type="types:MarkupContext"/> + + <complexType name="MarkupResponse"> + <sequence> + <element name="markupContext" type="types:MarkupContext"/> + <element name="sessionContext" type="types:SessionContext" minOccurs="0"/> + <element name="extensions" type="types:Extension" minOccurs="0" maxOccurs="unbounded"/> + </sequence> + </complexType> + + <complexType name="ResourceContext"> + <complexContent> + <extension base="types:MimeResponse"> + <sequence/> + </extension> + </complexContent> + </complexType> + <element name="ResourceContext" type="types:ResourceContext"/> + + <complexType name="ResourceResponse"> + <sequence> + <element name="resourceContext" type="types:ResourceContext"/> + <element name="sessionContext" type="types:SessionContext" minOccurs="0"/> + <element name="portletContext" type="types:PortletContext" minOccurs="0"/> + <element name="extensions" type="types:Extension" minOccurs="0" maxOccurs="unbounded"/> + </sequence> + </complexType> + + <complexType name="CCPPProfileDiff"> + <sequence> + <element name="extensions" type="types:Extension" minOccurs="0" maxOccurs="unbounded"/> + </sequence> + <attribute name="diffName" type="xsd:string" use="required"/> + <attribute name="description" type="xsd:string" use="required"/> + </complexType> + <element name="CCPPProfileDiff" type="types:CCPPProfileDiff"/> + + <complexType name="CCPPHeaders"> + <sequence> + <element name="profileDiffs" type="types:CCPPProfileDiff" minOccurs="0" maxOccurs="unbounded"/> + <element name="extensions" type="types:Extension" minOccurs="0" maxOccurs="unbounded"/> + </sequence> + <attribute name="profile" type="xsd:string" use="required"/> + </complexType> + <element name="CCPPHeaders" type="types:CCPPHeaders"/> + + <complexType name="ClientData"> + <sequence> + <element name="userAgent" type="xsd:string" minOccurs="0"/> + <element name="ccppHeaders" type="types:CCPPHeaders" minOccurs="0"/> + <element name="clientAttributes" type="types:NamedString" minOccurs="0" maxOccurs="unbounded"/> + <element name="extensions" type="types:Extension" minOccurs="0" maxOccurs="unbounded"/> + </sequence> + <attribute name="requestVerb" type="xsd:string" use="optional"/> + </complexType> + <element name="ClientData" type="types:ClientData"/> + + <complexType name="CacheControl"> + <sequence> + <element name="expires" type="xsd:int"/> + <element name="userScope" type="xsd:string"/> + <element name="validateTag" type="xsd:string" minOccurs="0"/> + <element name="extensions" type="types:Extension" minOccurs="0" maxOccurs="unbounded"/> + </sequence> + </complexType> + + <complexType name="Templates"> + <sequence> + <element name="defaultTemplate" type="xsd:string" nillable="true"/> + <element name="blockingActionTemplate" type="xsd:string" minOccurs="0"/> + <element name="renderTemplate" type="xsd:string" minOccurs="0"/> + <element name="resourceTemplate" type="xsd:string" minOccurs="0"/> + <element name="secureDefaultTemplate" type="xsd:string" nillable="true"/> + <element name="secureBlockingActionTemplate" type="xsd:string" minOccurs="0"/> + <element name="secureRenderTemplate" type="xsd:string" minOccurs="0"/> + <element name="secureResourceTemplate" type="xsd:string" minOccurs="0"/> + <element name="extensions" type="types:Extension" minOccurs="0" maxOccurs="unbounded"/> + </sequence> + </complexType> + <element name="Templates" type="types:Templates"/> + +  +  +  + + <simpleType name="StateChange"> + <restriction base="xsd:string"> + <enumeration value="readWrite"/> + <enumeration value="cloneBeforeWrite"/> + <enumeration value="readOnly"/> + </restriction> + </simpleType> + + <complexType name="UploadContext"> + <sequence> + <element name="mimeType" type="xsd:string"/> + <element name="uploadData" type="xsd:base64Binary"/> + <element name="mimeAttributes" type="types:NamedString" minOccurs="0" maxOccurs="unbounded"/> + <element name="extensions" type="types:Extension" minOccurs="0" maxOccurs="unbounded"/> + </sequence> + </complexType> + + <complexType name="InteractionParams"> + <sequence> + <element name="portletStateChange" type="types:StateChange"/> + <element name="interactionState" type="xsd:string" minOccurs="0"/> + <element name="formParameters" type="types:NamedString" minOccurs="0" maxOccurs="unbounded"/> + <element name="uploadContexts" type="types:UploadContext" minOccurs="0" maxOccurs="unbounded"/> + <element name="extensions" type="types:Extension" minOccurs="0" maxOccurs="unbounded"/> + </sequence> + </complexType> + <element name="InteractionParams" type="types:InteractionParams"/> + + <complexType name="UpdateResponse"> + <sequence> + <element name="sessionContext" type="types:SessionContext" minOccurs="0"/> + <element name="portletContext" type="types:PortletContext" minOccurs="0"/> + <element name="markupContext" type="types:MarkupContext" minOccurs="0"/> + <element name="events" type="types:Event" minOccurs="0" maxOccurs="unbounded"/> + <element name="navigationalContext" type="types:NavigationalContext" minOccurs="0"/> + <element name="newWindowState" type="xsd:string" minOccurs="0"/> + <element name="newMode" type="xsd:string" minOccurs="0"/> + <element name="extensions" type="types:Extension" minOccurs="0" maxOccurs="unbounded"/> + </sequence> + </complexType> + <element name="UpdateResponse" type="types:UpdateResponse"/> + + <complexType name="BlockingInteractionResponse"> + <sequence> + <element name="updateResponse" type="types:UpdateResponse" minOccurs="0"/> + <element name="redirectURL" type="xsd:string" minOccurs="0"/> + <element name="extensions" type="types:Extension" minOccurs="0" maxOccurs="unbounded"/> + </sequence> + </complexType> + <element name="BlockingInteractionResponse" type="types:BlockingInteractionResponse"/> + +  +  +  + + <complexType name="CopiedPortlet"> + <sequence> + <element name="newPortletContext" type="types:PortletContext"/> + <element name="extensions" type="types:Extension" minOccurs="0" maxOccurs="unbounded"/> + </sequence> + <attribute name="fromPortletHandle" type="xsd:string" use="required"/> + </complexType> + <element name="CopiedPortlet" type="types:CopiedPortlet"/> + + <complexType name="ExportedPortlet"> + <sequence> + <element name="exportData" type="xsd:base64Binary"/> + <element name="extensions" type="types:Extension" minOccurs="0" maxOccurs="unbounded"/> + </sequence> + <attribute name="portletHandle" type="xsd:string" use="required"/> + </complexType> + <element name="ExportedPortlet" type="types:ExportedPortlet"/> + + <complexType name="ImportPortlet"> + <sequence> + <element name="exportData" type="xsd:base64Binary"/> + <element name="extensions" type="types:Extension" minOccurs="0" maxOccurs="unbounded"/> + </sequence> + <attribute name="importID" type="xsd:string" use="required"/> + </complexType> + <element name="ImportPortlet" type="types:ImportPortlet"/> + + <complexType name="ImportedPortlet"> + <sequence> + <element name="importID" type="xsd:string"/> + <element name="newPortletContext" type="types:PortletContext"/> + <element name="extensions" type="types:Extension" minOccurs="0" maxOccurs="unbounded"/> + </sequence> + </complexType> + <element name="ImportedPortlet" type="types:ImportedPortlet"/> + + <complexType name="ImportPortletsFailed"> + <complexContent> + <extension base="types:BaseFailed"> + <sequence> + <element name="importID" type="xsd:string" maxOccurs="unbounded"/> + </sequence> + </extension> + </complexContent> + </complexType> + <element name="ImportPortletsFailed" type="types:ImportPortletsFailed"/> + +  +  +  + + <complexType name="Postal"> + <sequence> + <element name="name" type="xsd:string" minOccurs="0"/> + <element name="street" type="xsd:string" minOccurs="0"/> + <element name="city" type="xsd:string" minOccurs="0"/> + <element name="stateprov" type="xsd:string" minOccurs="0"/> + <element name="postalcode" type="xsd:string" minOccurs="0"/> + <element name="country" type="xsd:string" minOccurs="0"/> + <element name="organization" type="xsd:string" minOccurs="0"/> + <element name="extensions" type="types:Extension" minOccurs="0" maxOccurs="unbounded"/> + </sequence> + </complexType> + + <complexType name="TelephoneNum"> + <sequence> + <element name="intcode" type="xsd:string" minOccurs="0"/> + <element name="loccode" type="xsd:string" minOccurs="0"/> + <element name="number" type="xsd:string" minOccurs="0"/> + <element name="ext" type="xsd:string" minOccurs="0"/> + <element name="comment" type="xsd:string" minOccurs="0"/> + <element name="extensions" type="types:Extension" minOccurs="0" maxOccurs="unbounded"/> + </sequence> + </complexType> + + <complexType name="Telecom"> + <sequence> + <element name="telephone" type="types:TelephoneNum" minOccurs="0"/> + <element name="fax" type="types:TelephoneNum" minOccurs="0"/> + <element name="mobile" type="types:TelephoneNum" minOccurs="0"/> + <element name="pager" type="types:TelephoneNum" minOccurs="0"/> + <element name="extensions" type="types:Extension" minOccurs="0" maxOccurs="unbounded"/> + </sequence> + </complexType> + + <complexType name="Online"> + <sequence> + <element name="email" type="xsd:string" minOccurs="0"/> + <element name="uri" type="xsd:string" minOccurs="0"/> + <element name="extensions" type="types:Extension" minOccurs="0" maxOccurs="unbounded"/> + </sequence> + </complexType> + + <complexType name="Contact"> + <sequence> + <element name="postal" type="types:Postal" minOccurs="0"/> + <element name="telecom" type="types:Telecom" minOccurs="0"/> + <element name="online" type="types:Online" minOccurs="0"/> + <element name="extensions" type="types:Extension" minOccurs="0" maxOccurs="unbounded"/> + </sequence> + </complexType> + <element name="Contact" type="types:Contact"/> + + <complexType name="EmployerInfo"> + <sequence> + <element name="employer" type="xsd:string" minOccurs="0"/> + <element name="department" type="xsd:string" minOccurs="0"/> + <element name="jobtitle" type="xsd:string" minOccurs="0"/> + <element name="extensions" type="types:Extension" minOccurs="0" maxOccurs="unbounded"/> + </sequence> + </complexType> + + <complexType name="PersonName"> + <sequence> + <element name="prefix" type="xsd:string" minOccurs="0"/> + <element name="given" type="xsd:string" minOccurs="0"/> + <element name="family" type="xsd:string" minOccurs="0"/> + <element name="middle" type="xsd:string" minOccurs="0"/> + <element name="suffix" type="xsd:string" minOccurs="0"/> + <element name="nickname" type="xsd:string" minOccurs="0"/> + <element name="extensions" type="types:Extension" minOccurs="0" maxOccurs="unbounded"/> + </sequence> + </complexType> + + <complexType name="UserProfile"> + <sequence> + <element name="name" type="types:PersonName" minOccurs="0"/> + <element name="bdate" type="xsd:dateTime" minOccurs="0"/> + <element name="gender" type="xsd:string" minOccurs="0"/> + <element name="employerInfo" type="types:EmployerInfo" minOccurs="0"/> + <element name="homeInfo" type="types:Contact" minOccurs="0"/> + <element name="businessInfo" type="types:Contact" minOccurs="0"/> + <element name="extensions" type="types:Extension" minOccurs="0" maxOccurs="unbounded"/> + </sequence> + </complexType> + + <complexType name="UserContext"> + <sequence> + <element name="userContextKey" type="xsd:string"/> + <element name="userCategories" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/> + <element name="profile" type="types:UserProfile" minOccurs="0"/> + <element name="extensions" type="types:Extension" minOccurs="0" maxOccurs="unbounded"/> + </sequence> + </complexType> + <element name="UserContext" type="types:UserContext"/> + +  +  +  + + <complexType name="Property"> + <sequence> + <element name="stringValue" type="xsd:string" minOccurs="0"/> + <any namespace="##other" minOccurs="0" maxOccurs="unbounded" processContents="lax"/> + </sequence> + <attribute name="name" type="xsd:QName" use="required"/> + <attribute name="type" type="xsd:QName" use="optional"/> +  + <attribute ref="xml:lang" use="optional"/> + </complexType> + + <complexType name="ResetProperty"> + <sequence/> + <attribute name="name" type="xsd:QName" use="required"/> + </complexType> + + <complexType name="PropertyList"> + <sequence> + <element name="properties" type="types:Property" minOccurs="0" maxOccurs="unbounded"/> + <element name="resetProperties" type="types:ResetProperty" minOccurs="0" maxOccurs="unbounded"/> + <element name="extensions" type="types:Extension" minOccurs="0" maxOccurs="unbounded"/> + </sequence> + </complexType> + <element name="PropertyList" type="types:PropertyList"/> + + <complexType name="PropertyDescription"> + <sequence> + <element name="description" type="types:LocalizedString" minOccurs="0"/> + <element name="label" type="types:LocalizedString" minOccurs="0"/> + <element name="hint" type="types:LocalizedString" minOccurs="0"/> + <element name="usage" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/> + <element name="aliases" type="xsd:QName" minOccurs="0" maxOccurs="unbounded"/> + <element name="extensions" type="types:Extension" minOccurs="0" maxOccurs="unbounded"/> + </sequence> + <attribute name="name" type="xsd:QName" use="required"/> + <attribute name="type" type="xsd:QName" use="required"/> + <attribute name="schemaLocation" type="xsd:anyURI" use="optional"/> + </complexType> + <element name="PropertyDescription" type="types:PropertyDescription"/> + + <complexType name="ParameterDescription"> + <sequence> + <element name="names" type="xsd:QName" minOccurs="0" maxOccurs="unbounded"/> + <element name="description" type="types:LocalizedString" minOccurs="0"/> + <element name="label" type="types:LocalizedString" minOccurs="0"/> + <element name="hint" type="types:LocalizedString" minOccurs="0"/> + <element name="extensions" type="types:Extension" minOccurs="0" maxOccurs="unbounded"/> + </sequence> + <attribute name="identifier" type="xsd:string" use="required"/> + </complexType> + <element name="ParameterDescription" type="types:ParameterDescription"/> + + <complexType name="ModelTypes"> + <sequence> + <any namespace="##other" processContents="lax"/> + </sequence> + </complexType> + + <complexType name="ModelDescription"> + <sequence> + <element name="propertyDescriptions" type="types:PropertyDescription" minOccurs="0" maxOccurs="unbounded"/> + <element name="modelTypes" type="types:ModelTypes" minOccurs="0"/> + <element name="extensions" type="types:Extension" minOccurs="0" maxOccurs="unbounded"/> + </sequence> + </complexType> + <element name="ModelDescription" type="types:ModelDescription"/> + +  +  +  + + <complexType name="ReturnAny"> + <sequence> + <element name="extensions" type="types:Extension" minOccurs="0" maxOccurs="unbounded"/> + </sequence> + </complexType> + + <complexType name="getMarkup"> + <sequence> + <element name="registrationContext" type="types:RegistrationContext" nillable="true"/> + <element name="portletContext" type="types:PortletContext"/> + <element name="runtimeContext" type="types:RuntimeContext"/> + <element name="userContext" type="types:UserContext" nillable="true"/> + <element name="markupParams" type="types:MarkupParams"/> + </sequence> + </complexType> + <element name="getMarkup" type="types:getMarkup"/> + <element name="getMarkupResponse" type="types:MarkupResponse"/> + + <complexType name="getResource"> + <sequence> + <element name="registrationContext" type="types:RegistrationContext" nillable="true"/> + <element name="portletContext" type="types:PortletContext"/> + <element name="runtimeContext" type="types:RuntimeContext"/> + <element name="userContext" type="types:UserContext" nillable="true"/> + <element name="resourceParams" type="types:ResourceParams"/> + </sequence> + </complexType> + <element name="getResource" type="types:getResource"/> + <element name="getResourceResponse" type="types:ResourceResponse"/> + + <complexType name="performBlockingInteraction"> + <sequence> + <element name="registrationContext" type="types:RegistrationContext" nillable="true"/> + <element name="portletContext" type="types:PortletContext"/> + <element name="runtimeContext" type="types:RuntimeContext"/> + <element name="userContext" type="types:UserContext" nillable="true"/> + <element name="markupParams" type="types:MarkupParams"/> + <element name="interactionParams" type="types:InteractionParams"/> + </sequence> + </complexType> + <element name="performBlockingInteraction" type="types:performBlockingInteraction"/> + <element name="performBlockingInteractionResponse" type="types:BlockingInteractionResponse"/> + + <complexType name="handleEvents"> + <sequence> + <element name="registrationContext" type="types:RegistrationContext" nillable="true"/> + <element name="portletContext" type="types:PortletContext"/> + <element name="runtimeContext" type="types:RuntimeContext"/> + <element name="userContext" type="types:UserContext" nillable="true"/> + <element name="markupParams" type="types:MarkupParams"/> + <element name="eventParams" type="types:EventParams"/> + </sequence> + </complexType> + <element name="handleEvents" type="types:handleEvents"/> + <complexType name="HandleEventsResponse"> + <sequence> + <element name="updateResponse" type="types:UpdateResponse" minOccurs="0"/> + <element name="failedEvents" type="types:HandleEventsFailed" minOccurs="0" maxOccurs="unbounded"/> + <element name="extensions" type="types:Extension" minOccurs="0" maxOccurs="unbounded"/> + </sequence> + </complexType> + <element name="handleEventsResponse" type="types:HandleEventsResponse"/> + + <complexType name="getServiceDescription"> + <sequence> + <element name="registrationContext" type="types:RegistrationContext" nillable="true"/> + <element name="desiredLocales" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/> + <element name="portletHandles" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/> + <element name="userContext" type="types:UserContext" nillable="true"/> + </sequence> + </complexType> + <element name="getServiceDescription" type="types:getServiceDescription"/> + <element name="getServiceDescriptionResponse" type="types:ServiceDescription"/> + + <complexType name="register"> + <sequence> + <element name="registrationData" type="types:RegistrationData"/> + <element name="lifetime" type="types:Lifetime" nillable="true"/> + <element name="userContext" type="types:UserContext" nillable="true"/> + </sequence> + </complexType> + <element name="register" type="types:register"/> + <element name="registerResponse" type="types:RegistrationContext"/> + + <complexType name="deregister"> + <sequence> + <element name="registrationContext" type="types:RegistrationContext"/> + <element name="userContext" type="types:UserContext" nillable="true"/> + </sequence> + </complexType> + <element name="deregister" type="types:deregister"/> + <element name="deregisterResponse" type="types:ReturnAny"/> + + <complexType name="modifyRegistration"> + <sequence> + <element name="registrationContext" type="types:RegistrationContext" nillable="true"/> + <element name="registrationData" type="types:RegistrationData"/> + <element name="userContext" type="types:UserContext" nillable="true"/> + </sequence> + </complexType> + <element name="modifyRegistration" type="types:modifyRegistration"/> + <element name="modifyRegistrationResponse" type="types:RegistrationState"/> + + <complexType name="getPortletDescription"> + <sequence> + <element name="registrationContext" type="types:RegistrationContext" nillable="true"/> + <element name="portletContext" type="types:PortletContext"/> + <element name="userContext" type="types:UserContext" nillable="true"/> + <element name="desiredLocales" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/> + </sequence> + </complexType> + <element name="getPortletDescription" type="types:getPortletDescription"/> + <element name="getPortletDescriptionResponse" type="types:PortletDescriptionResponse"/> + + <complexType name="clonePortlet"> + <sequence> + <element name="registrationContext" type="types:RegistrationContext" nillable="true"/> + <element name="portletContext" type="types:PortletContext"/> + <element name="userContext" type="types:UserContext" nillable="true"/> + <element name="lifetime" type="types:Lifetime" nillable="true"/> + </sequence> + </complexType> + <element name="clonePortlet" type="types:clonePortlet"/> + <element name="clonePortletResponse" type="types:PortletContext"/> + + <complexType name="copyPortlets"> + <sequence> + <element name="toRegistrationContext" type="types:RegistrationContext" nillable="true"/> + <element name="toUserContext" type="types:UserContext" nillable="true"/> + <element name="fromRegistrationContext" type="types:RegistrationContext" nillable="true"/> + <element name="fromUserContext" type="types:UserContext" nillable="true"/> + <element name="fromPortletContexts" type="types:PortletContext" maxOccurs="unbounded"/> + <element name="lifetime" type="types:Lifetime" nillable="true"/> + </sequence> + </complexType> + <element name="copyPortlets" type="types:copyPortlets"/> + + <complexType name="copyPortletsResponse"> + <sequence> + <element name="copiedPortlets" type="types:CopiedPortlet" minOccurs="0" maxOccurs="unbounded"/> + <element name="failedPortlets" type="types:FailedPortlets" minOccurs="0" maxOccurs="unbounded"/> + <element name="resourceList" type="types:ResourceList" minOccurs="0"/> + <element name="extensions" type="types:Extension" minOccurs="0" maxOccurs="unbounded"/> + </sequence> + </complexType> + <element name="copyPortletsResponse" type="types:copyPortletsResponse"/> + + <complexType name="exportPortlets"> + <sequence> + <element name="registrationContext" type="types:RegistrationContext" nillable="true"/> + <element name="portletContext" type="types:PortletContext" maxOccurs="unbounded"/> + <element name="userContext" type="types:UserContext" nillable="true"/> + <element name="lifetime" type="types:Lifetime" nillable="true"/> + <element name="exportByValueRequired" type="xsd:boolean" minOccurs="0" default="false"/> + </sequence> + </complexType> + <element name="exportPortlets" type="types:exportPortlets"/> + + <complexType name="exportPortletsResponse"> + <sequence> + <element name="exportContext" type="xsd:base64Binary" nillable="true"/> + <element name="exportedPortlet" type="types:ExportedPortlet" minOccurs="0" maxOccurs="unbounded"/> + <element name="failedPortlets" type="types:FailedPortlets" minOccurs="0" maxOccurs="unbounded"/> + <element name="lifetime" type="types:Lifetime" minOccurs="0"/> + <element name="resourceList" type="types:ResourceList" minOccurs="0"/> + <element name="extensions" type="types:Extension" minOccurs="0" maxOccurs="unbounded"/> + </sequence> + </complexType> + <element name="exportPortletsResponse" type="types:exportPortletsResponse"/> + + <complexType name="importPortlets"> + <sequence> + <element name="registrationContext" type="types:RegistrationContext" nillable="true"/> + <element name="importContext" type="xsd:base64Binary" nillable="true"/> + <element name="importPortlet" type="types:ImportPortlet" maxOccurs="unbounded"/> + <element name="userContext" type="types:UserContext" nillable="true"/> + <element name="lifetime" type="types:Lifetime" nillable="true"/> + </sequence> + </complexType> + <element name="importPortlets" type="types:importPortlets"/> + + <complexType name="importPortletsResponse"> + <sequence> + <element name="importedPortlets" type="types:ImportedPortlet" minOccurs="0" maxOccurs="unbounded"/> + <element name="importFailed" type="types:ImportPortletsFailed" minOccurs="0" maxOccurs="unbounded"/> + <element name="resourceList" type="types:ResourceList" minOccurs="0"/> + <element name="extensions" type="types:Extension" minOccurs="0" maxOccurs="unbounded"/> + </sequence> + </complexType> + <element name="importPortletsResponse" type="types:importPortletsResponse"/> + + <complexType name="releaseExport"> + <sequence> + <element name="registrationContext" type="types:RegistrationContext" nillable="true"/> + <element name="exportContext" type="xsd:base64Binary"/> + <element name="userContext" type="types:UserContext" nillable="true"/> + </sequence> + </complexType> + <element name="releaseExport" type="types:releaseExport"/> + <element name="releaseExportResponse" type="types:ReturnAny" nillable="true"/> + + <complexType name="setExportLifetime"> + <sequence> + <element name="registrationContext" type="types:RegistrationContext" nillable="true"/> + <element name="exportContext" type="xsd:base64Binary"/> + <element name="userContext" type="types:UserContext" nillable="true"/> + <element name="lifetime" type="types:Lifetime" nillable="true"/> + </sequence> + </complexType> + <element name="setExportLifetime" type="types:setExportLifetime"/> + <element name="setExportLifetimeResponse" type="types:Lifetime" nillable="true"/> + + <complexType name="destroyPortlets"> + <sequence> + <element name="registrationContext" type="types:RegistrationContext" nillable="true"/> + <element name="portletHandles" type="xsd:string" maxOccurs="unbounded"/> + <element name="userContext" type="types:UserContext" nillable="true"/> + </sequence> + </complexType> + <element name="destroyPortlets" type="types:destroyPortlets"/> + + <complexType name="DestroyPortletsResponse"> + <sequence> + <element name="failedPortlets" type="types:FailedPortlets" minOccurs="0" maxOccurs="unbounded"/> + <element name="extensions" type="types:Extension" minOccurs="0" maxOccurs="unbounded"/> + </sequence> + </complexType> + <element name="destroyPortletsResponse" type="types:DestroyPortletsResponse"/> + + <complexType name="setPortletProperties"> + <sequence> + <element name="registrationContext" type="types:RegistrationContext" nillable="true"/> + <element name="portletContext" type="types:PortletContext"/> + <element name="userContext" type="types:UserContext" nillable="true"/> + <element name="propertyList" type="types:PropertyList"/> + </sequence> + </complexType> + <element name="setPortletProperties" type="types:setPortletProperties"/> + <element name="setPortletPropertiesResponse" type="types:PortletContext"/> + + <complexType name="getPortletProperties"> + <sequence> + <element name="registrationContext" type="types:RegistrationContext" nillable="true"/> + <element name="portletContext" type="types:PortletContext"/> + <element name="userContext" type="types:UserContext" nillable="true"/> + <element name="names" type="xsd:string" nillable="true" maxOccurs="unbounded"/> + </sequence> + </complexType> + <element name="getPortletProperties" type="types:getPortletProperties"/> + <element name="getPortletPropertiesResponse" type="types:PropertyList"/> + + <complexType name="getPortletPropertyDescription"> + <sequence> + <element name="registrationContext" type="types:RegistrationContext" nillable="true"/> + <element name="portletContext" type="types:PortletContext"/> + <element name="userContext" type="types:UserContext" nillable="true"/> + <element name="desiredLocales" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/> + </sequence> + </complexType> + <element name="getPortletPropertyDescription" type="types:getPortletPropertyDescription"/> + + <complexType name="PortletPropertyDescriptionResponse"> + <sequence> + <element name="modelDescription" type="types:ModelDescription" minOccurs="0"/> + <element name="resourceList" type="types:ResourceList" minOccurs="0"/> + <element name="extensions" type="types:Extension" minOccurs="0" maxOccurs="unbounded"/> + </sequence> + </complexType> + <element name="getPortletPropertyDescriptionResponse" type="types:PortletPropertyDescriptionResponse"/> + + <complexType name="releaseSessions"> + <sequence> + <element name="registrationContext" type="types:RegistrationContext" nillable="true"/> + <element name="sessionIDs" type="xsd:string" maxOccurs="unbounded"/> + <element name="userContext" type="types:UserContext" nillable="true"/> + </sequence> + </complexType> + <element name="releaseSessions" type="types:releaseSessions"/> + <element name="releaseSessionsResponse" type="types:ReturnAny"/> + + <complexType name="initCookie"> + <sequence> + <element name="registrationContext" type="types:RegistrationContext" nillable="true"/> + <element name="userContext" type="types:UserContext" nillable="true"/> + </sequence> + </complexType> + <element name="initCookie" type="types:initCookie"/> + <element name="initCookieResponse" type="types:ReturnAny"/> + + <complexType name="getRegistrationLifetime"> + <sequence> + <element name="registrationContext" type="types:RegistrationContext" nillable="true"/> + <element name="userContext" type="types:UserContext" nillable="true"/> + </sequence> + </complexType> + <element name="getRegistrationLifetime" type="types:getRegistrationLifetime"/> + <element name="getRegistrationLifetimeResponse" type="types:Lifetime" nillable="true"/> + + <complexType name="setRegistrationLifetime"> + <sequence> + <element name="registrationContext" type="types:RegistrationContext" nillable="true"/> + <element name="userContext" type="types:UserContext" nillable="true"/> + <element name="lifetime" type="types:Lifetime" nillable="true"/> + </sequence> + </complexType> + <element name="setRegistrationLifetime" type="types:setRegistrationLifetime"/> + <element name="setRegistrationLifetimeResponse" type="types:Lifetime" nillable="true"/> + + <complexType name="getPortletsLifetime"> + <sequence> + <element name="registrationContext" type="types:RegistrationContext" nillable="true"/> + <element name="portletContext" type="types:PortletContext" maxOccurs="unbounded"/> + <element name="userContext" type="types:UserContext" nillable="true"/> + </sequence> + </complexType> + <element name="getPortletsLifetime" type="types:getPortletsLifetime"/> + + <complexType name="getPortletsLifetimeResponse"> + <sequence> + <element name="portletLifetime" type="types:PortletLifetime" minOccurs="0" maxOccurs="unbounded"/> + <element name="failedPortlets" type="types:FailedPortlets" minOccurs="0" maxOccurs="unbounded"/> + <element name="resourceList" type="types:ResourceList" minOccurs="0"/> + <element name="extensions" type="types:Extension" minOccurs="0" maxOccurs="unbounded"/> + </sequence> + </complexType> + <element name="getPortletsLifetimeResponse" type="types:getPortletsLifetimeResponse" nillable="true"/> + + <complexType name="setPortletsLifetime"> + <sequence> + <element name="registrationContext" type="types:RegistrationContext" nillable="true"/> + <element name="portletContext" type="types:PortletContext" maxOccurs="unbounded"/> + <element name="userContext" type="types:UserContext" nillable="true"/> + <element name="lifetime" type="types:Lifetime" nillable="true"/> + </sequence> + </complexType> + <element name="setPortletsLifetime" type="types:setPortletsLifetime"/> + + <complexType name="setPortletsLifetimeResponse"> + <sequence> + <element name="updatedPortlet" type="types:PortletLifetime" minOccurs="0" maxOccurs="unbounded"/> + <element name="failedPortlets" type="types:FailedPortlets" minOccurs="0" maxOccurs="unbounded"/> + <element name="resourceList" type="types:ResourceList" minOccurs="0"/> + <element name="extensions" type="types:Extension" minOccurs="0" maxOccurs="unbounded"/> + </sequence> + </complexType> + <element name="setPortletsLifetimeResponse" type="types:setPortletsLifetimeResponse"/> + +  +  +  + + <complexType name="Fault"> + <sequence/> + </complexType> + + <complexType name="AccessDeniedFault"> + <complexContent> + <extension base="types:Fault"> + <sequence/> + </extension> + </complexContent> + </complexType> + <element name="AccessDenied" type="types:AccessDeniedFault"/> + + <complexType name="InconsistentParametersFault"> + <complexContent> + <extension base="types:Fault"> + <sequence/> + </extension> + </complexContent> + </complexType> + <element name="InconsistentParameters" type="types:InconsistentParametersFault"/> + + <complexType name="InvalidRegistrationFault"> + <complexContent> + <extension base="types:Fault"> + <sequence/> + </extension> + </complexContent> + </complexType> + <element name="InvalidRegistration" type="types:InvalidRegistrationFault"/> + + <complexType name="MissingParametersFault"> + <complexContent> + <extension base="types:Fault"> + <sequence/> + </extension> + </complexContent> + </complexType> + <element name="MissingParameters" type="types:MissingParametersFault"/> + + <complexType name="OperationFailedFault"> + <complexContent> + <extension base="types:Fault"> + <sequence/> + </extension> + </complexContent> + </complexType> + <element name="OperationFailed" type="types:OperationFailedFault"/> + + <complexType name="InvalidHandleFault"> + <complexContent> + <extension base="types:Fault"> + <sequence/> + </extension> + </complexContent> + </complexType> + <element name="InvalidHandle" type="types:InvalidHandleFault"/> + + <complexType name="InvalidUserCategoryFault"> + <complexContent> + <extension base="types:Fault"> + <sequence/> + </extension> + </complexContent> + </complexType> + <element name="InvalidUserCategory" type="types:InvalidUserCategoryFault"/> + + <complexType name="PortletStateChangeRequiredFault"> + <complexContent> + <extension base="types:Fault"> + <sequence/> + </extension> + </complexContent> + </complexType> + + <element name="PortletStateChangeRequired" type="types:PortletStateChangeRequiredFault"/> + + <complexType name="InvalidCookieFault"> + <complexContent> + <extension base="types:Fault"> + <sequence/> + </extension> + </complexContent> + </complexType> + + <element name="InvalidCookie" type="types:InvalidCookieFault"/> + + <complexType name="InvalidSessionFault"> + <complexContent> + <extension base="types:Fault"> + <sequence/> + </extension> + </complexContent> + </complexType> + + <element name="InvalidSession" type="types:InvalidSessionFault"/> + + <complexType name="UnsupportedModeFault"> + <complexContent> + <extension base="types:Fault"> + <sequence/> + </extension> + </complexContent> + </complexType> + <element name="UnsupportedMode" type="types:UnsupportedModeFault"/> + + <complexType name="UnsupportedWindowStateFault"> + <complexContent> + <extension base="types:Fault"> + <sequence/> + </extension> + </complexContent> + </complexType> + <element name="UnsupportedWindowState" type="types:UnsupportedWindowStateFault"/> + + <complexType name="UnsupportedLocaleFault"> + <complexContent> + <extension base="types:Fault"> + <sequence/> + </extension> + </complexContent> + </complexType> + <element name="UnsupportedLocale" type="types:UnsupportedLocaleFault"/> + + <complexType name="UnsupportedMimeTypeFault"> + <complexContent> + <extension base="types:Fault"> + <sequence/> + </extension> + </complexContent> + </complexType> + <element name="UnsupportedMimeType" type="types:UnsupportedMimeTypeFault"/> + + <complexType name="ModifyRegistrationRequiredFault"> + <complexContent> + <extension base="types:Fault"> + <sequence/> + </extension> + </complexContent> + </complexType> + <element name="ModifyRegistrationRequired" type="types:ModifyRegistrationRequiredFault"/> + + <complexType name="ResourceSuspendedFault"> + <complexContent> + <extension base="types:Fault"> + <sequence/> + </extension> + </complexContent> + </complexType> + <element name="ResourceSuspended" type="types:ResourceSuspendedFault"/> + + <complexType name="OperationNotSupportedFault"> + <complexContent> + <extension base="types:Fault"> + <sequence/> + </extension> + </complexContent> + </complexType> + <element name="OperationNotSupported" type="types:OperationNotSupportedFault"/> + + <complexType name="ExportByValueNotSupportedFault"> + <complexContent> + <extension base="types:Fault"> + <sequence/> + </extension> + </complexContent> + </complexType> + <element name="ExportByValueNotSupported" type="types:ExportByValueNotSupportedFault"/> + + <complexType name="ExportNoLongerValidFault"> + <complexContent> + <extension base="types:Fault"> + <sequence/> + </extension> + </complexContent> + </complexType> + <element name="ExportNoLongerValid" type="types:ExportNoLongerValidFault"/> + +  +  +  + <element name="eventHandlingFailed"> + <complexType> + <sequence> + <any minOccurs="0" processContents="lax"/> + </sequence> + </complexType> + </element> + + <element name="newNavigationalContextScope"> + <complexType> + <sequence> + <any minOccurs="0" processContents="lax"/> + </sequence> + </complexType> + </element> + + <element name="newMode"> + <complexType> + <sequence> + <any minOccurs="0" processContents="lax"/> + </sequence> + </complexType> + </element> + + <element name="newWindowState"> + <complexType> + <sequence> + <any minOccurs="0" processContents="lax"/> + </sequence> + </complexType> + </element> + +</schema>

14 years, 1 month

1
0
0 / 0

gatein SVN: r5273 - portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/localization.

by do-not-reply＠jboss.org

Author: mstruk Date: 2010-11-25 11:16:06 -0500 (Thu, 25 Nov 2010) New Revision: 5273 Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/localization/LocalizationFilter.java Log: GTNPORTAL-1693 Add the ability to configure LocalizationFilter's portalLocale Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/localization/LocalizationFilter.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/localization/LocalizationFilter.java 2010-11-25 15:29:30 UTC (rev 5272) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/localization/LocalizationFilter.java 2010-11-25 16:16:06 UTC (rev 5273) @@ -56,15 +56,27 @@ * override for extra-portlet requests (i.e. unbridged .jsp). Thanks to it dynamic resources can be localized * to keep in sync with the rest of the portal. This filter is re-entrant, and can safely be installed for * INCLUDE, FORWARD, and ERROR dispatch methods. - * + * <p> * A concrete example of re-entrant use is login/jsp/login.jsp used when authentication fails at portal login. - * + * <p> * By default {@link HttpServletRequest#getLocale()} and {@link HttpServletRequest#getLocales()} reflect * browser language preference. When using this filter these two calls employ the same Locale determination algorithm - * as LocalizationLifecycle does. - * + * as {@link LocalizationLifecycle} does. + * <p> * This filter can be activated / deactivated via portal module's web.xml - * + * <p> + * If default portal language is other than English, it can be configured for the filter by using PortalLocale init param: + * <p> + * <pre><filter> + * <filter-name>LocalizationFilter</filter-name> + * <filter-class>org.exoplatform.portal.application.localization.LocalizationFilter</filter-class> + * <init-param> + * <param-name>PortalLocale</param-name> + * <param-value>fr_FR</param-value> + * </init-param> + * </filter> + * </pre> + * * @author <a href="mailto:mstrukel@redhat.com">Marko Strukelj</a> */ public class LocalizationFilter implements Filter @@ -73,8 +85,14 @@ private static ThreadLocal<Locale> currentLocale = new ThreadLocal<Locale>(); + private Locale portalLocale = Locale.ENGLISH; + public void init(FilterConfig filterConfig) throws ServletException { + String locale = filterConfig.getInitParameter("PortalLocale"); + locale = locale != null ? locale.trim() : null; + if (locale != null && locale.length() > 0) + portalLocale = LocaleContextInfo.getLocale(locale); } public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException @@ -141,7 +159,7 @@ localeCtx.setUserProfileLocale(getUserProfileLocale(container, req.getRemoteUser())); localeCtx.setRemoteUser(req.getRemoteUser()); - localeCtx.setPortalLocale(Locale.ENGLISH); + localeCtx.setPortalLocale(checkPortalLocaleSupported(portalLocale, supportedLocales)); Locale locale = localePolicy.determineLocale(localeCtx); boolean supported = supportedLocales.contains(locale); @@ -170,6 +188,27 @@ } } + private Locale checkPortalLocaleSupported(Locale portalLocale, Set<Locale> supportedLocales) + { + if (supportedLocales.contains(portalLocale)) + return portalLocale; + if ("".equals(portalLocale.getCountry()) == false) + { + Locale loc = new Locale(portalLocale.getLanguage()); + if (supportedLocales.contains(loc)) + { + log.warn("portalLocale not supported: " + LocaleContextInfo.getLocaleAsString(portalLocale) + + ". Falling back to '" + portalLocale.getLanguage()+ "'."); + this.portalLocale = loc; + return loc; + } + } + + log.warn("portalLocale not supported: " + LocaleContextInfo.getLocaleAsString(portalLocale) + ". Falling back to Locale.ENGLISH."); + this.portalLocale = Locale.ENGLISH; + return portalLocale; + } + private Locale getUserProfileLocale(ExoContainer container, String user) { UserProfile userProfile = null;

14 years, 1 month

1
0
0 / 0

gatein SVN: r5272 - epp/portal/branches/EPP_5_1_Branch.

by do-not-reply＠jboss.org

Author: thomas.heute(a)jboss.com Date: 2010-11-25 10:29:30 -0500 (Thu, 25 Nov 2010) New Revision: 5272 Modified: epp/portal/branches/EPP_5_1_Branch/pom.xml Log: JBEPP-662: Upgrade to eXo JCR 1.12.6-CR02 Modified: epp/portal/branches/EPP_5_1_Branch/pom.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/pom.xml 2010-11-25 14:26:46 UTC (rev 5271) +++ epp/portal/branches/EPP_5_1_Branch/pom.xml 2010-11-25 15:29:30 UTC (rev 5272) @@ -37,10 +37,10 @@ <name>GateIn - Portal</name> <properties> - <org.exoplatform.kernel.version>2.2.6-CR01</org.exoplatform.kernel.version> - <org.exoplatform.core.version>2.3.6-CR01</org.exoplatform.core.version> - <org.exoplatform.ws.version>2.1.6-CR01</org.exoplatform.ws.version> - <org.exoplatform.jcr.version>1.12.6-CR01</org.exoplatform.jcr.version> + <org.exoplatform.kernel.version>2.2.6-CR02</org.exoplatform.kernel.version> + <org.exoplatform.core.version>2.3.6-CR02</org.exoplatform.core.version> + <org.exoplatform.ws.version>2.1.6-CR02</org.exoplatform.ws.version> + <org.exoplatform.jcr.version>1.12.6-CR02</org.exoplatform.jcr.version> <org.jibx.version>1.2.1</org.jibx.version> <org.shindig.version>1.0-r790473-Patch04</org.shindig.version> <nl.captcha.simplecaptcha.version>1.1.1-GA-Patch01</nl.captcha.simplecaptcha.version>

14 years, 1 month

1
0
0 / 0

gatein SVN: r5271 - in components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp: handler and 1 other directory.

by do-not-reply＠jboss.org

Author: chris.laprun(a)jboss.com Date: 2010-11-25 09:26:46 -0500 (Thu, 25 Nov 2010) New Revision: 5271 Modified: components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/handlers/DirectResourceServingHandler.java components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/handler/RequestHeaderClientHandler.java Log: - GTNWSRP-171: Properly send cookies when retrieving a resource directly. Thanks, Matt! - Added RequestHeaderClientHandler.createCookie method to avoid code duplication. Modified: components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/handlers/DirectResourceServingHandler.java =================================================================== --- components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/handlers/DirectResourceServingHandler.java 2010-11-25 12:25:10 UTC (rev 5270) +++ components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/handlers/DirectResourceServingHandler.java 2010-11-25 14:26:46 UTC (rev 5271) @@ -34,6 +34,7 @@ import org.gatein.wsrp.WSRPTypeFactory; import org.gatein.wsrp.consumer.WSRPConsumerImpl; import org.gatein.wsrp.handler.CookieUtil; +import org.gatein.wsrp.handler.RequestHeaderClientHandler; import org.oasis.wsrp.v2.GetResource; import org.oasis.wsrp.v2.ResourceContext; import org.oasis.wsrp.v2.ResourceResponse; @@ -63,6 +64,18 @@ URL url = new URL(resourceURL); URLConnection urlConnection = url.openConnection(); + + ProducerSessionInformation sessionInfo = RequestHeaderClientHandler.getCurrentProducerSessionInformation(); + if (sessionInfo != null) + { + String cookie = RequestHeaderClientHandler.createCookie(sessionInfo); + + if (cookie.length() != 0) + { + urlConnection.addRequestProperty(CookieUtil.COOKIE, cookie); + } + } + String contentType = urlConnection.getContentType(); // init ResponseProperties for ContentResponse result @@ -105,7 +118,7 @@ ResourceContext resourceContext; MediaType type = MediaType.create(contentType); - + //TODO: handle this better, we should probably have a class in the common module to determine if the MediaType should be treated as a text // file or as binary content. We also need to implement the algorithm to determine the character encoding. if (TypeDef.TEXT.equals(type.getType()) || (TypeDef.APPLICATION.equals(type.getType()) && (type.getSubtype().getName().contains("javascript")))) Modified: components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/handler/RequestHeaderClientHandler.java =================================================================== --- components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/handler/RequestHeaderClientHandler.java 2010-11-25 12:25:10 UTC (rev 5270) +++ components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/handler/RequestHeaderClientHandler.java 2010-11-25 14:26:46 UTC (rev 5271) @@ -47,6 +47,7 @@ public class RequestHeaderClientHandler implements SOAPHandler<SOAPMessageContext> { private static final ThreadLocal<CurrentInfo> local = new ThreadLocal<CurrentInfo>(); + private static final String EMPTY = ""; public Set<QName> getHeaders() { @@ -92,7 +93,33 @@ SOAPMessage message = msgContext.getMessage(); MimeHeaders mimeHeaders = message.getMimeHeaders(); - StringBuffer cookie = new StringBuffer(64); + + String cookie = createCookie(info, sessionInfo); + + if (cookie.length() != 0) + { + mimeHeaders.setHeader(CookieUtil.COOKIE, cookie); + } + + return true; + } + + public static String createCookie(ProducerSessionInformation sessionInformation) + { + CurrentInfo currentInfo = getCurrentInfo(false); + if (currentInfo != null) + { + return createCookie(currentInfo, sessionInformation); + } + else + { + return EMPTY; + } + } + + private static String createCookie(CurrentInfo info, ProducerSessionInformation sessionInfo) + { + StringBuilder cookie = new StringBuilder(128); if (sessionInfo.isPerGroupCookies()) { if (info.groupId == null) @@ -116,13 +143,7 @@ } cookie.append(userCookie); } - - if (cookie.length() != 0) - { - mimeHeaders.setHeader(CookieUtil.COOKIE, cookie.toString()); - } - - return true; + return cookie.toString(); } public boolean handleResponse(MessageContext msgContext)

14 years, 1 month

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

gatein-commits November 2010