gatein SVN: r3265 - in portal/trunk/webui/core/src: test and 2 other directories.
by do-not-reply＠jboss.org
Author: trong.tran
Date: 2010-06-09 00:32:19 -0400 (Wed, 09 Jun 2010)
New Revision: 3265
Added:
portal/trunk/webui/core/src/test/resources/
portal/trunk/webui/core/src/test/resources/webui-configuration.xml
Removed:
portal/trunk/webui/core/src/main/resources/webui-configuration.xml
Modified:
portal/trunk/webui/core/src/test/java/org/exoplatform/webui/test/TestApplication.java
Log:
Update tests failed
Deleted: portal/trunk/webui/core/src/main/resources/webui-configuration.xml
===================================================================
--- portal/trunk/webui/core/src/main/resources/webui-configuration.xml 2010-06-09 04:13:18 UTC (rev 3264)
+++ portal/trunk/webui/core/src/main/resources/webui-configuration.xml 2010-06-09 04:32:19 UTC (rev 3265)
@@ -1,107 +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.
-
--->
-
-<webui-configuration>
- <annotation-classes>
- <class>org.exoplatform.webui.test.UIComponentAnnotation</class>
- </annotation-classes>
-
- <!--
- <includes>
- <url>path</url>
- </includes>
- -->
-
- <ui-component-config id="id">
- <type>UIExoComponent</type>
- <lifecycle>lifecycle</lifecycle>
- <template>..............................</template>
- <decorator>............................</decorator>
-
- <init-params>
- <param><name>name</name><value>value</value></param>
- </init-params>
-
- <validators>
- <validator>
- <type>class.name</type>
- <init-params>
- <param><name>name</name><value>value</value></param>
- </init-params>
- </validator>
- </validators>
-
- <events>
- <event>
- <event-name>name</event-name>
- <execution-phase>decode</execution-phase>
- <init-params>
- <param><name>name</name><value>value</value></param>
- </init-params>
- <listener>class.type</listener>
- <listener>class.type</listener>
- </event>
-
- <event>
- <event-name>name</event-name>
- <execution-phase>any</execution-phase>
- <listener>class.type</listener>
- <listener>class.type</listener>
- </event>
- </events>
-
- <event-interceptors>
- <event-interceptor>
- <type>class.name</type>
- <init-params>
- <param><name>name</name><value>value</value></param>
- </init-params>
- <interceptor>class.type</interceptor>
- <interceptor>class.type</interceptor>
- </event-interceptor>
- </event-interceptors>
- </ui-component-config>
-
- <application>
- <init-params>
- <param><name>name</name><value>value</value></param>
- </init-params>
-
- <ui-component-root>org.exoplatform.portal.component.UIPortalApplication</ui-component-root>
- <state-manager>org.exoplatform.webui.application.mock.MockStateManager</state-manager>
-
- <application-lifecycle-listeners>
- <listener>org.exoplatform.webui.application.MonitorApplicationLifecycle</listener>
- </application-lifecycle-listeners>
-
- <events>
- <event>
- <event-name>name</event-name>
- <execution-phase>process</execution-phase>
- <init-params>
- <param><name>name</name><value>value</value></param>
- </init-params>
- <listener>class.type</listener>
- <listener>class.type</listener>
- </event>
- </events>
- </application>
-</webui-configuration>
Modified: portal/trunk/webui/core/src/test/java/org/exoplatform/webui/test/TestApplication.java
===================================================================
--- portal/trunk/webui/core/src/test/java/org/exoplatform/webui/test/TestApplication.java 2010-06-09 04:13:18 UTC (rev 3264)
+++ portal/trunk/webui/core/src/test/java/org/exoplatform/webui/test/TestApplication.java 2010-06-09 04:32:19 UTC (rev 3265)
@@ -40,7 +40,7 @@
initParams.put("webui.configuration", "webui.configuration");
String basedir = System.getProperty("basedir");
- String webuiConfig = basedir + "/src/main/resources/webui-configuration.xml";
+ String webuiConfig = basedir + "/src/test/resources/webui-configuration.xml";
Map<String, URL> resources = new HashMap<String, URL>();
resources.put("webui.configuration", new File(webuiConfig).toURL());
initParams.put("webui.configuration", new File(webuiConfig).toURL().toString());
Copied: portal/trunk/webui/core/src/test/resources/webui-configuration.xml (from rev 3255, portal/trunk/webui/core/src/main/resources/webui-configuration.xml)
===================================================================
--- portal/trunk/webui/core/src/test/resources/webui-configuration.xml (rev 0)
+++ portal/trunk/webui/core/src/test/resources/webui-configuration.xml 2010-06-09 04:32:19 UTC (rev 3265)
@@ -0,0 +1,107 @@
+<!--
+
+ 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.
+
+-->
+
+<webui-configuration>
+ <annotation-classes>
+ <class>org.exoplatform.webui.test.UIComponentAnnotation</class>
+ </annotation-classes>
+
+ <!--
+ <includes>
+ <url>path</url>
+ </includes>
+ -->
+
+ <ui-component-config id="id">
+ <type>UIExoComponent</type>
+ <lifecycle>lifecycle</lifecycle>
+ <template>..............................</template>
+ <decorator>............................</decorator>
+
+ <init-params>
+ <param><name>name</name><value>value</value></param>
+ </init-params>
+
+ <validators>
+ <validator>
+ <type>class.name</type>
+ <init-params>
+ <param><name>name</name><value>value</value></param>
+ </init-params>
+ </validator>
+ </validators>
+
+ <events>
+ <event>
+ <event-name>name</event-name>
+ <execution-phase>decode</execution-phase>
+ <init-params>
+ <param><name>name</name><value>value</value></param>
+ </init-params>
+ <listener>class.type</listener>
+ <listener>class.type</listener>
+ </event>
+
+ <event>
+ <event-name>name</event-name>
+ <execution-phase>any</execution-phase>
+ <listener>class.type</listener>
+ <listener>class.type</listener>
+ </event>
+ </events>
+
+ <event-interceptors>
+ <event-interceptor>
+ <type>class.name</type>
+ <init-params>
+ <param><name>name</name><value>value</value></param>
+ </init-params>
+ <interceptor>class.type</interceptor>
+ <interceptor>class.type</interceptor>
+ </event-interceptor>
+ </event-interceptors>
+ </ui-component-config>
+
+ <application>
+ <init-params>
+ <param><name>name</name><value>value</value></param>
+ </init-params>
+
+ <ui-component-root>org.exoplatform.portal.component.UIPortalApplication</ui-component-root>
+ <state-manager>org.exoplatform.webui.test.MockStateManager</state-manager>
+
+ <application-lifecycle-listeners>
+ <listener>org.exoplatform.webui.application.MonitorApplicationLifecycle</listener>
+ </application-lifecycle-listeners>
+
+ <events>
+ <event>
+ <event-name>name</event-name>
+ <execution-phase>process</execution-phase>
+ <init-params>
+ <param><name>name</name><value>value</value></param>
+ </init-params>
+ <listener>class.type</listener>
+ <listener>class.type</listener>
+ </event>
+ </events>
+ </application>
+</webui-configuration>
14 years, 7 months
gatein SVN: r3264 - portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component.
by do-not-reply＠jboss.org
Author: thanh_tung_do
Date: 2010-06-09 00:13:18 -0400 (Wed, 09 Jun 2010)
New Revision: 3264
Modified:
portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIGroupForm.java
Log:
GTNPORTAL-1218: don't link membership if membership type is null
Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIGroupForm.java
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIGroupForm.java 2010-06-09 04:09:26 UTC (rev 3263)
+++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIGroupForm.java 2010-06-09 04:13:18 UTC (rev 3264)
@@ -188,8 +188,11 @@
User user = service.getUserHandler().findUserByName(username);
MembershipType membershipType =
service.getMembershipTypeHandler().findMembershipType(GroupManagement.getUserACL().getAdminMSType());
- service.getMembershipHandler().linkMembership(user, newGroup, membershipType, true);
-
+
+ if(membershipType !=null){
+ service.getMembershipHandler().linkMembership(user, newGroup, membershipType, true);
+ }
+
uiGroupExplorer.changeGroup(changeGroupId);
uiGroupForm.reset();
uiGroupForm.setGroup(null);
14 years, 7 months
gatein SVN: r3263 - portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page.
by do-not-reply＠jboss.org
Author: hoang_to
Date: 2010-06-09 00:09:26 -0400 (Wed, 09 Jun 2010)
New Revision: 3263
Modified:
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageNodeForm.java
Log:
GTNPORTAL-1303: For system nodes: do not allow to change the visibility
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageNodeForm.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageNodeForm.java 2010-06-09 03:36:40 UTC (rev 3262)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageNodeForm.java 2010-06-09 04:09:26 UTC (rev 3263)
@@ -27,6 +27,7 @@
import org.exoplatform.portal.config.model.PageNavigation;
import org.exoplatform.portal.config.model.PageNode;
import org.exoplatform.portal.config.model.PortalConfig;
+import org.exoplatform.portal.mop.Visibility;
import org.exoplatform.portal.webui.navigation.PageNavigationUtils;
import org.exoplatform.portal.webui.navigation.ParentChildPair;
import org.exoplatform.portal.webui.portal.UIPortal;
@@ -150,24 +151,36 @@
icon = "Default";
getChild(UIFormInputIconSelector.class).setSelectedIcon(icon);
getUIStringInput("label").setValue(pageNode_.getLabel());
- getUIFormCheckBoxInput(VISIBLE).setChecked(pageNode_.isVisible());
- getUIFormCheckBoxInput(SHOW_PUBLICATION_DATE).setChecked(pageNode.isShowPublicationDate());
- setShowCheckPublicationDate(pageNode_.isVisible());
- Calendar cal = Calendar.getInstance();
- if (pageNode.getStartPublicationDate() != null)
+ if(pageNode.getVisibility() == Visibility.SYSTEM)
{
- cal.setTime(pageNode.getStartPublicationDate());
- getUIFormDateTimeInput(START_PUBLICATION_DATE).setCalendar(cal);
+ UIFormInputSet uiSettingSet = getChildById("PageNodeSetting");
+ uiSettingSet.removeChildById(VISIBLE);
+ uiSettingSet.removeChildById(SHOW_PUBLICATION_DATE);
+ uiSettingSet.removeChildById(START_PUBLICATION_DATE);
+ uiSettingSet.removeChildById(END_PUBLICATION_DATE);
}
else
- getUIFormDateTimeInput(START_PUBLICATION_DATE).setValue(null);
- if (pageNode.getEndPublicationDate() != null)
{
- cal.setTime(pageNode.getEndPublicationDate());
- getUIFormDateTimeInput(END_PUBLICATION_DATE).setCalendar(cal);
+ getUIFormCheckBoxInput(VISIBLE).setChecked(pageNode_.isVisible());
+ getUIFormCheckBoxInput(SHOW_PUBLICATION_DATE).setChecked(pageNode.isShowPublicationDate());
+ setShowCheckPublicationDate(pageNode_.isVisible());
+ Calendar cal = Calendar.getInstance();
+ if (pageNode.getStartPublicationDate() != null)
+ {
+ cal.setTime(pageNode.getStartPublicationDate());
+ getUIFormDateTimeInput(START_PUBLICATION_DATE).setCalendar(cal);
+ }
+ else
+ getUIFormDateTimeInput(START_PUBLICATION_DATE).setValue(null);
+ if (pageNode.getEndPublicationDate() != null)
+ {
+ cal.setTime(pageNode.getEndPublicationDate());
+ getUIFormDateTimeInput(END_PUBLICATION_DATE).setCalendar(cal);
+ }
+ else
+ getUIFormDateTimeInput(END_PUBLICATION_DATE).setValue(null);
}
- else
- getUIFormDateTimeInput(END_PUBLICATION_DATE).setValue(null);
+
}
public void invokeSetBindingBean(Object bean) throws Exception
14 years, 7 months
gatein SVN: r3262 - portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium.
by do-not-reply＠jboss.org
Author: hangnguyen
Date: 2010-06-08 23:36:40 -0400 (Tue, 08 Jun 2010)
New Revision: 3262
Modified:
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_19_EditPortal.html
Log:
Update this script base on GateIn 3.1.0 RC1
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_19_EditPortal.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_19_EditPortal.html 2010-06-09 03:31:34 UTC (rev 3261)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_19_EditPortal.html 2010-06-09 03:36:40 UTC (rev 3262)
@@ -208,17 +208,17 @@
</tr>
<tr>
<td>echo</td>
- <td>--Edit Portal Properties</td>
+ <td>--Edit Portal's Config</td>
<td></td>
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>link=Edit Portal's Properties</td>
+ <td>link=Edit Portal's Config</td>
<td>1,1</td>
</tr>
<tr>
<td>clickAt</td>
- <td>link=Edit Portal's Properties</td>
+ <td>link=Edit Portal's Config</td>
<td>1,1</td>
</tr>
<tr>
14 years, 7 months
gatein SVN: r3261 - portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium.
by do-not-reply＠jboss.org
Author: hangnguyen
Date: 2010-06-08 23:31:34 -0400 (Tue, 08 Jun 2010)
New Revision: 3261
Modified:
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_12_02_007_EditCurrentPortalWithNoOneForEditRight.html
Log:
Update this script base on GateIn 3.1.0 RC1
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_12_02_007_EditCurrentPortalWithNoOneForEditRight.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_12_02_007_EditCurrentPortalWithNoOneForEditRight.html 2010-06-09 03:14:12 UTC (rev 3260)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_12_02_007_EditCurrentPortalWithNoOneForEditRight.html 2010-06-09 03:31:34 UTC (rev 3261)
@@ -13,7 +13,7 @@
</thead><tbody>
<tr>
<td>open</td>
- <td>/portal/private/classic/</td>
+ <td>/portal/public/classic/</td>
<td></td>
</tr>
<tr>
@@ -22,6 +22,11 @@
<td></td>
</tr>
<tr>
+ <td>clickAt</td>
+ <td>link=Sign in</td>
+ <td></td>
+</tr>
+<tr>
<td>waitForElementPresent</td>
<td>username</td>
<td></td>
@@ -38,7 +43,7 @@
</tr>
<tr>
<td>clickAt</td>
- <td>link=Sign in</td>
+ <td>xpath=//div[@id='UIPortalLoginFormAction']/div/div/div</td>
<td></td>
</tr>
<tr>
@@ -68,12 +73,12 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>link=Portal Properties</td>
+ <td>link=Site's Config</td>
<td></td>
</tr>
<tr>
<td>clickAt</td>
- <td>link=Portal Properties</td>
+ <td>link=Site's Config</td>
<td></td>
</tr>
<tr>
@@ -176,11 +181,6 @@
<td>link=Sign out</td>
<td></td>
</tr>
-<tr>
- <td>waitForElementPresent</td>
- <td>link=Sign in</td>
- <td></td>
-</tr>
</tbody></table>
</body>
14 years, 7 months
gatein SVN: r3260 - in portal/trunk: component/portal/src/main/java/org/exoplatform/portal/config/model and 7 other directories.
by do-not-reply＠jboss.org
Author: trong.tran
Date: 2010-06-08 23:14:12 -0400 (Tue, 08 Jun 2010)
New Revision: 3260
Added:
portal/trunk/component/portal/src/main/java/org/exoplatform/portal/Constants.java
Removed:
portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/util/
portal/trunk/webui/core/src/main/java/org/exoplatform/webui/application/mock/
Modified:
portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIUserInfo.java
portal/trunk/webui/core/src/main/java/org/exoplatform/webui/form/UIFormCheckBoxInput.java
portal/trunk/webui/eXo/src/main/java/org/exoplatform/webui/organization/UIUserProfileInputSet.java
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletActionListener.java
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletLifecycle.java
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UILanguageSelector.java
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComposer.java
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UISkinSelector.java
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIPortalApplication.java
Log:
Clean up and improve a little code
Added: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/Constants.java
===================================================================
--- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/Constants.java (rev 0)
+++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/Constants.java 2010-06-09 03:14:12 UTC (rev 3260)
@@ -0,0 +1,35 @@
+/**
+ * Copyright (C) 2010 eXo Platform SAS.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.exoplatform.portal;
+
+/**
+ * @author <a href="trong.tran(a)exoplatform.com">Trong Tran</a>
+ * @version $Revision$
+ */
+
+public class Constants
+{
+ public static final String USER_LANGUAGE = "user.language";
+
+ public static final String USER_SKIN = "user.skin";
+
+ public static final String PORTAL_WINDOW_STATE = "portal:windowState";
+
+ public static final String PORTAL_PORTLET_MODE = "portal:portletMode";
+}
Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIUserInfo.java
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIUserInfo.java 2010-06-09 03:02:29 UTC (rev 3259)
+++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIUserInfo.java 2010-06-09 03:14:12 UTC (rev 3260)
@@ -20,6 +20,7 @@
package org.exoplatform.organization.webui.component;
import org.exoplatform.commons.serialization.api.annotations.Serialized;
+import org.exoplatform.portal.Constants;
import org.exoplatform.portal.webui.util.Util;
import org.exoplatform.portal.webui.workspace.UIPortalApplication;
import org.exoplatform.portal.webui.workspace.UIWorkingWorkspace;
@@ -123,7 +124,7 @@
{
UserProfileHandler hanlder = service.getUserProfileHandler();
UserProfile userProfile = hanlder.findUserProfileByName(event.getRequestContext().getRemoteUser());
- String language = userProfile.getAttribute("user.language");
+ String language = userProfile.getAttribute(Constants.USER_LANGUAGE);
UIPortalApplication uiApp = Util.getUIPortalApplication();
if (language == null || language.trim().length() < 1)
Modified: portal/trunk/webui/core/src/main/java/org/exoplatform/webui/form/UIFormCheckBoxInput.java
===================================================================
--- portal/trunk/webui/core/src/main/java/org/exoplatform/webui/form/UIFormCheckBoxInput.java 2010-06-09 03:02:29 UTC (rev 3259)
+++ portal/trunk/webui/core/src/main/java/org/exoplatform/webui/form/UIFormCheckBoxInput.java 2010-06-09 03:14:12 UTC (rev 3260)
@@ -137,8 +137,6 @@
if (onchange_ != null)
{
UIForm uiForm = getAncestorOfType(UIForm.class);
- //TODO TrongTT: The onchange don't affect in IE.
- // w.append(" onchange=\"").append(renderOnChangeEvent(uiForm)).append("\"");
w.append(" onclick=\"").append(renderOnChangeEvent(uiForm)).append("\"");
}
if (checked)
Modified: portal/trunk/webui/eXo/src/main/java/org/exoplatform/webui/organization/UIUserProfileInputSet.java
===================================================================
--- portal/trunk/webui/eXo/src/main/java/org/exoplatform/webui/organization/UIUserProfileInputSet.java 2010-06-09 03:02:29 UTC (rev 3259)
+++ portal/trunk/webui/eXo/src/main/java/org/exoplatform/webui/organization/UIUserProfileInputSet.java 2010-06-09 03:14:12 UTC (rev 3260)
@@ -20,6 +20,7 @@
package org.exoplatform.webui.organization;
import org.exoplatform.commons.serialization.api.annotations.Serialized;
+import org.exoplatform.portal.Constants;
import org.exoplatform.services.organization.OrganizationService;
import org.exoplatform.services.organization.UserProfile;
import org.exoplatform.services.organization.UserProfileHandler;
@@ -106,7 +107,7 @@
set.addUIFormInput(genderSelectBox);
continue;
}
- else if (key.equalsIgnoreCase("user.language"))
+ else if (key.equalsIgnoreCase(Constants.USER_LANGUAGE))
{
UIFormSelectBox langSelectBox = new UIFormSelectBox(key, key, null);
set.addUIFormInput(langSelectBox);
@@ -123,7 +124,7 @@
@Override
public void processRender(WebuiRequestContext context) throws Exception
{
- UIFormSelectBox langSelectBox = this.findComponentById("user.language");
+ UIFormSelectBox langSelectBox = this.findComponentById(Constants.USER_LANGUAGE);
initLanguageCombo(langSelectBox);
super.processRender(context);
}
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletActionListener.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletActionListener.java 2010-06-09 03:02:29 UTC (rev 3259)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletActionListener.java 2010-06-09 03:14:12 UTC (rev 3260)
@@ -19,6 +19,7 @@
package org.exoplatform.portal.webui.application;
+import org.exoplatform.portal.Constants;
import org.exoplatform.portal.application.PortalRequestContext;
import org.exoplatform.portal.pom.spi.wsrp.WSRP;
import org.exoplatform.portal.webui.page.UIPage;
@@ -709,8 +710,7 @@
pcontext.addUIComponentToUpdateByAjax(uiWorkingWS);
pcontext.setFullRender(true);
- String windowState = event.getRequestContext().getRequestParameter("portal:windowState");
- //TODO TrongTT: We should use only parameter for change WindowState
+ String windowState = event.getRequestContext().getRequestParameter(Constants.PORTAL_WINDOW_STATE);
if (windowState == null)
{
windowState = event.getRequestContext().getRequestParameter(UIComponent.OBJECTID).trim();
@@ -773,8 +773,7 @@
public void execute(Event<UIPortlet> event) throws Exception
{
UIPortlet uiPortlet = event.getSource();
- String portletMode = event.getRequestContext().getRequestParameter("portal:portletMode");
- //TODO TrongTT: We should use only parameter for change PortletMode
+ String portletMode = event.getRequestContext().getRequestParameter(Constants.PORTAL_PORTLET_MODE);
if (portletMode == null)
{
portletMode = event.getRequestContext().getRequestParameter(UIComponent.OBJECTID);
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletLifecycle.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletLifecycle.java 2010-06-09 03:02:29 UTC (rev 3259)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletLifecycle.java 2010-06-09 03:14:12 UTC (rev 3260)
@@ -92,7 +92,7 @@
return;
}
- String portletMode = context.getRequestParameter("portal:portletMode");
+ String portletMode = context.getRequestParameter(org.exoplatform.portal.Constants.PORTAL_PORTLET_MODE);
if (portletMode != null)
{
Event<UIComponent> event = uicomponent.createEvent("ChangePortletMode", Event.Phase.PROCESS, context);
@@ -100,7 +100,7 @@
event.broadcast();
}
- String windowState = context.getRequestParameter("portal:windowState");
+ String windowState = context.getRequestParameter(org.exoplatform.portal.Constants.PORTAL_WINDOW_STATE);
if (windowState != null)
{
Event<UIComponent> event = uicomponent.createEvent("ChangeWindowState", Event.Phase.PROCESS, context);
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UILanguageSelector.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UILanguageSelector.java 2010-06-09 03:02:29 UTC (rev 3259)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UILanguageSelector.java 2010-06-09 03:14:12 UTC (rev 3260)
@@ -19,6 +19,7 @@
package org.exoplatform.portal.webui.portal;
+import org.exoplatform.portal.Constants;
import org.exoplatform.portal.webui.util.Util;
import org.exoplatform.portal.webui.workspace.UIMaskWorkspace;
import org.exoplatform.portal.webui.workspace.UIPortalApplication;
@@ -137,7 +138,7 @@
if (remoteUser != null)
{
UserProfile userProfile = orgService.getUserProfileHandler().findUserProfileByName(remoteUser);
- userProfile.getUserInfoMap().put("user.language", language);
+ userProfile.getUserInfoMap().put(Constants.USER_LANGUAGE, language);
UserProfileHandler hanlder = orgService.getUserProfileHandler();
hanlder.saveUserProfile(userProfile, true);
}
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComposer.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComposer.java 2010-06-09 03:02:29 UTC (rev 3259)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComposer.java 2010-06-09 03:14:12 UTC (rev 3260)
@@ -19,6 +19,7 @@
package org.exoplatform.portal.webui.portal;
+import org.exoplatform.portal.Constants;
import org.exoplatform.portal.application.PortalRequestContext;
import org.exoplatform.portal.config.DataStorage;
import org.exoplatform.portal.config.StaleModelException;
@@ -222,7 +223,7 @@
String portalAppLanguage = uiPortalApp.getLocale().getLanguage();
OrganizationService orgService = getApplicationComponent(OrganizationService.class);
UserProfile userProfile = orgService.getUserProfileHandler().findUserProfileByName(remoteUser);
- String userLanguage = userProfile.getUserInfoMap().get("user.language");
+ String userLanguage = userProfile.getUserInfoMap().get(Constants.USER_LANGUAGE);
String browserLanguage = prContext.getRequest().getLocale().getLanguage();
// in case: edit current portal, set skin and language for uiPortalApp
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UISkinSelector.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UISkinSelector.java 2010-06-09 03:02:29 UTC (rev 3259)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UISkinSelector.java 2010-06-09 03:14:12 UTC (rev 3260)
@@ -19,6 +19,7 @@
package org.exoplatform.portal.webui.portal;
+import org.exoplatform.portal.Constants;
import org.exoplatform.portal.resource.SkinService;
import org.exoplatform.portal.webui.util.Util;
import org.exoplatform.portal.webui.workspace.UIMaskWorkspace;
@@ -117,7 +118,7 @@
if (remoteUser != null)
{
UserProfile userProfile = orgService.getUserProfileHandler().findUserProfileByName(remoteUser);
- userProfile.getUserInfoMap().put("user.skin", skin);
+ userProfile.getUserInfoMap().put(Constants.USER_SKIN, skin);
UserProfileHandler hanlder = orgService.getUserProfileHandler();
hanlder.saveUserProfile(userProfile, true);
}
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIPortalApplication.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIPortalApplication.java 2010-06-09 03:02:29 UTC (rev 3259)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIPortalApplication.java 2010-06-09 03:14:12 UTC (rev 3260)
@@ -20,6 +20,7 @@
package org.exoplatform.portal.webui.workspace;
import org.exoplatform.container.ExoContainer;
+import org.exoplatform.portal.Constants;
import org.exoplatform.portal.application.PortalRequestContext;
import org.exoplatform.portal.config.DataStorage;
import org.exoplatform.portal.config.NoSuchDataException;
@@ -155,8 +156,8 @@
UserProfile userProfile = orgService.getUserProfileHandler().findUserProfileByName(user);
if (userProfile != null)
{
- portalLanguage = userProfile.getUserInfoMap().get("user.language");
- portalSkin = userProfile.getUserInfoMap().get("user.skin");
+ portalLanguage = userProfile.getUserInfoMap().get(Constants.USER_LANGUAGE);
+ portalSkin = userProfile.getUserInfoMap().get(Constants.USER_SKIN);
}
else
{
14 years, 7 months
gatein SVN: r3259 - portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium.
by do-not-reply＠jboss.org
Author: hangnguyen
Date: 2010-06-08 23:02:29 -0400 (Tue, 08 Jun 2010)
New Revision: 3259
Removed:
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_25_05_005_CutPasteNodeInToTheSameThisSource
Log:
Deleted: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_25_05_005_CutPasteNodeInToTheSameThisSource
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_25_05_005_CutPasteNodeInToTheSameThisSource 2010-06-09 03:01:04 UTC (rev 3258)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_25_05_005_CutPasteNodeInToTheSameThisSource 2010-06-09 03:02:29 UTC (rev 3259)
@@ -1,167 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head profile="http://selenium-ide.openqa.org/profiles/test-case">
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<link rel="selenium.base" href="" />
-<title>Test_POR_25_05_005_CutPasteNodeInToTheSameThisSource</title>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
-<thead>
-<tr><td rowspan="1" colspan="3">Test_POR_25_05_005_CutPasteNodeInToTheSameThisSource</td></tr>
-</thead><tbody>
-<tr>
- <td>open</td>
- <td>/portal/public/classic/</td>
- <td></td>
-</tr>
-<tr>
- <td>echo</td>
- <td>--Login portal--</td>
- <td></td>
-</tr>
-<tr>
- <td>waitForElementPresent</td>
- <td>link=Sign in</td>
- <td></td>
-</tr>
-<tr>
- <td>clickAt</td>
- <td>link=Sign in</td>
- <td></td>
-</tr>
-<tr>
- <td>type</td>
- <td>username</td>
- <td>root</td>
-</tr>
-<tr>
- <td>type</td>
- <td>password</td>
- <td>gtn</td>
-</tr>
-<tr>
- <td>clickAt</td>
- <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td>
- <td></td>
-</tr>
-<tr>
- <td>echo</td>
- <td>--Open Navigation Management pop-up --</td>
- <td></td>
-</tr>
-<tr>
- <td>waitForElementPresent</td>
- <td>link=Group</td>
- <td></td>
-</tr>
-<tr>
- <td>clickAt</td>
- <td>link=Group</td>
- <td></td>
-</tr>
-<tr>
- <td>waitForElementPresent</td>
- <td>link=Edit Navigation</td>
- <td></td>
-</tr>
-<tr>
- <td>clickAt</td>
- <td>link=Edit Navigation</td>
- <td></td>
-</tr>
-<tr>
- <td>echo</td>
- <td>--Cut node--</td>
- <td></td>
-</tr>
-<tr>
- <td>waitForElementPresent</td>
- <td>//a[@title='New Staff']</td>
- <td></td>
-</tr>
-<tr>
- <td>componentExoContextMenu</td>
- <td>xpath=//div[@id='UINavigationNodeSelector']//a[@class='NodeIcon DefaultPageIcon' and @title='New Staff']</td>
- <td></td>
-</tr>
-<tr>
- <td>waitForElementPresent</td>
- <td>link=Cut Node</td>
- <td></td>
-</tr>
-<tr>
- <td>clickAt</td>
- <td>link=Cut Node</td>
- <td></td>
-</tr>
-<tr>
- <td>echo</td>
- <td>-- Paste node to same resource--</td>
- <td></td>
-</tr>
-<tr>
- <td>componentExoContextMenu</td>
- <td>//div[@class='UINavigationNodeSelector']/div/div/div/div[2]/div/div/div[2]/div[2]/div/div/a</td>
- <td></td>
-</tr>
-<tr>
- <td>waitForElementPresent</td>
- <td>xpath=//div[@id="UINavigationNodeSelector"]/div/div/div/div/div/div[2]/div/div/div[7]/a</td>
- <td></td>
-</tr>
-<tr>
- <td>clickAt</td>
- <td>xpath=//div[@id="UINavigationNodeSelector"]/div/div/div/div/div/div[2]/div/div/div[7]/a</td>
- <td></td>
-</tr>
-<tr>
- <td>echo</td>
- <td>--Verify text Message--</td>
- <td></td>
-</tr>
-<tr>
- <td>verifyTextPresent</td>
- <td>The source and the destination must be different.</td>
- <td></td>
-</tr>
-<tr>
- <td>waitForElementPresent</td>
- <td>//div[@id='UIPortalApplication']/div[@class='UIPopupWindow UIDragObject']//div[@class='MiddleLeftSideDecorator']//div[@class='UIPopupMessages']/div[@class='MessageActionBar']//a</td>
- <td></td>
-</tr>
-<tr>
- <td>clickAt</td>
- <td>//div[@id='UIPortalApplication']/div[@class='UIPopupWindow UIDragObject']//div[@class='MiddleLeftSideDecorator']//div[@class='UIPopupMessages']/div[@class='MessageActionBar']//a</td>
- <td></td>
-</tr>
-<tr>
- <td>waitForElementPresent</td>
- <td>link=Save</td>
- <td></td>
-</tr>
-<tr>
- <td>clickAt</td>
- <td>link=Save</td>
- <td></td>
-</tr>
-<tr>
- <td>echo</td>
- <td>-- Sign out--</td>
- <td></td>
-</tr>
-<tr>
- <td>waitForElementPresent</td>
- <td>link=Sign out</td>
- <td></td>
-</tr>
-<tr>
- <td>clickAt</td>
- <td>link=Sign out</td>
- <td></td>
-</tr>
-
-</tbody></table>
-</body>
-</html>
14 years, 7 months
gatein SVN: r3258 - portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium.
by do-not-reply＠jboss.org
Author: hangnguyen
Date: 2010-06-08 23:01:04 -0400 (Tue, 08 Jun 2010)
New Revision: 3258
Modified:
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_29_AddAndEditAndDeleteTab.html
Log:
Update this script base on GateIn 3.1.0 RC1
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_29_AddAndEditAndDeleteTab.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_29_AddAndEditAndDeleteTab.html 2010-06-09 02:54:26 UTC (rev 3257)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_29_AddAndEditAndDeleteTab.html 2010-06-09 03:01:04 UTC (rev 3258)
@@ -238,12 +238,12 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>link=Portal Properties</td>
+ <td>link=Site's Config</td>
<td></td>
</tr>
<tr>
<td>clickAt</td>
- <td>link=Portal Properties</td>
+ <td>link=Site's Config</td>
<td>1,1</td>
</tr>
<tr>
14 years, 7 months
gatein SVN: r3257 - portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium.
by do-not-reply＠jboss.org
Author: hangnguyen
Date: 2010-06-08 22:54:26 -0400 (Tue, 08 Jun 2010)
New Revision: 3257
Modified:
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_27_CreateAndEditPageAndEditSiteLayoutForGroup.html
Log:
Update this script base on GateIn 3.1.0 RC1
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_27_CreateAndEditPageAndEditSiteLayoutForGroup.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_27_CreateAndEditPageAndEditSiteLayoutForGroup.html 2010-06-09 02:45:47 UTC (rev 3256)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_27_CreateAndEditPageAndEditSiteLayoutForGroup.html 2010-06-09 02:54:26 UTC (rev 3257)
@@ -358,12 +358,12 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>link=Portal Properties</td>
+ <td>link=Site's Config</td>
<td></td>
</tr>
<tr>
<td>clickAt</td>
- <td>link=Portal Properties</td>
+ <td>link=Site's Config</td>
<td>1,1</td>
</tr>
<tr>
@@ -403,12 +403,12 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>link=Portal Properties</td>
+ <td>link=Site's Config</td>
<td></td>
</tr>
<tr>
<td>clickAt</td>
- <td>link=Portal Properties</td>
+ <td>link=Site's Config</td>
<td>1,1</td>
</tr>
<tr>
14 years, 7 months
gatein SVN: r3256 - portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium.
by do-not-reply＠jboss.org
Author: hangnguyen
Date: 2010-06-08 22:45:47 -0400 (Tue, 08 Jun 2010)
New Revision: 3256
Modified:
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_22_CreateAndEditPageAndEditSiteLayoutForPortal.html
Log:
Update this script base on GateIn 3.1.0 RC1
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_22_CreateAndEditPageAndEditSiteLayoutForPortal.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_22_CreateAndEditPageAndEditSiteLayoutForPortal.html 2010-06-09 01:59:32 UTC (rev 3255)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_22_CreateAndEditPageAndEditSiteLayoutForPortal.html 2010-06-09 02:45:47 UTC (rev 3256)
@@ -4,12 +4,12 @@
<head profile="http://selenium-ide.openqa.org/profiles/test-case">
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<link rel="selenium.base" href="http://localhost:8080/portal" />
-<title>SNF_PRL_22</title>
+<title>Test_SNF_PRL_22_CreateAndEditPageAndEditSiteLayoutForPortal</title>
</head>
<body>
<table cellpadding="1" cellspacing="1" border="1">
<thead>
-<tr><td rowspan="1" colspan="3">SNF_PRL_22</td></tr>
+<tr><td rowspan="1" colspan="3">Test_SNF_PRL_22_CreateAndEditPageAndEditSiteLayoutForPortal</td></tr>
</thead><tbody>
<tr>
<td>open</td>
@@ -58,12 +58,12 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>link=Portal Properties</td>
+ <td>link=Site's Config</td>
<td></td>
</tr>
<tr>
<td>clickAt</td>
- <td>link=Portal Properties</td>
+ <td>link=Site's Config</td>
<td>1,1</td>
</tr>
<tr>
@@ -183,12 +183,12 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>link=Portal Properties</td>
+ <td>link=Site's Config</td>
<td></td>
</tr>
<tr>
<td>clickAt</td>
- <td>link=Portal Properties</td>
+ <td>link=Site's Config</td>
<td>1,1</td>
</tr>
<tr>
14 years, 7 months