gatein SVN: r5179 - components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/registry.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2010-11-19 08:36:41 -0500 (Fri, 19 Nov 2010)
New Revision: 5179
Modified:
components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/registry/AbstractConsumerRegistry.java
Log:
- Indicate that save and delete can throw ConsumerExceptions.
Modified: components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/registry/AbstractConsumerRegistry.java
===================================================================
--- components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/registry/AbstractConsumerRegistry.java 2010-11-19 10:53:52 UTC (rev 5178)
+++ components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/registry/AbstractConsumerRegistry.java 2010-11-19 13:36:41 UTC (rev 5179)
@@ -399,9 +399,9 @@
return RELEASE_SESSIONS_LISTENER + id;
}
- protected abstract void save(ProducerInfo info, String messageOnError);
+ protected abstract void save(ProducerInfo info, String messageOnError) throws ConsumerException;
- protected abstract void delete(ProducerInfo info);
+ protected abstract void delete(ProducerInfo info) throws ConsumerException;
/**
* Persists the changes made to ProducerInfo.
14 years, 2 months
gatein SVN: r5178 - portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium.
by do-not-reply＠jboss.org
Author: hangnguyen
Date: 2010-11-19 05:53:52 -0500 (Fri, 19 Nov 2010)
New Revision: 5178
Modified:
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_PRL_03_05_011_AddMultiUserIntoGroup.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_PRL_03_05_012_AddSomeUsersIntoGroupInCaseAfterCommaHasSpace.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_PRL_03_06_003_EditMembershipOfUserWhichWasDeletedFromGroup.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_PRL_03_07_004_CheckShowGroupPageListAfterUserWasRemovedFromGroupWith1Role.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_PRL_03_07_005_CheckEditMembershipOfUserWhichRemvoedFromGroup.html
Log:
TestVN-356:Clean and Improve existing Selenium for GateIn
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_PRL_03_05_011_AddMultiUserIntoGroup.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_PRL_03_05_011_AddMultiUserIntoGroup.html 2010-11-19 10:52:42 UTC (rev 5177)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_PRL_03_05_011_AddMultiUserIntoGroup.html 2010-11-19 10:53:52 UTC (rev 5178)
@@ -188,7 +188,7 @@
</tr>
<tr>
<td>echo</td>
- <td>-- Delete user in group--</td>
+ <td>-- Delete user1 in group--</td>
<td></td>
</tr>
<tr>
@@ -207,6 +207,16 @@
<td></td>
</tr>
<tr>
+ <td>pause</td>
+ <td>1000</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>-- Delete user2 in group--</td>
+ <td></td>
+</tr>
+<tr>
<td>waitForElementPresent</td>
<td>//img[@alt='DeleteUser']</td>
<td></td>
@@ -222,6 +232,16 @@
<td></td>
</tr>
<tr>
+ <td>pause</td>
+ <td>1000</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>-- Delete user3 in group--</td>
+ <td></td>
+</tr>
+<tr>
<td>waitForElementPresent</td>
<td>//img[@alt='DeleteUser']</td>
<td></td>
@@ -237,6 +257,16 @@
<td></td>
</tr>
<tr>
+ <td>pause</td>
+ <td>1000</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>-- Delete user4 in group--</td>
+ <td></td>
+</tr>
+<tr>
<td>waitForElementPresent</td>
<td>//img[@alt='DeleteUser']</td>
<td></td>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_PRL_03_05_012_AddSomeUsersIntoGroupInCaseAfterCommaHasSpace.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_PRL_03_05_012_AddSomeUsersIntoGroupInCaseAfterCommaHasSpace.html 2010-11-19 10:52:42 UTC (rev 5177)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_PRL_03_05_012_AddSomeUsersIntoGroupInCaseAfterCommaHasSpace.html 2010-11-19 10:53:52 UTC (rev 5178)
@@ -153,7 +153,7 @@
</tr>
<tr>
<td>echo</td>
- <td>-- Delete user--</td>
+ <td>-- Delete user1--</td>
<td></td>
</tr>
<tr>
@@ -172,6 +172,16 @@
<td></td>
</tr>
<tr>
+ <td>pause</td>
+ <td>1000</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>-- Delete user2--</td>
+ <td></td>
+</tr>
+<tr>
<td>waitForElementPresent</td>
<td>//img[@alt='DeleteUser']</td>
<td></td>
@@ -187,6 +197,16 @@
<td></td>
</tr>
<tr>
+ <td>pause</td>
+ <td>1000</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>-- Delete user3--</td>
+ <td></td>
+</tr>
+<tr>
<td>waitForElementPresent</td>
<td>//img[@alt='DeleteUser']</td>
<td></td>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_PRL_03_06_003_EditMembershipOfUserWhichWasDeletedFromGroup.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_PRL_03_06_003_EditMembershipOfUserWhichWasDeletedFromGroup.html 2010-11-19 10:52:42 UTC (rev 5177)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_PRL_03_06_003_EditMembershipOfUserWhichWasDeletedFromGroup.html 2010-11-19 10:53:52 UTC (rev 5178)
@@ -178,25 +178,30 @@
</tr>
<tr>
<td>waitForTextPresent</td>
- <td>Can't save, membership removed!. </td>
+ <td>Can't save, membership removed!.</td>
<td></td>
</tr>
<tr>
<td>verifyTextPresent</td>
- <td>Can't save, membership removed!. </td>
+ <td>Can't save, membership removed!.</td>
<td></td>
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>//div[2]/div[2]/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/table/tbody/tr/td/div/div/div/div/a</td>
<td></td>
</tr>
<tr>
<td>click</td>
- <td>//div[2]/div[2]/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/table/tbody/tr/td/div/div/div/div/a</td>
<td></td>
</tr>
<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Sign out</td>
+ <td></td>
+</tr>
+<tr>
<td>clickAndWait</td>
<td>link=Sign out</td>
<td></td>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_PRL_03_07_004_CheckShowGroupPageListAfterUserWasRemovedFromGroupWith1Role.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_PRL_03_07_004_CheckShowGroupPageListAfterUserWasRemovedFromGroupWith1Role.html 2010-11-19 10:52:42 UTC (rev 5177)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_PRL_03_07_004_CheckShowGroupPageListAfterUserWasRemovedFromGroupWith1Role.html 2010-11-19 10:53:52 UTC (rev 5178)
@@ -107,12 +107,12 @@
<td></td>
</tr>
<tr>
- <td>verifyTextPresent</td>
+ <td>waitForTextPresent</td>
<td>You have registered a new account.</td>
<td></td>
</tr>
<tr>
- <td>waitForTextPresent</td>
+ <td>verifyTextPresent</td>
<td>You have registered a new account.</td>
<td></td>
</tr>
@@ -132,6 +132,11 @@
<td></td>
</tr>
<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Users and groups management</td>
+ <td></td>
+</tr>
+<tr>
<td>clickAndWait</td>
<td>link=Users and groups management</td>
<td></td>
@@ -437,6 +442,11 @@
<td></td>
</tr>
<tr>
+ <td>waitForElementPresent</td>
+ <td>//div[@id='UIPageEditor']/div[1]/div/div/div/a[2]</td>
+ <td></td>
+</tr>
+<tr>
<td>clickAndWait</td>
<td>//div[@id='UIPageEditor']/div[1]/div/div/div/a[2]</td>
<td></td>
@@ -772,11 +782,21 @@
<td></td>
</tr>
<tr>
+ <td>waitForTextNotPresent</td>
+ <td>Test_PLT_03_07_004_add</td>
+ <td></td>
+</tr>
+<tr>
<td>verifyTextNotPresent</td>
<td>Test_PLT_03_07_004_add</td>
<td></td>
</tr>
<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Sign out</td>
+ <td></td>
+</tr>
+<tr>
<td>clickAndWait</td>
<td>link=Sign out</td>
<td></td>
@@ -822,6 +842,11 @@
<td></td>
</tr>
<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Users and groups management</td>
+ <td></td>
+</tr>
+<tr>
<td>clickAndWait</td>
<td>link=Users and groups management</td>
<td></td>
@@ -932,6 +957,11 @@
<td></td>
</tr>
<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Sign out</td>
+ <td></td>
+</tr>
+<tr>
<td>clickAndWait</td>
<td>link=Sign out</td>
<td></td>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_PRL_03_07_005_CheckEditMembershipOfUserWhichRemvoedFromGroup.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_PRL_03_07_005_CheckEditMembershipOfUserWhichRemvoedFromGroup.html 2010-11-19 10:52:42 UTC (rev 5177)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_PRL_03_07_005_CheckEditMembershipOfUserWhichRemvoedFromGroup.html 2010-11-19 10:53:52 UTC (rev 5178)
@@ -94,7 +94,7 @@
<tr>
<td>waitForElementPresent</td>
<td>username</td>
- <td>root</td>
+ <td></td>
</tr>
<tr>
<td>type</td>
14 years, 2 months
gatein SVN: r5177 - portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium.
by do-not-reply＠jboss.org
Author: hangnguyen
Date: 2010-11-19 05:52:42 -0500 (Fri, 19 Nov 2010)
New Revision: 5177
Modified:
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_PRL_03_01_001_CheckShowingGroupManagementForm.html
Log:
TestVN-356:Clean and Improve existing Selenium for GateIn
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_PRL_03_01_001_CheckShowingGroupManagementForm.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_PRL_03_01_001_CheckShowingGroupManagementForm.html 2010-11-19 10:36:26 UTC (rev 5176)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_PRL_03_01_001_CheckShowingGroupManagementForm.html 2010-11-19 10:52:42 UTC (rev 5177)
@@ -97,14 +97,14 @@
<td></td>
</tr>
<tr>
- <td>waitForElementPresent</td>
- <td>//div[@id='UIOrganizationPortlet']/div[2]/div[2]/div[1]/div[2]/div[1]/div[2]/div/div/div/div[2]/div[1]/a</td>
+ <td>waitForTextPresent</td>
+ <td>Customers</td>
<td></td>
</tr>
<tr>
- <td>verifyText</td>
- <td>//div[@id='UIOrganizationPortlet']/div[2]/div[2]/div[1]/div[2]/div[1]/div[2]/div/div/div/div[2]/div[1]/a</td>
+ <td>verifyTextPresent</td>
<td>Customers</td>
+ <td></td>
</tr>
<tr>
<td>echo</td>
@@ -122,7 +122,7 @@
<td></td>
</tr>
<tr>
- <td>waitForElementPresent</td>
+ <td>waitForTextPresent</td>
<td>//div[@id='UIOrganizationPortlet']/div[2]/div[2]/div[1]/div[2]/div[1]/div[2]/div/div/div/div[3]/div[1]/a</td>
<td></td>
</tr>
@@ -182,14 +182,14 @@
<td></td>
</tr>
<tr>
- <td>waitForElementPresent</td>
+ <td>waitForTextPresent</td>
<td>link=Customers</td>
<td></td>
</tr>
<tr>
- <td>verifyText</td>
+ <td>verifyTextPresent</td>
<td>link=Customers</td>
- <td>Customers</td>
+ <td></td>
</tr>
<tr>
<td>echo</td>
@@ -207,12 +207,12 @@
<td></td>
</tr>
<tr>
- <td>waitForElementPresent</td>
+ <td>waitForTextPresent</td>
<td>//div[1]/div[2]/div/div/div/div[1]/a</td>
<td></td>
</tr>
<tr>
- <td>verifyText</td>
+ <td>verifyTextPresent</td>
<td>//div[1]/div[2]/div/div/div/div[1]/a</td>
<td></td>
</tr>
14 years, 2 months
gatein SVN: r5176 - in exo/portal/branches/3.1.x/component/identity/src: test/java/org/exoplatform/services/organization and 1 other directory.
by do-not-reply＠jboss.org
Author: hoang_to
Date: 2010-11-19 05:36:26 -0500 (Fri, 19 Nov 2010)
New Revision: 5176
Modified:
exo/portal/branches/3.1.x/component/identity/src/main/java/org/exoplatform/services/organization/idm/MembershipDAOImpl.java
exo/portal/branches/3.1.x/component/identity/src/test/java/org/exoplatform/services/organization/TestOrganizationService.java
Log:
EXOGTN-136: A MembershipType is automatically created if missing while making a membership link
Modified: exo/portal/branches/3.1.x/component/identity/src/main/java/org/exoplatform/services/organization/idm/MembershipDAOImpl.java
===================================================================
--- exo/portal/branches/3.1.x/component/identity/src/main/java/org/exoplatform/services/organization/idm/MembershipDAOImpl.java 2010-11-19 09:21:20 UTC (rev 5175)
+++ exo/portal/branches/3.1.x/component/identity/src/main/java/org/exoplatform/services/organization/idm/MembershipDAOImpl.java 2010-11-19 10:36:26 UTC (rev 5176)
@@ -102,6 +102,11 @@
+ " because membership type is null");
}
+ if(orgService.getMembershipTypeHandler().findMembershipType(mt.getName()) == null)
+ {
+ throw new InvalidNameException("MembershipType doesn't exist: " + mt.getName());
+ }
+
String plGroupName = getPLIDMGroupName(g.getGroupName());
String groupId =
Modified: exo/portal/branches/3.1.x/component/identity/src/test/java/org/exoplatform/services/organization/TestOrganizationService.java
===================================================================
--- exo/portal/branches/3.1.x/component/identity/src/test/java/org/exoplatform/services/organization/TestOrganizationService.java 2010-11-19 09:21:20 UTC (rev 5175)
+++ exo/portal/branches/3.1.x/component/identity/src/test/java/org/exoplatform/services/organization/TestOrganizationService.java 2010-11-19 10:36:26 UTC (rev 5176)
@@ -340,6 +340,7 @@
mt = mtHandler_.createMembershipTypeInstance();
mt.setName("membershipType3");
+ mtHandler_.createMembershipType(mt, true);
membershipHandler_.linkMembership(userBenj, group2, mt, true);
/*
@@ -496,7 +497,37 @@
PageList users = userHandler_.findUsersByGroup("/users");
assertTrue(users.getAvailable() > 0);
}
-
+
+ public void testLinkMembership() throws Exception
+ {
+ String userName = "testLinkMembershipUser";
+ String groupName = "testLinkMembershipGroup";
+ String membershipType = "testLinkMembership";
+
+ Group testGroup = groupHandler_.createGroupInstance();
+ testGroup.setGroupName(groupName);
+ groupHandler_.addChild(null, testGroup, true);
+
+ User testUser = createUser(userName);
+
+ MembershipType testMembership = mtHandler_.createMembershipTypeInstance();
+ testMembership.setName(membershipType);
+
+ try{
+ membershipHandler_.linkMembership(testUser, testGroup, testMembership, true);
+ //Fail the test if there is no exception in the call to linkMembership
+ fail();
+ }catch(Exception ex)
+ {
+
+ }
+
+ assertNull(mtHandler_.findMembershipType(membershipType));
+
+ userHandler_.removeUser(userName, true);
+ groupHandler_.removeGroup(testGroup, true);
+ }
+
private static class UserProfileListener extends UserProfileEventListener
{
14 years, 2 months
gatein SVN: r5175 - exo/portal/branches/3.1.x/portlet/dashboard/src/main/java/org/exoplatform/dashboard/webui/component.
by do-not-reply＠jboss.org
Author: ndkhoiits
Date: 2010-11-19 04:21:20 -0500 (Fri, 19 Nov 2010)
New Revision: 5175
Modified:
exo/portal/branches/3.1.x/portlet/dashboard/src/main/java/org/exoplatform/dashboard/webui/component/UITabPaneDashboard.java
Log:
EXOGTN-170 Encode new node URI before redirect to them in tab dashboard
Modified: exo/portal/branches/3.1.x/portlet/dashboard/src/main/java/org/exoplatform/dashboard/webui/component/UITabPaneDashboard.java
===================================================================
--- exo/portal/branches/3.1.x/portlet/dashboard/src/main/java/org/exoplatform/dashboard/webui/component/UITabPaneDashboard.java 2010-11-19 09:15:39 UTC (rev 5174)
+++ exo/portal/branches/3.1.x/portlet/dashboard/src/main/java/org/exoplatform/dashboard/webui/component/UITabPaneDashboard.java 2010-11-19 09:21:20 UTC (rev 5175)
@@ -40,6 +40,7 @@
import org.exoplatform.webui.event.Event;
import org.exoplatform.webui.event.EventListener;
+import java.net.URLEncoder;
import java.util.ArrayList;
import java.util.List;
@@ -419,7 +420,7 @@
PortalRequestContext prContext = Util.getPortalRequestContext();
prContext.setResponseComplete(true);
- prContext.getResponse().sendRedirect(prContext.getPortalURI() + selectedNode.getUri());
+ prContext.getResponse().sendRedirect(prContext.getPortalURI() + URLEncoder.encode(selectedNode.getUri(), "UTF-8"));
}
}
}
@@ -437,7 +438,7 @@
//We should redirect to current node while adding new tab fails
PageNode currentNode = tabPane.uiPortal.getSelectedNode();
PortalRequestContext prContext = Util.getPortalRequestContext();
- prContext.getResponse().sendRedirect(prContext.getPortalURI() + currentNode.getUri());
+ prContext.getResponse().sendRedirect(prContext.getPortalURI() + URLEncoder.encode(currentNode.getUri(), "UTF-8"));
Object[] args = {newTabLabel};
context.getUIApplication().addMessage(new ApplicationMessage("UITabPaneDashboard.msg.wrongTabName", args));
@@ -450,7 +451,7 @@
{
PortalRequestContext prContext = Util.getPortalRequestContext();
prContext.setResponseComplete(true);
- prContext.getResponse().sendRedirect(prContext.getPortalURI() + uri);
+ prContext.getResponse().sendRedirect(prContext.getPortalURI() + URLEncoder.encode(uri, "UTF-8"));
}
}
}
@@ -475,11 +476,10 @@
String newTabLabel = context.getRequestParameter(RENAMED_TAB_LABEL_PARAMETER);
if (!tabPane.validateName(newTabLabel))
{
- //TODO nguyenanhkien2a(a)gmail.com
//We should redirect to current node while renaming fails
PageNode currentNode = tabPane.uiPortal.getSelectedNode();
PortalRequestContext prContext = Util.getPortalRequestContext();
- prContext.getResponse().sendRedirect(prContext.getPortalURI() + currentNode.getUri());
+ prContext.getResponse().sendRedirect(prContext.getPortalURI() + URLEncoder.encode(currentNode.getUri(), "UTF-8"));
Object[] args = {newTabLabel};
context.getUIApplication().addMessage(new ApplicationMessage("UITabPaneDashboard.msg.wrongTabName", args));
@@ -491,7 +491,7 @@
if (newUri != null)
{
PortalRequestContext prContext = Util.getPortalRequestContext();
- prContext.getResponse().sendRedirect(prContext.getPortalURI() + newUri);
+ prContext.getResponse().sendRedirect(prContext.getPortalURI() + URLEncoder.encode(newUri, "UTF-8"));
}
}
}
14 years, 2 months
gatein SVN: r5174 - exo/portal/branches/3.1.x/component/portal/src/main/java/org/exoplatform/portal/pom/config.
by do-not-reply＠jboss.org
Author: ndkhoiits
Date: 2010-11-19 04:15:39 -0500 (Fri, 19 Nov 2010)
New Revision: 5174
Modified:
exo/portal/branches/3.1.x/component/portal/src/main/java/org/exoplatform/portal/pom/config/POMSession.java
Log:
EXOGTN-160 [PLF] Indicate slash symbol when using LIKE syntax to search special characters
Modified: exo/portal/branches/3.1.x/component/portal/src/main/java/org/exoplatform/portal/pom/config/POMSession.java
===================================================================
--- exo/portal/branches/3.1.x/component/portal/src/main/java/org/exoplatform/portal/pom/config/POMSession.java 2010-11-19 08:30:15 UTC (rev 5173)
+++ exo/portal/branches/3.1.x/component/portal/src/main/java/org/exoplatform/portal/pom/config/POMSession.java 2010-11-19 09:15:39 UTC (rev 5174)
@@ -314,7 +314,7 @@
"jcr:path LIKE '" + workspaceChunk + "/" + ownerTypeChunk + "/" + ownerIdChunk
+ "/mop:rootpage/mop:children/mop:pages/mop:children/%' AND " +
"(" +
- "LOWER(gtn:name) LIKE '%" + title.toLowerCase() + "%')";
+ "LOWER(gtn:name) LIKE '%" + title.toLowerCase() + "%' ESCAPE '\\')";
}
else
{
14 years, 2 months
gatein SVN: r5173 - in portal/branches/branch-GTNPORTAL-1643: webui/portlet/src/main/java/org/exoplatform/webui/application/portlet and 1 other directory.
by do-not-reply＠jboss.org
Author: hoang_to
Date: 2010-11-19 03:30:15 -0500 (Fri, 19 Nov 2010)
New Revision: 5173
Modified:
portal/branches/branch-GTNPORTAL-1643/component/web/controller/src/main/java/org/exoplatform/web/WebAppController.java
portal/branches/branch-GTNPORTAL-1643/webui/portlet/src/main/java/org/exoplatform/webui/application/portlet/PortletApplicationController.java
Log:
Add double-check pattern on registering Application, back port from EXOGTN
Modified: portal/branches/branch-GTNPORTAL-1643/component/web/controller/src/main/java/org/exoplatform/web/WebAppController.java
===================================================================
--- portal/branches/branch-GTNPORTAL-1643/component/web/controller/src/main/java/org/exoplatform/web/WebAppController.java 2010-11-19 07:33:26 UTC (rev 5172)
+++ portal/branches/branch-GTNPORTAL-1643/component/web/controller/src/main/java/org/exoplatform/web/WebAppController.java 2010-11-19 08:30:15 UTC (rev 5173)
@@ -49,7 +49,7 @@
private HashMap<String, Object> attributes_;
- private HashMap<String, Application> applications_;
+ private volatile HashMap<String, Application> applications_;
private HashMap<String, WebRequestHandler> handlers_;
@@ -89,16 +89,42 @@
return applications;
}
- public void removeApplication(String appId)
+ public synchronized void removeApplication(String appId)
{
applications_.remove(appId);
}
- public void addApplication(Application app)
+ /**
+ * Add application (portlet, gadget) to the global application map if and only if it has
+ * not been registered yet.
+ *
+ * @param <T>
+ * @param app
+ * @return
+ */
+ public <T extends Application> T addApplication(T app)
{
- applications_.put(app.getApplicationId(), app);
+ Application result = getApplication(app.getApplicationId());
+
+ //Double-check block
+ if(result == null)
+ {
+ synchronized(this)
+ {
+ result = getApplication(app.getApplicationId());
+ if(result == null)
+ {
+ HashMap<String, Application> temporalApplicationsMap = new HashMap<String, Application>(applications_);
+ temporalApplicationsMap.put(app.getApplicationId(), app);
+ this.applications_ = temporalApplicationsMap;
+ result = app;
+ }
+ }
+ }
+
+ return (T)result;
}
-
+
public void register(WebRequestHandler handler) throws Exception
{
for (String path : handler.getPath())
Modified: portal/branches/branch-GTNPORTAL-1643/webui/portlet/src/main/java/org/exoplatform/webui/application/portlet/PortletApplicationController.java
===================================================================
--- portal/branches/branch-GTNPORTAL-1643/webui/portlet/src/main/java/org/exoplatform/webui/application/portlet/PortletApplicationController.java 2010-11-19 07:33:26 UTC (rev 5172)
+++ portal/branches/branch-GTNPORTAL-1643/webui/portlet/src/main/java/org/exoplatform/webui/application/portlet/PortletApplicationController.java 2010-11-19 08:30:15 UTC (rev 5173)
@@ -133,7 +133,7 @@
{
application = new PortletApplication(getPortletConfig());
application.onInit();
- controller.addApplication(application);
+ application = controller.addApplication(application);
}
return application;
}
14 years, 2 months
gatein SVN: r5172 - exo/portal/branches/3.1.x/webui/core/src/main/java/org/exoplatform/webui/application.
by do-not-reply＠jboss.org
Author: hoang_to
Date: 2010-11-19 02:33:26 -0500 (Fri, 19 Nov 2010)
New Revision: 5172
Modified:
exo/portal/branches/3.1.x/webui/core/src/main/java/org/exoplatform/webui/application/ConfigurationManager.java
Log:
EXOGTN-129: Remove redundant synchronized block
Modified: exo/portal/branches/3.1.x/webui/core/src/main/java/org/exoplatform/webui/application/ConfigurationManager.java
===================================================================
--- exo/portal/branches/3.1.x/webui/core/src/main/java/org/exoplatform/webui/application/ConfigurationManager.java 2010-11-19 06:50:02 UTC (rev 5171)
+++ exo/portal/branches/3.1.x/webui/core/src/main/java/org/exoplatform/webui/application/ConfigurationManager.java 2010-11-19 07:33:26 UTC (rev 5172)
@@ -191,20 +191,9 @@
return config;
}
+ process(type);
+
//
- synchronized (this)
- {
- if ((config = configs_.get(key)) == null)
- {
- process(type);
- }
- else
- {
- return config;
- }
- }
-
- //
return configs_.get(key);
}
14 years, 2 months
gatein SVN: r5171 - portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest.
by do-not-reply＠jboss.org
Author: hangnguyen
Date: 2010-11-19 01:50:02 -0500 (Fri, 19 Nov 2010)
New Revision: 5171
Modified:
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_51_ManageGadget.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_53_DragAndDropGadget.html
Log:
TestVN-356:Clean and Improve existing Selenium for GateIn
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_51_ManageGadget.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_51_ManageGadget.html 2010-11-19 06:47:11 UTC (rev 5170)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_51_ManageGadget.html 2010-11-19 06:50:02 UTC (rev 5171)
@@ -52,6 +52,16 @@
<td></td>
</tr>
<tr>
+ <td>echo</td>
+ <td>-- Go to Dashboard page --</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Dashboard</td>
+ <td></td>
+</tr>
+<tr>
<td>clickAndWait</td>
<td>link=Dashboard</td>
<td></td>
@@ -87,11 +97,6 @@
<td>http://www.labpixies.com/campaigns/dates/dates.xml</td>
</tr>
<tr>
- <td>pause</td>
- <td>1000</td>
- <td></td>
-</tr>
-<tr>
<td>waitForElementPresent</td>
<td>//img[@title='Add Gadget']</td>
<td></td>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_53_DragAndDropGadget.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_53_DragAndDropGadget.html 2010-11-19 06:47:11 UTC (rev 5170)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_53_DragAndDropGadget.html 2010-11-19 06:50:02 UTC (rev 5171)
@@ -52,6 +52,16 @@
<td></td>
</tr>
<tr>
+ <td>echo</td>
+ <td>-- Go to Dashboard page --</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Dashboard</td>
+ <td></td>
+</tr>
+<tr>
<td>clickAndWait</td>
<td>link=Dashboard</td>
<td></td>
14 years, 2 months
gatein SVN: r5170 - exo/portal/branches/3.1.x/web/portal/src/main/webapp/WEB-INF/conf/common.
by do-not-reply＠jboss.org
Author: kien_nguyen
Date: 2010-11-19 01:47:11 -0500 (Fri, 19 Nov 2010)
New Revision: 5170
Modified:
exo/portal/branches/3.1.x/web/portal/src/main/webapp/WEB-INF/conf/common/common-configuration.xml
Log:
EXOGTN-133 [PLF] Performance improvements (GTNPORTAL-1574)
Modified: exo/portal/branches/3.1.x/web/portal/src/main/webapp/WEB-INF/conf/common/common-configuration.xml
===================================================================
--- exo/portal/branches/3.1.x/web/portal/src/main/webapp/WEB-INF/conf/common/common-configuration.xml 2010-11-19 06:46:12 UTC (rev 5169)
+++ exo/portal/branches/3.1.x/web/portal/src/main/webapp/WEB-INF/conf/common/common-configuration.xml 2010-11-19 06:47:11 UTC (rev 5170)
@@ -127,7 +127,7 @@
<init-params>
<value-param>
<name>cache.config.template</name>
- <value>classpath:/conf/jbosscache/cluster/config.xml</value>
+ <value>classpath:/conf/jbosscache/local/config.xml</value>
</value-param>
<value-param profiles="cluster">
<name>cache.config.template</name>
14 years, 2 months