gatein SVN: r6871 - portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl.
by do-not-reply@jboss.org
Author: chris.laprun(a)jboss.com
Date: 2011-07-14 10:52:00 -0400 (Thu, 14 Jul 2011)
New Revision: 6871
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/PortalImpl.java
Log:
- Encapsulated calls to RequestLifeCycle so that it can be used more easily by other implementation classes.
- Started get(Id) implementation.
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-07-14 11:13:47 UTC (rev 6870)
+++ portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/GateInImpl.java 2011-07-14 14:52:00 UTC (rev 6871)
@@ -71,7 +71,7 @@
{
try
{
- RequestLifeCycle.begin(container);
+ begin();
final List<PortalData> portals = dataStorage.find(PORTALS).getAll();
return new PortalIterableResult(portals);
@@ -82,10 +82,15 @@
}
finally
{
- RequestLifeCycle.end();
+ end();
}
}
+ void end()
+ {
+ RequestLifeCycle.end();
+ }
+
public Portal getPortal(Id<Portal> portalId)
{
PortalData portalData = getPortalDataFor(portalId);
@@ -129,7 +134,22 @@
public <T extends Identifiable> T get(Id<T> id)
{
- return null; //To change body of implemented methods use File | Settings | File Templates.
+ Class<T> type = id.getIdentifiableType();
+
+ Object result;
+
+ // todo: fix the use canonical names to avoid classloader issues?
+ String canonicalName = type.getCanonicalName();
+ if (Portal.class.getCanonicalName().equals(canonicalName))
+ {
+ result = getPortal((Id<Portal>)id);
+ }
+ else
+ {
+ throw new UnsupportedOperationException("Id<" + type.getSimpleName() + "> not yet supported");
+ }
+
+ return type.cast(result);
}
public <T extends Site> Site getSite(Id<Site> siteId, Site.Type<T> type)
@@ -203,7 +223,7 @@
ParameterValidation.throwIllegalArgExceptionIfNull(portalId, "Portal Id");
try
{
- RequestLifeCycle.begin(container);
+ begin();
return dataStorage.getPortalConfig(PortalKey.create(portalId.toString()));
}
@@ -213,10 +233,15 @@
}
finally
{
- RequestLifeCycle.end();
+ end();
}
}
+ void begin()
+ {
+ RequestLifeCycle.begin(container);
+ }
+
private static class PortalIterator implements Iterator<Portal>
{
private int current;
Modified: portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/PortalImpl.java
===================================================================
--- portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/PortalImpl.java 2011-07-14 11:13:47 UTC (rev 6870)
+++ portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/PortalImpl.java 2011-07-14 14:52:00 UTC (rev 6871)
@@ -58,12 +58,21 @@
public Navigation getNavigation()
{
NavigationService service = getGateInImpl().getNavigationService();
- NavigationContext navigation = service.loadNavigation(SiteKey.portal(getName()));
- //
- NodeContext<?> node = service.loadNode(NodeModel.SELF_MODEL, navigation, Scope.SINGLE, null).getNode();
+ try
+ {
+ getGateInImpl().begin();
+ NavigationContext navigation = service.loadNavigation(SiteKey.portal(getName()));
- return new NavigationImpl(node, getGateInImpl());
+ //
+ NodeContext<?> node = service.loadNode(NodeModel.SELF_MODEL, navigation, Scope.SINGLE, null).getNode();
+
+ return new NavigationImpl(node, getGateInImpl());
+ }
+ finally
+ {
+ getGateInImpl().end();
+ }
}
public Type getType()
13 years, 5 months
gatein SVN: r6870 - portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium.
by do-not-reply@jboss.org
Author: hanh.ly
Date: 2011-07-14 07:13:47 -0400 (Thu, 14 Jul 2011)
New Revision: 6870
Modified:
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_01_SignInSignOut.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_04_RememberMyLogin.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_05_RecoverUserNameOrPassword.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_06_CreateNewAccount.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_07_UsersManagement.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_08_SearchUser.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_09_GroupManagement.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_10_AddUserIntoGroup.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_11_MembershipManagement.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_12_ImportApplication.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_13_ShowOrHideImportApplicationIcon.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_14_ManageCategory.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_15_AddApplicationIntoCategory.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_16_ViewPortlets.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_17_ManageRemoteGadget.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_18_ManageManualGadget.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_19_LinkToGadget.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_20_ExpandAllCollapseAll.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_21_CreateNewPortal.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_22_DeletePortal.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_23_ChangeUsingPortal.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_24_ChangeSiteConfigOFPortal.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_25_ChangeContainerInPortal.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_26_ChangeApplicationInPortal.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_27_AddApplicationIntoContainerInLayoutOfPortal.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_28_EditPortalConfig.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_29_AddNewpageForPortal.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_30_EditPageForPortal.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_31_ManageNodePortal.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_32_MoreActionOnNodeInEditNavigationOfPortal.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_33_EditNodePageProperties.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_34_ChangeContainerWhenEditPropertiesOfNodeInPortalNavigation.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_35_ChangeApplicationWhenEditPropertiesOfNodeInPortalNavigation.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_36_AddApplicationIntoContainerWhenEditPagePropertiesOfNode.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_37_ManageNavigationOfGroup.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_38_EditPropertiesForGroup.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_39_AddNewpageForGroup.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_40_EditPageForGroup.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_41_ChangeSiteConfigWhenEditlayOutForGroupPage.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_42_ChangeContainerWhenEditLayoutForGroupPage.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_43_ChangeApplicationWhenEditLayoutForGroupPage.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_44_AddApplicationIntoCategoryWhenEditLayoutForGroupPage.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_45_ManageNodeGroup.html.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_46_MoreActionOnNodeInEditNavigationOfGroup.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_47_EditNodePagePropertiesForGroup.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_48_ChangeContainerWhenEditPagePropertiesOfNode.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_49_ChangeApplicationWhenEditPagePropertiesOfNode.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_50_AddApplicationIntoContainerWhenEditPagePropertiesOfNode.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_51_ManageGadget.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_52_ManageTab.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_53_DragAndDropGadget.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_54_AddNewpageForUser.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_55_EditPageForUser.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_56_ChangeSiteConfigWhenEditLayoutForUserPage.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_57_ChangeContainerWhenEditLayoutForUserPage.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_58_ChangeApplicationWhenEditLayoutForUserPage.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_59_AddApplicationIntoCateGoryWhenEditLayoutForUserPage.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_60_ShowAndSearchPage.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_61_ManagePageOfPortal.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_62_ManagePageOfGroup.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_63_ManagePageOfUser.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_64_ChangeLanguageInPrivateMode.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_65_ChangeSkin.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_66_ChangeUserProfile.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_67_ChangePassword.html
Log:
TESTVN-3813
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_01_SignInSignOut.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_01_SignInSignOut.html 2011-07-13 15:50:50 UTC (rev 6869)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_01_SignInSignOut.html 2011-07-14 11:13:47 UTC (rev 6870)
@@ -53,7 +53,7 @@
</tr>
<tr>
<td>clickAndWait</td>
- <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td>
+ <td>//a[@id='UIPortalLoginFormAction']</td>
<td></td>
</tr>
<tr>
@@ -108,7 +108,7 @@
</tr>
<tr>
<td>click</td>
- <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td>
+ <td>//a[@id='UIPortalLoginFormAction']</td>
<td></td>
</tr>
<tr>
@@ -163,7 +163,7 @@
</tr>
<tr>
<td>click</td>
- <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td>
+ <td>//a[@id='UIPortalLoginFormAction']</td>
<td></td>
</tr>
<tr>
@@ -218,7 +218,7 @@
</tr>
<tr>
<td>click</td>
- <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td>
+ <td>//a[@id='UIPortalLoginFormAction']</td>
<td></td>
</tr>
<tr>
@@ -241,7 +241,6 @@
<td>link=Sign out</td>
<td></td>
</tr>
-
</tbody></table>
</body>
</html>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_04_RememberMyLogin.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_04_RememberMyLogin.html 2011-07-13 15:50:50 UTC (rev 6869)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_04_RememberMyLogin.html 2011-07-14 11:13:47 UTC (rev 6870)
@@ -63,7 +63,7 @@
</tr>
<tr>
<td>clickAndWait</td>
- <td>//div[@id='UIPortalLoginFormAction']//div[@class='ButtonMiddle']/a</td>
+ <td>//a[@id='UIPortalLoginFormAction']</td>
<td></td>
</tr>
<tr>
@@ -121,7 +121,6 @@
<td>link=Sign out</td>
<td></td>
</tr>
-
</tbody></table>
</body>
</html>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_05_RecoverUserNameOrPassword.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_05_RecoverUserNameOrPassword.html 2011-07-13 15:50:50 UTC (rev 6869)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_05_RecoverUserNameOrPassword.html 2011-07-14 11:13:47 UTC (rev 6870)
@@ -48,7 +48,7 @@
</tr>
<tr>
<td>clickAndWait</td>
- <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td>
+ <td>//a[@id='UIPortalLoginFormAction']</td>
<td></td>
</tr>
<tr>
@@ -143,12 +143,12 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>//div[3]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div/a</td>
+ <td>//div[3]/div/div[2]/div/div/div/div/div/div[3]/div/a</td>
<td></td>
</tr>
<tr>
<td>click</td>
- <td>//div[3]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div/a</td>
+ <td>//div[3]/div/div[2]/div/div/div/div/div/div[3]/div/a</td>
<td></td>
</tr>
<tr>
@@ -218,12 +218,12 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>//div[6]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div/a</td>
+ <td>//div[6]/div/div[2]/div/div/div/div/div/div[3]/div/a</td>
<td></td>
</tr>
<tr>
<td>click</td>
- <td>//div[6]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div/a</td>
+ <td>//div[6]/div/div[2]/div/div/div/div/div/div[3]/div/a</td>
<td></td>
</tr>
<tr>
@@ -388,7 +388,7 @@
</tr>
<tr>
<td>clickAndWait</td>
- <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td>
+ <td>//a[@id='UIPortalLoginFormAction']</td>
<td></td>
</tr>
<tr>
@@ -433,7 +433,7 @@
</tr>
<tr>
<td>click</td>
- <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td>
+ <td>//a[@id='UIPortalLoginFormAction']</td>
<td></td>
</tr>
<tr>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_06_CreateNewAccount.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_06_CreateNewAccount.html 2011-07-13 15:50:50 UTC (rev 6869)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_06_CreateNewAccount.html 2011-07-14 11:13:47 UTC (rev 6870)
@@ -48,7 +48,7 @@
</tr>
<tr>
<td>clickAndWait</td>
- <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td>
+ <td>//a[@id='UIPortalLoginFormAction']</td>
<td></td>
</tr>
<tr>
@@ -198,7 +198,7 @@
</tr>
<tr>
<td>clickAndWait</td>
- <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td>
+ <td>//a[@id='UIPortalLoginFormAction']</td>
<td></td>
</tr>
<tr>
@@ -243,7 +243,7 @@
</tr>
<tr>
<td>clickAndWait</td>
- <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td>
+ <td>//a[@id='UIPortalLoginFormAction']</td>
<td></td>
</tr>
<tr>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_07_UsersManagement.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_07_UsersManagement.html 2011-07-13 15:50:50 UTC (rev 6869)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_07_UsersManagement.html 2011-07-14 11:13:47 UTC (rev 6870)
@@ -48,7 +48,7 @@
</tr>
<tr>
<td>clickAndWait</td>
- <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td>
+ <td>//a[@id='UIPortalLoginFormAction']</td>
<td></td>
</tr>
<tr>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_08_SearchUser.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_08_SearchUser.html 2011-07-13 15:50:50 UTC (rev 6869)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_08_SearchUser.html 2011-07-14 11:13:47 UTC (rev 6870)
@@ -48,7 +48,7 @@
</tr>
<tr>
<td>clickAndWait</td>
- <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td>
+ <td>//a[@id='UIPortalLoginFormAction']</td>
<td></td>
</tr>
<tr>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_09_GroupManagement.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_09_GroupManagement.html 2011-07-13 15:50:50 UTC (rev 6869)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_09_GroupManagement.html 2011-07-14 11:13:47 UTC (rev 6870)
@@ -48,7 +48,7 @@
</tr>
<tr>
<td>clickAndWait</td>
- <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td>
+ <td>//a[@id='UIPortalLoginFormAction']</td>
<td></td>
</tr>
<tr>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_10_AddUserIntoGroup.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_10_AddUserIntoGroup.html 2011-07-13 15:50:50 UTC (rev 6869)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_10_AddUserIntoGroup.html 2011-07-14 11:13:47 UTC (rev 6870)
@@ -48,7 +48,7 @@
</tr>
<tr>
<td>clickAndWait</td>
- <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td>
+ <td>//a[@id='UIPortalLoginFormAction']</td>
<td></td>
</tr>
<tr>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_11_MembershipManagement.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_11_MembershipManagement.html 2011-07-13 15:50:50 UTC (rev 6869)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_11_MembershipManagement.html 2011-07-14 11:13:47 UTC (rev 6870)
@@ -48,7 +48,7 @@
</tr>
<tr>
<td>clickAndWait</td>
- <td>//div[@id='UIPortalLoginFormAction']/div/div/div</td>
+ <td>//a[@id='UIPortalLoginFormAction']</td>
<td></td>
</tr>
<tr>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_12_ImportApplication.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_12_ImportApplication.html 2011-07-13 15:50:50 UTC (rev 6869)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_12_ImportApplication.html 2011-07-14 11:13:47 UTC (rev 6870)
@@ -48,7 +48,7 @@
</tr>
<tr>
<td>clickAndWait</td>
- <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td>
+ <td>//a[@id='UIPortalLoginFormAction']</td>
<td></td>
</tr>
<tr>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_13_ShowOrHideImportApplicationIcon.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_13_ShowOrHideImportApplicationIcon.html 2011-07-13 15:50:50 UTC (rev 6869)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_13_ShowOrHideImportApplicationIcon.html 2011-07-14 11:13:47 UTC (rev 6870)
@@ -48,7 +48,7 @@
</tr>
<tr>
<td>clickAndWait</td>
- <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td>
+ <td>//a[@id='UIPortalLoginFormAction']</td>
<td></td>
</tr>
<tr>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_14_ManageCategory.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_14_ManageCategory.html 2011-07-13 15:50:50 UTC (rev 6869)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_14_ManageCategory.html 2011-07-14 11:13:47 UTC (rev 6870)
@@ -48,7 +48,7 @@
</tr>
<tr>
<td>clickAndWait</td>
- <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td>
+ <td>//a[@id='UIPortalLoginFormAction']</td>
<td></td>
</tr>
<tr>
@@ -256,7 +256,6 @@
<td>link=Sign out</td>
<td></td>
</tr>
-
</tbody></table>
</body>
</html>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_15_AddApplicationIntoCategory.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_15_AddApplicationIntoCategory.html 2011-07-13 15:50:50 UTC (rev 6869)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_15_AddApplicationIntoCategory.html 2011-07-14 11:13:47 UTC (rev 6870)
@@ -43,7 +43,7 @@
</tr>
<tr>
<td>clickAndWait</td>
- <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td>
+ <td>//a[@id='UIPortalLoginFormAction']</td>
<td></td>
</tr>
<tr>
@@ -241,7 +241,6 @@
<td>link=Sign out</td>
<td></td>
</tr>
-
</tbody></table>
</body>
</html>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_16_ViewPortlets.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_16_ViewPortlets.html 2011-07-13 15:50:50 UTC (rev 6869)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_16_ViewPortlets.html 2011-07-14 11:13:47 UTC (rev 6870)
@@ -48,7 +48,7 @@
</tr>
<tr>
<td>clickAndWait</td>
- <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td>
+ <td>//a[@id='UIPortalLoginFormAction']</td>
<td></td>
</tr>
<tr>
@@ -686,7 +686,6 @@
<td>link=Sign out</td>
<td></td>
</tr>
-
</tbody></table>
</body>
</html>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_17_ManageRemoteGadget.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_17_ManageRemoteGadget.html 2011-07-13 15:50:50 UTC (rev 6869)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_17_ManageRemoteGadget.html 2011-07-14 11:13:47 UTC (rev 6870)
@@ -48,7 +48,7 @@
</tr>
<tr>
<td>clickAndWait</td>
- <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td>
+ <td>//a[@id='UIPortalLoginFormAction']</td>
<td></td>
</tr>
<tr>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_18_ManageManualGadget.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_18_ManageManualGadget.html 2011-07-13 15:50:50 UTC (rev 6869)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_18_ManageManualGadget.html 2011-07-14 11:13:47 UTC (rev 6870)
@@ -48,7 +48,7 @@
</tr>
<tr>
<td>clickAndWait</td>
- <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td>
+ <td>//a[@id='UIPortalLoginFormAction']</td>
<td></td>
</tr>
<tr>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_19_LinkToGadget.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_19_LinkToGadget.html 2011-07-13 15:50:50 UTC (rev 6869)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_19_LinkToGadget.html 2011-07-14 11:13:47 UTC (rev 6870)
@@ -48,7 +48,7 @@
</tr>
<tr>
<td>clickAndWait</td>
- <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td>
+ <td>//a[@id='UIPortalLoginFormAction']</td>
<td></td>
</tr>
<tr>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_20_ExpandAllCollapseAll.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_20_ExpandAllCollapseAll.html 2011-07-13 15:50:50 UTC (rev 6869)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_20_ExpandAllCollapseAll.html 2011-07-14 11:13:47 UTC (rev 6870)
@@ -48,7 +48,7 @@
</tr>
<tr>
<td>clickAndWait</td>
- <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td>
+ <td>//a[@id='UIPortalLoginFormAction']</td>
<td></td>
</tr>
<tr>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_21_CreateNewPortal.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_21_CreateNewPortal.html 2011-07-13 15:50:50 UTC (rev 6869)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_21_CreateNewPortal.html 2011-07-14 11:13:47 UTC (rev 6870)
@@ -48,7 +48,7 @@
</tr>
<tr>
<td>clickAndWait</td>
- <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td>
+ <td>//a[@id='UIPortalLoginFormAction']</td>
<td></td>
</tr>
<tr>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_22_DeletePortal.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_22_DeletePortal.html 2011-07-13 15:50:50 UTC (rev 6869)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_22_DeletePortal.html 2011-07-14 11:13:47 UTC (rev 6870)
@@ -48,7 +48,7 @@
</tr>
<tr>
<td>clickAndWait</td>
- <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td>
+ <td>//a[@id='UIPortalLoginFormAction']</td>
<td></td>
</tr>
<tr>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_23_ChangeUsingPortal.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_23_ChangeUsingPortal.html 2011-07-13 15:50:50 UTC (rev 6869)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_23_ChangeUsingPortal.html 2011-07-14 11:13:47 UTC (rev 6870)
@@ -48,7 +48,7 @@
</tr>
<tr>
<td>clickAndWait</td>
- <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td>
+ <td>//a[@id='UIPortalLoginFormAction']</td>
<td></td>
</tr>
<tr>
@@ -311,7 +311,6 @@
<td>link=Sign out</td>
<td></td>
</tr>
-
</tbody></table>
</body>
</html>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_24_ChangeSiteConfigOFPortal.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_24_ChangeSiteConfigOFPortal.html 2011-07-13 15:50:50 UTC (rev 6869)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_24_ChangeSiteConfigOFPortal.html 2011-07-14 11:13:47 UTC (rev 6870)
@@ -48,7 +48,7 @@
</tr>
<tr>
<td>clickAndWait</td>
- <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td>
+ <td>//a[@id='UIPortalLoginFormAction']</td>
<td></td>
</tr>
<tr>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_25_ChangeContainerInPortal.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_25_ChangeContainerInPortal.html 2011-07-13 15:50:50 UTC (rev 6869)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_25_ChangeContainerInPortal.html 2011-07-14 11:13:47 UTC (rev 6870)
@@ -48,7 +48,7 @@
</tr>
<tr>
<td>clickAndWait</td>
- <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td>
+ <td>//a[@id='UIPortalLoginFormAction']</td>
<td></td>
</tr>
<tr>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_26_ChangeApplicationInPortal.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_26_ChangeApplicationInPortal.html 2011-07-13 15:50:50 UTC (rev 6869)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_26_ChangeApplicationInPortal.html 2011-07-14 11:13:47 UTC (rev 6870)
@@ -48,7 +48,7 @@
</tr>
<tr>
<td>clickAndWait</td>
- <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td>
+ <td>//a[@id='UIPortalLoginFormAction']</td>
<td></td>
</tr>
<tr>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_27_AddApplicationIntoContainerInLayoutOfPortal.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_27_AddApplicationIntoContainerInLayoutOfPortal.html 2011-07-13 15:50:50 UTC (rev 6869)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_27_AddApplicationIntoContainerInLayoutOfPortal.html 2011-07-14 11:13:47 UTC (rev 6870)
@@ -48,7 +48,7 @@
</tr>
<tr>
<td>clickAndWait</td>
- <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td>
+ <td>//a[@id='UIPortalLoginFormAction']</td>
<td></td>
</tr>
<tr>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_28_EditPortalConfig.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_28_EditPortalConfig.html 2011-07-13 15:50:50 UTC (rev 6869)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_28_EditPortalConfig.html 2011-07-14 11:13:47 UTC (rev 6870)
@@ -48,7 +48,7 @@
</tr>
<tr>
<td>clickAndWait</td>
- <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td>
+ <td>//a[@id='UIPortalLoginFormAction']</td>
<td></td>
</tr>
<tr>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_29_AddNewpageForPortal.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_29_AddNewpageForPortal.html 2011-07-13 15:50:50 UTC (rev 6869)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_29_AddNewpageForPortal.html 2011-07-14 11:13:47 UTC (rev 6870)
@@ -48,7 +48,7 @@
</tr>
<tr>
<td>clickAndWait</td>
- <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td>
+ <td>//a[@id='UIPortalLoginFormAction']</td>
<td></td>
</tr>
<tr>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_30_EditPageForPortal.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_30_EditPageForPortal.html 2011-07-13 15:50:50 UTC (rev 6869)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_30_EditPageForPortal.html 2011-07-14 11:13:47 UTC (rev 6870)
@@ -48,7 +48,7 @@
</tr>
<tr>
<td>clickAndWait</td>
- <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td>
+ <td>//a[@id='UIPortalLoginFormAction']</td>
<td></td>
</tr>
<tr>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_31_ManageNodePortal.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_31_ManageNodePortal.html 2011-07-13 15:50:50 UTC (rev 6869)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_31_ManageNodePortal.html 2011-07-14 11:13:47 UTC (rev 6870)
@@ -48,7 +48,7 @@
</tr>
<tr>
<td>clickAndWait</td>
- <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td>
+ <td>//a[@id='UIPortalLoginFormAction']</td>
<td></td>
</tr>
<tr>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_32_MoreActionOnNodeInEditNavigationOfPortal.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_32_MoreActionOnNodeInEditNavigationOfPortal.html 2011-07-13 15:50:50 UTC (rev 6869)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_32_MoreActionOnNodeInEditNavigationOfPortal.html 2011-07-14 11:13:47 UTC (rev 6870)
@@ -48,7 +48,7 @@
</tr>
<tr>
<td>clickAndWait</td>
- <td>//div[@id='UIPortalLoginFormAction']/div/div/div</td>
+ <td>//a[@id='UIPortalLoginFormAction']</td>
<td></td>
</tr>
<tr>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_33_EditNodePageProperties.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_33_EditNodePageProperties.html 2011-07-13 15:50:50 UTC (rev 6869)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_33_EditNodePageProperties.html 2011-07-14 11:13:47 UTC (rev 6870)
@@ -48,7 +48,7 @@
</tr>
<tr>
<td>clickAndWait</td>
- <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td>
+ <td>//a[@id='UIPortalLoginFormAction']</td>
<td></td>
</tr>
<tr>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_34_ChangeContainerWhenEditPropertiesOfNodeInPortalNavigation.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_34_ChangeContainerWhenEditPropertiesOfNodeInPortalNavigation.html 2011-07-13 15:50:50 UTC (rev 6869)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_34_ChangeContainerWhenEditPropertiesOfNodeInPortalNavigation.html 2011-07-14 11:13:47 UTC (rev 6870)
@@ -48,7 +48,7 @@
</tr>
<tr>
<td>clickAndWait</td>
- <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td>
+ <td>//a[@id='UIPortalLoginFormAction']</td>
<td></td>
</tr>
<tr>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_35_ChangeApplicationWhenEditPropertiesOfNodeInPortalNavigation.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_35_ChangeApplicationWhenEditPropertiesOfNodeInPortalNavigation.html 2011-07-13 15:50:50 UTC (rev 6869)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_35_ChangeApplicationWhenEditPropertiesOfNodeInPortalNavigation.html 2011-07-14 11:13:47 UTC (rev 6870)
@@ -48,7 +48,7 @@
</tr>
<tr>
<td>clickAndWait</td>
- <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td>
+ <td>//a[@id='UIPortalLoginFormAction']</td>
<td></td>
</tr>
<tr>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_36_AddApplicationIntoContainerWhenEditPagePropertiesOfNode.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_36_AddApplicationIntoContainerWhenEditPagePropertiesOfNode.html 2011-07-13 15:50:50 UTC (rev 6869)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_36_AddApplicationIntoContainerWhenEditPagePropertiesOfNode.html 2011-07-14 11:13:47 UTC (rev 6870)
@@ -48,7 +48,7 @@
</tr>
<tr>
<td>clickAndWait</td>
- <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td>
+ <td>//a[@id='UIPortalLoginFormAction']</td>
<td></td>
</tr>
<tr>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_37_ManageNavigationOfGroup.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_37_ManageNavigationOfGroup.html 2011-07-13 15:50:50 UTC (rev 6869)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_37_ManageNavigationOfGroup.html 2011-07-14 11:13:47 UTC (rev 6870)
@@ -43,7 +43,7 @@
</tr>
<tr>
<td>clickAndWait</td>
- <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td>
+ <td>//a[@id='UIPortalLoginFormAction']</td>
<td></td>
</tr>
<tr>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_38_EditPropertiesForGroup.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_38_EditPropertiesForGroup.html 2011-07-13 15:50:50 UTC (rev 6869)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_38_EditPropertiesForGroup.html 2011-07-14 11:13:47 UTC (rev 6870)
@@ -38,7 +38,7 @@
</tr>
<tr>
<td>clickAndWait</td>
- <td>//div[@id='UIPortalLoginFormAction']/div/div/div</td>
+ <td>//a[@id='UIPortalLoginFormAction']</td>
<td></td>
</tr>
<tr>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_39_AddNewpageForGroup.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_39_AddNewpageForGroup.html 2011-07-13 15:50:50 UTC (rev 6869)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_39_AddNewpageForGroup.html 2011-07-14 11:13:47 UTC (rev 6870)
@@ -48,7 +48,7 @@
</tr>
<tr>
<td>clickAndWait</td>
- <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td>
+ <td>//a[@id='UIPortalLoginFormAction']</td>
<td></td>
</tr>
<tr>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_40_EditPageForGroup.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_40_EditPageForGroup.html 2011-07-13 15:50:50 UTC (rev 6869)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_40_EditPageForGroup.html 2011-07-14 11:13:47 UTC (rev 6870)
@@ -48,7 +48,7 @@
</tr>
<tr>
<td>clickAndWait</td>
- <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td>
+ <td>//a[@id='UIPortalLoginFormAction']</td>
<td></td>
</tr>
<tr>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_41_ChangeSiteConfigWhenEditlayOutForGroupPage.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_41_ChangeSiteConfigWhenEditlayOutForGroupPage.html 2011-07-13 15:50:50 UTC (rev 6869)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_41_ChangeSiteConfigWhenEditlayOutForGroupPage.html 2011-07-14 11:13:47 UTC (rev 6870)
@@ -48,7 +48,7 @@
</tr>
<tr>
<td>clickAndWait</td>
- <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td>
+ <td>//a[@id='UIPortalLoginFormAction']</td>
<td></td>
</tr>
<tr>
@@ -486,7 +486,6 @@
<td>link=Sign out</td>
<td></td>
</tr>
-
</tbody></table>
</body>
</html>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_42_ChangeContainerWhenEditLayoutForGroupPage.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_42_ChangeContainerWhenEditLayoutForGroupPage.html 2011-07-13 15:50:50 UTC (rev 6869)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_42_ChangeContainerWhenEditLayoutForGroupPage.html 2011-07-14 11:13:47 UTC (rev 6870)
@@ -48,7 +48,7 @@
</tr>
<tr>
<td>clickAndWait</td>
- <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td>
+ <td>//a[@id='UIPortalLoginFormAction']</td>
<td></td>
</tr>
<tr>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_43_ChangeApplicationWhenEditLayoutForGroupPage.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_43_ChangeApplicationWhenEditLayoutForGroupPage.html 2011-07-13 15:50:50 UTC (rev 6869)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_43_ChangeApplicationWhenEditLayoutForGroupPage.html 2011-07-14 11:13:47 UTC (rev 6870)
@@ -48,7 +48,7 @@
</tr>
<tr>
<td>clickAndWait</td>
- <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td>
+ <td>//a[@id='UIPortalLoginFormAction']</td>
<td></td>
</tr>
<tr>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_44_AddApplicationIntoCategoryWhenEditLayoutForGroupPage.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_44_AddApplicationIntoCategoryWhenEditLayoutForGroupPage.html 2011-07-13 15:50:50 UTC (rev 6869)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_44_AddApplicationIntoCategoryWhenEditLayoutForGroupPage.html 2011-07-14 11:13:47 UTC (rev 6870)
@@ -48,7 +48,7 @@
</tr>
<tr>
<td>clickAndWait</td>
- <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td>
+ <td>//a[@id='UIPortalLoginFormAction']</td>
<td></td>
</tr>
<tr>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_45_ManageNodeGroup.html.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_45_ManageNodeGroup.html.html 2011-07-13 15:50:50 UTC (rev 6869)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_45_ManageNodeGroup.html.html 2011-07-14 11:13:47 UTC (rev 6870)
@@ -48,7 +48,7 @@
</tr>
<tr>
<td>clickAndWait</td>
- <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td>
+ <td>//a[@id='UIPortalLoginFormAction']</td>
<td></td>
</tr>
<tr>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_46_MoreActionOnNodeInEditNavigationOfGroup.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_46_MoreActionOnNodeInEditNavigationOfGroup.html 2011-07-13 15:50:50 UTC (rev 6869)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_46_MoreActionOnNodeInEditNavigationOfGroup.html 2011-07-14 11:13:47 UTC (rev 6870)
@@ -48,7 +48,7 @@
</tr>
<tr>
<td>clickAndWait</td>
- <td>//div[@id='UIPortalLoginFormAction']/div/div/div</td>
+ <td>//a[@id='UIPortalLoginFormAction']</td>
<td></td>
</tr>
<tr>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_47_EditNodePagePropertiesForGroup.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_47_EditNodePagePropertiesForGroup.html 2011-07-13 15:50:50 UTC (rev 6869)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_47_EditNodePagePropertiesForGroup.html 2011-07-14 11:13:47 UTC (rev 6870)
@@ -48,7 +48,7 @@
</tr>
<tr>
<td>clickAndWait</td>
- <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td>
+ <td>//a[@id='UIPortalLoginFormAction']</td>
<td></td>
</tr>
<tr>
@@ -531,7 +531,6 @@
<td>link=Sign out</td>
<td></td>
</tr>
-
</tbody></table>
</body>
</html>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_48_ChangeContainerWhenEditPagePropertiesOfNode.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_48_ChangeContainerWhenEditPagePropertiesOfNode.html 2011-07-13 15:50:50 UTC (rev 6869)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_48_ChangeContainerWhenEditPagePropertiesOfNode.html 2011-07-14 11:13:47 UTC (rev 6870)
@@ -48,7 +48,7 @@
</tr>
<tr>
<td>clickAndWait</td>
- <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td>
+ <td>//a[@id='UIPortalLoginFormAction']</td>
<td></td>
</tr>
<tr>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_49_ChangeApplicationWhenEditPagePropertiesOfNode.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_49_ChangeApplicationWhenEditPagePropertiesOfNode.html 2011-07-13 15:50:50 UTC (rev 6869)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_49_ChangeApplicationWhenEditPagePropertiesOfNode.html 2011-07-14 11:13:47 UTC (rev 6870)
@@ -48,7 +48,7 @@
</tr>
<tr>
<td>clickAndWait</td>
- <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td>
+ <td>//a[@id='UIPortalLoginFormAction']</td>
<td></td>
</tr>
<tr>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_50_AddApplicationIntoContainerWhenEditPagePropertiesOfNode.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_50_AddApplicationIntoContainerWhenEditPagePropertiesOfNode.html 2011-07-13 15:50:50 UTC (rev 6869)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_50_AddApplicationIntoContainerWhenEditPagePropertiesOfNode.html 2011-07-14 11:13:47 UTC (rev 6870)
@@ -48,7 +48,7 @@
</tr>
<tr>
<td>clickAndWait</td>
- <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td>
+ <td>//a[@id='UIPortalLoginFormAction']</td>
<td></td>
</tr>
<tr>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_51_ManageGadget.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_51_ManageGadget.html 2011-07-13 15:50:50 UTC (rev 6869)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_51_ManageGadget.html 2011-07-14 11:13:47 UTC (rev 6870)
@@ -48,7 +48,7 @@
</tr>
<tr>
<td>clickAndWait</td>
- <td>xpath=//div[@id='UIPortalLoginFormAction']/div/div/div/a</td>
+ <td>//a[@id='UIPortalLoginFormAction']</td>
<td></td>
</tr>
<tr>
@@ -196,7 +196,6 @@
<td>link=Sign out</td>
<td></td>
</tr>
-
</tbody></table>
</body>
</html>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_52_ManageTab.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_52_ManageTab.html 2011-07-13 15:50:50 UTC (rev 6869)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_52_ManageTab.html 2011-07-14 11:13:47 UTC (rev 6870)
@@ -48,7 +48,7 @@
</tr>
<tr>
<td>clickAndWait</td>
- <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td>
+ <td>//a[@id='UIPortalLoginFormAction']</td>
<td></td>
</tr>
<tr>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_53_DragAndDropGadget.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_53_DragAndDropGadget.html 2011-07-13 15:50:50 UTC (rev 6869)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_53_DragAndDropGadget.html 2011-07-14 11:13:47 UTC (rev 6870)
@@ -166,7 +166,6 @@
<td>link=Sign out</td>
<td></td>
</tr>
-
</tbody></table>
</body>
</html>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_54_AddNewpageForUser.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_54_AddNewpageForUser.html 2011-07-13 15:50:50 UTC (rev 6869)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_54_AddNewpageForUser.html 2011-07-14 11:13:47 UTC (rev 6870)
@@ -48,7 +48,7 @@
</tr>
<tr>
<td>clickAndWait</td>
- <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td>
+ <td>//a[@id='UIPortalLoginFormAction']</td>
<td></td>
</tr>
<tr>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_55_EditPageForUser.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_55_EditPageForUser.html 2011-07-13 15:50:50 UTC (rev 6869)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_55_EditPageForUser.html 2011-07-14 11:13:47 UTC (rev 6870)
@@ -48,7 +48,7 @@
</tr>
<tr>
<td>clickAndWait</td>
- <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td>
+ <td>//a[@id='UIPortalLoginFormAction']</td>
<td></td>
</tr>
<tr>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_56_ChangeSiteConfigWhenEditLayoutForUserPage.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_56_ChangeSiteConfigWhenEditLayoutForUserPage.html 2011-07-13 15:50:50 UTC (rev 6869)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_56_ChangeSiteConfigWhenEditLayoutForUserPage.html 2011-07-14 11:13:47 UTC (rev 6870)
@@ -48,7 +48,7 @@
</tr>
<tr>
<td>clickAndWait</td>
- <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td>
+ <td>//a[@id='UIPortalLoginFormAction']</td>
<td></td>
</tr>
<tr>
@@ -261,7 +261,6 @@
<td>link=Sign out</td>
<td></td>
</tr>
-
</tbody></table>
</body>
</html>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_57_ChangeContainerWhenEditLayoutForUserPage.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_57_ChangeContainerWhenEditLayoutForUserPage.html 2011-07-13 15:50:50 UTC (rev 6869)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_57_ChangeContainerWhenEditLayoutForUserPage.html 2011-07-14 11:13:47 UTC (rev 6870)
@@ -48,7 +48,7 @@
</tr>
<tr>
<td>clickAndWait</td>
- <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td>
+ <td>//a[@id='UIPortalLoginFormAction']</td>
<td></td>
</tr>
<tr>
@@ -416,7 +416,6 @@
<td>link=Sign out</td>
<td></td>
</tr>
-
</tbody></table>
</body>
</html>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_58_ChangeApplicationWhenEditLayoutForUserPage.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_58_ChangeApplicationWhenEditLayoutForUserPage.html 2011-07-13 15:50:50 UTC (rev 6869)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_58_ChangeApplicationWhenEditLayoutForUserPage.html 2011-07-14 11:13:47 UTC (rev 6870)
@@ -48,7 +48,7 @@
</tr>
<tr>
<td>clickAndWait</td>
- <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td>
+ <td>//a[@id='UIPortalLoginFormAction']</td>
<td></td>
</tr>
<tr>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_59_AddApplicationIntoCateGoryWhenEditLayoutForUserPage.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_59_AddApplicationIntoCateGoryWhenEditLayoutForUserPage.html 2011-07-13 15:50:50 UTC (rev 6869)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_59_AddApplicationIntoCateGoryWhenEditLayoutForUserPage.html 2011-07-14 11:13:47 UTC (rev 6870)
@@ -48,7 +48,7 @@
</tr>
<tr>
<td>clickAndWait</td>
- <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td>
+ <td>//a[@id='UIPortalLoginFormAction']</td>
<td></td>
</tr>
<tr>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_60_ShowAndSearchPage.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_60_ShowAndSearchPage.html 2011-07-13 15:50:50 UTC (rev 6869)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_60_ShowAndSearchPage.html 2011-07-14 11:13:47 UTC (rev 6870)
@@ -48,7 +48,7 @@
</tr>
<tr>
<td>clickAndWait</td>
- <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td>
+ <td>//a[@id='UIPortalLoginFormAction']</td>
<td></td>
</tr>
<tr>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_61_ManagePageOfPortal.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_61_ManagePageOfPortal.html 2011-07-13 15:50:50 UTC (rev 6869)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_61_ManagePageOfPortal.html 2011-07-14 11:13:47 UTC (rev 6870)
@@ -48,7 +48,7 @@
</tr>
<tr>
<td>clickAndWait</td>
- <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td>
+ <td>//a[@id='UIPortalLoginFormAction']</td>
<td></td>
</tr>
<tr>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_62_ManagePageOfGroup.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_62_ManagePageOfGroup.html 2011-07-13 15:50:50 UTC (rev 6869)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_62_ManagePageOfGroup.html 2011-07-14 11:13:47 UTC (rev 6870)
@@ -48,7 +48,7 @@
</tr>
<tr>
<td>clickAndWait</td>
- <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td>
+ <td>//a[@id='UIPortalLoginFormAction']</td>
<td></td>
</tr>
<tr>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_63_ManagePageOfUser.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_63_ManagePageOfUser.html 2011-07-13 15:50:50 UTC (rev 6869)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_63_ManagePageOfUser.html 2011-07-14 11:13:47 UTC (rev 6870)
@@ -48,7 +48,7 @@
</tr>
<tr>
<td>clickAndWait</td>
- <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td>
+ <td>//a[@id='UIPortalLoginFormAction']</td>
<td></td>
</tr>
<tr>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_64_ChangeLanguageInPrivateMode.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_64_ChangeLanguageInPrivateMode.html 2011-07-13 15:50:50 UTC (rev 6869)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_64_ChangeLanguageInPrivateMode.html 2011-07-14 11:13:47 UTC (rev 6870)
@@ -48,7 +48,7 @@
</tr>
<tr>
<td>clickAndWait</td>
- <td>//div[@id='UIPortalLoginFormAction']/div/div/div</td>
+ <td>//a[@id='UIPortalLoginFormAction']</td>
<td></td>
</tr>
<tr>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_65_ChangeSkin.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_65_ChangeSkin.html 2011-07-13 15:50:50 UTC (rev 6869)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_65_ChangeSkin.html 2011-07-14 11:13:47 UTC (rev 6870)
@@ -48,7 +48,7 @@
</tr>
<tr>
<td>clickAndWait</td>
- <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td>
+ <td>//a[@id='UIPortalLoginFormAction']</td>
<td></td>
</tr>
<tr>
@@ -151,7 +151,6 @@
<td>link=Sign out</td>
<td></td>
</tr>
-
</tbody></table>
</body>
</html>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_66_ChangeUserProfile.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_66_ChangeUserProfile.html 2011-07-13 15:50:50 UTC (rev 6869)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_66_ChangeUserProfile.html 2011-07-14 11:13:47 UTC (rev 6870)
@@ -48,7 +48,7 @@
</tr>
<tr>
<td>clickAndWait</td>
- <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td>
+ <td>//a[@id='UIPortalLoginFormAction']</td>
<td></td>
</tr>
<tr>
@@ -221,7 +221,6 @@
<td>link=Sign out</td>
<td></td>
</tr>
-
</tbody></table>
</body>
</html>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_67_ChangePassword.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_67_ChangePassword.html 2011-07-13 15:50:50 UTC (rev 6869)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_67_ChangePassword.html 2011-07-14 11:13:47 UTC (rev 6870)
@@ -48,7 +48,7 @@
</tr>
<tr>
<td>clickAndWait</td>
- <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td>
+ <td>//a[@id='UIPortalLoginFormAction']</td>
<td></td>
</tr>
<tr>
13 years, 5 months
gatein SVN: r6869 - portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl.
by do-not-reply@jboss.org
Author: chris.laprun(a)jboss.com
Date: 2011-07-13 11:50:50 -0400 (Wed, 13 Jul 2011)
New Revision: 6869
Modified:
portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/GateInImpl.java
Log:
- Extracted getPortalDataFor method.
- Removed now unneeded POMSessionManager.
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-07-13 15:11:17 UTC (rev 6868)
+++ portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/GateInImpl.java 2011-07-13 15:50:50 UTC (rev 6869)
@@ -30,12 +30,12 @@
import org.exoplatform.portal.config.Query;
import org.exoplatform.portal.mop.SiteType;
import org.exoplatform.portal.mop.navigation.NavigationService;
-import org.exoplatform.portal.pom.config.POMSessionManager;
import org.exoplatform.portal.pom.data.ModelDataStorage;
import org.exoplatform.portal.pom.data.PortalData;
import org.exoplatform.portal.pom.data.PortalKey;
import org.gatein.api.GateIn;
import org.gatein.api.IterableResult;
+import org.gatein.api.ParameterValidation;
import org.gatein.api.content.Application;
import org.gatein.api.content.Content;
import org.gatein.api.content.Gadget;
@@ -61,7 +61,6 @@
private ExoContainer container;
private ModelDataStorage dataStorage;
private NavigationService navigationService;
- private POMSessionManager pomSessionManager;
public GateInImpl(ExoContainerContext context, InitParams params, ConfigurationManager configurationManager)
{
@@ -89,20 +88,8 @@
public Portal getPortal(Id<Portal> portalId)
{
- try
- {
- RequestLifeCycle.begin(container);
- PortalData portalData = dataStorage.getPortalConfig(PortalKey.create(portalId.toString()));
- return new PortalImpl(portalData, this);
- }
- catch (Exception e)
- {
- throw new RuntimeException(e);
- }
- finally
- {
- RequestLifeCycle.end();
- }
+ PortalData portalData = getPortalDataFor(portalId);
+ return new PortalImpl(portalData, this);
}
public Portal getDefaultPortal()
@@ -194,12 +181,11 @@
{
dataStorage = (ModelDataStorage)container.getComponentInstanceOfType(ModelDataStorage.class);
navigationService = (NavigationService)container.getComponentInstanceOfType(NavigationService.class);
- pomSessionManager = (POMSessionManager)container.getComponentInstanceOfType(POMSessionManager.class);
}
public void stop()
{
- //To change body of implemented methods use File | Settings | File Templates.
+ // nothing to do
}
ModelDataStorage getDataStorage()
@@ -212,6 +198,25 @@
return navigationService;
}
+ private PortalData getPortalDataFor(Id<Portal> portalId)
+ {
+ ParameterValidation.throwIllegalArgExceptionIfNull(portalId, "Portal Id");
+ try
+ {
+ RequestLifeCycle.begin(container);
+
+ return dataStorage.getPortalConfig(PortalKey.create(portalId.toString()));
+ }
+ catch (Exception e)
+ {
+ throw new RuntimeException(e);
+ }
+ finally
+ {
+ RequestLifeCycle.end();
+ }
+ }
+
private static class PortalIterator implements Iterator<Portal>
{
private int current;
@@ -259,20 +264,7 @@
public boolean contains(Id<Portal> id)
{
- try
- {
- RequestLifeCycle.begin(container);
-
- return id != null && dataStorage.getPortalConfig(PortalKey.create(id.toString())) != null;
- }
- catch (Exception e)
- {
- throw new RuntimeException(e);
- }
- finally
- {
- RequestLifeCycle.end();
- }
+ return getPortalDataFor(id) != null;
}
public Iterator<Portal> iterator()
13 years, 5 months
gatein SVN: r6868 - portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl.
by do-not-reply@jboss.org
Author: chris.laprun(a)jboss.com
Date: 2011-07-13 11:11:17 -0400 (Wed, 13 Jul 2011)
New Revision: 6868
Modified:
portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/GateInImpl.java
Log:
- Added calls to RequestLifeCycle so that calls to ModelDataStorage works. Note that this will only work if all the dependent services (for example, PicketLinkIDMService) are started and ready to be used...
- Removed failed attempts at optimizing size and contains methods in PortalIterableResult.
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-07-13 13:35:09 UTC (rev 6867)
+++ portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/GateInImpl.java 2011-07-13 15:11:17 UTC (rev 6868)
@@ -30,7 +30,6 @@
import org.exoplatform.portal.config.Query;
import org.exoplatform.portal.mop.SiteType;
import org.exoplatform.portal.mop.navigation.NavigationService;
-import org.exoplatform.portal.pom.config.POMSession;
import org.exoplatform.portal.pom.config.POMSessionManager;
import org.exoplatform.portal.pom.data.ModelDataStorage;
import org.exoplatform.portal.pom.data.PortalData;
@@ -46,7 +45,6 @@
import org.gatein.api.id.Identifiable;
import org.gatein.api.portal.Portal;
import org.gatein.api.portal.Site;
-import org.gatein.mop.api.workspace.ObjectType;
import org.picocontainer.Startable;
import java.net.URI;
@@ -93,6 +91,7 @@
{
try
{
+ RequestLifeCycle.begin(container);
PortalData portalData = dataStorage.getPortalConfig(PortalKey.create(portalId.toString()));
return new PortalImpl(portalData, this);
}
@@ -100,6 +99,10 @@
{
throw new RuntimeException(e);
}
+ finally
+ {
+ RequestLifeCycle.end();
+ }
}
public Portal getDefaultPortal()
@@ -242,38 +245,36 @@
private class PortalIterableResult implements IterableResult<Portal>
{
- private int size;
private final List<PortalData> portals;
public PortalIterableResult(List<PortalData> portals)
{
this.portals = portals;
- size = -1;
}
public int size()
{
- if (size != -1)
+ return portals.size();
+ }
+
+ public boolean contains(Id<Portal> id)
+ {
+ try
{
- return size;
+ RequestLifeCycle.begin(container);
+
+ return id != null && dataStorage.getPortalConfig(PortalKey.create(id.toString())) != null;
}
- else
+ catch (Exception e)
{
- POMSession session = pomSessionManager.getSession();
- size = session.findObjects(ObjectType.PORTAL_SITE, ObjectType.PORTAL_SITE, null, null, 0, 1).hits();
- session.close();
- return size;
+ throw new RuntimeException(e);
}
+ finally
+ {
+ RequestLifeCycle.end();
+ }
}
- public boolean contains(Id<Portal> id)
- {
- POMSession session = pomSessionManager.getSession();
- boolean found = id != null && session.findObjectById(id.toString()) != null;
- session.close();
- return found;
- }
-
public Iterator<Portal> iterator()
{
return new PortalIterator(portals, GateInImpl.this);
13 years, 5 months
gatein SVN: r6866 - in portal/trunk: webui/core/src/main/java/org/exoplatform/webui/form and 1 other directories.
by do-not-reply@jboss.org
Author: trong.tran
Date: 2011-07-12 23:43:02 -0400 (Tue, 12 Jul 2011)
New Revision: 6866
Added:
portal/trunk/webui/core/src/main/java/org/exoplatform/webui/form/input/UICheckBoxInput.java
Removed:
portal/trunk/webui/core/src/main/java/org/exoplatform/webui/form/input/UIFormCheckBoxInput.java
Modified:
portal/trunk/testsuite/webuibasedsamples/src/main/java/org/exoplatform/sample/webui/component/UISampleUIForm.java
portal/trunk/webui/core/src/main/java/org/exoplatform/webui/form/UIForm.java
portal/trunk/webui/core/src/main/java/org/exoplatform/webui/form/UIFormCheckBoxInput.java
portal/trunk/webui/core/src/main/java/org/exoplatform/webui/form/UIFormInputBase.java
Log:
GTNPORTAL-1916 Rename the new UIFormCheckBoxInput to UICheckBoxInput
Modified: portal/trunk/testsuite/webuibasedsamples/src/main/java/org/exoplatform/sample/webui/component/UISampleUIForm.java
===================================================================
--- portal/trunk/testsuite/webuibasedsamples/src/main/java/org/exoplatform/sample/webui/component/UISampleUIForm.java 2011-07-13 03:25:57 UTC (rev 6865)
+++ portal/trunk/testsuite/webuibasedsamples/src/main/java/org/exoplatform/sample/webui/component/UISampleUIForm.java 2011-07-13 03:43:02 UTC (rev 6866)
@@ -33,7 +33,7 @@
import org.exoplatform.webui.event.Event;
import org.exoplatform.webui.event.EventListener;
import org.exoplatform.webui.form.UIForm;
-import org.exoplatform.webui.form.input.UIFormCheckBoxInput;
+import org.exoplatform.webui.form.input.UICheckBoxInput;
import org.exoplatform.webui.form.UIFormDateTimeInput;
import org.exoplatform.webui.form.UIFormInput;
import org.exoplatform.webui.form.UIFormInputSet;
@@ -109,7 +109,7 @@
List<SelectItemOption<String>> selectItemOptions = makeSelectItemOptions();
inputSet.addUIFormInput(new UIFormSelectBox(POSITION, null, selectItemOptions));
- inputSet.addUIFormInput(new UIFormCheckBoxInput(RECEIVE_EMAIL, null, false));
+ inputSet.addUIFormInput(new UICheckBoxInput(RECEIVE_EMAIL, null, false));
List<SelectItemOption<String>> comboBoxItemOptions = new ArrayList<SelectItemOption<String>>();
comboBoxItemOptions.add(new SelectItemOption<String>(("VI")));
@@ -220,7 +220,7 @@
UISampleUIForm uiForm = event.getSource();
String userName = uiForm.getUIStringInput(USERNAME).getValue();
String password = uiForm.getUIStringInput(PASSWORD).getValue();
- boolean receiveEmail = uiForm.<UIFormCheckBoxInput>getUIInput(RECEIVE_EMAIL).isChecked();
+ boolean receiveEmail = uiForm.getUICheckBoxInput(RECEIVE_EMAIL).isChecked();
String favoriteColor = (String)uiForm.getUIInput(FAVORITE_COLOR).getValue();
String position = (String)uiForm.getUIInput(POSITION).getValue();
String gender = (String)uiForm.getUIInput(GENDER).getValue();
Modified: portal/trunk/webui/core/src/main/java/org/exoplatform/webui/form/UIForm.java
===================================================================
--- portal/trunk/webui/core/src/main/java/org/exoplatform/webui/form/UIForm.java 2011-07-13 03:25:57 UTC (rev 6865)
+++ portal/trunk/webui/core/src/main/java/org/exoplatform/webui/form/UIForm.java 2011-07-13 03:43:02 UTC (rev 6866)
@@ -28,6 +28,7 @@
import org.exoplatform.webui.config.Event;
import org.exoplatform.webui.core.UIComponent;
import org.exoplatform.webui.core.UIContainer;
+import org.exoplatform.webui.form.input.UICheckBoxInput;
import java.io.Writer;
import java.util.List;
@@ -115,6 +116,11 @@
return findComponentById(name);
}
+ public UICheckBoxInput getUICheckBoxInput(String name)
+ {
+ return findComponentById(name);
+ }
+
public UIFormSelectBox getUIFormSelectBox(String name)
{
return findComponentById(name);
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 2011-07-13 03:25:57 UTC (rev 6865)
+++ portal/trunk/webui/core/src/main/java/org/exoplatform/webui/form/UIFormCheckBoxInput.java 2011-07-13 03:43:02 UTC (rev 6866)
@@ -27,7 +27,7 @@
/**
* Represents a checkbox field.
* @param <T> The type of value that is expected
- * @deprecated use {@link org.exoplatform.webui.form.input.UIFormCheckBoxInput} instead
+ * @deprecated use {@link org.exoplatform.webui.form.input.UICheckBoxInput} instead
*/
@SuppressWarnings("hiding")
@Serialized
Modified: portal/trunk/webui/core/src/main/java/org/exoplatform/webui/form/UIFormInputBase.java
===================================================================
--- portal/trunk/webui/core/src/main/java/org/exoplatform/webui/form/UIFormInputBase.java 2011-07-13 03:25:57 UTC (rev 6865)
+++ portal/trunk/webui/core/src/main/java/org/exoplatform/webui/form/UIFormInputBase.java 2011-07-13 03:43:02 UTC (rev 6866)
@@ -138,7 +138,7 @@
return value_;
}
- public UIFormInput setValue(T value)
+ public UIFormInput<T> setValue(T value)
{
this.value_ = value;
return this;
Copied: portal/trunk/webui/core/src/main/java/org/exoplatform/webui/form/input/UICheckBoxInput.java (from rev 6864, portal/trunk/webui/core/src/main/java/org/exoplatform/webui/form/input/UIFormCheckBoxInput.java)
===================================================================
--- portal/trunk/webui/core/src/main/java/org/exoplatform/webui/form/input/UICheckBoxInput.java (rev 0)
+++ portal/trunk/webui/core/src/main/java/org/exoplatform/webui/form/input/UICheckBoxInput.java 2011-07-13 03:43:02 UTC (rev 6866)
@@ -0,0 +1,148 @@
+/*
+ * Copyright (C) 2011 eXo Platform SAS.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.exoplatform.webui.form.input;
+
+import java.io.Writer;
+
+import org.exoplatform.commons.serialization.api.annotations.Serialized;
+import org.exoplatform.webui.application.WebuiRequestContext;
+import org.exoplatform.webui.form.UIForm;
+import org.exoplatform.webui.form.UIFormInput;
+import org.exoplatform.webui.form.UIFormInputBase;
+
+/**
+ * <p>Represent an html checkbox input <br/>
+ * This class is a replacement for {@link org.exoplatform.webui.form.UIFormCheckBoxInput} <br/>
+ * Still support raising event when user click the checkbox, but now we only accept boolean value. </p>
+ *
+ * @author <a href="mailto:phuong.vu@exoplatform.com">Vu Viet Phuong</a>
+ * @version $Id$
+ */
+@Serialized
+public class UICheckBoxInput extends UIFormInputBase<Boolean>
+{
+ /**
+ * Name of {@link org.exoplatform.webui.event.EventListener} that will be fired when checkbox state is changed
+ */
+ private String onchange_;
+
+ /**
+ * Id of {@link org.exoplatform.webui.core.UIComponent} that is configured with the fired event
+ * This component must be in the same form with the checkbox
+ * If this field is null, event of the UIForm will be fire instead
+ */
+ private String componentEvent_ = null;
+
+ public UICheckBoxInput()
+ {
+ this(null, null, false);
+ }
+
+ public UICheckBoxInput(String name, String bindingExpression, Boolean value)
+ {
+ super(name, bindingExpression, Boolean.class);
+ setValue(value);
+ }
+
+ public UIFormInput<Boolean> setValue(Boolean value)
+ {
+ if (value == null)
+ {
+ value = false;
+ }
+
+ return super.setValue(value);
+ }
+
+ /**
+ * This method is used to make the action more meaning in the context of a checkbox
+ */
+ public boolean isChecked()
+ {
+ return getValue();
+ }
+
+ /**
+ * This method is used to make the action more meaning in the context of a checkbox
+ */
+ public UICheckBoxInput setChecked(boolean check)
+ {
+ return (UICheckBoxInput)setValue(check);
+ }
+
+ public void setOnChange(String onchange)
+ {
+ onchange_ = onchange;
+ }
+
+ public void setComponentEvent(String com)
+ {
+ componentEvent_ = com;
+ }
+
+ public void setOnChange(String event, String com)
+ {
+ this.onchange_ = event;
+ this.componentEvent_ = com;
+ }
+
+ public String renderOnChangeEvent(UIForm uiForm) throws Exception
+ {
+ if (componentEvent_ == null)
+ return uiForm.event(onchange_, null);
+ return uiForm.event(onchange_, componentEvent_, (String)null);
+ }
+
+ public void decode(Object input, WebuiRequestContext context) throws Exception
+ {
+ if (!isEnable())
+ return;
+
+ if (input == null || "false".equals(input.toString()))
+ {
+ setValue(false);
+ }
+ else
+ {
+ setValue(true);
+ }
+ }
+
+ public void processRender(WebuiRequestContext context) throws Exception
+ {
+ Writer w = context.getWriter();
+ w.write("<input type='checkbox' name='");
+ w.write(name);
+ w.write("'");
+ if (onchange_ != null)
+ {
+ UIForm uiForm = getAncestorOfType(UIForm.class);
+ w.append(" onclick=\"").append(renderOnChangeEvent(uiForm)).append("\"");
+ }
+ if (isChecked())
+ w.write(" checked");
+ if (!enable_)
+ w.write(" disabled");
+ w.write(" class='checkbox'/>");
+ if (this.isMandatory())
+ w.write(" *");
+ }
+
+}
\ No newline at end of file
Deleted: portal/trunk/webui/core/src/main/java/org/exoplatform/webui/form/input/UIFormCheckBoxInput.java
===================================================================
--- portal/trunk/webui/core/src/main/java/org/exoplatform/webui/form/input/UIFormCheckBoxInput.java 2011-07-13 03:25:57 UTC (rev 6865)
+++ portal/trunk/webui/core/src/main/java/org/exoplatform/webui/form/input/UIFormCheckBoxInput.java 2011-07-13 03:43:02 UTC (rev 6866)
@@ -1,148 +0,0 @@
-/*
- * Copyright (C) 2011 eXo Platform SAS.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.exoplatform.webui.form.input;
-
-import java.io.Writer;
-
-import org.exoplatform.commons.serialization.api.annotations.Serialized;
-import org.exoplatform.webui.application.WebuiRequestContext;
-import org.exoplatform.webui.form.UIForm;
-import org.exoplatform.webui.form.UIFormInput;
-import org.exoplatform.webui.form.UIFormInputBase;
-
-/**
- * @author <a href="mailto:phuong.vu@exoplatform.com">Vu Viet Phuong</a>
- * @version $Id$
- *
- * <p>Represent an html checkbox input <br/>
- * This class is a replacement for {@link org.exoplatform.webui.form.UIFormCheckBoxInput} <br/>
- * Still support raising event when user click the checkbox, but now we only accept boolean value. </p>
- */
-@Serialized
-public class UIFormCheckBoxInput extends UIFormInputBase<Boolean>
-{
- /**
- * Name of {@link org.exoplatform.webui.event.EventListener} that will be fired when checkbox state is changed
- */
- private String onchange_;
-
- /**
- * Id of {@link org.exoplatform.webui.core.UIComponent} that is configured with the fired event
- * This component must be in the same form with the checkbox
- * If this field is null, event of the UIForm will be fire instead
- */
- private String componentEvent_ = null;
-
- public UIFormCheckBoxInput()
- {
- this(null, null, false);
- }
-
- public UIFormCheckBoxInput(String name, String bindingExpression, Boolean value)
- {
- super(name, bindingExpression, Boolean.class);
- setValue(value);
- }
-
- public UIFormInput setValue(Boolean value)
- {
- if (value == null)
- {
- value = false;
- }
-
- return super.setValue(value);
- }
-
- /**
- * This method is used to make the action more meaning in the context of a checkbox
- */
- public boolean isChecked()
- {
- return getValue();
- }
-
- /**
- * This method is used to make the action more meaning in the context of a checkbox
- */
- public UIFormCheckBoxInput setChecked(boolean check)
- {
- return (UIFormCheckBoxInput)setValue(check);
- }
-
- public void setOnChange(String onchange)
- {
- onchange_ = onchange;
- }
-
- public void setComponentEvent(String com)
- {
- componentEvent_ = com;
- }
-
- public void setOnChange(String event, String com)
- {
- this.onchange_ = event;
- this.componentEvent_ = com;
- }
-
- public String renderOnChangeEvent(UIForm uiForm) throws Exception
- {
- if (componentEvent_ == null)
- return uiForm.event(onchange_, null);
- return uiForm.event(onchange_, componentEvent_, (String)null);
- }
-
- public void decode(Object input, WebuiRequestContext context) throws Exception
- {
- if (!isEnable())
- return;
-
- if (input == null || "false".equals(input.toString()))
- {
- setValue(false);
- }
- else
- {
- setValue(true);
- }
- }
-
- public void processRender(WebuiRequestContext context) throws Exception
- {
- Writer w = context.getWriter();
- w.write("<input type='checkbox' name='");
- w.write(name);
- w.write("'");
- if (onchange_ != null)
- {
- UIForm uiForm = getAncestorOfType(UIForm.class);
- w.append(" onclick=\"").append(renderOnChangeEvent(uiForm)).append("\"");
- }
- if (isChecked())
- w.write(" checked");
- if (!enable_)
- w.write(" disabled");
- w.write(" class='checkbox'/>");
- if (this.isMandatory())
- w.write(" *");
- }
-
-}
\ No newline at end of file
13 years, 5 months
gatein SVN: r6865 - in portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale: portal and 1 other directory.
by do-not-reply@jboss.org
Author: phuong_vu
Date: 2011-07-12 23:25:57 -0400 (Tue, 12 Jul 2011)
New Revision: 6865
Modified:
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/navigation/portal/classic_de.properties
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/navigation/portal/classic_en.properties
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/navigation/portal/classic_es.properties
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/navigation/portal/classic_it.properties
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/navigation/portal/classic_ja.properties
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/navigation/portal/classic_ko.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/navigation/portal/classic_ne.properties
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/navigation/portal/classic_nl.properties
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/navigation/portal/classic_pt_BR.properties
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/navigation/portal/classic_ru.properties
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/navigation/portal/classic_uk.properties
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/navigation/portal/classic_zh.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/navigation/portal/classic_zh_TW.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ar.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_de.properties
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_es.properties
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_fr.properties
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_it.properties
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ja.properties
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ko.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ne.properties
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_nl.properties
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_pt_BR.properties
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ru.properties
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_uk.properties
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_vi.properties
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_zh.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_zh_TW.xml
Log:
GTNPORTAL-1950 Remove keys UIAddNewApplication.* from webui_*.properties
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/navigation/portal/classic_de.properties
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/navigation/portal/classic_de.properties 2011-07-12 20:45:32 UTC (rev 6864)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/navigation/portal/classic_de.properties 2011-07-13 03:25:57 UTC (rev 6865)
@@ -22,5 +22,4 @@
portal.classic.groupnavigation=Gruppennavigation
portal.classic.portalnavigation=Portalnavigation
portal.classic.register=Registrieren
-portal.classic.webexplorer=Web Explorer
-UIAddNewApplication.label.AddApplication = Applikation hinzuf\u00fcgen
\ No newline at end of file
+portal.classic.webexplorer=Web Explorer
\ No newline at end of file
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/navigation/portal/classic_en.properties
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/navigation/portal/classic_en.properties 2011-07-12 20:45:32 UTC (rev 6864)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/navigation/portal/classic_en.properties 2011-07-13 03:25:57 UTC (rev 6865)
@@ -22,5 +22,4 @@
portal.classic.groupnavigation=Group Navigation
portal.classic.portalnavigation=Portal Navigation
portal.classic.register=Register
-portal.classic.webexplorer=Web Explorer
-UIAddNewApplication.label.AddApplication = Add Application
\ No newline at end of file
+portal.classic.webexplorer=Web Explorer
\ No newline at end of file
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/navigation/portal/classic_es.properties
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/navigation/portal/classic_es.properties 2011-07-12 20:45:32 UTC (rev 6864)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/navigation/portal/classic_es.properties 2011-07-13 03:25:57 UTC (rev 6865)
@@ -23,4 +23,3 @@
portal.classic.portalnavigation=Navegaci\u00f3n por Portales
portal.classic.register=Registrarse
portal.classic.webexplorer=Explorador Web
-UIAddNewApplication.label.AddApplication = A\u00f1adir Aplicaci\u00f3n
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/navigation/portal/classic_it.properties
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/navigation/portal/classic_it.properties 2011-07-12 20:45:32 UTC (rev 6864)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/navigation/portal/classic_it.properties 2011-07-13 03:25:57 UTC (rev 6865)
@@ -22,5 +22,4 @@
portal.classic.groupnavigation=Navigazione dei Gruppi
portal.classic.portalnavigation=Navigazione del Portale
portal.classic.register=Registrazione
-portal.classic.webexplorer=Web Explorer
-UIAddNewApplication.label.AddApplication = Aggiungi Applicazione
\ No newline at end of file
+portal.classic.webexplorer=Web Explorer
\ No newline at end of file
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/navigation/portal/classic_ja.properties
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/navigation/portal/classic_ja.properties 2011-07-12 20:45:32 UTC (rev 6864)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/navigation/portal/classic_ja.properties 2011-07-13 03:25:57 UTC (rev 6865)
@@ -24,5 +24,4 @@
portal.classic.register=\u767b\u9332
portal.classic.webexplorer=Web\u30a8\u30af\u30b9\u30d7\u30ed\u30fc\u30e9
-UIAddNewApplication.label.AddApplication = \u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u3092\u8ffd\u52a0
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/navigation/portal/classic_ko.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/navigation/portal/classic_ko.xml 2011-07-12 20:45:32 UTC (rev 6864)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/navigation/portal/classic_ko.xml 2011-07-13 03:25:57 UTC (rev 6865)
@@ -10,9 +10,4 @@
<webexplorer>웹 탐색기</webexplorer>
</classic>
</portal>
- <UIAddNewApplication>
- <label>
- <AddApplication >애플리케이션 추가</AddApplication >
- </label>
- </UIAddNewApplication>
</bundle>
\ No newline at end of file
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/navigation/portal/classic_ne.properties
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/navigation/portal/classic_ne.properties 2011-07-12 20:45:32 UTC (rev 6864)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/navigation/portal/classic_ne.properties 2011-07-13 03:25:57 UTC (rev 6865)
@@ -23,4 +23,3 @@
portal.classic.portalnavigation=\u092a\u094b\u0930\u094d\u091f\u0932 \u0928\u094d\u092f\u093e\u092d\u093f\u0917\u0947\u0938\u0928
portal.classic.register=\u0926\u0930\u094d\u0924\u093e
portal.classic.webexplorer=\u0935\u0947\u092c \u090f\u0915\u094d\u0938\u094d\u092a\u094d\u0932\u094b\u0930\u0930\u094d
-UIAddNewApplication.label.AddApplication = \u090f\u092a\u094d\u200d\u0932\u093f\u0915\u0947\u0936\u0928 \u0925\u092a\u094d\u0928\u0941\u0939\u094b\u0938\u094d
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/navigation/portal/classic_nl.properties
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/navigation/portal/classic_nl.properties 2011-07-12 20:45:32 UTC (rev 6864)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/navigation/portal/classic_nl.properties 2011-07-13 03:25:57 UTC (rev 6865)
@@ -23,4 +23,3 @@
portal.classic.portalnavigation=Portaal navigatie
portal.classic.register=Registreren
portal.classic.webexplorer=Web verkenner
-UIAddNewApplication.label.AddApplication=Voeg applicatie toe
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/navigation/portal/classic_pt_BR.properties
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/navigation/portal/classic_pt_BR.properties 2011-07-12 20:45:32 UTC (rev 6864)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/navigation/portal/classic_pt_BR.properties 2011-07-13 03:25:57 UTC (rev 6865)
@@ -22,5 +22,4 @@
portal.classic.groupnavigation=Navegação do Grupo
portal.classic.portalnavigation=Navegação do Portal
portal.classic.register=Cadastrar-se
-portal.classic.webexplorer=Explorador Web
-UIAddNewApplication.label.AddApplication=Adicionar Aplicação
+portal.classic.webexplorer=Explorador Web
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/navigation/portal/classic_ru.properties
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/navigation/portal/classic_ru.properties 2011-07-12 20:45:32 UTC (rev 6864)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/navigation/portal/classic_ru.properties 2011-07-13 03:25:57 UTC (rev 6865)
@@ -21,5 +21,4 @@
portal.classic.sitemap=SiteMap
portal.classic.groupnavigation=Навигация по группам
portal.classic.portalnavigation=Навигация по порталу
-portal.classic.webexplorer=Web-проводник
-UIAddNewApplication.label.AddApplication =Добавить приложение
+portal.classic.webexplorer=Web-проводник
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/navigation/portal/classic_uk.properties
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/navigation/portal/classic_uk.properties 2011-07-12 20:45:32 UTC (rev 6864)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/navigation/portal/classic_uk.properties 2011-07-13 03:25:57 UTC (rev 6865)
@@ -20,5 +20,4 @@
portal.classic.home=Додому
portal.classic.groupnavigation=Навігація груп
portal.classic.portalnavigation=Навігація порталу
-portal.classic.webexplorer=Веб-навігація
-UIAddNewApplication.label.AddApplication =Додати програму
\ No newline at end of file
+portal.classic.webexplorer=Веб-навігація
\ No newline at end of file
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/navigation/portal/classic_zh.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/navigation/portal/classic_zh.xml 2011-07-12 20:45:32 UTC (rev 6864)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/navigation/portal/classic_zh.xml 2011-07-13 03:25:57 UTC (rev 6865)
@@ -10,9 +10,4 @@
<webexplorer>网络浏览器</webexplorer>
</classic>
</portal>
- <UIAddNewApplication>
- <label>
- <AddApplication >增加应用</AddApplication >
- </label>
- </UIAddNewApplication>
</bundle>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/navigation/portal/classic_zh_TW.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/navigation/portal/classic_zh_TW.xml 2011-07-12 20:45:32 UTC (rev 6864)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/navigation/portal/classic_zh_TW.xml 2011-07-13 03:25:57 UTC (rev 6865)
@@ -10,9 +10,4 @@
<webexplorer>網頁瀏覽器</webexplorer>
</classic>
</portal>
- <UIAddNewApplication>
- <label>
- <AddApplication >新增應用程式</AddApplication >
- </label>
- </UIAddNewApplication>
</bundle>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ar.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ar.xml 2011-07-12 20:45:32 UTC (rev 6864)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ar.xml 2011-07-13 03:25:57 UTC (rev 6865)
@@ -2325,28 +2325,8 @@
<empty>بيانات فارغة </empty>
<user-required> يرجى التحقق من مستخدم واحد على الأقل.</user-required>
</msg>
- </UIUserSelector>
+ </UIUserSelector>
<!--
- ################################################################################
- # org.exoplatform.portal.webui.application.UIAddNewApplication
- ################################################################################
- -->
- <UIAddNewApplication>
- <label>
- <AddApplication>إضافة التطبيق </AddApplication>
- <Categories>الفئات</Categories>
- <Select>حدد التطبيقات </Select>
- <NoneApp> لا يوجد تطبيق في هذا الموقع. انتقل إلى مدخل التطبيق التسجيل
- لاستيراد التطبيقات.</NoneApp>
- <Type> النوع :</Type>
- <Created> التي أنشأتها :</Created>
- <Description> الوصف :</Description>
- <Close> أغلق</Close>
- <Add>إضافة والحفاظ على هذا الطلب في صفحة </Add>
- <AddToStartup>إضافة وتشغيل هذا التطبيق على الفور </AddToStartup>
- </label>
- </UIAddNewApplication>
- <!--
#############################################################################
#org.exoplatform.portal.webui.component.UIPortalNavigation #
#############################################################################
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_de.properties
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_de.properties 2011-07-12 20:45:32 UTC (rev 6864)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_de.properties 2011-07-13 03:25:57 UTC (rev 6865)
@@ -1213,21 +1213,6 @@
UIUserSelector.msg.empty=Keine Daten
UIUserSelector.msg.user-required=Mindestens einen Benutzer ausw\u00e4hlen.
- ################################################################################
- # org.exoplatform.portal.webui.application.UIAddNewApplication
- ################################################################################
-
-UIAddNewApplication.label.AddApplication=Applikation hinzuf\u00fcgen
-UIAddNewApplication.label.Categories=Kategorien
-UIAddNewApplication.label.Select=Applikation ausw\u00e4hlen
-UIAddNewApplication.label.NoneApp=Keine Applikation vorhanden. Öffnen Sie das Applikations-Registrier-Portlet um Applikationen zu importieren.
-UIAddNewApplication.label.Type=Typ:
-UIAddNewApplication.label.Created=Erstellt durch:
-UIAddNewApplication.label.Description=Beschreibung:
-UIAddNewApplication.label.Close=Schlie\u00dfen
-UIAddNewApplication.label.Add=Applikation zur Seite hinzuf\u00fcgen
-UIAddNewApplication.label.AddToStartup=Applikation hinzuf\u00fcgen und sofort ausf\u00fchren
-
#############################################################################
#org.exoplatform.portal.webui.component.UIPortalNavigation #
#############################################################################
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties 2011-07-12 20:45:32 UTC (rev 6864)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties 2011-07-13 03:25:57 UTC (rev 6865)
@@ -1312,21 +1312,6 @@
UIUserSelector.msg.empty=Empty data
UIUserSelector.msg.user-required=Please check at least one user.
- ################################################################################
- # org.exoplatform.portal.webui.application.UIAddNewApplication
- ################################################################################
-
-UIAddNewApplication.label.AddApplication=Add Application
-UIAddNewApplication.label.Categories=Categories
-UIAddNewApplication.label.Select=Select Applications
-UIAddNewApplication.label.NoneApp=There is no application in this location. Go to the Application Registry portlet to import applications.
-UIAddNewApplication.label.Type=Type:
-UIAddNewApplication.label.Created=Created by:
-UIAddNewApplication.label.Description=Description:
-UIAddNewApplication.label.Close=Close
-UIAddNewApplication.label.Add=Add and keep this application in a page
-UIAddNewApplication.label.AddToStartup=Add and Run this application immediately
-
#############################################################################
#org.exoplatform.portal.webui.component.UIPortalNavigation #
#############################################################################
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_es.properties
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_es.properties 2011-07-12 20:45:32 UTC (rev 6864)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_es.properties 2011-07-13 03:25:57 UTC (rev 6865)
@@ -1187,21 +1187,6 @@
UIUserSelector.msg.empty=Datos vac\u00edos
UIUserSelector.msg.user-required=Por favor, selecciona al menos un usuario.
- ################################################################################
- # org.exoplatform.portal.webui.application.UIAddNewApplication
- ################################################################################
-
-UIAddNewApplication.label.AddApplication=A\u00f1adir Aplicaci\u00f3n
-UIAddNewApplication.label.Categories=Categor\u00edas
-UIAddNewApplication.label.Select=Seleccionar Aplicaciones
-UIAddNewApplication.label.NoneApp=No hay aplicaciones en esta ubicaci\u00f3n. Ve al portlet de registro de Aplicaciones para importar aplicaciones.
-UIAddNewApplication.label.Type=Tipe:
-UIAddNewApplication.label.Created=Creado por:
-UIAddNewApplication.label.Description=Descripci\u00f3n:
-UIAddNewApplication.label.Close=Cerrar
-UIAddNewApplication.label.Add=A\u00f1ade y manten esta aplicaci\u00f3n en una p\u00e1gina
-UIAddNewApplication.label.AddToStartup=A\u00f1ade y ejecuta esta aplicaci\u00f3n inmediatamente
-
#############################################################################
#org.exoplatform.portal.webui.component.UIPortalNavigation #
#############################################################################
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_fr.properties
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_fr.properties 2011-07-12 20:45:32 UTC (rev 6864)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_fr.properties 2011-07-13 03:25:57 UTC (rev 6865)
@@ -1205,21 +1205,6 @@
UIUserSelector.msg.empty=Vide
UIUserSelector.msg.user-required=Choisissez au moins un utilisateur
- ################################################################################
- # org.exoplatform.portal.webui.application.UIAddNewApplication
- ################################################################################
-
-UIAddNewApplication.label.AddApplication=Ajouter application
-UIAddNewApplication.label.Categories=Categories
-UIAddNewApplication.label.Select=Select Applications
-UIAddNewApplication.label.NoneApp=There is no application in this location. Go to Application Registry portlet to import applications.
-UIAddNewApplication.label.Type=Type:
-UIAddNewApplication.label.Created=Créé par:
-UIAddNewApplication.label.Description=Description:
-UIAddNewApplication.label.Close=Fermer
-UIAddNewApplication.label.Add=Add and keep this application in page
-UIAddNewApplication.label.AddToStartup=Ajouter et exécuter l'application immédiatement
-
#############################################################################
#org.exoplatform.portal.webui.component.UIPortalNavigation #
#############################################################################
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_it.properties
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_it.properties 2011-07-12 20:45:32 UTC (rev 6864)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_it.properties 2011-07-13 03:25:57 UTC (rev 6865)
@@ -1264,21 +1264,6 @@
UIUserSelector.msg.empty=Dato vuoto
UIUserSelector.msg.user-required=Verifica almeno un utente.
- ################################################################################
- # org.exoplatform.portal.webui.application.UIAddNewApplication
- ################################################################################
-
-UIAddNewApplication.label.AddApplication=Aggiungi Applicazione
-UIAddNewApplication.label.Categories=Categorie
-UIAddNewApplication.label.Select=Seleziona le Applicazioni
-UIAddNewApplication.label.NoneApp=Non c'\u00E8 nessun'applicazione in questo spazio. Vai alla portlet del Registro delle Applicazioni per importare le applicazioni.
-UIAddNewApplication.label.Type=Tipo:
-UIAddNewApplication.label.Created=Creato da:
-UIAddNewApplication.label.Description=Descrizione:
-UIAddNewApplication.label.Close=Chiudi
-UIAddNewApplication.label.Add=Aggiungi e mantieni l'applicazione nella pagina
-UIAddNewApplication.label.AddToStartup=Aggiungi ed esegui l'applicazione immediatamente
-
#############################################################################
#org.exoplatform.portal.webui.component.UIPortalNavigation #
#############################################################################
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ja.properties
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ja.properties 2011-07-12 20:45:32 UTC (rev 6864)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ja.properties 2011-07-13 03:25:57 UTC (rev 6865)
@@ -1218,21 +1218,6 @@
UIUserSelector.msg.empty=\u7a7a\u30c7\u30fc\u30bf
UIUserSelector.msg.user-required=\u30e6\u30fc\u30b6\u30fc\u3092\u5c11\u306a\u304f\u3068\u30821\u3064\u30c1\u30a7\u30c3\u30af\u3057\u3066\u304f\u3060\u3055\u3044\u3002
- ################################################################################
- # org.exoplatform.portal.webui.application.UIAddNewApplication
- ################################################################################
-
-UIAddNewApplication.label.AddApplication=\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u3092\u8ffd\u52a0
-UIAddNewApplication.label.Categories=\u30ab\u30c6\u30b4\u30ea\u30fc
-UIAddNewApplication.label.Select=\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u3092\u9078\u629e
-UIAddNewApplication.label.NoneApp=\u3053\u306e\u30ed\u30b1\u30fc\u30b7\u30e7\u30f3\u306b\u306f\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u304c\u3042\u308a\u307e\u305b\u3093\u3002\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u767b\u9332\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u306b\u79fb\u52d5\u3057\u3066\u3001\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u3092\u30a4\u30f3\u30dd\u30fc\u30c8\u3057\u3066\u304f\u3060\u3055\u3044\u3002
-UIAddNewApplication.label.Type=\u30bf\u30a4\u30d7:
-UIAddNewApplication.label.Created=\u4f5c\u6210\u8005:
-UIAddNewApplication.label.Description=\u8aac\u660e:
-UIAddNewApplication.label.Close=\u9589\u3058\u308b
-UIAddNewApplication.label.Add=\u3053\u306e\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u3092\u30da\u30fc\u30b8\u306b\u8ffd\u52a0\u3057\u3066\u4fdd\u5b58
-UIAddNewApplication.label.AddToStartup=\u3053\u306e\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u3092\u4fdd\u5b58\u3057\u3066\u3059\u3050\u306b\u8d77\u52d5
-
#############################################################################
#org.exoplatform.portal.webui.component.UIPortalNavigation #
#############################################################################
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ko.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ko.xml 2011-07-12 20:45:32 UTC (rev 6864)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ko.xml 2011-07-13 03:25:57 UTC (rev 6865)
@@ -1821,20 +1821,6 @@
<user-required>적어도 한 명의 사용자를 체크하십시오.</user-required>
</msg>
</UIUserSelector>
- <UIAddNewApplication>
- <label>
- <AddApplication>애플리케이션 추가</AddApplication>
- <Categories>카테고리</Categories>
- <Select>애플리케이션 선택</Select>
- <NoneApp>이 위치에 애플리케이션이 존재하지 않습니다. 애플리케이션 삽입을 하시려면 애플리케이션 등록 포틀릿으로 이동하십시오.</NoneApp>
- <Type>유형:</Type>
- <Created>생성자:</Created>
- <Description>설명:</Description>
- <Close>닫기</Close>
- <Add>페이지에 이 애플리케이션을 추가하고 유지</Add>
- <AddToStartup>이 애플리케이션을 즉시 추가하고 실행</AddToStartup>
- </label>
- </UIAddNewApplication>
<UIPortalNavigation>
<Label>
<Next>다음</Next>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ne.properties
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ne.properties 2011-07-12 20:45:32 UTC (rev 6864)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ne.properties 2011-07-13 03:25:57 UTC (rev 6865)
@@ -1214,23 +1214,8 @@
UIUserSelector.label.Add=\u0925\u092a\u094d\u0928\u0941\u0939\u094b\u0938\u094d
UIUserSelector.label.Close=\u092c\u0928\u094d\u0926 \u0917\u0930\u094d\u0928\u0941\u0939\u094b\u0938\u094d
UIUserSelector.msg.empty=\u0921\u093e\u091f\u093e \u0916\u093e\u0932\u0940 \u091b
-UIUserSelector.msg.user-required=\u0915\u092e\u094d\u0924\u0940\u092e\u093e \u090f\u0909\u091f\u093e \u092a\u094d\u0930\u092f\u094b\u0917\u0915\u0930\u094d\u0924\u093e \u091f\u093f\u0915 \u0932\u0917\u093e\u0909\u0928\u0941\u0939\u094b\u0938\u094d\u0964
+UIUserSelector.msg.user-required=\u0915\u092e\u094d\u0924\u0940\u092e\u093e \u090f\u0909\u091f\u093e \u092a\u094d\u0930\u092f\u094b\u0917\u0915\u0930\u094d\u0924\u093e \u091f\u093f\u0915 \u0932\u0917\u093e\u0909\u0928\u0941\u0939\u094b\u0938\u094d\u0964
- ################################################################################
- # org.exoplatform.portal.webui.application.UIAddNewApplication
- ################################################################################
-
-UIAddNewApplication.label.AddApplication=\u090f\u092a\u094d\u200d\u0932\u093f\u0915\u0947\u0936\u0928 \u0925\u092a\u094d\u0928\u0941\u0939\u094b\u0938\u094d
-UIAddNewApplication.label.Categories=\u0935\u0930\u094d\u0917\u0939\u0930\u0941
-UIAddNewApplication.label.Select=\u090f\u092a\u094d\u200d\u0932\u093f\u0915\u0947\u0936\u0928\u0939\u0930\u0941 \u091b\u0928\u094c\u091f \u0917\u0930\u094d\u0928\u0941\u0939\u094b\u0938\u094d
-UIAddNewApplication.label.NoneApp=\u092f\u094b \u0920\u093e\u0909\u0901\u092e\u093e \u0915\u0941\u0928\u0948 \u092a\u0928\u093f \u091b\u0948\u0928 \u090f\u092a\u094d\u200d\u0932\u093f\u0915\u0947\u0936\u0928\u0964 \u0906\u092f\u093e\u0924 \u0917\u0930\u094d\u0928\u0915\u094b\u0932\u093e\u0917\u0940 \u090f\u092a\u094d\u200d\u0932\u093f\u0915\u0947\u0936\u0928 \u0930\u091c\u093f\u0938\u094d\u091f\u094d\u0930\u0940 \u092a\u094b\u0930\u094d\u091f\u094d\u0932\u0947\u091f\u092e\u093e \u091c\u0928\u0941\u0939\u094b\u0938\u094d\u0964
-UIAddNewApplication.label.Type=\u0915\u093f\u0938\u093f\u092e :
-UIAddNewApplication.label.Created=\u092c\u0928\u093e\u0909\u0928\u0947\u0915\u094b \u0928\u093e\u092e :
-UIAddNewApplication.label.Description=\u0935\u092f\u093e\u0928 :
-UIAddNewApplication.label.Close=\u092c\u0928\u094d\u0926 \u0917\u0930\u094d\u0928\u0941\u0939\u094b\u0938\u094d
-UIAddNewApplication.label.Add=\u090f\u092a\u094d\u200d\u0932\u093f\u0915\u0947\u0936\u0928 \u0925\u092a\u094d\u0928\u0941\u0939\u094b\u0938\u094d \u0930 \u092a\u0947\u091c\u092e\u093e \u0930\u093e\u0916\u094d\u0928\u0941\u0939\u094b\u0938\u094d
-UIAddNewApplication.label.AddToStartup=\u090f\u092a\u094d\u200d\u0932\u093f\u0915\u0947\u0936\u0928 \u0925\u092a\u094d\u0928\u0941\u0939\u094b\u0938\u094d \u0930 \u0924\u0941\u0930\u0941\u0928\u094d\u0924\u0948 \u0926\u094c\u0921\u094c\u0928\u0941\u0939\u094b\u0938\u094d
-
#############################################################################
#org.exoplatform.portal.webui.component.UIPortalNavigation #
#############################################################################
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_nl.properties
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_nl.properties 2011-07-12 20:45:32 UTC (rev 6864)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_nl.properties 2011-07-13 03:25:57 UTC (rev 6865)
@@ -1191,21 +1191,6 @@
UIUserSelector.msg.empty=Geen gegevens.
UIUserSelector.msg.user-required=Selecteer tenminste \u00E9\u00E9n gebruiker.
-################################################################################
-# org.exoplatform.portal.webui.application.UIAddNewApplication
-################################################################################
-
-UIAddNewApplication.label.AddApplication=Voeg applicatie toe
-UIAddNewApplication.label.Categories=Categorie\u00EBn
-UIAddNewApplication.label.Select=Selecteer applicaties
-UIAddNewApplication.label.NoneApp=Er is geen applicatie in deze locatie. Ga naar de application register portlet om applicaties te importeren
-UIAddNewApplication.label.Type=Type:
-UIAddNewApplication.label.Created=Gemaakt door:
-UIAddNewApplication.label.Description=#{word.description} :
-UIAddNewApplication.label.Close=#{word.close}
-UIAddNewApplication.label.Add=Voeg toe en hou deze applicatie in een pagina
-UIAddNewApplication.label.AddToStartup=Voeg toe en start de applicatie onmiddellijk
-
#############################################################################
#org.exoplatform.portal.webui.component.UIPortalNavigation #
#############################################################################
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_pt_BR.properties
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_pt_BR.properties 2011-07-12 20:45:32 UTC (rev 6864)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_pt_BR.properties 2011-07-13 03:25:57 UTC (rev 6865)
@@ -1210,21 +1210,6 @@
UIUserSelector.msg.empty=Sem dados
UIUserSelector.msg.user-required=Selecione pelo menos um usuário.
- ################################################################################
- # org.exoplatform.portal.webui.application.UIAddNewApplication
- ################################################################################
-
-UIAddNewApplication.label.AddApplication=Adicionar Aplicação
-UIAddNewApplication.label.Categories=Categorias
-UIAddNewApplication.label.Select=Selecionar Aplicação.
-UIAddNewApplication.label.NoneApp=Não há aplicação neste local. Vá ao Registro de Aplicação e importe aplicações.
-UIAddNewApplication.label.Type=Tipo:
-UIAddNewApplication.label.Created=Criado por:
-UIAddNewApplication.label.Description=Descrição:
-UIAddNewApplication.label.Close=Fechar
-UIAddNewApplication.label.Add=Adicionar aplicação a uma página
-UIAddNewApplication.label.AddToStartup=Executar e adicionar aplicação a uma página
-
#############################################################################
#org.exoplatform.portal.webui.component.UIPortalNavigation #
#############################################################################
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ru.properties
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ru.properties 2011-07-12 20:45:32 UTC (rev 6864)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ru.properties 2011-07-13 03:25:57 UTC (rev 6865)
@@ -1173,21 +1173,6 @@
UIUserSelector.msg.empty=Пусто
UIUserSelector.msg.user-required=Необходимо выбрать минимум одного пользователя.
- ################################################################################
- # org.exoplatform.portal.webui.application.UIAddNewApplication
- ################################################################################
-
-UIAddNewApplication.label.AddApplication=Добавить приложение
-UIAddNewApplication.label.Categories=Категории
-UIAddNewApplication.label.Select=Выбрать приложения
-UIAddNewApplication.label.NoneApp=По данному адресу приложение не найдено. Перейдите в раздел "Приложения" для импорта приложения.
-UIAddNewApplication.label.Type=Тип:
-UIAddNewApplication.label.Created=Автор:
-UIAddNewApplication.label.Description=Описание:
-UIAddNewApplication.label.Close=Закрыть
-UIAddNewApplication.label.Add=Добавить приложение и сохранить на странице
-UIAddNewApplication.label.AddToStartup=Добавить и запустить приложение
-
#############################################################################
#org.exoplatform.portal.webui.component.UIPortalNavigation #
#############################################################################
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_uk.properties
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_uk.properties 2011-07-12 20:45:32 UTC (rev 6864)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_uk.properties 2011-07-13 03:25:57 UTC (rev 6865)
@@ -1164,21 +1164,6 @@
UIUserSelector.msg.empty=Порожні дані
UIUserSelector.msg.user-required=Будь ласка, відмітьте хоча б одного користувача.
- ################################################################################
- # org.exoplatform.portal.webui.application.UIAddNewApplication
- ################################################################################
-
-UIAddNewApplication.label.AddApplication=Додати програму
-UIAddNewApplication.label.Categories=Категорія
-UIAddNewApplication.label.Select=Вибір додатків
-UIAddNewApplication.label.NoneApp=В цій області немає додатків. Будь ласка, йдіть до Application Registry portlet, щоб імпортувати додатки.
-UIAddNewApplication.label.Type=Тип:
-UIAddNewApplication.label.Created=Створений:
-UIAddNewApplication.label.Description=Опис:
-UIAddNewApplication.label.Close=Закрити
-UIAddNewApplication.label.Add=Додати і залишити цей додаток на сторінці
-UIAddNewApplication.label.AddToStartup=Додати і негайно запустити цей додаток
-
#############################################################################
#org.exoplatform.portal.webui.component.UIPortalNavigation #
#############################################################################
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_vi.properties
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_vi.properties 2011-07-12 20:45:32 UTC (rev 6864)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_vi.properties 2011-07-13 03:25:57 UTC (rev 6865)
@@ -1228,21 +1228,6 @@
UIUserSelector.msg.empty=Không có dữ liệu
UIUserSelector.msg.user-required=Xin vui lòng chọn một tài khoản.
- ################################################################################
- # org.exoplatform.portal.webui.application.UIAddNewApplication
- ################################################################################
-
-UIAddNewApplication.label.AddApplication=Thêm ứng dụng
-UIAddNewApplication.label.Categories=Danh mục
-UIAddNewApplication.label.Select=Chọn ứng dụng
-UIAddNewApplication.label.NoneApp=Không có ứng dụng nào ở đây. Vào portlet Quản lý ứng dụng để thêm ứng dụng.
-UIAddNewApplication.label.Type=Kiểu:
-UIAddNewApplication.label.Created=Người tạo:
-UIAddNewApplication.label.Description=Mô tả:
-UIAddNewApplication.label.Close=Đóng
-UIAddNewApplication.label.Add=Thêm và giữ cho ứng dụng này tại trang
-UIAddNewApplication.label.AddToStartup=Thêm và chạy ứng dụng
-
#############################################################################
#org.exoplatform.portal.webui.component.UIPortalNavigation #
#############################################################################
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_zh.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_zh.xml 2011-07-12 20:45:32 UTC (rev 6864)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_zh.xml 2011-07-13 03:25:57 UTC (rev 6865)
@@ -1732,21 +1732,7 @@
<empty>空数据</empty>
<user-required>请至少检查一个用户。</user-required>
</msg>
- </UIUserSelector>
- <UIAddNewApplication>
- <label>
- <AddApplication>增加应用</AddApplication>
- <Categories>分类</Categories>
- <Select>选择应用</Select>
- <NoneApp>此处不存在应用。请到应用注册portlet处导入应用。</NoneApp>
- <Type>类型:</Type>
- <Created>创建于:</Created>
- <Description>描述:</Description>
- <Close>关闭</Close>
- <Add>添加并将此应用保存在页面中。</Add>
- <AddToStartup>添加并立即运行此应用。</AddToStartup>
- </label>
- </UIAddNewApplication>
+ </UIUserSelector>
<UIPortalNavigation>
<Label>
<Next>下一步</Next>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_zh_TW.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_zh_TW.xml 2011-07-12 20:45:32 UTC (rev 6864)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_zh_TW.xml 2011-07-13 03:25:57 UTC (rev 6865)
@@ -1903,21 +1903,7 @@
<empty>空資料</empty>
<user-required>請至少檢查一個使用者。</user-required>
</msg>
- </UIUserSelector>
- <UIAddNewApplication>
- <label>
- <AddApplication>新增儲存程式</AddApplication>
- <Categories>分類</Categories>
- <Select>選擇儲存</Select>
- <NoneApp>此處不存在儲存。請到儲存註冊portlet處導入儲存。</NoneApp>
- <Type>類型:</Type>
- <Created>建立於:</Created>
- <Description>描述:</Description>
- <Close>關閉</Close>
- <Add>增加並將此儲存儲存在頁面中。</Add>
- <AddToStartup>增加並立即運行此儲存。</AddToStartup>
- </label>
- </UIAddNewApplication>
+ </UIUserSelector>
<UIPortalNavigation>
<Label>
<Next>下一步</Next>
13 years, 5 months
gatein SVN: r6864 - in portal/branches/api: component/api-impl and 2 other directories.
by do-not-reply@jboss.org
Author: chris.laprun(a)jboss.com
Date: 2011-07-12 16:45:32 -0400 (Tue, 12 Jul 2011)
New Revision: 6864
Modified:
portal/branches/api/component/api-impl/pom.xml
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/PortalImpl.java
portal/branches/api/packaging/jboss-as5/pkg/pom.xml
portal/branches/api/pom.xml
Log:
- Changed API implementation artifact id.
- Adapted for API changes: now properly implement GateIn.portalId.
- Updated POM files to use the new API artifact ids and versions.
Modified: portal/branches/api/component/api-impl/pom.xml
===================================================================
--- portal/branches/api/component/api-impl/pom.xml 2011-07-12 15:18:10 UTC (rev 6863)
+++ portal/branches/api/component/api-impl/pom.xml 2011-07-12 20:45:32 UTC (rev 6864)
@@ -9,19 +9,14 @@
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.gatein.portal</groupId>
- <artifactId>gatein-api-impl</artifactId>
+ <groupId>org.gatein.api</groupId>
+ <artifactId>java-api-impl</artifactId>
<dependencies>
<dependency>
- <groupId>org.gatein.portal</groupId>
- <artifactId>gatein-api</artifactId>
+ <groupId>org.gatein.api</groupId>
+ <artifactId>gatein-java-api</artifactId>
</dependency>
- <!--<dependency>
- <groupId>picocontainer</groupId>
- <artifactId>picocontainer</artifactId>
- <version>1.1</version>
- </dependency>-->
<dependency>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>exo.kernel.container</artifactId>
@@ -37,4 +32,8 @@
</dependency>
</dependencies>
+ <build>
+ <finalName>gatein-java-api-impl-${project.version}</finalName>
+ </build>
+
</project>
\ No newline at end of file
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-07-12 15:18:10 UTC (rev 6863)
+++ portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/GateInImpl.java 2011-07-12 20:45:32 UTC (rev 6864)
@@ -41,6 +41,7 @@
import org.gatein.api.content.Content;
import org.gatein.api.content.Gadget;
import org.gatein.api.content.ManagedContent;
+import org.gatein.api.id.Context;
import org.gatein.api.id.Id;
import org.gatein.api.id.Identifiable;
import org.gatein.api.portal.Portal;
@@ -51,11 +52,14 @@
import java.net.URI;
import java.util.Iterator;
import java.util.List;
+import java.util.regex.Pattern;
/** @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> */
public class GateInImpl implements GateIn, Startable
{
private static final Query<PortalData> PORTALS = new Query<PortalData>(SiteType.PORTAL.getName(), null, PortalData.class);
+ public static final Context CONTEXT = Context.builder().requiredComponent("owner", Site.class, Pattern.compile("\\w+"))
+ .requiredComponent("name", Portal.class, Pattern.compile("\\w+")).withDefaultSeparator("::").build();
private ExoContainer container;
private ModelDataStorage dataStorage;
private NavigationService navigationService;
@@ -100,7 +104,7 @@
public Portal getDefaultPortal()
{
- return getPortal(portalId("classic")); // todo: check
+ return getPortal(portalId(Site.Type.PORTAL, "classic")); // todo: check
}
public IterableResult<Site> getSites()
@@ -178,9 +182,9 @@
return null; //To change body of implemented methods use File | Settings | File Templates.
}
- public Id<Portal> portalId(String portalName)
+ public Id<Portal> portalId(Site.Type siteType, String portalName)
{
- return null; //To change body of implemented methods use File | Settings | File Templates.
+ return Id.create(CONTEXT, Portal.class, siteType.getName(), portalName);
}
public void start()
Modified: portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/PortalImpl.java
===================================================================
--- portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/PortalImpl.java 2011-07-12 15:18:10 UTC (rev 6863)
+++ portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/PortalImpl.java 2011-07-12 20:45:32 UTC (rev 6864)
@@ -31,24 +31,18 @@
import org.exoplatform.portal.pom.data.PortalData;
import org.gatein.api.Container;
import org.gatein.api.content.ContentRegistry;
-import org.gatein.api.id.Context;
-import org.gatein.api.id.Id;
import org.gatein.api.portal.Navigation;
import org.gatein.api.portal.Page;
import org.gatein.api.portal.Portal;
import org.gatein.api.portal.Site;
-import java.util.regex.Pattern;
-
/** @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> */
public class PortalImpl extends IdentifiableImpl implements Portal
{
- public static final Context CONTEXT = Context.builder().requiredComponent("owner", Site.class, Pattern.compile("\\w+"))
- .requiredComponent("name", Portal.class, Pattern.compile("\\w+")).withDefaultSeparator("::").build();
public PortalImpl(PortalData portal, GateInImpl gateIn)
{
- super(Id.create(CONTEXT, Portal.class, portal.getKey().getType(), portal.getKey().getId()), portal.getName(), gateIn);
+ super(gateIn.portalId(Site.Type.forName(portal.getKey().getType()), portal.getKey().getId()), portal.getName(), gateIn);
}
public ContentRegistry getContentRegistry()
Modified: portal/branches/api/packaging/jboss-as5/pkg/pom.xml
===================================================================
--- portal/branches/api/packaging/jboss-as5/pkg/pom.xml 2011-07-12 15:18:10 UTC (rev 6863)
+++ portal/branches/api/packaging/jboss-as5/pkg/pom.xml 2011-07-12 20:45:32 UTC (rev 6864)
@@ -1,5 +1,6 @@
<?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -18,7 +19,7 @@
<!-- The following two properties should not be changed! -->
<jbossas.version>5.1.0.GA</jbossas.version>
<jbossas.dist.version>5.1.0.GA-jdk6</jbossas.dist.version>
-
+
<servers.dir>${project.basedir}/../../servers</servers.dir>
<jbossas.path>${servers.dir}</jbossas.path>
<jbossas.name>jboss-${jbossas.version}</jbossas.name>
@@ -296,12 +297,12 @@
<!-- GateIn API -->
<dependency>
- <groupId>org.gatein.portal</groupId>
- <artifactId>gatein-api</artifactId>
+ <groupId>org.gatein.api</groupId>
+ <artifactId>java-api-impl</artifactId>
</dependency>
<dependency>
- <groupId>org.gatein.portal</groupId>
- <artifactId>gatein-api-impl</artifactId>
+ <groupId>org.gatein.api</groupId>
+ <artifactId>gatein-java-api</artifactId>
</dependency>
<!-- Gatein common -->
@@ -500,9 +501,9 @@
<!-- Provided -->
<dependency>
- <groupId>javax.inject</groupId>
- <artifactId>javax.inject</artifactId>
- <version>1</version>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
+ <version>1</version>
</dependency>
<dependency>
<groupId>javax.activation</groupId>
@@ -630,8 +631,8 @@
<version>2.0.235</version>
</dependency>
<dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
</dependency>
<dependency>
<groupId>org.codehaus.groovy</groupId>
@@ -798,19 +799,19 @@
<version>1.2.3</version>
</dependency>
<dependency>
- <groupId>org.apache.tika</groupId>
- <artifactId>tika-core</artifactId>
- <version>0.7</version>
+ <groupId>org.apache.tika</groupId>
+ <artifactId>tika-core</artifactId>
+ <version>0.7</version>
</dependency>
<dependency>
- <groupId>org.apache.tika</groupId>
- <artifactId>tika-parsers</artifactId>
- <version>0.7</version>
+ <groupId>org.apache.tika</groupId>
+ <artifactId>tika-parsers</artifactId>
+ <version>0.7</version>
</dependency>
<dependency>
- <groupId>com.google.javascript</groupId>
- <artifactId>closure-compiler</artifactId>
- <version>r706</version>
+ <groupId>com.google.javascript</groupId>
+ <artifactId>closure-compiler</artifactId>
+ <version>r706</version>
</dependency>
<dependency>
@@ -927,17 +928,17 @@
<requireProperty>
<property>jbossas.path</property>
<message>"
-You must define the property 'jbossas.path'
-to give the path to the directory where you store your applications servers.
-"
+ You must define the property 'jbossas.path'
+ to give the path to the directory where you store your applications servers.
+ "
</message>
</requireProperty>
<requireProperty>
<property>jbossas.name</property>
<message>"
-You must define the property 'jbossas.name'
-to give the name of the directory where JBoss AS is stored.
-"
+ You must define the property 'jbossas.name'
+ to give the name of the directory where JBoss AS is stored.
+ "
</message>
</requireProperty>
<requireFilesExist>
@@ -945,13 +946,14 @@
<file>${jbossas.path}/${jbossas.name}/</file>
</files>
<message>"
-The following JBoss AS directory doesn't exist :
+ The following JBoss AS directory doesn't exist :
${jbossas.path}/${jbossas.name}
-Make JBoss AS instance available at that location, or use -Dservers.dir=PATH to point to the correct location of servers directory
-and/or -Djbossas.name=NAME to point to the correct directory under the servers directory.
-You can also use -Pdownload to automatically provide JBoss AS instance.
-"
+ Make JBoss AS instance available at that location, or use -Dservers.dir=PATH to point to
+ the correct location of servers directory
+ and/or -Djbossas.name=NAME to point to the correct directory under the servers directory.
+ You can also use -Pdownload to automatically provide JBoss AS instance.
+ "
</message>
</requireFilesExist>
</rules>
@@ -987,9 +989,9 @@
<configuration>
<target>
<ant antfile="${project.basedir}/package.xml" inheritRefs="true">
- <target name="package" />
- <property name="maven.project.basedir" value="${project.basedir}" />
- <property name="maven.project.build.directory" value="${project.build.directory}" />
+ <target name="package"/>
+ <property name="maven.project.basedir" value="${project.basedir}"/>
+ <property name="maven.project.build.directory" value="${project.build.directory}"/>
</ant>
</target>
</configuration>
@@ -998,8 +1000,8 @@
</plugin>
</plugins>
</build>
-
+
<profiles>
<profile>
<id>pkg-jbossas5</id>
@@ -1026,9 +1028,9 @@
<requireProperty>
<property>exo.projects.directory.dependencies</property>
<message>"
-You must define the property 'exo.projects.directory.dependencies'
-to specify the path to the directory where you store your application servers.
-"
+ You must define the property 'exo.projects.directory.dependencies'
+ to specify the path to the directory where you store your application servers.
+ "
</message>
</requireProperty>
</rules>
@@ -1045,9 +1047,9 @@
<requireProperty>
<property>exo.projects.app.jboss5.version</property>
<message>"
-You must define the property 'exo.projects.app.jboss5.version'
-to specify the name of the directory where JBoss AS is stored.
-"
+ You must define the property 'exo.projects.app.jboss5.version'
+ to specify the name of the directory where JBoss AS is stored.
+ "
</message>
</requireProperty>
</rules>
@@ -1068,13 +1070,15 @@
</file>
</files>
<message>"
-The following JBoss AS directory doesn't exist :
+ The following JBoss AS directory doesn't exist :
${exo.projects.directory.dependencies}/${exo.projects.app.jboss5.version}
-Make JBoss AS instance available at that location, or use -Dexo.projects.directory.dependencies=PATH to point to the correct location
-of servers directory and/or -Dexo.projects.app.jboss5.version=NAME to point to the correct directory under the servers directory.
-You can also use -Pdownload to automatically provide JBoss AS instance.
-"
+ Make JBoss AS instance available at that location, or use
+ -Dexo.projects.directory.dependencies=PATH to point to the correct location
+ of servers directory and/or -Dexo.projects.app.jboss5.version=NAME to point to the
+ correct directory under the servers directory.
+ You can also use -Pdownload to automatically provide JBoss AS instance.
+ "
</message>
</requireFilesExist>
</rules>
@@ -1084,10 +1088,10 @@
<execution>
<id>check-jboss-environment-ready</id>
<phase>none</phase>
- </execution>
+ </execution>
</executions>
</plugin>
-
+
</plugins>
</build>
</profile>
@@ -1127,35 +1131,36 @@
</goals>
<configuration>
<target>
- <available property="jbossas.dir.exists" type="dir" file="${jbossas.dir}" />
+ <available property="jbossas.dir.exists" type="dir" file="${jbossas.dir}"/>
<fail if="jbossas.dir.exists">"
-Destination JBossAS directory exists already:
+ Destination JBossAS directory exists already:
${jbossas.dir}
-Either rename it, delete it, or deactivate -Pdownload profile.
-"
+ Either rename it, delete it, or deactivate -Pdownload profile.
+ "
</fail>
- <property name="jbossas.zip" value="${jbossas.path}/jboss-${jbossas.dist.version}.zip" />
+ <property name="jbossas.zip" value="${jbossas.path}/jboss-${jbossas.dist.version}.zip"/>
<!-- Autocreate servers.dir if necessary -->
- <mkdir dir="${jbossas.path}" />
+ <mkdir dir="${jbossas.path}"/>
<!-- Download JBossAS unless already downloaded -->
<ant antfile="${project.basedir}/download-jboss.xml">
- <target name="download-jboss" />
- <property name="url" value="http://sourceforge.net/projects/jboss/files/JBoss/JBoss-${jbossas.version..." />
- <property name="dest" value="${jbossas.zip}" />
+ <target name="download-jboss"/>
+ <property name="url"
+ value="http://sourceforge.net/projects/jboss/files/JBoss/JBoss-${jbossas.version..."/>
+ <property name="dest" value="${jbossas.zip}"/>
</ant>
<!-- Extract downloaded JBossAS to servers dir -->
- <unzip src="${jbossas.zip}" dest="${jbossas.path}" overwrite="false" />
+ <unzip src="${jbossas.zip}" dest="${jbossas.path}" overwrite="false"/>
<ant antfile="${project.basedir}/package.xml" inheritRefs="true">
- <target name="package" />
- <property name="maven.project.basedir" value="${project.basedir}" />
- <property name="maven.project.build.directory" value="${project.build.directory}" />
+ <target name="package"/>
+ <property name="maven.project.basedir" value="${project.basedir}"/>
+ <property name="maven.project.build.directory" value="${project.build.directory}"/>
</ant>
</target>
</configuration>
@@ -1165,7 +1170,7 @@
</plugins>
</build>
</profile>
-
+
<profile>
<id>bundle</id>
<build>
@@ -1183,8 +1188,10 @@
</goals>
<configuration>
<target>
- <zip destfile="${project.build.directory}/GateIn-${project.version}-jbossas.zip" basedir="${jbossas.target.dir}" />
- <attachartifact file="${project.build.directory}/GateIn-${project.version}-jbossas.zip" classifier="bundle" type="zip" />
+ <zip destfile="${project.build.directory}/GateIn-${project.version}-jbossas.zip"
+ basedir="${jbossas.target.dir}"/>
+ <attachartifact file="${project.build.directory}/GateIn-${project.version}-jbossas.zip"
+ classifier="bundle" type="zip"/>
</target>
</configuration>
</execution>
@@ -1193,5 +1200,5 @@
</plugins>
</build>
</profile>
- </profiles>
+ </profiles>
</project>
Modified: portal/branches/api/pom.xml
===================================================================
--- portal/branches/api/pom.xml 2011-07-12 15:18:10 UTC (rev 6863)
+++ portal/branches/api/pom.xml 2011-07-12 20:45:32 UTC (rev 6864)
@@ -50,7 +50,7 @@
<org.picketlink.idm>1.3.0.Alpha03</org.picketlink.idm>
<org.gatein.wsrp.version>2.1.0-Beta04</org.gatein.wsrp.version>
<org.gatein.mop.version>1.1.0-Beta05</org.gatein.mop.version>
- <org.gatein.api.version>1.0.0-GA-SNAPSHOT</org.gatein.api.version>
+ <org.gatein.api.version>1.0.0-Beta01-SNAPSHOT</org.gatein.api.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>
@@ -381,13 +381,13 @@
<!-- API -->
<dependency>
- <groupId>org.gatein.portal</groupId>
- <artifactId>gatein-api</artifactId>
+ <groupId>org.gatein.api</groupId>
+ <artifactId>gatein-java-api</artifactId>
<version>${org.gatein.api.version}</version>
</dependency>
<dependency>
- <groupId>org.gatein.portal</groupId>
- <artifactId>gatein-api-impl</artifactId>
+ <groupId>org.gatein.api</groupId>
+ <artifactId>java-api-impl</artifactId>
<version>${project.version}</version>
</dependency>
13 years, 5 months
gatein SVN: r6863 - portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl.
by do-not-reply@jboss.org
Author: chris.laprun(a)jboss.com
Date: 2011-07-12 11:18:10 -0400 (Tue, 12 Jul 2011)
New Revision: 6863
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/NavigationImpl.java
portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/PortalImpl.java
Log:
- Adapted for API changes.
- Extracted anonymous classes into inner ones.
- Fleshed out implementation some more.
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-07-12 09:49:09 UTC (rev 6862)
+++ portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/GateInImpl.java 2011-07-12 15:18:10 UTC (rev 6863)
@@ -22,13 +22,12 @@
package org.gatein.portal.api.impl;
-import org.exoplatform.commons.utils.LazyPageList;
import org.exoplatform.container.ExoContainer;
import org.exoplatform.container.ExoContainerContext;
+import org.exoplatform.container.component.RequestLifeCycle;
import org.exoplatform.container.configuration.ConfigurationManager;
import org.exoplatform.container.xml.InitParams;
import org.exoplatform.portal.config.Query;
-import org.exoplatform.portal.config.model.PortalConfig;
import org.exoplatform.portal.mop.SiteType;
import org.exoplatform.portal.mop.navigation.NavigationService;
import org.exoplatform.portal.pom.config.POMSession;
@@ -38,24 +37,25 @@
import org.exoplatform.portal.pom.data.PortalKey;
import org.gatein.api.GateIn;
import org.gatein.api.IterableResult;
-import org.gatein.api.Portal;
import org.gatein.api.content.Application;
import org.gatein.api.content.Content;
import org.gatein.api.content.Gadget;
import org.gatein.api.content.ManagedContent;
import org.gatein.api.id.Id;
import org.gatein.api.id.Identifiable;
-import org.gatein.api.navigation.Site;
+import org.gatein.api.portal.Portal;
+import org.gatein.api.portal.Site;
import org.gatein.mop.api.workspace.ObjectType;
import org.picocontainer.Startable;
import java.net.URI;
import java.util.Iterator;
+import java.util.List;
/** @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> */
public class GateInImpl implements GateIn, Startable
{
- private static final Query<PortalConfig> PORTALS = new Query<PortalConfig>(SiteType.PORTAL.getName(), null, PortalConfig.class);
+ private static final Query<PortalData> PORTALS = new Query<PortalData>(SiteType.PORTAL.getName(), null, PortalData.class);
private ExoContainer container;
private ModelDataStorage dataStorage;
private NavigationService navigationService;
@@ -70,53 +70,27 @@
{
try
{
- LazyPageList<PortalConfig> portals = dataStorage.find(PORTALS);
+ RequestLifeCycle.begin(container);
+ final List<PortalData> portals = dataStorage.find(PORTALS).getAll();
- return new IterableResult<Portal>()
- {
- private int size = -1;
-
- public int size()
- {
- if (size != -1)
- {
- return size;
- }
- else
- {
- POMSession session = pomSessionManager.getSession();
- size = session.findObjects(ObjectType.PORTAL_SITE, ObjectType.PORTAL_SITE, null, null, 0, 1).hits();
- session.close();
- return size;
- }
- }
-
- public boolean contains(Portal portal)
- {
- POMSession session = pomSessionManager.getSession();
- boolean found = portal != null && session.findObjectById(portal.getId().toString()) != null;
- session.close();
- return found;
- }
-
- public Iterator<Portal> iterator()
- {
- return null;
- }
- };
+ return new PortalIterableResult(portals);
}
catch (Exception e)
{
throw new RuntimeException(e);
}
+ finally
+ {
+ RequestLifeCycle.end();
+ }
}
public Portal getPortal(Id<Portal> portalId)
{
try
{
- PortalData portalConfig = dataStorage.getPortalConfig(PortalKey.create(portalId.toString()));
- return new PortalImpl(portalConfig, this);
+ PortalData portalData = dataStorage.getPortalConfig(PortalKey.create(portalId.toString()));
+ return new PortalImpl(portalData, this);
}
catch (Exception e)
{
@@ -126,7 +100,7 @@
public Portal getDefaultPortal()
{
- return getPortal(portalId("default")); // todo: check
+ return getPortal(portalId("classic")); // todo: check
}
public IterableResult<Site> getSites()
@@ -230,4 +204,75 @@
{
return navigationService;
}
+
+ private static class PortalIterator implements Iterator<Portal>
+ {
+ private int current;
+ private int size;
+ private final List<PortalData> portals;
+ private final GateInImpl gateIn;
+
+ public PortalIterator(List<PortalData> portals, GateInImpl gateIn)
+ {
+ this.portals = portals;
+ size = portals.size();
+ this.gateIn = gateIn;
+ }
+
+
+ public boolean hasNext()
+ {
+ return current > size;
+ }
+
+ public Portal next()
+ {
+ return new PortalImpl(portals.get(current++), gateIn);
+ }
+
+ public void remove()
+ {
+ throw new UnsupportedOperationException();
+ }
+ }
+
+ private class PortalIterableResult implements IterableResult<Portal>
+ {
+ private int size;
+ private final List<PortalData> portals;
+
+ public PortalIterableResult(List<PortalData> portals)
+ {
+ this.portals = portals;
+ size = -1;
+ }
+
+ public int size()
+ {
+ if (size != -1)
+ {
+ return size;
+ }
+ else
+ {
+ POMSession session = pomSessionManager.getSession();
+ size = session.findObjects(ObjectType.PORTAL_SITE, ObjectType.PORTAL_SITE, null, null, 0, 1).hits();
+ session.close();
+ return size;
+ }
+ }
+
+ public boolean contains(Id<Portal> id)
+ {
+ POMSession session = pomSessionManager.getSession();
+ boolean found = id != null && session.findObjectById(id.toString()) != null;
+ session.close();
+ return found;
+ }
+
+ public Iterator<Portal> iterator()
+ {
+ return new PortalIterator(portals, GateInImpl.this);
+ }
+ }
}
Modified: portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/NavigationImpl.java
===================================================================
--- portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/NavigationImpl.java 2011-07-12 09:49:09 UTC (rev 6862)
+++ portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/NavigationImpl.java 2011-07-12 15:18:10 UTC (rev 6863)
@@ -26,9 +26,9 @@
import org.gatein.api.Filter;
import org.gatein.api.IterableResult;
import org.gatein.api.Query;
-import org.gatein.api.navigation.Navigation;
-import org.gatein.api.navigation.Page;
-import org.gatein.api.navigation.Site;
+import org.gatein.api.portal.Navigation;
+import org.gatein.api.portal.Page;
+import org.gatein.api.portal.Site;
/** @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> */
public class NavigationImpl extends IdentifiableImpl<Navigation> implements Navigation
Modified: portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/PortalImpl.java
===================================================================
--- portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/PortalImpl.java 2011-07-12 09:49:09 UTC (rev 6862)
+++ portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/PortalImpl.java 2011-07-12 15:18:10 UTC (rev 6863)
@@ -30,13 +30,13 @@
import org.exoplatform.portal.mop.navigation.Scope;
import org.exoplatform.portal.pom.data.PortalData;
import org.gatein.api.Container;
-import org.gatein.api.Portal;
import org.gatein.api.content.ContentRegistry;
import org.gatein.api.id.Context;
import org.gatein.api.id.Id;
-import org.gatein.api.navigation.Navigation;
-import org.gatein.api.navigation.Page;
-import org.gatein.api.navigation.Site;
+import org.gatein.api.portal.Navigation;
+import org.gatein.api.portal.Page;
+import org.gatein.api.portal.Portal;
+import org.gatein.api.portal.Site;
import java.util.regex.Pattern;
13 years, 5 months
gatein SVN: r6862 - portal/trunk/portlet/dashboard/src/main/webapp/groovy/gadget/webui/component.
by do-not-reply@jboss.org
Author: kien_nguyen
Date: 2011-07-12 05:49:09 -0400 (Tue, 12 Jul 2011)
New Revision: 6862
Modified:
portal/trunk/portlet/dashboard/src/main/webapp/groovy/gadget/webui/component/UIGadgetViewMode.gtmpl
Log:
Remove fixed height of gadget portlet, it should be dynamic height
Modified: portal/trunk/portlet/dashboard/src/main/webapp/groovy/gadget/webui/component/UIGadgetViewMode.gtmpl
===================================================================
--- portal/trunk/portlet/dashboard/src/main/webapp/groovy/gadget/webui/component/UIGadgetViewMode.gtmpl 2011-07-12 08:37:28 UTC (rev 6861)
+++ portal/trunk/portlet/dashboard/src/main/webapp/groovy/gadget/webui/component/UIGadgetViewMode.gtmpl 2011-07-12 09:49:09 UTC (rev 6862)
@@ -9,7 +9,6 @@
def windowId = rcontext.getWindowId();
def id = uicomponent.getId() + "-" + windowId ;
def url = uicomponent.getParent().getUrl();
- def height = "auto" ;
if(url != null) {
def metadata = uicomponent.getParent().getMetadata(url);
@@ -17,11 +16,7 @@
JavascriptManager jsmanager = rcontext.getJavascriptManager();
jsmanager.importJavascript("eXo.gadget.UIGadget") ;
jsmanager.addCustomizedOnLoadScript("eXo.gadget.UIGadget.createGadget('$url','$id', $metadata, $userPref, 'canvas', '$hostName');") ;
- java.util.Map<String, String> metadataMap = GadgetUtil.getMapMetadata(url) ;
-
- if(metadataMap.containsKey("height") && Integer.parseInt(metadataMap.get("height")) > 0)
- height = (Integer.parseInt(metadataMap.get("height")) + 10) + "px" ;
}
%>
-<div class="UIGadgetViewMode" id="$id" style="height: <%=height%>;"></div>
+<div class="UIGadgetViewMode" id="$id" style="height: auto;"></div>
13 years, 5 months