gatein SVN: r7906 - portal/trunk/portlet/dashboard/src/main/java/org/exoplatform/gadget/webui/component.
by do-not-reply＠jboss.org
Author: kien_nguyen
Date: 2011-10-28 04:05:15 -0400 (Fri, 28 Oct 2011)
New Revision: 7906
Modified:
portal/trunk/portlet/dashboard/src/main/java/org/exoplatform/gadget/webui/component/UIGadgetPortlet.java
Log:
GTNPORTAL-2110 Gadget Wrapper portlets default horoscope gadget doesnt work propertly
Modified: portal/trunk/portlet/dashboard/src/main/java/org/exoplatform/gadget/webui/component/UIGadgetPortlet.java
===================================================================
--- portal/trunk/portlet/dashboard/src/main/java/org/exoplatform/gadget/webui/component/UIGadgetPortlet.java 2011-10-28 07:54:08 UTC (rev 7905)
+++ portal/trunk/portlet/dashboard/src/main/java/org/exoplatform/gadget/webui/component/UIGadgetPortlet.java 2011-10-28 08:05:15 UTC (rev 7906)
@@ -79,6 +79,32 @@
this.userPref = pref;
}
+ @Override
+ public void processAction(WebuiRequestContext context) throws Exception
+ {
+ super.processAction(context);
+
+ PortletRequest req = context.getRequest();
+ userPref = req.getParameter("userPref");
+
+ if (userPref != null && !userPref.isEmpty())
+ {
+ PortletPreferences prefs = req.getPreferences();
+ prefs.setValue("userPref", userPref);
+ prefs.store();
+ }
+ }
+
+ @Override
+ public void processRender(WebuiApplication app, WebuiRequestContext context) throws Exception
+ {
+ PortletRequest req = context.getRequest();
+ PortletPreferences prefs = req.getPreferences();
+ userPref = prefs.getValue("userPref", null);
+
+ super.processRender(app, context);
+ }
+
public String getUrl()
{
PortletRequestContext pcontext = (PortletRequestContext)WebuiRequestContext.getCurrentInstance();
12 years, 8 months
gatein SVN: r7905 - in portal/trunk/portlet/dashboard/src/main: webapp/WEB-INF/classes/locale/portlet/dashboard and 1 other directory.
by do-not-reply＠jboss.org
Author: kien_nguyen
Date: 2011-10-28 03:54:08 -0400 (Fri, 28 Oct 2011)
New Revision: 7905
Modified:
portal/trunk/portlet/dashboard/src/main/java/org/exoplatform/dashboard/webui/component/UITabPaneDashboard.java
portal/trunk/portlet/dashboard/src/main/webapp/WEB-INF/classes/locale/portlet/dashboard/TabbedDashboardPortlet_en.properties
portal/trunk/portlet/dashboard/src/main/webapp/WEB-INF/classes/locale/portlet/dashboard/TabbedDashboardPortlet_fr.properties
portal/trunk/portlet/dashboard/src/main/webapp/WEB-INF/classes/locale/portlet/dashboard/TabbedDashboardPortlet_vi.properties
Log:
GTNPORTAL-2236 Have conflict when edit label of user's page
Modified: portal/trunk/portlet/dashboard/src/main/java/org/exoplatform/dashboard/webui/component/UITabPaneDashboard.java
===================================================================
--- portal/trunk/portlet/dashboard/src/main/java/org/exoplatform/dashboard/webui/component/UITabPaneDashboard.java 2011-10-28 07:52:56 UTC (rev 7904)
+++ portal/trunk/portlet/dashboard/src/main/java/org/exoplatform/dashboard/webui/component/UITabPaneDashboard.java 2011-10-28 07:54:08 UTC (rev 7905)
@@ -252,11 +252,6 @@
{
try
{
- if (nodeLabel == null || nodeLabel.length() == 0)
- {
- nodeLabel = "Tab_" + getCurrentNumberOfTabs();
- }
-
UserNavigation userNav = getCurrentUserNavigation();
UserNode parentNode = getParentTab();
if (userNav == null || parentNode == null)
@@ -264,8 +259,7 @@
return null;
}
- String uniqueNodeName = nodeLabel.toLowerCase().replace(' ', '_');
-
+ String uniqueNodeName = buildName(nodeLabel);
SiteKey siteKey = userNav.getKey();
Page page =
configService.createPageTemplate(UITabPaneDashboard.PAGE_TEMPLATE, siteKey.getTypeName(), siteKey.getName());
@@ -304,16 +298,23 @@
{
return false;
}
+ return true;
+ }
+
+ private String buildName(String label)
+ {
+ StringBuffer nodeName = new StringBuffer();
for (int i = 0; i < label.length(); i++)
{
char c = label.charAt(i);
- if (Character.isLetter(c) || Character.isDigit(c) || c == '_' || c == '-' || Character.isSpaceChar(c))
+ if (Character.isLetter(c) || Character.isDigit(c) || c == '_' || c == '-')
{
+ nodeName.append(c);
continue;
}
- return false;
+ nodeName.append("_");
}
- return true;
+ return nodeName.toString();
}
public UserNode renamePageNode(String nodeName, String newNodeLabel)
@@ -328,7 +329,7 @@
UserNode renamedNode = parentNode.getChild(nodeName);
renamedNode.setLabel(newNodeLabel);
- String newNodeName = newNodeLabel.toLowerCase().replace(' ', '_');
+ String newNodeName = buildName(newNodeLabel);
if (parentNode.getChild(newNodeName) != null)
{
newNodeName = newNodeName + "_" + System.currentTimeMillis();
Modified: portal/trunk/portlet/dashboard/src/main/webapp/WEB-INF/classes/locale/portlet/dashboard/TabbedDashboardPortlet_en.properties
===================================================================
--- portal/trunk/portlet/dashboard/src/main/webapp/WEB-INF/classes/locale/portlet/dashboard/TabbedDashboardPortlet_en.properties 2011-10-28 07:52:56 UTC (rev 7904)
+++ portal/trunk/portlet/dashboard/src/main/webapp/WEB-INF/classes/locale/portlet/dashboard/TabbedDashboardPortlet_en.properties 2011-10-28 07:54:08 UTC (rev 7905)
@@ -20,5 +20,5 @@
UITabPaneDashboard.action.addNewDashboard=Add Dashboard
UITabPaneDashboard.action.switchShowRange=Switch Range
UITabPaneDashboard.msg.deleteTab=Really want to remove this dashboard?
-UITabPaneDashboard.msg.cannotDeleteLastTab=Can not delete the last tab.
-UITabPaneDashboard.msg.wrongTabName={0}: is invalid; only alpha, digit, underscore, dash and space characters allowed.
\ No newline at end of file
+UITabPaneDashboard.msg.cannotDeleteLastTab=Can not delete the last tab
+UITabPaneDashboard.msg.wrongTabName=Name cannot be empty and must start with a character
\ No newline at end of file
Modified: portal/trunk/portlet/dashboard/src/main/webapp/WEB-INF/classes/locale/portlet/dashboard/TabbedDashboardPortlet_fr.properties
===================================================================
--- portal/trunk/portlet/dashboard/src/main/webapp/WEB-INF/classes/locale/portlet/dashboard/TabbedDashboardPortlet_fr.properties 2011-10-28 07:52:56 UTC (rev 7904)
+++ portal/trunk/portlet/dashboard/src/main/webapp/WEB-INF/classes/locale/portlet/dashboard/TabbedDashboardPortlet_fr.properties 2011-10-28 07:54:08 UTC (rev 7905)
@@ -17,8 +17,8 @@
# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
#
-UITabPaneDashboard.action.addNewDashboard =Ajoute Dashboard
-UITabPaneDashboard.action.switchShowRange =Decale
-UITabPaneDashboard.msg.deleteTab=Really want to remove this dashboard?
-UITabPaneDashboard.msg.cannotDeleteLastTab=Can not delete the last tab.
-UITabPaneDashboard.msg.wrongTabName={0}: is invalid; only alpha, digit, underscore, dash and space characters allowed.
\ No newline at end of file
+UITabPaneDashboard.action.addNewDashboard =Ajoute Dashboard
+UITabPaneDashboard.action.switchShowRange =Decale
+UITabPaneDashboard.msg.deleteTab=Etes-vous sûr de supprimer ce tableau de bord?
+UITabPaneDashboard.msg.cannotDeleteLastTab=Impossible de supprimer le dernier onglet
+UITabPaneDashboard.msg.wrongTabName=Nom ne peut pas être vide et doit commencer par un caractère
Modified: portal/trunk/portlet/dashboard/src/main/webapp/WEB-INF/classes/locale/portlet/dashboard/TabbedDashboardPortlet_vi.properties
===================================================================
--- portal/trunk/portlet/dashboard/src/main/webapp/WEB-INF/classes/locale/portlet/dashboard/TabbedDashboardPortlet_vi.properties 2011-10-28 07:52:56 UTC (rev 7904)
+++ portal/trunk/portlet/dashboard/src/main/webapp/WEB-INF/classes/locale/portlet/dashboard/TabbedDashboardPortlet_vi.properties 2011-10-28 07:54:08 UTC (rev 7905)
@@ -17,8 +17,8 @@
# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
#
-UITabPaneDashboard.action.addNewDashboard=Thêm Dashboard
-UITabPaneDashboard.action.switchShowRange=Switch Range
-UITabPaneDashboard.msg.deleteTab=Bạn muốn xóa dashboard này?
+UITabPaneDashboard.action.addNewDashboard=Thêm Dashboard
+UITabPaneDashboard.action.switchShowRange=Switch Range
+UITabPaneDashboard.msg.deleteTab=Bạn muốn xóa dashboard này?
UITabPaneDashboard.msg.cannotDeleteLastTab=Không thể xóa tab cuối cùng.
-UITabPaneDashboard.msg.wrongTabName={0}: không hợp lệ, chỉ cho phép chữ cái, chữ số, kí tự '_', kí tự '-' và kí tự cách.
+UITabPaneDashboard.msg.wrongTabName=Tên phải bắt đầu bằng một ký tự và không được để trống
12 years, 8 months
gatein SVN: r7904 - portal/trunk/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component.
by do-not-reply＠jboss.org
Author: haint
Date: 2011-10-28 03:52:56 -0400 (Fri, 28 Oct 2011)
New Revision: 7904
Modified:
portal/trunk/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIAdminToolbarPortlet.gtmpl
Log:
GTNPORTAL-2240 Remove unused EditCurrentPage action listener of UIMainActionListener class
Modified: portal/trunk/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIAdminToolbarPortlet.gtmpl
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIAdminToolbarPortlet.gtmpl 2011-10-28 04:58:35 UTC (rev 7903)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIAdminToolbarPortlet.gtmpl 2011-10-28 07:52:56 UTC (rev 7904)
@@ -38,13 +38,18 @@
<a href="javascript:ajaxGet(eXo.env.server.createPortalURL('UIWorkingWorkspace', 'PageCreationWizard', true))" title="" class="ItemIcon AddPageIcon">$addPageLabel</a>
</li>
<% } %>
-
- <% if(userCouldEditPage){ %>
- <li class="MenuItem portlet-menu-cascade-item">
- <a href="javascript:ajaxGet(eXo.env.server.createPortalURL('UIWorkingWorkspace', 'EditCurrentPage', true))" title="" class="ItemIcon EditPageIcon">$editPageLabel</a>
- </li>
- <% } %>
-
+
+ <% if(userCouldEditPage){
+
+ UIPortalApplication portalApp = Util.getUIPortalApplication();
+ UIPage uiPage = portalApp.findFirstComponentOfType(UIPage.class);//TODO: Find a better solution than this traversing
+ String editPageRequest = "javascript:ajaxGet(eXo.env.server.createPortalURL('" + uiPage.getId() + "', 'EditCurrentPage', true))";
+ %>
+ <li class="MenuItem">
+ <a href="$editPageRequest" title="" class="ItemIcon EditPageIcon">$editPageLabel</a>
+ </li>
+ <% } %>
+
<% if(userCouldEditPortal){ %>
<li class="MenuItem portlet-menu-cascade-item">
<a href="javascript:ajaxGet(eXo.env.server.createPortalURL('UIWorkingWorkspace', 'EditInline', true))" title="" class="ItemIcon EditSiteIcon">$editSiteLayout</a>
@@ -52,4 +57,4 @@
<% } %>
</ul>
</li>
-</ul>
\ No newline at end of file
+</ul>
12 years, 8 months
gatein SVN: r7903 - epp/portal/branches/EPP_5_2_Branch.
by do-not-reply＠jboss.org
Author: nscavell
Date: 2011-10-28 00:58:35 -0400 (Fri, 28 Oct 2011)
New Revision: 7903
Modified:
epp/portal/branches/EPP_5_2_Branch/pom.xml
Log:
Update gatein-management to 1.0.0-GA
Modified: epp/portal/branches/EPP_5_2_Branch/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/pom.xml 2011-10-28 04:50:41 UTC (rev 7902)
+++ epp/portal/branches/EPP_5_2_Branch/pom.xml 2011-10-28 04:58:35 UTC (rev 7903)
@@ -55,7 +55,7 @@
<org.picketlink.idm>1.3.0.Alpha09</org.picketlink.idm>
<org.gatein.wsrp.version>2.1.0-EPP520-Beta08</org.gatein.wsrp.version>
<org.gatein.mop.version>1.1.0-Beta07</org.gatein.mop.version>
- <org.gatein.mgmt.version>1.0.0-Beta05</org.gatein.mgmt.version>
+ <org.gatein.mgmt.version>1.0.0-GA</org.gatein.mgmt.version>
<org.slf4j.version>1.5.8</org.slf4j.version>
<commons-pool.version>1.5.5</commons-pool.version>
<rhino.version>1.6R5</rhino.version>
12 years, 8 months
gatein SVN: r7902 - in portal/trunk/packaging/jboss-as5/pkg/src/main/resources/jboss: server/default/conf and 1 other directory.
by do-not-reply＠jboss.org
Author: nscavell
Date: 2011-10-28 00:50:41 -0400 (Fri, 28 Oct 2011)
New Revision: 7902
Modified:
portal/trunk/packaging/jboss-as5/pkg/src/main/resources/jboss/bin/run.conf
portal/trunk/packaging/jboss-as5/pkg/src/main/resources/jboss/server/default/conf/jboss-log4j.xml
Log:
Revert local changes.
Modified: portal/trunk/packaging/jboss-as5/pkg/src/main/resources/jboss/bin/run.conf
===================================================================
--- portal/trunk/packaging/jboss-as5/pkg/src/main/resources/jboss/bin/run.conf 2011-10-28 04:43:39 UTC (rev 7901)
+++ portal/trunk/packaging/jboss-as5/pkg/src/main/resources/jboss/bin/run.conf 2011-10-28 04:50:41 UTC (rev 7902)
@@ -53,6 +53,3 @@
# GateIn configuration directory
JAVA_OPTS="$JAVA_OPTS -Dexo.conf.dir.name=gatein"
-
-# JRebel configuration
-JAVA_OPTS="-noverify -javaagent:/home/nscavell/devel/jrebel/current/jrebel.jar $JAVA_OPTS"
Modified: portal/trunk/packaging/jboss-as5/pkg/src/main/resources/jboss/server/default/conf/jboss-log4j.xml
===================================================================
--- portal/trunk/packaging/jboss-as5/pkg/src/main/resources/jboss/server/default/conf/jboss-log4j.xml 2011-10-28 04:43:39 UTC (rev 7901)
+++ portal/trunk/packaging/jboss-as5/pkg/src/main/resources/jboss/server/default/conf/jboss-log4j.xml 2011-10-28 04:50:41 UTC (rev 7902)
@@ -85,7 +85,7 @@
<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
<errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
<param name="Target" value="System.out"/>
- <!--<param name="Threshold" value="INFO"/>-->
+ <param name="Threshold" value="INFO"/>
<layout class="org.apache.log4j.PatternLayout">
<!-- The default pattern: Date Priority [Category] Message\n -->
@@ -180,10 +180,6 @@
<!-- Limit categories -->
<!-- ================ -->
- <category name="org.gatein.management">
- <priority value="DEBUG"/>
- </category>
-
<!-- Limit the org.apache category to INFO as its DEBUG is verbose -->
<category name="org.apache">
<priority value="INFO"/>
@@ -300,7 +296,6 @@
<!-- ======================= -->
<root>
- <priority value="INFO" />
<appender-ref ref="CONSOLE"/>
<appender-ref ref="FILE"/>
</root>
12 years, 8 months
gatein SVN: r7901 - in portal/trunk: packaging/jboss-as5/pkg/src/main/resources/jboss/bin and 1 other directories.
by do-not-reply＠jboss.org
Author: nscavell
Date: 2011-10-28 00:43:39 -0400 (Fri, 28 Oct 2011)
New Revision: 7901
Modified:
portal/trunk/packaging/jboss-as5/pkg/src/main/resources/jboss/bin/run.conf
portal/trunk/packaging/jboss-as5/pkg/src/main/resources/jboss/server/default/conf/jboss-log4j.xml
portal/trunk/pom.xml
Log:
Update gatein-management to 1.0.0-GA
Modified: portal/trunk/packaging/jboss-as5/pkg/src/main/resources/jboss/bin/run.conf
===================================================================
--- portal/trunk/packaging/jboss-as5/pkg/src/main/resources/jboss/bin/run.conf 2011-10-28 04:16:14 UTC (rev 7900)
+++ portal/trunk/packaging/jboss-as5/pkg/src/main/resources/jboss/bin/run.conf 2011-10-28 04:43:39 UTC (rev 7901)
@@ -53,3 +53,6 @@
# GateIn configuration directory
JAVA_OPTS="$JAVA_OPTS -Dexo.conf.dir.name=gatein"
+
+# JRebel configuration
+JAVA_OPTS="-noverify -javaagent:/home/nscavell/devel/jrebel/current/jrebel.jar $JAVA_OPTS"
Modified: portal/trunk/packaging/jboss-as5/pkg/src/main/resources/jboss/server/default/conf/jboss-log4j.xml
===================================================================
--- portal/trunk/packaging/jboss-as5/pkg/src/main/resources/jboss/server/default/conf/jboss-log4j.xml 2011-10-28 04:16:14 UTC (rev 7900)
+++ portal/trunk/packaging/jboss-as5/pkg/src/main/resources/jboss/server/default/conf/jboss-log4j.xml 2011-10-28 04:43:39 UTC (rev 7901)
@@ -85,7 +85,7 @@
<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
<errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
<param name="Target" value="System.out"/>
- <param name="Threshold" value="INFO"/>
+ <!--<param name="Threshold" value="INFO"/>-->
<layout class="org.apache.log4j.PatternLayout">
<!-- The default pattern: Date Priority [Category] Message\n -->
@@ -180,6 +180,10 @@
<!-- Limit categories -->
<!-- ================ -->
+ <category name="org.gatein.management">
+ <priority value="DEBUG"/>
+ </category>
+
<!-- Limit the org.apache category to INFO as its DEBUG is verbose -->
<category name="org.apache">
<priority value="INFO"/>
@@ -296,6 +300,7 @@
<!-- ======================= -->
<root>
+ <priority value="INFO" />
<appender-ref ref="CONSOLE"/>
<appender-ref ref="FILE"/>
</root>
Modified: portal/trunk/pom.xml
===================================================================
--- portal/trunk/pom.xml 2011-10-28 04:16:14 UTC (rev 7900)
+++ portal/trunk/pom.xml 2011-10-28 04:43:39 UTC (rev 7901)
@@ -49,7 +49,7 @@
<org.picketlink.idm>1.3.0.Alpha09</org.picketlink.idm>
<org.gatein.wsrp.version>2.1.0-Beta08</org.gatein.wsrp.version>
<org.gatein.mop.version>1.1.0-Beta06</org.gatein.mop.version>
- <org.gatein.mgmt.version>1.0.0-Beta05</org.gatein.mgmt.version>
+ <org.gatein.mgmt.version>1.0.0-GA</org.gatein.mgmt.version>
<org.slf4j.version>1.5.8</org.slf4j.version>
<commons-pool.version>1.5.5</commons-pool.version>
<rhino.version>1.6R5</rhino.version>
12 years, 8 months
gatein SVN: r7900 - in portal/trunk: examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/jcr and 3 other directories.
by do-not-reply＠jboss.org
Author: haint
Date: 2011-10-28 00:16:14 -0400 (Fri, 28 Oct 2011)
New Revision: 7900
Modified:
portal/trunk/component/common/src/main/java/conf/configuration-jboss.properties
portal/trunk/component/common/src/main/java/conf/configuration-tomcat.properties
portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/jcr/repository-configuration.xml
portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/jcr/repository-configuration.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/repository-configuration.xml
portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/repository-configuration.xml
Log:
EXOGTN-783: Externalize some JCR Workspace properties
Modified: portal/trunk/component/common/src/main/java/conf/configuration-jboss.properties
===================================================================
--- portal/trunk/component/common/src/main/java/conf/configuration-jboss.properties 2011-10-28 02:37:49 UTC (rev 7899)
+++ portal/trunk/component/common/src/main/java/conf/configuration-jboss.properties 2011-10-28 04:16:14 UTC (rev 7900)
@@ -41,6 +41,8 @@
gatein.jcr.index.changefilterclass=org.exoplatform.services.jcr.impl.core.query.DefaultChangesFilter
gatein.jcr.index.cache.config=war:/conf/jcr/jbosscache/cluster/indexer-config.xml
gatein.jcr.jgroups.config=classpath:/jgroups/gatein-${gatein.default.jgroups.stack:udp}.xml
+gatein.jcr.workspace.default=portal-system
+gatein.jcr.workspace.system=system
# IDM
gatein.idm.datasource.name=java:jdbcidm
Modified: portal/trunk/component/common/src/main/java/conf/configuration-tomcat.properties
===================================================================
--- portal/trunk/component/common/src/main/java/conf/configuration-tomcat.properties 2011-10-28 02:37:49 UTC (rev 7899)
+++ portal/trunk/component/common/src/main/java/conf/configuration-tomcat.properties 2011-10-28 04:16:14 UTC (rev 7900)
@@ -41,6 +41,8 @@
gatein.jcr.index.changefilterclass=org.exoplatform.services.jcr.impl.core.query.DefaultChangesFilter
gatein.jcr.index.cache.config=war:/conf/jcr/jbosscache/cluster/indexer-config.xml
gatein.jcr.jgroups.config=classpath:/jgroups/gatein-${gatein.default.jgroups.stack:udp}.xml
+gatein.jcr.workspace.default=portal-system
+gatein.jcr.workspace.system=system
# IDM
gatein.idm.datasource.name=jdbcidm
Modified: portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/jcr/repository-configuration.xml
===================================================================
--- portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/jcr/repository-configuration.xml 2011-10-28 02:37:49 UTC (rev 7899)
+++ portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/jcr/repository-configuration.xml 2011-10-28 04:16:14 UTC (rev 7900)
@@ -21,9 +21,9 @@
<repository-service default-repository="repository">
<repositories>
- <repository name="repository" system-workspace="system" default-workspace="portal-system">
- <security-domain>gatein-domain</security-domain>
- <access-control>optional</access-control>
+ <repository name="repository" system-workspace="${gatein.jcr.workspace.system}" default-workspace="${gatein.jcr.workspace.default}">
+ <security-domain>${portal.container.realm}</security-domain>
+ <access-control>optional</access-control>
<authentication-policy>org.exoplatform.services.jcr.impl.core.access.JAASAuthenticator</authentication-policy>
<workspaces>
<workspace name="sample-ws">
Modified: portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/jcr/repository-configuration.xml
===================================================================
--- portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/jcr/repository-configuration.xml 2011-10-28 02:37:49 UTC (rev 7899)
+++ portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/jcr/repository-configuration.xml 2011-10-28 04:16:14 UTC (rev 7900)
@@ -21,8 +21,8 @@
<repository-service default-repository="repository">
<repositories>
- <repository name="repository" system-workspace="system" default-workspace="portal-system">
- <security-domain>gatein-domain</security-domain>
+ <repository name="repository" system-workspace="${gatein.jcr.workspace.system}" default-workspace="${gatein.jcr.workspace.default}">
+ <security-domain>${portal.container.realm}</security-domain>
<access-control>optional</access-control>
<authentication-policy>org.exoplatform.services.jcr.impl.core.access.JAASAuthenticator</authentication-policy>
<workspaces>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/repository-configuration.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/repository-configuration.xml 2011-10-28 02:37:49 UTC (rev 7899)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/repository-configuration.xml 2011-10-28 04:16:14 UTC (rev 7900)
@@ -21,8 +21,8 @@
<repository-service default-repository="repository">
<repositories>
- <repository name="repository" system-workspace="system" default-workspace="portal-system">
- <security-domain>gatein-domain</security-domain>
+ <repository name="repository" system-workspace="${gatein.jcr.workspace.system}" default-workspace="${gatein.jcr.workspace.default}">
+ <security-domain>${portal.container.realm}</security-domain>
<access-control>optional</access-control>
<authentication-policy>org.exoplatform.services.jcr.impl.core.access.JAASAuthenticator</authentication-policy>
Modified: portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/repository-configuration.xml
===================================================================
--- portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/repository-configuration.xml 2011-10-28 02:37:49 UTC (rev 7899)
+++ portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/repository-configuration.xml 2011-10-28 04:16:14 UTC (rev 7900)
@@ -23,8 +23,8 @@
<repository-service default-repository="repository">
<repositories>
- <repository name="repository" system-workspace="system" default-workspace="portal-system">
- <security-domain>gatein-domain</security-domain>
+ <repository name="repository" system-workspace="${gatein.jcr.workspace.system}" default-workspace="${gatein.jcr.workspace.default}">
+ <security-domain>${portal.container.realm}</security-domain>
<access-control>optional</access-control>
<authentication-policy>org.exoplatform.services.jcr.impl.core.access.JAASAuthenticator</authentication-policy>
<workspaces>
12 years, 8 months
gatein SVN: r7899 - portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace.
by do-not-reply＠jboss.org
Author: haint
Date: 2011-10-27 22:37:49 -0400 (Thu, 27 Oct 2011)
New Revision: 7899
Modified:
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIMainActionListener.java
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIWorkingWorkspace.java
Log:
GTNPORTAL-2240 Remove unused EditCurrentPage action listener of UIMainActionListener class
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIMainActionListener.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIMainActionListener.java 2011-10-27 18:11:18 UTC (rev 7898)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIMainActionListener.java 2011-10-28 02:37:49 UTC (rev 7899)
@@ -57,59 +57,6 @@
*/
public class UIMainActionListener
{
-
- static public class EditCurrentPageActionListener extends EventListener<UIWorkingWorkspace>
- {
- public void execute(Event<UIWorkingWorkspace> event) throws Exception
- {
- UIPortalApplication uiApp = Util.getUIPortalApplication();
- UIWorkingWorkspace uiWorkingWS = event.getSource();
-
- // check edit permission for page
- UIPageBody pageBody = uiWorkingWS.findFirstComponentOfType(UIPageBody.class);
- UIPage uiPage = (UIPage)pageBody.getUIComponent();
- if (uiPage == null)
- {
- uiApp.addMessage(new ApplicationMessage("UIPageBrowser.msg.PageNotExist", null));
- return;
- }
- Page page = PortalDataMapper.toPageModel(uiPage);
-
- UserACL userACL = uiApp.getApplicationComponent(UserACL.class);
- if (!userACL.hasEditPermission(page))
- {
- uiApp.addMessage(new ApplicationMessage("UIPortalManagement.msg.Invalid-EditPage-Permission", null));
- return;
- }
-
- uiWorkingWS.setRenderedChild(UIEditInlineWorkspace.class);
-
- UIPortalComposer portalComposer =
- uiWorkingWS.findFirstComponentOfType(UIPortalComposer.class).setRendered(true);
- portalComposer.setComponentConfig(UIPortalComposer.class, UIPortalComposer.UIPAGE_EDITOR);
- portalComposer.setId(UIPortalComposer.UIPAGE_EDITOR);
- portalComposer.setShowControl(true);
- portalComposer.setEditted(false);
- portalComposer.setCollapse(false);
-
- UIPortalToolPanel uiToolPanel = uiWorkingWS.findFirstComponentOfType(UIPortalToolPanel.class);
- uiToolPanel.setShowMaskLayer(false);
- uiApp.setModeState(UIPortalApplication.APP_BLOCK_EDIT_MODE);
-
- // We clone the edited UIPage object, that is required for Abort action
- UIPageFactory clazz = UIPageFactory.getInstance(page.getFactoryId());
- UIPage newUIPage = clazz.createUIPage(null);
- PortalDataMapper.toUIPage(newUIPage, page);
- uiToolPanel.setWorkingComponent(newUIPage);
-
- // Remove current UIPage from UIPageBody
- pageBody.setUIComponent(null);
-
- event.getRequestContext().addUIComponentToUpdateByAjax(uiWorkingWS);
- Util.getPortalRequestContext().ignoreAJAXUpdateOnPortlets(true);
- }
- }
-
static public class PageCreationWizardActionListener extends EventListener<UIWorkingWorkspace>
{
public void execute(Event<UIWorkingWorkspace> event) throws Exception
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIWorkingWorkspace.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIWorkingWorkspace.java 2011-10-27 18:11:18 UTC (rev 7898)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIWorkingWorkspace.java 2011-10-28 02:37:49 UTC (rev 7899)
@@ -40,7 +40,6 @@
@ComponentConfig(id = "UIWorkingWorkspace", template = "system:/groovy/portal/webui/workspace/UIWorkingWorkspace.gtmpl", events = {
@EventConfig(listeners = UIMainActionListener.CreatePortalActionListener.class),
- @EventConfig(listeners = UIMainActionListener.EditCurrentPageActionListener.class),
@EventConfig(listeners = UIMainActionListener.PageCreationWizardActionListener.class),
@EventConfig(listeners = UIMainActionListener.EditBackgroundActionListener.class),
@EventConfig(listeners = UIMainActionListener.EditInlineActionListener.class)})
12 years, 8 months
gatein SVN: r7898 - portal/trunk/component/web/security.
by do-not-reply＠jboss.org
Author: mstruk
Date: 2011-10-27 14:11:18 -0400 (Thu, 27 Oct 2011)
New Revision: 7898
Modified:
portal/trunk/component/web/security/pom.xml
Log:
Fix for apache-log4j:log4j obsolete dependency transitively polluting the build
Modified: portal/trunk/component/web/security/pom.xml
===================================================================
--- portal/trunk/component/web/security/pom.xml 2011-10-27 08:11:13 UTC (rev 7897)
+++ portal/trunk/component/web/security/pom.xml 2011-10-27 18:11:18 UTC (rev 7898)
@@ -105,6 +105,10 @@
<groupId>trove</groupId>
<artifactId>trove</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>apache-log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
12 years, 8 months
gatein SVN: r7897 - in epp/portal/branches/EPP_5_2_Branch: component and 7 other directories.
by do-not-reply＠jboss.org
Author: theute
Date: 2011-10-27 04:11:13 -0400 (Thu, 27 Oct 2011)
New Revision: 7897
Modified:
epp/portal/branches/EPP_5_2_Branch/
epp/portal/branches/EPP_5_2_Branch/component/
epp/portal/branches/EPP_5_2_Branch/component/portal/
epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/
epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/src/main/resources/conf/gatein/controller.xml
epp/portal/branches/EPP_5_2_Branch/examples/portal/war/src/main/webapp/WEB-INF/web.xml
epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/web.xml
epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIPortalApplication.java
epp/portal/branches/EPP_5_2_Branch/wsrp-integration/
Log:
JBEPP-1314: Change route prefix from groups--> g and users--> u
Property changes on: epp/portal/branches/EPP_5_2_Branch
___________________________________________________________________
Modified: svn:mergeinfo
- /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795:5868
/portal/branches/branch-GTNPORTAL-1592:4868,4894
/portal/branches/branch-GTNPORTAL-1643:5002,5063,5167
/portal/branches/branch-GTNPORTAL-1700:5348,5363,5402,5445
/portal/branches/branch-GTNPORTAL-1731:5622,5644,5668
/portal/branches/branch-GTNPORTAL-1745:5765
/portal/branches/branch-GTNPORTAL-1790:5871
/portal/branches/branch-GTNPORTAL-1822:5943,5952
/portal/branches/branch-GTNPORTAL-1832:6030,6063
/portal/branches/branch-GTNPORTAL-1872:6400,6551
/portal/branches/branch-GTNPORTAL-1921:6603,6771-6772,6774
/portal/branches/branch-GTNPORTAL-1963:6904,6915-6916
/portal/branches/decoupled-webos:6214-6243
/portal/branches/gatein-management:6920-6958
/portal/branches/global-portlet-metadata:6298-6384
/portal/branches/site-describability:6171-6235
/portal/branches/xss:7377-7595,7597
/portal/branches/xss-issues:7350-7351,7358
/portal/trunk:4876,4891,5269,5744,5822,5943,6168,6196,6201-6203,6205-6206,6223,6323,6437,6440,6449,6452,6573,6783-6784,6912-6913,6960,7042,7061,7085,7095,7117,7125,7132-7134,7186,7239,7262,7308,7326,7330-7334,7359,7367,7433,7450,7452,7454,7478,7497,7500,7552,7554-7555,7570-7571,7573,7577,7598,7614-7615,7741,7780
+ /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795:5868
/portal/branches/branch-GTNPORTAL-1592:4868,4894
/portal/branches/branch-GTNPORTAL-1643:5002,5063,5167
/portal/branches/branch-GTNPORTAL-1700:5348,5363,5402,5445
/portal/branches/branch-GTNPORTAL-1731:5622,5644,5668
/portal/branches/branch-GTNPORTAL-1745:5765
/portal/branches/branch-GTNPORTAL-1790:5871
/portal/branches/branch-GTNPORTAL-1822:5943,5952
/portal/branches/branch-GTNPORTAL-1832:6030,6063
/portal/branches/branch-GTNPORTAL-1872:6400,6551
/portal/branches/branch-GTNPORTAL-1921:6603,6771-6772,6774
/portal/branches/branch-GTNPORTAL-1963:6904,6915-6916
/portal/branches/decoupled-webos:6214-6243
/portal/branches/gatein-management:6920-6958
/portal/branches/global-portlet-metadata:6298-6384
/portal/branches/site-describability:6171-6235
/portal/branches/xss:7377-7595,7597
/portal/branches/xss-issues:7350-7351,7358
/portal/trunk:4876,4891,5269,5744,5822,5943,6168,6196,6201-6203,6205-6206,6223,6323,6437,6440,6449,6452,6573,6783-6784,6912-6913,6960,7042,7061,7085,7095,7117,7125,7132-7134,7186,7239,7262,7308,7326,7330-7334,7359,7367,7412,7433,7450,7452,7454,7478,7497,7500,7552,7554-7555,7570-7571,7573,7577,7598,7614-7615,7741,7748,7780
Property changes on: epp/portal/branches/EPP_5_2_Branch/component
___________________________________________________________________
Modified: svn:mergeinfo
- /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795/component:5868
/portal/branches/branch-GTNPORTAL-1592/component:4868,4894
/portal/branches/branch-GTNPORTAL-1643/component:5002,5063,5167
/portal/branches/branch-GTNPORTAL-1700/component:5348,5363,5402,5445
/portal/branches/branch-GTNPORTAL-1731/component:5622,5644,5668
/portal/branches/branch-GTNPORTAL-1745/component:5765
/portal/branches/branch-GTNPORTAL-1790/component:5871
/portal/branches/branch-GTNPORTAL-1822/component:5943,5952
/portal/branches/branch-GTNPORTAL-1832/component:6030,6063
/portal/branches/branch-GTNPORTAL-1872/component:6400,6551
/portal/branches/branch-GTNPORTAL-1921/component:6603,6771-6772,6774
/portal/branches/branch-GTNPORTAL-1963/component:6904,6915-6916
/portal/trunk/component:4876,4891,5269,5744,5822,5943,6031,6033,6168,6196,6201-6203,6205-6206,6223,6292,6323,6437,6440,6449,6452,6573,6783-6784,6912-6913,6960,7042,7061,7085,7095,7117,7120,7125,7132-7134,7186,7239,7262,7308,7326,7330-7334,7359,7367,7433,7450-7452,7454,7478,7497,7500,7552,7554-7555,7570-7571,7573,7577,7598,7614-7615,7780
+ /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795/component:5868
/portal/branches/branch-GTNPORTAL-1592/component:4868,4894
/portal/branches/branch-GTNPORTAL-1643/component:5002,5063,5167
/portal/branches/branch-GTNPORTAL-1700/component:5348,5363,5402,5445
/portal/branches/branch-GTNPORTAL-1731/component:5622,5644,5668
/portal/branches/branch-GTNPORTAL-1745/component:5765
/portal/branches/branch-GTNPORTAL-1790/component:5871
/portal/branches/branch-GTNPORTAL-1822/component:5943,5952
/portal/branches/branch-GTNPORTAL-1832/component:6030,6063
/portal/branches/branch-GTNPORTAL-1872/component:6400,6551
/portal/branches/branch-GTNPORTAL-1921/component:6603,6771-6772,6774
/portal/branches/branch-GTNPORTAL-1963/component:6904,6915-6916
/portal/trunk/component:4876,4891,5269,5744,5822,5943,6031,6033,6168,6196,6201-6203,6205-6206,6223,6292,6323,6437,6440,6449,6452,6573,6783-6784,6912-6913,6960,7042,7061,7085,7095,7117,7120,7125,7132-7134,7186,7239,7262,7308,7326,7330-7334,7359,7367,7412,7433,7450-7452,7454,7478,7497,7500,7552,7554-7555,7570-7571,7573,7577,7598,7614-7615,7748,7780
Property changes on: epp/portal/branches/EPP_5_2_Branch/component/portal
___________________________________________________________________
Modified: svn:mergeinfo
- /portal/branches/branch-GTNPORTAL-1592/component/portal:4868
/portal/trunk:7451
/portal/trunk/component/portal:7085,7451,7500,7570-7571,7573,7577,7614-7615,7780
+ /portal/branches/branch-GTNPORTAL-1592/component/portal:4868
/portal/trunk:7451
/portal/trunk/component/portal:7085,7412,7451,7500,7570-7571,7573,7577,7614-7615,7748,7780
Property changes on: epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org
___________________________________________________________________
Modified: svn:mergeinfo
- /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795/component/portal/src/main/java/org:5868
/portal/branches/branch-GTNPORTAL-1592/component/portal/src/main/java/org:4868,4894
/portal/branches/branch-GTNPORTAL-1643/component/portal/src/main/java/org:5002,5063,5167
/portal/branches/branch-GTNPORTAL-1700/component/portal/src/main/java/org:5348,5363,5402,5445
/portal/branches/branch-GTNPORTAL-1731/component/portal/src/main/java/org:5622,5644,5668
/portal/branches/branch-GTNPORTAL-1745/component/portal/src/main/java/org:5765
/portal/branches/branch-GTNPORTAL-1790/component/portal/src/main/java/org:5871
/portal/branches/branch-GTNPORTAL-1822/component/portal/src/main/java/org:5943,5952
/portal/branches/branch-GTNPORTAL-1832/component/portal/src/main/java/org:6030,6063
/portal/branches/branch-GTNPORTAL-1872/component/portal/src/main/java/org:6400,6551
/portal/branches/branch-GTNPORTAL-1921/component/portal/src/main/java/org:6603,6771-6772,6774
/portal/branches/branch-GTNPORTAL-1963/component/portal/src/main/java/org:6904,6915-6916
/portal/trunk/component/portal/src/main/java/org:4876,4891,5269,5744,5822,5943,6031,6033,6168,6196,6201-6203,6205-6206,6223,6292,6323,6437,6440,6449,6452,6573,6741,6783-6784,6912-6913,6960,7042,7061,7085,7095,7117,7120,7125,7132-7134,7186,7198,7239,7262,7308,7326,7330-7334,7359,7367,7433,7450-7452,7454,7478,7497,7500,7552,7554-7555,7570-7571,7573,7577,7598,7614-7615,7741,7780
/portal/trunk/src/main/java/org:7451
+ /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795/component/portal/src/main/java/org:5868
/portal/branches/branch-GTNPORTAL-1592/component/portal/src/main/java/org:4868,4894
/portal/branches/branch-GTNPORTAL-1643/component/portal/src/main/java/org:5002,5063,5167
/portal/branches/branch-GTNPORTAL-1700/component/portal/src/main/java/org:5348,5363,5402,5445
/portal/branches/branch-GTNPORTAL-1731/component/portal/src/main/java/org:5622,5644,5668
/portal/branches/branch-GTNPORTAL-1745/component/portal/src/main/java/org:5765
/portal/branches/branch-GTNPORTAL-1790/component/portal/src/main/java/org:5871
/portal/branches/branch-GTNPORTAL-1822/component/portal/src/main/java/org:5943,5952
/portal/branches/branch-GTNPORTAL-1832/component/portal/src/main/java/org:6030,6063
/portal/branches/branch-GTNPORTAL-1872/component/portal/src/main/java/org:6400,6551
/portal/branches/branch-GTNPORTAL-1921/component/portal/src/main/java/org:6603,6771-6772,6774
/portal/branches/branch-GTNPORTAL-1963/component/portal/src/main/java/org:6904,6915-6916
/portal/trunk/component/portal/src/main/java/org:4876,4891,5269,5744,5822,5943,6031,6033,6168,6196,6201-6203,6205-6206,6223,6292,6323,6437,6440,6449,6452,6573,6741,6783-6784,6912-6913,6960,7042,7061,7085,7095,7117,7120,7125,7132-7134,7186,7198,7239,7262,7308,7326,7330-7334,7359,7367,7412,7433,7450-7452,7454,7478,7497,7500,7552,7554-7555,7570-7571,7573,7577,7598,7614-7615,7741,7748,7780
/portal/trunk/src/main/java/org:7451
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/src/main/resources/conf/gatein/controller.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/src/main/resources/conf/gatein/controller.xml 2011-10-27 06:56:09 UTC (rev 7896)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/src/main/resources/conf/gatein/controller.xml 2011-10-27 08:11:13 UTC (rev 7897)
@@ -94,7 +94,7 @@
<request-param qname="gtn:objectid" name="objectId"/>
<!-- The group access -->
- <route path="/groups/{gtn:sitename}/{gtn:path}">
+ <route path="/g/{gtn:sitename}/{gtn:path}">
<request-param qname="gtn:lang" name="lang" value-mapping="never-empty">
<pattern>([A-Za-z]{2}(-[A-Za-z]{2})?)?</pattern>
</request-param>
@@ -107,7 +107,7 @@
</route>
<!-- The user access -->
- <route path="/users/{gtn:sitename}/{gtn:path}">
+ <route path="/u/{gtn:sitename}/{gtn:path}">
<request-param qname="gtn:lang" name="lang" value-mapping="never-empty">
<pattern>([A-Za-z]{2}(-[A-Za-z]{2})?)?</pattern>
</request-param>
Modified: epp/portal/branches/EPP_5_2_Branch/examples/portal/war/src/main/webapp/WEB-INF/web.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/examples/portal/war/src/main/webapp/WEB-INF/web.xml 2011-10-27 06:56:09 UTC (rev 7896)
+++ epp/portal/branches/EPP_5_2_Branch/examples/portal/war/src/main/webapp/WEB-INF/web.xml 2011-10-27 08:11:13 UTC (rev 7897)
@@ -271,8 +271,8 @@
<web-resource-name>user authentication</web-resource-name>
<url-pattern>/dologin</url-pattern>
<url-pattern>/private/*</url-pattern>
- <url-pattern>/groups/*</url-pattern>
- <url-pattern>/users/*</url-pattern>
+ <url-pattern>/g/*</url-pattern>
+ <url-pattern>/u/*</url-pattern>
<http-method>POST</http-method>
<http-method>GET</http-method>
</web-resource-collection>
Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/web.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/web.xml 2011-10-27 06:56:09 UTC (rev 7896)
+++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/web.xml 2011-10-27 08:11:13 UTC (rev 7897)
@@ -302,8 +302,8 @@
<web-resource-name>user authentication</web-resource-name>
<url-pattern>/dologin</url-pattern>
<url-pattern>/private/*</url-pattern>
- <url-pattern>/groups/*</url-pattern>
- <url-pattern>/users/*</url-pattern>
+ <url-pattern>/g/*</url-pattern>
+ <url-pattern>/u/*</url-pattern>
<http-method>POST</http-method>
<http-method>GET</http-method>
</web-resource-collection>
Modified: epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIPortalApplication.java
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIPortalApplication.java 2011-10-27 06:56:09 UTC (rev 7896)
+++ epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIPortalApplication.java 2011-10-27 08:11:13 UTC (rev 7897)
@@ -795,7 +795,7 @@
* and used for JS based portal url generation.
*
* <p>The portal url template are calculated base on the current request and site state.
- * Something like : <code>"/portal/groups/:platform:administrators/administration/registry?portal:componentId={portal:uicomponentId}&portal:action={portal:action}" ;</code>
+ * Something like : <code>"/portal/g/:platform:administrators/administration/registry?portal:componentId={portal:uicomponentId}&portal:action={portal:action}" ;</code>
*
* @return return portal url template
* @throws UnsupportedEncodingException
Property changes on: epp/portal/branches/EPP_5_2_Branch/wsrp-integration
___________________________________________________________________
Modified: svn:mergeinfo
- /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795/wsrp-integration:5868
/portal/branches/branch-GTNPORTAL-1592/wsrp-integration:4868,4894
/portal/branches/branch-GTNPORTAL-1643/wsrp-integration:5002,5063,5167
/portal/branches/branch-GTNPORTAL-1700/wsrp-integration:5348,5363,5402,5445
/portal/branches/branch-GTNPORTAL-1731/wsrp-integration:5622,5644,5668
/portal/branches/branch-GTNPORTAL-1745/wsrp-integration:5765
/portal/branches/branch-GTNPORTAL-1790/wsrp-integration:5871
/portal/branches/branch-GTNPORTAL-1822/wsrp-integration:5943,5952
/portal/branches/branch-GTNPORTAL-1832/wsrp-integration:6030,6063
/portal/branches/branch-GTNPORTAL-1872/wsrp-integration:6400,6551
/portal/branches/branch-GTNPORTAL-1921/wsrp-integration:6603,6771-6772,6774
/portal/branches/branch-GTNPORTAL-1963/wsrp-integration:6904,6915-6916
/portal/branches/decoupled-webos/wsrp-integration:6214-6243
/portal/branches/gatein-management/wsrp-integration:6920-6958
/portal/branches/global-portlet-metadata/wsrp-integration:6298-6384
/portal/branches/site-describability/wsrp-integration:6171-6235
/portal/trunk/wsrp-integration:4876,4891,5269,5744,5822,5943,6168,6196,6201-6203,6205-6206,6223,6323,6437,6440,6449,6452,6573,6741,6783-6784,6912-6913,6960,7042,7061,7085,7095,7117,7125,7132-7134,7186,7198,7239,7262,7308,7326,7330-7334,7359,7367,7433,7450-7452,7454,7478,7497,7500,7552,7554-7555,7570-7571,7573,7577,7598,7614-7615,7780
+ /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795/wsrp-integration:5868
/portal/branches/branch-GTNPORTAL-1592/wsrp-integration:4868,4894
/portal/branches/branch-GTNPORTAL-1643/wsrp-integration:5002,5063,5167
/portal/branches/branch-GTNPORTAL-1700/wsrp-integration:5348,5363,5402,5445
/portal/branches/branch-GTNPORTAL-1731/wsrp-integration:5622,5644,5668
/portal/branches/branch-GTNPORTAL-1745/wsrp-integration:5765
/portal/branches/branch-GTNPORTAL-1790/wsrp-integration:5871
/portal/branches/branch-GTNPORTAL-1822/wsrp-integration:5943,5952
/portal/branches/branch-GTNPORTAL-1832/wsrp-integration:6030,6063
/portal/branches/branch-GTNPORTAL-1872/wsrp-integration:6400,6551
/portal/branches/branch-GTNPORTAL-1921/wsrp-integration:6603,6771-6772,6774
/portal/branches/branch-GTNPORTAL-1963/wsrp-integration:6904,6915-6916
/portal/branches/decoupled-webos/wsrp-integration:6214-6243
/portal/branches/gatein-management/wsrp-integration:6920-6958
/portal/branches/global-portlet-metadata/wsrp-integration:6298-6384
/portal/branches/site-describability/wsrp-integration:6171-6235
/portal/trunk/wsrp-integration:4876,4891,5269,5744,5822,5943,6168,6196,6201-6203,6205-6206,6223,6323,6437,6440,6449,6452,6573,6741,6783-6784,6912-6913,6960,7042,7061,7085,7095,7117,7125,7132-7134,7186,7198,7239,7262,7308,7326,7330-7334,7359,7367,7412,7433,7450-7452,7454,7478,7497,7500,7552,7554-7555,7570-7571,7573,7577,7598,7614-7615,7748,7780
12 years, 8 months