gatein SVN: r6976 - epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/structure.
by do-not-reply＠jboss.org
Author: hfnukal
Date: 2011-08-02 09:30:46 -0400 (Tue, 02 Aug 2011)
New Revision: 6976
Modified:
epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/structure/MOPConsumerStructureProvider.java
Log:
JBEPP-1036 Unknown error when edit dashboard with more than 2 gadgets
Modified: epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/structure/MOPConsumerStructureProvider.java
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/structure/MOPConsumerStructureProvider.java 2011-08-02 13:25:22 UTC (rev 6975)
+++ epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/structure/MOPConsumerStructureProvider.java 2011-08-02 13:30:46 UTC (rev 6976)
@@ -272,6 +272,9 @@
public void addWindow(String windowName, String uuid)
{
+
+ if(windowName==null) windowName=uuid;
+
// add suffix in case we have several windows with the same name in the page
if (childrenWindows.containsKey(windowName))
{
13 years, 4 months
- 1
- 0
gatein SVN: r6975 - epp/portal/branches/EPP_5_1_Branch/web/portal/src/main/webapp/groovy/webui/core.
by do-not-reply＠jboss.org
Author: hfnukal
Date: 2011-08-02 09:25:22 -0400 (Tue, 02 Aug 2011)
New Revision: 6975
Modified:
epp/portal/branches/EPP_5_1_Branch/web/portal/src/main/webapp/groovy/webui/core/UIRepeater.gtmpl
Log:
JBEPP-365 XSS in page title
Modified: epp/portal/branches/EPP_5_1_Branch/web/portal/src/main/webapp/groovy/webui/core/UIRepeater.gtmpl
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/web/portal/src/main/webapp/groovy/webui/core/UIRepeater.gtmpl 2011-08-02 09:59:15 UTC (rev 6974)
+++ epp/portal/branches/EPP_5_1_Branch/web/portal/src/main/webapp/groovy/webui/core/UIRepeater.gtmpl 2011-08-02 13:25:22 UTC (rev 6975)
@@ -4,6 +4,7 @@
import org.exoplatform.webui.form.UIForm;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
+ import org.gatein.common.text.EntityEncoder;
String[] beanFields = uicomponent.getBeanFields() ;
String[] beanActions = uicomponent.getBeanActions() ;
13 years, 4 months
- 1
- 0
gatein SVN: r6974 - in portal/branches/api/component/api-impl/src: main/java/org/gatein/portal/api/impl/content and 2 other directories.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2011-08-02 05:59:15 -0400 (Tue, 02 Aug 2011)
New Revision: 6974
Modified:
portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/GateInImpl.java
portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/content/GadgetImpl.java
portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/content/PortletImpl.java
portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/content/WSRPImpl.java
portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/portal/SiteImpl.java
portal/branches/api/component/api-impl/src/test/java/org/gatein/portal/api/impl/portal/SiteTestCase.java
Log:
- Adapted for changes in Type API.
Modified: portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/GateInImpl.java
===================================================================
--- portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/GateInImpl.java 2011-08-02 07:20:31 UTC (rev 6973)
+++ portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/GateInImpl.java 2011-08-02 09:59:15 UTC (rev 6974)
@@ -84,7 +84,7 @@
private static final String GROUP_CHARS = "\\w|-|_";
public static final Context CONTEXT = GenericContext.builder()
- .requiredComponent("owner", Site.class, Pattern.compile(Site.PORTAL_NAME + "|" + Site.GROUP_NAME + "|" + Site.DASHBOARD_NAME))
+ .requiredComponent("owner", Site.class, Pattern.compile(Site.PORTAL_TYPE_NAME + "|" + Site.GROUP_TYPE_NAME + "|" + Site.DASHBOARD_TYPE_NAME))
.requiredComponent("portal", Portal.class, Pattern.compile("(" + GROUP_CHARS + "|\\/)+"))
.optionalComponent("page", Page.class, Pattern.compile("\\w+"))
.withDefaultSeparator("::").build();
@@ -118,7 +118,7 @@
container = context.getContainer();
}
- public <T> T getProperty(Type<T, GateIn> property)
+ public <T> T getProperty(Type<T> property)
{
if (property == null)
{
@@ -130,7 +130,7 @@
return type.cast(o);
}
- public <T> void setProperty(Type<T, GateIn> property, T value)
+ public <T> void setProperty(Type<T> property, T value)
{
if (property != null)
{
@@ -331,7 +331,7 @@
return type.cast(result);
}
- public <T extends Site> T getSite(Id<T> siteId, Type<T, Site> type)
+ public <T extends Site> T getSite(Id<T> siteId, Type<T> type)
{
return null; //To change body of implemented methods use File | Settings | File Templates.
}
@@ -386,7 +386,7 @@
return CATEGORY_CONTEXT.create(Category.class, name);
}
- public <T extends Site> Id<T> siteId(Type<T, Site> siteType, String siteName)
+ public <T extends Site> Id<T> siteId(Type<T> siteType, String siteName)
{
return CONTEXT.create(siteType.getValueType(), siteType.getName(), siteName);
}
Modified: portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/content/GadgetImpl.java
===================================================================
--- portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/content/GadgetImpl.java 2011-08-02 07:20:31 UTC (rev 6973)
+++ portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/content/GadgetImpl.java 2011-08-02 09:59:15 UTC (rev 6974)
@@ -127,7 +127,7 @@
return gadget.isLocal();
}
- public Type<org.gatein.api.content.Gadget, Content> getType()
+ public Type<org.gatein.api.content.Gadget> getType()
{
return Content.GADGET;
}
Modified: portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/content/PortletImpl.java
===================================================================
--- portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/content/PortletImpl.java 2011-08-02 07:20:31 UTC (rev 6973)
+++ portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/content/PortletImpl.java 2011-08-02 09:59:15 UTC (rev 6974)
@@ -47,7 +47,7 @@
return "Application '" + getName() + "' @" + getId();
}
- public Type<Portlet, Content> getType()
+ public Type<Portlet> getType()
{
return Content.PORTLET;
}
Modified: portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/content/WSRPImpl.java
===================================================================
--- portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/content/WSRPImpl.java 2011-08-02 07:20:31 UTC (rev 6973)
+++ portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/content/WSRPImpl.java 2011-08-02 09:59:15 UTC (rev 6974)
@@ -38,7 +38,7 @@
super(id, application.getApplicationName(), gateIn);
}
- public Type<WSRP, Content> getType()
+ public Type<WSRP> getType()
{
return Content.WSRP;
}
Modified: portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/portal/SiteImpl.java
===================================================================
--- portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/portal/SiteImpl.java 2011-08-02 07:20:31 UTC (rev 6973)
+++ portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/portal/SiteImpl.java 2011-08-02 09:59:15 UTC (rev 6974)
@@ -33,6 +33,7 @@
import org.gatein.api.portal.Navigation;
import org.gatein.api.portal.Page;
import org.gatein.api.portal.Site;
+import org.gatein.api.util.GateInTypesResolver;
import org.gatein.api.util.HierarchicalContainer;
import org.gatein.api.util.Type;
import org.gatein.portal.api.impl.GateInImpl;
@@ -54,7 +55,7 @@
static Type getAPITypeFrom(OwnerKey key)
{
- return Type.forName(key.getType(), Site.class);
+ return GateInTypesResolver.forName(key.getType(), Site.class);
}
public HierarchicalContainer<String, Page> getPageRegistry()
Modified: portal/branches/api/component/api-impl/src/test/java/org/gatein/portal/api/impl/portal/SiteTestCase.java
===================================================================
--- portal/branches/api/component/api-impl/src/test/java/org/gatein/portal/api/impl/portal/SiteTestCase.java 2011-08-02 07:20:31 UTC (rev 6973)
+++ portal/branches/api/component/api-impl/src/test/java/org/gatein/portal/api/impl/portal/SiteTestCase.java 2011-08-02 09:59:15 UTC (rev 6974)
@@ -26,12 +26,21 @@
import org.exoplatform.portal.pom.data.PageKey;
import org.exoplatform.portal.pom.data.PortalKey;
import org.gatein.api.portal.Site;
+import org.gatein.api.util.GateInTypesResolver;
+import org.gatein.api.util.Type;
import org.testng.annotations.Test;
/** @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> */
public class SiteTestCase
{
@Test
+ public void checkThatTypesAreProperlyResolvedEvenIfClassIsNotLoaded()
+ {
+ Type portal = GateInTypesResolver.forName("portal", Site.class);
+ assert portal != null;
+ }
+
+ @Test
public void getAPITypeShouldProperlyResolve()
{
assert Site.DASHBOARD.equals(SiteImpl.getAPITypeFrom(new PageKey(SiteType.USER.getName(), "foo", "foo")));
13 years, 4 months
- 1
- 0
gatein SVN: r6973 - portal/branches/branch-GTNPORTAL-1963/docs/reference-guide/en-US/modules/PortalDevelopment.
by do-not-reply＠jboss.org
Author: ndkhoiits
Date: 2011-08-02 03:20:31 -0400 (Tue, 02 Aug 2011)
New Revision: 6973
Modified:
portal/branches/branch-GTNPORTAL-1963/docs/reference-guide/en-US/modules/PortalDevelopment/DefaultPortalNavigationConfiguration.xml
Log:
GTNPORTAL-1977 Update Reference Guide for initial Portal/Group/User configuration
Modified: portal/branches/branch-GTNPORTAL-1963/docs/reference-guide/en-US/modules/PortalDevelopment/DefaultPortalNavigationConfiguration.xml
===================================================================
--- portal/branches/branch-GTNPORTAL-1963/docs/reference-guide/en-US/modules/PortalDevelopment/DefaultPortalNavigationConfiguration.xml 2011-08-02 05:57:08 UTC (rev 6972)
+++ portal/branches/branch-GTNPORTAL-1963/docs/reference-guide/en-US/modules/PortalDevelopment/DefaultPortalNavigationConfiguration.xml 2011-08-02 07:20:31 UTC (rev 6973)
@@ -8,7 +8,7 @@
<section id="sect-Reference_Guide-Portal_Navigation_Configuration-Overview">
<title>Overview</title>
<para>
- There are three types of navigation available to portal users:
+ There are three navigation types available to portal users:
</para>
<itemizedlist>
<listitem>
@@ -28,134 +28,303 @@
</listitem>
</itemizedlist>
<para>
- These navigations are configured using standard XML syntax in the file; "<filename>02portal.war:/WEB-INF/conf/portal/portal-configuration.xml</filename>".
+ These navigations are configured using the standard XML syntax in the file; "<filename>02portal.war:/WEB-INF/conf/portal/portal-configuration.xml</filename>".
</para>
-<programlisting role="XML"><component>
- <key>org.exoplatform.portal.config.UserPortalConfigService</key>
- <type>org.exoplatform.portal.config.UserPortalConfigService</type>
- <component-plugins>
- <component-plugin>
- <name>new.portal.config.user.listener</name>
- <set-method>initListener</set-method>
- <type>org.exoplatform.portal.config.NewPortalConfigListener</type>
- <description>this listener init the portal configuration</description>
- <init-params>
- <value-param>
- <name>default.portal</name>
- <description>The default portal for checking db is empty or not</description>
- <value>classic</value>
- </value-param>
- <object-param>
- <name>portal.configuration</name>
- <description>description</description>
- <object type="org.exoplatform.portal.config.NewPortalConfig">
- <field name="predefinedOwner">
- <collection type="java.util.HashSet">
- <value><string>classic</string></value>
- <value><string>webos</string></value>
- </collection>
- </field>
- <field name="ownerType"><string>portal</string></field>
- <field name="templateLocation"><string>war:/conf/portal</string></field>
- </object>
- </object-param>
- <object-param>
- <name>group.configuration</name>
- <description>description</description>
- <object type="org.exoplatform.portal.config.NewPortalConfig">
- <field name="predefinedOwner">
- <collection type="java.util.HashSet">
- <value><string>platform/administrators</string></value>
- <value><string>platform/users</string></value>
- <value><string>platform/guests</string></value>
- <value><string>organization/management/executive-board</string></value>
- </collection>
- </field>
- <field name="ownerType"><string>group</string></field>
- <field name="templateLocation"><string>war:/conf/portal</string></field>
- </object>
- </object-param>
- <object-param>
- <name>user.configuration</name>
- <description>description</description>
- <object type="org.exoplatform.portal.config.NewPortalConfig">
- <field name="predefinedOwner">
- <collection type="java.util.HashSet">
- <value><string>root</string></value>
- <value><string>john</string></value>
- <value><string>mary</string></value>
- <value><string>demo</string></value>
- </collection>
- </field>
- <field name="ownerType"><string>user</string></field>
- <field name="templateLocation"><string>war:/conf/portal</string></field>
- </object>
- </object-param>
- </init-params>
- </component-plugin>
-</component-plugins>
+<programlisting role="XML"><![CDATA[<component>
+ <key>org.exoplatform.portal.config.UserPortalConfigService</key>
+ <type>org.exoplatform.portal.config.UserPortalConfigService</type>
+ <component-plugins>
+ <component-plugin>
+ <name>new.portal.config.user.listener</name>
+ <set-method>initListener</set-method>
+ <type>org.exoplatform.portal.config.NewPortalConfigListener
+ </type>
+ <description>this listener init the portal configuration
+ </description>
+ <init-params>
+ <value-param>
+ <name>default.portal</name>
+ <description>The default portal for checking db is empty or not</description>
+ <value>classic</value>
+ </value-param>
+ <value-param>
+ <name>page.templates.location</name>
+ <description>the path to the location that contains Page templates</description>
+ <value>war:/conf/portal/template/pages</value>
+ </value-param>
+ <value-param>
+ <name>override</name>
+ <description>The flag parameter to decide if portal metadata is overriden on restarting server
+ </description>
+ <value>false</value>
+ </value-param>
+ <object-param>
+ <name>site.templates.location</name>
+ <description>description</description>
+ <object type="org.exoplatform.portal.config.SiteConfigTemplates">
+ <field name="location">
+ <string>war:/conf/portal</string>
+ </field>
+ <field name="portalTemplates">
+ <collection type="java.util.HashSet">
+ <value><string>basic</string></value>
+ <value><string>classic</string></value>
+ </collection>
+ </field>
+ <field name="groupTemplates">
+ <collection type="java.util.HashSet">
+ <value><string>group</string></value>
+ </collection>
+ </field>
+ <field name="userTemplates">
+ <collection type="java.util.HashSet">
+ <value><string>user</string></value>
+ </collection>
+ </field>
+ </object>
+ </object-param>
+ <object-param>
+ <name>portal.configuration</name>
+ <description>description</description>
+ <object type="org.exoplatform.portal.config.NewPortalConfig">
+ <field name="predefinedOwner">
+ <collection type="java.util.HashSet">
+ <value><string>classic</string></value>
+ </collection>
+ </field>
+ <field name="ownerType">
+ <string>portal</string>
+ </field>
+ <field name="templateLocation">
+ <string>war:/conf/portal/</string>
+ </field>
+ <field name="importMode">
+ <string>conserve</string>
+ </field>
+ </object>
+ </object-param>
+ <object-param>
+ <name>group.configuration</name>
+ <description>description</description>
+ <object type="org.exoplatform.portal.config.NewPortalConfig">
+ <field name="predefinedOwner">
+ <collection type="java.util.HashSet">
+ <value><string>/platform/administrators</string></value>
+ <value><string>/platform/users</string></value>
+ <value><string>/platform/guests</string></value>
+ <value><string>/organization/management/executive-board</string></value>
+ </collection>
+ </field>
+ <field name="ownerType">
+ <string>group</string>
+ </field>
+ <field name="templateLocation">
+ <string>war:/conf/portal</string>
+ </field>
+ <field name="importMode">
+ <string>conserve</string>
+ </field>
+ </object>
+ </object-param>
+ <object-param>
+ <name>user.configuration</name>
+ <description>description</description>
+ <object type="org.exoplatform.portal.config.NewPortalConfig">
+ <field name="predefinedOwner">
+ <collection type="java.util.HashSet">
+ <value><string>root</string></value>
+ <value><string>john</string></value>
+ <value><string>mary</string></value>
+ <value><string>demo</string></value>
+ <value><string>user</string></value>
+ </collection>
+ </field>
+ <field name="ownerType">
+ <string>user</string>
+ </field>
+ <field name="templateLocation">
+ <string>war:/conf/portal</string>
+ </field>
+ <field name="importMode">
+ <string>conserve</string>
+ </field>
+ </object>
+ </object-param>
+ </init-params>
+ </component-plugin>
+ </component-plugins>
+</component>]]>
</programlisting>
- <para>
- This XML configuration defines where in the portal's war to look for configuration, and what portals, groups, and user specific views
- to include in portal/group/user navigation. Those files will be used to create an initial navigation, the first time the portal is launched.
- That information will then be stored in JCR content repository, and can then be modified, and managed from the portal UI.
- </para>
+<para>
+ This XML configuration defines where in the portal's war to look for configuration, and which portals, groups, and user specific views
+ to include in <literal>portal/group/user</literal> navigation. Those files will be used to create an initial navigation when the portal is launched in the first time.
+ That information will then be stored in the JCR content repository, and can then be modified and managed from the portal UI.
+ </para>
+
+<para>
+Each portal, groups and users navigation is indicated by a configuration paragraph, for example:
+
+<programlistingco>
+ <areaspec>
+ <area coords="5" id="area-Reference_Guide.Portalconf.predifinedOwner" />
+ <area coords="10" id="area-Reference_Guide.Portalconf.ownerType" />
+ <area coords="13" id="area-Reference_Guide.Portalconf.templateLocation" />
+ <area coords="16" id="area-Reference_Guide.Portalconf.importMode" />
+ </areaspec>
+<programlisting language="xml"><![CDATA[<object-param>
+ <name>portal.configuration</name>
+ <description>description</description>
+ <object type="org.exoplatform.portal.config.NewPortalConfig">
+ <field name="predefinedOwner">
+ <collection type="java.util.HashSet">
+ <value><string>classic</string></value>
+ </collection>
+ </field>
+ <field name="ownerType">
+ <string>portal</string>
+ </field>
+ <field name="templateLocation">
+ <string>war:/conf/portal/</string>
+ </field>
+ <field name="importMode">
+ <string>conserve</string>
+ </field>
+ </object>
+</object-param>]]>
+</programlisting>
+</programlistingco>
+
+<calloutlist>
+ <callout arearefs="area-Reference_Guide.Portalconf.predifinedOwner">
+ <para>
+ <emphasis> predefinedOwner</emphasis> define the navigation owner, portal will look for the configuration files in folder with this name, if there is no suiable folder, a default portal will be created with name is this value.
+ </para>
+ </callout>
+ <callout arearefs="area-Reference_Guide.Portalconf.ownerType">
+ <para>
+ <emphasis> ownerType</emphasis> define the type of portal navigation. It may be a portal, group or user
+ </para>
+ </callout>
+ <callout arearefs="area-Reference_Guide.Portalconf.templateLocation">
+ <para>
+ <emphasis> templateLocation</emphasis> the classpath where contains all portal configuration files
+ </para>
+ </callout>
+ <callout arearefs="area-Reference_Guide.Portalconf.importMode">
+ <para>
+ <emphasis> importMode</emphasis> The mode for navigation import. There are 4 types of import mode:
+ </para>
+ <itemizedlist>
+ <listitem>
+ <emphasis>conserve</emphasis>: Import data when it does not exist, otherwise do nothing.
+ </listitem>
+ <listitem>
+ <emphasis>insert</emphasis>: Import data when it does not exist, otherwise performs a strategy that adds new data only.
+ </listitem>
+ <listitem>
+ <emphasis>merge</emphasis>: Import data when it does not exist, update data when it exists.
+ </listitem>
+ <listitem>
+ <emphasis>rewrite</emphasis>: Overwrite data whatsoever.
+ </listitem>
+ </itemizedlist>
+ </callout>
+</calloutlist>
+ </para>
+
+ <para>
+Base on these parameters, portal will look for the configuration files and create a relevant portal navigation, pages and data import strategy. The portal configuration files will be stored in folders with path look like <literal>{templateLocation}/{ownerType}/{predefinedOwner}</literal>, all navigations are defined in the <literal>navigation.xml</literal> file, pages are defined in pages.xml and portal configuration is defined in <literal>{ownerType}.xml</literal>.
+For example, with the above configuration, prtal will look for all configuration files from <literal>war:/conf/portal/portal/classic path.</literal>
+ </para>
</section>
<section id="sect-Reference_Guide-Portal_Navigation_Configuration-Portal_Navigation">
<title>Portal Navigation</title>
<para>
- The portal navigation incorporates the pages that can be accessed even when a user is not logged in
- (assuming the applicable permissions allow public access). For example; several portal navigations are used
- when a company owns multiple trademarks, and sets up a web site for each of them.
+ The portal navigation incorporates the pages that can be accessed even when the user is not logged in assuming the applicable permissions allow the public access). For example, several portal navigations are used when a company owns multiple trademarks, and sets up a website for each of them.
</para>
<para>
- The <emphasis role="bold">classic</emphasis> portal is configured by four XML files in <filename>02portal.war:/WEB-INF/conf/portal/portal/classic</filename> directory:
+ The <emphasis role="bold">classic</emphasis> portal is configured by four XML files in the <filename>02portal.war:/WEB-INF/conf/portal/portal/classic</filename> directory:
</para>
<variablelist>
<varlistentry>
<term>portal.xml</term>
<listitem>
<para>
- This file describes the layout and portlets that will be shown on all pages. Usually the layout contains the banner, footer, menu and breadcrumbs portlets.
+ This file describes the layout and portlets that will be shown on all pages. The layout usually contains the banner, footer, menu and breadcrumbs portlets.
&PRODUCT; is extremely configurable as every view element (even the banner and footer) is a portlet.
</para>
-<programlisting role="XML"><?xml version="1.0" encoding="ISO-8859-1"?>
-<portal-config>
- <portal-name>classic</portal-name>
- <locale>en</locale>
- <factory-id>office</factory-id>
- <access-permissions>Everyone</access-permissions>
- <edit-permission>*:/platform/administrators</edit-permission>
- <creator>root</creator>
-
- <portal-layout>
- <application>
- <instance-id>portal#classic:/web/BannerPortlet/banner</instance-id>
- <show-info-bar>false</show-info-bar>
- </application>
- <application>
- <instance-id>portal#classic:/web/NavigationPortlet/toolbar</instance-id>
- <show-info-bar>false</show-info-bar>
- </application>
-
- <application>
- <instance-id>portal#classic:/web/BreadcumbsPortlet/breadcumbs</instance-id>
- <show-info-bar>false</show-info-bar>
- </application>
+<programlisting role="XML"><![CDATA[<portal-config
+ 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/gatein_objects_1_0"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0">
+ <portal-name>classic</portal-name>
+ <locale>en</locale>
+ <access-permissions>Everyone</access-permissions>
+ <edit-permission>*:/platform/administrators</edit-permission>
+ <properties>
+ <entry key="sessionAlive">onDemand</entry>
+ <entry key="showPortletInfo">1</entry>
+ </properties>
+
+ <portal-layout>
+ <portlet-application>
+ <portlet>
+ <application-ref>web</application-ref>
+ <portlet-ref>BannerPortlet</portlet-ref>
+ <preferences>
+ <preference>
+ <name>template</name>
+ <value>par:/groovy/groovy/webui/component/UIBannerPortlet.gtmpl</value>
+ <read-only>false</read-only>
+ </preference>
+ </preferences>
+ </portlet>
+ <access-permissions>Everyone</access-permissions>
+ <show-info-bar>false</show-info-bar>
+ </portlet-application>
+
+ <portlet-application>
+ <portlet>
+ <application-ref>web</application-ref>
+ <portlet-ref>NavigationPortlet</portlet-ref>
+ </portlet>
+ <access-permissions>Everyone</access-permissions>
+ <show-info-bar>false</show-info-bar>
+ </portlet-application>
+
+ <portlet-application>
+ <portlet>
+ <application-ref>web</application-ref>
+ <portlet-ref>BreadcumbsPortlet</portlet-ref>
+ </portlet>
+ <access-permissions>Everyone</access-permissions>
+ <show-info-bar>false</show-info-bar>
+ </portlet-application>
+
+ <page-body> </page-body>
+
+ <portlet-application>
+ <portlet>
+ <application-ref>web</application-ref>
+ <portlet-ref>FooterPortlet</portlet-ref>
+ <preferences>
+ <preference>
+ <name>template</name>
+ <value>par:/groovy/groovy/webui/component/UIFooterPortlet.gtmpl</value>
+ <read-only>false</read-only>
+ </preference>
+ </preferences>
+ </portlet>
+ <access-permissions>Everyone</access-permissions>
+ <show-info-bar>false</show-info-bar>
+ </portlet-application>
+
+ </portal-layout>
-
- <page-body> </page-body>
-
- <application>
- <instance-id>portal#classic:/web/FooterPortlet/footer</instance-id>
- <show-info-bar>false</show-info-bar>
- </application>
- </portal-layout>
-
-</portal-config>
+</portal-config>]]>
</programlisting>
<para>
It is also possible to apply a nested container that can also contain portlets. Row, column or tab containers are then responsible for the layout of their child portlets.
@@ -175,51 +344,43 @@
<term>navigation.xml</term>
<listitem>
<para>
- This file defines all the navigation nodes the portal will have. The syntax is simple, using nested node tags. Each node references a page defined in pages.xml file (explained next).
+ This file defines all the navigation nodes of the portal. The syntax is simple using the nested node tags. Each node refers to a page defined in the <literal>pages.xml</literal> file (explained next).
</para>
<para>
- When <literal>#{...}</literal> syntax is used, the enclosed property name serves as a key that is automatically passed to internationalization mechanism
- so the literal property name is replaced by a localized value taken from the associated properties file matching the current locale.
+ If the administrator want to create node labels for each language, they will have to use <literal>xml:lang</literal> attribute in the label tag with value of <literal>xml:lang</literal> is the relevant locale.
</para>
+ <para>
+ Otherwise, if they want the node label is localized by resource bundle files, the <literal>#{...}</literal> syntax will be used, the enclosed property name serves as a key that is automatically passed to the internationalization mechanism. Thus the literal property name is replaced by a localized value taken from the associated properties file matching the current locale.
+ <para>
+ For example:
+ </para>
+ </para>
-<programlisting role="XML">
- <![CDATA[
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<node-navigation
- 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/gatein_objects_1_0"
- xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0">
- <priority>1</priority>
- <page-nodes>
- <node>
- <uri>home</uri>
- <name>home</name>
- <label>#{portal.classic.home}</label>
- <page-reference>portal::classic::homepage</page-reference>
- </node>
- <node>
- <uri>sitemap</uri>
- <name>sitemap</name>
- <label>#{portal.classic.sitemap}</label>
- <visibility>DISPLAYED</visibility>
- <page-reference>portal::classic::sitemap</page-reference>
- </node>
- </page-nodes>
-</node-navigation>
-
- ]]>
+<programlisting role="XML"><![CDATA[<node-navigation
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_2 http://www.gatein.org/xml/ns/gatein_objects_1_2"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_2">
+ <priority>1</priority>
+ <page-nodes>
+ <node>
+ <name>home</name>
+ <label xml:lang="en">Home</label>
+ <page-reference>portal::classic::homepage</page-reference>
+ </node>
+ <node>
+ <name>sitemap</name>
+ <label xml:lang="en">SiteMap</label>
+ <visibility>DISPLAYED</visibility>
+ <page-reference>portal::classic::sitemap</page-reference>
+ </node>
+ ..........
+ </page-nodes>
+</node-navigation>]]>
</programlisting>
-
<para>
This navigation tree can have multiple views inside portlets (such as the breadcrumbs portlet) that render the current view node, the site map or the menu portlets.
</para>
- <warning>
- <para>
- For top nodes, the <emphasis role="bold">uri</emphasis> and the <emphasis role="bold">name</emphasis> of your navigation nodes must have the <emphasis>same</emphasis> value.
- For other nodes the <emphasis role="bold">uri</emphasis> is a relative path. For example, <emphasis><uri>contentmanagement/fileexplorer</uri></emphasis> where '<literal>contentmanagement</literal> ' is the name of the parent node and '<literal>fileexplorer</literal>' is the name of the node ( <emphasis><name>fileexplorer</name> </emphasis> ).
- </para>
- </warning>
</listitem>
</varlistentry>
<varlistentry>
@@ -230,428 +391,82 @@
Each application can decide whether to render the portlet border, the window state, the icons or portlet's mode.
</para>
-<programlisting role="XML">
- <![CDATA[
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<page-set
- 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/gatein_objects_1_0"
- xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0">
+<programlisting role="XML"><![CDATA[<page-set
+ 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/gatein_objects_1_0"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0">
- <page>
- <name>homepage</name>
- <title>Home Page</title>
- <access-permissions>Everyone</access-permissions>
- <edit-permission>*:/platform/administrators</edit-permission>
- <portlet-application>
- <portlet>
- <application-ref>web</application-ref>
- <portlet-ref>HomePagePortlet</portlet-ref>
- <preferences>
- <preference>
- <name>template</name>
- <value>system:/templates/groovy/webui/component/UIHomePagePortlet.gtmpl</value>
- <read-only>false</read-only>
- </preference>
- </preferences>
- </portlet>
- <title>Home Page portlet</title>
+ <page>
+ <name>homepage</name>
+ <title>Home Page</title>
<access-permissions>Everyone</access-permissions>
- <show-info-bar>false</show-info-bar>
- <show-application-state>false</show-application-state>
- <show-application-mode>false</show-application-mode>
- </portlet-application>
- </page>
- <page>
- <name>sitemap</name>
- <title>Site Map</title>
- <access-permissions>Everyone</access-permissions>
- <edit-permission>*:/platform/administrators</edit-permission>
- <portlet-application>
- <portlet>
- <application-ref>web</application-ref>
- <portlet-ref>SiteMapPortlet</portlet-ref>
- </portlet>
- <title>SiteMap</title>
+ <edit-permission>*:/platform/administrators</edit-permission>
+ <portlet-application>
+ <portlet>
+ <application-ref>web</application-ref>
+ <portlet-ref>HomePagePortlet</portlet-ref>
+ <preferences>
+ <preference>
+ <name>template</name>
+ <value>system:/templates/groovy/webui/component/UIHomePagePortlet.gtmpl</value>
+ <read-only>false</read-only>
+ </preference>
+ </preferences>
+ </portlet>
+ <title>Home Page portlet</title>
+ <access-permissions>Everyone</access-permissions>
+ <show-info-bar>false</show-info-bar>
+ <show-application-state>false</show-application-state>
+ <show-application-mode>false</show-application-mode>
+ </portlet-application>
+ </page>
+
+ <page>
+ <name>sitemap</name>
+ <title>Site Map</title>
<access-permissions>Everyone</access-permissions>
- <show-info-bar>false</show-info-bar>
- </portlet-application>
- </page>
-</page-set>
-]]>
+ <edit-permission>*:/platform/administrators</edit-permission>
+ <portlet-application>
+ <portlet>
+ <application-ref>web</application-ref>
+ <portlet-ref>SiteMapPortlet</portlet-ref>
+ </portlet>
+ <title>SiteMap</title>
+ <access-permissions>Everyone</access-permissions>
+ <show-info-bar>false</show-info-bar>
+ </portlet-application>
+ </page>
+ .......
+</page-set>]]>
</programlisting>
</listitem>
</varlistentry>
- <varlistentry>
- <term>portlet-preferences.xml</term>
- <listitem>
- <para>
- Porlet instances can be associated with <literal>portlet-preferences</literal> that override the ones defined in <filename>portlet.xml</filename> of the portlet application <literal>war</literal> (TODO: clarify which file in which war).
- </para>
-
-<programlisting role="XML"><?xml version="1.0" encoding="ISO-8859-1"?>
-<portlet-preferences-set>
- <portlet-preferences>
- <owner-type>portal</owner-type>
- <owner-id>classic</owner-id>
- <window-id>portal#classic:/web/BannerPortlet/banner</window-id>
- <preference>
- <name>template</name>
- <value>par:/groovy/groovy/webui/component/UIBannerPortlet.gtmpl</value>
- <read-only>false</read-only>
- </preference>
- </portlet-preferences>
- <portlet-preferences>
- <owner-type>portal</owner-type>
- <owner-id>classic</owner-id>
- <window-id>portal#classic:/web/NavigationPortlet/toolbar</window-id>
- <preference>
- <name>useAJAX</name>
- <value>true</value>
- <read-only>false</read-only>
- </preference>
- </portlet-preferences>
- <portlet-preferences>
- <owner-type>portal</owner-type>
- <owner-id>classic</owner-id>
- <window-id>portal#classic:/web/FooterPortlet/footer</window-id>
- <preference>
- <name>template</name>
- <value>par:/groovy/groovy/webui/component/UIFooterPortlet.gtmpl</value>
- <read-only>false</read-only>
- </preference>
- </portlet-preferences>
-
-
- <portlet-preferences>
- <owner-type>portal</owner-type>
- <owner-id>classic</owner-id>
- <window-id>portal#classic:/web/GroovyPortlet/groovyportlet</window-id>
- <preference>
- <name>template</name>
- <value>par:/groovy/groovy/webui/component/UIGroovyPortlet.gtmpl</value>
- <read-only>false</read-only>
- </preference>
- </portlet-preferences>
-</portlet-preferences-set>
-</programlisting>
- </listitem>
- </varlistentry>
</variablelist>
</section>
- <!-- <section id="sect-Reference_Guide-Portal_Navigation_Configuration-Portal.xml">
- <title>Portal.xml</title>
- <para>
- That file describes the layout and portlets that will be shown for all pages. Usually the layout contains the banner, footer, menu, breadcrumbs portlets. Indeed, in GateIn, every area is a portlet even the banner and footer which makes the platform extremely configurable.
- </para>
-
-<programlisting role="XML"><?xml version="1.0" encoding="ISO-8859-1"?>
-<portal-config>
- <portal-name>classic</portal-name>
- <locale>en</locale>
- <factory-id>office</factory-id>
- <access-permissions>Everyone</access-permissions>
- <edit-permission>*:/platform/administrators</edit-permission>
- <creator>root</creator>
-
- <portal-layout>
- <application>
- <instance-id>portal#classic:/web/BannerPortlet/banner</instance-id>
- <show-info-bar>false</show-info-bar>
- </application>
- <application>
- <instance-id>portal#classic:/web/NavigationPortlet/toolbar</instance-id>
- <show-info-bar>false</show-info-bar>
- </application>
-
- <application>
- <instance-id>portal#classic:/web/BreadcumbsPortlet/breadcumbs</instance-id>
- <show-info-bar>false</show-info-bar>
- </application>
-
-
- <page-body> </page-body>
-
- <application>
- <instance-id>portal#classic:/web/FooterPortlet/footer</instance-id>
- <show-info-bar>false</show-info-bar>
- </application>
- </portal-layout>
-
-</portal-config>
-</programlisting>
- <para>
- Even if not shown in the previous XML file, it is also possible to apply a nested container that can also contain portlets. Containers are then responsible of the layout of their children (row, column or tabs containers exist).
- </para>
- <para>
- Each application references a portlet using the id portal#{portalName}:/{portletWarName}/{portletName}/{uniqueId}
- </para>
- <para>
- In order to define at which location GateIn Portal shall render the current page use the page-body tag.
- </para>
- <para>
- The defined classic portal is accessible to "Everyone" (that means it can be accessed through the URL /portal/public/classic) but only members of the group /platform/administrators can edit it.
- </para>
- </section>
-
- <section id="sect-Reference_Guide-Portal_Navigation_Configuration-Navigation.xml">
- <title>Navigation.xml</title>
- <para>
- This file defines all the navigation nodes the portal will have. The syntax is simple as we get nested node tags. Each node references a page that is defined in the next XML file.
- </para>
- <para>
- If the label #{} is used then it means the i18n mechanism is activated and that the real label to render is taken from an associated properties file for the current locale.
- </para>
-
-<programlisting role="XML"><?xml version="1.0" encoding="UTF-8"?>
-<node-navigation>
- <owner-type>portal</owner-type>
- <owner-id>classic</owner-id>
- <priority>1</priority>
- <page-nodes>
- <node>
- <uri>home</uri>
- <name>home</name>
- <label>#{portal.classic.home}</label>
- <page-reference>portal::classic::homepage</page-reference>
- </node>
- <node>
- <uri>webexplorer</uri>
- <name>webexplorer</name>
- <label>#{portal.classic.webexplorer}</label>
- <page-reference>portal::classic::webexplorer</page-reference>
- </node>
- </page-nodes>
-</node-navigation>
-</programlisting>
- <para>
- This navigation tree can have multiple views inside portlets such as the breadcrumbs that render the current view node, the site map or the menu portlets.
- </para>
- <warning>
- <para>
- For top nodes, the <emphasis role="bold">uri</emphasis> and the <emphasis role="bold">name</emphasis> of your navigation nodes must have the <emphasis role="bold">same</emphasis> value. For the other nodes the uri is composed like <emphasis><uri>contentmanagement/fileexplorer</uri></emphasis> where 'contentmanagement' is the name of the parent node and 'fileexplorer' the name of the node ( <emphasis><name>fileexplorer</name> </emphasis> ).
- </para>
- </warning>
- </section>
-
- <section id="sect-Reference_Guide-Portal_Navigation_Configuration-Pages.xml">
- <title>Pages.xml</title>
- <para>
- This XML file structure is very similar to portal.xml and it can also contain container tags. Each application can decide if it wishes to render the portlet border, the window state icons or the mode.
- </para>
-
-<programlisting role="XML"><?xml version="1.0" encoding="ISO-8859-1"?>
-<page-set>
- <page>
- <page-id>portal::classic::homepage</page-id>
- <owner-type>portal</owner-type>
- <owner-id>classic</owner-id>
- <name>homepage</name>
- <title>Home Page</title>
- <access-permissions>Everyone</access-permissions>
- <edit-permission>*:/platform/administrators</edit-permission>
- <application>
- <instance-id>portal#classic:/web/HomePagePortlet/homepageportlet</instance-id>
- <title>Home Page portlet</title>
- <show-info-bar>false</show-info-bar>
- <show-application-state>false</show-application-state>
- <show-application-mode>false</show-application-mode>
- </application>
- </page>
-
- <page>
- <page-id>portal::classic::webexplorer</page-id>
- <owner-type>portal</owner-type>
- <owner-id>classic</owner-id>
- <name>webexplorer</name>
- <title>Web Explorer</title>
- <access-permissions>*:/platform/users</access-permissions>
- <edit-permission>*:/platform/administrators</edit-permission>
- <application>
- <instance-id>group#platform/users:/web/BrowserPortlet/WebExplorer</instance-id>
- <title>Web Explorer</title>
- <show-info-bar>false</show-info-bar>
- </application>
- </page>
-</page-set>
-</programlisting>
- </section>
-
- <section id="sect-Reference_Guide-Portal_Navigation_Configuration-Portlet_preferences.xml">
- <title>Portlet-preferences.xml</title>
- <para>
- Porlet instances can be associated with portlet-preferences that override the one defined in the usual portlet.xml file of the portlet application WAR.
- </para>
-
-<programlisting role="XML"><?xml version="1.0" encoding="ISO-8859-1"?>
-<portlet-preferences-set>
- <portlet-preferences>
- <owner-type>portal</owner-type>
- <owner-id>classic</owner-id>
- <window-id>portal#classic:/web/BannerPortlet/banner</window-id>
- <preference>
- <name>template</name>
- <value>par:/groovy/groovy/webui/component/UIBannerPortlet.gtmpl</value>
- <read-only>false</read-only>
- </preference>
- </portlet-preferences>
- <portlet-preferences>
- <owner-type>portal</owner-type>
- <owner-id>classic</owner-id>
- <window-id>portal#classic:/web/NavigationPortlet/toolbar</window-id>
- <preference>
- <name>useAJAX</name>
- <value>true</value>
- <read-only>false</read-only>
- </preference>
- </portlet-preferences>
- <portlet-preferences>
- <owner-type>portal</owner-type>
- <owner-id>classic</owner-id>
- <window-id>portal#classic:/web/FooterPortlet/footer</window-id>
- <preference>
- <name>template</name>
- <value>par:/groovy/groovy/webui/component/UIFooterPortlet.gtmpl</value>
- <read-only>false</read-only>
- </preference>
- </portlet-preferences>
-
-
- <portlet-preferences>
- <owner-type>portal</owner-type>
- <owner-id>classic</owner-id>
- <window-id>portal#classic:/web/GroovyPortlet/groovyportlet</window-id>
- <preference>
- <name>template</name>
- <value>par:/groovy/groovy/webui/component/UIGroovyPortlet.gtmpl</value>
- <read-only>false</read-only>
- </preference>
- </portlet-preferences>
-</portlet-preferences-set>
-</programlisting>
- </section> -->
<section id="sect-Reference_Guide-Portal_Navigation_Configuration-Group_Navigation">
<title>Group Navigation</title>
<para>
- Group navigations are dynamically added to the user navigation at login. This allows users to see in the menu all the pages assigned to any groups they belong to.
+ Group navigations are dynamically added to the user navigation at login. This allows users to see the menu of all pages assigned to any groups they belong to.
</para>
<para>
The group navigation menu is configured by three XML files (<filename>navigation.xml</filename>, <filename>pages.xml</filename> and <filename>portlet-preferences.xml</filename>). The syntax used in these files is the same as those covered in <xref linkend="sect-Reference_Guide-Portal_Navigation_Configuration-Portal_Navigation" />.
</para>
<para>
- They are located in <filename>portal.war/WEB-INF/conf/portal/group<replaceable>/group-name-path/</replaceable></filename> directory (For example; <filename>portal.war/WEB-INF/conf/portal/group/platform/administrators/</filename>).
+ They are also located in the <filename>{templateLocation}/{ownerType}/{predefinedOwner}</filename> directory with <literal>ownerType</literal> is <literal>group</literal> and <literal>predefinedOwner</literal> is the path to the group. For example, <filename>portal.war/WEB-INF/conf/portal/group/platform/administrators/</filename>.
</para>
</section>
<section id="sect-Reference_Guide-Portal_Navigation_Configuration-User_Navigation">
<title>User Navigation</title>
<para>
- User navigation is the set of nodes and pages that are owned by a user. They are part of the user's dashboard.
+ User navigation is the set of nodes and pages that are owned by the user. They are part of the user's dashboard.
</para>
<para>
- Three files configure the user navigation (<filename>navigation.xml</filename>, <filename>pages.xml</filename> and <filename>portlet-preferences.xml</filename>). They are located in the directory "<filename>portal.war/WEB-INF/conf/portal/users/{userName}</filename>".
+ Three files configure the user navigation (<filename>navigation.xml</filename>, <filename>pages.xml</filename> and <filename>portlet-preferences.xml</filename>). They are located in the <filename>{templateLocation}/{ownerType}/{predefinedOwner}</filename> directory with <literal>ownerType</literal> is <literal>user</literal> and <literal>predefinedOwner</literal> is username that want to create the navigation. For example, if administrator want to create navigation for user <literal>root</literal>, he has to locate the configuration files in <filename>portal.war/WEB-INF/conf/portal/user/root </filename>
</para>
- <para>
- This directory also contains a <filename>gadgets.xml</filename> file (formerly called <filename>widgets.xml</filename>). This file defines the gadgets located in the user's workspace.
- </para>
- <para>
- The user's workspace is located at the left hand side of the page and access is restricted to some privileged users, see <xref linkend="sect-Reference_Guide-Predefined_User_Configuration" />
- </para>
-
-<programlisting role="XML"><?xml version="1.0" encoding="ISO-8859-1"?>
-<widgets>
- <owner-type>user</owner-type>
- <owner-id>root</owner-id>
-
- <container id="Information">
- <name>Information</name>
- <description>Information's Description</description>
- <application>
- <instance-id>user#root:/GateInWidgetWeb/WelcomeWidget/WelcomeWidget1</instance-id>
- <application-type>GateInWidget</application-type>
- </application>
-
- <application>
- <instance-id>user#root:/GateInWidgetWeb/StickerWidget/StickerWidget</instance-id>
- <application-type>GateInWidget</application-type>
- </application>
-
- <application>
- <instance-id>user#root:/GateInWidgetWeb/InfoWidget/InfoWidget1</instance-id>
- <application-type>GateInWidget</application-type>
- </application>
- </container>
-
- <container id="Calendar">
- <name>Calendar</name>
- <description>Calendar's Description</description>
- <application>
- <instance-id>user#root:/GateInWidgetWeb/CalendarWidget/CalendarWidget</instance-id>
- <application-type>GateInWidget</application-type>
- </application>
- </container>
-
-</widgets>
-</programlisting>
- <!-- <para>
- Note that when you develop a portal, we advise you to use the XML instead of the User Interface as XML will allow you to provide a preconfigured package to your customer. But as each time you start the server the first time, the XML files are stored in the JCR, it will be necessary to remove the database (the jcr leverages a database). During the development phase using tomcat it simply means to delete the directory: exo-tomcat/temp
- </para> -->
</section>
-
- <section id="sect-Reference_Guide-Portal_Navigation_Configuration-Tips">
- <title>Tips</title>
- <section id="sect-Reference_Guide-Tips-Direct_External_Links">
- <title>Direct External Links</title>
- <para>
- If you wish to add a link to a URL outside the portal you first have to define a "page" that will only serve as a navigation placeholder for external redirect - it will not be used for any portlets.
- Then add the URL to the navigation. (TODO: check for correctness)
- </para>
- <variablelist>
- <varlistentry>
- <term>pages.xml</term>
- <listitem>
- <para>
-
-<programlisting><page>
- <owner-type>portal</owner-type>
- <owner-id>website</owner-id>
- <name>documentation</name>
- <title>Documentation</title>
- <access-permissions>Everyone</access-permissions>
- <edit-permission>*:/platform/administrators</edit-permission>
-</page>
-</programlisting>
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>navigation.xml</term>
- <listitem>
- <para>
-
-<programlisting><node>
- <uri>http://wiki.exoplatform.com/xwiki/bin/view/Main/WebHome</uri>
- <name>documentation</name>
- <label>#{portal.classic.documentation}</label>
- <page-reference>portal::website::documentation</page-reference>
-</node>
-</programlisting>
- </para>
- </listitem>
- </varlistentry>
- </variablelist>
- <warning>
- <title>Direct external links were not a design goal</title>
- <para>
- Currently you cannot modify the URL using the portal interface, you must change it in the configuration files or modify the underlying database table.
- </para>
- </warning>
- </section>
-
- </section>
-
</section>
13 years, 4 months
- 1
- 0
gatein SVN: r6972 - in epp/portal/branches/EPP_5_1_Branch/component/common/src/main/java/conf/jcr/jbosscache: cluster and 1 other directories.
by do-not-reply＠jboss.org
Author: hfnukal
Date: 2011-08-02 01:57:08 -0400 (Tue, 02 Aug 2011)
New Revision: 6972
Added:
epp/portal/branches/EPP_5_1_Branch/component/common/src/main/java/conf/jcr/jbosscache/cluster/
epp/portal/branches/EPP_5_1_Branch/component/common/src/main/java/conf/jcr/jbosscache/cluster/config.xml
epp/portal/branches/EPP_5_1_Branch/component/common/src/main/java/conf/jcr/jbosscache/cluster/indexer-config.xml
epp/portal/branches/EPP_5_1_Branch/component/common/src/main/java/conf/jcr/jbosscache/cluster/lock-config.xml
epp/portal/branches/EPP_5_1_Branch/component/common/src/main/java/conf/jcr/jbosscache/cluster/udp-mux.xml
epp/portal/branches/EPP_5_1_Branch/component/common/src/main/java/conf/jcr/jbosscache/local/lock-config.xml
Removed:
epp/portal/branches/EPP_5_1_Branch/component/common/src/main/java/conf/jcr/jbosscache/local/config.xml
Log:
JBEPP-987 EPP 5.1.1.DEV02 fails to start against existing DB schema
Added: epp/portal/branches/EPP_5_1_Branch/component/common/src/main/java/conf/jcr/jbosscache/cluster/config.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/component/common/src/main/java/conf/jcr/jbosscache/cluster/config.xml (rev 0)
+++ epp/portal/branches/EPP_5_1_Branch/component/common/src/main/java/conf/jcr/jbosscache/cluster/config.xml 2011-08-02 05:57:08 UTC (rev 6972)
@@ -0,0 +1,40 @@
+<!--
+ ~ 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.
+ -->
+
+<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:jbosscache-core:config:3.1">
+
+ <locking useLockStriping="false" concurrencyLevel="64" lockParentForChildInsertRemove="false"
+ lockAcquisitionTimeout="20000" />
+
+ <clustering mode="replication" clusterName="${jboss.partition.name:DefaultPartition}-${jbosscache-cluster-name}">
+ <stateRetrieval timeout="20000" fetchInMemoryState="false" />
+ <jgroupsConfig multiplexerStack="jcr.stack" />
+ <sync />
+ </clustering>
+
+ <!-- Eviction configuration -->
+ <eviction wakeUpInterval="5000">
+ <default algorithmClass="org.jboss.cache.eviction.LRUAlgorithm"
+ actionPolicyClass="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.ParentNodeEvictionActionPolicy"
+ eventQueueSize="1000000">
+ <property name="maxNodes" value="5000" />
+ <property name="timeToLive" value="20000" />
+ </default>
+ </eviction>
+</jbosscache>
\ No newline at end of file
Added: epp/portal/branches/EPP_5_1_Branch/component/common/src/main/java/conf/jcr/jbosscache/cluster/indexer-config.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/component/common/src/main/java/conf/jcr/jbosscache/cluster/indexer-config.xml (rev 0)
+++ epp/portal/branches/EPP_5_1_Branch/component/common/src/main/java/conf/jcr/jbosscache/cluster/indexer-config.xml 2011-08-02 05:57:08 UTC (rev 6972)
@@ -0,0 +1,40 @@
+<!--
+ ~ 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.
+ -->
+<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:jbosscache-core:config:3.1">
+
+ <locking useLockStriping="false" concurrencyLevel="64" lockParentForChildInsertRemove="false"
+ lockAcquisitionTimeout="20000" />
+
+ <!-- Configure the TransactionManager -->
+ <transaction transactionManagerLookupClass="org.jboss.cache.transaction.JBossStandaloneJTAManagerLookup" />
+
+ <clustering mode="replication" clusterName="${jboss.partition.name:DefaultPartition}-${jbosscache-cluster-name}">
+ <stateRetrieval timeout="20000" fetchInMemoryState="false" />
+ <jgroupsConfig multiplexerStack="jcr.stack" />
+ <sync />
+ </clustering>
+ <!-- Eviction configuration -->
+ <eviction wakeUpInterval="5000">
+ <default algorithmClass="org.jboss.cache.eviction.FIFOAlgorithm" eventQueueSize="1000000">
+ <property name="maxNodes" value="5000" />
+ <property name="minTimeToLive" value="20000" />
+ </default>
+ </eviction>
+
+</jbosscache>
Added: epp/portal/branches/EPP_5_1_Branch/component/common/src/main/java/conf/jcr/jbosscache/cluster/lock-config.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/component/common/src/main/java/conf/jcr/jbosscache/cluster/lock-config.xml (rev 0)
+++ epp/portal/branches/EPP_5_1_Branch/component/common/src/main/java/conf/jcr/jbosscache/cluster/lock-config.xml 2011-08-02 05:57:08 UTC (rev 6972)
@@ -0,0 +1,50 @@
+<!--
+ ~ 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.
+ -->
+
+<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:jbosscache-core:config:3.1">
+
+ <locking useLockStriping="false" concurrencyLevel="64" lockParentForChildInsertRemove="false" lockAcquisitionTimeout="20000" />
+
+ <clustering mode="replication" clusterName="${jboss.partition.name:DefaultPartition}-${jbosscache-cluster-name}">
+ <stateRetrieval timeout="20000" fetchInMemoryState="false" />
+ <jgroupsConfig multiplexerStack="jcr.stack" />
+ <sync />
+ </clustering>
+
+ <loaders passivation="false" shared="true">
+ <preload>
+ <node fqn="/" />
+ </preload>
+ <loader class="org.jboss.cache.loader.JDBCCacheLoader" async="false" fetchPersistentState="false"
+ ignoreModifications="false" purgeOnStartup="false">
+ <properties>
+ cache.jdbc.table.name=${jbosscache-cl-cache.jdbc.table.name}
+ cache.jdbc.table.create=${jbosscache-cl-cache.jdbc.table.create}
+ cache.jdbc.table.drop=${jbosscache-cl-cache.jdbc.table.drop}
+ cache.jdbc.table.primarykey=${jbosscache-cl-cache.jdbc.table.primarykey}
+ cache.jdbc.fqn.column=${jbosscache-cl-cache.jdbc.fqn.column}
+ cache.jdbc.fqn.type=${jbosscache-cl-cache.jdbc.fqn.type}
+ cache.jdbc.node.column=${jbosscache-cl-cache.jdbc.node.column}
+ cache.jdbc.node.type=${jbosscache-cl-cache.jdbc.node.type}
+ cache.jdbc.parent.column=${jbosscache-cl-cache.jdbc.parent.column}
+ cache.jdbc.datasource=${jbosscache-cl-cache.jdbc.datasource}
+ </properties>
+ </loader>
+ </loaders>
+</jbosscache>
Added: epp/portal/branches/EPP_5_1_Branch/component/common/src/main/java/conf/jcr/jbosscache/cluster/udp-mux.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/component/common/src/main/java/conf/jcr/jbosscache/cluster/udp-mux.xml (rev 0)
+++ epp/portal/branches/EPP_5_1_Branch/component/common/src/main/java/conf/jcr/jbosscache/cluster/udp-mux.xml 2011-08-02 05:57:08 UTC (rev 6972)
@@ -0,0 +1,51 @@
+<!--
+ ~ Copyright (C) 2009 eXo Platform SAS.
+ ~
+ ~ This is free software; you can redistribute it and/or modify it
+ ~ under the terms of the GNU Lesser General Public License as
+ ~ published by the Free Software Foundation; either version 2.1 of
+ ~ the License, or (at your option) any later version.
+ ~
+ ~ This software is distributed in the hope that it will be useful,
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ ~ Lesser General Public License for more details.
+ ~
+ ~ You should have received a copy of the GNU Lesser General Public
+ ~ License along with this software; if not, write to the Free
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ -->
+<protocol_stacks>
+ <stack name="jcr.stack">
+ <config>
+ <UDP mcast_addr="${jboss.jgroups.udp_async.mcast_addr:228.10.10.10}" mcast_port="${jboss.jgroups.udp_async.mcast_port:45588}" tos="8" ucast_recv_buf_size="20000000"
+ ucast_send_buf_size="640000" mcast_recv_buf_size="25000000" mcast_send_buf_size="640000" loopback="false"
+ discard_incompatible_packets="true" max_bundle_size="64000" max_bundle_timeout="30"
+ use_incoming_packet_handler="true" ip_ttl="2" enable_bundling="true" enable_diagnostics="true"
+ thread_naming_pattern="cl" use_concurrent_stack="true" thread_pool.enabled="true" thread_pool.min_threads="2"
+ thread_pool.max_threads="8" thread_pool.keep_alive_time="5000" thread_pool.queue_enabled="true"
+ thread_pool.queue_max_size="1000" thread_pool.rejection_policy="discard" oob_thread_pool.enabled="true"
+ oob_thread_pool.min_threads="1" oob_thread_pool.max_threads="8" oob_thread_pool.keep_alive_time="5000"
+ oob_thread_pool.queue_enabled="false" oob_thread_pool.queue_max_size="100" oob_thread_pool.rejection_policy="Run" />
+
+ <PING timeout="2000" num_initial_members="3" />
+ <MERGE2 max_interval="30000" min_interval="10000" />
+ <FD_SOCK />
+ <FD timeout="10000" max_tries="5" shun="true" />
+ <VERIFY_SUSPECT timeout="1500" />
+ <BARRIER />
+ <pbcast.NAKACK use_stats_for_retransmission="false" exponential_backoff="150" use_mcast_xmit="true"
+ gc_lag="0" retransmit_timeout="50,300,600,1200" discard_delivered_msgs="true" />
+ <UNICAST timeout="300,600,1200" />
+ <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000" max_bytes="1000000" />
+ <VIEW_SYNC avg_send_interval="60000" />
+ <pbcast.GMS print_local_addr="true" join_timeout="3000" shun="false" view_bundling="true" />
+ <FC max_credits="500000" min_threshold="0.20" />
+ <FRAG2 frag_size="60000" />
+ <!--pbcast.STREAMING_STATE_TRANSFER /-->
+ <pbcast.STATE_TRANSFER />
+ <!-- pbcast.FLUSH /-->
+ </config>
+ </stack>
+</protocol_stacks>
\ No newline at end of file
Deleted: epp/portal/branches/EPP_5_1_Branch/component/common/src/main/java/conf/jcr/jbosscache/local/config.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/component/common/src/main/java/conf/jcr/jbosscache/local/config.xml 2011-08-02 05:55:47 UTC (rev 6971)
+++ epp/portal/branches/EPP_5_1_Branch/component/common/src/main/java/conf/jcr/jbosscache/local/config.xml 2011-08-02 05:57:08 UTC (rev 6972)
@@ -1,22 +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.
- -->
-
-<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:jbosscache-core:config:3.1">
-
-</jbosscache>
\ No newline at end of file
Added: epp/portal/branches/EPP_5_1_Branch/component/common/src/main/java/conf/jcr/jbosscache/local/lock-config.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/component/common/src/main/java/conf/jcr/jbosscache/local/lock-config.xml (rev 0)
+++ epp/portal/branches/EPP_5_1_Branch/component/common/src/main/java/conf/jcr/jbosscache/local/lock-config.xml 2011-08-02 05:57:08 UTC (rev 6972)
@@ -0,0 +1,43 @@
+<!--
+ ~ 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.
+ -->
+<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:jbosscache-core:config:3.1">
+
+ <locking useLockStriping="false" concurrencyLevel="64" lockParentForChildInsertRemove="false" lockAcquisitionTimeout="20000" />
+
+ <loaders passivation="false" shared="true">
+ <preload>
+ <node fqn="/" />
+ </preload>
+ <loader class="org.jboss.cache.loader.JDBCCacheLoader" async="false" fetchPersistentState="false"
+ ignoreModifications="false" purgeOnStartup="false">
+ <properties>
+ cache.jdbc.table.name=${jbosscache-cl-cache.jdbc.table.name}
+ cache.jdbc.table.create=${jbosscache-cl-cache.jdbc.table.create}
+ cache.jdbc.table.drop=${jbosscache-cl-cache.jdbc.table.drop}
+ cache.jdbc.table.primarykey=${jbosscache-cl-cache.jdbc.table.primarykey}
+ cache.jdbc.fqn.column=${jbosscache-cl-cache.jdbc.fqn.column}
+ cache.jdbc.fqn.type=${jbosscache-cl-cache.jdbc.fqn.type}
+ cache.jdbc.node.column=${jbosscache-cl-cache.jdbc.node.column}
+ cache.jdbc.node.type=${jbosscache-cl-cache.jdbc.node.type}
+ cache.jdbc.parent.column=${jbosscache-cl-cache.jdbc.parent.column}
+ cache.jdbc.datasource=${jbosscache-cl-cache.jdbc.datasource}
+ </properties>
+ </loader>
+ </loaders>
+</jbosscache>
13 years, 4 months
- 1
- 0
gatein SVN: r6971 - epp/portal/branches/EPP_5_1_Branch/web/portal/src/main/webapp/groovy/webui/core.
by do-not-reply＠jboss.org
Author: hfnukal
Date: 2011-08-02 01:55:47 -0400 (Tue, 02 Aug 2011)
New Revision: 6971
Modified:
epp/portal/branches/EPP_5_1_Branch/web/portal/src/main/webapp/groovy/webui/core/UIRepeater.gtmpl
Log:
JBEPP-365 PageManagement
Modified: epp/portal/branches/EPP_5_1_Branch/web/portal/src/main/webapp/groovy/webui/core/UIRepeater.gtmpl
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/web/portal/src/main/webapp/groovy/webui/core/UIRepeater.gtmpl 2011-08-02 05:53:57 UTC (rev 6970)
+++ epp/portal/branches/EPP_5_1_Branch/web/portal/src/main/webapp/groovy/webui/core/UIRepeater.gtmpl 2011-08-02 05:55:47 UTC (rev 6971)
@@ -13,6 +13,7 @@
UIForm uiForm = uicomponent.getAncestorOfType(UIForm.class);
DateFormat dateFormat = null;
+ EntityEncoder entityEncoder = EntityEncoder.FULL;
%>
<div id="$uicomponent.id">
<table class="UIGrid" cellspacing="0">
@@ -56,8 +57,11 @@
if(dateFormat == null) dateFormat = new SimpleDateFormat("HH:mm:ss yyyy-MM-dd");
cssClass = "Datetime" ;
fieldValue = dateFormat.format(fieldValue);
- }
- else cssClass = "Text" ;
+ }
+ else {
+ cssClass = "Text" ;
+ fieldValue = entityEncoder.encode(fieldValue.toString());
+ }
} else {
fieldValue = "";
}
13 years, 4 months
- 1
- 0
gatein SVN: r6970 - in epp/portal/branches/EPP_5_1_Branch: webui/core/src/main/java/org/exoplatform/webui/form and 1 other directory.
by do-not-reply＠jboss.org
Author: hfnukal
Date: 2011-08-02 01:53:57 -0400 (Tue, 02 Aug 2011)
New Revision: 6970
Modified:
epp/portal/branches/EPP_5_1_Branch/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIGadgetEditor.java
epp/portal/branches/EPP_5_1_Branch/webui/core/src/main/java/org/exoplatform/webui/form/UIFormTextAreaInput.java
Log:
JBEPP-1023 JBEPP-1028 Remove EntityEncoder
Modified: epp/portal/branches/EPP_5_1_Branch/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIGadgetEditor.java
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIGadgetEditor.java 2011-08-02 05:52:00 UTC (rev 6969)
+++ epp/portal/branches/EPP_5_1_Branch/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIGadgetEditor.java 2011-08-02 05:53:57 UTC (rev 6970)
@@ -123,6 +123,8 @@
UIFormStringInput uiInputName = getUIStringInput(FIELD_NAME);
String encoded = StringEscapeUtils.escapeHtml(StringEscapeUtils.unescapeHtml(uiInputSource.getValue()));
uiInputSource.setValue(encoded);
+ //uiInputSource.setValue(uiInputSource.getValue());
+
if(this.isEdit()) {
uiInputName.setEditable(false);
}
Modified: epp/portal/branches/EPP_5_1_Branch/webui/core/src/main/java/org/exoplatform/webui/form/UIFormTextAreaInput.java
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/webui/core/src/main/java/org/exoplatform/webui/form/UIFormTextAreaInput.java 2011-08-02 05:52:00 UTC (rev 6969)
+++ epp/portal/branches/EPP_5_1_Branch/webui/core/src/main/java/org/exoplatform/webui/form/UIFormTextAreaInput.java 2011-08-02 05:53:57 UTC (rev 6970)
@@ -21,8 +21,6 @@
import org.exoplatform.webui.application.WebuiRequestContext;
import org.exoplatform.commons.serialization.api.annotations.Serialized;
-import org.gatein.common.text.EntityEncoder;
-
import java.io.Writer;
/**
@@ -42,11 +40,6 @@
*/
private int columns = 30;
- /**
- * HTML Entity Encoder
- */
- private EntityEncoder entityEncoder = EntityEncoder.FULL;
-
public UIFormTextAreaInput()
{
}
@@ -78,7 +71,9 @@
w.append(" cols=\"").append(String.valueOf(columns)).append("\"");
w.write(">");
if (value != null)
- w.write(entityEncoder.encode(value));
+ //TODO: remove from other components and than encode here
+ //w.write(org.gatein.common.text.EntityEncoder.FULL.encode(value));
+ w.write(value);
w.write("</textarea>");
if (this.isMandatory())
w.write(" *");
13 years, 4 months
- 1
- 0
gatein SVN: r6969 - in epp/portal/branches/EPP_5_1_Branch: component and 85 other directories.
by do-not-reply＠jboss.org
Author: hfnukal
Date: 2011-08-02 01:52:00 -0400 (Tue, 02 Aug 2011)
New Revision: 6969
Modified:
epp/portal/branches/EPP_5_1_Branch/component/application-registry/pom.xml
epp/portal/branches/EPP_5_1_Branch/component/common/pom.xml
epp/portal/branches/EPP_5_1_Branch/component/identity/pom.xml
epp/portal/branches/EPP_5_1_Branch/component/management/pom.xml
epp/portal/branches/EPP_5_1_Branch/component/pc/pom.xml
epp/portal/branches/EPP_5_1_Branch/component/pom.xml
epp/portal/branches/EPP_5_1_Branch/component/portal/pom.xml
epp/portal/branches/EPP_5_1_Branch/component/resources/pom.xml
epp/portal/branches/EPP_5_1_Branch/component/scripting/pom.xml
epp/portal/branches/EPP_5_1_Branch/component/test/core/pom.xml
epp/portal/branches/EPP_5_1_Branch/component/test/jcr/pom.xml
epp/portal/branches/EPP_5_1_Branch/component/test/organization/pom.xml
epp/portal/branches/EPP_5_1_Branch/component/test/pom.xml
epp/portal/branches/EPP_5_1_Branch/component/web/api/pom.xml
epp/portal/branches/EPP_5_1_Branch/component/web/controller/pom.xml
epp/portal/branches/EPP_5_1_Branch/component/web/pom.xml
epp/portal/branches/EPP_5_1_Branch/component/web/resources/pom.xml
epp/portal/branches/EPP_5_1_Branch/component/web/security/pom.xml
epp/portal/branches/EPP_5_1_Branch/component/web/server/pom.xml
epp/portal/branches/EPP_5_1_Branch/component/wsrp/pom.xml
epp/portal/branches/EPP_5_1_Branch/distribution/jboss-eap/examples/pom.xml
epp/portal/branches/EPP_5_1_Branch/distribution/jboss-eap/pom.xml
epp/portal/branches/EPP_5_1_Branch/distribution/jboss-eap/portletbridge/pom.xml
epp/portal/branches/EPP_5_1_Branch/distribution/jboss-eap/serverAddon/gatein.ear/pom.xml
epp/portal/branches/EPP_5_1_Branch/distribution/jboss-eap/serverAddon/integration.war/pom.xml
epp/portal/branches/EPP_5_1_Branch/distribution/jboss-eap/serverAddon/pom.xml
epp/portal/branches/EPP_5_1_Branch/distribution/pom.xml
epp/portal/branches/EPP_5_1_Branch/examples/extension/config/pom.xml
epp/portal/branches/EPP_5_1_Branch/examples/extension/ear/pom.xml
epp/portal/branches/EPP_5_1_Branch/examples/extension/jar/pom.xml
epp/portal/branches/EPP_5_1_Branch/examples/extension/pom.xml
epp/portal/branches/EPP_5_1_Branch/examples/extension/war/pom.xml
epp/portal/branches/EPP_5_1_Branch/examples/pom.xml
epp/portal/branches/EPP_5_1_Branch/examples/portal/config/pom.xml
epp/portal/branches/EPP_5_1_Branch/examples/portal/ear/pom.xml
epp/portal/branches/EPP_5_1_Branch/examples/portal/jar/pom.xml
epp/portal/branches/EPP_5_1_Branch/examples/portal/pom.xml
epp/portal/branches/EPP_5_1_Branch/examples/portal/rest-war/pom.xml
epp/portal/branches/EPP_5_1_Branch/examples/portal/war/pom.xml
epp/portal/branches/EPP_5_1_Branch/examples/portlets/api/pom.xml
epp/portal/branches/EPP_5_1_Branch/examples/portlets/jsfhellouser/pom.xml
epp/portal/branches/EPP_5_1_Branch/examples/portlets/jsphellouser/pom.xml
epp/portal/branches/EPP_5_1_Branch/examples/portlets/pom.xml
epp/portal/branches/EPP_5_1_Branch/examples/portlets/simplesthelloworld/pom.xml
epp/portal/branches/EPP_5_1_Branch/examples/portlets/struts-jpetstore/pom.xml
epp/portal/branches/EPP_5_1_Branch/examples/skins/pom.xml
epp/portal/branches/EPP_5_1_Branch/examples/skins/simpleskin/pom.xml
epp/portal/branches/EPP_5_1_Branch/gadgets/core/pom.xml
epp/portal/branches/EPP_5_1_Branch/gadgets/eXoGadgets/pom.xml
epp/portal/branches/EPP_5_1_Branch/gadgets/pom.xml
epp/portal/branches/EPP_5_1_Branch/gadgets/server/pom.xml
epp/portal/branches/EPP_5_1_Branch/packaging/jboss-as/ear/pom.xml
epp/portal/branches/EPP_5_1_Branch/packaging/jboss-as/integration.war/pom.xml
epp/portal/branches/EPP_5_1_Branch/packaging/jboss-as/pkg/pom.xml
epp/portal/branches/EPP_5_1_Branch/packaging/jboss-as/pom.xml
epp/portal/branches/EPP_5_1_Branch/packaging/module/pom.xml
epp/portal/branches/EPP_5_1_Branch/packaging/pkg/pom.xml
epp/portal/branches/EPP_5_1_Branch/packaging/pom.xml
epp/portal/branches/EPP_5_1_Branch/packaging/product/pom.xml
epp/portal/branches/EPP_5_1_Branch/packaging/reports/pom.xml
epp/portal/branches/EPP_5_1_Branch/pom.xml
epp/portal/branches/EPP_5_1_Branch/portlet/dashboard/pom.xml
epp/portal/branches/EPP_5_1_Branch/portlet/exoadmin/pom.xml
epp/portal/branches/EPP_5_1_Branch/portlet/pom.xml
epp/portal/branches/EPP_5_1_Branch/portlet/web/pom.xml
epp/portal/branches/EPP_5_1_Branch/server/jboss/patch-ear/pom.xml
epp/portal/branches/EPP_5_1_Branch/server/jboss/plugin/pom.xml
epp/portal/branches/EPP_5_1_Branch/server/jboss/pom.xml
epp/portal/branches/EPP_5_1_Branch/server/pom.xml
epp/portal/branches/EPP_5_1_Branch/starter/ear/pom.xml
epp/portal/branches/EPP_5_1_Branch/starter/jar/
epp/portal/branches/EPP_5_1_Branch/starter/jar/pom.xml
epp/portal/branches/EPP_5_1_Branch/starter/pom.xml
epp/portal/branches/EPP_5_1_Branch/starter/war/pom.xml
epp/portal/branches/EPP_5_1_Branch/testsuite/pom.xml
epp/portal/branches/EPP_5_1_Branch/testsuite/selenium-snifftests/pom.xml
epp/portal/branches/EPP_5_1_Branch/testsuite/webuibasedsamples/pom.xml
epp/portal/branches/EPP_5_1_Branch/web/eXoResources/pom.xml
epp/portal/branches/EPP_5_1_Branch/web/pom.xml
epp/portal/branches/EPP_5_1_Branch/web/portal/pom.xml
epp/portal/branches/EPP_5_1_Branch/web/rest/pom.xml
epp/portal/branches/EPP_5_1_Branch/webui/core/pom.xml
epp/portal/branches/EPP_5_1_Branch/webui/dashboard/pom.xml
epp/portal/branches/EPP_5_1_Branch/webui/eXo/pom.xml
epp/portal/branches/EPP_5_1_Branch/webui/framework/pom.xml
epp/portal/branches/EPP_5_1_Branch/webui/pom.xml
epp/portal/branches/EPP_5_1_Branch/webui/portal/pom.xml
epp/portal/branches/EPP_5_1_Branch/webui/portlet/pom.xml
Log:
Update version
Modified: epp/portal/branches/EPP_5_1_Branch/component/application-registry/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/component/application-registry/pom.xml 2011-08-02 04:22:04 UTC (rev 6968)
+++ epp/portal/branches/EPP_5_1_Branch/component/application-registry/pom.xml 2011-08-02 05:52:00 UTC (rev 6969)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_1_Branch/component/common/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/component/common/pom.xml 2011-08-02 04:22:04 UTC (rev 6968)
+++ epp/portal/branches/EPP_5_1_Branch/component/common/pom.xml 2011-08-02 05:52:00 UTC (rev 6969)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>exo.portal.component.common</artifactId>
Modified: epp/portal/branches/EPP_5_1_Branch/component/identity/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/component/identity/pom.xml 2011-08-02 04:22:04 UTC (rev 6968)
+++ epp/portal/branches/EPP_5_1_Branch/component/identity/pom.xml 2011-08-02 05:52:00 UTC (rev 6969)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_1_Branch/component/management/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/component/management/pom.xml 2011-08-02 04:22:04 UTC (rev 6968)
+++ epp/portal/branches/EPP_5_1_Branch/component/management/pom.xml 2011-08-02 05:52:00 UTC (rev 6969)
@@ -21,7 +21,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_1_Branch/component/pc/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/component/pc/pom.xml 2011-08-02 04:22:04 UTC (rev 6968)
+++ epp/portal/branches/EPP_5_1_Branch/component/pc/pom.xml 2011-08-02 05:52:00 UTC (rev 6969)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_1_Branch/component/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/component/pom.xml 2011-08-02 04:22:04 UTC (rev 6968)
+++ epp/portal/branches/EPP_5_1_Branch/component/pom.xml 2011-08-02 05:52:00 UTC (rev 6969)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.component</artifactId>
Modified: epp/portal/branches/EPP_5_1_Branch/component/portal/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/component/portal/pom.xml 2011-08-02 04:22:04 UTC (rev 6968)
+++ epp/portal/branches/EPP_5_1_Branch/component/portal/pom.xml 2011-08-02 05:52:00 UTC (rev 6969)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_1_Branch/component/resources/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/component/resources/pom.xml 2011-08-02 04:22:04 UTC (rev 6968)
+++ epp/portal/branches/EPP_5_1_Branch/component/resources/pom.xml 2011-08-02 05:52:00 UTC (rev 6969)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_1_Branch/component/scripting/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/component/scripting/pom.xml 2011-08-02 04:22:04 UTC (rev 6968)
+++ epp/portal/branches/EPP_5_1_Branch/component/scripting/pom.xml 2011-08-02 05:52:00 UTC (rev 6969)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_1_Branch/component/test/core/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/component/test/core/pom.xml 2011-08-02 04:22:04 UTC (rev 6968)
+++ epp/portal/branches/EPP_5_1_Branch/component/test/core/pom.xml 2011-08-02 05:52:00 UTC (rev 6969)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_1_Branch/component/test/jcr/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/component/test/jcr/pom.xml 2011-08-02 04:22:04 UTC (rev 6968)
+++ epp/portal/branches/EPP_5_1_Branch/component/test/jcr/pom.xml 2011-08-02 05:52:00 UTC (rev 6969)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_1_Branch/component/test/organization/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/component/test/organization/pom.xml 2011-08-02 04:22:04 UTC (rev 6968)
+++ epp/portal/branches/EPP_5_1_Branch/component/test/organization/pom.xml 2011-08-02 05:52:00 UTC (rev 6969)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_1_Branch/component/test/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/component/test/pom.xml 2011-08-02 04:22:04 UTC (rev 6968)
+++ epp/portal/branches/EPP_5_1_Branch/component/test/pom.xml 2011-08-02 05:52:00 UTC (rev 6969)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_1_Branch/component/web/api/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/component/web/api/pom.xml 2011-08-02 04:22:04 UTC (rev 6968)
+++ epp/portal/branches/EPP_5_1_Branch/component/web/api/pom.xml 2011-08-02 05:52:00 UTC (rev 6969)
@@ -21,7 +21,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_1_Branch/component/web/controller/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/component/web/controller/pom.xml 2011-08-02 04:22:04 UTC (rev 6968)
+++ epp/portal/branches/EPP_5_1_Branch/component/web/controller/pom.xml 2011-08-02 05:52:00 UTC (rev 6969)
@@ -21,7 +21,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_1_Branch/component/web/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/component/web/pom.xml 2011-08-02 04:22:04 UTC (rev 6968)
+++ epp/portal/branches/EPP_5_1_Branch/component/web/pom.xml 2011-08-02 05:52:00 UTC (rev 6969)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_1_Branch/component/web/resources/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/component/web/resources/pom.xml 2011-08-02 04:22:04 UTC (rev 6968)
+++ epp/portal/branches/EPP_5_1_Branch/component/web/resources/pom.xml 2011-08-02 05:52:00 UTC (rev 6969)
@@ -21,7 +21,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_1_Branch/component/web/security/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/component/web/security/pom.xml 2011-08-02 04:22:04 UTC (rev 6968)
+++ epp/portal/branches/EPP_5_1_Branch/component/web/security/pom.xml 2011-08-02 05:52:00 UTC (rev 6969)
@@ -21,7 +21,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_1_Branch/component/web/server/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/component/web/server/pom.xml 2011-08-02 04:22:04 UTC (rev 6968)
+++ epp/portal/branches/EPP_5_1_Branch/component/web/server/pom.xml 2011-08-02 05:52:00 UTC (rev 6969)
@@ -21,7 +21,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_1_Branch/component/wsrp/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/component/wsrp/pom.xml 2011-08-02 04:22:04 UTC (rev 6968)
+++ epp/portal/branches/EPP_5_1_Branch/component/wsrp/pom.xml 2011-08-02 05:52:00 UTC (rev 6969)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_1_Branch/distribution/jboss-eap/examples/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/distribution/jboss-eap/examples/pom.xml 2011-08-02 04:22:04 UTC (rev 6968)
+++ epp/portal/branches/EPP_5_1_Branch/distribution/jboss-eap/examples/pom.xml 2011-08-02 05:52:00 UTC (rev 6969)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>distribution.parent</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: epp/portal/branches/EPP_5_1_Branch/distribution/jboss-eap/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/distribution/jboss-eap/pom.xml 2011-08-02 04:22:04 UTC (rev 6968)
+++ epp/portal/branches/EPP_5_1_Branch/distribution/jboss-eap/pom.xml 2011-08-02 05:52:00 UTC (rev 6969)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>distribution.parent</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
</parent>
<artifactId>distribution</artifactId>
Modified: epp/portal/branches/EPP_5_1_Branch/distribution/jboss-eap/portletbridge/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/distribution/jboss-eap/portletbridge/pom.xml 2011-08-02 04:22:04 UTC (rev 6968)
+++ epp/portal/branches/EPP_5_1_Branch/distribution/jboss-eap/portletbridge/pom.xml 2011-08-02 05:52:00 UTC (rev 6969)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>distribution.parent</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: epp/portal/branches/EPP_5_1_Branch/distribution/jboss-eap/serverAddon/gatein.ear/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/distribution/jboss-eap/serverAddon/gatein.ear/pom.xml 2011-08-02 04:22:04 UTC (rev 6968)
+++ epp/portal/branches/EPP_5_1_Branch/distribution/jboss-eap/serverAddon/gatein.ear/pom.xml 2011-08-02 05:52:00 UTC (rev 6969)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>distribution.parent</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<artifactId>gatein</artifactId>
Modified: epp/portal/branches/EPP_5_1_Branch/distribution/jboss-eap/serverAddon/integration.war/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/distribution/jboss-eap/serverAddon/integration.war/pom.xml 2011-08-02 04:22:04 UTC (rev 6968)
+++ epp/portal/branches/EPP_5_1_Branch/distribution/jboss-eap/serverAddon/integration.war/pom.xml 2011-08-02 05:52:00 UTC (rev 6969)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>distribution.parent</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<artifactId>integration</artifactId>
Modified: epp/portal/branches/EPP_5_1_Branch/distribution/jboss-eap/serverAddon/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/distribution/jboss-eap/serverAddon/pom.xml 2011-08-02 04:22:04 UTC (rev 6968)
+++ epp/portal/branches/EPP_5_1_Branch/distribution/jboss-eap/serverAddon/pom.xml 2011-08-02 05:52:00 UTC (rev 6969)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>distribution.parent</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: epp/portal/branches/EPP_5_1_Branch/distribution/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/distribution/pom.xml 2011-08-02 04:22:04 UTC (rev 6968)
+++ epp/portal/branches/EPP_5_1_Branch/distribution/pom.xml 2011-08-02 05:52:00 UTC (rev 6969)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
</parent>
<artifactId>distribution.parent</artifactId>
@@ -15,7 +15,7 @@
<name>Distribution</name>
<properties>
- <eap.version>5.1.1.ER2</eap.version>
+ <eap.version>5.1.1</eap.version>
<eap.dir>jboss-eap-5.1</eap.dir>
<epp.dir>jboss-epp-5.1</epp.dir>
Modified: epp/portal/branches/EPP_5_1_Branch/examples/extension/config/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/examples/extension/config/pom.xml 2011-08-02 04:22:04 UTC (rev 6968)
+++ epp/portal/branches/EPP_5_1_Branch/examples/extension/config/pom.xml 2011-08-02 05:52:00 UTC (rev 6969)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_1_Branch/examples/extension/ear/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/examples/extension/ear/pom.xml 2011-08-02 04:22:04 UTC (rev 6968)
+++ epp/portal/branches/EPP_5_1_Branch/examples/extension/ear/pom.xml 2011-08-02 05:52:00 UTC (rev 6969)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -37,23 +37,23 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.sample.extension.config</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.sample.extension.jar</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web.api</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.sample.extension.war</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
<type>war</type>
</dependency>
</dependencies>
Modified: epp/portal/branches/EPP_5_1_Branch/examples/extension/jar/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/examples/extension/jar/pom.xml 2011-08-02 04:22:04 UTC (rev 6968)
+++ epp/portal/branches/EPP_5_1_Branch/examples/extension/jar/pom.xml 2011-08-02 05:52:00 UTC (rev 6969)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_1_Branch/examples/extension/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/examples/extension/pom.xml 2011-08-02 04:22:04 UTC (rev 6968)
+++ epp/portal/branches/EPP_5_1_Branch/examples/extension/pom.xml 2011-08-02 05:52:00 UTC (rev 6969)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.sample.extension.root</artifactId>
Modified: epp/portal/branches/EPP_5_1_Branch/examples/extension/war/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/examples/extension/war/pom.xml 2011-08-02 04:22:04 UTC (rev 6968)
+++ epp/portal/branches/EPP_5_1_Branch/examples/extension/war/pom.xml 2011-08-02 05:52:00 UTC (rev 6969)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_1_Branch/examples/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/examples/pom.xml 2011-08-02 04:22:04 UTC (rev 6968)
+++ epp/portal/branches/EPP_5_1_Branch/examples/pom.xml 2011-08-02 05:52:00 UTC (rev 6969)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.sample</artifactId>
Modified: epp/portal/branches/EPP_5_1_Branch/examples/portal/config/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/examples/portal/config/pom.xml 2011-08-02 04:22:04 UTC (rev 6968)
+++ epp/portal/branches/EPP_5_1_Branch/examples/portal/config/pom.xml 2011-08-02 05:52:00 UTC (rev 6969)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_1_Branch/examples/portal/ear/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/examples/portal/ear/pom.xml 2011-08-02 04:22:04 UTC (rev 6968)
+++ epp/portal/branches/EPP_5_1_Branch/examples/portal/ear/pom.xml 2011-08-02 05:52:00 UTC (rev 6969)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -37,29 +37,29 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.sample.portal.config</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.sample.portal.jar</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web.api</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.sample.portal.war</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
<type>war</type>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.sample.portal.rest-war</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
<type>war</type>
</dependency>
</dependencies>
Modified: epp/portal/branches/EPP_5_1_Branch/examples/portal/jar/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/examples/portal/jar/pom.xml 2011-08-02 04:22:04 UTC (rev 6968)
+++ epp/portal/branches/EPP_5_1_Branch/examples/portal/jar/pom.xml 2011-08-02 05:52:00 UTC (rev 6969)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_1_Branch/examples/portal/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/examples/portal/pom.xml 2011-08-02 04:22:04 UTC (rev 6968)
+++ epp/portal/branches/EPP_5_1_Branch/examples/portal/pom.xml 2011-08-02 05:52:00 UTC (rev 6969)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.sample.portal.root</artifactId>
Modified: epp/portal/branches/EPP_5_1_Branch/examples/portal/rest-war/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/examples/portal/rest-war/pom.xml 2011-08-02 04:22:04 UTC (rev 6968)
+++ epp/portal/branches/EPP_5_1_Branch/examples/portal/rest-war/pom.xml 2011-08-02 05:52:00 UTC (rev 6969)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_1_Branch/examples/portal/war/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/examples/portal/war/pom.xml 2011-08-02 04:22:04 UTC (rev 6968)
+++ epp/portal/branches/EPP_5_1_Branch/examples/portal/war/pom.xml 2011-08-02 05:52:00 UTC (rev 6969)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_1_Branch/examples/portlets/api/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/examples/portlets/api/pom.xml 2011-08-02 04:22:04 UTC (rev 6968)
+++ epp/portal/branches/EPP_5_1_Branch/examples/portlets/api/pom.xml 2011-08-02 05:52:00 UTC (rev 6969)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.gatein.portal.examples.portlets</groupId>
<artifactId>portlets-parent</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
</parent>
<artifactId>gatein-api</artifactId>
Modified: epp/portal/branches/EPP_5_1_Branch/examples/portlets/jsfhellouser/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/examples/portlets/jsfhellouser/pom.xml 2011-08-02 04:22:04 UTC (rev 6968)
+++ epp/portal/branches/EPP_5_1_Branch/examples/portlets/jsfhellouser/pom.xml 2011-08-02 05:52:00 UTC (rev 6969)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.gatein.portal.examples.portlets</groupId>
<artifactId>portlets-parent</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
</parent>
<artifactId>gatein-jsf-hellouser</artifactId>
Modified: epp/portal/branches/EPP_5_1_Branch/examples/portlets/jsphellouser/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/examples/portlets/jsphellouser/pom.xml 2011-08-02 04:22:04 UTC (rev 6968)
+++ epp/portal/branches/EPP_5_1_Branch/examples/portlets/jsphellouser/pom.xml 2011-08-02 05:52:00 UTC (rev 6969)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.gatein.portal.examples.portlets</groupId>
<artifactId>portlets-parent</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
</parent>
<artifactId>gatein-jsp-hellouser</artifactId>
Modified: epp/portal/branches/EPP_5_1_Branch/examples/portlets/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/examples/portlets/pom.xml 2011-08-02 04:22:04 UTC (rev 6968)
+++ epp/portal/branches/EPP_5_1_Branch/examples/portlets/pom.xml 2011-08-02 05:52:00 UTC (rev 6969)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
</parent>
<groupId>org.gatein.portal.examples.portlets</groupId>
Modified: epp/portal/branches/EPP_5_1_Branch/examples/portlets/simplesthelloworld/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/examples/portlets/simplesthelloworld/pom.xml 2011-08-02 04:22:04 UTC (rev 6968)
+++ epp/portal/branches/EPP_5_1_Branch/examples/portlets/simplesthelloworld/pom.xml 2011-08-02 05:52:00 UTC (rev 6969)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.gatein.portal.examples.portlets</groupId>
<artifactId>portlets-parent</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
</parent>
<artifactId>gatein-simplest-helloworld</artifactId>
Modified: epp/portal/branches/EPP_5_1_Branch/examples/portlets/struts-jpetstore/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/examples/portlets/struts-jpetstore/pom.xml 2011-08-02 04:22:04 UTC (rev 6968)
+++ epp/portal/branches/EPP_5_1_Branch/examples/portlets/struts-jpetstore/pom.xml 2011-08-02 05:52:00 UTC (rev 6969)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.gatein.portal.examples.portlets</groupId>
<artifactId>portlets-parent</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
</parent>
<artifactId>struts-jpetstore</artifactId>
Modified: epp/portal/branches/EPP_5_1_Branch/examples/skins/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/examples/skins/pom.xml 2011-08-02 04:22:04 UTC (rev 6968)
+++ epp/portal/branches/EPP_5_1_Branch/examples/skins/pom.xml 2011-08-02 05:52:00 UTC (rev 6969)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
</parent>
<groupId>org.gatein.portal.examples.skins</groupId>
Modified: epp/portal/branches/EPP_5_1_Branch/examples/skins/simpleskin/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/examples/skins/simpleskin/pom.xml 2011-08-02 04:22:04 UTC (rev 6968)
+++ epp/portal/branches/EPP_5_1_Branch/examples/skins/simpleskin/pom.xml 2011-08-02 05:52:00 UTC (rev 6969)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.portal.examples.skins</groupId>
<artifactId>skins-parent</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
</parent>
<artifactId>gatein-sample-skin</artifactId>
Modified: epp/portal/branches/EPP_5_1_Branch/gadgets/core/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/gadgets/core/pom.xml 2011-08-02 04:22:04 UTC (rev 6968)
+++ epp/portal/branches/EPP_5_1_Branch/gadgets/core/pom.xml 2011-08-02 05:52:00 UTC (rev 6969)
@@ -14,7 +14,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.gadgets</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.gadgets-core</artifactId>
Modified: epp/portal/branches/EPP_5_1_Branch/gadgets/eXoGadgets/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/gadgets/eXoGadgets/pom.xml 2011-08-02 04:22:04 UTC (rev 6968)
+++ epp/portal/branches/EPP_5_1_Branch/gadgets/eXoGadgets/pom.xml 2011-08-02 05:52:00 UTC (rev 6969)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.gadgets</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_1_Branch/gadgets/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/gadgets/pom.xml 2011-08-02 04:22:04 UTC (rev 6968)
+++ epp/portal/branches/EPP_5_1_Branch/gadgets/pom.xml 2011-08-02 05:52:00 UTC (rev 6969)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.gadgets</artifactId>
Modified: epp/portal/branches/EPP_5_1_Branch/gadgets/server/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/gadgets/server/pom.xml 2011-08-02 04:22:04 UTC (rev 6968)
+++ epp/portal/branches/EPP_5_1_Branch/gadgets/server/pom.xml 2011-08-02 05:52:00 UTC (rev 6969)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.gadgets</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.gadgets-server</artifactId>
Modified: epp/portal/branches/EPP_5_1_Branch/packaging/jboss-as/ear/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/packaging/jboss-as/ear/pom.xml 2011-08-02 04:22:04 UTC (rev 6968)
+++ epp/portal/branches/EPP_5_1_Branch/packaging/jboss-as/ear/pom.xml 2011-08-02 05:52:00 UTC (rev 6969)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.packaging.jboss-as.ear</artifactId>
<packaging>ear</packaging>
Modified: epp/portal/branches/EPP_5_1_Branch/packaging/jboss-as/integration.war/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/packaging/jboss-as/integration.war/pom.xml 2011-08-02 04:22:04 UTC (rev 6968)
+++ epp/portal/branches/EPP_5_1_Branch/packaging/jboss-as/integration.war/pom.xml 2011-08-02 05:52:00 UTC (rev 6969)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.packaging.jboss-as.integration</artifactId>
<packaging>war</packaging>
Modified: epp/portal/branches/EPP_5_1_Branch/packaging/jboss-as/pkg/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/packaging/jboss-as/pkg/pom.xml 2011-08-02 04:22:04 UTC (rev 6968)
+++ epp/portal/branches/EPP_5_1_Branch/packaging/jboss-as/pkg/pom.xml 2011-08-02 05:52:00 UTC (rev 6969)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.packaging.jboss-as.pkg</artifactId>
<packaging>pom</packaging>
Modified: epp/portal/branches/EPP_5_1_Branch/packaging/jboss-as/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/packaging/jboss-as/pom.xml 2011-08-02 04:22:04 UTC (rev 6968)
+++ epp/portal/branches/EPP_5_1_Branch/packaging/jboss-as/pom.xml 2011-08-02 05:52:00 UTC (rev 6969)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.packaging.jboss-as</artifactId>
<packaging>pom</packaging>
Modified: epp/portal/branches/EPP_5_1_Branch/packaging/module/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/packaging/module/pom.xml 2011-08-02 04:22:04 UTC (rev 6968)
+++ epp/portal/branches/EPP_5_1_Branch/packaging/module/pom.xml 2011-08-02 05:52:00 UTC (rev 6969)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.packaging</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_1_Branch/packaging/pkg/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/packaging/pkg/pom.xml 2011-08-02 04:22:04 UTC (rev 6968)
+++ epp/portal/branches/EPP_5_1_Branch/packaging/pkg/pom.xml 2011-08-02 05:52:00 UTC (rev 6969)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.packaging</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -67,13 +67,13 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>portal.packaging.module</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
<type>js</type>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>portal.packaging.product</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
<type>js</type>
</dependency>
</dependencies>
Modified: epp/portal/branches/EPP_5_1_Branch/packaging/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/packaging/pom.xml 2011-08-02 04:22:04 UTC (rev 6968)
+++ epp/portal/branches/EPP_5_1_Branch/packaging/pom.xml 2011-08-02 05:52:00 UTC (rev 6969)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_1_Branch/packaging/product/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/packaging/product/pom.xml 2011-08-02 04:22:04 UTC (rev 6968)
+++ epp/portal/branches/EPP_5_1_Branch/packaging/product/pom.xml 2011-08-02 05:52:00 UTC (rev 6969)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.packaging</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_1_Branch/packaging/reports/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/packaging/reports/pom.xml 2011-08-02 04:22:04 UTC (rev 6968)
+++ epp/portal/branches/EPP_5_1_Branch/packaging/reports/pom.xml 2011-08-02 05:52:00 UTC (rev 6969)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.packaging</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_1_Branch/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/pom.xml 2011-08-02 04:22:04 UTC (rev 6968)
+++ epp/portal/branches/EPP_5_1_Branch/pom.xml 2011-08-02 05:52:00 UTC (rev 6969)
@@ -31,7 +31,7 @@
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
<packaging>pom</packaging>
<name>EPP GateIn - Portal - ${project.version}</name>
@@ -363,68 +363,68 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.common</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web.controller</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web.security</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web.server</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web.api</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web.resources</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.portal</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.portal</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.pc</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.identity</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.resources</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.application-registry</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
@@ -434,90 +434,90 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.scripting</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.management</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui.framework</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui.portlet</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui.portal</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui.eXo</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui.core</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui.dashboard</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.gadgets-core</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test.core</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test.core</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test.jcr</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test.jcr</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test.organization</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test.organization</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>gatein.portal.component.wsrp</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.server.jboss.plugin</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
Modified: epp/portal/branches/EPP_5_1_Branch/portlet/dashboard/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/portlet/dashboard/pom.xml 2011-08-02 04:22:04 UTC (rev 6968)
+++ epp/portal/branches/EPP_5_1_Branch/portlet/dashboard/pom.xml 2011-08-02 05:52:00 UTC (rev 6969)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.portlet</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_1_Branch/portlet/exoadmin/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/portlet/exoadmin/pom.xml 2011-08-02 04:22:04 UTC (rev 6968)
+++ epp/portal/branches/EPP_5_1_Branch/portlet/exoadmin/pom.xml 2011-08-02 05:52:00 UTC (rev 6969)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.portlet</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_1_Branch/portlet/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/portlet/pom.xml 2011-08-02 04:22:04 UTC (rev 6968)
+++ epp/portal/branches/EPP_5_1_Branch/portlet/pom.xml 2011-08-02 05:52:00 UTC (rev 6969)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.portlet</artifactId>
Modified: epp/portal/branches/EPP_5_1_Branch/portlet/web/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/portlet/web/pom.xml 2011-08-02 04:22:04 UTC (rev 6968)
+++ epp/portal/branches/EPP_5_1_Branch/portlet/web/pom.xml 2011-08-02 05:52:00 UTC (rev 6969)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.portlet</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_1_Branch/server/jboss/patch-ear/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/server/jboss/patch-ear/pom.xml 2011-08-02 04:22:04 UTC (rev 6968)
+++ epp/portal/branches/EPP_5_1_Branch/server/jboss/patch-ear/pom.xml 2011-08-02 05:52:00 UTC (rev 6969)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.server.jboss</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_1_Branch/server/jboss/plugin/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/server/jboss/plugin/pom.xml 2011-08-02 04:22:04 UTC (rev 6968)
+++ epp/portal/branches/EPP_5_1_Branch/server/jboss/plugin/pom.xml 2011-08-02 05:52:00 UTC (rev 6969)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.server.jboss</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_1_Branch/server/jboss/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/server/jboss/pom.xml 2011-08-02 04:22:04 UTC (rev 6968)
+++ epp/portal/branches/EPP_5_1_Branch/server/jboss/pom.xml 2011-08-02 05:52:00 UTC (rev 6969)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.server</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.server.jboss</artifactId>
Modified: epp/portal/branches/EPP_5_1_Branch/server/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/server/pom.xml 2011-08-02 04:22:04 UTC (rev 6968)
+++ epp/portal/branches/EPP_5_1_Branch/server/pom.xml 2011-08-02 05:52:00 UTC (rev 6969)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.server</artifactId>
Modified: epp/portal/branches/EPP_5_1_Branch/starter/ear/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/starter/ear/pom.xml 2011-08-02 04:22:04 UTC (rev 6968)
+++ epp/portal/branches/EPP_5_1_Branch/starter/ear/pom.xml 2011-08-02 05:52:00 UTC (rev 6969)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.starter.war</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
<type>war</type>
</dependency>
</dependencies>
Property changes on: epp/portal/branches/EPP_5_1_Branch/starter/jar
___________________________________________________________________
Added: svn:ignore
+ target
Modified: epp/portal/branches/EPP_5_1_Branch/starter/jar/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/starter/jar/pom.xml 2011-08-02 04:22:04 UTC (rev 6968)
+++ epp/portal/branches/EPP_5_1_Branch/starter/jar/pom.xml 2011-08-02 05:52:00 UTC (rev 6969)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_1_Branch/starter/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/starter/pom.xml 2011-08-02 04:22:04 UTC (rev 6968)
+++ epp/portal/branches/EPP_5_1_Branch/starter/pom.xml 2011-08-02 05:52:00 UTC (rev 6969)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.starter.root</artifactId>
Modified: epp/portal/branches/EPP_5_1_Branch/starter/war/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/starter/war/pom.xml 2011-08-02 04:22:04 UTC (rev 6968)
+++ epp/portal/branches/EPP_5_1_Branch/starter/war/pom.xml 2011-08-02 05:52:00 UTC (rev 6969)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -50,7 +50,7 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.starter.jar</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
</dependency>
</dependencies>
</project>
Modified: epp/portal/branches/EPP_5_1_Branch/testsuite/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/testsuite/pom.xml 2011-08-02 04:22:04 UTC (rev 6968)
+++ epp/portal/branches/EPP_5_1_Branch/testsuite/pom.xml 2011-08-02 05:52:00 UTC (rev 6969)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.testsuite</artifactId>
Modified: epp/portal/branches/EPP_5_1_Branch/testsuite/selenium-snifftests/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/testsuite/selenium-snifftests/pom.xml 2011-08-02 04:22:04 UTC (rev 6968)
+++ epp/portal/branches/EPP_5_1_Branch/testsuite/selenium-snifftests/pom.xml 2011-08-02 05:52:00 UTC (rev 6969)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.testsuite</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.selenium.snifftests</artifactId>
Modified: epp/portal/branches/EPP_5_1_Branch/testsuite/webuibasedsamples/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/testsuite/webuibasedsamples/pom.xml 2011-08-02 04:22:04 UTC (rev 6968)
+++ epp/portal/branches/EPP_5_1_Branch/testsuite/webuibasedsamples/pom.xml 2011-08-02 05:52:00 UTC (rev 6969)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.testsuite</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.webui.based.samples</artifactId>
Modified: epp/portal/branches/EPP_5_1_Branch/web/eXoResources/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/web/eXoResources/pom.xml 2011-08-02 04:22:04 UTC (rev 6968)
+++ epp/portal/branches/EPP_5_1_Branch/web/eXoResources/pom.xml 2011-08-02 05:52:00 UTC (rev 6969)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.web</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_1_Branch/web/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/web/pom.xml 2011-08-02 04:22:04 UTC (rev 6968)
+++ epp/portal/branches/EPP_5_1_Branch/web/pom.xml 2011-08-02 05:52:00 UTC (rev 6969)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.web</artifactId>
Modified: epp/portal/branches/EPP_5_1_Branch/web/portal/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/web/portal/pom.xml 2011-08-02 04:22:04 UTC (rev 6968)
+++ epp/portal/branches/EPP_5_1_Branch/web/portal/pom.xml 2011-08-02 05:52:00 UTC (rev 6969)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.web</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_1_Branch/web/rest/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/web/rest/pom.xml 2011-08-02 04:22:04 UTC (rev 6968)
+++ epp/portal/branches/EPP_5_1_Branch/web/rest/pom.xml 2011-08-02 05:52:00 UTC (rev 6969)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.web</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_1_Branch/webui/core/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/webui/core/pom.xml 2011-08-02 04:22:04 UTC (rev 6968)
+++ epp/portal/branches/EPP_5_1_Branch/webui/core/pom.xml 2011-08-02 05:52:00 UTC (rev 6969)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_1_Branch/webui/dashboard/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/webui/dashboard/pom.xml 2011-08-02 04:22:04 UTC (rev 6968)
+++ epp/portal/branches/EPP_5_1_Branch/webui/dashboard/pom.xml 2011-08-02 05:52:00 UTC (rev 6969)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_1_Branch/webui/eXo/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/webui/eXo/pom.xml 2011-08-02 04:22:04 UTC (rev 6968)
+++ epp/portal/branches/EPP_5_1_Branch/webui/eXo/pom.xml 2011-08-02 05:52:00 UTC (rev 6969)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_1_Branch/webui/framework/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/webui/framework/pom.xml 2011-08-02 04:22:04 UTC (rev 6968)
+++ epp/portal/branches/EPP_5_1_Branch/webui/framework/pom.xml 2011-08-02 05:52:00 UTC (rev 6969)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_1_Branch/webui/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/webui/pom.xml 2011-08-02 04:22:04 UTC (rev 6968)
+++ epp/portal/branches/EPP_5_1_Branch/webui/pom.xml 2011-08-02 05:52:00 UTC (rev 6969)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.webui</artifactId>
Modified: epp/portal/branches/EPP_5_1_Branch/webui/portal/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/webui/portal/pom.xml 2011-08-02 04:22:04 UTC (rev 6968)
+++ epp/portal/branches/EPP_5_1_Branch/webui/portal/pom.xml 2011-08-02 05:52:00 UTC (rev 6969)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_1_Branch/webui/portlet/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/webui/portlet/pom.xml 2011-08-02 04:22:04 UTC (rev 6968)
+++ epp/portal/branches/EPP_5_1_Branch/webui/portlet/pom.xml 2011-08-02 05:52:00 UTC (rev 6969)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui</artifactId>
- <version>5.1.1-epp-CR01-SNAPSHOT</version>
+ <version>5.1.1-epp-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
13 years, 4 months
- 1
- 0
gatein SVN: r6968 - epp/docs/branches/5.1/Reference_Guide/en-US/modules/AuthenticationAndIdentity.
by do-not-reply＠jboss.org
Author: smumford
Date: 2011-08-02 00:22:04 -0400 (Tue, 02 Aug 2011)
New Revision: 6968
Modified:
epp/docs/branches/5.1/Reference_Guide/en-US/modules/AuthenticationAndIdentity/SSO.xml
Log:
JBEPP-894:Added Enabling SSO valve section.
Modified: epp/docs/branches/5.1/Reference_Guide/en-US/modules/AuthenticationAndIdentity/SSO.xml
===================================================================
--- epp/docs/branches/5.1/Reference_Guide/en-US/modules/AuthenticationAndIdentity/SSO.xml 2011-08-01 21:47:46 UTC (rev 6967)
+++ epp/docs/branches/5.1/Reference_Guide/en-US/modules/AuthenticationAndIdentity/SSO.xml 2011-08-02 04:22:04 UTC (rev 6968)
@@ -60,7 +60,149 @@
</warning>
</section>
-
+ <section>
+ <title><remark>Enabling SSO using JBoss SSO valve</remark></title>
+<!-- Source Metadata
+URL: https://issues.jboss.org/browse/JBQA-4530
+Author [w/email]: Marek Posolda (mposolda(a)redhat.com)
+
+URL: http://community.jboss.org/wiki/JBossWebSingleSignOn
+Author [w/email]: Brian Stansberry (bstansberry(a)jboss.com)
+
+URL: https://issues.jboss.org/browse/JBEPP-615
+Author [w/email]: Marek Posolda (mposolda(a)redhat.com)
+-->
+ <para>
+ To successfully implement SSO integration, do the following:
+ </para>
+ <procedure>
+ <title>SSO Integration</title>
+ <step>
+ <para>
+ Open the <filename><replaceable><JBOSS_HOME></replaceable>/server/<replaceable><PROFILE></replaceable>/deploy/jmx-console.war/WEB-INF/web.xml</filename> file and ensure the following lines are present and unaltered:
+ </para>
+
+<programlisting language="XML" role="XML"><![CDATA[<security-constraint>
+ <web-resource-collection>
+ <web-resource-name>HtmlAdaptor</web-resource-name>
+ <description>An example security config that only allows users with the
+ role JBossAdmin to access the HTML JMX console web application
+ </description>
+ <url-pattern>/*</url-pattern>
+ </web-resource-collection>
+ <auth-constraint>
+ <role-name>JBossAdmin</role-name>
+ </auth-constraint>
+</security-constraint>
+
+<login-config>
+ <auth-method>BASIC</auth-method>
+ <realm-name>JBoss JMX Console</realm-name>
+</login-config>
+
+<security-role>
+ <role-name>JBossAdmin</role-name>
+</security-role>
+]]></programlisting>
+ </step>
+ <step>
+ <para>
+ Open the <filename>/<replaceable><JBOSS_HOME></replaceable>/server/<replaceable><PROFILE></replaceable>/deploy/jbossweb.sar/server.xml</filename> file and uncomment one of the two <parameter>Valve</parameter> entries:
+ </para>
+ <itemizedlist>
+ <listitem>
+ <para>
+ For a <emphasis>non-clustered</emphasis> implementation, uncomment:
+ </para>
+
+<programlisting language="XML" role="XML"><![CDATA[<Valve className="org.apache.catalina.authenticator.SingleSignOn" />
+]]></programlisting>
+ </listitem>
+ <listitem>
+ <para>
+ For a <emphasis>clustered</emphasis> implementation, uncomment:
+ </para>
+
+<programlisting language="XML" role="XML"><![CDATA[<Valve className="org.jboss.web.tomcat.service.sso.ClusteredSingleSignOn" />
+]]></programlisting>
+ </listitem>
+ </itemizedlist>
+ </step>
+ <step>
+ <para>
+ To integrate with the JBoss SSO valve, follow <emphasis role="bold">one</emphasis> of the procedures below to make the necessary configuration changes in the Java Authentication and Authorization Service (<emphasis role="bold">JAAS</emphasis>):
+ </para>
+ <itemizedlist>
+ <listitem>
+ <procedure>
+ <title>Call the JAAS authentication directly</title>
+ <step>
+ <para>
+ Open the <filename>/<replaceable><JBOSS_HOME></replaceable>/server/<replaceable><PROFILE></replaceable>/deploy/gatein.ear/02portal.war/login/jsp/login.jsp</filename> file.
+ </para>
+ </step>
+ <step>
+ <para>
+ Change the line that reads:
+ </para>
+<programlisting language="XML" role="XML"><![CDATA[<form name="loginForm" action="<%= contextPath + "/login"%>" method="post" style="margin: 0px;">
+]]></programlisting>
+ <para>
+ to read:
+ </para>
+<programlisting language="XML" role="XML"><![CDATA[<form name="loginForm" action="<%= contextPath + "/private/j_security_check"%>" method="post" style="margin: 0px;">
+]]></programlisting>
+ </step>
+ <step>
+ <para>
+ Change the line that reads:
+ </para>
+<programlisting language="XML" role="XML"><![CDATA[<td><input class="UserName" name="username" value="<%=username%>"/></td>
+]]></programlisting>
+ <para>
+ to read:
+ </para>
+<programlisting language="XML" role="XML"><![CDATA[<td><input class="UserName" name="j_username" value="<%=username%>"/></td>
+]]></programlisting>
+ </step>
+ <step>
+ <para>
+ Change the line that reads:
+ </para>
+<programlisting language="XML" role="XML"><![CDATA[<td><input class="Password" type="password" name="password" value=""/></td>
+]]></programlisting>
+
+ <para>
+ to read:
+ </para>
+<programlisting language="XML" role="XML"><![CDATA[<td><input class="Password" type="password" name="j_password" value=""/></td>
+]]></programlisting>
+ </step>
+ </procedure>
+ </listitem>
+ <listitem>
+ <procedure>
+ <title>Switch to <emphasis role="bold">BASIC</emphasis> authentication</title>
+ <step>
+ <para>
+ Change the <parameter>auth-method</parameter> element in <filename><replaceable><JBOSS_HOME></replaceable>/server/<replaceable><PROFILE></replaceable>/deploy/gatein.ear/02portal.war/WEB-INF/web.xml</filename> from <parameter>FORM</parameter> to <parameter>BASIC</parameter>:
+ </para>
+<programlisting language="XML" role="XML"><![CDATA[<login-config>
+<auth-method>BASIC</auth-method>
+<realm-name>gatein-domain</realm-name>
+<form-login-config>
+ <form-login-page>/initiatelogin</form-login-page>
+ <form-error-page>/errorlogin</form-error-page>
+</form-login-config>
+]]></programlisting>
+ </step>
+ </procedure>
+ </listitem>
+ </itemizedlist>
+ </step>
+ </procedure>
+ </section>
+
<section id="sect-Reference_Guide-SSO_Single_Sign_On-CAS_Central_Authentication_Service">
<title>CAS - Central Authentication Service</title>
<para>
@@ -113,7 +255,7 @@
<programlisting language="XML" role="XML"><xi:include href="../../extras/Authentication_Identity_SSO/default102.xml" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting>
<para>
- ...with the following:
+ with:
</para>
<programlisting language="XML" role="XML"><xi:include href="../../extras/Authentication_Identity_SSO/default103.xml" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting>
13 years, 4 months
- 1
- 0
gatein SVN: r6967 - portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/content.
by do-not-reply＠jboss.org
Author: mwringe
Date: 2011-08-01 17:47:46 -0400 (Mon, 01 Aug 2011)
New Revision: 6967
Modified:
portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/content/CategoryImpl.java
Log:
Use the id of the application, not the id of the application content (would otherwise fail if the category name doesn't equal the web application's name).
Modified: portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/content/CategoryImpl.java
===================================================================
--- portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/content/CategoryImpl.java 2011-08-01 15:07:06 UTC (rev 6966)
+++ portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/content/CategoryImpl.java 2011-08-01 21:47:46 UTC (rev 6967)
@@ -82,6 +82,7 @@
Class<Content> contentClass = getContentClassFor(type);
if (Gadget.class.isAssignableFrom(contentClass))
{
+ //TODO: for a gadget, it should probably be using application.getID instead of getContentId
return gateIn.gadgetId(application.getContentId());
}
else if (org.gatein.api.content.WSRP.class.isAssignableFrom(contentClass))
@@ -90,7 +91,7 @@
}
else if (org.gatein.api.content.Portlet.class.isAssignableFrom(contentClass))
{
- return gateIn.parsePortletId(application.getContentId());
+ return gateIn.parsePortletId(application.getId());
}
else
{
13 years, 4 months
- 1
- 0