gatein SVN: r7424 - in epp/portal/branches/EPP_5_2_Branch: component/pc and 2 other directories.
by do-not-reply＠jboss.org
Author: theute
Date: 2011-09-14 12:26:48 -0400 (Wed, 14 Sep 2011)
New Revision: 7424
Modified:
epp/portal/branches/EPP_5_2_Branch/component/pc/pom.xml
epp/portal/branches/EPP_5_2_Branch/component/pc/src/main/java/org/exoplatform/portal/pc/ExoKernelIntegration.java
epp/portal/branches/EPP_5_2_Branch/component/pc/src/main/java/org/exoplatform/portal/pc/ExoPortletApplicationDeployer.java
epp/portal/branches/EPP_5_2_Branch/component/pc/src/main/java/org/exoplatform/portal/pc/GlobalPortletMetaData.java
epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/gatein.ear/pom.xml
epp/portal/branches/EPP_5_2_Branch/pom.xml
Log:
JBEPP-1176: GateIn PC update to 2.3.0-Beta05
Modified: epp/portal/branches/EPP_5_2_Branch/component/pc/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/pc/pom.xml 2011-09-14 15:50:34 UTC (rev 7423)
+++ epp/portal/branches/EPP_5_2_Branch/component/pc/pom.xml 2011-09-14 16:26:48 UTC (rev 7424)
@@ -55,10 +55,6 @@
</dependency>
<dependency>
<groupId>org.gatein.pc</groupId>
- <artifactId>pc-mc</artifactId>
- </dependency>
- <dependency>
- <groupId>org.gatein.pc</groupId>
<artifactId>pc-federation</artifactId>
</dependency>
<dependency>
Modified: epp/portal/branches/EPP_5_2_Branch/component/pc/src/main/java/org/exoplatform/portal/pc/ExoKernelIntegration.java
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/pc/src/main/java/org/exoplatform/portal/pc/ExoKernelIntegration.java 2011-09-14 15:50:34 UTC (rev 7423)
+++ epp/portal/branches/EPP_5_2_Branch/component/pc/src/main/java/org/exoplatform/portal/pc/ExoKernelIntegration.java 2011-09-14 16:26:48 UTC (rev 7424)
@@ -26,7 +26,6 @@
import org.gatein.pc.bridge.BridgeInterceptor;
import org.gatein.pc.federation.FederatingPortletInvoker;
import org.gatein.pc.federation.impl.FederatingPortletInvokerService;
-import org.gatein.pc.mc.PortletApplicationDeployer;
import org.gatein.pc.portlet.PortletInvokerInterceptor;
import org.gatein.pc.portlet.aspects.CCPPInterceptor;
import org.gatein.pc.portlet.aspects.ConsumerCacheInterceptor;
@@ -40,6 +39,7 @@
import org.gatein.pc.portlet.aspects.ValveInterceptor;
import org.gatein.pc.portlet.container.ContainerPortletDispatcher;
import org.gatein.pc.portlet.container.ContainerPortletInvoker;
+import org.gatein.pc.portlet.impl.deployment.PortletApplicationDeployer;
import org.gatein.pc.portlet.impl.state.StateManagementPolicyService;
import org.gatein.pc.portlet.impl.state.producer.PortletStatePersistenceManagerService;
import org.gatein.pc.portlet.state.StateConverter;
Modified: epp/portal/branches/EPP_5_2_Branch/component/pc/src/main/java/org/exoplatform/portal/pc/ExoPortletApplicationDeployer.java
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/pc/src/main/java/org/exoplatform/portal/pc/ExoPortletApplicationDeployer.java 2011-09-14 15:50:34 UTC (rev 7423)
+++ epp/portal/branches/EPP_5_2_Branch/component/pc/src/main/java/org/exoplatform/portal/pc/ExoPortletApplicationDeployer.java 2011-09-14 16:26:48 UTC (rev 7424)
@@ -23,18 +23,17 @@
import org.exoplatform.commons.utils.Safe;
import org.gatein.common.logging.Logger;
import org.gatein.common.logging.LoggerFactory;
-import org.gatein.pc.mc.PortletApplicationDeployer;
+import org.gatein.pc.portlet.impl.deployment.PortletApplicationDeployer;
+import org.gatein.pc.portlet.impl.deployment.staxnav.PortletApplicationMetaDataBuilder;
import org.gatein.pc.portlet.impl.metadata.PortletApplication10MetaData;
import org.gatein.wci.WebApp;
-import org.jboss.xb.binding.JBossXBException;
import java.io.File;
import java.io.FileInputStream;
-import java.io.FileNotFoundException;
import java.io.InputStream;
/**
- * Extends the {@link org.gatein.pc.mc.PortletApplicationDeployer} to inject configuration metadata
+ * Extends the {@link org.gatein.pc.portlet.impl.deployment.PortletApplicationDeployer} to inject configuration metadata
* from global portlet.xml and to configure the resource bundle factory of deployed portlet
* applications. The resource bundle factory used is {@link org.exoplatform.portal.pc.ExoResourceBundleFactory}.
*
@@ -43,6 +42,8 @@
*/
public class ExoPortletApplicationDeployer extends PortletApplicationDeployer
{
+
+ /** . */
private final Logger log = LoggerFactory.getLogger(ExoPortletApplicationDeployer.class);
@Override
@@ -88,17 +89,16 @@
* This method is invoked for each portlet application deployment. That is necessary for the moment
* to ensure independence between portlet applications
*
- * @return
- * @throws FileNotFoundException
- * @throws JBossXBException
+ * @return the global meta data
+ * @throws Exception any exception
*/
- private GlobalPortletMetaData loadGlobalMetadata(String globalPortletLocation) throws FileNotFoundException,
- JBossXBException
+ private GlobalPortletMetaData loadGlobalMetadata(String globalPortletLocation) throws Exception
{
//TODO: Avoid using File
InputStream in = new FileInputStream(new File(globalPortletLocation));
try
{
+ PortletApplicationMetaDataBuilder builder = new PortletApplicationMetaDataBuilder();
return GlobalPortletMetaData.unmarshalling(in);
}
finally
Modified: epp/portal/branches/EPP_5_2_Branch/component/pc/src/main/java/org/exoplatform/portal/pc/GlobalPortletMetaData.java
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/pc/src/main/java/org/exoplatform/portal/pc/GlobalPortletMetaData.java 2011-09-14 15:50:34 UTC (rev 7423)
+++ epp/portal/branches/EPP_5_2_Branch/component/pc/src/main/java/org/exoplatform/portal/pc/GlobalPortletMetaData.java 2011-09-14 16:26:48 UTC (rev 7424)
@@ -18,15 +18,11 @@
*/
package org.exoplatform.portal.pc;
-import org.gatein.pc.mc.metadata.factory.PortletApplicationModelFactory;
-import org.gatein.pc.mc.metadata.impl.ValueTrimmingFilter;
+import org.gatein.pc.portlet.impl.deployment.staxnav.PortletApplicationMetaDataBuilder;
import org.gatein.pc.portlet.impl.metadata.PortletApplication10MetaData;
import org.gatein.pc.portlet.impl.metadata.PortletApplication20MetaData;
import org.gatein.pc.portlet.impl.metadata.filter.FilterMappingMetaData;
import org.gatein.pc.portlet.impl.metadata.filter.FilterMetaData;
-import org.jboss.xb.binding.JBossXBException;
-import org.jboss.xb.binding.Unmarshaller;
-import org.jboss.xb.binding.UnmarshallerFactory;
import java.io.InputStream;
import java.util.ArrayList;
@@ -135,17 +131,12 @@
//TODO: Wait for the spec of merging public render parameters
}
- public static GlobalPortletMetaData unmarshalling(InputStream in) throws JBossXBException
- {
- Unmarshaller unmarshaller = UnmarshallerFactory.newInstance().newUnmarshaller();
- unmarshaller.setNamespaceAware(true);
- unmarshaller.setSchemaValidation(false);
- unmarshaller.setValidation(false);
+ /** . */
+ private static final PortletApplicationMetaDataBuilder builder = new PortletApplicationMetaDataBuilder();
- PortletApplicationModelFactory factory = new PortletApplicationModelFactory();
-
- PortletApplication10MetaData application10MetaData = (PortletApplication10MetaData)unmarshaller.unmarshal(in, new ValueTrimmingFilter(factory), null);
-
+ public static GlobalPortletMetaData unmarshalling(InputStream in) throws Exception
+ {
+ PortletApplication10MetaData application10MetaData = builder.build(in);
return new GlobalPortletMetaData(application10MetaData);
}
}
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/gatein.ear/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/gatein.ear/pom.xml 2011-09-14 15:50:34 UTC (rev 7423)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/gatein.ear/pom.xml 2011-09-14 16:26:48 UTC (rev 7424)
@@ -919,52 +919,6 @@
</dependency>
<dependency>
<groupId>org.gatein.pc</groupId>
- <artifactId>pc-mc</artifactId>
- <exclusions>
- <exclusion>
- <artifactId>junit</artifactId>
- <groupId>junit</groupId>
- </exclusion>
- <exclusion>
- <artifactId>jaxb-api</artifactId>
- <groupId>sun-jaxb</groupId>
- </exclusion>
- <exclusion>
- <artifactId>jboss-logging-spi</artifactId>
- <groupId>org.jboss.logging</groupId>
- </exclusion>
- <exclusion>
- <artifactId>jboss-reflect</artifactId>
- <groupId>org.jboss</groupId>
- </exclusion>
- <exclusion>
- <artifactId>jboss-unit</artifactId>
- <groupId>org.jboss.unit</groupId>
- </exclusion>
- <exclusion>
- <artifactId>jboss-common-core</artifactId>
- <groupId>org.jboss</groupId>
- </exclusion>
- <exclusion>
- <artifactId>xml-apis</artifactId>
- <groupId>apache-xerces</groupId>
- </exclusion>
- <exclusion>
- <artifactId>dtdparser121</artifactId>
- <groupId>wutka-dtdparser</groupId>
- </exclusion>
- <exclusion>
- <artifactId>xercesImpl</artifactId>
- <groupId>apache-xerces</groupId>
- </exclusion>
- <exclusion>
- <artifactId>jbossxb</artifactId>
- <groupId>org.jboss</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.gatein.pc</groupId>
<artifactId>pc-portlet</artifactId>
<exclusions>
<exclusion>
Modified: epp/portal/branches/EPP_5_2_Branch/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/pom.xml 2011-09-14 15:50:34 UTC (rev 7423)
+++ epp/portal/branches/EPP_5_2_Branch/pom.xml 2011-09-14 16:26:48 UTC (rev 7424)
@@ -51,7 +51,7 @@
<org.gatein.common.version>2.0.4-Beta03</org.gatein.common.version>
<org.gatein.dep.version>1.1.0-Beta06</org.gatein.dep.version>
<org.gatein.wci.version>2.1.0-Beta06</org.gatein.wci.version>
- <org.gatein.pc.version>2.3.0-Beta04</org.gatein.pc.version>
+ <org.gatein.pc.version>2.3.0-Beta05</org.gatein.pc.version>
<org.picketlink.idm>1.3.0.Alpha04</org.picketlink.idm>
<org.gatein.wsrp.version>2.1.0-Beta05</org.gatein.wsrp.version>
<org.gatein.mop.version>1.1.0-Beta05</org.gatein.mop.version>
@@ -354,11 +354,6 @@
</dependency>
<dependency>
<groupId>org.gatein.pc</groupId>
- <artifactId>pc-mc</artifactId>
- <version>${org.gatein.pc.version}</version>
- </dependency>
- <dependency>
- <groupId>org.gatein.pc</groupId>
<artifactId>pc-portlet</artifactId>
<version>${org.gatein.pc.version}</version>
</dependency>
13 years, 4 months
- 1
- 0
gatein SVN: r7423 - in epp/portal/tags/EPP_5_2_0_ER01: distribution/mead-tools and 25 other directories.
by do-not-reply＠jboss.org
Author: hfnukal
Date: 2011-09-14 11:50:34 -0400 (Wed, 14 Sep 2011)
New Revision: 7423
Modified:
epp/portal/tags/EPP_5_2_0_ER01/distribution/mead-tools/exo-core/pom.xml
epp/portal/tags/EPP_5_2_0_ER01/distribution/mead-tools/exo-doc/pom.xml
epp/portal/tags/EPP_5_2_0_ER01/distribution/mead-tools/exo-jcr/pom.xml
epp/portal/tags/EPP_5_2_0_ER01/distribution/mead-tools/exo-junit/pom.xml
epp/portal/tags/EPP_5_2_0_ER01/distribution/mead-tools/exo-kernel/pom.xml
epp/portal/tags/EPP_5_2_0_ER01/distribution/mead-tools/exo-parent/pom.xml
epp/portal/tags/EPP_5_2_0_ER01/distribution/mead-tools/exo-ws/pom.xml
epp/portal/tags/EPP_5_2_0_ER01/distribution/mead-tools/gatein-common/pom.xml
epp/portal/tags/EPP_5_2_0_ER01/distribution/mead-tools/gatein-dep/pom.xml
epp/portal/tags/EPP_5_2_0_ER01/distribution/mead-tools/gatein-management/pom.xml
epp/portal/tags/EPP_5_2_0_ER01/distribution/mead-tools/gatein-mop/pom.xml
epp/portal/tags/EPP_5_2_0_ER01/distribution/mead-tools/gatein-packager/pom.xml
epp/portal/tags/EPP_5_2_0_ER01/distribution/mead-tools/gatein-parent/pom.xml
epp/portal/tags/EPP_5_2_0_ER01/distribution/mead-tools/gatein-pc/pom.xml
epp/portal/tags/EPP_5_2_0_ER01/distribution/mead-tools/gatein-portal/pom.xml
epp/portal/tags/EPP_5_2_0_ER01/distribution/mead-tools/gatein-shindig/pom.xml
epp/portal/tags/EPP_5_2_0_ER01/distribution/mead-tools/gatein-simplecaptcha/pom.xml
epp/portal/tags/EPP_5_2_0_ER01/distribution/mead-tools/gatein-sso/pom.xml
epp/portal/tags/EPP_5_2_0_ER01/distribution/mead-tools/gatein-wci/pom.xml
epp/portal/tags/EPP_5_2_0_ER01/distribution/mead-tools/gatein-wsrp/pom.xml
epp/portal/tags/EPP_5_2_0_ER01/distribution/mead-tools/jboss-picketlink-idm/pom.xml
epp/portal/tags/EPP_5_2_0_ER01/distribution/mead-tools/jboss-portletbridge/pom.xml
epp/portal/tags/EPP_5_2_0_ER01/distribution/mead-tools/mead.parent/pom.xml
epp/portal/tags/EPP_5_2_0_ER01/distribution/mead-tools/pom.xml
epp/portal/tags/EPP_5_2_0_ER01/pom.xml
epp/portal/tags/EPP_5_2_0_ER01/server/jboss/patch-ear/src/main/jboss/server/default/deploy/gatein.ear/integration.war/pom.xml
epp/portal/tags/EPP_5_2_0_ER01/testsuite/htmlunit-tests/pom.xml
Log:
Version update
Modified: epp/portal/tags/EPP_5_2_0_ER01/distribution/mead-tools/exo-core/pom.xml
===================================================================
--- epp/portal/tags/EPP_5_2_0_ER01/distribution/mead-tools/exo-core/pom.xml 2011-09-14 15:21:12 UTC (rev 7422)
+++ epp/portal/tags/EPP_5_2_0_ER01/distribution/mead-tools/exo-core/pom.xml 2011-09-14 15:50:34 UTC (rev 7423)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.exoplatform.portal.mead</groupId>
<artifactId>mead.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
<relativePath>../mead.parent/pom.xml</relativePath>
</parent>
Modified: epp/portal/tags/EPP_5_2_0_ER01/distribution/mead-tools/exo-doc/pom.xml
===================================================================
--- epp/portal/tags/EPP_5_2_0_ER01/distribution/mead-tools/exo-doc/pom.xml 2011-09-14 15:21:12 UTC (rev 7422)
+++ epp/portal/tags/EPP_5_2_0_ER01/distribution/mead-tools/exo-doc/pom.xml 2011-09-14 15:50:34 UTC (rev 7423)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.exoplatform.portal.mead</groupId>
<artifactId>mead.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
<relativePath>../mead.parent/pom.xml</relativePath>
</parent>
Modified: epp/portal/tags/EPP_5_2_0_ER01/distribution/mead-tools/exo-jcr/pom.xml
===================================================================
--- epp/portal/tags/EPP_5_2_0_ER01/distribution/mead-tools/exo-jcr/pom.xml 2011-09-14 15:21:12 UTC (rev 7422)
+++ epp/portal/tags/EPP_5_2_0_ER01/distribution/mead-tools/exo-jcr/pom.xml 2011-09-14 15:50:34 UTC (rev 7423)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.exoplatform.portal.mead</groupId>
<artifactId>mead.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
<relativePath>../mead.parent/pom.xml</relativePath>
</parent>
Modified: epp/portal/tags/EPP_5_2_0_ER01/distribution/mead-tools/exo-junit/pom.xml
===================================================================
--- epp/portal/tags/EPP_5_2_0_ER01/distribution/mead-tools/exo-junit/pom.xml 2011-09-14 15:21:12 UTC (rev 7422)
+++ epp/portal/tags/EPP_5_2_0_ER01/distribution/mead-tools/exo-junit/pom.xml 2011-09-14 15:50:34 UTC (rev 7423)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.exoplatform.portal.mead</groupId>
<artifactId>mead.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
<relativePath>../mead.parent/pom.xml</relativePath>
</parent>
Modified: epp/portal/tags/EPP_5_2_0_ER01/distribution/mead-tools/exo-kernel/pom.xml
===================================================================
--- epp/portal/tags/EPP_5_2_0_ER01/distribution/mead-tools/exo-kernel/pom.xml 2011-09-14 15:21:12 UTC (rev 7422)
+++ epp/portal/tags/EPP_5_2_0_ER01/distribution/mead-tools/exo-kernel/pom.xml 2011-09-14 15:50:34 UTC (rev 7423)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.exoplatform.portal.mead</groupId>
<artifactId>mead.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
<relativePath>../mead.parent/pom.xml</relativePath>
</parent>
Modified: epp/portal/tags/EPP_5_2_0_ER01/distribution/mead-tools/exo-parent/pom.xml
===================================================================
--- epp/portal/tags/EPP_5_2_0_ER01/distribution/mead-tools/exo-parent/pom.xml 2011-09-14 15:21:12 UTC (rev 7422)
+++ epp/portal/tags/EPP_5_2_0_ER01/distribution/mead-tools/exo-parent/pom.xml 2011-09-14 15:50:34 UTC (rev 7423)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.exoplatform.portal.mead</groupId>
<artifactId>mead.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
<relativePath>../mead.parent/pom.xml</relativePath>
</parent>
Modified: epp/portal/tags/EPP_5_2_0_ER01/distribution/mead-tools/exo-ws/pom.xml
===================================================================
--- epp/portal/tags/EPP_5_2_0_ER01/distribution/mead-tools/exo-ws/pom.xml 2011-09-14 15:21:12 UTC (rev 7422)
+++ epp/portal/tags/EPP_5_2_0_ER01/distribution/mead-tools/exo-ws/pom.xml 2011-09-14 15:50:34 UTC (rev 7423)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.exoplatform.portal.mead</groupId>
<artifactId>mead.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
<relativePath>../mead.parent/pom.xml</relativePath>
</parent>
Modified: epp/portal/tags/EPP_5_2_0_ER01/distribution/mead-tools/gatein-common/pom.xml
===================================================================
--- epp/portal/tags/EPP_5_2_0_ER01/distribution/mead-tools/gatein-common/pom.xml 2011-09-14 15:21:12 UTC (rev 7422)
+++ epp/portal/tags/EPP_5_2_0_ER01/distribution/mead-tools/gatein-common/pom.xml 2011-09-14 15:50:34 UTC (rev 7423)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.exoplatform.portal.mead</groupId>
<artifactId>mead.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
<relativePath>../mead.parent/pom.xml</relativePath>
</parent>
Modified: epp/portal/tags/EPP_5_2_0_ER01/distribution/mead-tools/gatein-dep/pom.xml
===================================================================
--- epp/portal/tags/EPP_5_2_0_ER01/distribution/mead-tools/gatein-dep/pom.xml 2011-09-14 15:21:12 UTC (rev 7422)
+++ epp/portal/tags/EPP_5_2_0_ER01/distribution/mead-tools/gatein-dep/pom.xml 2011-09-14 15:50:34 UTC (rev 7423)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.exoplatform.portal.mead</groupId>
<artifactId>mead.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
<relativePath>../mead.parent/pom.xml</relativePath>
</parent>
Modified: epp/portal/tags/EPP_5_2_0_ER01/distribution/mead-tools/gatein-management/pom.xml
===================================================================
--- epp/portal/tags/EPP_5_2_0_ER01/distribution/mead-tools/gatein-management/pom.xml 2011-09-14 15:21:12 UTC (rev 7422)
+++ epp/portal/tags/EPP_5_2_0_ER01/distribution/mead-tools/gatein-management/pom.xml 2011-09-14 15:50:34 UTC (rev 7423)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.exoplatform.portal.mead</groupId>
<artifactId>mead.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
<relativePath>../mead.parent/pom.xml</relativePath>
</parent>
Modified: epp/portal/tags/EPP_5_2_0_ER01/distribution/mead-tools/gatein-mop/pom.xml
===================================================================
--- epp/portal/tags/EPP_5_2_0_ER01/distribution/mead-tools/gatein-mop/pom.xml 2011-09-14 15:21:12 UTC (rev 7422)
+++ epp/portal/tags/EPP_5_2_0_ER01/distribution/mead-tools/gatein-mop/pom.xml 2011-09-14 15:50:34 UTC (rev 7423)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.exoplatform.portal.mead</groupId>
<artifactId>mead.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
<relativePath>../mead.parent/pom.xml</relativePath>
</parent>
Modified: epp/portal/tags/EPP_5_2_0_ER01/distribution/mead-tools/gatein-packager/pom.xml
===================================================================
--- epp/portal/tags/EPP_5_2_0_ER01/distribution/mead-tools/gatein-packager/pom.xml 2011-09-14 15:21:12 UTC (rev 7422)
+++ epp/portal/tags/EPP_5_2_0_ER01/distribution/mead-tools/gatein-packager/pom.xml 2011-09-14 15:50:34 UTC (rev 7423)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.exoplatform.portal.mead</groupId>
<artifactId>mead.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
<relativePath>../mead.parent/pom.xml</relativePath>
</parent>
Modified: epp/portal/tags/EPP_5_2_0_ER01/distribution/mead-tools/gatein-parent/pom.xml
===================================================================
--- epp/portal/tags/EPP_5_2_0_ER01/distribution/mead-tools/gatein-parent/pom.xml 2011-09-14 15:21:12 UTC (rev 7422)
+++ epp/portal/tags/EPP_5_2_0_ER01/distribution/mead-tools/gatein-parent/pom.xml 2011-09-14 15:50:34 UTC (rev 7423)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.exoplatform.portal.mead</groupId>
<artifactId>mead.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
<relativePath>../mead.parent/pom.xml</relativePath>
</parent>
Modified: epp/portal/tags/EPP_5_2_0_ER01/distribution/mead-tools/gatein-pc/pom.xml
===================================================================
--- epp/portal/tags/EPP_5_2_0_ER01/distribution/mead-tools/gatein-pc/pom.xml 2011-09-14 15:21:12 UTC (rev 7422)
+++ epp/portal/tags/EPP_5_2_0_ER01/distribution/mead-tools/gatein-pc/pom.xml 2011-09-14 15:50:34 UTC (rev 7423)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.exoplatform.portal.mead</groupId>
<artifactId>mead.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
<relativePath>../mead.parent/pom.xml</relativePath>
</parent>
Modified: epp/portal/tags/EPP_5_2_0_ER01/distribution/mead-tools/gatein-portal/pom.xml
===================================================================
--- epp/portal/tags/EPP_5_2_0_ER01/distribution/mead-tools/gatein-portal/pom.xml 2011-09-14 15:21:12 UTC (rev 7422)
+++ epp/portal/tags/EPP_5_2_0_ER01/distribution/mead-tools/gatein-portal/pom.xml 2011-09-14 15:50:34 UTC (rev 7423)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.exoplatform.portal.mead</groupId>
<artifactId>mead.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
<relativePath>../mead.parent/pom.xml</relativePath>
</parent>
Modified: epp/portal/tags/EPP_5_2_0_ER01/distribution/mead-tools/gatein-shindig/pom.xml
===================================================================
--- epp/portal/tags/EPP_5_2_0_ER01/distribution/mead-tools/gatein-shindig/pom.xml 2011-09-14 15:21:12 UTC (rev 7422)
+++ epp/portal/tags/EPP_5_2_0_ER01/distribution/mead-tools/gatein-shindig/pom.xml 2011-09-14 15:50:34 UTC (rev 7423)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.exoplatform.portal.mead</groupId>
<artifactId>mead.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
<relativePath>../mead.parent/pom.xml</relativePath>
</parent>
Modified: epp/portal/tags/EPP_5_2_0_ER01/distribution/mead-tools/gatein-simplecaptcha/pom.xml
===================================================================
--- epp/portal/tags/EPP_5_2_0_ER01/distribution/mead-tools/gatein-simplecaptcha/pom.xml 2011-09-14 15:21:12 UTC (rev 7422)
+++ epp/portal/tags/EPP_5_2_0_ER01/distribution/mead-tools/gatein-simplecaptcha/pom.xml 2011-09-14 15:50:34 UTC (rev 7423)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.exoplatform.portal.mead</groupId>
<artifactId>mead.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
<relativePath>../mead.parent/pom.xml</relativePath>
</parent>
Modified: epp/portal/tags/EPP_5_2_0_ER01/distribution/mead-tools/gatein-sso/pom.xml
===================================================================
--- epp/portal/tags/EPP_5_2_0_ER01/distribution/mead-tools/gatein-sso/pom.xml 2011-09-14 15:21:12 UTC (rev 7422)
+++ epp/portal/tags/EPP_5_2_0_ER01/distribution/mead-tools/gatein-sso/pom.xml 2011-09-14 15:50:34 UTC (rev 7423)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.exoplatform.portal.mead</groupId>
<artifactId>mead.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
<relativePath>../mead.parent/pom.xml</relativePath>
</parent>
Modified: epp/portal/tags/EPP_5_2_0_ER01/distribution/mead-tools/gatein-wci/pom.xml
===================================================================
--- epp/portal/tags/EPP_5_2_0_ER01/distribution/mead-tools/gatein-wci/pom.xml 2011-09-14 15:21:12 UTC (rev 7422)
+++ epp/portal/tags/EPP_5_2_0_ER01/distribution/mead-tools/gatein-wci/pom.xml 2011-09-14 15:50:34 UTC (rev 7423)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.exoplatform.portal.mead</groupId>
<artifactId>mead.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
<relativePath>../mead.parent/pom.xml</relativePath>
</parent>
Modified: epp/portal/tags/EPP_5_2_0_ER01/distribution/mead-tools/gatein-wsrp/pom.xml
===================================================================
--- epp/portal/tags/EPP_5_2_0_ER01/distribution/mead-tools/gatein-wsrp/pom.xml 2011-09-14 15:21:12 UTC (rev 7422)
+++ epp/portal/tags/EPP_5_2_0_ER01/distribution/mead-tools/gatein-wsrp/pom.xml 2011-09-14 15:50:34 UTC (rev 7423)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.exoplatform.portal.mead</groupId>
<artifactId>mead.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
<relativePath>../mead.parent/pom.xml</relativePath>
</parent>
Modified: epp/portal/tags/EPP_5_2_0_ER01/distribution/mead-tools/jboss-picketlink-idm/pom.xml
===================================================================
--- epp/portal/tags/EPP_5_2_0_ER01/distribution/mead-tools/jboss-picketlink-idm/pom.xml 2011-09-14 15:21:12 UTC (rev 7422)
+++ epp/portal/tags/EPP_5_2_0_ER01/distribution/mead-tools/jboss-picketlink-idm/pom.xml 2011-09-14 15:50:34 UTC (rev 7423)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.exoplatform.portal.mead</groupId>
<artifactId>mead.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
<relativePath>../mead.parent/pom.xml</relativePath>
</parent>
Modified: epp/portal/tags/EPP_5_2_0_ER01/distribution/mead-tools/jboss-portletbridge/pom.xml
===================================================================
--- epp/portal/tags/EPP_5_2_0_ER01/distribution/mead-tools/jboss-portletbridge/pom.xml 2011-09-14 15:21:12 UTC (rev 7422)
+++ epp/portal/tags/EPP_5_2_0_ER01/distribution/mead-tools/jboss-portletbridge/pom.xml 2011-09-14 15:50:34 UTC (rev 7423)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.exoplatform.portal.mead</groupId>
<artifactId>mead.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
<relativePath>../mead.parent/pom.xml</relativePath>
</parent>
Modified: epp/portal/tags/EPP_5_2_0_ER01/distribution/mead-tools/mead.parent/pom.xml
===================================================================
--- epp/portal/tags/EPP_5_2_0_ER01/distribution/mead-tools/mead.parent/pom.xml 2011-09-14 15:21:12 UTC (rev 7422)
+++ epp/portal/tags/EPP_5_2_0_ER01/distribution/mead-tools/mead.parent/pom.xml 2011-09-14 15:50:34 UTC (rev 7423)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.exoplatform.portal.mead</groupId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
<artifactId>mead-tools</artifactId>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: epp/portal/tags/EPP_5_2_0_ER01/distribution/mead-tools/pom.xml
===================================================================
--- epp/portal/tags/EPP_5_2_0_ER01/distribution/mead-tools/pom.xml 2011-09-14 15:21:12 UTC (rev 7422)
+++ epp/portal/tags/EPP_5_2_0_ER01/distribution/mead-tools/pom.xml 2011-09-14 15:50:34 UTC (rev 7423)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>distribution.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
</parent>
<groupId>org.exoplatform.portal.mead</groupId>
@@ -121,8 +121,8 @@
<module>gatein-wsrp </module>
<module>gatein-mop </module>
<module>gatein-simplecaptcha </module>
- <module>gatein-shindig </module>
- <module>gatein-management </module>
+ <!--<module>gatein-shindig </module>-->
+ <!--<module>gatein-management </module>-->
<module>jboss-picketlink-idm </module>
<module>gatein-portal </module>
<module>gatein-sso </module>
Modified: epp/portal/tags/EPP_5_2_0_ER01/pom.xml
===================================================================
--- epp/portal/tags/EPP_5_2_0_ER01/pom.xml 2011-09-14 15:21:12 UTC (rev 7422)
+++ epp/portal/tags/EPP_5_2_0_ER01/pom.xml 2011-09-14 15:50:34 UTC (rev 7423)
@@ -618,12 +618,12 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test.organization</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test.organization</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
<type>test-jar</type>
</dependency>
<dependency>
Modified: epp/portal/tags/EPP_5_2_0_ER01/server/jboss/patch-ear/src/main/jboss/server/default/deploy/gatein.ear/integration.war/pom.xml
===================================================================
--- epp/portal/tags/EPP_5_2_0_ER01/server/jboss/patch-ear/src/main/jboss/server/default/deploy/gatein.ear/integration.war/pom.xml 2011-09-14 15:21:12 UTC (rev 7422)
+++ epp/portal/tags/EPP_5_2_0_ER01/server/jboss/patch-ear/src/main/jboss/server/default/deploy/gatein.ear/integration.war/pom.xml 2011-09-14 15:50:34 UTC (rev 7423)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
</parent>
<artifactId>exo.portal.packaging.jboss-as.integration</artifactId>
<packaging>war</packaging>
Modified: epp/portal/tags/EPP_5_2_0_ER01/testsuite/htmlunit-tests/pom.xml
===================================================================
--- epp/portal/tags/EPP_5_2_0_ER01/testsuite/htmlunit-tests/pom.xml 2011-09-14 15:21:12 UTC (rev 7422)
+++ epp/portal/tags/EPP_5_2_0_ER01/testsuite/htmlunit-tests/pom.xml 2011-09-14 15:50:34 UTC (rev 7423)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.testsuite</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
</parent>
<groupId>org.jboss.gatein</groupId>
13 years, 4 months
- 1
- 0
gatein SVN: r7422 - in epp/portal/tags: EPP_5_2_0_ER01 and 83 other directories.
by do-not-reply＠jboss.org
Author: hfnukal
Date: 2011-09-14 11:21:12 -0400 (Wed, 14 Sep 2011)
New Revision: 7422
Added:
epp/portal/tags/EPP_5_2_0_ER01/
Modified:
epp/portal/tags/EPP_5_2_0_ER01/component/application-registry/pom.xml
epp/portal/tags/EPP_5_2_0_ER01/component/common/pom.xml
epp/portal/tags/EPP_5_2_0_ER01/component/identity/pom.xml
epp/portal/tags/EPP_5_2_0_ER01/component/management/pom.xml
epp/portal/tags/EPP_5_2_0_ER01/component/pc/pom.xml
epp/portal/tags/EPP_5_2_0_ER01/component/pom.xml
epp/portal/tags/EPP_5_2_0_ER01/component/portal/pom.xml
epp/portal/tags/EPP_5_2_0_ER01/component/resources/pom.xml
epp/portal/tags/EPP_5_2_0_ER01/component/scripting/pom.xml
epp/portal/tags/EPP_5_2_0_ER01/component/test/core/pom.xml
epp/portal/tags/EPP_5_2_0_ER01/component/test/jcr/pom.xml
epp/portal/tags/EPP_5_2_0_ER01/component/test/pom.xml
epp/portal/tags/EPP_5_2_0_ER01/component/web/api/pom.xml
epp/portal/tags/EPP_5_2_0_ER01/component/web/controller/pom.xml
epp/portal/tags/EPP_5_2_0_ER01/component/web/pom.xml
epp/portal/tags/EPP_5_2_0_ER01/component/web/resources/pom.xml
epp/portal/tags/EPP_5_2_0_ER01/component/web/security/pom.xml
epp/portal/tags/EPP_5_2_0_ER01/component/web/server/pom.xml
epp/portal/tags/EPP_5_2_0_ER01/distribution/jboss-epp/examples/pom.xml
epp/portal/tags/EPP_5_2_0_ER01/distribution/jboss-epp/pom.xml
epp/portal/tags/EPP_5_2_0_ER01/distribution/jboss-epp/portletbridge/pom.xml
epp/portal/tags/EPP_5_2_0_ER01/distribution/jboss-epp/serverAddon/gatein.ear/pom.xml
epp/portal/tags/EPP_5_2_0_ER01/distribution/jboss-epp/serverAddon/integration.war/pom.xml
epp/portal/tags/EPP_5_2_0_ER01/distribution/jboss-epp/serverAddon/pom.xml
epp/portal/tags/EPP_5_2_0_ER01/distribution/mead-tools/pom.xml
epp/portal/tags/EPP_5_2_0_ER01/distribution/pom.xml
epp/portal/tags/EPP_5_2_0_ER01/examples/extension/config/pom.xml
epp/portal/tags/EPP_5_2_0_ER01/examples/extension/ear/pom.xml
epp/portal/tags/EPP_5_2_0_ER01/examples/extension/jar/pom.xml
epp/portal/tags/EPP_5_2_0_ER01/examples/extension/pom.xml
epp/portal/tags/EPP_5_2_0_ER01/examples/extension/war/pom.xml
epp/portal/tags/EPP_5_2_0_ER01/examples/pom.xml
epp/portal/tags/EPP_5_2_0_ER01/examples/portal/config/pom.xml
epp/portal/tags/EPP_5_2_0_ER01/examples/portal/ear/pom.xml
epp/portal/tags/EPP_5_2_0_ER01/examples/portal/jar/pom.xml
epp/portal/tags/EPP_5_2_0_ER01/examples/portal/pom.xml
epp/portal/tags/EPP_5_2_0_ER01/examples/portal/rest-war/pom.xml
epp/portal/tags/EPP_5_2_0_ER01/examples/portal/war/pom.xml
epp/portal/tags/EPP_5_2_0_ER01/examples/portlets/api/pom.xml
epp/portal/tags/EPP_5_2_0_ER01/examples/portlets/jsfhellouser/pom.xml
epp/portal/tags/EPP_5_2_0_ER01/examples/portlets/jsphellouser/pom.xml
epp/portal/tags/EPP_5_2_0_ER01/examples/portlets/pom.xml
epp/portal/tags/EPP_5_2_0_ER01/examples/portlets/simplesthelloworld/pom.xml
epp/portal/tags/EPP_5_2_0_ER01/examples/portlets/struts-jpetstore/pom.xml
epp/portal/tags/EPP_5_2_0_ER01/examples/skins/pom.xml
epp/portal/tags/EPP_5_2_0_ER01/examples/skins/simpleskin/pom.xml
epp/portal/tags/EPP_5_2_0_ER01/gadgets/core/pom.xml
epp/portal/tags/EPP_5_2_0_ER01/gadgets/eXoGadgets/pom.xml
epp/portal/tags/EPP_5_2_0_ER01/gadgets/gwtGadgets/pom.xml
epp/portal/tags/EPP_5_2_0_ER01/gadgets/pom.xml
epp/portal/tags/EPP_5_2_0_ER01/gadgets/server/pom.xml
epp/portal/tags/EPP_5_2_0_ER01/pom.xml
epp/portal/tags/EPP_5_2_0_ER01/portlet/dashboard/pom.xml
epp/portal/tags/EPP_5_2_0_ER01/portlet/exoadmin/pom.xml
epp/portal/tags/EPP_5_2_0_ER01/portlet/pom.xml
epp/portal/tags/EPP_5_2_0_ER01/portlet/web/pom.xml
epp/portal/tags/EPP_5_2_0_ER01/server/jboss/patch-ear/pom.xml
epp/portal/tags/EPP_5_2_0_ER01/server/jboss/plugin/pom.xml
epp/portal/tags/EPP_5_2_0_ER01/server/jboss/pom.xml
epp/portal/tags/EPP_5_2_0_ER01/server/pom.xml
epp/portal/tags/EPP_5_2_0_ER01/starter/ear/pom.xml
epp/portal/tags/EPP_5_2_0_ER01/starter/jar/pom.xml
epp/portal/tags/EPP_5_2_0_ER01/starter/pom.xml
epp/portal/tags/EPP_5_2_0_ER01/starter/war/pom.xml
epp/portal/tags/EPP_5_2_0_ER01/testsuite/pom.xml
epp/portal/tags/EPP_5_2_0_ER01/testsuite/selenium-snifftests/pom.xml
epp/portal/tags/EPP_5_2_0_ER01/testsuite/webuibasedsamples/pom.xml
epp/portal/tags/EPP_5_2_0_ER01/web/eXoResources/pom.xml
epp/portal/tags/EPP_5_2_0_ER01/web/pom.xml
epp/portal/tags/EPP_5_2_0_ER01/web/portal/pom.xml
epp/portal/tags/EPP_5_2_0_ER01/web/rest/pom.xml
epp/portal/tags/EPP_5_2_0_ER01/webui/core/pom.xml
epp/portal/tags/EPP_5_2_0_ER01/webui/dashboard/pom.xml
epp/portal/tags/EPP_5_2_0_ER01/webui/eXo/pom.xml
epp/portal/tags/EPP_5_2_0_ER01/webui/framework/pom.xml
epp/portal/tags/EPP_5_2_0_ER01/webui/pom.xml
epp/portal/tags/EPP_5_2_0_ER01/webui/portal/pom.xml
epp/portal/tags/EPP_5_2_0_ER01/webui/portlet/pom.xml
epp/portal/tags/EPP_5_2_0_ER01/wsrp-integration/extension-component/pom.xml
epp/portal/tags/EPP_5_2_0_ER01/wsrp-integration/extension-config/pom.xml
epp/portal/tags/EPP_5_2_0_ER01/wsrp-integration/extension-ear-as5/pom.xml
epp/portal/tags/EPP_5_2_0_ER01/wsrp-integration/extension-ear/pom.xml
epp/portal/tags/EPP_5_2_0_ER01/wsrp-integration/extension-war/pom.xml
epp/portal/tags/EPP_5_2_0_ER01/wsrp-integration/pom.xml
Log:
New version EPP 5.2.0.ER01
Property changes on: epp/portal/tags/EPP_5_2_0_ER01
___________________________________________________________________
Added: svn:ignore
+ *.iml
.idea
Added: 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,5363,5402,5445
/portal/branches/branch-GTNPORTAL-1731:5622,5644,5668
/portal/branches/branch-GTNPORTAL-1745:5765
/portal/branches/branch-GTNPORTAL-1790:5871
/portal/branches/branch-GTNPORTAL-1822:5943,5952
/portal/branches/branch-GTNPORTAL-1832:6030,6063
/portal/branches/branch-GTNPORTAL-1872:6400,6551
/portal/branches/branch-GTNPORTAL-1921:6603
/portal/branches/branch-GTNPORTAL-1963:6904,6915-6916
/portal/branches/decoupled-webos:6214-6243
/portal/branches/gatein-management:6920-6958
/portal/branches/global-portlet-metadata:6298-6384
/portal/branches/site-describability:6171-6235
/portal/trunk:4891,5269,5744,5822,5943,6168,6196,6201-6203,6205-6206,6223,6323,6437,6440,6449,6452,6573,6783-6784,6912-6913,6960,7042,7061,7095,7117,7125,7132-7134,7239,7262,7308,7326,7331,7359,7367
Modified: epp/portal/tags/EPP_5_2_0_ER01/component/application-registry/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/application-registry/pom.xml 2011-09-14 15:03:35 UTC (rev 7421)
+++ epp/portal/tags/EPP_5_2_0_ER01/component/application-registry/pom.xml 2011-09-14 15:21:12 UTC (rev 7422)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/tags/EPP_5_2_0_ER01/component/common/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/common/pom.xml 2011-09-14 15:03:35 UTC (rev 7421)
+++ epp/portal/tags/EPP_5_2_0_ER01/component/common/pom.xml 2011-09-14 15:21:12 UTC (rev 7422)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>exo.portal.component.common</artifactId>
Modified: epp/portal/tags/EPP_5_2_0_ER01/component/identity/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/identity/pom.xml 2011-09-14 15:03:35 UTC (rev 7421)
+++ epp/portal/tags/EPP_5_2_0_ER01/component/identity/pom.xml 2011-09-14 15:21:12 UTC (rev 7422)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/tags/EPP_5_2_0_ER01/component/management/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/management/pom.xml 2011-09-14 15:03:35 UTC (rev 7421)
+++ epp/portal/tags/EPP_5_2_0_ER01/component/management/pom.xml 2011-09-14 15:21:12 UTC (rev 7422)
@@ -21,7 +21,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/tags/EPP_5_2_0_ER01/component/pc/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/pc/pom.xml 2011-09-14 15:03:35 UTC (rev 7421)
+++ epp/portal/tags/EPP_5_2_0_ER01/component/pc/pom.xml 2011-09-14 15:21:12 UTC (rev 7422)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/tags/EPP_5_2_0_ER01/component/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/pom.xml 2011-09-14 15:03:35 UTC (rev 7421)
+++ epp/portal/tags/EPP_5_2_0_ER01/component/pom.xml 2011-09-14 15:21:12 UTC (rev 7422)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
</parent>
<artifactId>exo.portal.component</artifactId>
Modified: epp/portal/tags/EPP_5_2_0_ER01/component/portal/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/portal/pom.xml 2011-09-14 15:03:35 UTC (rev 7421)
+++ epp/portal/tags/EPP_5_2_0_ER01/component/portal/pom.xml 2011-09-14 15:21:12 UTC (rev 7422)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/tags/EPP_5_2_0_ER01/component/resources/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/resources/pom.xml 2011-09-14 15:03:35 UTC (rev 7421)
+++ epp/portal/tags/EPP_5_2_0_ER01/component/resources/pom.xml 2011-09-14 15:21:12 UTC (rev 7422)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/tags/EPP_5_2_0_ER01/component/scripting/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/scripting/pom.xml 2011-09-14 15:03:35 UTC (rev 7421)
+++ epp/portal/tags/EPP_5_2_0_ER01/component/scripting/pom.xml 2011-09-14 15:21:12 UTC (rev 7422)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/tags/EPP_5_2_0_ER01/component/test/core/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/test/core/pom.xml 2011-09-14 15:03:35 UTC (rev 7421)
+++ epp/portal/tags/EPP_5_2_0_ER01/component/test/core/pom.xml 2011-09-14 15:21:12 UTC (rev 7422)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/tags/EPP_5_2_0_ER01/component/test/jcr/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/test/jcr/pom.xml 2011-09-14 15:03:35 UTC (rev 7421)
+++ epp/portal/tags/EPP_5_2_0_ER01/component/test/jcr/pom.xml 2011-09-14 15:21:12 UTC (rev 7422)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/tags/EPP_5_2_0_ER01/component/test/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/test/pom.xml 2011-09-14 15:03:35 UTC (rev 7421)
+++ epp/portal/tags/EPP_5_2_0_ER01/component/test/pom.xml 2011-09-14 15:21:12 UTC (rev 7422)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/tags/EPP_5_2_0_ER01/component/web/api/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/web/api/pom.xml 2011-09-14 15:03:35 UTC (rev 7421)
+++ epp/portal/tags/EPP_5_2_0_ER01/component/web/api/pom.xml 2011-09-14 15:21:12 UTC (rev 7422)
@@ -21,7 +21,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/tags/EPP_5_2_0_ER01/component/web/controller/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/web/controller/pom.xml 2011-09-14 15:03:35 UTC (rev 7421)
+++ epp/portal/tags/EPP_5_2_0_ER01/component/web/controller/pom.xml 2011-09-14 15:21:12 UTC (rev 7422)
@@ -21,7 +21,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/tags/EPP_5_2_0_ER01/component/web/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/web/pom.xml 2011-09-14 15:03:35 UTC (rev 7421)
+++ epp/portal/tags/EPP_5_2_0_ER01/component/web/pom.xml 2011-09-14 15:21:12 UTC (rev 7422)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/tags/EPP_5_2_0_ER01/component/web/resources/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/web/resources/pom.xml 2011-09-14 15:03:35 UTC (rev 7421)
+++ epp/portal/tags/EPP_5_2_0_ER01/component/web/resources/pom.xml 2011-09-14 15:21:12 UTC (rev 7422)
@@ -21,7 +21,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/tags/EPP_5_2_0_ER01/component/web/security/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/web/security/pom.xml 2011-09-14 15:03:35 UTC (rev 7421)
+++ epp/portal/tags/EPP_5_2_0_ER01/component/web/security/pom.xml 2011-09-14 15:21:12 UTC (rev 7422)
@@ -21,7 +21,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/tags/EPP_5_2_0_ER01/component/web/server/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/web/server/pom.xml 2011-09-14 15:03:35 UTC (rev 7421)
+++ epp/portal/tags/EPP_5_2_0_ER01/component/web/server/pom.xml 2011-09-14 15:21:12 UTC (rev 7422)
@@ -21,7 +21,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/tags/EPP_5_2_0_ER01/distribution/jboss-epp/examples/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/examples/pom.xml 2011-09-14 15:03:35 UTC (rev 7421)
+++ epp/portal/tags/EPP_5_2_0_ER01/distribution/jboss-epp/examples/pom.xml 2011-09-14 15:21:12 UTC (rev 7422)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>distribution.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: epp/portal/tags/EPP_5_2_0_ER01/distribution/jboss-epp/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/pom.xml 2011-09-14 15:03:35 UTC (rev 7421)
+++ epp/portal/tags/EPP_5_2_0_ER01/distribution/jboss-epp/pom.xml 2011-09-14 15:21:12 UTC (rev 7422)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>distribution.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
</parent>
<artifactId>distribution</artifactId>
Modified: epp/portal/tags/EPP_5_2_0_ER01/distribution/jboss-epp/portletbridge/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/portletbridge/pom.xml 2011-09-14 15:03:35 UTC (rev 7421)
+++ epp/portal/tags/EPP_5_2_0_ER01/distribution/jboss-epp/portletbridge/pom.xml 2011-09-14 15:21:12 UTC (rev 7422)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>distribution.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: epp/portal/tags/EPP_5_2_0_ER01/distribution/jboss-epp/serverAddon/gatein.ear/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/gatein.ear/pom.xml 2011-09-14 15:03:35 UTC (rev 7421)
+++ epp/portal/tags/EPP_5_2_0_ER01/distribution/jboss-epp/serverAddon/gatein.ear/pom.xml 2011-09-14 15:21:12 UTC (rev 7422)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>distribution.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<artifactId>gatein</artifactId>
Modified: epp/portal/tags/EPP_5_2_0_ER01/distribution/jboss-epp/serverAddon/integration.war/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/integration.war/pom.xml 2011-09-14 15:03:35 UTC (rev 7421)
+++ epp/portal/tags/EPP_5_2_0_ER01/distribution/jboss-epp/serverAddon/integration.war/pom.xml 2011-09-14 15:21:12 UTC (rev 7422)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>distribution.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<artifactId>integration</artifactId>
Modified: epp/portal/tags/EPP_5_2_0_ER01/distribution/jboss-epp/serverAddon/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/pom.xml 2011-09-14 15:03:35 UTC (rev 7421)
+++ epp/portal/tags/EPP_5_2_0_ER01/distribution/jboss-epp/serverAddon/pom.xml 2011-09-14 15:21:12 UTC (rev 7422)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>distribution.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: epp/portal/tags/EPP_5_2_0_ER01/distribution/mead-tools/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/pom.xml 2011-09-14 15:03:35 UTC (rev 7421)
+++ epp/portal/tags/EPP_5_2_0_ER01/distribution/mead-tools/pom.xml 2011-09-14 15:21:12 UTC (rev 7422)
@@ -67,9 +67,7 @@
<!-- GateIn -->
<svn.gatein.repo>gatein</svn.gatein.repo>
- <!--<gatein-portal.svnpath>${project.scm.url}</gatein-portal.svnpath>-->
- <!--<gatein-portal.svnpath>epp/portal/tags/EPP_5_2_0_DEV03</gatein-portal.svnpath>-->
- <gatein-portal.svnpath>epp/portal/branches/EPP_5_2_Branch</gatein-portal.svnpath>
+ <gatein-portal.svnpath>epp/portal/tags/EPP_5_2_0_ER01</gatein-portal.svnpath>
<gatein-parent.svnpath>maven/parent/tags/${org.gatein.parent.version}</gatein-parent.svnpath>
<gatein-dep.svnpath>maven/dep/tags/${org.gatein.dep.version}</gatein-dep.svnpath>
Modified: epp/portal/tags/EPP_5_2_0_ER01/distribution/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/pom.xml 2011-09-14 15:03:35 UTC (rev 7421)
+++ epp/portal/tags/EPP_5_2_0_ER01/distribution/pom.xml 2011-09-14 15:21:12 UTC (rev 7422)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
</parent>
<artifactId>distribution.parent</artifactId>
Modified: epp/portal/tags/EPP_5_2_0_ER01/examples/extension/config/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/examples/extension/config/pom.xml 2011-09-14 15:03:35 UTC (rev 7421)
+++ epp/portal/tags/EPP_5_2_0_ER01/examples/extension/config/pom.xml 2011-09-14 15:21:12 UTC (rev 7422)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
Modified: epp/portal/tags/EPP_5_2_0_ER01/examples/extension/ear/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/examples/extension/ear/pom.xml 2011-09-14 15:03:35 UTC (rev 7421)
+++ epp/portal/tags/EPP_5_2_0_ER01/examples/extension/ear/pom.xml 2011-09-14 15:21:12 UTC (rev 7422)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
@@ -38,23 +38,23 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.sample.extension.config</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.sample.extension.jar</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web.api</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.sample.extension.war</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
<type>war</type>
</dependency>
</dependencies>
Modified: epp/portal/tags/EPP_5_2_0_ER01/examples/extension/jar/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/examples/extension/jar/pom.xml 2011-09-14 15:03:35 UTC (rev 7421)
+++ epp/portal/tags/EPP_5_2_0_ER01/examples/extension/jar/pom.xml 2011-09-14 15:21:12 UTC (rev 7422)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
Modified: epp/portal/tags/EPP_5_2_0_ER01/examples/extension/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/examples/extension/pom.xml 2011-09-14 15:03:35 UTC (rev 7421)
+++ epp/portal/tags/EPP_5_2_0_ER01/examples/extension/pom.xml 2011-09-14 15:21:12 UTC (rev 7422)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: epp/portal/tags/EPP_5_2_0_ER01/examples/extension/war/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/examples/extension/war/pom.xml 2011-09-14 15:03:35 UTC (rev 7421)
+++ epp/portal/tags/EPP_5_2_0_ER01/examples/extension/war/pom.xml 2011-09-14 15:21:12 UTC (rev 7422)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
Modified: epp/portal/tags/EPP_5_2_0_ER01/examples/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/examples/pom.xml 2011-09-14 15:03:35 UTC (rev 7421)
+++ epp/portal/tags/EPP_5_2_0_ER01/examples/pom.xml 2011-09-14 15:21:12 UTC (rev 7422)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
</parent>
<artifactId>exo.portal.sample</artifactId>
Modified: epp/portal/tags/EPP_5_2_0_ER01/examples/portal/config/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/examples/portal/config/pom.xml 2011-09-14 15:03:35 UTC (rev 7421)
+++ epp/portal/tags/EPP_5_2_0_ER01/examples/portal/config/pom.xml 2011-09-14 15:21:12 UTC (rev 7422)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
Modified: epp/portal/tags/EPP_5_2_0_ER01/examples/portal/ear/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/examples/portal/ear/pom.xml 2011-09-14 15:03:35 UTC (rev 7421)
+++ epp/portal/tags/EPP_5_2_0_ER01/examples/portal/ear/pom.xml 2011-09-14 15:21:12 UTC (rev 7422)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
@@ -38,29 +38,29 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.sample.portal.config</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.sample.portal.jar</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web.api</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.sample.portal.war</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
<type>war</type>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.sample.portal.rest-war</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
<type>war</type>
</dependency>
</dependencies>
Modified: epp/portal/tags/EPP_5_2_0_ER01/examples/portal/jar/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/examples/portal/jar/pom.xml 2011-09-14 15:03:35 UTC (rev 7421)
+++ epp/portal/tags/EPP_5_2_0_ER01/examples/portal/jar/pom.xml 2011-09-14 15:21:12 UTC (rev 7422)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
Modified: epp/portal/tags/EPP_5_2_0_ER01/examples/portal/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/examples/portal/pom.xml 2011-09-14 15:03:35 UTC (rev 7421)
+++ epp/portal/tags/EPP_5_2_0_ER01/examples/portal/pom.xml 2011-09-14 15:21:12 UTC (rev 7422)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: epp/portal/tags/EPP_5_2_0_ER01/examples/portal/rest-war/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/examples/portal/rest-war/pom.xml 2011-09-14 15:03:35 UTC (rev 7421)
+++ epp/portal/tags/EPP_5_2_0_ER01/examples/portal/rest-war/pom.xml 2011-09-14 15:21:12 UTC (rev 7422)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
Modified: epp/portal/tags/EPP_5_2_0_ER01/examples/portal/war/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/examples/portal/war/pom.xml 2011-09-14 15:03:35 UTC (rev 7421)
+++ epp/portal/tags/EPP_5_2_0_ER01/examples/portal/war/pom.xml 2011-09-14 15:21:12 UTC (rev 7422)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
Modified: epp/portal/tags/EPP_5_2_0_ER01/examples/portlets/api/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/examples/portlets/api/pom.xml 2011-09-14 15:03:35 UTC (rev 7421)
+++ epp/portal/tags/EPP_5_2_0_ER01/examples/portlets/api/pom.xml 2011-09-14 15:21:12 UTC (rev 7422)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.gatein.portal.examples.portlets</groupId>
<artifactId>portlets-parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
</parent>
<artifactId>gatein-api</artifactId>
Modified: epp/portal/tags/EPP_5_2_0_ER01/examples/portlets/jsfhellouser/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/examples/portlets/jsfhellouser/pom.xml 2011-09-14 15:03:35 UTC (rev 7421)
+++ epp/portal/tags/EPP_5_2_0_ER01/examples/portlets/jsfhellouser/pom.xml 2011-09-14 15:21:12 UTC (rev 7422)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.gatein.portal.examples.portlets</groupId>
<artifactId>portlets-parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
</parent>
<artifactId>gatein-jsf-hellouser</artifactId>
Modified: epp/portal/tags/EPP_5_2_0_ER01/examples/portlets/jsphellouser/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/examples/portlets/jsphellouser/pom.xml 2011-09-14 15:03:35 UTC (rev 7421)
+++ epp/portal/tags/EPP_5_2_0_ER01/examples/portlets/jsphellouser/pom.xml 2011-09-14 15:21:12 UTC (rev 7422)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.gatein.portal.examples.portlets</groupId>
<artifactId>portlets-parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
</parent>
<artifactId>gatein-jsp-hellouser</artifactId>
Modified: epp/portal/tags/EPP_5_2_0_ER01/examples/portlets/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/examples/portlets/pom.xml 2011-09-14 15:03:35 UTC (rev 7421)
+++ epp/portal/tags/EPP_5_2_0_ER01/examples/portlets/pom.xml 2011-09-14 15:21:12 UTC (rev 7422)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: epp/portal/tags/EPP_5_2_0_ER01/examples/portlets/simplesthelloworld/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/examples/portlets/simplesthelloworld/pom.xml 2011-09-14 15:03:35 UTC (rev 7421)
+++ epp/portal/tags/EPP_5_2_0_ER01/examples/portlets/simplesthelloworld/pom.xml 2011-09-14 15:21:12 UTC (rev 7422)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.gatein.portal.examples.portlets</groupId>
<artifactId>portlets-parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
</parent>
<artifactId>gatein-simplest-helloworld</artifactId>
Modified: epp/portal/tags/EPP_5_2_0_ER01/examples/portlets/struts-jpetstore/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/examples/portlets/struts-jpetstore/pom.xml 2011-09-14 15:03:35 UTC (rev 7421)
+++ epp/portal/tags/EPP_5_2_0_ER01/examples/portlets/struts-jpetstore/pom.xml 2011-09-14 15:21:12 UTC (rev 7422)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.gatein.portal.examples.portlets</groupId>
<artifactId>portlets-parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
</parent>
<artifactId>struts-jpetstore</artifactId>
Modified: epp/portal/tags/EPP_5_2_0_ER01/examples/skins/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/examples/skins/pom.xml 2011-09-14 15:03:35 UTC (rev 7421)
+++ epp/portal/tags/EPP_5_2_0_ER01/examples/skins/pom.xml 2011-09-14 15:21:12 UTC (rev 7422)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: epp/portal/tags/EPP_5_2_0_ER01/examples/skins/simpleskin/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/pom.xml 2011-09-14 15:03:35 UTC (rev 7421)
+++ epp/portal/tags/EPP_5_2_0_ER01/examples/skins/simpleskin/pom.xml 2011-09-14 15:21:12 UTC (rev 7422)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.portal.examples.skins</groupId>
<artifactId>skins-parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
</parent>
<artifactId>gatein-sample-skin</artifactId>
Modified: epp/portal/tags/EPP_5_2_0_ER01/gadgets/core/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/gadgets/core/pom.xml 2011-09-14 15:03:35 UTC (rev 7421)
+++ epp/portal/tags/EPP_5_2_0_ER01/gadgets/core/pom.xml 2011-09-14 15:21:12 UTC (rev 7422)
@@ -14,7 +14,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.gadgets</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
</parent>
<artifactId>exo.portal.gadgets-core</artifactId>
Modified: epp/portal/tags/EPP_5_2_0_ER01/gadgets/eXoGadgets/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/pom.xml 2011-09-14 15:03:35 UTC (rev 7421)
+++ epp/portal/tags/EPP_5_2_0_ER01/gadgets/eXoGadgets/pom.xml 2011-09-14 15:21:12 UTC (rev 7422)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.gadgets</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/tags/EPP_5_2_0_ER01/gadgets/gwtGadgets/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/gadgets/gwtGadgets/pom.xml 2011-09-14 15:03:35 UTC (rev 7421)
+++ epp/portal/tags/EPP_5_2_0_ER01/gadgets/gwtGadgets/pom.xml 2011-09-14 15:21:12 UTC (rev 7422)
@@ -28,7 +28,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.gadgets</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
</parent>
<artifactId>exo.portal.gwtGadgets</artifactId>
Modified: epp/portal/tags/EPP_5_2_0_ER01/gadgets/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/gadgets/pom.xml 2011-09-14 15:03:35 UTC (rev 7421)
+++ epp/portal/tags/EPP_5_2_0_ER01/gadgets/pom.xml 2011-09-14 15:21:12 UTC (rev 7422)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
</parent>
<artifactId>exo.portal.gadgets</artifactId>
Modified: epp/portal/tags/EPP_5_2_0_ER01/gadgets/server/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/gadgets/server/pom.xml 2011-09-14 15:03:35 UTC (rev 7421)
+++ epp/portal/tags/EPP_5_2_0_ER01/gadgets/server/pom.xml 2011-09-14 15:21:12 UTC (rev 7422)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.gadgets</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
</parent>
<artifactId>exo.portal.gadgets-server</artifactId>
Modified: epp/portal/tags/EPP_5_2_0_ER01/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/pom.xml 2011-09-14 15:03:35 UTC (rev 7421)
+++ epp/portal/tags/EPP_5_2_0_ER01/pom.xml 2011-09-14 15:21:12 UTC (rev 7422)
@@ -31,7 +31,7 @@
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
<packaging>pom</packaging>
<name>EPP GateIn - Portal - ${project.version}</name>
@@ -474,74 +474,74 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.common</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web.controller</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web.security</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web.server</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web.api</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web.resources</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.portal</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.portal</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.pc</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.identity</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.identity</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.resources</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.application-registry</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
@@ -551,68 +551,68 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.scripting</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.management</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui.framework</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui.portlet</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui.portal</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui.eXo</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui.core</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui.dashboard</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.gadgets-core</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test.core</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test.core</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test.jcr</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test.jcr</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
<type>test-jar</type>
</dependency>
<dependency>
@@ -629,7 +629,7 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.server.jboss.plugin</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
</dependency>
<!-- Chromattic -->
Modified: epp/portal/tags/EPP_5_2_0_ER01/portlet/dashboard/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/portlet/dashboard/pom.xml 2011-09-14 15:03:35 UTC (rev 7421)
+++ epp/portal/tags/EPP_5_2_0_ER01/portlet/dashboard/pom.xml 2011-09-14 15:21:12 UTC (rev 7422)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.portlet</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/tags/EPP_5_2_0_ER01/portlet/exoadmin/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/pom.xml 2011-09-14 15:03:35 UTC (rev 7421)
+++ epp/portal/tags/EPP_5_2_0_ER01/portlet/exoadmin/pom.xml 2011-09-14 15:21:12 UTC (rev 7422)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.portlet</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/tags/EPP_5_2_0_ER01/portlet/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/portlet/pom.xml 2011-09-14 15:03:35 UTC (rev 7421)
+++ epp/portal/tags/EPP_5_2_0_ER01/portlet/pom.xml 2011-09-14 15:21:12 UTC (rev 7422)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
</parent>
<artifactId>exo.portal.portlet</artifactId>
Modified: epp/portal/tags/EPP_5_2_0_ER01/portlet/web/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/portlet/web/pom.xml 2011-09-14 15:03:35 UTC (rev 7421)
+++ epp/portal/tags/EPP_5_2_0_ER01/portlet/web/pom.xml 2011-09-14 15:21:12 UTC (rev 7422)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.portlet</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/tags/EPP_5_2_0_ER01/server/jboss/patch-ear/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/server/jboss/patch-ear/pom.xml 2011-09-14 15:03:35 UTC (rev 7421)
+++ epp/portal/tags/EPP_5_2_0_ER01/server/jboss/patch-ear/pom.xml 2011-09-14 15:21:12 UTC (rev 7422)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.server.jboss</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/tags/EPP_5_2_0_ER01/server/jboss/plugin/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/server/jboss/plugin/pom.xml 2011-09-14 15:03:35 UTC (rev 7421)
+++ epp/portal/tags/EPP_5_2_0_ER01/server/jboss/plugin/pom.xml 2011-09-14 15:21:12 UTC (rev 7422)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.server.jboss</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/tags/EPP_5_2_0_ER01/server/jboss/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/server/jboss/pom.xml 2011-09-14 15:03:35 UTC (rev 7421)
+++ epp/portal/tags/EPP_5_2_0_ER01/server/jboss/pom.xml 2011-09-14 15:21:12 UTC (rev 7422)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.server</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
</parent>
<artifactId>exo.portal.server.jboss</artifactId>
Modified: epp/portal/tags/EPP_5_2_0_ER01/server/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/server/pom.xml 2011-09-14 15:03:35 UTC (rev 7421)
+++ epp/portal/tags/EPP_5_2_0_ER01/server/pom.xml 2011-09-14 15:21:12 UTC (rev 7422)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
</parent>
<artifactId>exo.portal.server</artifactId>
Modified: epp/portal/tags/EPP_5_2_0_ER01/starter/ear/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/starter/ear/pom.xml 2011-09-14 15:03:35 UTC (rev 7421)
+++ epp/portal/tags/EPP_5_2_0_ER01/starter/ear/pom.xml 2011-09-14 15:21:12 UTC (rev 7422)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@@ -38,7 +38,7 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.starter.war</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
<type>war</type>
</dependency>
</dependencies>
Modified: epp/portal/tags/EPP_5_2_0_ER01/starter/jar/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/starter/jar/pom.xml 2011-09-14 15:03:35 UTC (rev 7421)
+++ epp/portal/tags/EPP_5_2_0_ER01/starter/jar/pom.xml 2011-09-14 15:21:12 UTC (rev 7422)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: epp/portal/tags/EPP_5_2_0_ER01/starter/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/starter/pom.xml 2011-09-14 15:03:35 UTC (rev 7421)
+++ epp/portal/tags/EPP_5_2_0_ER01/starter/pom.xml 2011-09-14 15:21:12 UTC (rev 7422)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
</parent>
<artifactId>exo.portal.starter.root</artifactId>
Modified: epp/portal/tags/EPP_5_2_0_ER01/starter/war/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/starter/war/pom.xml 2011-09-14 15:03:35 UTC (rev 7421)
+++ epp/portal/tags/EPP_5_2_0_ER01/starter/war/pom.xml 2011-09-14 15:21:12 UTC (rev 7422)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@@ -51,7 +51,7 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.starter.jar</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
</dependency>
</dependencies>
</project>
Modified: epp/portal/tags/EPP_5_2_0_ER01/testsuite/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/testsuite/pom.xml 2011-09-14 15:03:35 UTC (rev 7421)
+++ epp/portal/tags/EPP_5_2_0_ER01/testsuite/pom.xml 2011-09-14 15:21:12 UTC (rev 7422)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
</parent>
<artifactId>exo.portal.testsuite</artifactId>
Modified: epp/portal/tags/EPP_5_2_0_ER01/testsuite/selenium-snifftests/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/testsuite/selenium-snifftests/pom.xml 2011-09-14 15:03:35 UTC (rev 7421)
+++ epp/portal/tags/EPP_5_2_0_ER01/testsuite/selenium-snifftests/pom.xml 2011-09-14 15:21:12 UTC (rev 7422)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.testsuite</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
</parent>
<artifactId>exo.portal.selenium.snifftests</artifactId>
Modified: epp/portal/tags/EPP_5_2_0_ER01/testsuite/webuibasedsamples/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/testsuite/webuibasedsamples/pom.xml 2011-09-14 15:03:35 UTC (rev 7421)
+++ epp/portal/tags/EPP_5_2_0_ER01/testsuite/webuibasedsamples/pom.xml 2011-09-14 15:21:12 UTC (rev 7422)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.testsuite</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
</parent>
<artifactId>exo.webui.based.samples</artifactId>
Modified: epp/portal/tags/EPP_5_2_0_ER01/web/eXoResources/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/web/eXoResources/pom.xml 2011-09-14 15:03:35 UTC (rev 7421)
+++ epp/portal/tags/EPP_5_2_0_ER01/web/eXoResources/pom.xml 2011-09-14 15:21:12 UTC (rev 7422)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.web</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/tags/EPP_5_2_0_ER01/web/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/web/pom.xml 2011-09-14 15:03:35 UTC (rev 7421)
+++ epp/portal/tags/EPP_5_2_0_ER01/web/pom.xml 2011-09-14 15:21:12 UTC (rev 7422)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
</parent>
<artifactId>exo.portal.web</artifactId>
Modified: epp/portal/tags/EPP_5_2_0_ER01/web/portal/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/web/portal/pom.xml 2011-09-14 15:03:35 UTC (rev 7421)
+++ epp/portal/tags/EPP_5_2_0_ER01/web/portal/pom.xml 2011-09-14 15:21:12 UTC (rev 7422)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.web</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/tags/EPP_5_2_0_ER01/web/rest/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/web/rest/pom.xml 2011-09-14 15:03:35 UTC (rev 7421)
+++ epp/portal/tags/EPP_5_2_0_ER01/web/rest/pom.xml 2011-09-14 15:21:12 UTC (rev 7422)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.web</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/tags/EPP_5_2_0_ER01/webui/core/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/webui/core/pom.xml 2011-09-14 15:03:35 UTC (rev 7421)
+++ epp/portal/tags/EPP_5_2_0_ER01/webui/core/pom.xml 2011-09-14 15:21:12 UTC (rev 7422)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/tags/EPP_5_2_0_ER01/webui/dashboard/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/webui/dashboard/pom.xml 2011-09-14 15:03:35 UTC (rev 7421)
+++ epp/portal/tags/EPP_5_2_0_ER01/webui/dashboard/pom.xml 2011-09-14 15:21:12 UTC (rev 7422)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/tags/EPP_5_2_0_ER01/webui/eXo/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/webui/eXo/pom.xml 2011-09-14 15:03:35 UTC (rev 7421)
+++ epp/portal/tags/EPP_5_2_0_ER01/webui/eXo/pom.xml 2011-09-14 15:21:12 UTC (rev 7422)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/tags/EPP_5_2_0_ER01/webui/framework/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/webui/framework/pom.xml 2011-09-14 15:03:35 UTC (rev 7421)
+++ epp/portal/tags/EPP_5_2_0_ER01/webui/framework/pom.xml 2011-09-14 15:21:12 UTC (rev 7422)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/tags/EPP_5_2_0_ER01/webui/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/webui/pom.xml 2011-09-14 15:03:35 UTC (rev 7421)
+++ epp/portal/tags/EPP_5_2_0_ER01/webui/pom.xml 2011-09-14 15:21:12 UTC (rev 7422)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
</parent>
<artifactId>exo.portal.webui</artifactId>
Modified: epp/portal/tags/EPP_5_2_0_ER01/webui/portal/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/webui/portal/pom.xml 2011-09-14 15:03:35 UTC (rev 7421)
+++ epp/portal/tags/EPP_5_2_0_ER01/webui/portal/pom.xml 2011-09-14 15:21:12 UTC (rev 7422)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/tags/EPP_5_2_0_ER01/webui/portlet/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/webui/portlet/pom.xml 2011-09-14 15:03:35 UTC (rev 7421)
+++ epp/portal/tags/EPP_5_2_0_ER01/webui/portlet/pom.xml 2011-09-14 15:21:12 UTC (rev 7422)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/tags/EPP_5_2_0_ER01/wsrp-integration/extension-component/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-component/pom.xml 2011-09-14 15:03:35 UTC (rev 7421)
+++ epp/portal/tags/EPP_5_2_0_ER01/wsrp-integration/extension-component/pom.xml 2011-09-14 15:21:12 UTC (rev 7422)
@@ -26,7 +26,7 @@
<parent>
<artifactId>gatein-wsrp-integration-parent</artifactId>
<groupId>org.gatein.integration</groupId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/tags/EPP_5_2_0_ER01/wsrp-integration/extension-config/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-config/pom.xml 2011-09-14 15:03:35 UTC (rev 7421)
+++ epp/portal/tags/EPP_5_2_0_ER01/wsrp-integration/extension-config/pom.xml 2011-09-14 15:21:12 UTC (rev 7422)
@@ -26,7 +26,7 @@
<parent>
<artifactId>gatein-wsrp-integration-parent</artifactId>
<groupId>org.gatein.integration</groupId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
</parent>
<artifactId>extension-config</artifactId>
Modified: epp/portal/tags/EPP_5_2_0_ER01/wsrp-integration/extension-ear/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear/pom.xml 2011-09-14 15:03:35 UTC (rev 7421)
+++ epp/portal/tags/EPP_5_2_0_ER01/wsrp-integration/extension-ear/pom.xml 2011-09-14 15:21:12 UTC (rev 7422)
@@ -28,7 +28,7 @@
<parent>
<artifactId>gatein-wsrp-integration-parent</artifactId>
<groupId>org.gatein.integration</groupId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
</parent>
<artifactId>extension-ear</artifactId>
Modified: epp/portal/tags/EPP_5_2_0_ER01/wsrp-integration/extension-ear-as5/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear-as5/pom.xml 2011-09-14 15:03:35 UTC (rev 7421)
+++ epp/portal/tags/EPP_5_2_0_ER01/wsrp-integration/extension-ear-as5/pom.xml 2011-09-14 15:21:12 UTC (rev 7422)
@@ -27,7 +27,7 @@
<parent>
<groupId>org.gatein.integration</groupId>
<artifactId>gatein-wsrp-integration-parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
</parent>
<artifactId>extension-ear-as5</artifactId>
Modified: epp/portal/tags/EPP_5_2_0_ER01/wsrp-integration/extension-war/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-war/pom.xml 2011-09-14 15:03:35 UTC (rev 7421)
+++ epp/portal/tags/EPP_5_2_0_ER01/wsrp-integration/extension-war/pom.xml 2011-09-14 15:21:12 UTC (rev 7422)
@@ -27,7 +27,7 @@
<parent>
<artifactId>gatein-wsrp-integration-parent</artifactId>
<groupId>org.gatein.integration</groupId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
</parent>
<artifactId>extension-war</artifactId>
Modified: epp/portal/tags/EPP_5_2_0_ER01/wsrp-integration/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/pom.xml 2011-09-14 15:03:35 UTC (rev 7421)
+++ epp/portal/tags/EPP_5_2_0_ER01/wsrp-integration/pom.xml 2011-09-14 15:21:12 UTC (rev 7422)
@@ -34,7 +34,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-epp-ER01</version>
</parent>
<description>GateIn WSRP Integration extension parent</description>
13 years, 4 months
- 1
- 0
gatein SVN: r7421 - in epp/portal/branches/EPP_5_2_Branch: distribution and 1 other directories.
by do-not-reply＠jboss.org
Author: hfnukal
Date: 2011-09-14 11:03:35 -0400 (Wed, 14 Sep 2011)
New Revision: 7421
Modified:
epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/pom.xml
epp/portal/branches/EPP_5_2_Branch/distribution/pom.xml
epp/portal/branches/EPP_5_2_Branch/pom.xml
Log:
JBEPP-1091 mead build import user friendly messages
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/pom.xml 2011-09-14 13:29:27 UTC (rev 7420)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/pom.xml 2011-09-14 15:03:35 UTC (rev 7421)
@@ -31,7 +31,29 @@
brew.no.wait - If not declared, build waits until task is done and synchronized
brew.not.scratch - Performs scratch build unless specified. This prevents from unwanted execution.
</description>
-
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.5</version>
+ <configuration>
+ <propertyPrefix>version</propertyPrefix>
+ </configuration>
+ <executions>
+ <execution>
+ <id>parse-version</id>
+ <goals>
+ <goal>parse-version</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ </plugins>
+ </build>
+
<properties>
<!-- Ant properties -->
<ant.build.file>build.xml</ant.build.file>
@@ -45,10 +67,11 @@
<!-- GateIn -->
<svn.gatein.repo>gatein</svn.gatein.repo>
- <gatein-portal.svnpath>epp/portal/tags/EPP_5_2_0_Dev03</gatein-portal.svnpath>
- <gatein-parent.svnpath>maven/parent/tags/1.0.2-GA</gatein-parent.svnpath>
- <gatein-packager.svnpath>maven/packager/tags/1.0.0-CR01</gatein-packager.svnpath>
- <gatein-dep.svnpath>maven/dep/tags/1.1.0-Beta06</gatein-dep.svnpath>
+ <!--<gatein-portal.svnpath>${project.scm.url}</gatein-portal.svnpath>-->
+ <!--<gatein-portal.svnpath>epp/portal/tags/EPP_5_2_0_DEV03</gatein-portal.svnpath>-->
+ <gatein-portal.svnpath>epp/portal/branches/EPP_5_2_Branch</gatein-portal.svnpath>
+ <gatein-parent.svnpath>maven/parent/tags/${org.gatein.parent.version}</gatein-parent.svnpath>
+ <gatein-dep.svnpath>maven/dep/tags/${org.gatein.dep.version}</gatein-dep.svnpath>
<gatein-common.svnpath>components/common/tags/${org.gatein.common.version}</gatein-common.svnpath>
<gatein-wci.svnpath>components/wci/tags/${org.gatein.wci.version}</gatein-wci.svnpath>
@@ -68,9 +91,9 @@
<!-- # eXo components -->
<svn.exo.repo>exo-jcr</svn.exo.repo>
- <exo-parent.svnpath>parent/tags/9</exo-parent.svnpath>
- <exo-doc.svnpath>docs-style/tags/1</exo-doc.svnpath>
- <exo-junit.svnpath>junit.framework/tags/1.2.1-GA</exo-junit.svnpath>
+ <exo-parent.svnpath>parent/tags/${org.exoplatform.parent.version}</exo-parent.svnpath>
+ <exo-doc.svnpath>docs-style/tags/${org.exoplatform.doc-style.version}</exo-doc.svnpath>
+ <exo-junit.svnpath>junit.framework/tags/${org.exoplatform.kernel.junit.version}</exo-junit.svnpath>
<exo-kernel.svnpath>kernel/tags/${org.exoplatform.kernel.version}</exo-kernel.svnpath>
<exo-core.svnpath>core/tags/${org.exoplatform.core.version}</exo-core.svnpath>
@@ -78,7 +101,7 @@
<exo-jcr.svnpath>jcr/tags/${org.exoplatform.jcr.version}</exo-jcr.svnpath>
</properties>
-
+
<profiles>
<profile>
<id>mead-all</id>
@@ -102,7 +125,6 @@
<module>gatein-simplecaptcha </module>
<module>gatein-shindig </module>
<module>gatein-management </module>
- <module>gatein-packager </module>
<module>jboss-picketlink-idm </module>
<module>gatein-portal </module>
<module>gatein-sso </module>
@@ -126,15 +148,6 @@
</modules>
</profile>
-<!--gatein-packager-->
- <profile>
- <id>gatein-packager</id>
- <modules>
- <module>gatein-packager</module>
- </modules>
-
- </profile>
-
<!--gatein-dep-->
<profile>
<id>gatein-dep</id>
@@ -288,5 +301,4 @@
</profile>
</profiles>
-
</project>
\ No newline at end of file
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/pom.xml 2011-09-14 13:29:27 UTC (rev 7420)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/pom.xml 2011-09-14 15:03:35 UTC (rev 7421)
@@ -18,6 +18,9 @@
<eap.dir>jboss-eap-5.1</eap.dir>
<epp.dir>jboss-epp-5.2</epp.dir>
+ <sso.version>1.0.2-epp-DEV01</sso.version>
+ <portletbridge.version>2.1.1.GA.EPP51</portletbridge.version>
+
<!-- portlet bridge directory - not used, distribution module name is used as directory name -->
<portletbridge.directory>portletbridge</portletbridge.directory>
<!-- gatein-sso directory name within EPP -->
@@ -25,12 +28,8 @@
<!-- EPP Documentation main directory -->
<epp.doc.directory>jboss-epp-doc-5.1</epp.doc.directory>
-
- <sso.version>1.0.2-epp-DEV01</sso.version>
- <portletbridge.version>2.1.1.GA.EPP51</portletbridge.version>
-
+
</properties>
-
<profiles>
<profile>
Modified: epp/portal/branches/EPP_5_2_Branch/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/pom.xml 2011-09-14 13:29:27 UTC (rev 7420)
+++ epp/portal/branches/EPP_5_2_Branch/pom.xml 2011-09-14 15:03:35 UTC (rev 7421)
@@ -37,14 +37,19 @@
<name>EPP GateIn - Portal - ${project.version}</name>
<properties>
+ <org.exoplatform.parent.version>9</org.exoplatform.parent.version>
<org.exoplatform.kernel.version>2.3.0-GA</org.exoplatform.kernel.version>
+ <org.exoplatform.kernel.junit.version>1.2.1-GA</org.exoplatform.kernel.junit.version> <!-- from exo.kernel -->
<org.exoplatform.core.version>2.4.0-GA-CP02</org.exoplatform.core.version>
<org.exoplatform.ws.version>2.2.0-GA</org.exoplatform.ws.version>
<org.exoplatform.jcr.version>1.14.0-GA</org.exoplatform.jcr.version>
+ <org.exoplatform.doc-style.version>1</org.exoplatform.doc-style.version>
<org.jibx.version>1.2.1</org.jibx.version>
<org.shindig.version>2.0.2-Beta02</org.shindig.version>
<nl.captcha.simplecaptcha.version>1.1.1-GA-Patch01</nl.captcha.simplecaptcha.version>
+ <org.gatein.parent.version>${parent.version}</org.gatein.parent.version>
<org.gatein.common.version>2.0.4-Beta03</org.gatein.common.version>
+ <org.gatein.dep.version>1.1.0-Beta06</org.gatein.dep.version>
<org.gatein.wci.version>2.1.0-Beta06</org.gatein.wci.version>
<org.gatein.pc.version>2.3.0-Beta04</org.gatein.pc.version>
<org.picketlink.idm>1.3.0.Alpha04</org.picketlink.idm>
13 years, 4 months
- 1
- 0
gatein SVN: r7420 - in epp/portal/branches/EPP_5_2_Branch: component/common/src/main/java/org/exoplatform/commons/scope and 16 other directories.
by do-not-reply＠jboss.org
Author: hfnukal
Date: 2011-09-14 09:29:27 -0400 (Wed, 14 Sep 2011)
New Revision: 7420
Added:
epp/portal/branches/EPP_5_2_Branch/component/common/src/main/java/org/exoplatform/commons/scope/
epp/portal/branches/EPP_5_2_Branch/component/common/src/main/java/org/exoplatform/commons/scope/AbstractScopedKey.java
epp/portal/branches/EPP_5_2_Branch/component/common/src/main/java/org/exoplatform/commons/scope/ScopeManager.java
epp/portal/branches/EPP_5_2_Branch/component/common/src/main/java/org/exoplatform/commons/scope/ScopedKey.java
epp/portal/branches/EPP_5_2_Branch/component/common/src/test/java/org/exoplatform/commons/scope/
epp/portal/branches/EPP_5_2_Branch/component/common/src/test/java/org/exoplatform/commons/scope/ScopeTestCase.java
epp/portal/branches/EPP_5_2_Branch/component/common/src/test/resources/org/
epp/portal/branches/EPP_5_2_Branch/component/common/src/test/resources/org/exoplatform/
epp/portal/branches/EPP_5_2_Branch/component/common/src/test/resources/org/exoplatform/commons/
epp/portal/branches/EPP_5_2_Branch/component/common/src/test/resources/org/exoplatform/commons/chromattic/
epp/portal/branches/EPP_5_2_Branch/component/common/src/test/resources/org/exoplatform/commons/chromattic/configuration.xml
epp/portal/branches/EPP_5_2_Branch/component/common/src/test/resources/org/exoplatform/commons/scope/
epp/portal/branches/EPP_5_2_Branch/component/common/src/test/resources/org/exoplatform/commons/scope/configuration.xml
Removed:
epp/portal/branches/EPP_5_2_Branch/component/common/src/main/java/org/exoplatform/commons/scope/AbstractScopedKey.java
epp/portal/branches/EPP_5_2_Branch/component/common/src/main/java/org/exoplatform/commons/scope/ScopeManager.java
epp/portal/branches/EPP_5_2_Branch/component/common/src/main/java/org/exoplatform/commons/scope/ScopedKey.java
epp/portal/branches/EPP_5_2_Branch/component/common/src/test/java/org/exoplatform/commons/scope/ScopeTestCase.java
epp/portal/branches/EPP_5_2_Branch/component/common/src/test/resources/conf/
epp/portal/branches/EPP_5_2_Branch/component/common/src/test/resources/org/exoplatform/
epp/portal/branches/EPP_5_2_Branch/component/common/src/test/resources/org/exoplatform/commons/
epp/portal/branches/EPP_5_2_Branch/component/common/src/test/resources/org/exoplatform/commons/chromattic/
epp/portal/branches/EPP_5_2_Branch/component/common/src/test/resources/org/exoplatform/commons/chromattic/configuration.xml
epp/portal/branches/EPP_5_2_Branch/component/common/src/test/resources/org/exoplatform/commons/scope/
epp/portal/branches/EPP_5_2_Branch/component/common/src/test/resources/org/exoplatform/commons/scope/configuration.xml
epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/pom/config/GlobalKey.java
Modified:
epp/portal/branches/EPP_5_2_Branch/component/common/src/test/java/org/exoplatform/commons/chromattic/ChromatticIntegrationTestCase.java
epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/
epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/mop/description/CacheKey.java
epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/mop/description/DescriptionServiceImpl.java
epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/mop/description/ExoDataCache.java
epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/mop/navigation/ExoDataCache.java
epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/pom/config/POMSessionManager.java
epp/portal/branches/EPP_5_2_Branch/component/portal/src/test/resources/conf/exo.portal.component.portal-configuration.xml
epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/common/common-configuration.xml
epp/portal/branches/EPP_5_2_Branch/wsrp-integration/
Log:
JBEPP-1157 DescriptionService cache not properly configured
Deleted: epp/portal/branches/EPP_5_2_Branch/component/common/src/main/java/org/exoplatform/commons/scope/AbstractScopedKey.java
===================================================================
--- portal/trunk/component/common/src/main/java/org/exoplatform/commons/scope/AbstractScopedKey.java 2011-08-23 10:00:39 UTC (rev 7198)
+++ epp/portal/branches/EPP_5_2_Branch/component/common/src/main/java/org/exoplatform/commons/scope/AbstractScopedKey.java 2011-09-14 13:29:27 UTC (rev 7420)
@@ -1,100 +0,0 @@
-/*
- * Copyright (C) 2009 eXo Platform SAS.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.exoplatform.commons.scope;
-
-import java.io.Serializable;
-
-/**
- * The abstract scoped key should be subclasses to create scoped key.
- *
- * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
- * @version $Revision$
- */
-public abstract class AbstractScopedKey implements Serializable
-{
-
- /** . */
- private final String scope;
-
- protected AbstractScopedKey()
- {
- String scope = ScopeManager.getCurrentScope();
- if (scope == null)
- {
- scope = "";
- }
-
- //
- this.scope = scope;
- }
-
- protected AbstractScopedKey(String scope) throws NullPointerException
- {
- if (scope == null)
- {
- throw new NullPointerException();
- }
-
- //
- this.scope = scope;
- }
-
- public final String getScope()
- {
- return scope;
- }
-
- /**
- * Returns the scope value hashCode.
- *
- * @return the hash code
- */
- @Override
- public int hashCode()
- {
- return scope.hashCode();
- }
-
- /**
- * Returns true when:
- * <ul>
- * <li>the obj argument has the same reference than this object</li>
- * <li>or the obj has class equality (<code>getClass().equals(obj.getClass())</code>) and scope equality</li>
- * </ul>
- *
- * Subclasses should override this method and call the super method to ensure that the objects are of the same
- * class and have the same scope. When this method returns true, the obj argument can be safely casted to
- * the same sub class for performing more state equality checks.
- */
- @Override
- public boolean equals(Object obj)
- {
- if (obj == this)
- {
- return true;
- }
- if (obj instanceof AbstractScopedKey)
- {
- AbstractScopedKey that = (AbstractScopedKey)obj;
- return getClass().equals(that.getClass()) && scope.equals(that.scope);
- }
- return false;
- }
-}
Copied: epp/portal/branches/EPP_5_2_Branch/component/common/src/main/java/org/exoplatform/commons/scope/AbstractScopedKey.java (from rev 7198, portal/trunk/component/common/src/main/java/org/exoplatform/commons/scope/AbstractScopedKey.java)
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/common/src/main/java/org/exoplatform/commons/scope/AbstractScopedKey.java (rev 0)
+++ epp/portal/branches/EPP_5_2_Branch/component/common/src/main/java/org/exoplatform/commons/scope/AbstractScopedKey.java 2011-09-14 13:29:27 UTC (rev 7420)
@@ -0,0 +1,100 @@
+/*
+ * Copyright (C) 2009 eXo Platform SAS.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.exoplatform.commons.scope;
+
+import java.io.Serializable;
+
+/**
+ * The abstract scoped key should be subclasses to create scoped key.
+ *
+ * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
+ * @version $Revision$
+ */
+public abstract class AbstractScopedKey implements Serializable
+{
+
+ /** . */
+ private final String scope;
+
+ protected AbstractScopedKey()
+ {
+ String scope = ScopeManager.getCurrentScope();
+ if (scope == null)
+ {
+ scope = "";
+ }
+
+ //
+ this.scope = scope;
+ }
+
+ protected AbstractScopedKey(String scope) throws NullPointerException
+ {
+ if (scope == null)
+ {
+ throw new NullPointerException();
+ }
+
+ //
+ this.scope = scope;
+ }
+
+ public final String getScope()
+ {
+ return scope;
+ }
+
+ /**
+ * Returns the scope value hashCode.
+ *
+ * @return the hash code
+ */
+ @Override
+ public int hashCode()
+ {
+ return scope.hashCode();
+ }
+
+ /**
+ * Returns true when:
+ * <ul>
+ * <li>the obj argument has the same reference than this object</li>
+ * <li>or the obj has class equality (<code>getClass().equals(obj.getClass())</code>) and scope equality</li>
+ * </ul>
+ *
+ * Subclasses should override this method and call the super method to ensure that the objects are of the same
+ * class and have the same scope. When this method returns true, the obj argument can be safely casted to
+ * the same sub class for performing more state equality checks.
+ */
+ @Override
+ public boolean equals(Object obj)
+ {
+ if (obj == this)
+ {
+ return true;
+ }
+ if (obj instanceof AbstractScopedKey)
+ {
+ AbstractScopedKey that = (AbstractScopedKey)obj;
+ return getClass().equals(that.getClass()) && scope.equals(that.scope);
+ }
+ return false;
+ }
+}
Deleted: epp/portal/branches/EPP_5_2_Branch/component/common/src/main/java/org/exoplatform/commons/scope/ScopeManager.java
===================================================================
--- portal/trunk/component/common/src/main/java/org/exoplatform/commons/scope/ScopeManager.java 2011-08-23 10:00:39 UTC (rev 7198)
+++ epp/portal/branches/EPP_5_2_Branch/component/common/src/main/java/org/exoplatform/commons/scope/ScopeManager.java 2011-09-14 13:29:27 UTC (rev 7420)
@@ -1,107 +0,0 @@
-/**
- * Copyright (C) 2011 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.commons.scope;
-
-import org.exoplatform.container.ExoContainer;
-import org.exoplatform.container.component.ComponentRequestLifecycle;
-import org.exoplatform.services.jcr.RepositoryService;
-import org.exoplatform.services.jcr.core.ManageableRepository;
-import org.gatein.common.logging.Logger;
-import org.gatein.common.logging.LoggerFactory;
-
-import javax.jcr.RepositoryException;
-
-/**
- * <p></p>The scope manager manages the life cycle of a scope value (which means a mere string) associated with the current
- * thread aimed to scope state. The scope manager takes it values from the current repository service name when
- * it is associated with a request on a container containing the repository service.</p>
- *
- * <p>The manager implements the {@link ComponentRequestLifecycle}</p> interface to be aware of the request life cycle.</p>
- *
- * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
- */
-public class ScopeManager implements ComponentRequestLifecycle
-{
-
- /** The scope thread local. */
- private static final ThreadLocal<String> currentScope = new ThreadLocal<String>();
-
- /** . */
- private static final Logger log = LoggerFactory.getLogger(ScopeManager.class);
-
- /**
- * Returns the current scope value or null if no value is associated with the current thread.
- *
- * @return the current scope
- */
- public static String getCurrentScope()
- {
- return currentScope.get();
- }
-
- public void startRequest(ExoContainer container)
- {
- if (currentScope.get() != null)
- {
- throw new IllegalStateException("Detected scope reentrancy " + currentScope.get());
- }
-
- //
- RepositoryService repositoryService = (RepositoryService)container.getComponentInstanceOfType(RepositoryService.class);
-
- //
- String scope = null;
- if (repositoryService != null)
- {
- try
- {
- ManageableRepository currentRepository = repositoryService.getCurrentRepository();
- if (currentRepository != null)
- {
- scope = currentRepository.getConfiguration().getName();
- }
- }
- catch (RepositoryException e)
- {
- log.error("Could not obtain scope value from repository", e);
- }
- }
-
- //
- if (scope == null)
- {
- scope = "";
- }
-
- //
- currentScope.set(scope);
- log.debug("Starting scope request \"" + scope + "\"");
- }
-
- public void endRequest(ExoContainer container)
- {
- if (currentScope.get() == null)
- {
- throw new IllegalStateException("Detected unscoped unscoping ");
- }
-
- //
- currentScope.set(null);
- }
-}
Copied: epp/portal/branches/EPP_5_2_Branch/component/common/src/main/java/org/exoplatform/commons/scope/ScopeManager.java (from rev 7198, portal/trunk/component/common/src/main/java/org/exoplatform/commons/scope/ScopeManager.java)
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/common/src/main/java/org/exoplatform/commons/scope/ScopeManager.java (rev 0)
+++ epp/portal/branches/EPP_5_2_Branch/component/common/src/main/java/org/exoplatform/commons/scope/ScopeManager.java 2011-09-14 13:29:27 UTC (rev 7420)
@@ -0,0 +1,107 @@
+/**
+ * Copyright (C) 2011 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.commons.scope;
+
+import org.exoplatform.container.ExoContainer;
+import org.exoplatform.container.component.ComponentRequestLifecycle;
+import org.exoplatform.services.jcr.RepositoryService;
+import org.exoplatform.services.jcr.core.ManageableRepository;
+import org.gatein.common.logging.Logger;
+import org.gatein.common.logging.LoggerFactory;
+
+import javax.jcr.RepositoryException;
+
+/**
+ * <p></p>The scope manager manages the life cycle of a scope value (which means a mere string) associated with the current
+ * thread aimed to scope state. The scope manager takes it values from the current repository service name when
+ * it is associated with a request on a container containing the repository service.</p>
+ *
+ * <p>The manager implements the {@link ComponentRequestLifecycle}</p> interface to be aware of the request life cycle.</p>
+ *
+ * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
+ */
+public class ScopeManager implements ComponentRequestLifecycle
+{
+
+ /** The scope thread local. */
+ private static final ThreadLocal<String> currentScope = new ThreadLocal<String>();
+
+ /** . */
+ private static final Logger log = LoggerFactory.getLogger(ScopeManager.class);
+
+ /**
+ * Returns the current scope value or null if no value is associated with the current thread.
+ *
+ * @return the current scope
+ */
+ public static String getCurrentScope()
+ {
+ return currentScope.get();
+ }
+
+ public void startRequest(ExoContainer container)
+ {
+ if (currentScope.get() != null)
+ {
+ throw new IllegalStateException("Detected scope reentrancy " + currentScope.get());
+ }
+
+ //
+ RepositoryService repositoryService = (RepositoryService)container.getComponentInstanceOfType(RepositoryService.class);
+
+ //
+ String scope = null;
+ if (repositoryService != null)
+ {
+ try
+ {
+ ManageableRepository currentRepository = repositoryService.getCurrentRepository();
+ if (currentRepository != null)
+ {
+ scope = currentRepository.getConfiguration().getName();
+ }
+ }
+ catch (RepositoryException e)
+ {
+ log.error("Could not obtain scope value from repository", e);
+ }
+ }
+
+ //
+ if (scope == null)
+ {
+ scope = "";
+ }
+
+ //
+ currentScope.set(scope);
+ log.debug("Starting scope request \"" + scope + "\"");
+ }
+
+ public void endRequest(ExoContainer container)
+ {
+ if (currentScope.get() == null)
+ {
+ throw new IllegalStateException("Detected unscoped unscoping ");
+ }
+
+ //
+ currentScope.set(null);
+ }
+}
Deleted: epp/portal/branches/EPP_5_2_Branch/component/common/src/main/java/org/exoplatform/commons/scope/ScopedKey.java
===================================================================
--- portal/trunk/component/common/src/main/java/org/exoplatform/commons/scope/ScopedKey.java 2011-08-23 10:00:39 UTC (rev 7198)
+++ epp/portal/branches/EPP_5_2_Branch/component/common/src/main/java/org/exoplatform/commons/scope/ScopedKey.java 2011-09-14 13:29:27 UTC (rev 7420)
@@ -1,110 +0,0 @@
-/*
- * Copyright (C) 2009 eXo Platform SAS.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.exoplatform.commons.scope;
-
-import java.io.Serializable;
-
-/**
- * A scoped key wrapping a key including the a scope. The scoped key implements the {@link #hashCode()} and
- * {@link #equals(Object)} method based on the scope and the current value.
- *
- * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
- * @version $Revision$
- */
-public class ScopedKey<S extends Serializable> extends AbstractScopedKey
-{
-
- /**
- * Create a scoped key from a key, the scope value is obtained from the {@link ScopeManager#getCurrentScope()} method.
- *
- * @param key the local key
- * @param <S> the key generic serializable type
- * @return the scoped key
- * @throws NullPointerException if the key argument is null
- */
- public static <S extends Serializable> ScopedKey<S> create(S key) throws NullPointerException
- {
- return new ScopedKey<S>(key);
- }
-
- /**
- * Creates a new scoped key with an explicit scope value.
- *
- * @param scope the scope value
- * @param key the key
- * @param <S> the key generic serializable type
- * @return the scoped key
- * @throws NullPointerException if any argument is null
- */
- public static <S extends Serializable> ScopedKey<S> create(String scope, S key) throws NullPointerException
- {
- return new ScopedKey<S>(scope, key);
- }
-
- /** . */
- private final S key;
-
- public ScopedKey(S key) throws NullPointerException
- {
- if (key == null)
- {
- throw new NullPointerException();
- }
-
- //
- this.key = key;
- }
-
- public ScopedKey(String scope, S key) throws NullPointerException
- {
- super(scope);
-
- if (key == null)
- {
- throw new NullPointerException();
- }
-
- //
- this.key = key;
- }
-
- public S getKey()
- {
- return key;
- }
-
- @Override
- public int hashCode()
- {
- return super.hashCode() ^ key.hashCode();
- }
-
- @Override
- public boolean equals(Object obj)
- {
- return super.equals(obj) && ((ScopedKey)obj).key.equals(key);
- }
-
- @Override
- public String toString()
- {
- return "ScopedKey[scope=" + getScope() + ",key=" + key + "]";
- }
-}
Copied: epp/portal/branches/EPP_5_2_Branch/component/common/src/main/java/org/exoplatform/commons/scope/ScopedKey.java (from rev 7198, portal/trunk/component/common/src/main/java/org/exoplatform/commons/scope/ScopedKey.java)
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/common/src/main/java/org/exoplatform/commons/scope/ScopedKey.java (rev 0)
+++ epp/portal/branches/EPP_5_2_Branch/component/common/src/main/java/org/exoplatform/commons/scope/ScopedKey.java 2011-09-14 13:29:27 UTC (rev 7420)
@@ -0,0 +1,110 @@
+/*
+ * Copyright (C) 2009 eXo Platform SAS.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.exoplatform.commons.scope;
+
+import java.io.Serializable;
+
+/**
+ * A scoped key wrapping a key including the a scope. The scoped key implements the {@link #hashCode()} and
+ * {@link #equals(Object)} method based on the scope and the current value.
+ *
+ * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
+ * @version $Revision$
+ */
+public class ScopedKey<S extends Serializable> extends AbstractScopedKey
+{
+
+ /**
+ * Create a scoped key from a key, the scope value is obtained from the {@link ScopeManager#getCurrentScope()} method.
+ *
+ * @param key the local key
+ * @param <S> the key generic serializable type
+ * @return the scoped key
+ * @throws NullPointerException if the key argument is null
+ */
+ public static <S extends Serializable> ScopedKey<S> create(S key) throws NullPointerException
+ {
+ return new ScopedKey<S>(key);
+ }
+
+ /**
+ * Creates a new scoped key with an explicit scope value.
+ *
+ * @param scope the scope value
+ * @param key the key
+ * @param <S> the key generic serializable type
+ * @return the scoped key
+ * @throws NullPointerException if any argument is null
+ */
+ public static <S extends Serializable> ScopedKey<S> create(String scope, S key) throws NullPointerException
+ {
+ return new ScopedKey<S>(scope, key);
+ }
+
+ /** . */
+ private final S key;
+
+ public ScopedKey(S key) throws NullPointerException
+ {
+ if (key == null)
+ {
+ throw new NullPointerException();
+ }
+
+ //
+ this.key = key;
+ }
+
+ public ScopedKey(String scope, S key) throws NullPointerException
+ {
+ super(scope);
+
+ if (key == null)
+ {
+ throw new NullPointerException();
+ }
+
+ //
+ this.key = key;
+ }
+
+ public S getKey()
+ {
+ return key;
+ }
+
+ @Override
+ public int hashCode()
+ {
+ return super.hashCode() ^ key.hashCode();
+ }
+
+ @Override
+ public boolean equals(Object obj)
+ {
+ return super.equals(obj) && ((ScopedKey)obj).key.equals(key);
+ }
+
+ @Override
+ public String toString()
+ {
+ return "ScopedKey[scope=" + getScope() + ",key=" + key + "]";
+ }
+}
Modified: epp/portal/branches/EPP_5_2_Branch/component/common/src/test/java/org/exoplatform/commons/chromattic/ChromatticIntegrationTestCase.java
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/common/src/test/java/org/exoplatform/commons/chromattic/ChromatticIntegrationTestCase.java 2011-09-14 12:32:16 UTC (rev 7419)
+++ epp/portal/branches/EPP_5_2_Branch/component/common/src/test/java/org/exoplatform/commons/chromattic/ChromatticIntegrationTestCase.java 2011-09-14 13:29:27 UTC (rev 7420)
@@ -32,7 +32,7 @@
*/
@ConfiguredBy({
@ConfigurationUnit(scope = ContainerScope.PORTAL, path = "conf/exo.portal.component.test.jcr-configuration.xml"),
- @ConfigurationUnit(scope = ContainerScope.PORTAL, path = "conf/exo.portal.component.common-configuration.xml")
+ @ConfigurationUnit(scope = ContainerScope.PORTAL, path = "org/exoplatform/commons/chromattic/configuration.xml")
})
public class ChromatticIntegrationTestCase extends AbstractKernelTest
{
Deleted: epp/portal/branches/EPP_5_2_Branch/component/common/src/test/java/org/exoplatform/commons/scope/ScopeTestCase.java
===================================================================
--- portal/trunk/component/common/src/test/java/org/exoplatform/commons/scope/ScopeTestCase.java 2011-08-23 10:00:39 UTC (rev 7198)
+++ epp/portal/branches/EPP_5_2_Branch/component/common/src/test/java/org/exoplatform/commons/scope/ScopeTestCase.java 2011-09-14 13:29:27 UTC (rev 7420)
@@ -1,78 +0,0 @@
-package org.exoplatform.commons.scope;
-
-import org.exoplatform.component.test.AbstractKernelTest;
-import org.exoplatform.component.test.ConfigurationUnit;
-import org.exoplatform.component.test.ConfiguredBy;
-import org.exoplatform.component.test.ContainerScope;
-
-/** @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> */
-@ConfiguredBy({
- @ConfigurationUnit(scope = ContainerScope.PORTAL, path = "conf/exo.portal.component.test.jcr-configuration.xml"),
- @ConfigurationUnit(scope = ContainerScope.PORTAL, path = "org/exoplatform/commons/scope/configuration.xml")
-})
-public class ScopeTestCase extends AbstractKernelTest
-{
-
- public void testKey()
- {
- ScopedKey<String> k1 = ScopedKey.create("foo", "bar");
- assertEquals("foo", k1.getScope());
- assertEquals("bar", k1.getKey());
-
- //
- ScopedKey<String> k2 = ScopedKey.create("foo", "bar");
- assertEquals("foo", k1.getScope());
- assertEquals("bar", k1.getKey());
-
- //
- ScopedKey<String> k3 = ScopedKey.create("juu", "bar");
- assertEquals("juu", k3.getScope());
- assertEquals("bar", k3.getKey());
-
- //
- ScopedKey<String> k4 = ScopedKey.create("juu", "daa");
- assertEquals("juu", k4.getScope());
- assertEquals("daa", k4.getKey());
-
- //
- assertTrue(k1.equals(k2));
- assertTrue(k2.equals(k1));
- assertEquals(k1.hashCode(), k2.hashCode());
- assertFalse(k1.equals(k3));
- assertFalse(k3.equals(k1));
- assertFalse(k3.equals(k4));
- assertFalse(k4.equals(k3));
- }
-
- public void testLifeCycle()
- {
- assertNull(ScopeManager.getCurrentScope());
- ScopedKey<String> key = ScopedKey.create("foo");
- assertEquals("", key.getScope());
- assertEquals("foo", key.getKey());
-
- //
- assertNull(ScopeManager.getCurrentScope());
- key = ScopedKey.create("foo");
- assertEquals("", key.getScope());
- assertEquals("foo", key.getKey());
-
- //
- begin();
-
- //
- assertEquals("repository", ScopeManager.getCurrentScope());
- key = ScopedKey.create("foo");
- assertEquals("repository", key.getScope());
- assertEquals("foo", key.getKey());
-
- //
- end();
-
- //
- assertNull(ScopeManager.getCurrentScope());
- key = ScopedKey.create("foo");
- assertEquals("", key.getScope());
- assertEquals("foo", key.getKey());
- }
-}
Copied: epp/portal/branches/EPP_5_2_Branch/component/common/src/test/java/org/exoplatform/commons/scope/ScopeTestCase.java (from rev 7198, portal/trunk/component/common/src/test/java/org/exoplatform/commons/scope/ScopeTestCase.java)
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/common/src/test/java/org/exoplatform/commons/scope/ScopeTestCase.java (rev 0)
+++ epp/portal/branches/EPP_5_2_Branch/component/common/src/test/java/org/exoplatform/commons/scope/ScopeTestCase.java 2011-09-14 13:29:27 UTC (rev 7420)
@@ -0,0 +1,78 @@
+package org.exoplatform.commons.scope;
+
+import org.exoplatform.component.test.AbstractKernelTest;
+import org.exoplatform.component.test.ConfigurationUnit;
+import org.exoplatform.component.test.ConfiguredBy;
+import org.exoplatform.component.test.ContainerScope;
+
+/** @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> */
+@ConfiguredBy({
+ @ConfigurationUnit(scope = ContainerScope.PORTAL, path = "conf/exo.portal.component.test.jcr-configuration.xml"),
+ @ConfigurationUnit(scope = ContainerScope.PORTAL, path = "org/exoplatform/commons/scope/configuration.xml")
+})
+public class ScopeTestCase extends AbstractKernelTest
+{
+
+ public void testKey()
+ {
+ ScopedKey<String> k1 = ScopedKey.create("foo", "bar");
+ assertEquals("foo", k1.getScope());
+ assertEquals("bar", k1.getKey());
+
+ //
+ ScopedKey<String> k2 = ScopedKey.create("foo", "bar");
+ assertEquals("foo", k1.getScope());
+ assertEquals("bar", k1.getKey());
+
+ //
+ ScopedKey<String> k3 = ScopedKey.create("juu", "bar");
+ assertEquals("juu", k3.getScope());
+ assertEquals("bar", k3.getKey());
+
+ //
+ ScopedKey<String> k4 = ScopedKey.create("juu", "daa");
+ assertEquals("juu", k4.getScope());
+ assertEquals("daa", k4.getKey());
+
+ //
+ assertTrue(k1.equals(k2));
+ assertTrue(k2.equals(k1));
+ assertEquals(k1.hashCode(), k2.hashCode());
+ assertFalse(k1.equals(k3));
+ assertFalse(k3.equals(k1));
+ assertFalse(k3.equals(k4));
+ assertFalse(k4.equals(k3));
+ }
+
+ public void testLifeCycle()
+ {
+ assertNull(ScopeManager.getCurrentScope());
+ ScopedKey<String> key = ScopedKey.create("foo");
+ assertEquals("", key.getScope());
+ assertEquals("foo", key.getKey());
+
+ //
+ assertNull(ScopeManager.getCurrentScope());
+ key = ScopedKey.create("foo");
+ assertEquals("", key.getScope());
+ assertEquals("foo", key.getKey());
+
+ //
+ begin();
+
+ //
+ assertEquals("repository", ScopeManager.getCurrentScope());
+ key = ScopedKey.create("foo");
+ assertEquals("repository", key.getScope());
+ assertEquals("foo", key.getKey());
+
+ //
+ end();
+
+ //
+ assertNull(ScopeManager.getCurrentScope());
+ key = ScopedKey.create("foo");
+ assertEquals("", key.getScope());
+ assertEquals("foo", key.getKey());
+ }
+}
Deleted: epp/portal/branches/EPP_5_2_Branch/component/common/src/test/resources/org/exoplatform/commons/chromattic/configuration.xml
===================================================================
--- portal/trunk/component/common/src/test/resources/org/exoplatform/commons/chromattic/configuration.xml 2011-08-23 10:00:39 UTC (rev 7198)
+++ epp/portal/branches/EPP_5_2_Branch/component/common/src/test/resources/org/exoplatform/commons/chromattic/configuration.xml 2011-09-14 13:29:27 UTC (rev 7420)
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-
- Copyright (C) 2009 eXo Platform SAS.
-
- This is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as
- published by the Free Software Foundation; either version 2.1 of
- the License, or (at your option) any later version.
-
- This software is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this software; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-
--->
-
-<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"
- xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd">
- <component>
- <key>org.exoplatform.commons.chromattic.ChromatticManager</key>
- <type>org.exoplatform.commons.chromattic.ChromatticManager</type>
- </component>
-
- <external-component-plugins>
- <target-component>org.exoplatform.commons.chromattic.ChromatticManager</target-component>
- <component-plugin>
- <name>chromattic</name>
- <set-method>addLifeCycle</set-method>
- <type>org.exoplatform.commons.chromattic.ChromatticLifeCycle</type>
- <init-params>
- <value-param>
- <name>domain-name</name>
- <value>test1</value>
- </value-param>
- <value-param>
- <name>workspace-name</name>
- <value>portal-test</value>
- </value-param>
- <values-param>
- <name>entities</name>
- <value>org.exoplatform.commons.chromattic.FooEntity</value>
- </values-param>
- </init-params>
- </component-plugin>
- <component-plugin>
- <name>chromattic</name>
- <set-method>addLifeCycle</set-method>
- <type>org.exoplatform.commons.chromattic.ChromatticLifeCycle</type>
- <init-params>
- <value-param>
- <name>domain-name</name>
- <value>test2</value>
- </value-param>
- <value-param>
- <name>workspace-name</name>
- <value>portal-test</value>
- </value-param>
- <values-param>
- <name>entities</name>
- </values-param>
- </init-params>
- </component-plugin>
- </external-component-plugins>
-
-</configuration>
Copied: epp/portal/branches/EPP_5_2_Branch/component/common/src/test/resources/org/exoplatform/commons/chromattic/configuration.xml (from rev 7198, portal/trunk/component/common/src/test/resources/org/exoplatform/commons/chromattic/configuration.xml)
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/common/src/test/resources/org/exoplatform/commons/chromattic/configuration.xml (rev 0)
+++ epp/portal/branches/EPP_5_2_Branch/component/common/src/test/resources/org/exoplatform/commons/chromattic/configuration.xml 2011-09-14 13:29:27 UTC (rev 7420)
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+
+ Copyright (C) 2009 eXo Platform SAS.
+
+ This is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as
+ published by the Free Software Foundation; either version 2.1 of
+ the License, or (at your option) any later version.
+
+ This software is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this software; if not, write to the Free
+ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+
+-->
+
+<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"
+ xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd">
+ <component>
+ <key>org.exoplatform.commons.chromattic.ChromatticManager</key>
+ <type>org.exoplatform.commons.chromattic.ChromatticManager</type>
+ </component>
+
+ <external-component-plugins>
+ <target-component>org.exoplatform.commons.chromattic.ChromatticManager</target-component>
+ <component-plugin>
+ <name>chromattic</name>
+ <set-method>addLifeCycle</set-method>
+ <type>org.exoplatform.commons.chromattic.ChromatticLifeCycle</type>
+ <init-params>
+ <value-param>
+ <name>domain-name</name>
+ <value>test1</value>
+ </value-param>
+ <value-param>
+ <name>workspace-name</name>
+ <value>portal-test</value>
+ </value-param>
+ <values-param>
+ <name>entities</name>
+ <value>org.exoplatform.commons.chromattic.FooEntity</value>
+ </values-param>
+ </init-params>
+ </component-plugin>
+ <component-plugin>
+ <name>chromattic</name>
+ <set-method>addLifeCycle</set-method>
+ <type>org.exoplatform.commons.chromattic.ChromatticLifeCycle</type>
+ <init-params>
+ <value-param>
+ <name>domain-name</name>
+ <value>test2</value>
+ </value-param>
+ <value-param>
+ <name>workspace-name</name>
+ <value>portal-test</value>
+ </value-param>
+ <values-param>
+ <name>entities</name>
+ </values-param>
+ </init-params>
+ </component-plugin>
+ </external-component-plugins>
+
+</configuration>
Deleted: epp/portal/branches/EPP_5_2_Branch/component/common/src/test/resources/org/exoplatform/commons/scope/configuration.xml
===================================================================
--- portal/trunk/component/common/src/test/resources/org/exoplatform/commons/scope/configuration.xml 2011-08-23 10:00:39 UTC (rev 7198)
+++ epp/portal/branches/EPP_5_2_Branch/component/common/src/test/resources/org/exoplatform/commons/scope/configuration.xml 2011-09-14 13:29:27 UTC (rev 7420)
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-
- Copyright (C) 2009 eXo Platform SAS.
-
- This is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as
- published by the Free Software Foundation; either version 2.1 of
- the License, or (at your option) any later version.
-
- This software is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this software; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-
--->
-
-<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"
- xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd">
- <component>
- <key>org.exoplatform.commons.scope.ScopeManager</key>
- <type>org.exoplatform.commons.scope.ScopeManager</type>
- </component>
-</configuration>
Copied: epp/portal/branches/EPP_5_2_Branch/component/common/src/test/resources/org/exoplatform/commons/scope/configuration.xml (from rev 7198, portal/trunk/component/common/src/test/resources/org/exoplatform/commons/scope/configuration.xml)
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/common/src/test/resources/org/exoplatform/commons/scope/configuration.xml (rev 0)
+++ epp/portal/branches/EPP_5_2_Branch/component/common/src/test/resources/org/exoplatform/commons/scope/configuration.xml 2011-09-14 13:29:27 UTC (rev 7420)
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+
+ Copyright (C) 2009 eXo Platform SAS.
+
+ This is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as
+ published by the Free Software Foundation; either version 2.1 of
+ the License, or (at your option) any later version.
+
+ This software is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this software; if not, write to the Free
+ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+
+-->
+
+<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"
+ xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd">
+ <component>
+ <key>org.exoplatform.commons.scope.ScopeManager</key>
+ <type>org.exoplatform.commons.scope.ScopeManager</type>
+ </component>
+</configuration>
Property changes on: epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org
___________________________________________________________________
Modified: svn:mergeinfo
- /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795/component/portal/src/main/java/org:5868
/portal/branches/branch-GTNPORTAL-1592/component/portal/src/main/java/org:4894
/portal/branches/branch-GTNPORTAL-1643/component/portal/src/main/java/org:5002,5063,5167
/portal/branches/branch-GTNPORTAL-1700/component/portal/src/main/java/org:5348,5363,5402,5445
/portal/branches/branch-GTNPORTAL-1731/component/portal/src/main/java/org:5622,5644,5668
/portal/branches/branch-GTNPORTAL-1745/component/portal/src/main/java/org:5765
/portal/branches/branch-GTNPORTAL-1790/component/portal/src/main/java/org:5871
/portal/branches/branch-GTNPORTAL-1822/component/portal/src/main/java/org:5943,5952
/portal/branches/branch-GTNPORTAL-1832/component/portal/src/main/java/org:6030,6063
/portal/branches/branch-GTNPORTAL-1872/component/portal/src/main/java/org:6400,6551
/portal/branches/branch-GTNPORTAL-1921/component/portal/src/main/java/org:6603
/portal/branches/branch-GTNPORTAL-1963/component/portal/src/main/java/org:6904,6915-6916
/portal/trunk/component/portal/src/main/java/org:4891,5269,5744,5822,5943,6031,6033,6168,6196,6201-6203,6205-6206,6223,6292,6323,6437,6440,6449,6452,6573,6741,6783-6784,6912-6913,6960,7042,7061,7095,7117,7120,7125,7132-7134,7239,7262,7308,7326,7331,7359,7367
+ /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795/component/portal/src/main/java/org:5868
/portal/branches/branch-GTNPORTAL-1592/component/portal/src/main/java/org:4894
/portal/branches/branch-GTNPORTAL-1643/component/portal/src/main/java/org:5002,5063,5167
/portal/branches/branch-GTNPORTAL-1700/component/portal/src/main/java/org:5348,5363,5402,5445
/portal/branches/branch-GTNPORTAL-1731/component/portal/src/main/java/org:5622,5644,5668
/portal/branches/branch-GTNPORTAL-1745/component/portal/src/main/java/org:5765
/portal/branches/branch-GTNPORTAL-1790/component/portal/src/main/java/org:5871
/portal/branches/branch-GTNPORTAL-1822/component/portal/src/main/java/org:5943,5952
/portal/branches/branch-GTNPORTAL-1832/component/portal/src/main/java/org:6030,6063
/portal/branches/branch-GTNPORTAL-1872/component/portal/src/main/java/org:6400,6551
/portal/branches/branch-GTNPORTAL-1921/component/portal/src/main/java/org:6603
/portal/branches/branch-GTNPORTAL-1963/component/portal/src/main/java/org:6904,6915-6916
/portal/trunk/component/portal/src/main/java/org:4891,5269,5744,5822,5943,6031,6033,6168,6196,6201-6203,6205-6206,6223,6292,6323,6437,6440,6449,6452,6573,6741,6783-6784,6912-6913,6960,7042,7061,7095,7117,7120,7125,7132-7134,7198,7239,7262,7308,7326,7331,7359,7367
Modified: epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/mop/description/CacheKey.java
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/mop/description/CacheKey.java 2011-09-14 12:32:16 UTC (rev 7419)
+++ epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/mop/description/CacheKey.java 2011-09-14 13:29:27 UTC (rev 7420)
@@ -19,13 +19,15 @@
package org.exoplatform.portal.mop.description;
+import org.exoplatform.commons.scope.AbstractScopedKey;
+
import java.io.Serializable;
import java.util.Locale;
/**
* @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
*/
-public final class CacheKey implements Serializable
+public final class CacheKey extends AbstractScopedKey implements Serializable
{
/** . */
@@ -53,12 +55,8 @@
@Override
public boolean equals(Object obj)
{
- if (obj == this)
+ if (super.equals(obj))
{
- return true;
- }
- if (obj instanceof CacheKey)
- {
CacheKey that = (CacheKey)obj;
return locale.equals(that.locale) && id.equals(that.id);
}
@@ -68,6 +66,6 @@
@Override
public int hashCode()
{
- return locale.hashCode() ^ id.hashCode();
+ return super.hashCode() ^ locale.hashCode() ^ id.hashCode();
}
}
Modified: epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/mop/description/DescriptionServiceImpl.java
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/mop/description/DescriptionServiceImpl.java 2011-09-14 12:32:16 UTC (rev 7419)
+++ epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/mop/description/DescriptionServiceImpl.java 2011-09-14 13:29:27 UTC (rev 7420)
@@ -23,6 +23,7 @@
import org.exoplatform.portal.mop.i18n.I18NAdapter;
import org.exoplatform.portal.pom.config.POMSession;
import org.exoplatform.portal.pom.config.POMSessionManager;
+import org.exoplatform.services.cache.CacheService;
import org.gatein.mop.api.workspace.WorkspaceObject;
import java.util.Collection;
@@ -53,6 +54,11 @@
this.cache = cache;
}
+ public DescriptionServiceImpl(POMSessionManager manager, CacheService cacheService)
+ {
+ this(manager, new ExoDataCache(cacheService));
+ }
+
public Described.State resolveDescription(String id, Locale locale) throws NullPointerException
{
return resolveDescription(id, null, locale);
Modified: epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/mop/description/ExoDataCache.java
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/mop/description/ExoDataCache.java 2011-09-14 12:32:16 UTC (rev 7419)
+++ epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/mop/description/ExoDataCache.java 2011-09-14 13:29:27 UTC (rev 7420)
@@ -49,7 +49,7 @@
public ExoDataCache(CacheService cacheService)
{
- this.cache = cacheService.getCacheInstance("NavigationService");
+ this.cache = cacheService.getCacheInstance(DescriptionService.class.getSimpleName());
this.values = new FutureExoCache<CacheKey, CacheValue, POMSession>(valueLoader, cache)
{
@Override
Modified: epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/mop/navigation/ExoDataCache.java
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/mop/navigation/ExoDataCache.java 2011-09-14 12:32:16 UTC (rev 7419)
+++ epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/mop/navigation/ExoDataCache.java 2011-09-14 13:29:27 UTC (rev 7420)
@@ -21,6 +21,7 @@
import org.exoplatform.commons.cache.future.FutureExoCache;
import org.exoplatform.commons.cache.future.Loader;
+import org.exoplatform.commons.scope.ScopedKey;
import org.exoplatform.portal.mop.SiteKey;
import org.exoplatform.portal.pom.config.POMSession;
import org.exoplatform.services.cache.CacheService;
@@ -38,16 +39,17 @@
{
/** . */
- protected ExoCache<Serializable, Serializable> cache;
+ protected ExoCache<ScopedKey<?>, Serializable> cache;
/** . */
- protected FutureExoCache<Serializable, Serializable, POMSession> objects;
+ protected FutureExoCache<ScopedKey<?>, Serializable, POMSession> objects;
/** . */
- private Loader<Serializable, Serializable, POMSession> navigationLoader = new Loader<Serializable, Serializable, POMSession>()
+ private Loader<ScopedKey<?>, Serializable, POMSession> navigationLoader = new Loader<ScopedKey<?>, Serializable, POMSession>()
{
- public Serializable retrieve(POMSession session, Serializable key) throws Exception
+ public Serializable retrieve(POMSession session, ScopedKey<?> scopedKey) throws Exception
{
+ Object key = scopedKey.getKey();
if (key instanceof SiteKey)
{
return loadNavigation(session, (SiteKey)key);
@@ -61,8 +63,8 @@
public ExoDataCache(CacheService cacheService)
{
- this.cache = cacheService.getCacheInstance("NavigationService");
- this.objects = new FutureExoCache<Serializable, Serializable, POMSession>(navigationLoader, cache);
+ this.cache = cacheService.getCacheInstance(NavigationService.class.getSimpleName());
+ this.objects = new FutureExoCache<ScopedKey<?>, Serializable, POMSession>(navigationLoader, cache);
}
@Override
@@ -70,26 +72,26 @@
{
for (String key : keys)
{
- cache.remove(key);
+ cache.remove(ScopedKey.create(key));
}
}
@Override
protected NodeData getNode(POMSession session, String key)
{
- return (NodeData)objects.get(session, key);
+ return (NodeData)objects.get(session, ScopedKey.create(key));
}
@Override
protected void removeNavigation(SiteKey key)
{
- cache.remove(key);
+ cache.remove(ScopedKey.create(key));
}
@Override
protected NavigationData getNavigation(POMSession session, SiteKey key)
{
- return (NavigationData)objects.get(session, key);
+ return (NavigationData)objects.get(session, ScopedKey.create(key));
}
@Override
Deleted: epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/pom/config/GlobalKey.java
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/pom/config/GlobalKey.java 2011-09-14 12:32:16 UTC (rev 7419)
+++ epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/pom/config/GlobalKey.java 2011-09-14 13:29:27 UTC (rev 7420)
@@ -1,94 +0,0 @@
-/*
- * Copyright (C) 2009 eXo Platform SAS.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.exoplatform.portal.pom.config;
-
-import java.io.Serializable;
-
-/**
- * A global key wrapping a local key including the current repository id.
- *
- * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
- * @version $Revision$
- */
-public class GlobalKey implements Serializable
-{
-
- public static GlobalKey wrap(String repositoryName, Serializable localKey)
- {
- return new GlobalKey(repositoryName, localKey);
- }
-
- /** . */
- private final String repositoryId;
-
- /** . */
- private final Serializable localKey;
-
- public GlobalKey(String repositoryId, Serializable localKey)
- {
- if (repositoryId == null)
- {
- throw new NullPointerException();
- }
- if (localKey == null)
- {
- throw new NullPointerException();
- }
- this.repositoryId = repositoryId;
- this.localKey = localKey;
- }
-
- public String getRepositoryId()
- {
- return repositoryId;
- }
-
- public Serializable getLocalKey()
- {
- return localKey;
- }
-
- @Override
- public int hashCode()
- {
- return repositoryId.hashCode() ^ localKey.hashCode();
- }
-
- @Override
- public boolean equals(Object obj)
- {
- if (obj == this)
- {
- return true;
- }
- if (obj instanceof GlobalKey)
- {
- GlobalKey that = (GlobalKey)obj;
- return repositoryId.equals(that.repositoryId) && localKey.equals(that.localKey);
- }
- return false;
- }
-
- @Override
- public String toString()
- {
- return "GlobalKey[repositoryId=" + repositoryId + ",localKey=" + localKey + "]";
- }
-}
Modified: epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/pom/config/POMSessionManager.java
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/pom/config/POMSessionManager.java 2011-09-14 12:32:16 UTC (rev 7419)
+++ epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/pom/config/POMSessionManager.java 2011-09-14 13:29:27 UTC (rev 7420)
@@ -22,6 +22,7 @@
import org.exoplatform.commons.chromattic.ChromatticLifeCycle;
import org.exoplatform.commons.chromattic.ChromatticManager;
import org.exoplatform.commons.chromattic.SessionContext;
+import org.exoplatform.commons.scope.ScopedKey;
import org.exoplatform.portal.pom.config.cache.DataCache;
import org.exoplatform.portal.pom.config.cache.PortalNamesCache;
import org.exoplatform.portal.pom.data.OwnerKey;
@@ -53,7 +54,7 @@
private MOPService pomService;
/** . */
- private final ExoCache<GlobalKey, Object> cache;
+ private final ExoCache<ScopedKey<?>, Object> cache;
/** . */
final ChromatticManager manager;
@@ -84,7 +85,7 @@
public void cachePut(Serializable key, Object value)
{
- GlobalKey globalKey = GlobalKey.wrap(configurator.getRepositoryName(), key);
+ ScopedKey<?> globalKey = ScopedKey.create(key);
//
if (log.isTraceEnabled())
@@ -98,7 +99,7 @@
public Object cacheGet(Serializable key)
{
- GlobalKey globalKey = GlobalKey.wrap(configurator.getRepositoryName(), key);
+ ScopedKey globalKey = ScopedKey.create(key);
//
Object value = cache.get(globalKey);
@@ -115,7 +116,7 @@
public void cacheRemove(Serializable key)
{
- final GlobalKey globalKey = GlobalKey.wrap(configurator.getRepositoryName(), key);
+ final ScopedKey<?> globalKey = ScopedKey.create(key);
//
if (log.isTraceEnabled())
@@ -132,13 +133,13 @@
final PortalKey portalKey = (PortalKey)key;
try
{
- cache.select(new CachedObjectSelector<GlobalKey, Object>()
+ cache.select(new CachedObjectSelector<ScopedKey<?>, Object>()
{
- public boolean select(GlobalKey selectedGlobalKey, ObjectCacheInfo<?> ocinfo)
+ public boolean select(ScopedKey<?> selectedGlobalKey, ObjectCacheInfo<?> ocinfo)
{
- if (globalKey.getRepositoryId().equals(selectedGlobalKey.getRepositoryId()))
+ if (globalKey.getScope().equals(selectedGlobalKey.getScope()))
{
- Serializable selectedLocalKey = selectedGlobalKey.getLocalKey();
+ Serializable selectedLocalKey = selectedGlobalKey.getKey();
if (selectedLocalKey instanceof OwnerKey)
{
OwnerKey selectedOwnerKey = (OwnerKey)selectedLocalKey;
@@ -150,7 +151,8 @@
}
return false;
}
- public void onSelect(ExoCache<? extends GlobalKey, ?> exoCache, GlobalKey key, ObjectCacheInfo<?> ocinfo) throws Exception
+
+ public void onSelect(ExoCache<? extends ScopedKey<?>, ?> exoCache, ScopedKey<?> key, ObjectCacheInfo<?> ocinfo) throws Exception
{
cache.remove(key);
}
Modified: epp/portal/branches/EPP_5_2_Branch/component/portal/src/test/resources/conf/exo.portal.component.portal-configuration.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/portal/src/test/resources/conf/exo.portal.component.portal-configuration.xml 2011-09-14 12:32:16 UTC (rev 7419)
+++ epp/portal/branches/EPP_5_2_Branch/component/portal/src/test/resources/conf/exo.portal.component.portal-configuration.xml 2011-09-14 13:29:27 UTC (rev 7420)
@@ -25,6 +25,11 @@
xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd">
<component>
+ <key>org.exoplatform.commons.scope.ScopeManager</key>
+ <type>org.exoplatform.commons.scope.ScopeManager</type>
+ </component>
+
+ <component>
<key>org.exoplatform.services.cache.CacheService</key>
<jmx-name>cache:type=CacheService</jmx-name>
<type>org.exoplatform.services.cache.impl.CacheServiceImpl</type>
Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/common/common-configuration.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/common/common-configuration.xml 2011-09-14 12:32:16 UTC (rev 7419)
+++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/common/common-configuration.xml 2011-09-14 13:29:27 UTC (rev 7420)
@@ -103,6 +103,11 @@
</component>
<component>
+ <key>org.exoplatform.commons.scope.ScopeManager</key>
+ <type>org.exoplatform.commons.scope.ScopeManager</type>
+ </component>
+
+ <component>
<key>org.exoplatform.services.cache.CacheService</key>
<jmx-name>cache:type=CacheService</jmx-name>
<type>org.exoplatform.services.cache.impl.CacheServiceImpl</type>
Property changes on: epp/portal/branches/EPP_5_2_Branch/wsrp-integration
___________________________________________________________________
Modified: svn:mergeinfo
- /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795/wsrp-integration:5868
/portal/branches/branch-GTNPORTAL-1592/wsrp-integration:4894
/portal/branches/branch-GTNPORTAL-1643/wsrp-integration:5002,5063,5167
/portal/branches/branch-GTNPORTAL-1700/wsrp-integration:5348,5363,5402,5445
/portal/branches/branch-GTNPORTAL-1731/wsrp-integration:5622,5644,5668
/portal/branches/branch-GTNPORTAL-1745/wsrp-integration:5765
/portal/branches/branch-GTNPORTAL-1790/wsrp-integration:5871
/portal/branches/branch-GTNPORTAL-1822/wsrp-integration:5943,5952
/portal/branches/branch-GTNPORTAL-1832/wsrp-integration:6030,6063
/portal/branches/branch-GTNPORTAL-1872/wsrp-integration:6400,6551
/portal/branches/branch-GTNPORTAL-1921/wsrp-integration:6603
/portal/branches/branch-GTNPORTAL-1963/wsrp-integration:6904,6915-6916
/portal/branches/decoupled-webos/wsrp-integration:6214-6243
/portal/branches/gatein-management/wsrp-integration:6920-6958
/portal/branches/global-portlet-metadata/wsrp-integration:6298-6384
/portal/branches/site-describability/wsrp-integration:6171-6235
/portal/trunk/wsrp-integration:4891,5269,5744,5822,5943,6168,6196,6201-6203,6205-6206,6223,6323,6437,6440,6449,6452,6573,6741,6783-6784,6912-6913,6960,7042,7061,7095,7117,7125,7132-7134,7239,7262,7308,7326,7331,7359,7367
+ /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795/wsrp-integration:5868
/portal/branches/branch-GTNPORTAL-1592/wsrp-integration:4894
/portal/branches/branch-GTNPORTAL-1643/wsrp-integration:5002,5063,5167
/portal/branches/branch-GTNPORTAL-1700/wsrp-integration:5348,5363,5402,5445
/portal/branches/branch-GTNPORTAL-1731/wsrp-integration:5622,5644,5668
/portal/branches/branch-GTNPORTAL-1745/wsrp-integration:5765
/portal/branches/branch-GTNPORTAL-1790/wsrp-integration:5871
/portal/branches/branch-GTNPORTAL-1822/wsrp-integration:5943,5952
/portal/branches/branch-GTNPORTAL-1832/wsrp-integration:6030,6063
/portal/branches/branch-GTNPORTAL-1872/wsrp-integration:6400,6551
/portal/branches/branch-GTNPORTAL-1921/wsrp-integration:6603
/portal/branches/branch-GTNPORTAL-1963/wsrp-integration:6904,6915-6916
/portal/branches/decoupled-webos/wsrp-integration:6214-6243
/portal/branches/gatein-management/wsrp-integration:6920-6958
/portal/branches/global-portlet-metadata/wsrp-integration:6298-6384
/portal/branches/site-describability/wsrp-integration:6171-6235
/portal/trunk/wsrp-integration:4891,5269,5744,5822,5943,6168,6196,6201-6203,6205-6206,6223,6323,6437,6440,6449,6452,6573,6741,6783-6784,6912-6913,6960,7042,7061,7095,7117,7125,7132-7134,7198,7239,7262,7308,7326,7331,7359,7367
13 years, 4 months
- 1
- 0
gatein SVN: r7419 - epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/webui/core.
by do-not-reply＠jboss.org
Author: hfnukal
Date: 2011-09-14 08:32:16 -0400 (Wed, 14 Sep 2011)
New Revision: 7419
Modified:
epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/webui/core/UISitemapTree.gtmpl
Log:
JBEPP-1136 Remove empty expand all element from SiteMap
Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/webui/core/UISitemapTree.gtmpl
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/webui/core/UISitemapTree.gtmpl 2011-09-14 12:23:12 UTC (rev 7418)
+++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/webui/core/UISitemapTree.gtmpl 2011-09-14 12:32:16 UTC (rev 7419)
@@ -112,10 +112,7 @@
<div class="CollapseAll FloatLeft" onclick="$actionCollapseAll">
<%=_ctx.appRes(siteMapPortlet.getName() + ".label.CollapseAll")%>
</div>
- <div class="ExpandAll FloatLeft" onclick="{$actionExpandAll}">
- <%//_ctx.appRes(siteMapPortlet.getName() + ".label.ExpandAll")%>
</div>
- </div>
<div class="SitemapContent">
<div class="UISiteTree">
<% TreeNode treeNodeRoot = uicomponent.getTreeNodes() ;%>
13 years, 4 months
- 1
- 0
gatein SVN: r7418 - in portal/trunk/component/web/resources/src: test/java/org/exoplatform/portal/resource and 1 other directory.
by do-not-reply＠jboss.org
Author: trong.tran
Date: 2011-09-14 08:23:12 -0400 (Wed, 14 Sep 2011)
New Revision: 7418
Modified:
portal/trunk/component/web/resources/src/main/java/gatein_resources_1_2.xsd
portal/trunk/component/web/resources/src/test/java/org/exoplatform/portal/resource/TestXSDCorruption.java
Log:
GTNPORTAL-1450 Fix a small mistake in the scheme
Modified: portal/trunk/component/web/resources/src/main/java/gatein_resources_1_2.xsd
===================================================================
--- portal/trunk/component/web/resources/src/main/java/gatein_resources_1_2.xsd 2011-09-14 10:55:44 UTC (rev 7417)
+++ portal/trunk/component/web/resources/src/main/java/gatein_resources_1_2.xsd 2011-09-14 12:23:12 UTC (rev 7418)
@@ -45,8 +45,8 @@
<xs:element name="skin-name" type="xs:string" minOccurs="1" maxOccurs="1"/>
<xs:element name="skin-module" type="xs:string" minOccurs="0" maxOccurs="1"/>
<xs:element name="css-path" type="xs:string" minOccurs="1" maxOccurs="1"/>
- <xs:element name="css-priority" type="xs:string" minOccurs="0" maxOccurs="1"/>
- <xs:element name="overwrite" type="xs:integer" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="css-priority" type="xs:integer" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="overwrite" type="xs:string" minOccurs="0" maxOccurs="1"/>
</xs:sequence>
</xs:complexType>
Modified: portal/trunk/component/web/resources/src/test/java/org/exoplatform/portal/resource/TestXSDCorruption.java
===================================================================
--- portal/trunk/component/web/resources/src/test/java/org/exoplatform/portal/resource/TestXSDCorruption.java 2011-09-14 10:55:44 UTC (rev 7417)
+++ portal/trunk/component/web/resources/src/test/java/org/exoplatform/portal/resource/TestXSDCorruption.java 2011-09-14 12:23:12 UTC (rev 7418)
@@ -59,6 +59,6 @@
{
assertHash("c68ea6831c3d24a242f63abd2db261a6", "gatein_resources_1_0.xsd");
assertHash("c55b7e0dc8ae23e2d34430b38260cd96", "gatein_resources_1_1.xsd");
- assertHash("378178d66c1efacf87619c3c60a4cbf6", "gatein_resources_1_2.xsd");
+ assertHash("6d5566a86feb32f30fb9c7551c026042", "gatein_resources_1_2.xsd");
}
}
\ No newline at end of file
13 years, 4 months
- 1
- 0
gatein SVN: r7417 - epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/src/main/webapp/skin/DefaultSkin/portletIcons.
by do-not-reply＠jboss.org
Author: theute
Date: 2011-09-14 06:55:44 -0400 (Wed, 14 Sep 2011)
New Revision: 7417
Added:
epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/src/main/webapp/skin/DefaultSkin/portletIcons/Calculator.gif
epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/src/main/webapp/skin/DefaultSkin/portletIcons/Calendar.gif
epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/src/main/webapp/skin/DefaultSkin/portletIcons/Todo.gif
Removed:
epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/src/main/webapp/skin/DefaultSkin/portletIcons/Calculator.png
epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/src/main/webapp/skin/DefaultSkin/portletIcons/Calendar.png
epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/src/main/webapp/skin/DefaultSkin/portletIcons/Todo.png
Log:
JBEPP-1173: Default gadget thumbnais have incorrect extension
Copied: epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/src/main/webapp/skin/DefaultSkin/portletIcons/Calculator.gif (from rev 7096, portal/trunk/gadgets/eXoGadgets/src/main/webapp/skin/DefaultSkin/portletIcons/Calculator.gif)
===================================================================
(Binary files differ)
Deleted: epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/src/main/webapp/skin/DefaultSkin/portletIcons/Calculator.png
===================================================================
(Binary files differ)
Copied: epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/src/main/webapp/skin/DefaultSkin/portletIcons/Calendar.gif (from rev 7096, portal/trunk/gadgets/eXoGadgets/src/main/webapp/skin/DefaultSkin/portletIcons/Calendar.gif)
===================================================================
(Binary files differ)
Deleted: epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/src/main/webapp/skin/DefaultSkin/portletIcons/Calendar.png
===================================================================
(Binary files differ)
Copied: epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/src/main/webapp/skin/DefaultSkin/portletIcons/Todo.gif (from rev 7096, portal/trunk/gadgets/eXoGadgets/src/main/webapp/skin/DefaultSkin/portletIcons/Todo.gif)
===================================================================
(Binary files differ)
Deleted: epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/src/main/webapp/skin/DefaultSkin/portletIcons/Todo.png
===================================================================
(Binary files differ)
13 years, 4 months
- 1
- 0
gatein SVN: r7416 - in epp/portal/branches/EPP_5_2_Branch/gadgets: server and 1 other directories.
by do-not-reply＠jboss.org
Author: theute
Date: 2011-09-14 06:34:45 -0400 (Wed, 14 Sep 2011)
New Revision: 7416
Modified:
epp/portal/branches/EPP_5_2_Branch/gadgets/pom.xml
epp/portal/branches/EPP_5_2_Branch/gadgets/server/pom.xml
epp/portal/branches/EPP_5_2_Branch/gadgets/server/src/main/webapp/containers/default/container.js
Log:
Missing ports to EPP
Modified: epp/portal/branches/EPP_5_2_Branch/gadgets/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/gadgets/pom.xml 2011-09-14 10:31:44 UTC (rev 7415)
+++ epp/portal/branches/EPP_5_2_Branch/gadgets/pom.xml 2011-09-14 10:34:45 UTC (rev 7416)
@@ -35,6 +35,6 @@
<module>core</module>
<module>server</module>
<module>eXoGadgets</module>
- <module>gwtGadgets</module>
+ <module>gwtGadgets</module>
</modules>
</project>
Modified: epp/portal/branches/EPP_5_2_Branch/gadgets/server/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/gadgets/server/pom.xml 2011-09-14 10:31:44 UTC (rev 7415)
+++ epp/portal/branches/EPP_5_2_Branch/gadgets/server/pom.xml 2011-09-14 10:34:45 UTC (rev 7416)
@@ -72,7 +72,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <scope>provided</scope>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
Modified: epp/portal/branches/EPP_5_2_Branch/gadgets/server/src/main/webapp/containers/default/container.js
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/gadgets/server/src/main/webapp/containers/default/container.js 2011-09-14 10:31:44 UTC (rev 7415)
+++ epp/portal/branches/EPP_5_2_Branch/gadgets/server/src/main/webapp/containers/default/container.js 2011-09-14 10:34:45 UTC (rev 7416)
@@ -44,7 +44,9 @@
// Container must be an array; this allows multiple containers
// to share configuration.
-{"gadgets.container" : ["default"],
+// TODO: Move out accel container config into a separate accel.js file.
+// TODO : remove "" container
+{"gadgets.container" : ["default", "accel", ""],
// Set of regular expressions to validate the parent parameter. This is
// necessary to support situations where you want a single container to support
@@ -60,38 +62,45 @@
// DNS domain on which gadgets should render.
"gadgets.lockedDomainSuffix" : "-a.example.com:8080",
+// Origins for CORS requests and/or Referer validation
+// Indicate a set of origins or an entry with * to indicate that all origins are allowed
+"gadgets.parentOrigins" : ["*"],
+
// Various urls generated throughout the code base.
// iframeBaseUri will automatically have the host inserted
// if locked domain is enabled and the implementation supports it.
// query parameters will be added.
"gadgets.iframeBaseUri" : "/eXoGadgetServer/gadgets/ifr",
+"gadgets.uri.iframe.basePath" : "/eXoGadgetServer/gadgets/ifr",
// jsUriTemplate will have %host% and %js% substituted.
// No locked domain special cases, but jsUriTemplate must
// never conflict with a lockedDomainSuffix.
"gadgets.jsUriTemplate" : "http://%host%/eXoGadgetServer/gadgets/js/%js%",
+//New configuration for iframeUri generation:
+"gadgets.uri.iframe.lockedDomainSuffix" : "-a.example.com:8080",
+"gadgets.uri.iframe.unlockedDomain" : "http://%host%",
+"gadgets.uri.iframe.basePath" : "/eXoGadgetServer/gadgets/ifr",
+
+
// Callback URL. Scheme relative URL for easy switch between https/http.
-"gadgets.oauthGadgetCallbackTemplate" : "//%host%/eXoGadgetServer/gadgets/oauthcallback",
+"gadgets.uri.oauth.callbackTemplate" : "//%host%/eXoGadgetServer/gadgets/oauthcallback",
// Use an insecure security token by default
"gadgets.securityTokenType" : "secure",
"gadgets.securityTokenKeyFile" : "key.txt",
+// Config param to load Opensocial data for social
+// preloads in data pipelining. %host% will be
+// substituted with the current host.
+"gadgets.osDataUri" : "http://%host%/rpc",
+
"gadgets.signingKeyFile" : "oauthkey.pem",
"gadgets.signingKeyName" : "mytestkey",
"gadgets.signedFetchDomain" : "eXo",
-// Config param to load Opensocial data for social
-// preloads in data pipelining. %host% will be
-// substituted with the current host.
-"gadgets.osDataUri" : "http://%host%/social/rpc",
-// Uncomment these to switch to a secure version
-//
-//"gadgets.securityTokenType" : "secure",
-//"gadgets.securityTokenKeyFile" : "/path/to/key/file.txt",
-
"gadgets.content-rewrite" : {
"include-urls": ".*",
"exclude-urls": "",
@@ -101,6 +110,19 @@
"concat-url": "/eXoGadgetServer/gadgets/concat?"
},
+// Default Js Uri config: also must be overridden.
+"gadgets.uri.js.host" : "http://%host%/",
+"gadgets.uri.js.path" : "/eXoGadgetServer/gadgets/js",
+
+// Default concat Uri config; used for testing.
+"gadgets.uri.concat.host" : "%host%",
+"gadgets.uri.concat.path" : "/eXoGadgetServer/gadgets/concat",
+"gadgets.uri.concat.js.splitToken" : "false",
+
+// Default proxy Uri config; used for testing.
+"gadgets.uri.proxy.host" : "%host%",
+"gadgets.uri.proxy.path" : "/eXoGadgetServer/gadgets/proxy",
+
// This config data will be passed down to javascript. Please
// configure your object using the feature name rather than
// the javascript name.
@@ -110,8 +132,8 @@
"gadgets.features" : {
"core.io" : {
// Note: /proxy is an open proxy. Be careful how you expose this!
- "proxyUrl" : "http://%host%/eXoGadgetServer/gadgets/proxy?refresh=%refresh%&url=%url%",
- "jsonProxyUrl" : "http://%host%/eXoGadgetServer/gadgets/makeRequest"
+ "proxyUrl" : "//%host%/eXoGadgetServer/gadgets/proxy?container=default&refresh=%refresh%&url=%url%%rewriteMime%",
+ "jsonProxyUrl" : "//%host%/eXoGadgetServer/gadgets/makeRequest"
},
"views" : {
"home" : {
@@ -125,6 +147,74 @@
"aliases" : ["FULL_PAGE"]
}
},
+ "tabs": {
+ "css" : [
+ ".tablib_table {",
+ "width: 100%;",
+ "border-collapse: separate;",
+ "border-spacing: 0px;",
+ "empty-cells: show;",
+ "font-size: 11px;",
+ "text-align: center;",
+ "}",
+ ".tablib_emptyTab {",
+ "border-bottom: 1px solid #676767;",
+ "padding: 0px 1px;",
+ "}",
+ ".tablib_spacerTab {",
+ "border-bottom: 1px solid #676767;",
+ "padding: 0px 1px;",
+ "width: 1px;",
+ "}",
+ ".tablib_selected {",
+ "padding: 2px;",
+ "background-color: #ffffff;",
+ "border: 1px solid #676767;",
+ "border-bottom-width: 0px;",
+ "color: #3366cc;",
+ "font-weight: bold;",
+ "width: 80px;",
+ "cursor: default;",
+ "}",
+ ".tablib_unselected {",
+ "padding: 2px;",
+ "background-color: #dddddd;",
+ "border: 1px solid #aaaaaa;",
+ "border-bottom-color: #676767;",
+ "color: #000000;",
+ "width: 80px;",
+ "cursor: pointer;",
+ "}",
+ ".tablib_navContainer {",
+ "width: 10px;",
+ "vertical-align: middle;",
+ "}",
+ ".tablib_navContainer a:link, ",
+ ".tablib_navContainer a:visited, ",
+ ".tablib_navContainer a:hover {",
+ "color: #3366aa;",
+ "text-decoration: none;",
+ "}"
+ ]
+ },
+ "minimessage": {
+ "css": [
+ ".mmlib_table {",
+ "width: 100%;",
+ "font: bold 9px arial,sans-serif;",
+ "background-color: #fff4c2;",
+ "border-collapse: separate;",
+ "border-spacing: 0px;",
+ "padding: 1px 0px;",
+ "}",
+ ".mmlib_xlink {",
+ "font: normal 1.1em arial,sans-serif;",
+ "font-weight: bold;",
+ "color: #0000cc;",
+ "cursor: pointer;",
+ "}"
+ ]
+ },
"rpc" : {
// Path to the relay file. Automatically appended to the parent
/// parameter if it passes input validation and is not null.
@@ -147,34 +237,44 @@
"ANCHOR_COLOR": ""
}
},
- "opensocial-0.8" : {
+ "opensocial" : {
// Path to fetch opensocial data from
// Must be on the same domain as the gadget rendering server
- "path" : "http://%host%/social",
+ "path" : "http://%host%/rpc",
+ // Path to issue invalidate calls
+ "invalidatePath" : "http://%host%/rpc",
"domain" : "shindig",
"enableCaja" : false,
"supportedFields" : {
"person" : ["id", {"name" : ["familyName", "givenName", "unstructured"]}, "thumbnailUrl", "profileUrl"],
- "activity" : ["id", "title"]
+ "activity" : ["appId", "body", "bodyId", "externalId", "id", "mediaItems", "postedTime", "priority",
+ "streamFaviconUrl", "streamSourceUrl", "streamTitle", "streamUrl", "templateParams", "title",
+ "url", "userId"],
+ "activityEntry" : ["icon", "postedTime", "actor", "verb", "object", "target", "generator", "provider", "title",
+ "body", "standardLinks", "to", "cc", "bcc"],
+ "album" : ["id", "thumbnailUrl", "title", "description", "location", "ownerId"],
+ "mediaItem" : ["album_id", "created", "description", "duration", "file_size", "id", "language", "last_updated",
+ "location", "mime_type", "num_comments", "num_views", "num_votes", "rating", "start_time",
+ "tagged_people", "tags", "thumbnail_url", "title", "type", "url"]
}
},
"osapi.services" : {
// Specifying a binding to "container.listMethods" instructs osapi to dynamicaly introspect the services
// provided by the container and delay the gadget onLoad handler until that introspection is
// complete.
- // Alternatively a container can directly configure services here rather than having them
+ // Alternatively a container can directly configure services here rather than having them
// introspected. Simply list out the available servies and omit "container.listMethods" to
// avoid the initialization delay caused by gadgets.rpc
// E.g. "gadgets.rpc" : ["activities.requestCreate", "messages.requestSend", "requestShareApp", "requestPermission"]
"gadgets.rpc" : ["container.listMethods"]
},
-// "osapi" : {
-// // The endpoints to query for available JSONRPC/REST services
-// "endPoints" : [ "http://%host%/social/rpc", "http://%host%/gadgets/api/rpc" ]
-// },
+ "osapi" : {
+ // The endpoints to query for available JSONRPC/REST services
+ "endPoints" : [ "http://%host%/rpc" ]
+ },
"osml": {
// OSML library resource. Can be set to null or the empty string to disable OSML
// for a container.
- "library": ""
+ "library": "config/OSML_library.xml"
}
-}}
+}}
\ No newline at end of file
13 years, 4 months
- 1
- 0
gatein SVN: r7415 - in epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/src/main/webapp: WEB-INF and 2 other directories.
by do-not-reply＠jboss.org
Author: theute
Date: 2011-09-14 06:31:44 -0400 (Wed, 14 Sep 2011)
New Revision: 7415
Added:
epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/src/main/webapp/gadgets/Todo/locale/
epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/src/main/webapp/gadgets/Todo/locale/ALL_ALL.xml
epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/src/main/webapp/gadgets/Todo/locale/ar_ALL.xml
epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/src/main/webapp/gadgets/Todo/locale/de_ALL.xml
epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/src/main/webapp/gadgets/Todo/locale/es_ALL.xml
epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/src/main/webapp/gadgets/Todo/locale/fr_ALL.xml
epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/src/main/webapp/gadgets/Todo/locale/ja_ALL.xml
epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/src/main/webapp/gadgets/Todo/locale/kr_ALL.xml
epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/src/main/webapp/gadgets/Todo/locale/vi_ALL.xml
epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/src/main/webapp/gadgets/Todo/locale/zh_ALL.xml
epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/src/main/webapp/gadgets/Todo/locale/zh_TW_ALL.xml
Removed:
epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/src/main/webapp/gadgets/Todo/locale/ALL_ALL.xml
epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/src/main/webapp/gadgets/Todo/locale/ar_ALL.xml
epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/src/main/webapp/gadgets/Todo/locale/de_ALL.xml
epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/src/main/webapp/gadgets/Todo/locale/es_ALL.xml
epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/src/main/webapp/gadgets/Todo/locale/fr_ALL.xml
epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/src/main/webapp/gadgets/Todo/locale/ja_ALL.xml
epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/src/main/webapp/gadgets/Todo/locale/kr_ALL.xml
epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/src/main/webapp/gadgets/Todo/locale/vi_ALL.xml
epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/src/main/webapp/gadgets/Todo/locale/zh_ALL.xml
epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/src/main/webapp/gadgets/Todo/locale/zh_TW_ALL.xml
epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/src/main/webapp/locale/
Modified:
epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/src/main/webapp/WEB-INF/gadget.xml
epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/src/main/webapp/gadgets/Todo/Todo.xml
Log:
JBEPP-925: TODO gadget has unlocalized button __MSG_Save__
Modified: epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/src/main/webapp/WEB-INF/gadget.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/src/main/webapp/WEB-INF/gadget.xml 2011-09-14 10:06:56 UTC (rev 7414)
+++ epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/src/main/webapp/WEB-INF/gadget.xml 2011-09-14 10:31:44 UTC (rev 7415)
@@ -22,7 +22,7 @@
<gadgets
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gadgets_1_0"
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gadgets_1_0"
xmlns="http://www.gatein.org/xml/ns/gadgets_1_0">
<gadget name="Todo">
Modified: epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/src/main/webapp/gadgets/Todo/Todo.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/src/main/webapp/gadgets/Todo/Todo.xml 2011-09-14 10:06:56 UTC (rev 7414)
+++ epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/src/main/webapp/gadgets/Todo/Todo.xml 2011-09-14 10:31:44 UTC (rev 7415)
@@ -36,10 +36,10 @@
description="ToDo Gadget, easily manage and track your daily to-do list."
thumbnail="images/Todo.gif"
height="235">
- <Locale messages="http://localhost:8080/eXoGadgets/locale/Todo/ALL_ALL.xml" />
- <Locale lang="ar" messages="http://localhost:8080/eXoGadgets/locale/Todo/ar_ALL.xml" language_direction="rtl"/>
- <Locale lang="fr" messages="http://localhost:8080/eXoGadgets/locale/Todo/fr_ALL.xml" />
- <Locale lang="vi" messages="http://localhost:8080/eXoGadgets/locale/Todo/vi_ALL.xml" />
+ <Locale messages="locale/ALL_ALL.xml" />
+ <Locale lang="ar" messages="locale/ar_ALL.xml" language_direction="rtl"/>
+ <Locale lang="fr" messages="locale/fr_ALL.xml" />
+ <Locale lang="vi" messages="locale/vi_ALL.xml" />
<Require feature="setprefs"/>
</ModulePrefs>
<UserPref name="todoList" datatype="list"/>
Deleted: epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/src/main/webapp/gadgets/Todo/locale/ALL_ALL.xml
===================================================================
--- portal/branches/branch-GTNPORTAL-1872/gadgets/eXoGadgets/src/main/webapp/gadgets/Todo/locale/ALL_ALL.xml 2011-05-23 03:46:39 UTC (rev 6526)
+++ epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/src/main/webapp/gadgets/Todo/locale/ALL_ALL.xml 2011-09-14 10:31:44 UTC (rev 7415)
@@ -1,29 +0,0 @@
-<!--
-
- Copyright (C) 2009 eXo Platform SAS.
-
- This is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as
- published by the Free Software Foundation; either version 2.1 of
- the License, or (at your option) any later version.
-
- This software is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this software; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-
--->
-
-<messagebundle>
- <msg name="save">
- Save
- </msg>
- <msg name="type_here">
- Type new task here
- </msg>
-</messagebundle>
\ No newline at end of file
Copied: epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/src/main/webapp/gadgets/Todo/locale/ALL_ALL.xml (from rev 6526, portal/branches/branch-GTNPORTAL-1872/gadgets/eXoGadgets/src/main/webapp/gadgets/Todo/locale/ALL_ALL.xml)
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/src/main/webapp/gadgets/Todo/locale/ALL_ALL.xml (rev 0)
+++ epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/src/main/webapp/gadgets/Todo/locale/ALL_ALL.xml 2011-09-14 10:31:44 UTC (rev 7415)
@@ -0,0 +1,29 @@
+<!--
+
+ 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.
+
+-->
+
+<messagebundle>
+ <msg name="save">
+ Save
+ </msg>
+ <msg name="type_here">
+ Type new task here
+ </msg>
+</messagebundle>
\ No newline at end of file
Deleted: epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/src/main/webapp/gadgets/Todo/locale/ar_ALL.xml
===================================================================
--- portal/branches/branch-GTNPORTAL-1872/gadgets/eXoGadgets/src/main/webapp/gadgets/Todo/locale/ar_ALL.xml 2011-05-23 03:46:39 UTC (rev 6526)
+++ epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/src/main/webapp/gadgets/Todo/locale/ar_ALL.xml 2011-09-14 10:31:44 UTC (rev 7415)
@@ -1,29 +0,0 @@
-<!--
-
- Copyright (C) 2009 eXo Platform SAS.
-
- This is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as
- published by the Free Software Foundation; either version 2.1 of
- the License, or (at your option) any later version.
-
- This software is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this software; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-
--->
-
-<messagebundle>
- <msg name="save">
- حفظ
- </msg>
- <msg name="type_here">
- نوع المهمة الجديدة هنا
- </msg>
-</messagebundle>
\ No newline at end of file
Copied: epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/src/main/webapp/gadgets/Todo/locale/ar_ALL.xml (from rev 6526, portal/branches/branch-GTNPORTAL-1872/gadgets/eXoGadgets/src/main/webapp/gadgets/Todo/locale/ar_ALL.xml)
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/src/main/webapp/gadgets/Todo/locale/ar_ALL.xml (rev 0)
+++ epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/src/main/webapp/gadgets/Todo/locale/ar_ALL.xml 2011-09-14 10:31:44 UTC (rev 7415)
@@ -0,0 +1,29 @@
+<!--
+
+ 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.
+
+-->
+
+<messagebundle>
+ <msg name="save">
+ حفظ
+ </msg>
+ <msg name="type_here">
+ نوع المهمة الجديدة هنا
+ </msg>
+</messagebundle>
\ No newline at end of file
Deleted: epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/src/main/webapp/gadgets/Todo/locale/de_ALL.xml
===================================================================
--- portal/branches/branch-GTNPORTAL-1872/gadgets/eXoGadgets/src/main/webapp/gadgets/Todo/locale/de_ALL.xml 2011-05-23 03:46:39 UTC (rev 6526)
+++ epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/src/main/webapp/gadgets/Todo/locale/de_ALL.xml 2011-09-14 10:31:44 UTC (rev 7415)
@@ -1,29 +0,0 @@
-<!--
-
- Copyright (C) 2009 eXo Platform SAS.
-
- This is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as
- published by the Free Software Foundation; either version 2.1 of
- the License, or (at your option) any later version.
-
- This software is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this software; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-
--->
-
-<messagebundle>
- <msg name="save">
- Speichern
- </msg>
- <msg name="type_here">
- Hier neue Aufgabe eingeben
- </msg>
-</messagebundle>
\ No newline at end of file
Copied: epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/src/main/webapp/gadgets/Todo/locale/de_ALL.xml (from rev 6526, portal/branches/branch-GTNPORTAL-1872/gadgets/eXoGadgets/src/main/webapp/gadgets/Todo/locale/de_ALL.xml)
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/src/main/webapp/gadgets/Todo/locale/de_ALL.xml (rev 0)
+++ epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/src/main/webapp/gadgets/Todo/locale/de_ALL.xml 2011-09-14 10:31:44 UTC (rev 7415)
@@ -0,0 +1,29 @@
+<!--
+
+ 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.
+
+-->
+
+<messagebundle>
+ <msg name="save">
+ Speichern
+ </msg>
+ <msg name="type_here">
+ Hier neue Aufgabe eingeben
+ </msg>
+</messagebundle>
\ No newline at end of file
Deleted: epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/src/main/webapp/gadgets/Todo/locale/es_ALL.xml
===================================================================
--- portal/branches/branch-GTNPORTAL-1872/gadgets/eXoGadgets/src/main/webapp/gadgets/Todo/locale/es_ALL.xml 2011-05-23 03:46:39 UTC (rev 6526)
+++ epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/src/main/webapp/gadgets/Todo/locale/es_ALL.xml 2011-09-14 10:31:44 UTC (rev 7415)
@@ -1,29 +0,0 @@
-<!--
-
- Copyright (C) 2009 eXo Platform SAS.
-
- This is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as
- published by the Free Software Foundation; either version 2.1 of
- the License, or (at your option) any later version.
-
- This software is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this software; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-
--->
-
-<messagebundle>
- <msg name="save">
- Guardar
- </msg>
- <msg name="type_here">
- Introduce la nueva Tarea aquí
- </msg>
-</messagebundle>
\ No newline at end of file
Copied: epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/src/main/webapp/gadgets/Todo/locale/es_ALL.xml (from rev 6526, portal/branches/branch-GTNPORTAL-1872/gadgets/eXoGadgets/src/main/webapp/gadgets/Todo/locale/es_ALL.xml)
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/src/main/webapp/gadgets/Todo/locale/es_ALL.xml (rev 0)
+++ epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/src/main/webapp/gadgets/Todo/locale/es_ALL.xml 2011-09-14 10:31:44 UTC (rev 7415)
@@ -0,0 +1,29 @@
+<!--
+
+ 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.
+
+-->
+
+<messagebundle>
+ <msg name="save">
+ Guardar
+ </msg>
+ <msg name="type_here">
+ Introduce la nueva Tarea aquí
+ </msg>
+</messagebundle>
\ No newline at end of file
Deleted: epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/src/main/webapp/gadgets/Todo/locale/fr_ALL.xml
===================================================================
--- portal/branches/branch-GTNPORTAL-1872/gadgets/eXoGadgets/src/main/webapp/gadgets/Todo/locale/fr_ALL.xml 2011-05-23 03:46:39 UTC (rev 6526)
+++ epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/src/main/webapp/gadgets/Todo/locale/fr_ALL.xml 2011-09-14 10:31:44 UTC (rev 7415)
@@ -1,29 +0,0 @@
-<!--
-
- Copyright (C) 2009 eXo Platform SAS.
-
- This is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as
- published by the Free Software Foundation; either version 2.1 of
- the License, or (at your option) any later version.
-
- This software is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this software; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-
--->
-
-<messagebundle>
- <msg name="save">
- Sauver
- </msg>
- <msg name="type_here">
- Type de nouvelle tâche ici
- </msg>
-</messagebundle>
\ No newline at end of file
Copied: epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/src/main/webapp/gadgets/Todo/locale/fr_ALL.xml (from rev 6526, portal/branches/branch-GTNPORTAL-1872/gadgets/eXoGadgets/src/main/webapp/gadgets/Todo/locale/fr_ALL.xml)
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/src/main/webapp/gadgets/Todo/locale/fr_ALL.xml (rev 0)
+++ epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/src/main/webapp/gadgets/Todo/locale/fr_ALL.xml 2011-09-14 10:31:44 UTC (rev 7415)
@@ -0,0 +1,29 @@
+<!--
+
+ 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.
+
+-->
+
+<messagebundle>
+ <msg name="save">
+ Sauver
+ </msg>
+ <msg name="type_here">
+ Type de nouvelle tâche ici
+ </msg>
+</messagebundle>
\ No newline at end of file
Deleted: epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/src/main/webapp/gadgets/Todo/locale/ja_ALL.xml
===================================================================
--- portal/branches/branch-GTNPORTAL-1872/gadgets/eXoGadgets/src/main/webapp/gadgets/Todo/locale/ja_ALL.xml 2011-05-23 03:46:39 UTC (rev 6526)
+++ epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/src/main/webapp/gadgets/Todo/locale/ja_ALL.xml 2011-09-14 10:31:44 UTC (rev 7415)
@@ -1,29 +0,0 @@
-<!--
-
- Copyright (C) 2009 eXo Platform SAS.
-
- This is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as
- published by the Free Software Foundation; either version 2.1 of
- the License, or (at your option) any later version.
-
- This software is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this software; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-
--->
-
-<messagebundle>
- <msg name="save">
- 保存
- </msg>
- <msg name="type_here">
- 新しいタスクを入力してください。
- </msg>
-</messagebundle>
Copied: epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/src/main/webapp/gadgets/Todo/locale/ja_ALL.xml (from rev 6526, portal/branches/branch-GTNPORTAL-1872/gadgets/eXoGadgets/src/main/webapp/gadgets/Todo/locale/ja_ALL.xml)
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/src/main/webapp/gadgets/Todo/locale/ja_ALL.xml (rev 0)
+++ epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/src/main/webapp/gadgets/Todo/locale/ja_ALL.xml 2011-09-14 10:31:44 UTC (rev 7415)
@@ -0,0 +1,29 @@
+<!--
+
+ 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.
+
+-->
+
+<messagebundle>
+ <msg name="save">
+ 保存
+ </msg>
+ <msg name="type_here">
+ 新しいタスクを入力してください。
+ </msg>
+</messagebundle>
Deleted: epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/src/main/webapp/gadgets/Todo/locale/kr_ALL.xml
===================================================================
--- portal/branches/branch-GTNPORTAL-1872/gadgets/eXoGadgets/src/main/webapp/gadgets/Todo/locale/kr_ALL.xml 2011-05-23 03:46:39 UTC (rev 6526)
+++ epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/src/main/webapp/gadgets/Todo/locale/kr_ALL.xml 2011-09-14 10:31:44 UTC (rev 7415)
@@ -1,29 +0,0 @@
-<!--
-
- Copyright (C) 2009 eXo Platform SAS.
-
- This is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as
- published by the Free Software Foundation; either version 2.1 of
- the License, or (at your option) any later version.
-
- This software is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this software; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-
--->
-
-<messagebundle>
- <msg name="save">
- 저장
- </msg>
- <msg name="type_here">
- 새로운 태스크를 입력하십시오
- </msg>
-</messagebundle>
Copied: epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/src/main/webapp/gadgets/Todo/locale/kr_ALL.xml (from rev 6526, portal/branches/branch-GTNPORTAL-1872/gadgets/eXoGadgets/src/main/webapp/gadgets/Todo/locale/kr_ALL.xml)
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/src/main/webapp/gadgets/Todo/locale/kr_ALL.xml (rev 0)
+++ epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/src/main/webapp/gadgets/Todo/locale/kr_ALL.xml 2011-09-14 10:31:44 UTC (rev 7415)
@@ -0,0 +1,29 @@
+<!--
+
+ 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.
+
+-->
+
+<messagebundle>
+ <msg name="save">
+ 저장
+ </msg>
+ <msg name="type_here">
+ 새로운 태스크를 입력하십시오
+ </msg>
+</messagebundle>
Deleted: epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/src/main/webapp/gadgets/Todo/locale/vi_ALL.xml
===================================================================
--- portal/branches/branch-GTNPORTAL-1872/gadgets/eXoGadgets/src/main/webapp/gadgets/Todo/locale/vi_ALL.xml 2011-05-23 03:46:39 UTC (rev 6526)
+++ epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/src/main/webapp/gadgets/Todo/locale/vi_ALL.xml 2011-09-14 10:31:44 UTC (rev 7415)
@@ -1,29 +0,0 @@
-<!--
-
- Copyright (C) 2009 eXo Platform SAS.
-
- This is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as
- published by the Free Software Foundation; either version 2.1 of
- the License, or (at your option) any later version.
-
- This software is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this software; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-
--->
-
-<messagebundle>
- <msg name="save">
- Lưu
- </msg>
- <msg name="type_here">
- Ghi chú công việc
- </msg>
-</messagebundle>
\ No newline at end of file
Copied: epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/src/main/webapp/gadgets/Todo/locale/vi_ALL.xml (from rev 6526, portal/branches/branch-GTNPORTAL-1872/gadgets/eXoGadgets/src/main/webapp/gadgets/Todo/locale/vi_ALL.xml)
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/src/main/webapp/gadgets/Todo/locale/vi_ALL.xml (rev 0)
+++ epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/src/main/webapp/gadgets/Todo/locale/vi_ALL.xml 2011-09-14 10:31:44 UTC (rev 7415)
@@ -0,0 +1,29 @@
+<!--
+
+ 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.
+
+-->
+
+<messagebundle>
+ <msg name="save">
+ Lưu
+ </msg>
+ <msg name="type_here">
+ Ghi chú công việc
+ </msg>
+</messagebundle>
\ No newline at end of file
Deleted: epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/src/main/webapp/gadgets/Todo/locale/zh_ALL.xml
===================================================================
--- portal/branches/branch-GTNPORTAL-1872/gadgets/eXoGadgets/src/main/webapp/gadgets/Todo/locale/zh_ALL.xml 2011-05-23 03:46:39 UTC (rev 6526)
+++ epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/src/main/webapp/gadgets/Todo/locale/zh_ALL.xml 2011-09-14 10:31:44 UTC (rev 7415)
@@ -1,29 +0,0 @@
-<!--
-
- Copyright (C) 2009 eXo Platform SAS.
-
- This is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as
- published by the Free Software Foundation; either version 2.1 of
- the License, or (at your option) any later version.
-
- This software is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this software; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-
--->
-
-<messagebundle>
- <msg name="save">
- 保存
- </msg>
- <msg name="type_here">
- 在此增加新的任务
- </msg>
-</messagebundle>
Copied: epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/src/main/webapp/gadgets/Todo/locale/zh_ALL.xml (from rev 6526, portal/branches/branch-GTNPORTAL-1872/gadgets/eXoGadgets/src/main/webapp/gadgets/Todo/locale/zh_ALL.xml)
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/src/main/webapp/gadgets/Todo/locale/zh_ALL.xml (rev 0)
+++ epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/src/main/webapp/gadgets/Todo/locale/zh_ALL.xml 2011-09-14 10:31:44 UTC (rev 7415)
@@ -0,0 +1,29 @@
+<!--
+
+ 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.
+
+-->
+
+<messagebundle>
+ <msg name="save">
+ 保存
+ </msg>
+ <msg name="type_here">
+ 在此增加新的任务
+ </msg>
+</messagebundle>
Deleted: epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/src/main/webapp/gadgets/Todo/locale/zh_TW_ALL.xml
===================================================================
--- portal/branches/branch-GTNPORTAL-1872/gadgets/eXoGadgets/src/main/webapp/gadgets/Todo/locale/zh_TW_ALL.xml 2011-05-23 03:46:39 UTC (rev 6526)
+++ epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/src/main/webapp/gadgets/Todo/locale/zh_TW_ALL.xml 2011-09-14 10:31:44 UTC (rev 7415)
@@ -1,29 +0,0 @@
-<!--
-
- Copyright (C) 2009 eXo Platform SAS.
-
- This is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as
- published by the Free Software Foundation; either version 2.1 of
- the License, or (at your option) any later version.
-
- This software is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this software; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-
--->
-
-<messagebundle>
- <msg name="save">
- Save
- </msg>
- <msg name="type_here">
- Type new task here
- </msg>
-</messagebundle>
\ No newline at end of file
Copied: epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/src/main/webapp/gadgets/Todo/locale/zh_TW_ALL.xml (from rev 6526, portal/branches/branch-GTNPORTAL-1872/gadgets/eXoGadgets/src/main/webapp/gadgets/Todo/locale/zh_TW_ALL.xml)
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/src/main/webapp/gadgets/Todo/locale/zh_TW_ALL.xml (rev 0)
+++ epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/src/main/webapp/gadgets/Todo/locale/zh_TW_ALL.xml 2011-09-14 10:31:44 UTC (rev 7415)
@@ -0,0 +1,29 @@
+<!--
+
+ 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.
+
+-->
+
+<messagebundle>
+ <msg name="save">
+ Save
+ </msg>
+ <msg name="type_here">
+ Type new task here
+ </msg>
+</messagebundle>
\ No newline at end of file
13 years, 4 months
- 1
- 0