[gatein-commits] gatein SVN: r6721 - in epp/portal/branches/EPP_5_2_Branch: examples and 27 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Wed Jun 22 22:59:29 EDT 2011
Author: hfnukal
Date: 2011-06-22 22:59:29 -0400 (Wed, 22 Jun 2011)
New Revision: 6721
Added:
epp/portal/branches/EPP_5_2_Branch/packaging/jetty/
epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/
epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/pom.xml
epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/
epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/
epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/
epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/
epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/bin/
epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/bin/commons-logging.properties
epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/bin/exokey.pem
epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/bin/gatein-dev.bat
epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/bin/gatein-dev.sh
epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/bin/gatein.bat
epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/bin/gatein.sh
epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/bin/oauthkey.pem
epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/contexts/
epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/contexts/eXoGadgetServer.xml
epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/contexts/eXoResources.xml
epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/contexts/portal.xml
epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/contexts/rest.xml
epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/etc/
epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/etc/jetty.xml
epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/etc/login.conf
epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/gatein/
epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/gatein/conf/
epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/gatein/conf/configuration.xml
epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/webapps/
epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/webapps/ROOT/
epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/webapps/ROOT/WEB-INF/
epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/webapps/ROOT/WEB-INF/web.xml
epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/webapps/ROOT/index.jsp
epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/transform.xsl
epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pom.xml
epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/jetty-web.xml
epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/application/PortalLogoutLifecycle.java
Removed:
epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/
epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/pom.xml
epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/
epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/
epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/
epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/
epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/bin/
epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/bin/commons-logging.properties
epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/bin/exokey.pem
epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/bin/gatein-dev.bat
epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/bin/gatein-dev.sh
epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/bin/gatein.bat
epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/bin/gatein.sh
epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/bin/oauthkey.pem
epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/contexts/
epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/contexts/eXoGadgetServer.xml
epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/contexts/eXoResources.xml
epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/contexts/portal.xml
epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/contexts/rest.xml
epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/etc/
epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/etc/jetty.xml
epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/etc/login.conf
epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/gatein/
epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/gatein/conf/
epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/gatein/conf/configuration.xml
epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/webapps/
epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/webapps/ROOT/
epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/webapps/ROOT/WEB-INF/
epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/webapps/ROOT/WEB-INF/web.xml
epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/webapps/ROOT/index.jsp
epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/transform.xsl
epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pom.xml
Modified:
epp/portal/branches/EPP_5_2_Branch/
epp/portal/branches/EPP_5_2_Branch/examples/
epp/portal/branches/EPP_5_2_Branch/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/GadgetToken.java
epp/portal/branches/EPP_5_2_Branch/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/GadgetTokenInfoService.java
epp/portal/branches/EPP_5_2_Branch/packaging/jboss-as/ear/pom.xml
epp/portal/branches/EPP_5_2_Branch/packaging/module/pom.xml
epp/portal/branches/EPP_5_2_Branch/packaging/module/src/main/javascript/portal.packaging.module.js
epp/portal/branches/EPP_5_2_Branch/packaging/pkg/pom.xml
epp/portal/branches/EPP_5_2_Branch/packaging/pom.xml
epp/portal/branches/EPP_5_2_Branch/packaging/profiles.xml
epp/portal/branches/EPP_5_2_Branch/pom.xml
epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UISiteManagement.java
epp/portal/branches/EPP_5_2_Branch/server/jboss/patch-ear/src/main/jboss/server/default/deploy/gatein.ear/META-INF/gatein-jboss-beans.xml
epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/common/autologin-configuration.xml
epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/web.xml
epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/webui-configuration.xml
epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/login/UIForgetPassword.java
epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortal.java
epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalActionListener.java
epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComposer.java
Log:
JBEPP-952 Merge Revision 5822
Property changes on: epp/portal/branches/EPP_5_2_Branch
___________________________________________________________________
Modified: svn:mergeinfo
- /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795:5868
/portal/branches/branch-GTNPORTAL-1592:4894
/portal/branches/branch-GTNPORTAL-1643:5002,5063,5167
/portal/branches/branch-GTNPORTAL-1700:5348,5402,5445
/portal/branches/branch-GTNPORTAL-1731:5668
/portal/branches/branch-GTNPORTAL-1745:5765
/portal/branches/branch-GTNPORTAL-1822:5943
/portal/branches/branch-GTNPORTAL-1832:6030,6063
/portal/trunk:4891,5744,5943,6168,6196,6201-6203,6205-6206
+ /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795:5868
/portal/branches/branch-GTNPORTAL-1592:4894
/portal/branches/branch-GTNPORTAL-1643:5002,5063,5167
/portal/branches/branch-GTNPORTAL-1700:5348,5402,5445
/portal/branches/branch-GTNPORTAL-1731:5668
/portal/branches/branch-GTNPORTAL-1745:5765
/portal/branches/branch-GTNPORTAL-1822:5943
/portal/branches/branch-GTNPORTAL-1832:6030,6063
/portal/trunk:4891,5744,5822,5943,6168,6196,6201-6203,6205-6206
Property changes on: epp/portal/branches/EPP_5_2_Branch/examples
___________________________________________________________________
Deleted: svn:mergeinfo
- /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795/examples:5868
/portal/branches/branch-GTNPORTAL-1592/examples:4894
/portal/branches/branch-GTNPORTAL-1643/examples:5002,5063,5167
/portal/branches/branch-GTNPORTAL-1700/examples:5348,5402,5445
/portal/branches/branch-GTNPORTAL-1731/examples:5668
/portal/branches/branch-GTNPORTAL-1745/examples:5765
/portal/branches/branch-GTNPORTAL-1822/examples:5943
/portal/branches/branch-GTNPORTAL-1832/examples:6030,6063
/portal/trunk/examples:4891,5744,5822,5943,6168,6196,6201-6203,6205-6206
Modified: epp/portal/branches/EPP_5_2_Branch/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/GadgetToken.java
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/GadgetToken.java 2011-06-23 02:24:17 UTC (rev 6720)
+++ epp/portal/branches/EPP_5_2_Branch/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/GadgetToken.java 2011-06-23 02:59:29 UTC (rev 6721)
@@ -1,8 +1,8 @@
package org.exoplatform.portal.gadget.core;
import org.apache.shindig.gadgets.oauth.OAuthStore.TokenInfo;
-import org.exoplatform.web.security.Credentials;
import org.exoplatform.web.security.Token;
+import org.gatein.wci.security.Credentials;
public class GadgetToken extends TokenInfo implements Token
Modified: epp/portal/branches/EPP_5_2_Branch/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/GadgetTokenInfoService.java
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/GadgetTokenInfoService.java 2011-06-23 02:24:17 UTC (rev 6720)
+++ epp/portal/branches/EPP_5_2_Branch/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/GadgetTokenInfoService.java 2011-06-23 02:59:29 UTC (rev 6721)
@@ -27,8 +27,8 @@
import org.exoplatform.commons.chromattic.ContextualTask;
import org.exoplatform.commons.chromattic.SessionContext;
import org.exoplatform.container.xml.InitParams;
-import org.exoplatform.web.security.Credentials;
import org.exoplatform.web.security.security.AbstractTokenService;
+import org.gatein.wci.security.Credentials;
import java.util.Collection;
Modified: epp/portal/branches/EPP_5_2_Branch/packaging/jboss-as/ear/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/packaging/jboss-as/ear/pom.xml 2011-06-23 02:24:17 UTC (rev 6720)
+++ epp/portal/branches/EPP_5_2_Branch/packaging/jboss-as/ear/pom.xml 2011-06-23 02:59:29 UTC (rev 6721)
@@ -291,7 +291,7 @@
</dependency>
<dependency>
<groupId>org.gatein.wci</groupId>
- <artifactId>wci-tomcat</artifactId>
+ <artifactId>wci-tomcat6</artifactId>
</dependency>
<dependency>
<groupId>org.gatein.pc</groupId>
Deleted: epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/pom.xml
===================================================================
--- portal/trunk/packaging/jetty/pkg/pom.xml 2011-01-27 09:50:23 UTC (rev 5822)
+++ epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/pom.xml 2011-06-23 02:59:29 UTC (rev 6721)
@@ -1,963 +0,0 @@
-<?xml version="1.0"?>
-<?rename tofile="portal.war"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.exoplatform.portal</groupId>
- <artifactId>exo.portal.parent</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
- </parent>
- <artifactId>exo.portal.packaging.jetty.pkg</artifactId>
- <packaging>pom</packaging>
- <name>GateIn for Jetty packaging</name>
-
- <properties>
- <jetty.dir>${exo.projects.directory.dependencies}/${exo.projects.app.jetty.version}</jetty.dir>
- </properties>
-
- <dependencies>
-
- <!-- Logging -->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-jdk14</artifactId>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
-
- <!-- Apache commons -->
- <dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-chain</groupId>
- <artifactId>commons-chain</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-dbcp</groupId>
- <artifactId>commons-dbcp</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-digester</groupId>
- <artifactId>commons-digester</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-fileupload</groupId>
- <artifactId>commons-fileupload</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-pool</groupId>
- <artifactId>commons-pool</artifactId>
- </dependency>
-
- <!-- JBoss -->
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-common-core</artifactId>
- <version>2.2.9.GA</version>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jbossxb</artifactId>
- <version>2.0.1.GA</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- <version>2.0.5.GA</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.cache</groupId>
- <artifactId>jbosscache-core</artifactId>
- <version>3.2.6.GA</version>
- </dependency>
- <dependency>
- <groupId>jboss.jbossts</groupId>
- <artifactId>jbossjts</artifactId>
- <version>4.6.1.GA</version>
- </dependency>
- <dependency>
- <groupId>jboss.jbossts</groupId>
- <artifactId>jbossts-common</artifactId>
- <version>4.6.1.GA</version>
- </dependency>
- <dependency>
- <groupId>javassist</groupId>
- <artifactId>javassist</artifactId>
- <version>3.4.GA</version>
- </dependency>
- <dependency>
- <groupId>jgroups</groupId>
- <artifactId>jgroups</artifactId>
- <version>2.6.13.GA</version>
- </dependency>
-
- <!-- JCR stack -->
- <dependency>
- <groupId>org.exoplatform.kernel</groupId>
- <artifactId>exo.kernel.commons</artifactId>
- </dependency>
- <dependency>
- <groupId>org.exoplatform.kernel</groupId>
- <artifactId>exo.kernel.component.cache</artifactId>
- </dependency>
- <dependency>
- <groupId>org.exoplatform.kernel</groupId>
- <artifactId>exo.kernel.component.command</artifactId>
- </dependency>
- <dependency>
- <groupId>org.exoplatform.kernel</groupId>
- <artifactId>exo.kernel.component.common</artifactId>
- </dependency>
- <dependency>
- <groupId>org.exoplatform.kernel</groupId>
- <artifactId>exo.kernel.component.remote</artifactId>
- </dependency>
- <dependency>
- <groupId>org.exoplatform.kernel</groupId>
- <artifactId>exo.kernel.container</artifactId>
- </dependency>
- <dependency>
- <groupId>org.exoplatform.kernel</groupId>
- <artifactId>exo.kernel.component.ext.cache.impl.jboss.v3</artifactId>
- </dependency>
- <dependency>
- <groupId>org.exoplatform.core</groupId>
- <artifactId>exo.core.component.organization.api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.exoplatform.core</groupId>
- <artifactId>exo.core.component.database</artifactId>
- </dependency>
- <dependency>
- <groupId>org.exoplatform.core</groupId>
- <artifactId>exo.core.component.organization.jdbc</artifactId>
- </dependency>
- <dependency>
- <groupId>org.exoplatform.core</groupId>
- <artifactId>exo.core.component.organization.ldap</artifactId>
- </dependency>
- <dependency>
- <groupId>org.exoplatform.core</groupId>
- <artifactId>exo.core.component.security.core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.exoplatform.core</groupId>
- <artifactId>exo.core.component.document</artifactId>
- </dependency>
- <dependency>
- <groupId>org.exoplatform.core</groupId>
- <artifactId>exo.core.component.xml-processing</artifactId>
- </dependency>
- <dependency>
- <groupId>org.exoplatform.jcr</groupId>
- <artifactId>exo.jcr.component.core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.exoplatform.jcr</groupId>
- <artifactId>exo.jcr.component.ext</artifactId>
- </dependency>
- <dependency>
- <groupId>org.exoplatform.jcr</groupId>
- <artifactId>exo.jcr.component.webdav</artifactId>
- </dependency>
- <dependency>
- <groupId>org.exoplatform.jcr</groupId>
- <artifactId>exo.jcr.component.ftp</artifactId>
- </dependency>
- <dependency>
- <groupId>org.exoplatform.jcr</groupId>
- <artifactId>exo.jcr.framework.web</artifactId>
- </dependency>
- <dependency>
- <groupId>org.exoplatform.jcr</groupId>
- <artifactId>exo.jcr.framework.command</artifactId>
- </dependency>
- <dependency>
- <groupId>org.exoplatform.ws</groupId>
- <artifactId>exo.ws.commons</artifactId>
- </dependency>
- <dependency>
- <groupId>org.exoplatform.ws</groupId>
- <artifactId>exo.ws.frameworks.json</artifactId>
- </dependency>
- <dependency>
- <groupId>org.exoplatform.ws</groupId>
- <artifactId>exo.ws.frameworks.servlet</artifactId>
- </dependency>
- <dependency>
- <groupId>org.exoplatform.ws</groupId>
- <artifactId>exo.ws.rest.core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.exoplatform.ws</groupId>
- <artifactId>exo.ws.rest.ext</artifactId>
- </dependency>
-
- <!-- Reflext -->
- <dependency>
- <groupId>org.reflext</groupId>
- <artifactId>reflext.api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.reflext</groupId>
- <artifactId>reflext.core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.reflext</groupId>
- <artifactId>reflext.jlr</artifactId>
- </dependency>
- <dependency>
- <groupId>org.reflext</groupId>
- <artifactId>reflext.spi</artifactId>
- </dependency>
-
- <!-- Chromattic -->
- <dependency>
- <groupId>org.chromattic</groupId>
- <artifactId>chromattic.apt</artifactId>
- </dependency>
- <dependency>
- <groupId>org.chromattic</groupId>
- <artifactId>chromattic.api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.chromattic</groupId>
- <artifactId>chromattic.spi</artifactId>
- </dependency>
- <dependency>
- <groupId>org.chromattic</groupId>
- <artifactId>chromattic.common</artifactId>
- </dependency>
- <dependency>
- <groupId>org.chromattic</groupId>
- <artifactId>chromattic.core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.chromattic</groupId>
- <artifactId>chromattic.metamodel</artifactId>
- </dependency>
- <dependency>
- <groupId>org.chromattic</groupId>
- <artifactId>chromattic.ext</artifactId>
- </dependency>
-
- <!-- Picket link -->
- <dependency>
- <groupId>org.picketlink.idm</groupId>
- <artifactId>picketlink-idm-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.picketlink.idm</groupId>
- <artifactId>picketlink-idm-spi</artifactId>
- </dependency>
- <dependency>
- <groupId>org.picketlink.idm</groupId>
- <artifactId>picketlink-idm-cache</artifactId>
- </dependency>
- <dependency>
- <groupId>org.picketlink.idm</groupId>
- <artifactId>picketlink-idm-common</artifactId>
- </dependency>
- <dependency>
- <groupId>org.picketlink.idm</groupId>
- <artifactId>picketlink-idm-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.picketlink.idm</groupId>
- <artifactId>picketlink-idm-hibernate</artifactId>
- </dependency>
- <dependency>
- <groupId>org.picketlink.idm</groupId>
- <artifactId>picketlink-idm-ldap</artifactId>
- </dependency>
-
- <!-- Gatein common -->
- <dependency>
- <groupId>org.gatein.common</groupId>
- <artifactId>common-common</artifactId>
- </dependency>
- <dependency>
- <groupId>org.gatein.common</groupId>
- <artifactId>common-logging</artifactId>
- </dependency>
-
- <!-- Gatein wci -->
- <dependency>
- <groupId>org.gatein.wci</groupId>
- <artifactId>wci-wci</artifactId>
- </dependency>
- <dependency>
- <groupId>org.gatein.wci</groupId>
- <artifactId>wci-jetty</artifactId>
- </dependency>
- <dependency>
- <groupId>org.gatein.wci</groupId>
- <artifactId>wci-exo</artifactId>
- </dependency>
-
- <!-- Gatein PC -->
- <dependency>
- <groupId>org.gatein.pc</groupId>
- <artifactId>pc-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.gatein.pc</groupId>
- <artifactId>pc-portlet</artifactId>
- </dependency>
- <dependency>
- <groupId>org.gatein.pc</groupId>
- <artifactId>pc-controller</artifactId>
- </dependency>
- <dependency>
- <groupId>org.gatein.pc</groupId>
- <artifactId>pc-federation</artifactId>
- </dependency>
- <dependency>
- <groupId>org.gatein.pc</groupId>
- <artifactId>pc-mc</artifactId>
- </dependency>
- <dependency>
- <groupId>org.gatein.pc</groupId>
- <artifactId>pc-bridge</artifactId>
- </dependency>
-
- <!-- GateIn MOP -->
- <dependency>
- <groupId>org.gatein.mop</groupId>
- <artifactId>mop-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.gatein.mop</groupId>
- <artifactId>mop-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.gatein.mop</groupId>
- <artifactId>mop-spi</artifactId>
- </dependency>
-
- <!-- GateIn Captcha -->
- <dependency>
- <groupId>org.gatein.captcha</groupId>
- <artifactId>simplecaptcha</artifactId>
- </dependency>
-
- <!-- GateIn Shinding -->
- <dependency>
- <groupId>org.gatein.shindig</groupId>
- <artifactId>shindig-gadgets</artifactId>
- </dependency>
- <dependency>
- <groupId>org.gatein.shindig</groupId>
- <artifactId>shindig-features</artifactId>
- </dependency>
- <dependency>
- <groupId>org.gatein.shindig</groupId>
- <artifactId>shindig-common</artifactId>
- </dependency>
- <dependency>
- <groupId>org.gatein.shindig</groupId>
- <artifactId>shindig-social-api</artifactId>
- </dependency>
-
- <!-- GateIn -->
- <dependency>
- <groupId>org.exoplatform.portal</groupId>
- <artifactId>exo.portal.component.application-registry</artifactId>
- </dependency>
- <dependency>
- <groupId>org.exoplatform.portal</groupId>
- <artifactId>exo.portal.component.common</artifactId>
- </dependency>
- <dependency>
- <groupId>org.exoplatform.portal</groupId>
- <artifactId>exo.portal.component.identity</artifactId>
- </dependency>
- <dependency>
- <groupId>org.exoplatform.portal</groupId>
- <artifactId>exo.portal.component.management</artifactId>
- </dependency>
- <dependency>
- <groupId>org.exoplatform.portal</groupId>
- <artifactId>exo.portal.component.pc</artifactId>
- </dependency>
- <dependency>
- <groupId>org.exoplatform.portal</groupId>
- <artifactId>exo.portal.component.portal</artifactId>
- </dependency>
- <dependency>
- <groupId>org.exoplatform.portal</groupId>
- <artifactId>exo.portal.component.resources</artifactId>
- </dependency>
- <dependency>
- <groupId>org.exoplatform.portal</groupId>
- <artifactId>exo.portal.component.scripting</artifactId>
- </dependency>
- <dependency>
- <groupId>org.exoplatform.portal</groupId>
- <artifactId>exo.portal.component.web.api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.exoplatform.portal</groupId>
- <artifactId>exo.portal.component.web.controller</artifactId>
- </dependency>
- <dependency>
- <groupId>org.exoplatform.portal</groupId>
- <artifactId>exo.portal.component.web.resources</artifactId>
- </dependency>
- <dependency>
- <groupId>org.exoplatform.portal</groupId>
- <artifactId>exo.portal.component.web.security</artifactId>
- </dependency>
- <dependency>
- <groupId>org.exoplatform.portal</groupId>
- <artifactId>exo.portal.component.web.server</artifactId>
- </dependency>
- <dependency>
- <groupId>org.exoplatform.portal</groupId>
- <artifactId>exo.portal.webui.core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.exoplatform.portal</groupId>
- <artifactId>exo.portal.webui.dashboard</artifactId>
- </dependency>
- <dependency>
- <groupId>org.exoplatform.portal</groupId>
- <artifactId>exo.portal.webui.eXo</artifactId>
- </dependency>
- <dependency>
- <groupId>org.exoplatform.portal</groupId>
- <artifactId>exo.portal.webui.framework</artifactId>
- </dependency>
- <dependency>
- <groupId>org.exoplatform.portal</groupId>
- <artifactId>exo.portal.webui.portal</artifactId>
- </dependency>
- <dependency>
- <groupId>org.exoplatform.portal</groupId>
- <artifactId>exo.portal.webui.portlet</artifactId>
- </dependency>
- <dependency>
- <groupId>org.exoplatform.portal</groupId>
- <artifactId>exo.portal.gadgets-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.exoplatform.portal</groupId>
- <artifactId>gatein.portal.component.wsrp</artifactId>
- </dependency>
-
- <!-- Provided -->
- <dependency>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- <version>1.1</version>
- </dependency>
- <dependency>
- <groupId>javax.jcr</groupId>
- <artifactId>jcr</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>javax.portlet</groupId>
- <artifactId>portlet-api</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>jsr250-api</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>javax.ws.rs</groupId>
- <artifactId>jsr311-api</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>javax.transaction</groupId>
- <artifactId>jta</artifactId>
- <version>1.0.1B</version>
- </dependency>
- <dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- <version>1.4.2</version>
- </dependency>
- <dependency>
- <groupId>javax.resource</groupId>
- <artifactId>connector-api</artifactId>
- <version>1.5</version>
- </dependency>
- <dependency>
- <groupId>javax.ccpp</groupId>
- <artifactId>ccpp</artifactId>
- <version>1.0</version>
- </dependency>
-
- <!-- Hibernate -->
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>ejb3-persistence</artifactId>
- <version>1.0.2.GA</version>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-commons-annotations</artifactId>
- <version>3.1.0.GA</version>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-core</artifactId>
- <version>3.3.2.GA</version>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-annotations</artifactId>
- <version>3.4.0.GA</version>
- </dependency>
-
- <!-- Various -->
- <dependency>
- <groupId>com.google.code.guice</groupId>
- <artifactId>guice</artifactId>
- </dependency>
- <dependency>
- <groupId>com.google.code.guice</groupId>
- <artifactId>guice-jmx</artifactId>
- </dependency>
- <dependency>
- <groupId>antlr</groupId>
- <artifactId>antlr</artifactId>
- <version>2.7.6rc1</version>
- </dependency>
- <dependency>
- <groupId>aopalliance</groupId>
- <artifactId>aopalliance</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>asm</groupId>
- <artifactId>asm</artifactId>
- <version>1.5.3</version>
- </dependency>
- <dependency>
- <groupId>bouncycastle</groupId>
- <artifactId>bcmail-jdk14</artifactId>
- <version>136</version>
- </dependency>
- <dependency>
- <groupId>bouncycastle</groupId>
- <artifactId>bcprov-jdk14</artifactId>
- <version>136</version>
- </dependency>
- <dependency>
- <groupId>caja</groupId>
- <artifactId>caja</artifactId>
- </dependency>
- <dependency>
- <groupId>caja</groupId>
- <artifactId>json_simple</artifactId>
- </dependency>
- <dependency>
- <groupId>cglib</groupId>
- <artifactId>cglib</artifactId>
- <version>2.2</version>
- </dependency>
- <dependency>
- <groupId>oswego-concurrent</groupId>
- <artifactId>concurrent</artifactId>
- <version>1.3.4</version>
- </dependency>
- <dependency>
- <groupId>dom4j</groupId>
- <artifactId>dom4j</artifactId>
- <version>1.6.1</version>
- </dependency>
- <dependency>
- <groupId>net.sf.ehcache</groupId>
- <artifactId>ehcache</artifactId>
- <version>1.6.0</version>
- </dependency>
- <dependency>
- <groupId>com.jhlabs</groupId>
- <artifactId>filters</artifactId>
- <version>2.0.235</version>
- </dependency>
- <dependency>
- <groupId>com.google.collections</groupId>
- <artifactId>google-collections</artifactId>
- </dependency>
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-all</artifactId>
- </dependency>
- <dependency>
- <groupId>hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- </dependency>
- <dependency>
- <groupId>html-parser</groupId>
- <artifactId>html-parser</artifactId>
- <version>1.6</version>
- </dependency>
- <dependency>
- <groupId>com.ibm.icu</groupId>
- <artifactId>icu4j</artifactId>
- </dependency>
- <dependency>
- <groupId>com.lowagie</groupId>
- <artifactId>itext</artifactId>
- <version>2.1.0</version>
- </dependency>
- <dependency>
- <groupId>net.jcip</groupId>
- <artifactId>jcip-annotations</artifactId>
- </dependency>
- <dependency>
- <groupId>jdom</groupId>
- <artifactId>jdom</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>org.jibx</groupId>
- <artifactId>jibx-bind</artifactId>
- <version>${org.jibx.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jibx</groupId>
- <artifactId>jibx-run</artifactId>
- <version>${org.jibx.version}</version>
- </dependency>
- <dependency>
- <groupId>joda-time</groupId>
- <artifactId>joda-time</artifactId>
- <version>1.6</version>
- </dependency>
- <dependency>
- <groupId>rhino</groupId>
- <artifactId>js</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jsecurity</groupId>
- <artifactId>jsecurity</artifactId>
- <version>0.9.0</version>
- </dependency>
- <dependency>
- <groupId>org.json</groupId>
- <artifactId>json</artifactId>
- </dependency>
- <dependency>
- <groupId>de.odysseus.juel</groupId>
- <artifactId>juel-api</artifactId>
- <version>2.1.2</version>
- </dependency>
- <dependency>
- <groupId>de.odysseus.juel</groupId>
- <artifactId>juel-impl</artifactId>
- <version>2.1.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-core</artifactId>
- <version>2.4.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-memory</artifactId>
- <version>2.4.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-spellchecker</artifactId>
- <version>2.4.1</version>
- </dependency>
- <dependency>
- <groupId>net.sourceforge.nekohtml</groupId>
- <artifactId>nekohtml</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.pdfbox</groupId>
- <artifactId>pdfbox</artifactId>
- <version>1.1.0</version>
- </dependency>
- <dependency>
- <groupId>picocontainer</groupId>
- <artifactId>picocontainer</artifactId>
- <version>1.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.poi</groupId>
- <artifactId>poi</artifactId>
- <version>3.6</version>
- </dependency>
- <dependency>
- <groupId>org.apache.poi</groupId>
- <artifactId>poi-ooxml</artifactId>
- <version>3.6</version>
- </dependency>
- <dependency>
- <groupId>org.apache.poi</groupId>
- <artifactId>poi-scratchpad</artifactId>
- <version>3.6</version>
- </dependency>
- <dependency>
- <groupId>org.apache.portals.bridges</groupId>
- <artifactId>portals-bridges-common</artifactId>
- <version>1.0.4</version>
- </dependency>
- <dependency>
- <groupId>quartz</groupId>
- <artifactId>quartz</artifactId>
- <version>1.5.2</version>
- </dependency>
- <dependency>
- <groupId>rome</groupId>
- <artifactId>rome</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.sanselan</groupId>
- <artifactId>sanselan</artifactId>
- <version>0.97-incubator</version>
- </dependency>
- <dependency>
- <groupId>org.apache.ws.commons</groupId>
- <artifactId>ws-commons-util</artifactId>
- <version>1.0.1</version>
- </dependency>
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.xmlbeans</groupId>
- <artifactId>xmlbeans</artifactId>
- <version>2.3.0</version>
- </dependency>
- <dependency>
- <groupId>xpp3</groupId>
- <artifactId>xpp3</artifactId>
- <version>1.1.3.4.O</version>
- </dependency>
- <dependency>
- <groupId>com.thoughtworks.xstream</groupId>
- <artifactId>xstream</artifactId>
- <version>1.3.1</version>
- </dependency>
- <dependency>
- <groupId>net.oauth</groupId>
- <artifactId>core</artifactId>
- </dependency>
-
- <!-- War files -->
- <dependency>
- <?rename portal.war?>
- <groupId>org.exoplatform.portal</groupId>
- <artifactId>exo.portal.web.portal</artifactId>
- <type>war</type>
- </dependency>
- <dependency>
- <?rename eXoGadgetServer.war?>
- <groupId>org.exoplatform.portal</groupId>
- <artifactId>exo.portal.gadgets-server</artifactId>
- <type>war</type>
- </dependency>
- <dependency>
- <?rename eXoGadgets.war?>
- <groupId>org.exoplatform.portal</groupId>
- <artifactId>exo.portal.eXoGadgets</artifactId>
- <type>war</type>
- </dependency>
- <dependency>
- <?rename web.war?>
- <groupId>org.exoplatform.portal</groupId>
- <artifactId>exo.portal.portlet.web</artifactId>
- <type>war</type>
- </dependency>
- <dependency>
- <?rename rest.war?>
- <groupId>org.exoplatform.portal</groupId>
- <artifactId>exo.portal.web.rest</artifactId>
- <type>war</type>
- </dependency>
- <dependency>
- <?rename exoadmin.war?>
- <groupId>org.exoplatform.portal</groupId>
- <artifactId>exo.portal.portlet.exoadmin</artifactId>
- <type>war</type>
- </dependency>
- <dependency>
- <?rename eXoResources.war?>
- <groupId>org.exoplatform.portal</groupId>
- <artifactId>exo.portal.web.eXoResources</artifactId>
- <type>war</type>
- </dependency>
-
- <dependency>
- <?rename gatein-sample-skin.war?>
- <groupId>org.gatein.portal.examples.skins</groupId>
- <artifactId>gatein-sample-skin</artifactId>
- <type>war</type>
- </dependency>
-
- <dependency>
- <?rename dashboard.war?>
- <groupId>org.exoplatform.portal</groupId>
- <artifactId>exo.portal.portlet.dashboard</artifactId>
- <type>war</type>
- </dependency>
-
- </dependencies>
-
- <build>
- <plugins>
-
- <!-- Ensure your environment is correctly setup -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <executions>
- <execution>
- <id>tomcat-check-environment-ready</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- <configuration>
- <rules>
- <requireProperty>
- <property>exo.projects.directory.dependencies</property>
- <message>"You must define the property exo.projects.directory.dependencies to give the path to the directory where you store your applications servers"</message>
- </requireProperty>
- <requireProperty>
- <property>exo.projects.app.jetty.version</property>
- <message>"You must define the property exo.projects.app.jetty.version to give the name of the directory where is stored jetty"</message>
- </requireProperty>
- </rules>
- <fail>true</fail>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.6</version>
- <executions>
- <execution>
- <id>prepare-package</id>
- <phase>prepare-package</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <target>
-
- <!-- Copy the dependencies -->
- <dependencyfilesets/>
- <xslt
- basedir="${project.basedir}"
- destdir="${project.build.directory}"
- includes="pom.xml"
- extension=".xml"
- style="${project.basedir}/transform.xsl">
- <param name="lib.dir" expression="${project.build.directory}/jetty/lib"/>
- <param name="webapps.dir" expression="${project.build.directory}/jetty/webapps"/>
- <mapper type="glob" from="pom.xml" to="copy-dependencies.xml"/>
- </xslt>
- <ant antfile="${project.build.directory}/copy-dependencies.xml" inheritRefs="true">
- <target name="copy-dependencies" />
- </ant>
-
- <!-- Copy jetty -->
- <copy todir="${project.build.directory}/jetty">
- <fileset dir="${jetty.dir}">
- <exclude name="webapps/**"/>
- <exclude name="contexts/**"/>
- </fileset>
- </copy>
-
- <!-- Copy configuration -->
- <copy todir="${project.build.directory}/jetty" overwrite="true">
- <fileset dir="${project.basedir}/src/main/resources/jetty"/>
- </copy>
-
- <!-- Copy configuration -->
- <copy tofile="${project.build.directory}/jetty/gatein/conf/configuration.properties">
- <fileset dir="${project.basedir}/../../../component/common/src/main/java/conf" includes="configuration-jetty.properties"/>
- </copy>
-
- <!-- File permissions -->
- <chmod perm="0644" type="file" dir="${project.build.directory}/jetty/bin" excludes="**/*.sh"/>
- <chmod perm="0755" type="file" dir="${project.build.directory}/jetty/bin" includes="**/*.sh"/>
-
- </target>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
- <profile>
- <id>bundle</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.6</version>
- <executions>
- <execution>
- <id>package</id>
- <phase>package</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <target>
- <zip destfile="${project.build.directory}/jetty.zip" basedir="${project.build.directory}/jetty"/>
- <attachartifact file="${project.build.directory}/jetty.zip" classifier="bundle" type="zip"/>
- </target>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
-</project>
\ No newline at end of file
Copied: epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/pom.xml (from rev 5822, portal/trunk/packaging/jetty/pkg/pom.xml)
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/pom.xml (rev 0)
+++ epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/pom.xml 2011-06-23 02:59:29 UTC (rev 6721)
@@ -0,0 +1,963 @@
+<?xml version="1.0"?>
+<?rename tofile="portal.war"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.exoplatform.portal</groupId>
+ <artifactId>exo.portal.parent</artifactId>
+ <version>3.2.0-Beta01-SNAPSHOT</version>
+ </parent>
+ <artifactId>exo.portal.packaging.jetty.pkg</artifactId>
+ <packaging>pom</packaging>
+ <name>GateIn for Jetty packaging</name>
+
+ <properties>
+ <jetty.dir>${exo.projects.directory.dependencies}/${exo.projects.app.jetty.version}</jetty.dir>
+ </properties>
+
+ <dependencies>
+
+ <!-- Logging -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jdk14</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </dependency>
+
+ <!-- Apache commons -->
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-chain</groupId>
+ <artifactId>commons-chain</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-dbcp</groupId>
+ <artifactId>commons-dbcp</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-digester</groupId>
+ <artifactId>commons-digester</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-fileupload</groupId>
+ <artifactId>commons-fileupload</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-pool</groupId>
+ <artifactId>commons-pool</artifactId>
+ </dependency>
+
+ <!-- JBoss -->
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-common-core</artifactId>
+ <version>2.2.9.GA</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossxb</artifactId>
+ <version>2.0.1.GA</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ <version>2.0.5.GA</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.cache</groupId>
+ <artifactId>jbosscache-core</artifactId>
+ <version>3.2.6.GA</version>
+ </dependency>
+ <dependency>
+ <groupId>jboss.jbossts</groupId>
+ <artifactId>jbossjts</artifactId>
+ <version>4.6.1.GA</version>
+ </dependency>
+ <dependency>
+ <groupId>jboss.jbossts</groupId>
+ <artifactId>jbossts-common</artifactId>
+ <version>4.6.1.GA</version>
+ </dependency>
+ <dependency>
+ <groupId>javassist</groupId>
+ <artifactId>javassist</artifactId>
+ <version>3.4.GA</version>
+ </dependency>
+ <dependency>
+ <groupId>jgroups</groupId>
+ <artifactId>jgroups</artifactId>
+ <version>2.6.13.GA</version>
+ </dependency>
+
+ <!-- JCR stack -->
+ <dependency>
+ <groupId>org.exoplatform.kernel</groupId>
+ <artifactId>exo.kernel.commons</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.exoplatform.kernel</groupId>
+ <artifactId>exo.kernel.component.cache</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.exoplatform.kernel</groupId>
+ <artifactId>exo.kernel.component.command</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.exoplatform.kernel</groupId>
+ <artifactId>exo.kernel.component.common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.exoplatform.kernel</groupId>
+ <artifactId>exo.kernel.component.remote</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.exoplatform.kernel</groupId>
+ <artifactId>exo.kernel.container</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.exoplatform.kernel</groupId>
+ <artifactId>exo.kernel.component.ext.cache.impl.jboss.v3</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.exoplatform.core</groupId>
+ <artifactId>exo.core.component.organization.api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.exoplatform.core</groupId>
+ <artifactId>exo.core.component.database</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.exoplatform.core</groupId>
+ <artifactId>exo.core.component.organization.jdbc</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.exoplatform.core</groupId>
+ <artifactId>exo.core.component.organization.ldap</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.exoplatform.core</groupId>
+ <artifactId>exo.core.component.security.core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.exoplatform.core</groupId>
+ <artifactId>exo.core.component.document</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.exoplatform.core</groupId>
+ <artifactId>exo.core.component.xml-processing</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.exoplatform.jcr</groupId>
+ <artifactId>exo.jcr.component.core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.exoplatform.jcr</groupId>
+ <artifactId>exo.jcr.component.ext</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.exoplatform.jcr</groupId>
+ <artifactId>exo.jcr.component.webdav</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.exoplatform.jcr</groupId>
+ <artifactId>exo.jcr.component.ftp</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.exoplatform.jcr</groupId>
+ <artifactId>exo.jcr.framework.web</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.exoplatform.jcr</groupId>
+ <artifactId>exo.jcr.framework.command</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.exoplatform.ws</groupId>
+ <artifactId>exo.ws.commons</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.exoplatform.ws</groupId>
+ <artifactId>exo.ws.frameworks.json</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.exoplatform.ws</groupId>
+ <artifactId>exo.ws.frameworks.servlet</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.exoplatform.ws</groupId>
+ <artifactId>exo.ws.rest.core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.exoplatform.ws</groupId>
+ <artifactId>exo.ws.rest.ext</artifactId>
+ </dependency>
+
+ <!-- Reflext -->
+ <dependency>
+ <groupId>org.reflext</groupId>
+ <artifactId>reflext.api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.reflext</groupId>
+ <artifactId>reflext.core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.reflext</groupId>
+ <artifactId>reflext.jlr</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.reflext</groupId>
+ <artifactId>reflext.spi</artifactId>
+ </dependency>
+
+ <!-- Chromattic -->
+ <dependency>
+ <groupId>org.chromattic</groupId>
+ <artifactId>chromattic.apt</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.chromattic</groupId>
+ <artifactId>chromattic.api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.chromattic</groupId>
+ <artifactId>chromattic.spi</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.chromattic</groupId>
+ <artifactId>chromattic.common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.chromattic</groupId>
+ <artifactId>chromattic.core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.chromattic</groupId>
+ <artifactId>chromattic.metamodel</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.chromattic</groupId>
+ <artifactId>chromattic.ext</artifactId>
+ </dependency>
+
+ <!-- Picket link -->
+ <dependency>
+ <groupId>org.picketlink.idm</groupId>
+ <artifactId>picketlink-idm-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.picketlink.idm</groupId>
+ <artifactId>picketlink-idm-spi</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.picketlink.idm</groupId>
+ <artifactId>picketlink-idm-cache</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.picketlink.idm</groupId>
+ <artifactId>picketlink-idm-common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.picketlink.idm</groupId>
+ <artifactId>picketlink-idm-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.picketlink.idm</groupId>
+ <artifactId>picketlink-idm-hibernate</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.picketlink.idm</groupId>
+ <artifactId>picketlink-idm-ldap</artifactId>
+ </dependency>
+
+ <!-- Gatein common -->
+ <dependency>
+ <groupId>org.gatein.common</groupId>
+ <artifactId>common-common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.gatein.common</groupId>
+ <artifactId>common-logging</artifactId>
+ </dependency>
+
+ <!-- Gatein wci -->
+ <dependency>
+ <groupId>org.gatein.wci</groupId>
+ <artifactId>wci-wci</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.gatein.wci</groupId>
+ <artifactId>wci-jetty</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.gatein.wci</groupId>
+ <artifactId>wci-exo</artifactId>
+ </dependency>
+
+ <!-- Gatein PC -->
+ <dependency>
+ <groupId>org.gatein.pc</groupId>
+ <artifactId>pc-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.gatein.pc</groupId>
+ <artifactId>pc-portlet</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.gatein.pc</groupId>
+ <artifactId>pc-controller</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.gatein.pc</groupId>
+ <artifactId>pc-federation</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.gatein.pc</groupId>
+ <artifactId>pc-mc</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.gatein.pc</groupId>
+ <artifactId>pc-bridge</artifactId>
+ </dependency>
+
+ <!-- GateIn MOP -->
+ <dependency>
+ <groupId>org.gatein.mop</groupId>
+ <artifactId>mop-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.gatein.mop</groupId>
+ <artifactId>mop-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.gatein.mop</groupId>
+ <artifactId>mop-spi</artifactId>
+ </dependency>
+
+ <!-- GateIn Captcha -->
+ <dependency>
+ <groupId>org.gatein.captcha</groupId>
+ <artifactId>simplecaptcha</artifactId>
+ </dependency>
+
+ <!-- GateIn Shinding -->
+ <dependency>
+ <groupId>org.gatein.shindig</groupId>
+ <artifactId>shindig-gadgets</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.gatein.shindig</groupId>
+ <artifactId>shindig-features</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.gatein.shindig</groupId>
+ <artifactId>shindig-common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.gatein.shindig</groupId>
+ <artifactId>shindig-social-api</artifactId>
+ </dependency>
+
+ <!-- GateIn -->
+ <dependency>
+ <groupId>org.exoplatform.portal</groupId>
+ <artifactId>exo.portal.component.application-registry</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.exoplatform.portal</groupId>
+ <artifactId>exo.portal.component.common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.exoplatform.portal</groupId>
+ <artifactId>exo.portal.component.identity</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.exoplatform.portal</groupId>
+ <artifactId>exo.portal.component.management</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.exoplatform.portal</groupId>
+ <artifactId>exo.portal.component.pc</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.exoplatform.portal</groupId>
+ <artifactId>exo.portal.component.portal</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.exoplatform.portal</groupId>
+ <artifactId>exo.portal.component.resources</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.exoplatform.portal</groupId>
+ <artifactId>exo.portal.component.scripting</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.exoplatform.portal</groupId>
+ <artifactId>exo.portal.component.web.api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.exoplatform.portal</groupId>
+ <artifactId>exo.portal.component.web.controller</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.exoplatform.portal</groupId>
+ <artifactId>exo.portal.component.web.resources</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.exoplatform.portal</groupId>
+ <artifactId>exo.portal.component.web.security</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.exoplatform.portal</groupId>
+ <artifactId>exo.portal.component.web.server</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.exoplatform.portal</groupId>
+ <artifactId>exo.portal.webui.core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.exoplatform.portal</groupId>
+ <artifactId>exo.portal.webui.dashboard</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.exoplatform.portal</groupId>
+ <artifactId>exo.portal.webui.eXo</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.exoplatform.portal</groupId>
+ <artifactId>exo.portal.webui.framework</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.exoplatform.portal</groupId>
+ <artifactId>exo.portal.webui.portal</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.exoplatform.portal</groupId>
+ <artifactId>exo.portal.webui.portlet</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.exoplatform.portal</groupId>
+ <artifactId>exo.portal.gadgets-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.exoplatform.portal</groupId>
+ <artifactId>gatein.portal.component.wsrp</artifactId>
+ </dependency>
+
+ <!-- Provided -->
+ <dependency>
+ <groupId>javax.activation</groupId>
+ <artifactId>activation</artifactId>
+ <version>1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.jcr</groupId>
+ <artifactId>jcr</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.portlet</groupId>
+ <artifactId>portlet-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>jsr250-api</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.ws.rs</groupId>
+ <artifactId>jsr311-api</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.transaction</groupId>
+ <artifactId>jta</artifactId>
+ <version>1.0.1B</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ <version>1.4.2</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.resource</groupId>
+ <artifactId>connector-api</artifactId>
+ <version>1.5</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.ccpp</groupId>
+ <artifactId>ccpp</artifactId>
+ <version>1.0</version>
+ </dependency>
+
+ <!-- Hibernate -->
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>ejb3-persistence</artifactId>
+ <version>1.0.2.GA</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-commons-annotations</artifactId>
+ <version>3.1.0.GA</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core</artifactId>
+ <version>3.3.2.GA</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-annotations</artifactId>
+ <version>3.4.0.GA</version>
+ </dependency>
+
+ <!-- Various -->
+ <dependency>
+ <groupId>com.google.code.guice</groupId>
+ <artifactId>guice</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.google.code.guice</groupId>
+ <artifactId>guice-jmx</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>antlr</groupId>
+ <artifactId>antlr</artifactId>
+ <version>2.7.6rc1</version>
+ </dependency>
+ <dependency>
+ <groupId>aopalliance</groupId>
+ <artifactId>aopalliance</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
+ <version>1.5.3</version>
+ </dependency>
+ <dependency>
+ <groupId>bouncycastle</groupId>
+ <artifactId>bcmail-jdk14</artifactId>
+ <version>136</version>
+ </dependency>
+ <dependency>
+ <groupId>bouncycastle</groupId>
+ <artifactId>bcprov-jdk14</artifactId>
+ <version>136</version>
+ </dependency>
+ <dependency>
+ <groupId>caja</groupId>
+ <artifactId>caja</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>caja</groupId>
+ <artifactId>json_simple</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>cglib</groupId>
+ <artifactId>cglib</artifactId>
+ <version>2.2</version>
+ </dependency>
+ <dependency>
+ <groupId>oswego-concurrent</groupId>
+ <artifactId>concurrent</artifactId>
+ <version>1.3.4</version>
+ </dependency>
+ <dependency>
+ <groupId>dom4j</groupId>
+ <artifactId>dom4j</artifactId>
+ <version>1.6.1</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.ehcache</groupId>
+ <artifactId>ehcache</artifactId>
+ <version>1.6.0</version>
+ </dependency>
+ <dependency>
+ <groupId>com.jhlabs</groupId>
+ <artifactId>filters</artifactId>
+ <version>2.0.235</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.collections</groupId>
+ <artifactId>google-collections</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-all</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>html-parser</groupId>
+ <artifactId>html-parser</artifactId>
+ <version>1.6</version>
+ </dependency>
+ <dependency>
+ <groupId>com.ibm.icu</groupId>
+ <artifactId>icu4j</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.lowagie</groupId>
+ <artifactId>itext</artifactId>
+ <version>2.1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>net.jcip</groupId>
+ <artifactId>jcip-annotations</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jdom</groupId>
+ <artifactId>jdom</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jibx</groupId>
+ <artifactId>jibx-bind</artifactId>
+ <version>${org.jibx.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jibx</groupId>
+ <artifactId>jibx-run</artifactId>
+ <version>${org.jibx.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>joda-time</groupId>
+ <artifactId>joda-time</artifactId>
+ <version>1.6</version>
+ </dependency>
+ <dependency>
+ <groupId>rhino</groupId>
+ <artifactId>js</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jsecurity</groupId>
+ <artifactId>jsecurity</artifactId>
+ <version>0.9.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.json</groupId>
+ <artifactId>json</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>de.odysseus.juel</groupId>
+ <artifactId>juel-api</artifactId>
+ <version>2.1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>de.odysseus.juel</groupId>
+ <artifactId>juel-impl</artifactId>
+ <version>2.1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-core</artifactId>
+ <version>2.4.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-memory</artifactId>
+ <version>2.4.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-spellchecker</artifactId>
+ <version>2.4.1</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sourceforge.nekohtml</groupId>
+ <artifactId>nekohtml</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.pdfbox</groupId>
+ <artifactId>pdfbox</artifactId>
+ <version>1.1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>picocontainer</groupId>
+ <artifactId>picocontainer</artifactId>
+ <version>1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.poi</groupId>
+ <artifactId>poi</artifactId>
+ <version>3.6</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.poi</groupId>
+ <artifactId>poi-ooxml</artifactId>
+ <version>3.6</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.poi</groupId>
+ <artifactId>poi-scratchpad</artifactId>
+ <version>3.6</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.portals.bridges</groupId>
+ <artifactId>portals-bridges-common</artifactId>
+ <version>1.0.4</version>
+ </dependency>
+ <dependency>
+ <groupId>quartz</groupId>
+ <artifactId>quartz</artifactId>
+ <version>1.5.2</version>
+ </dependency>
+ <dependency>
+ <groupId>rome</groupId>
+ <artifactId>rome</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sanselan</groupId>
+ <artifactId>sanselan</artifactId>
+ <version>0.97-incubator</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ws.commons</groupId>
+ <artifactId>ws-commons-util</artifactId>
+ <version>1.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xmlbeans</groupId>
+ <artifactId>xmlbeans</artifactId>
+ <version>2.3.0</version>
+ </dependency>
+ <dependency>
+ <groupId>xpp3</groupId>
+ <artifactId>xpp3</artifactId>
+ <version>1.1.3.4.O</version>
+ </dependency>
+ <dependency>
+ <groupId>com.thoughtworks.xstream</groupId>
+ <artifactId>xstream</artifactId>
+ <version>1.3.1</version>
+ </dependency>
+ <dependency>
+ <groupId>net.oauth</groupId>
+ <artifactId>core</artifactId>
+ </dependency>
+
+ <!-- War files -->
+ <dependency>
+ <?rename portal.war?>
+ <groupId>org.exoplatform.portal</groupId>
+ <artifactId>exo.portal.web.portal</artifactId>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <?rename eXoGadgetServer.war?>
+ <groupId>org.exoplatform.portal</groupId>
+ <artifactId>exo.portal.gadgets-server</artifactId>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <?rename eXoGadgets.war?>
+ <groupId>org.exoplatform.portal</groupId>
+ <artifactId>exo.portal.eXoGadgets</artifactId>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <?rename web.war?>
+ <groupId>org.exoplatform.portal</groupId>
+ <artifactId>exo.portal.portlet.web</artifactId>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <?rename rest.war?>
+ <groupId>org.exoplatform.portal</groupId>
+ <artifactId>exo.portal.web.rest</artifactId>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <?rename exoadmin.war?>
+ <groupId>org.exoplatform.portal</groupId>
+ <artifactId>exo.portal.portlet.exoadmin</artifactId>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <?rename eXoResources.war?>
+ <groupId>org.exoplatform.portal</groupId>
+ <artifactId>exo.portal.web.eXoResources</artifactId>
+ <type>war</type>
+ </dependency>
+
+ <dependency>
+ <?rename gatein-sample-skin.war?>
+ <groupId>org.gatein.portal.examples.skins</groupId>
+ <artifactId>gatein-sample-skin</artifactId>
+ <type>war</type>
+ </dependency>
+
+ <dependency>
+ <?rename dashboard.war?>
+ <groupId>org.exoplatform.portal</groupId>
+ <artifactId>exo.portal.portlet.dashboard</artifactId>
+ <type>war</type>
+ </dependency>
+
+ </dependencies>
+
+ <build>
+ <plugins>
+
+ <!-- Ensure your environment is correctly setup -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>tomcat-check-environment-ready</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <requireProperty>
+ <property>exo.projects.directory.dependencies</property>
+ <message>"You must define the property exo.projects.directory.dependencies to give the path to the directory where you store your applications servers"</message>
+ </requireProperty>
+ <requireProperty>
+ <property>exo.projects.app.jetty.version</property>
+ <message>"You must define the property exo.projects.app.jetty.version to give the name of the directory where is stored jetty"</message>
+ </requireProperty>
+ </rules>
+ <fail>true</fail>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.6</version>
+ <executions>
+ <execution>
+ <id>prepare-package</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <target>
+
+ <!-- Copy the dependencies -->
+ <dependencyfilesets/>
+ <xslt
+ basedir="${project.basedir}"
+ destdir="${project.build.directory}"
+ includes="pom.xml"
+ extension=".xml"
+ style="${project.basedir}/transform.xsl">
+ <param name="lib.dir" expression="${project.build.directory}/jetty/lib"/>
+ <param name="webapps.dir" expression="${project.build.directory}/jetty/webapps"/>
+ <mapper type="glob" from="pom.xml" to="copy-dependencies.xml"/>
+ </xslt>
+ <ant antfile="${project.build.directory}/copy-dependencies.xml" inheritRefs="true">
+ <target name="copy-dependencies" />
+ </ant>
+
+ <!-- Copy jetty -->
+ <copy todir="${project.build.directory}/jetty">
+ <fileset dir="${jetty.dir}">
+ <exclude name="webapps/**"/>
+ <exclude name="contexts/**"/>
+ </fileset>
+ </copy>
+
+ <!-- Copy configuration -->
+ <copy todir="${project.build.directory}/jetty" overwrite="true">
+ <fileset dir="${project.basedir}/src/main/resources/jetty"/>
+ </copy>
+
+ <!-- Copy configuration -->
+ <copy tofile="${project.build.directory}/jetty/gatein/conf/configuration.properties">
+ <fileset dir="${project.basedir}/../../../component/common/src/main/java/conf" includes="configuration-jetty.properties"/>
+ </copy>
+
+ <!-- File permissions -->
+ <chmod perm="0644" type="file" dir="${project.build.directory}/jetty/bin" excludes="**/*.sh"/>
+ <chmod perm="0755" type="file" dir="${project.build.directory}/jetty/bin" includes="**/*.sh"/>
+
+ </target>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <profiles>
+ <profile>
+ <id>bundle</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.6</version>
+ <executions>
+ <execution>
+ <id>package</id>
+ <phase>package</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <target>
+ <zip destfile="${project.build.directory}/jetty.zip" basedir="${project.build.directory}/jetty"/>
+ <attachartifact file="${project.build.directory}/jetty.zip" classifier="bundle" type="zip"/>
+ </target>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
+</project>
\ No newline at end of file
Deleted: epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/bin/commons-logging.properties
===================================================================
--- portal/trunk/packaging/jetty/pkg/src/main/resources/jetty/bin/commons-logging.properties 2011-01-27 09:50:23 UTC (rev 5822)
+++ epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/bin/commons-logging.properties 2011-06-23 02:59:29 UTC (rev 6721)
@@ -1,3 +0,0 @@
-# Configure commons logging to use JDK logger
-org.apache.commons.logging.LogFactory=org.apache.commons.logging.impl.LogFactoryImpl
-org.apache.commons.logging.Log=org.apache.commons.logging.impl.Jdk14Logger
Copied: epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/bin/commons-logging.properties (from rev 5822, portal/trunk/packaging/jetty/pkg/src/main/resources/jetty/bin/commons-logging.properties)
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/bin/commons-logging.properties (rev 0)
+++ epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/bin/commons-logging.properties 2011-06-23 02:59:29 UTC (rev 6721)
@@ -0,0 +1,3 @@
+# Configure commons logging to use JDK logger
+org.apache.commons.logging.LogFactory=org.apache.commons.logging.impl.LogFactoryImpl
+org.apache.commons.logging.Log=org.apache.commons.logging.impl.Jdk14Logger
Deleted: epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/bin/exokey.pem
===================================================================
--- portal/trunk/packaging/jetty/pkg/src/main/resources/jetty/bin/exokey.pem 2011-01-27 09:50:23 UTC (rev 5822)
+++ epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/bin/exokey.pem 2011-06-23 02:59:29 UTC (rev 6721)
@@ -1,29 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIICXAIBAAKBgQDMYzu2ZJb6Mt89RxjYcPb01clMna7PJTm+UneDYELKjG6EZ4Nu
-+v8Di7e2PxpNlW4cCwUiEkiWBrZH8S1caz4CYIAG+VmKXZXBgmNCINgRVzNtj0/E
-4xi5Yz+G1uGCkaB+1mheJWke1rO6SgL6tJ5LmEYCGGu0mj+vxD8W2i4nBwIDAQAB
-AoGAJS1zwiSf9djlFI9nLI+3zCdLG32fO5zI2R7FEIek/pT20WzG0pwjYPC8NRFb
-Zntk8QLsJxtuSqPj6kgreSEkwRR/YGVIo/xIr46vwl/WydMLKJljvu+E7Y4yjYHb
-X4+FDRSL+huOMNNrHgnMy8WnplvtuW5LNV4kD3izU37jxQECQQD15re+8J3C8O6m
-wt8+5Ed6a+1+BIdFggFFpV4oC2AKE11+dnwxD5ZyB77sg6sCbcWbLTXOyp/CCAY8
-bkp9ZbOBAkEA1MgP7ZKUUrtrIIg0VYaTTH24iMWTOsPbgNWg9DlLzmIagHHmmmLC
-O6gFT05bsNPcFv5a25m+jT1yfvjuKLN+hwJBAJHD544/UjWZ3s5p3C6K4bg3PDwk
-cQ+KBjkD0zHHtHGkkxqBIBNxGwyTfOD1GC1DZw0amrfvsw4w9YljE7ML04ECQHrX
-IPLrm3uDvZ3jZCs37RPMxNsZDR1w8ukW67vy1APK+TfMCfB5MV8VajNVrnOQa9BO
-eY+r26lYnyAUgBG5RkMCQHW5qFDYmgJjb38+uwxd53zGy6m+Jd7kdnGms9V4pPd1
-b21WA/5ncxrpFaz5OFPLtv2zrKYVBAj0tros5hs8Fwk=
------END RSA PRIVATE KEY-----
------BEGIN CERTIFICATE-----
-MIICGzCCAYSgAwIBAgIJAJ/PJcjrAB25MA0GCSqGSIb3DQEBBAUAMBQxEjAQBgNV
-BAMTCW15dGVzdGtleTAeFw0wOTAxMDgwNzUwMjlaFw0xMDAxMDgwNzUwMjlaMBQx
-EjAQBgNVBAMTCW15dGVzdGtleTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-zGM7tmSW+jLfPUcY2HD29NXJTJ2uzyU5vlJ3g2BCyoxuhGeDbvr/A4u3tj8aTZVu
-HAsFIhJIlga2R/EtXGs+AmCABvlZil2VwYJjQiDYEVczbY9PxOMYuWM/htbhgpGg
-ftZoXiVpHtazukoC+rSeS5hGAhhrtJo/r8Q/FtouJwcCAwEAAaN1MHMwHQYDVR0O
-BBYEFB6QdOIZawuedUjT4F+bK9RG8+sMMEQGA1UdIwQ9MDuAFB6QdOIZawuedUjT
-4F+bK9RG8+sMoRikFjAUMRIwEAYDVQQDEwlteXRlc3RrZXmCCQCfzyXI6wAduTAM
-BgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBAUAA4GBAAE/6mmd8/mMyzzFozblp04e
-TonwNrUB7TldXj+0WnYP04u0hNJuFJ/KD29gHdMnYDdOiVdmK/WS6a7Mn+7HVDT7
-wytizzu/Jfvlrr3yMQYCZssvNIbXPTmr+MjLErjkRxYi4quAnkankTNCDxa4mxN3
-WNlNt2SavfSi3d60wd5o
------END CERTIFICATE-----
Copied: epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/bin/exokey.pem (from rev 5822, portal/trunk/packaging/jetty/pkg/src/main/resources/jetty/bin/exokey.pem)
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/bin/exokey.pem (rev 0)
+++ epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/bin/exokey.pem 2011-06-23 02:59:29 UTC (rev 6721)
@@ -0,0 +1,29 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIICXAIBAAKBgQDMYzu2ZJb6Mt89RxjYcPb01clMna7PJTm+UneDYELKjG6EZ4Nu
++v8Di7e2PxpNlW4cCwUiEkiWBrZH8S1caz4CYIAG+VmKXZXBgmNCINgRVzNtj0/E
+4xi5Yz+G1uGCkaB+1mheJWke1rO6SgL6tJ5LmEYCGGu0mj+vxD8W2i4nBwIDAQAB
+AoGAJS1zwiSf9djlFI9nLI+3zCdLG32fO5zI2R7FEIek/pT20WzG0pwjYPC8NRFb
+Zntk8QLsJxtuSqPj6kgreSEkwRR/YGVIo/xIr46vwl/WydMLKJljvu+E7Y4yjYHb
+X4+FDRSL+huOMNNrHgnMy8WnplvtuW5LNV4kD3izU37jxQECQQD15re+8J3C8O6m
+wt8+5Ed6a+1+BIdFggFFpV4oC2AKE11+dnwxD5ZyB77sg6sCbcWbLTXOyp/CCAY8
+bkp9ZbOBAkEA1MgP7ZKUUrtrIIg0VYaTTH24iMWTOsPbgNWg9DlLzmIagHHmmmLC
+O6gFT05bsNPcFv5a25m+jT1yfvjuKLN+hwJBAJHD544/UjWZ3s5p3C6K4bg3PDwk
+cQ+KBjkD0zHHtHGkkxqBIBNxGwyTfOD1GC1DZw0amrfvsw4w9YljE7ML04ECQHrX
+IPLrm3uDvZ3jZCs37RPMxNsZDR1w8ukW67vy1APK+TfMCfB5MV8VajNVrnOQa9BO
+eY+r26lYnyAUgBG5RkMCQHW5qFDYmgJjb38+uwxd53zGy6m+Jd7kdnGms9V4pPd1
+b21WA/5ncxrpFaz5OFPLtv2zrKYVBAj0tros5hs8Fwk=
+-----END RSA PRIVATE KEY-----
+-----BEGIN CERTIFICATE-----
+MIICGzCCAYSgAwIBAgIJAJ/PJcjrAB25MA0GCSqGSIb3DQEBBAUAMBQxEjAQBgNV
+BAMTCW15dGVzdGtleTAeFw0wOTAxMDgwNzUwMjlaFw0xMDAxMDgwNzUwMjlaMBQx
+EjAQBgNVBAMTCW15dGVzdGtleTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
+zGM7tmSW+jLfPUcY2HD29NXJTJ2uzyU5vlJ3g2BCyoxuhGeDbvr/A4u3tj8aTZVu
+HAsFIhJIlga2R/EtXGs+AmCABvlZil2VwYJjQiDYEVczbY9PxOMYuWM/htbhgpGg
+ftZoXiVpHtazukoC+rSeS5hGAhhrtJo/r8Q/FtouJwcCAwEAAaN1MHMwHQYDVR0O
+BBYEFB6QdOIZawuedUjT4F+bK9RG8+sMMEQGA1UdIwQ9MDuAFB6QdOIZawuedUjT
+4F+bK9RG8+sMoRikFjAUMRIwEAYDVQQDEwlteXRlc3RrZXmCCQCfzyXI6wAduTAM
+BgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBAUAA4GBAAE/6mmd8/mMyzzFozblp04e
+TonwNrUB7TldXj+0WnYP04u0hNJuFJ/KD29gHdMnYDdOiVdmK/WS6a7Mn+7HVDT7
+wytizzu/Jfvlrr3yMQYCZssvNIbXPTmr+MjLErjkRxYi4quAnkankTNCDxa4mxN3
+WNlNt2SavfSi3d60wd5o
+-----END CERTIFICATE-----
Deleted: epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/bin/gatein-dev.bat
===================================================================
--- portal/trunk/packaging/jetty/pkg/src/main/resources/jetty/bin/gatein-dev.bat 2011-01-27 09:50:23 UTC (rev 5822)
+++ epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/bin/gatein-dev.bat 2011-06-23 02:59:29 UTC (rev 6721)
@@ -1,39 +0,0 @@
- at REM
- at REM Copyright (C) 2009 eXo Platform SAS.
- at REM
- at REM This is free software; you can redistribute it and/or modify it
- at REM under the terms of the GNU Lesser General Public License as
- at REM published by the Free Software Foundation; either version 2.1 of
- at REM the License, or (at your option) any later version.
- at REM
- at REM This software is distributed in the hope that it will be useful,
- at REM but WITHOUT ANY WARRANTY; without even the implied warranty of
- at REM MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- at REM Lesser General Public License for more details.
- at REM
- at REM You should have received a copy of the GNU Lesser General Public
- at REM License along with this software; if not, write to the Free
- at REM Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- at REM 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- at REM
-
- at echo off
-
-rem Computes the absolute path of eXo
-setlocal ENABLEDELAYEDEXPANSION
-for %%i in ( !%~f0! ) do set BIN_DIR=%%~dpi
-cd %BIN_DIR%
-
-rem Sets some variables
-set LOG_OPTS=-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.SimpleLog
-set SECURITY_OPTS=-Djava.security.auth.login.config=etc\login.conf
-set EXO_OPTS=-Dexo.product.developing=true -Dexo.conf.dir.name=gatein\conf
-set EXO_CONFIG_OPTS=-Dorg.exoplatform.container.configuration.debug
-set REMOTE_DEBUG=-Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n
-
-set JAVA_OPTIONS=-Xms128m -Xmx512m -XX:MaxPermSize=256m %LOG_OPTS% %SECURITY_OPTS% %EXO_OPTS% %EXO_CONFIG_OPTS% %REMOTE_DEBUG%
-set JPDA_TRANSPORT=dt_socket
-set JPDA_ADDRESS=8000
-
-rem Launches the server
-call jetty.bat %*
Copied: epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/bin/gatein-dev.bat (from rev 5822, portal/trunk/packaging/jetty/pkg/src/main/resources/jetty/bin/gatein-dev.bat)
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/bin/gatein-dev.bat (rev 0)
+++ epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/bin/gatein-dev.bat 2011-06-23 02:59:29 UTC (rev 6721)
@@ -0,0 +1,39 @@
+ at REM
+ at REM Copyright (C) 2009 eXo Platform SAS.
+ at REM
+ at REM This is free software; you can redistribute it and/or modify it
+ at REM under the terms of the GNU Lesser General Public License as
+ at REM published by the Free Software Foundation; either version 2.1 of
+ at REM the License, or (at your option) any later version.
+ at REM
+ at REM This software is distributed in the hope that it will be useful,
+ at REM but WITHOUT ANY WARRANTY; without even the implied warranty of
+ at REM MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ at REM Lesser General Public License for more details.
+ at REM
+ at REM You should have received a copy of the GNU Lesser General Public
+ at REM License along with this software; if not, write to the Free
+ at REM Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ at REM 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ at REM
+
+ at echo off
+
+rem Computes the absolute path of eXo
+setlocal ENABLEDELAYEDEXPANSION
+for %%i in ( !%~f0! ) do set BIN_DIR=%%~dpi
+cd %BIN_DIR%
+
+rem Sets some variables
+set LOG_OPTS=-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.SimpleLog
+set SECURITY_OPTS=-Djava.security.auth.login.config=etc\login.conf
+set EXO_OPTS=-Dexo.product.developing=true -Dexo.conf.dir.name=gatein\conf
+set EXO_CONFIG_OPTS=-Dorg.exoplatform.container.configuration.debug
+set REMOTE_DEBUG=-Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n
+
+set JAVA_OPTIONS=-Xms128m -Xmx512m -XX:MaxPermSize=256m %LOG_OPTS% %SECURITY_OPTS% %EXO_OPTS% %EXO_CONFIG_OPTS% %REMOTE_DEBUG%
+set JPDA_TRANSPORT=dt_socket
+set JPDA_ADDRESS=8000
+
+rem Launches the server
+call jetty.bat %*
Deleted: epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/bin/gatein-dev.sh
===================================================================
--- portal/trunk/packaging/jetty/pkg/src/main/resources/jetty/bin/gatein-dev.sh 2011-01-27 09:50:23 UTC (rev 5822)
+++ epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/bin/gatein-dev.sh 2011-06-23 02:59:29 UTC (rev 6721)
@@ -1,51 +0,0 @@
-#!/bin/sh
-#
-# 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.
-#
-
-# Computes the absolute path of eXo
-cd `dirname "$0"`
-
-# Sets some variables
-LOG_OPTS="-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.SimpleLog"
-SECURITY_OPTS="-Djava.security.auth.login.config=etc/login.conf"
-EXO_OPTS="-Dexo.product.developing=true -Dexo.conf.dir.name=gatein/conf -Djava.awt.headless=true"
-EXO_CONFIG_OPTS="-Xms128m -Xmx512m -XX:MaxPermSize=256m -Dorg.exoplatform.container.configuration.debug"
-JPDA_TRANSPORT=dt_socket
-JPDA_ADDRESS=8000
-REMOTE_DEBUG="-Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n"
-JMX_AGENT="-Dcom.sun.management.jmxremote"
-GATEIN_OPTS=""
-
-while getopts "D:" OPTION
-do
- case $OPTION in
- D)
- GATEIN_OPTS="$GATEIN_OPTS -D$OPTARG"
- ;;
- esac
-done
-
-# skip getopt parms
-shift $((OPTIND-1))
-
-JAVA_OPTIONS="$JAVA_OPTS $LOG_OPTS $SECURITY_OPTS $EXO_OPTS $EXO_CONFIG_OPTS $REMOTE_DEBUG $GATEIN_OPTS"
-export JAVA_OPTIONS
-
-# Launches the server
-exec "$PRGDIR"./jetty.sh "$@"
Copied: epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/bin/gatein-dev.sh (from rev 5822, portal/trunk/packaging/jetty/pkg/src/main/resources/jetty/bin/gatein-dev.sh)
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/bin/gatein-dev.sh (rev 0)
+++ epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/bin/gatein-dev.sh 2011-06-23 02:59:29 UTC (rev 6721)
@@ -0,0 +1,51 @@
+#!/bin/sh
+#
+# 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.
+#
+
+# Computes the absolute path of eXo
+cd `dirname "$0"`
+
+# Sets some variables
+LOG_OPTS="-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.SimpleLog"
+SECURITY_OPTS="-Djava.security.auth.login.config=etc/login.conf"
+EXO_OPTS="-Dexo.product.developing=true -Dexo.conf.dir.name=gatein/conf -Djava.awt.headless=true"
+EXO_CONFIG_OPTS="-Xms128m -Xmx512m -XX:MaxPermSize=256m -Dorg.exoplatform.container.configuration.debug"
+JPDA_TRANSPORT=dt_socket
+JPDA_ADDRESS=8000
+REMOTE_DEBUG="-Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n"
+JMX_AGENT="-Dcom.sun.management.jmxremote"
+GATEIN_OPTS=""
+
+while getopts "D:" OPTION
+do
+ case $OPTION in
+ D)
+ GATEIN_OPTS="$GATEIN_OPTS -D$OPTARG"
+ ;;
+ esac
+done
+
+# skip getopt parms
+shift $((OPTIND-1))
+
+JAVA_OPTIONS="$JAVA_OPTS $LOG_OPTS $SECURITY_OPTS $EXO_OPTS $EXO_CONFIG_OPTS $REMOTE_DEBUG $GATEIN_OPTS"
+export JAVA_OPTIONS
+
+# Launches the server
+exec "$PRGDIR"./jetty.sh "$@"
Deleted: epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/bin/gatein.bat
===================================================================
--- portal/trunk/packaging/jetty/pkg/src/main/resources/jetty/bin/gatein.bat 2011-01-27 09:50:23 UTC (rev 5822)
+++ epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/bin/gatein.bat 2011-06-23 02:59:29 UTC (rev 6721)
@@ -1,34 +0,0 @@
- at REM
- at REM Copyright (C) 2009 eXo Platform SAS.
- at REM
- at REM This is free software; you can redistribute it and/or modify it
- at REM under the terms of the GNU Lesser General Public License as
- at REM published by the Free Software Foundation; either version 2.1 of
- at REM the License, or (at your option) any later version.
- at REM
- at REM This software is distributed in the hope that it will be useful,
- at REM but WITHOUT ANY WARRANTY; without even the implied warranty of
- at REM MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- at REM Lesser General Public License for more details.
- at REM
- at REM You should have received a copy of the GNU Lesser General Public
- at REM License along with this software; if not, write to the Free
- at REM Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- at REM 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- at REM
-
- at echo off
-
-rem Computes the absolute path of eXo
-setlocal ENABLEDELAYEDEXPANSION
-for %%i in ( !%~f0! ) do set BIN_DIR=%%~dpi
-cd %BIN_DIR%
-
-rem Sets some variables
-set LOG_OPTS=-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.SimpleLog
-set SECURITY_OPTS=-Djava.security.auth.login.config=etc\login.conf
-set EXO_OPTS=-Dexo.product.developing=false -Dexo.conf.dir.name=gatein\conf
-set JAVA_OPTIONS=-Xms128m -Xmx512m -XX:MaxPermSize=256m %LOG_OPTS% %SECURITY_OPTS% %EXO_OPTS%
-
-rem Launches the server
-call jetty.bat %*
Copied: epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/bin/gatein.bat (from rev 5822, portal/trunk/packaging/jetty/pkg/src/main/resources/jetty/bin/gatein.bat)
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/bin/gatein.bat (rev 0)
+++ epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/bin/gatein.bat 2011-06-23 02:59:29 UTC (rev 6721)
@@ -0,0 +1,34 @@
+ at REM
+ at REM Copyright (C) 2009 eXo Platform SAS.
+ at REM
+ at REM This is free software; you can redistribute it and/or modify it
+ at REM under the terms of the GNU Lesser General Public License as
+ at REM published by the Free Software Foundation; either version 2.1 of
+ at REM the License, or (at your option) any later version.
+ at REM
+ at REM This software is distributed in the hope that it will be useful,
+ at REM but WITHOUT ANY WARRANTY; without even the implied warranty of
+ at REM MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ at REM Lesser General Public License for more details.
+ at REM
+ at REM You should have received a copy of the GNU Lesser General Public
+ at REM License along with this software; if not, write to the Free
+ at REM Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ at REM 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ at REM
+
+ at echo off
+
+rem Computes the absolute path of eXo
+setlocal ENABLEDELAYEDEXPANSION
+for %%i in ( !%~f0! ) do set BIN_DIR=%%~dpi
+cd %BIN_DIR%
+
+rem Sets some variables
+set LOG_OPTS=-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.SimpleLog
+set SECURITY_OPTS=-Djava.security.auth.login.config=etc\login.conf
+set EXO_OPTS=-Dexo.product.developing=false -Dexo.conf.dir.name=gatein\conf
+set JAVA_OPTIONS=-Xms128m -Xmx512m -XX:MaxPermSize=256m %LOG_OPTS% %SECURITY_OPTS% %EXO_OPTS%
+
+rem Launches the server
+call jetty.bat %*
Deleted: epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/bin/gatein.sh
===================================================================
--- portal/trunk/packaging/jetty/pkg/src/main/resources/jetty/bin/gatein.sh 2011-01-27 09:50:23 UTC (rev 5822)
+++ epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/bin/gatein.sh 2011-06-23 02:59:29 UTC (rev 6721)
@@ -1,49 +0,0 @@
-#!/bin/sh
-#
-# 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.
-#
-
-#Production Script to launch GateIn
-#See gatein-dev.sh for development starup
-
-# Computes the absolute path of eXo
-cd `dirname "$0"`
-
-# Sets some variables
-LOG_OPTS="-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.SimpleLog"
-SECURITY_OPTS="-Djava.security.auth.login.config=etc/login.conf"
-EXO_OPTS="-Dexo.product.developing=false -Dexo.conf.dir.name=gatein/conf -Djava.awt.headless=true"
-GATEIN_OPTS=""
-
-while getopts "D:" OPTION
-do
- case $OPTION in
- D)
- GATEIN_OPTS="$GATEIN_OPTS -D$OPTARG"
- ;;
- esac
-done
-
-# skip getopt parms
-shift $((OPTIND-1))
-
-JAVA_OPTIONS="-Xms128m -Xmx384m -XX:MaxPermSize=192m $JAVA_OPTS $LOG_OPTS $SECURITY_OPTS $EXO_OPTS $GATEIN_OPTS"
-export JAVA_OPTIONS
-
-# Launches the server
-exec "$PRGDIR"./jetty.sh "$@"
Copied: epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/bin/gatein.sh (from rev 5822, portal/trunk/packaging/jetty/pkg/src/main/resources/jetty/bin/gatein.sh)
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/bin/gatein.sh (rev 0)
+++ epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/bin/gatein.sh 2011-06-23 02:59:29 UTC (rev 6721)
@@ -0,0 +1,49 @@
+#!/bin/sh
+#
+# 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.
+#
+
+#Production Script to launch GateIn
+#See gatein-dev.sh for development starup
+
+# Computes the absolute path of eXo
+cd `dirname "$0"`
+
+# Sets some variables
+LOG_OPTS="-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.SimpleLog"
+SECURITY_OPTS="-Djava.security.auth.login.config=etc/login.conf"
+EXO_OPTS="-Dexo.product.developing=false -Dexo.conf.dir.name=gatein/conf -Djava.awt.headless=true"
+GATEIN_OPTS=""
+
+while getopts "D:" OPTION
+do
+ case $OPTION in
+ D)
+ GATEIN_OPTS="$GATEIN_OPTS -D$OPTARG"
+ ;;
+ esac
+done
+
+# skip getopt parms
+shift $((OPTIND-1))
+
+JAVA_OPTIONS="-Xms128m -Xmx384m -XX:MaxPermSize=192m $JAVA_OPTS $LOG_OPTS $SECURITY_OPTS $EXO_OPTS $GATEIN_OPTS"
+export JAVA_OPTIONS
+
+# Launches the server
+exec "$PRGDIR"./jetty.sh "$@"
Deleted: epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/bin/oauthkey.pem
===================================================================
--- portal/trunk/packaging/jetty/pkg/src/main/resources/jetty/bin/oauthkey.pem 2011-01-27 09:50:23 UTC (rev 5822)
+++ epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/bin/oauthkey.pem 2011-06-23 02:59:29 UTC (rev 6721)
@@ -1,16 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAMxjO7Zklvoy3z1H
-GNhw9vTVyUydrs8lOb5Sd4NgQsqMboRng276/wOLt7Y/Gk2VbhwLBSISSJYGtkfx
-LVxrPgJggAb5WYpdlcGCY0Ig2BFXM22PT8TjGLljP4bW4YKRoH7WaF4laR7Ws7pK
-Avq0nkuYRgIYa7SaP6/EPxbaLicHAgMBAAECgYAlLXPCJJ/12OUUj2csj7fMJ0sb
-fZ87nMjZHsUQh6T+lPbRbMbSnCNg8Lw1EVtme2TxAuwnG25Ko+PqSCt5ISTBFH9g
-ZUij/Eivjq/CX9bJ0wsomWO+74TtjjKNgdtfj4UNFIv6G44w02seCczLxaemW+25
-bks1XiQPeLNTfuPFAQJBAPXmt77wncLw7qbC3z7kR3pr7X4Eh0WCAUWlXigLYAoT
-XX52fDEPlnIHvuyDqwJtxZstNc7Kn8IIBjxuSn1ls4ECQQDUyA/tkpRSu2sgiDRV
-hpNMfbiIxZM6w9uA1aD0OUvOYhqAceaaYsI7qAVPTluw09wW/lrbmb6NPXJ++O4o
-s36HAkEAkcPnjj9SNZnezmncLorhuDc8PCRxD4oGOQPTMce0caSTGoEgE3EbDJN8
-4PUYLUNnDRqat++zDjD1iWMTswvTgQJAetcg8uube4O9neNkKzftE8zE2xkNHXDy
-6Rbru/LUA8r5N8wJ8HkxXxVqM1Wuc5Br0E55j6vbqVifIBSAEblGQwJAdbmoUNia
-AmNvfz67DF3nfMbLqb4l3uR2caaz1Xik93VvbVYD/mdzGukVrPk4U8u2/bOsphUE
-CPS2uizmGzwXCQ==
------END PRIVATE KEY-----
Copied: epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/bin/oauthkey.pem (from rev 5822, portal/trunk/packaging/jetty/pkg/src/main/resources/jetty/bin/oauthkey.pem)
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/bin/oauthkey.pem (rev 0)
+++ epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/bin/oauthkey.pem 2011-06-23 02:59:29 UTC (rev 6721)
@@ -0,0 +1,16 @@
+-----BEGIN PRIVATE KEY-----
+MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAMxjO7Zklvoy3z1H
+GNhw9vTVyUydrs8lOb5Sd4NgQsqMboRng276/wOLt7Y/Gk2VbhwLBSISSJYGtkfx
+LVxrPgJggAb5WYpdlcGCY0Ig2BFXM22PT8TjGLljP4bW4YKRoH7WaF4laR7Ws7pK
+Avq0nkuYRgIYa7SaP6/EPxbaLicHAgMBAAECgYAlLXPCJJ/12OUUj2csj7fMJ0sb
+fZ87nMjZHsUQh6T+lPbRbMbSnCNg8Lw1EVtme2TxAuwnG25Ko+PqSCt5ISTBFH9g
+ZUij/Eivjq/CX9bJ0wsomWO+74TtjjKNgdtfj4UNFIv6G44w02seCczLxaemW+25
+bks1XiQPeLNTfuPFAQJBAPXmt77wncLw7qbC3z7kR3pr7X4Eh0WCAUWlXigLYAoT
+XX52fDEPlnIHvuyDqwJtxZstNc7Kn8IIBjxuSn1ls4ECQQDUyA/tkpRSu2sgiDRV
+hpNMfbiIxZM6w9uA1aD0OUvOYhqAceaaYsI7qAVPTluw09wW/lrbmb6NPXJ++O4o
+s36HAkEAkcPnjj9SNZnezmncLorhuDc8PCRxD4oGOQPTMce0caSTGoEgE3EbDJN8
+4PUYLUNnDRqat++zDjD1iWMTswvTgQJAetcg8uube4O9neNkKzftE8zE2xkNHXDy
+6Rbru/LUA8r5N8wJ8HkxXxVqM1Wuc5Br0E55j6vbqVifIBSAEblGQwJAdbmoUNia
+AmNvfz67DF3nfMbLqb4l3uR2caaz1Xik93VvbVYD/mdzGukVrPk4U8u2/bOsphUE
+CPS2uizmGzwXCQ==
+-----END PRIVATE KEY-----
Deleted: epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/contexts/eXoGadgetServer.xml
===================================================================
--- portal/trunk/packaging/jetty/pkg/src/main/resources/jetty/contexts/eXoGadgetServer.xml 2011-01-27 09:50:23 UTC (rev 5822)
+++ epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/contexts/eXoGadgetServer.xml 2011-06-23 02:59:29 UTC (rev 6721)
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://jetty.mortbay.org/configure.dtd">
-
-<!-- ==================================================================
-Configure and deploy the test web application in $(jetty.home)/webapps/test
-
-Note. If this file did not exist or used a context path other that /test
-then the default configuration of jetty.xml would discover the test
-webapplication with a WebAppDeployer. By specifying a context in this
-directory, additional configuration may be specified and hot deployments
-detected.
-===================================================================== -->
-
-<Configure class="org.mortbay.jetty.webapp.WebAppContext">
-
- <Set name="contextPath">/eXoGadgetServer</Set>
- <Set name="war"><SystemProperty name="jetty.home" default="."/>/webapps/eXoGadgetServer.war</Set>
-
-</Configure>
\ No newline at end of file
Copied: epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/contexts/eXoGadgetServer.xml (from rev 5822, portal/trunk/packaging/jetty/pkg/src/main/resources/jetty/contexts/eXoGadgetServer.xml)
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/contexts/eXoGadgetServer.xml (rev 0)
+++ epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/contexts/eXoGadgetServer.xml 2011-06-23 02:59:29 UTC (rev 6721)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://jetty.mortbay.org/configure.dtd">
+
+<!-- ==================================================================
+Configure and deploy the test web application in $(jetty.home)/webapps/test
+
+Note. If this file did not exist or used a context path other that /test
+then the default configuration of jetty.xml would discover the test
+webapplication with a WebAppDeployer. By specifying a context in this
+directory, additional configuration may be specified and hot deployments
+detected.
+===================================================================== -->
+
+<Configure class="org.mortbay.jetty.webapp.WebAppContext">
+
+ <Set name="contextPath">/eXoGadgetServer</Set>
+ <Set name="war"><SystemProperty name="jetty.home" default="."/>/webapps/eXoGadgetServer.war</Set>
+
+</Configure>
\ No newline at end of file
Deleted: epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/contexts/eXoResources.xml
===================================================================
--- portal/trunk/packaging/jetty/pkg/src/main/resources/jetty/contexts/eXoResources.xml 2011-01-27 09:50:23 UTC (rev 5822)
+++ epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/contexts/eXoResources.xml 2011-06-23 02:59:29 UTC (rev 6721)
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://jetty.mortbay.org/configure.dtd">
-
-<!-- ==================================================================
-Configure and deploy the test web application in $(jetty.home)/webapps/test
-
-Note. If this file did not exist or used a context path other that /test
-then the default configuration of jetty.xml would discover the test
-webapplication with a WebAppDeployer. By specifying a context in this
-directory, additional configuration may be specified and hot deployments
-detected.
-===================================================================== -->
-
-<Configure class="org.mortbay.jetty.webapp.WebAppContext">
-
- <Set name="contextPath">/eXoResources</Set>
- <Set name="war"><SystemProperty name="jetty.home" default="."/>/webapps/eXoResources.war</Set>
-
-</Configure>
\ No newline at end of file
Copied: epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/contexts/eXoResources.xml (from rev 5822, portal/trunk/packaging/jetty/pkg/src/main/resources/jetty/contexts/eXoResources.xml)
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/contexts/eXoResources.xml (rev 0)
+++ epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/contexts/eXoResources.xml 2011-06-23 02:59:29 UTC (rev 6721)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://jetty.mortbay.org/configure.dtd">
+
+<!-- ==================================================================
+Configure and deploy the test web application in $(jetty.home)/webapps/test
+
+Note. If this file did not exist or used a context path other that /test
+then the default configuration of jetty.xml would discover the test
+webapplication with a WebAppDeployer. By specifying a context in this
+directory, additional configuration may be specified and hot deployments
+detected.
+===================================================================== -->
+
+<Configure class="org.mortbay.jetty.webapp.WebAppContext">
+
+ <Set name="contextPath">/eXoResources</Set>
+ <Set name="war"><SystemProperty name="jetty.home" default="."/>/webapps/eXoResources.war</Set>
+
+</Configure>
\ No newline at end of file
Deleted: epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/contexts/portal.xml
===================================================================
--- portal/trunk/packaging/jetty/pkg/src/main/resources/jetty/contexts/portal.xml 2011-01-27 09:50:23 UTC (rev 5822)
+++ epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/contexts/portal.xml 2011-06-23 02:59:29 UTC (rev 6721)
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://jetty.mortbay.org/configure.dtd">
-
-<!-- ==================================================================
-Configure and deploy the test web application in $(jetty.home)/webapps/test
-
-Note. If this file did not exist or used a context path other that /test
-then the default configuration of jetty.xml would discover the test
-webapplication with a WebAppDeployer. By specifying a context in this
-directory, additional configuration may be specified and hot deployments
-detected.
-===================================================================== -->
-
-<Configure class="org.mortbay.jetty.webapp.WebAppContext">
-
- <Set name="contextPath">/portal</Set>
- <Set name="war"><SystemProperty name="jetty.home" default="."/>/webapps/portal.war</Set>
-
-</Configure>
\ No newline at end of file
Copied: epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/contexts/portal.xml (from rev 5822, portal/trunk/packaging/jetty/pkg/src/main/resources/jetty/contexts/portal.xml)
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/contexts/portal.xml (rev 0)
+++ epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/contexts/portal.xml 2011-06-23 02:59:29 UTC (rev 6721)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://jetty.mortbay.org/configure.dtd">
+
+<!-- ==================================================================
+Configure and deploy the test web application in $(jetty.home)/webapps/test
+
+Note. If this file did not exist or used a context path other that /test
+then the default configuration of jetty.xml would discover the test
+webapplication with a WebAppDeployer. By specifying a context in this
+directory, additional configuration may be specified and hot deployments
+detected.
+===================================================================== -->
+
+<Configure class="org.mortbay.jetty.webapp.WebAppContext">
+
+ <Set name="contextPath">/portal</Set>
+ <Set name="war"><SystemProperty name="jetty.home" default="."/>/webapps/portal.war</Set>
+
+</Configure>
\ No newline at end of file
Deleted: epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/contexts/rest.xml
===================================================================
--- portal/trunk/packaging/jetty/pkg/src/main/resources/jetty/contexts/rest.xml 2011-01-27 09:50:23 UTC (rev 5822)
+++ epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/contexts/rest.xml 2011-06-23 02:59:29 UTC (rev 6721)
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://jetty.mortbay.org/configure.dtd">
-
-<!-- ==================================================================
-Configure and deploy the test web application in $(jetty.home)/webapps/test
-
-Note. If this file did not exist or used a context path other that /test
-then the default configuration of jetty.xml would discover the test
-webapplication with a WebAppDeployer. By specifying a context in this
-directory, additional configuration may be specified and hot deployments
-detected.
-===================================================================== -->
-
-<Configure class="org.mortbay.jetty.webapp.WebAppContext">
-
- <Set name="contextPath">/rest</Set>
- <Set name="war"><SystemProperty name="jetty.home" default="."/>/webapps/rest.war</Set>
-
-</Configure>
\ No newline at end of file
Copied: epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/contexts/rest.xml (from rev 5822, portal/trunk/packaging/jetty/pkg/src/main/resources/jetty/contexts/rest.xml)
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/contexts/rest.xml (rev 0)
+++ epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/contexts/rest.xml 2011-06-23 02:59:29 UTC (rev 6721)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://jetty.mortbay.org/configure.dtd">
+
+<!-- ==================================================================
+Configure and deploy the test web application in $(jetty.home)/webapps/test
+
+Note. If this file did not exist or used a context path other that /test
+then the default configuration of jetty.xml would discover the test
+webapplication with a WebAppDeployer. By specifying a context in this
+directory, additional configuration may be specified and hot deployments
+detected.
+===================================================================== -->
+
+<Configure class="org.mortbay.jetty.webapp.WebAppContext">
+
+ <Set name="contextPath">/rest</Set>
+ <Set name="war"><SystemProperty name="jetty.home" default="."/>/webapps/rest.war</Set>
+
+</Configure>
\ No newline at end of file
Deleted: epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/etc/jetty.xml
===================================================================
--- portal/trunk/packaging/jetty/pkg/src/main/resources/jetty/etc/jetty.xml 2011-01-27 09:50:23 UTC (rev 5822)
+++ epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/etc/jetty.xml 2011-06-23 02:59:29 UTC (rev 6721)
@@ -1,235 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://jetty.mortbay.org/configure.dtd">
-
-<!-- =============================================================== -->
-<!-- Configure the Jetty Server -->
-<!-- -->
-<!-- Documentation of this file format can be found at: -->
-<!-- http://docs.codehaus.org/display/JETTY/jetty.xml -->
-<!-- -->
-<!-- =============================================================== -->
-
-
-<Configure id="Server" class="org.mortbay.jetty.Server">
-
- <!-- =========================================================== -->
- <!-- Server Thread Pool -->
- <!-- =========================================================== -->
- <Set name="ThreadPool">
-
- <New class="org.mortbay.thread.QueuedThreadPool">
- <Set name="minThreads">10</Set>
- <Set name="maxThreads">200</Set>
- <Set name="lowThreads">20</Set>
- <Set name="SpawnOrShrinkAt">2</Set>
- </New>
-
- <!-- Optional Java 5 bounded threadpool with job queue
- <New class="org.mortbay.thread.concurrent.ThreadPool">
- <Set name="corePoolSize">50</Set>
- <Set name="maximumPoolSize">50</Set>
- </New>
- -->
- </Set>
-
-
-
- <!-- =========================================================== -->
- <!-- Set connectors -->
- <!-- =========================================================== -->
- <!-- One of each type! -->
- <!-- =========================================================== -->
-
- <!-- Use this connector for many frequently idle connections
- and for threadless continuations.
- -->
- <Call name="addConnector">
- <Arg>
- <New class="org.mortbay.jetty.nio.SelectChannelConnector">
- <Set name="host"><SystemProperty name="jetty.host" /></Set>
- <Set name="port"><SystemProperty name="jetty.port" default="8080"/></Set>
- <Set name="maxIdleTime">30000</Set>
- <Set name="Acceptors">2</Set>
- <Set name="statsOn">false</Set>
- <Set name="confidentialPort">8443</Set>
- <Set name="lowResourcesConnections">5000</Set>
- <Set name="lowResourcesMaxIdleTime">5000</Set>
- </New>
- </Arg>
- </Call>
-
- <!-- Use this connector if NIO is not available.
- <Call name="addConnector">
- <Arg>
- <New class="org.mortbay.jetty.bio.SocketConnector">
- <Set name="port">8081</Set>
- <Set name="maxIdleTime">50000</Set>
- <Set name="lowResourceMaxIdleTime">1500</Set>
- </New>
- </Arg>
- </Call>
- -->
-
- <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
- <!-- To add a HTTPS SSL listener -->
- <!-- see jetty-ssl.xml to add an ssl connector. use -->
- <!-- java -jar start.jar etc/jetty.xml etc/jetty-ssl.xml -->
- <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
- <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
- <!-- To allow Jetty to be started from xinetd -->
- <!-- mixin jetty-xinetd.xml: -->
- <!-- java -jar start.jar etc/jetty.xml etc/jetty-xinetd.xml -->
- <!-- -->
- <!-- See jetty-xinetd.xml for further instructions. -->
- <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
- <!-- =========================================================== -->
- <!-- Set up global session ID manager -->
- <!-- =========================================================== -->
- <!--
- <Set name="sessionIdManager">
- <New class="org.mortbay.jetty.servlet.HashSessionIdManager">
- <Set name="workerName">node1</Set>
- </New>
- </Set>
- -->
-
- <!-- =========================================================== -->
- <!-- Set handler Collection Structure -->
- <!-- =========================================================== -->
- <Set name="handler">
- <New id="Handlers" class="org.mortbay.jetty.handler.HandlerCollection">
- <Set name="handlers">
- <Array type="org.mortbay.jetty.Handler">
- <Item>
- <New id="Contexts" class="org.mortbay.jetty.handler.ContextHandlerCollection"/>
- </Item>
- <Item>
- <New id="DefaultHandler" class="org.mortbay.jetty.handler.DefaultHandler"/>
- </Item>
- <Item>
- <New id="RequestLog" class="org.mortbay.jetty.handler.RequestLogHandler"/>
- </Item>
- </Array>
- </Set>
- </New>
- </Set>
-
- <!-- =========================================================== -->
- <!-- Configure the context deployer -->
- <!-- A context deployer will deploy contexts described in -->
- <!-- configuration files discovered in a directory. -->
- <!-- The configuration directory can be scanned for hot -->
- <!-- deployments at the configured scanInterval. -->
- <!-- -->
- <!-- This deployer is configured to deploy contexts configured -->
- <!-- in the $JETTY_HOME/contexts directory -->
- <!-- -->
- <!-- =========================================================== -->
- <Call name="addLifeCycle">
- <Arg>
- <New class="org.mortbay.jetty.deployer.ContextDeployer">
- <Set name="contexts"><Ref id="Contexts"/></Set>
- <Set name="configurationDir"><SystemProperty name="jetty.home" default="."/>/contexts</Set>
- <Set name="scanInterval">5</Set>
- </New>
- </Arg>
- </Call>
-
- <!-- =========================================================== -->
- <!-- Configure the webapp deployer. -->
- <!-- A webapp deployer will deploy standard webapps discovered -->
- <!-- in a directory at startup, without the need for additional -->
- <!-- configuration files. It does not support hot deploy or -->
- <!-- non standard contexts (see ContextDeployer above). -->
- <!-- -->
- <!-- This deployer is configured to deploy webapps from the -->
- <!-- $JETTY_HOME/webapps directory -->
- <!-- -->
- <!-- Normally only one type of deployer need be used. -->
- <!-- -->
- <!-- =========================================================== -->
- <Call name="addLifeCycle">
- <Arg>
- <New class="org.mortbay.jetty.deployer.WebAppDeployer">
- <Set name="contexts"><Ref id="Contexts"/></Set>
- <Set name="webAppDir"><SystemProperty name="jetty.home" default="."/>/webapps</Set>
- <Set name="parentLoaderPriority">false</Set>
- <Set name="extract">true</Set>
- <Set name="allowDuplicates">false</Set>
- <Set name="defaultsDescriptor"><SystemProperty name="jetty.home" default="."/>/etc/webdefault.xml</Set>
- </New>
- </Arg>
- </Call>
-
- <!-- =========================================================== -->
- <!-- Configure Authentication Realms -->
- <!-- Realms may be configured for the entire server here, or -->
- <!-- they can be configured for a specific web app in a context -->
- <!-- configuration (see $(jetty.home)/contexts/test.xml for an -->
- <!-- example). -->
- <!-- =========================================================== -->
- <Set name="UserRealms">
-<!--
- <Array type="org.mortbay.jetty.security.UserRealm">
- <Item>
- <New class="org.mortbay.jetty.security.HashUserRealm">
- <Set name="name">Test Realm</Set>
- <Set name="config"><SystemProperty name="jetty.home" default="."/>/etc/realm.properties</Set>
- <Set name="refreshInterval">0</Set>
- </New>
- </Item>
- </Array>
--->
- <Array type="org.mortbay.jetty.plus.jaas.JAASUserRealm">
- <Item>
- <New class="org.mortbay.jetty.plus.jaas.JAASUserRealm">
- <Set name="Name">gatein-domain</Set>
- <Set name="LoginModuleName">gatein-domain</Set>
- <Set name="RoleCheckPolicy">
- <New class="org.mortbay.jetty.plus.jaas.StrictRoleCheckPolicy"/>
- </Set>
- <Set name="CallbackHandlerClass">
- org.mortbay.jetty.plus.jaas.callback.DefaultCallbackHandler
- </Set>
- <Set name="roleClassNames">
- <Array type="java.lang.String">
- <Item>org.exoplatform.services.security.jaas.RolePrincipal</Item>
- </Array>
- </Set>
- </New>
- </Item>
- </Array>
- </Set>
-
- <!-- =========================================================== -->
- <!-- Configure Request Log -->
- <!-- Request logs may be configured for the entire server here, -->
- <!-- or they can be configured for a specific web app in a -->
- <!-- contexts configuration (see $(jetty.home)/contexts/test.xml -->
- <!-- for an example). -->
- <!-- =========================================================== -->
- <Ref id="RequestLog">
- <Set name="requestLog">
- <New id="RequestLogImpl" class="org.mortbay.jetty.NCSARequestLog">
- <Set name="filename"><SystemProperty name="jetty.logs" default="./logs"/>/yyyy_mm_dd.request.log</Set>
- <Set name="filenameDateFormat">yyyy_MM_dd</Set>
- <Set name="retainDays">90</Set>
- <Set name="append">true</Set>
- <Set name="extended">false</Set>
- <Set name="logCookies">false</Set>
- <Set name="LogTimeZone">GMT</Set>
- </New>
- </Set>
- </Ref>
-
- <!-- =========================================================== -->
- <!-- extra options -->
- <!-- =========================================================== -->
- <Set name="stopAtShutdown">true</Set>
- <Set name="sendServerVersion">true</Set>
- <Set name="sendDateHeader">true</Set>
- <Set name="gracefulShutdown">1000</Set>
-
-</Configure>
Copied: epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/etc/jetty.xml (from rev 5822, portal/trunk/packaging/jetty/pkg/src/main/resources/jetty/etc/jetty.xml)
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/etc/jetty.xml (rev 0)
+++ epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/etc/jetty.xml 2011-06-23 02:59:29 UTC (rev 6721)
@@ -0,0 +1,235 @@
+<?xml version="1.0"?>
+<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://jetty.mortbay.org/configure.dtd">
+
+<!-- =============================================================== -->
+<!-- Configure the Jetty Server -->
+<!-- -->
+<!-- Documentation of this file format can be found at: -->
+<!-- http://docs.codehaus.org/display/JETTY/jetty.xml -->
+<!-- -->
+<!-- =============================================================== -->
+
+
+<Configure id="Server" class="org.mortbay.jetty.Server">
+
+ <!-- =========================================================== -->
+ <!-- Server Thread Pool -->
+ <!-- =========================================================== -->
+ <Set name="ThreadPool">
+
+ <New class="org.mortbay.thread.QueuedThreadPool">
+ <Set name="minThreads">10</Set>
+ <Set name="maxThreads">200</Set>
+ <Set name="lowThreads">20</Set>
+ <Set name="SpawnOrShrinkAt">2</Set>
+ </New>
+
+ <!-- Optional Java 5 bounded threadpool with job queue
+ <New class="org.mortbay.thread.concurrent.ThreadPool">
+ <Set name="corePoolSize">50</Set>
+ <Set name="maximumPoolSize">50</Set>
+ </New>
+ -->
+ </Set>
+
+
+
+ <!-- =========================================================== -->
+ <!-- Set connectors -->
+ <!-- =========================================================== -->
+ <!-- One of each type! -->
+ <!-- =========================================================== -->
+
+ <!-- Use this connector for many frequently idle connections
+ and for threadless continuations.
+ -->
+ <Call name="addConnector">
+ <Arg>
+ <New class="org.mortbay.jetty.nio.SelectChannelConnector">
+ <Set name="host"><SystemProperty name="jetty.host" /></Set>
+ <Set name="port"><SystemProperty name="jetty.port" default="8080"/></Set>
+ <Set name="maxIdleTime">30000</Set>
+ <Set name="Acceptors">2</Set>
+ <Set name="statsOn">false</Set>
+ <Set name="confidentialPort">8443</Set>
+ <Set name="lowResourcesConnections">5000</Set>
+ <Set name="lowResourcesMaxIdleTime">5000</Set>
+ </New>
+ </Arg>
+ </Call>
+
+ <!-- Use this connector if NIO is not available.
+ <Call name="addConnector">
+ <Arg>
+ <New class="org.mortbay.jetty.bio.SocketConnector">
+ <Set name="port">8081</Set>
+ <Set name="maxIdleTime">50000</Set>
+ <Set name="lowResourceMaxIdleTime">1500</Set>
+ </New>
+ </Arg>
+ </Call>
+ -->
+
+ <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+ <!-- To add a HTTPS SSL listener -->
+ <!-- see jetty-ssl.xml to add an ssl connector. use -->
+ <!-- java -jar start.jar etc/jetty.xml etc/jetty-ssl.xml -->
+ <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+
+ <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+ <!-- To allow Jetty to be started from xinetd -->
+ <!-- mixin jetty-xinetd.xml: -->
+ <!-- java -jar start.jar etc/jetty.xml etc/jetty-xinetd.xml -->
+ <!-- -->
+ <!-- See jetty-xinetd.xml for further instructions. -->
+ <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+
+ <!-- =========================================================== -->
+ <!-- Set up global session ID manager -->
+ <!-- =========================================================== -->
+ <!--
+ <Set name="sessionIdManager">
+ <New class="org.mortbay.jetty.servlet.HashSessionIdManager">
+ <Set name="workerName">node1</Set>
+ </New>
+ </Set>
+ -->
+
+ <!-- =========================================================== -->
+ <!-- Set handler Collection Structure -->
+ <!-- =========================================================== -->
+ <Set name="handler">
+ <New id="Handlers" class="org.mortbay.jetty.handler.HandlerCollection">
+ <Set name="handlers">
+ <Array type="org.mortbay.jetty.Handler">
+ <Item>
+ <New id="Contexts" class="org.mortbay.jetty.handler.ContextHandlerCollection"/>
+ </Item>
+ <Item>
+ <New id="DefaultHandler" class="org.mortbay.jetty.handler.DefaultHandler"/>
+ </Item>
+ <Item>
+ <New id="RequestLog" class="org.mortbay.jetty.handler.RequestLogHandler"/>
+ </Item>
+ </Array>
+ </Set>
+ </New>
+ </Set>
+
+ <!-- =========================================================== -->
+ <!-- Configure the context deployer -->
+ <!-- A context deployer will deploy contexts described in -->
+ <!-- configuration files discovered in a directory. -->
+ <!-- The configuration directory can be scanned for hot -->
+ <!-- deployments at the configured scanInterval. -->
+ <!-- -->
+ <!-- This deployer is configured to deploy contexts configured -->
+ <!-- in the $JETTY_HOME/contexts directory -->
+ <!-- -->
+ <!-- =========================================================== -->
+ <Call name="addLifeCycle">
+ <Arg>
+ <New class="org.mortbay.jetty.deployer.ContextDeployer">
+ <Set name="contexts"><Ref id="Contexts"/></Set>
+ <Set name="configurationDir"><SystemProperty name="jetty.home" default="."/>/contexts</Set>
+ <Set name="scanInterval">5</Set>
+ </New>
+ </Arg>
+ </Call>
+
+ <!-- =========================================================== -->
+ <!-- Configure the webapp deployer. -->
+ <!-- A webapp deployer will deploy standard webapps discovered -->
+ <!-- in a directory at startup, without the need for additional -->
+ <!-- configuration files. It does not support hot deploy or -->
+ <!-- non standard contexts (see ContextDeployer above). -->
+ <!-- -->
+ <!-- This deployer is configured to deploy webapps from the -->
+ <!-- $JETTY_HOME/webapps directory -->
+ <!-- -->
+ <!-- Normally only one type of deployer need be used. -->
+ <!-- -->
+ <!-- =========================================================== -->
+ <Call name="addLifeCycle">
+ <Arg>
+ <New class="org.mortbay.jetty.deployer.WebAppDeployer">
+ <Set name="contexts"><Ref id="Contexts"/></Set>
+ <Set name="webAppDir"><SystemProperty name="jetty.home" default="."/>/webapps</Set>
+ <Set name="parentLoaderPriority">false</Set>
+ <Set name="extract">true</Set>
+ <Set name="allowDuplicates">false</Set>
+ <Set name="defaultsDescriptor"><SystemProperty name="jetty.home" default="."/>/etc/webdefault.xml</Set>
+ </New>
+ </Arg>
+ </Call>
+
+ <!-- =========================================================== -->
+ <!-- Configure Authentication Realms -->
+ <!-- Realms may be configured for the entire server here, or -->
+ <!-- they can be configured for a specific web app in a context -->
+ <!-- configuration (see $(jetty.home)/contexts/test.xml for an -->
+ <!-- example). -->
+ <!-- =========================================================== -->
+ <Set name="UserRealms">
+<!--
+ <Array type="org.mortbay.jetty.security.UserRealm">
+ <Item>
+ <New class="org.mortbay.jetty.security.HashUserRealm">
+ <Set name="name">Test Realm</Set>
+ <Set name="config"><SystemProperty name="jetty.home" default="."/>/etc/realm.properties</Set>
+ <Set name="refreshInterval">0</Set>
+ </New>
+ </Item>
+ </Array>
+-->
+ <Array type="org.mortbay.jetty.plus.jaas.JAASUserRealm">
+ <Item>
+ <New class="org.mortbay.jetty.plus.jaas.JAASUserRealm">
+ <Set name="Name">gatein-domain</Set>
+ <Set name="LoginModuleName">gatein-domain</Set>
+ <Set name="RoleCheckPolicy">
+ <New class="org.mortbay.jetty.plus.jaas.StrictRoleCheckPolicy"/>
+ </Set>
+ <Set name="CallbackHandlerClass">
+ org.mortbay.jetty.plus.jaas.callback.DefaultCallbackHandler
+ </Set>
+ <Set name="roleClassNames">
+ <Array type="java.lang.String">
+ <Item>org.exoplatform.services.security.jaas.RolePrincipal</Item>
+ </Array>
+ </Set>
+ </New>
+ </Item>
+ </Array>
+ </Set>
+
+ <!-- =========================================================== -->
+ <!-- Configure Request Log -->
+ <!-- Request logs may be configured for the entire server here, -->
+ <!-- or they can be configured for a specific web app in a -->
+ <!-- contexts configuration (see $(jetty.home)/contexts/test.xml -->
+ <!-- for an example). -->
+ <!-- =========================================================== -->
+ <Ref id="RequestLog">
+ <Set name="requestLog">
+ <New id="RequestLogImpl" class="org.mortbay.jetty.NCSARequestLog">
+ <Set name="filename"><SystemProperty name="jetty.logs" default="./logs"/>/yyyy_mm_dd.request.log</Set>
+ <Set name="filenameDateFormat">yyyy_MM_dd</Set>
+ <Set name="retainDays">90</Set>
+ <Set name="append">true</Set>
+ <Set name="extended">false</Set>
+ <Set name="logCookies">false</Set>
+ <Set name="LogTimeZone">GMT</Set>
+ </New>
+ </Set>
+ </Ref>
+
+ <!-- =========================================================== -->
+ <!-- extra options -->
+ <!-- =========================================================== -->
+ <Set name="stopAtShutdown">true</Set>
+ <Set name="sendServerVersion">true</Set>
+ <Set name="sendDateHeader">true</Set>
+ <Set name="gracefulShutdown">1000</Set>
+
+</Configure>
Deleted: epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/etc/login.conf
===================================================================
--- portal/trunk/packaging/jetty/pkg/src/main/resources/jetty/etc/login.conf 2011-01-27 09:50:23 UTC (rev 5822)
+++ epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/etc/login.conf 2011-06-23 02:59:29 UTC (rev 6721)
@@ -1,13 +0,0 @@
-gatein-domain {
- org.gatein.wci.security.WCILoginModule optional;
- org.exoplatform.web.security.PortalLoginModule required;
- org.exoplatform.services.security.jaas.SharedStateLoginModule required;
- org.exoplatform.services.security.j2ee.TomcatLoginModule required;
-
- // Uncomment the following part (and comment the other part for CAS integration
- // org.gatein.sso.agent.login.SSOLoginModule required
- // org.exoplatform.services.security.j2ee.TomcatLoginModule required
- // portalContainerName=portal
- // realmName=gatein-domain
-
-};
\ No newline at end of file
Copied: epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/etc/login.conf (from rev 5822, portal/trunk/packaging/jetty/pkg/src/main/resources/jetty/etc/login.conf)
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/etc/login.conf (rev 0)
+++ epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/etc/login.conf 2011-06-23 02:59:29 UTC (rev 6721)
@@ -0,0 +1,13 @@
+gatein-domain {
+ org.gatein.wci.security.WCILoginModule optional;
+ org.exoplatform.web.security.PortalLoginModule required;
+ org.exoplatform.services.security.jaas.SharedStateLoginModule required;
+ org.exoplatform.services.security.j2ee.TomcatLoginModule required;
+
+ // Uncomment the following part (and comment the other part for CAS integration
+ // org.gatein.sso.agent.login.SSOLoginModule required
+ // org.exoplatform.services.security.j2ee.TomcatLoginModule required
+ // portalContainerName=portal
+ // realmName=gatein-domain
+
+};
\ No newline at end of file
Deleted: epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/gatein/conf/configuration.xml
===================================================================
--- portal/trunk/packaging/jetty/pkg/src/main/resources/jetty/gatein/conf/configuration.xml 2011-01-27 09:50:23 UTC (rev 5822)
+++ epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/gatein/conf/configuration.xml 2011-06-23 02:59:29 UTC (rev 6721)
@@ -1,65 +0,0 @@
-<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd http://www.exoplaform.org/xml/ns/kernel_1_1.xsd"
- xmlns="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd">
-
- <component>
- <!-- The full qualified name of the PortalContainerConfig -->
- <type>org.exoplatform.container.definition.PortalContainerConfig</type>
- <init-params>
- <!-- The name of the default portal container -->
- <value-param>
- <name>default.portal.container</name>
- <value>portal</value>
- </value-param>
- <!-- The name of the default rest ServletContext -->
- <value-param>
- <name>default.rest.context</name>
- <value>rest</value>
- </value-param>
- <!-- The name of the default realm -->
- <value-param>
- <name>default.realm.name</name>
- <value>gatein-domain</value>
- </value-param>
- <!-- The default portal container definition -->
- <!-- It cans be used to avoid duplicating configuration -->
- <object-param>
- <name>default.portal.definition</name>
- <object type="org.exoplatform.container.definition.PortalContainerDefinition">
- <!-- The path to the external properties file -->
- <field name="externalSettingsPath">
- <string>configuration.properties</string>
- </field>
- <field name="dependencies">
- <collection type="java.util.ArrayList">
- <value>
- <string>eXoResources</string>
- </value>
- <value>
- <string>portal</string>
- </value>
- <value>
- <string>dashboard</string>
- </value>
- <value>
- <string>exoadmin</string>
- </value>
- <value>
- <string>eXoGadgets</string>
- </value>
- <value>
- <string>eXoGadgetServer</string>
- </value>
- <value>
- <string>rest</string>
- </value>
- <value>
- <string>web</string>
- </value>
- </collection>
- </field>
- </object>
- </object-param>
- </init-params>
- </component>
-</configuration>
Copied: epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/gatein/conf/configuration.xml (from rev 5822, portal/trunk/packaging/jetty/pkg/src/main/resources/jetty/gatein/conf/configuration.xml)
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/gatein/conf/configuration.xml (rev 0)
+++ epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/gatein/conf/configuration.xml 2011-06-23 02:59:29 UTC (rev 6721)
@@ -0,0 +1,65 @@
+<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd http://www.exoplaform.org/xml/ns/kernel_1_1.xsd"
+ xmlns="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd">
+
+ <component>
+ <!-- The full qualified name of the PortalContainerConfig -->
+ <type>org.exoplatform.container.definition.PortalContainerConfig</type>
+ <init-params>
+ <!-- The name of the default portal container -->
+ <value-param>
+ <name>default.portal.container</name>
+ <value>portal</value>
+ </value-param>
+ <!-- The name of the default rest ServletContext -->
+ <value-param>
+ <name>default.rest.context</name>
+ <value>rest</value>
+ </value-param>
+ <!-- The name of the default realm -->
+ <value-param>
+ <name>default.realm.name</name>
+ <value>gatein-domain</value>
+ </value-param>
+ <!-- The default portal container definition -->
+ <!-- It cans be used to avoid duplicating configuration -->
+ <object-param>
+ <name>default.portal.definition</name>
+ <object type="org.exoplatform.container.definition.PortalContainerDefinition">
+ <!-- The path to the external properties file -->
+ <field name="externalSettingsPath">
+ <string>configuration.properties</string>
+ </field>
+ <field name="dependencies">
+ <collection type="java.util.ArrayList">
+ <value>
+ <string>eXoResources</string>
+ </value>
+ <value>
+ <string>portal</string>
+ </value>
+ <value>
+ <string>dashboard</string>
+ </value>
+ <value>
+ <string>exoadmin</string>
+ </value>
+ <value>
+ <string>eXoGadgets</string>
+ </value>
+ <value>
+ <string>eXoGadgetServer</string>
+ </value>
+ <value>
+ <string>rest</string>
+ </value>
+ <value>
+ <string>web</string>
+ </value>
+ </collection>
+ </field>
+ </object>
+ </object-param>
+ </init-params>
+ </component>
+</configuration>
Deleted: epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/webapps/ROOT/WEB-INF/web.xml
===================================================================
--- portal/trunk/packaging/jetty/pkg/src/main/resources/jetty/webapps/ROOT/WEB-INF/web.xml 2011-01-27 09:50:23 UTC (rev 5822)
+++ epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/webapps/ROOT/WEB-INF/web.xml 2011-06-23 02:59:29 UTC (rev 6721)
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-
-<!--
-
- Copyright (C) 2010 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.
-
--->
-
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
- "http://java.sun.com/dtd/web-app_2_3.dtd">
-<web-app>
- <display-name>Welcome to eXo platform</display-name>
- <description>Welcome to eXo platform</description>
-</web-app>
\ No newline at end of file
Copied: epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/webapps/ROOT/WEB-INF/web.xml (from rev 5822, portal/trunk/packaging/jetty/pkg/src/main/resources/jetty/webapps/ROOT/WEB-INF/web.xml)
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/webapps/ROOT/WEB-INF/web.xml (rev 0)
+++ epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/webapps/ROOT/WEB-INF/web.xml 2011-06-23 02:59:29 UTC (rev 6721)
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+
+<!--
+
+ Copyright (C) 2010 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.
+
+-->
+
+<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+ "http://java.sun.com/dtd/web-app_2_3.dtd">
+<web-app>
+ <display-name>Welcome to eXo platform</display-name>
+ <description>Welcome to eXo platform</description>
+</web-app>
\ No newline at end of file
Deleted: epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/webapps/ROOT/index.jsp
===================================================================
--- portal/trunk/packaging/jetty/pkg/src/main/resources/jetty/webapps/ROOT/index.jsp 2011-01-27 09:50:23 UTC (rev 5822)
+++ epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/webapps/ROOT/index.jsp 2011-06-23 02:59:29 UTC (rev 6721)
@@ -1,4 +0,0 @@
-<%
-response.setStatus(response.SC_MOVED_TEMPORARILY);
-response.setHeader("Location", "/portal");
-%>
\ No newline at end of file
Copied: epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/webapps/ROOT/index.jsp (from rev 5822, portal/trunk/packaging/jetty/pkg/src/main/resources/jetty/webapps/ROOT/index.jsp)
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/webapps/ROOT/index.jsp (rev 0)
+++ epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/webapps/ROOT/index.jsp 2011-06-23 02:59:29 UTC (rev 6721)
@@ -0,0 +1,4 @@
+<%
+response.setStatus(response.SC_MOVED_TEMPORARILY);
+response.setHeader("Location", "/portal");
+%>
\ No newline at end of file
Deleted: epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/transform.xsl
===================================================================
--- portal/trunk/packaging/jetty/pkg/transform.xsl 2011-01-27 09:50:23 UTC (rev 5822)
+++ epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/transform.xsl 2011-06-23 02:59:29 UTC (rev 6721)
@@ -1,50 +0,0 @@
-<?xml version="1.0"?>
-<xsl:stylesheet
- version="1.0"
- xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- xmlns:mvn="http://maven.apache.org/POM/4.0.0">
- <xsl:param name="lib.dir"/>
- <xsl:param name="webapps.dir"/>
- <xsl:output method="xml" indent="yes"/>
- <xsl:template match="/" >
- <xsl:comment>Generated file</xsl:comment>
- <project name="copy-dependencies">
- <target name="copy-dependencies">
- <xsl:element name="copy">
- <xsl:attribute name="todir"><xsl:value-of select="$lib.dir"/></xsl:attribute>
- <xsl:for-each select="//mvn:dependencies/mvn:dependency[count(mvn:type)=0 or mvn:type/text()='jar']">
- <xsl:element name="fileset">
- <xsl:attribute name="refid"><xsl:value-of select="./mvn:groupId"/>:<xsl:value-of select="./mvn:artifactId"/>:jar</xsl:attribute>
- </xsl:element>
- </xsl:for-each>
- </xsl:element>
- <xsl:for-each select="//mvn:dependencies/mvn:dependency[mvn:type/text()='war']">
- <xsl:variable name="webapps.name">
- <xsl:for-each select="processing-instruction()[name()='rename']">
- <xsl:value-of select="."/>
- </xsl:for-each>
- </xsl:variable>
- <xsl:choose>
- <xsl:when test="$webapps.name=''">
- <xsl:element name="copy">
- <xsl:attribute name="todir"><xsl:value-of select="$webapps.dir"/></xsl:attribute>
- <xsl:element name="fileset">
- <xsl:attribute name="refid"><xsl:value-of select="./mvn:groupId"/>:<xsl:value-of select="./mvn:artifactId"/>:war</xsl:attribute>
- </xsl:element>
- </xsl:element>
- </xsl:when>
- <xsl:otherwise>
- <xsl:element name="copy">
- <xsl:attribute name="tofile"><xsl:value-of select="$webapps.dir"/>/<xsl:value-of select="$webapps.name"/></xsl:attribute>
- <xsl:element name="fileset">
- <xsl:attribute name="refid"><xsl:value-of select="./mvn:groupId"/>:<xsl:value-of select="./mvn:artifactId"/>:war</xsl:attribute>
- </xsl:element>
- </xsl:element>
- </xsl:otherwise>
- </xsl:choose>
-
- </xsl:for-each>
- </target>
- </project>
- </xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
Copied: epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/transform.xsl (from rev 5822, portal/trunk/packaging/jetty/pkg/transform.xsl)
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/transform.xsl (rev 0)
+++ epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/transform.xsl 2011-06-23 02:59:29 UTC (rev 6721)
@@ -0,0 +1,50 @@
+<?xml version="1.0"?>
+<xsl:stylesheet
+ version="1.0"
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ xmlns:mvn="http://maven.apache.org/POM/4.0.0">
+ <xsl:param name="lib.dir"/>
+ <xsl:param name="webapps.dir"/>
+ <xsl:output method="xml" indent="yes"/>
+ <xsl:template match="/" >
+ <xsl:comment>Generated file</xsl:comment>
+ <project name="copy-dependencies">
+ <target name="copy-dependencies">
+ <xsl:element name="copy">
+ <xsl:attribute name="todir"><xsl:value-of select="$lib.dir"/></xsl:attribute>
+ <xsl:for-each select="//mvn:dependencies/mvn:dependency[count(mvn:type)=0 or mvn:type/text()='jar']">
+ <xsl:element name="fileset">
+ <xsl:attribute name="refid"><xsl:value-of select="./mvn:groupId"/>:<xsl:value-of select="./mvn:artifactId"/>:jar</xsl:attribute>
+ </xsl:element>
+ </xsl:for-each>
+ </xsl:element>
+ <xsl:for-each select="//mvn:dependencies/mvn:dependency[mvn:type/text()='war']">
+ <xsl:variable name="webapps.name">
+ <xsl:for-each select="processing-instruction()[name()='rename']">
+ <xsl:value-of select="."/>
+ </xsl:for-each>
+ </xsl:variable>
+ <xsl:choose>
+ <xsl:when test="$webapps.name=''">
+ <xsl:element name="copy">
+ <xsl:attribute name="todir"><xsl:value-of select="$webapps.dir"/></xsl:attribute>
+ <xsl:element name="fileset">
+ <xsl:attribute name="refid"><xsl:value-of select="./mvn:groupId"/>:<xsl:value-of select="./mvn:artifactId"/>:war</xsl:attribute>
+ </xsl:element>
+ </xsl:element>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:element name="copy">
+ <xsl:attribute name="tofile"><xsl:value-of select="$webapps.dir"/>/<xsl:value-of select="$webapps.name"/></xsl:attribute>
+ <xsl:element name="fileset">
+ <xsl:attribute name="refid"><xsl:value-of select="./mvn:groupId"/>:<xsl:value-of select="./mvn:artifactId"/>:war</xsl:attribute>
+ </xsl:element>
+ </xsl:element>
+ </xsl:otherwise>
+ </xsl:choose>
+
+ </xsl:for-each>
+ </target>
+ </project>
+ </xsl:template>
+</xsl:stylesheet>
\ No newline at end of file
Deleted: epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pom.xml
===================================================================
--- portal/trunk/packaging/jetty/pom.xml 2011-01-27 09:50:23 UTC (rev 5822)
+++ epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pom.xml 2011-06-23 02:59:29 UTC (rev 6721)
@@ -1,18 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.exoplatform.portal</groupId>
- <artifactId>exo.portal.parent</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
- </parent>
- <artifactId>exo.portal.packaging.jetty</artifactId>
- <packaging>pom</packaging>
- <name>GateIn Jetty package</name>
-
- <modules>
- <module>pkg</module>
- </modules>
-
-</project>
\ No newline at end of file
Copied: epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pom.xml (from rev 5822, portal/trunk/packaging/jetty/pom.xml)
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pom.xml (rev 0)
+++ epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pom.xml 2011-06-23 02:59:29 UTC (rev 6721)
@@ -0,0 +1,18 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.exoplatform.portal</groupId>
+ <artifactId>exo.portal.parent</artifactId>
+ <version>3.2.0-Beta01-SNAPSHOT</version>
+ </parent>
+ <artifactId>exo.portal.packaging.jetty</artifactId>
+ <packaging>pom</packaging>
+ <name>GateIn Jetty package</name>
+
+ <modules>
+ <module>pkg</module>
+ </modules>
+
+</project>
\ No newline at end of file
Modified: epp/portal/branches/EPP_5_2_Branch/packaging/module/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/packaging/module/pom.xml 2011-06-23 02:24:17 UTC (rev 6720)
+++ epp/portal/branches/EPP_5_2_Branch/packaging/module/pom.xml 2011-06-23 02:59:29 UTC (rev 6721)
@@ -34,8 +34,20 @@
<properties>
<exobuild.name>portal</exobuild.name>
<exobuild.type>module</exobuild.type>
+ <wci.native.module>tomcat6</wci.native.module>
+ <patch.tomcat.version>tomcat</patch.tomcat.version>
</properties>
+ <profiles>
+ <profile>
+ <id>pkg-tomcat7</id>
+ <properties>
+ <wci.native.module>tomcat7</wci.native.module>
+ <patch.tomcat.version>tomcat7</patch.tomcat.version>
+ </properties>
+ </profile>
+ </profiles>
+
<build>
<plugins>
<plugin>
Modified: epp/portal/branches/EPP_5_2_Branch/packaging/module/src/main/javascript/portal.packaging.module.js
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/packaging/module/src/main/javascript/portal.packaging.module.js 2011-06-23 02:24:17 UTC (rev 6720)
+++ epp/portal/branches/EPP_5_2_Branch/packaging/module/src/main/javascript/portal.packaging.module.js 2011-06-23 02:59:29 UTC (rev 6721)
@@ -70,7 +70,7 @@
addDependency(new Project("org.gatein.pc", "pc-controller", "jar", pcVersion)).
addDependency(new Project("org.gatein.pc", "pc-federation", "jar", pcVersion)).
addDependency(new Project("org.gatein.wci", "wci-wci", "jar", wciVersion)).
- addDependency(new Project("org.gatein.wci", "wci-tomcat", "jar", wciVersion)).
+ addDependency(new Project("org.gatein.wci", "wci-${wci.native.module}", "jar", wciVersion)).
addDependency(new Project("org.gatein.wci", "wci-exo", "jar", wciVersion)).
addDependency(new Project("org.gatein.common", "common-common", "jar", commonVersion)).
addDependency(new Project("log4j", "log4j", "jar", "1.2.14")).
@@ -275,6 +275,14 @@
module.server = {}
+ module.server.tomcat = {}
+ module.server.tomcat.patch =
+ new Project("org.exoplatform.portal", "exo.portal.server.${patch.tomcat.version}.patch", "jar", module.version);
+
+ module.server.jboss = {}
+ module.server.jboss.patch =
+ new Project("org.exoplatform.portal", "exo.portal.server.jboss.patch", "jar", module.version);
+
module.server.jbossear = {}
module.server.jbossear.patch =
new Project("org.exoplatform.portal", "exo.portal.server.jboss.patch-ear", "jar", module.version);
Modified: epp/portal/branches/EPP_5_2_Branch/packaging/pkg/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/packaging/pkg/pom.xml 2011-06-23 02:24:17 UTC (rev 6720)
+++ epp/portal/branches/EPP_5_2_Branch/packaging/pkg/pom.xml 2011-06-23 02:59:29 UTC (rev 6721)
@@ -135,6 +135,106 @@
<profiles>
<profile>
+ <id>pkg-tomcat7</id>
+ <build>
+ <finalName>GateIn-${project.version}</finalName>
+ <plugins>
+ <!-- Ensure your environment is correctly setup -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>tomcat-check-environment-ready</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <requireProperty>
+ <property>exo.projects.directory.dependencies</property>
+ <message>"You must define the property exo.projects.directory.dependencies to give the path to the directory where you store your applications servers"</message>
+ </requireProperty>
+ <requireProperty>
+ <property>exo.projects.app.tomcat7.version</property>
+ <message>"You must define the property exo.projects.app.tomcat7.version to give the name of the directory where is stored tomcat"</message>
+ </requireProperty>
+ <requireFilesExist>
+ <files>
+ <file>${exo.projects.directory.dependencies}/${exo.projects.app.tomcat7.version}/</file>
+ </files>
+ <message>"The following Tomcat directory doesn't exist : ${exo.projects.directory.dependencies}/${exo.projects.app.tomcat7.version}"</message>
+ </requireFilesExist>
+ </rules>
+ <fail>true</fail>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <!-- run exo build -->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>tomcat-packaging</id>
+ <phase>package</phase>
+ <configuration>
+ <executable>java</executable>
+ <workingDirectory>${basedir}</workingDirectory>
+ <arguments>
+ <argument>-Dexo.package.home=${basedir}/target/packager</argument>
+ <argument>-Dexo.current.dir=${basedir}</argument>
+ <argument>-Dexo.base.dir=${exo.projects.directory.base}</argument>
+ <argument>-Dexo.conf.dir=${basedir}/target/packager-conf</argument>
+ <argument>-Dexo.working.dir=${gatein.working.dir}/</argument>
+ <!--argument>-Dexo.src.dir=NONE</argument-->
+ <argument>-Dexo.dep.dir=${exo.projects.directory.dependencies}</argument><!-- to get the server ref install -->
+ <argument>-Dexo.m2.repos=file:${settings.localRepository}</argument>
+ <argument>-Dclean.server=${exo.projects.app.tomcat7.version}</argument>
+ <argument>-Dexo.m2.home=${maven.home}</argument>
+ <argument>-Xms128m</argument>
+ <argument>-Xmx512m</argument>
+ <argument>-classpath</argument>
+ <argument>${basedir}/target/packager/lib/js.jar</argument>
+ <argument>org.mozilla.javascript.tools.shell.Main</argument>
+ <argument>${basedir}/target/packager/javascript/eXo/eXo.js</argument>
+ <argument>exobuild</argument>
+ <argument>--product=portal</argument>
+ <argument>--deploy=tomcat</argument>
+ </arguments>
+ </configuration>
+ <goals>
+ <goal>exec</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+<!--
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>tomcat-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/tomcat-zip.xml</descriptor>
+ </descriptors>
+ <attach>false</attach>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+-->
+ </plugins>
+ </build>
+ </profile>
+
+ <profile>
<id>pkg-jbossas</id>
<build>
<finalName>GateIn-${project.version}</finalName>
Modified: epp/portal/branches/EPP_5_2_Branch/packaging/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/packaging/pom.xml 2011-06-23 02:24:17 UTC (rev 6720)
+++ epp/portal/branches/EPP_5_2_Branch/packaging/pom.xml 2011-06-23 02:59:29 UTC (rev 6721)
@@ -58,5 +58,33 @@
<module>reports</module>
</modules>
</profile>
+ <profile>
+ <id>pkg-tomcat7</id>
+ <modules>
+ <module>tomcat</module>
+ <module>reports</module>
+ </modules>
+ </profile>
+ <profile>
+ <id>pkg-jetty</id>
+ <modules>
+ <module>jetty</module>
+ <module>reports</module>
+ </modules>
+ </profile>
+ <profile>
+ <id>pkg-jbossas6</id>
+ <modules>
+ <module>jboss-as6</module>
+ <module>reports</module>
+ </modules>
+ </profile>
+ <profile>
+ <id>pkg-jbossas5</id>
+ <modules>
+ <module>jboss-as5</module>
+ <module>reports</module>
+ </modules>
+ </profile>
</profiles>
</project>
Modified: epp/portal/branches/EPP_5_2_Branch/packaging/profiles.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/packaging/profiles.xml 2011-06-23 02:24:17 UTC (rev 6720)
+++ epp/portal/branches/EPP_5_2_Branch/packaging/profiles.xml 2011-06-23 02:59:29 UTC (rev 6721)
@@ -1,17 +1,17 @@
<!--
Copyright (C) 2009 eXo Platform SAS.
-
+
This is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation; either version 2.1 of
the License, or (at your option) any later version.
-
+
This software is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
-
+
You should have received a copy of the GNU Lesser General Public
License along with this software; if not, write to the Free
Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
@@ -24,23 +24,39 @@
<profile>
<id>gatein-projects</id>
<properties>
- <!--
+ <!--
Replace with the directory where uncompressed Tomcat 6 and/or JBoss 5.1 can be found
ex: On Windows 'c:/AS'
ex: On Linux '/home/user/AS'
-->
<exo.projects.directory.dependencies>/opt/AS</exo.projects.directory.dependencies>
- <!--
+ <!--
If you want that the server is deployed always at the same place (not in packaging/pkg/target/<server> dir)
Uncomment and Replace with the directory you prefer
-->
- <!--
+ <!--
<gatein.working.dir>REPLACE_WITH_SERVER_DIR</gatein.working.dir>
-->
<!--
- Replace with the name of the directory containing JBoss AS 5.1
+ Replace with the name of the directory containing Tomcat 6
-->
- <exo.projects.app.jboss.version>jboss-5.1.0.GA</exo.projects.app.jboss.version>
+ <exo.projects.app.tomcat.version>apache-tomcat-6.0.20</exo.projects.app.tomcat.version>
+ <!--
+ Replace with the name of the directory containing Tomcat 7
+ -->
+ <exo.projects.app.tomcat7.version>apache-tomcat-7.0.2</exo.projects.app.tomcat7.version>
+ <!--
+ Replace with the name of the directory containing Jetty 6
+ -->
+ <exo.projects.app.jetty.version>jetty-6.1.25/jetty-6.1.25</exo.projects.app.jetty.version>
+ <!--
+ Replace with the name of the directory containing JBoss AS 5
+ -->
+ <exo.projects.app.jboss5.version>jboss-5.1.0.GA</exo.projects.app.jboss5.version>
+ <!--
+ Replace with the name of the directory containing JBoss AS 6
+ -->
+ <exo.projects.app.jboss6.version>jboss-6.0.0.Final</exo.projects.app.jboss6.version>
</properties>
</profile>
</profiles>
Modified: epp/portal/branches/EPP_5_2_Branch/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/pom.xml 2011-06-23 02:24:17 UTC (rev 6720)
+++ epp/portal/branches/EPP_5_2_Branch/pom.xml 2011-06-23 02:59:29 UTC (rev 6721)
@@ -284,10 +284,20 @@
</dependency>
<dependency>
<groupId>org.gatein.wci</groupId>
- <artifactId>wci-tomcat</artifactId>
+ <artifactId>wci-tomcat6</artifactId>
<version>${org.gatein.wci.version}</version>
</dependency>
<dependency>
+ <groupId>org.gatein.wci</groupId>
+ <artifactId>wci-tomcat7</artifactId>
+ <version>${org.gatein.wci.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.gatein.wci</groupId>
+ <artifactId>wci-jetty</artifactId>
+ <version>${org.gatein.wci.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-bridge</artifactId>
<version>${org.gatein.pc.version}</version>
Modified: epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UISiteManagement.java
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UISiteManagement.java 2011-06-23 02:24:17 UTC (rev 6720)
+++ epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UISiteManagement.java 2011-06-23 02:59:29 UTC (rev 6721)
@@ -44,6 +44,7 @@
import org.exoplatform.portal.webui.workspace.UIWorkingWorkspace;
import org.exoplatform.util.ReflectionUtil;
import org.exoplatform.web.application.ApplicationMessage;
+import org.exoplatform.web.login.LogoutControl;
import org.exoplatform.webui.application.WebuiRequestContext;
import org.exoplatform.webui.config.annotation.ComponentConfig;
import org.exoplatform.webui.config.annotation.ComponentConfigs;
@@ -252,7 +253,7 @@
if (config == null || Util.getUIPortal().getName().equals(portalName))
{
HttpServletRequest request = prContext.getRequest();
- request.getSession().invalidate();
+ LogoutControl.wantLogout();
prContext.setResponseComplete(true);
prContext.getResponse().sendRedirect(request.getContextPath());
return;
Modified: epp/portal/branches/EPP_5_2_Branch/server/jboss/patch-ear/src/main/jboss/server/default/deploy/gatein.ear/META-INF/gatein-jboss-beans.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/server/jboss/patch-ear/src/main/jboss/server/default/deploy/gatein.ear/META-INF/gatein-jboss-beans.xml 2011-06-23 02:24:17 UTC (rev 6720)
+++ epp/portal/branches/EPP_5_2_Branch/server/jboss/patch-ear/src/main/jboss/server/default/deploy/gatein.ear/META-INF/gatein-jboss-beans.xml 2011-06-23 02:59:29 UTC (rev 6721)
@@ -2,6 +2,10 @@
<application-policy xmlns="urn:jboss:security-beans:1.0" name="gatein-domain">
<authentication>
+ <login-module code="org.gatein.wci.security.WCILoginModule" flag="optional">
+ <module-option name="portalContainerName">portal</module-option>
+ <module-option name="realmName">gatein-domain</module-option>
+ </login-module>
<login-module code="org.exoplatform.web.security.PortalLoginModule" flag="required">
<module-option name="portalContainerName">portal</module-option>
<module-option name="realmName">gatein-domain</module-option>
Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/common/autologin-configuration.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/common/autologin-configuration.xml 2011-06-23 02:24:17 UTC (rev 6720)
+++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/common/autologin-configuration.xml 2011-06-23 02:59:29 UTC (rev 6721)
@@ -40,12 +40,12 @@
</component>
<component>
- <key>org.exoplatform.web.security.security.TransientTokenService</key>
- <type>org.exoplatform.web.security.security.TransientTokenService</type>
+ <key>org.exoplatform.web.security.security.TicketConfiguration</key>
+ <type>org.exoplatform.web.security.security.TicketConfiguration</type>
<init-params>
<values-param>
<name>service.configuration</name>
- <value>memory-token</value>
+ <value>wci-ticket</value>
<value>1</value>
<value>MINUTE</value>
</values-param>
Copied: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/jetty-web.xml (from rev 5822, portal/trunk/web/portal/src/main/webapp/WEB-INF/jetty-web.xml)
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/jetty-web.xml (rev 0)
+++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/jetty-web.xml 2011-06-23 02:59:29 UTC (rev 6721)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://jetty.mortbay.org/configure.dtd">
+<Configure class="org.mortbay.jetty.webapp.WebAppContext">
+
+ <Get id="serverObject" name="server"/>
+
+ <New id="jettySetup" class="org.gatein.wci.jetty.Jetty6Handler">
+ <Arg><Ref id="serverObject"/></Arg>
+ </New>
+
+</Configure>
+
+
Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/web.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/web.xml 2011-06-23 02:24:17 UTC (rev 6720)
+++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/web.xml 2011-06-23 02:59:29 UTC (rev 6721)
@@ -217,7 +217,7 @@
<servlet>
<servlet-name>PortalLoginController</servlet-name>
- <servlet-class>org.exoplatform.web.login.PortalLoginController</servlet-class>
+ <servlet-class>org.exoplatform.web.security.PortalLoginController</servlet-class>
</servlet>
<servlet>
<servlet-name>InitiateLoginServlet</servlet-name>
Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/webui-configuration.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/webui-configuration.xml 2011-06-23 02:24:17 UTC (rev 6720)
+++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/webui-configuration.xml 2011-06-23 02:59:29 UTC (rev 6721)
@@ -33,6 +33,7 @@
<application-lifecycle-listeners>
<listener>org.exoplatform.portal.application.UserSiteLifeCycle</listener>
+ <listener>org.exoplatform.portal.application.PortalLogoutLifecycle</listener>
<listener>org.exoplatform.portal.application.PortalStatisticLifecycle</listener>
<listener>org.exoplatform.portal.application.PortalApplicationLifecycle</listener>
<listener>org.exoplatform.webui.application.MonitorApplicationLifecycle</listener>
Copied: epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/application/PortalLogoutLifecycle.java (from rev 5822, portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/PortalLogoutLifecycle.java)
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/application/PortalLogoutLifecycle.java (rev 0)
+++ epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/application/PortalLogoutLifecycle.java 2011-06-23 02:59:29 UTC (rev 6721)
@@ -0,0 +1,67 @@
+/*
+* Copyright (C) 2003-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.util.Util;
+import org.exoplatform.web.application.Application;
+import org.exoplatform.web.application.ApplicationLifecycle;
+import org.exoplatform.web.application.RequestFailure;
+import org.exoplatform.web.login.LogoutControl;
+import org.exoplatform.webui.application.WebuiRequestContext;
+import org.gatein.wci.impl.DefaultServletContainerFactory;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * @author <a href="mailto:alain.defrance at exoplatform.com">Alain Defrance</a>
+ * @version $Revision$
+ */
+public class PortalLogoutLifecycle implements ApplicationLifecycle<WebuiRequestContext>
+{
+
+ public void onInit(Application app) throws Exception
+ {
+ }
+
+ public void onStartRequest(Application app, WebuiRequestContext context) throws Exception
+ {
+ LogoutControl.cancelLogout();
+ }
+
+ public void onFailRequest(Application app, WebuiRequestContext context, RequestFailure failureType) throws Exception
+ {
+ }
+
+ public void onEndRequest(Application app, WebuiRequestContext context) throws Exception
+ {
+ if (LogoutControl.isLogoutRequired())
+ {
+ PortalRequestContext prContext = Util.getPortalRequestContext();
+ HttpServletRequest request = prContext.getRequest();
+ HttpServletResponse response = prContext.getResponse();
+ DefaultServletContainerFactory.getInstance().getServletContainer().logout(request, response);
+ }
+ }
+
+ public void onDestroy(Application app) throws Exception
+ {
+ }
+}
Modified: epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/login/UIForgetPassword.java
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/login/UIForgetPassword.java 2011-06-23 02:24:17 UTC (rev 6720)
+++ epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/login/UIForgetPassword.java 2011-06-23 02:59:29 UTC (rev 6721)
@@ -27,7 +27,6 @@
import org.exoplatform.services.organization.Query;
import org.exoplatform.services.organization.User;
import org.exoplatform.web.application.ApplicationMessage;
-import org.exoplatform.web.security.Credentials;
import org.exoplatform.web.security.security.RemindPasswordTokenService;
import org.exoplatform.webui.application.WebuiRequestContext;
import org.exoplatform.webui.config.annotation.ComponentConfig;
@@ -40,6 +39,7 @@
import org.exoplatform.webui.form.UIFormStringInput;
import org.exoplatform.webui.form.validator.EmailAddressValidator;
import org.exoplatform.webui.form.validator.MandatoryValidator;
+import org.gatein.wci.security.Credentials;
import java.net.URLEncoder;
import java.util.MissingResourceException;
Modified: epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortal.java
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortal.java 2011-06-23 02:24:17 UTC (rev 6720)
+++ epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortal.java 2011-06-23 02:59:29 UTC (rev 6721)
@@ -45,6 +45,7 @@
import org.exoplatform.services.organization.User;
import org.exoplatform.services.resources.ResourceBundleManager;
import org.exoplatform.web.login.InitiateLoginServlet;
+import org.exoplatform.web.login.LogoutControl;
import org.exoplatform.web.security.security.AbstractTokenService;
import org.exoplatform.web.security.security.CookieTokenService;
import org.exoplatform.webui.application.WebuiRequestContext;
@@ -414,8 +415,8 @@
AbstractTokenService tokenService = AbstractTokenService.getInstance(CookieTokenService.class);
tokenService.deleteToken(token);
}
-
- req.getSession().invalidate();
+
+ LogoutControl.wantLogout();
Cookie cookie = new Cookie(InitiateLoginServlet.COOKIE_NAME, "");
cookie.setPath(req.getContextPath());
cookie.setMaxAge(0);
Modified: epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalActionListener.java
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalActionListener.java 2011-06-23 02:24:17 UTC (rev 6720)
+++ epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalActionListener.java 2011-06-23 02:59:29 UTC (rev 6721)
@@ -22,6 +22,7 @@
import org.exoplatform.portal.application.PortalRequestContext;
import org.exoplatform.portal.webui.application.UIPortlet;
import org.exoplatform.portal.webui.util.Util;
+import org.exoplatform.web.login.LogoutControl;
import org.exoplatform.webui.application.WebuiRequestContext;
import org.exoplatform.webui.core.UIComponent;
import org.exoplatform.webui.event.Event;
@@ -45,7 +46,7 @@
public void execute(Event<UIComponent> event) throws Exception
{
PortalRequestContext prContext = Util.getPortalRequestContext();
- prContext.getRequest().getSession().invalidate();
+ LogoutControl.wantLogout();
HttpServletRequest request = prContext.getRequest();
String portalName = URLEncoder.encode(Util.getUIPortal().getName(), "UTF-8");
String redirect = request.getContextPath() + "/public/" + portalName + "/";
Modified: epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComposer.java
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComposer.java 2011-06-23 02:24:17 UTC (rev 6720)
+++ epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComposer.java 2011-06-23 02:59:29 UTC (rev 6721)
@@ -46,6 +46,7 @@
import org.exoplatform.services.resources.LocaleConfigService;
import org.exoplatform.web.application.ApplicationMessage;
import org.exoplatform.web.application.JavascriptManager;
+import org.exoplatform.web.login.LogoutControl;
import org.exoplatform.webui.application.WebuiRequestContext;
import org.exoplatform.webui.config.annotation.ComponentConfig;
import org.exoplatform.webui.config.annotation.ComponentConfigs;
@@ -497,7 +498,7 @@
if (editPortal.getOwner().equals(prContext.getPortalOwner()))
{
HttpServletRequest request = prContext.getRequest();
- request.getSession().invalidate();
+ LogoutControl.wantLogout();
prContext.setResponseComplete(true);
prContext.getResponse().sendRedirect(request.getContextPath());
return;
More information about the gatein-commits
mailing list