gatein SVN: r7896 - portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/webui.
by do-not-reply＠jboss.org
Author: haint
Date: 2011-10-27 02:56:09 -0400 (Thu, 27 Oct 2011)
New Revision: 7896
Modified:
portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/webui/UIRightClickPopupMenu.js
Log:
GTNPORTAL-2238 Right click menu is lost some options
Modified: portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/webui/UIRightClickPopupMenu.js
===================================================================
--- portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/webui/UIRightClickPopupMenu.js 2011-10-26 15:48:44 UTC (rev 7895)
+++ portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/webui/UIRightClickPopupMenu.js 2011-10-27 06:56:09 UTC (rev 7896)
@@ -181,10 +181,13 @@
case 4:
break;
default:
- if((eXo.core.Mouse.mouseyInClient + ctxMenuContainer.offsetHeight) > eXo.core.Browser.getBrowserHeight()) {
- intTop -= ctxMenuContainer.offsetHeight ;
- }
- break;
+ // if it isn't fit to be showed down BUT is fit to to be showed up
+ if((eXo.core.Mouse.mouseyInClient + ctxMenuContainer.offsetHeight) > eXo.core.Browser.getBrowserHeight()
+ && (intTop > ctxMenuContainer.offsetHeight))
+ {
+ intTop -= ctxMenuContainer.offsetHeight ;
+ }
+ break;
}
if(eXo.core.I18n.isLT()) {
12 years, 8 months
- 1
- 0
gatein SVN: r7895 - in epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/javascript/eXo: portal and 1 other directory.
by do-not-reply＠jboss.org
Author: mwringe
Date: 2011-10-26 11:48:44 -0400 (Wed, 26 Oct 2011)
New Revision: 7895
Modified:
epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/javascript/eXo/i18n/MessageResource_ar.js
epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/javascript/eXo/i18n/MessageResource_en.js
epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/javascript/eXo/i18n/MessageResource_es.js
epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/javascript/eXo/i18n/MessageResource_fr.js
epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/javascript/eXo/i18n/MessageResource_ja.js
epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/javascript/eXo/i18n/MessageResource_ko.js
epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/javascript/eXo/i18n/MessageResource_ne.js
epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/javascript/eXo/i18n/MessageResource_nl.js
epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/javascript/eXo/i18n/MessageResource_uk.js
epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/javascript/eXo/i18n/MessageResource_zh.js
epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/javascript/eXo/i18n/MessageResource_zh_TW.js
epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/javascript/eXo/portal/PortalHttpRequest.js
Log:
JBEPP-1191: fix an issue which occurs if a ajax request is trying to update a component which no longer exists (which causes a cryptic error message and a page reload due to a timeout). Now the alert message will be more clear on the issue and recommend that a refresh may be in order (but does not automatically perform this refresh).
Modified: epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/javascript/eXo/i18n/MessageResource_ar.js
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/javascript/eXo/i18n/MessageResource_ar.js 2011-10-26 15:20:53 UTC (rev 7894)
+++ epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/javascript/eXo/i18n/MessageResource_ar.js 2011-10-26 15:48:44 UTC (rev 7895)
@@ -18,6 +18,6 @@
*/
eXo.i18n.I18NMessage.SessionTimeout = "Session timeout ! Refresh your browser.";
-eXo.i18n.I18NMessage.TargetBlockNotFound = "The target blockId to update is not found : {0}";
+eXo.i18n.I18NMessage.TargetBlockNotFound = "Cannot complete request as the component to update cannot be found (blockId: {0}). If the page's contents have changed, a page refresh may be needed."
eXo.i18n.I18NMessage.BlockUpdateNotFound = "The blockId to update is not found : {0}";
eXo.i18n.I18NMessage.DefaultTheme = "Default Theme";
\ No newline at end of file
Modified: epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/javascript/eXo/i18n/MessageResource_en.js
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/javascript/eXo/i18n/MessageResource_en.js 2011-10-26 15:20:53 UTC (rev 7894)
+++ epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/javascript/eXo/i18n/MessageResource_en.js 2011-10-26 15:48:44 UTC (rev 7895)
@@ -18,6 +18,6 @@
*/
eXo.i18n.I18NMessage.SessionTimeout = "Session timeout ! Refresh your browser.";
-eXo.i18n.I18NMessage.TargetBlockNotFound = "The target blockId to update is not found : {0}";
+eXo.i18n.I18NMessage.TargetBlockNotFound = "Cannot complete request as the component to update cannot be found (blockId: {0}). If the page's contents have changed, a page refresh may be needed."
eXo.i18n.I18NMessage.BlockUpdateNotFound = "The blockId to update is not found : {0}";
eXo.i18n.I18NMessage.DefaultTheme = "Default Theme";
\ No newline at end of file
Modified: epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/javascript/eXo/i18n/MessageResource_es.js
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/javascript/eXo/i18n/MessageResource_es.js 2011-10-26 15:20:53 UTC (rev 7894)
+++ epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/javascript/eXo/i18n/MessageResource_es.js 2011-10-26 15:48:44 UTC (rev 7895)
@@ -18,6 +18,6 @@
*/
eXo.i18n.I18NMessage.SessionTimeout = "Session timeout ! Refresh your browser.";
-eXo.i18n.I18NMessage.TargetBlockNotFound = "The target blockId to update is not found : {0}";
+eXo.i18n.I18NMessage.TargetBlockNotFound = "Cannot complete request as the component to update cannot be found (blockId: {0}). If the page's contents have changed, a page refresh may be needed."
eXo.i18n.I18NMessage.BlockUpdateNotFound = "The blockId to update is not found : {0}";
eXo.i18n.I18NMessage.DefaultTheme = "Tema por Defecto";
\ No newline at end of file
Modified: epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/javascript/eXo/i18n/MessageResource_fr.js
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/javascript/eXo/i18n/MessageResource_fr.js 2011-10-26 15:20:53 UTC (rev 7894)
+++ epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/javascript/eXo/i18n/MessageResource_fr.js 2011-10-26 15:48:44 UTC (rev 7895)
@@ -18,6 +18,6 @@
*/
eXo.i18n.I18NMessage.SessionTimeout = "La session a expir\u00e9 ! Veuillez recharger la page.";
-eXo.i18n.I18NMessage.TargetBlockNotFound = "The target blockId to update is not found : {0}";
+eXo.i18n.I18NMessage.TargetBlockNotFound = "Cannot complete request as the component to update cannot be found (blockId: {0}). If the page's contents have changed, a page refresh may be needed."
eXo.i18n.I18NMessage.BlockUpdateNotFound = "The blockId to update is not found : {0}";
eXo.i18n.I18NMessage.DefaultTheme = "Style par Défaut";
\ No newline at end of file
Modified: epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/javascript/eXo/i18n/MessageResource_ja.js
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/javascript/eXo/i18n/MessageResource_ja.js 2011-10-26 15:20:53 UTC (rev 7894)
+++ epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/javascript/eXo/i18n/MessageResource_ja.js 2011-10-26 15:48:44 UTC (rev 7895)
@@ -18,6 +18,6 @@
*/
eXo.i18n.I18NMessage.SessionTimeout = "Session timeout ! Refresh your browser.";
-eXo.i18n.I18NMessage.TargetBlockNotFound = "The target blockId to update is not found : {0}";
+eXo.i18n.I18NMessage.TargetBlockNotFound = "Cannot complete request as the component to update cannot be found (blockId: {0}). If the page's contents have changed, a page refresh may be needed."
eXo.i18n.I18NMessage.BlockUpdateNotFound = "The blockId to update is not found : {0}";
eXo.i18n.I18NMessage.DefaultTheme = "Default Theme";
\ No newline at end of file
Modified: epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/javascript/eXo/i18n/MessageResource_ko.js
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/javascript/eXo/i18n/MessageResource_ko.js 2011-10-26 15:20:53 UTC (rev 7894)
+++ epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/javascript/eXo/i18n/MessageResource_ko.js 2011-10-26 15:48:44 UTC (rev 7895)
@@ -18,6 +18,6 @@
*/
eXo.i18n.I18NMessage.SessionTimeout = "Session timeout ! Refresh your browser.";
-eXo.i18n.I18NMessage.TargetBlockNotFound = "The target blockId to update is not found : {0}";
+eXo.i18n.I18NMessage.TargetBlockNotFound = "Cannot complete request as the component to update cannot be found (blockId: {0}). If the page's contents have changed, a page refresh may be needed."
eXo.i18n.I18NMessage.BlockUpdateNotFound = "The blockId to update is not found : {0}";
eXo.i18n.I18NMessage.DefaultTheme = "기본 테마";
\ No newline at end of file
Modified: epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/javascript/eXo/i18n/MessageResource_ne.js
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/javascript/eXo/i18n/MessageResource_ne.js 2011-10-26 15:20:53 UTC (rev 7894)
+++ epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/javascript/eXo/i18n/MessageResource_ne.js 2011-10-26 15:48:44 UTC (rev 7895)
@@ -18,6 +18,6 @@
*/
eXo.i18n.I18NMessage.SessionTimeout = "Session timeout ! Refresh your browser.";
-eXo.i18n.I18NMessage.TargetBlockNotFound = "The target blockId to update is not found : {0}";
+eXo.i18n.I18NMessage.TargetBlockNotFound = "Cannot complete request as the component to update cannot be found (blockId: {0}). If the page's contents have changed, a page refresh may be needed."
eXo.i18n.I18NMessage.BlockUpdateNotFound = "The blockId to update is not found : {0}";
eXo.i18n.I18NMessage.DefaultTheme = "\u0921\u093f\u092b\u094c\u0932\u094d\u091f \u0925\u0940\u092e";
\ No newline at end of file
Modified: epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/javascript/eXo/i18n/MessageResource_nl.js
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/javascript/eXo/i18n/MessageResource_nl.js 2011-10-26 15:20:53 UTC (rev 7894)
+++ epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/javascript/eXo/i18n/MessageResource_nl.js 2011-10-26 15:48:44 UTC (rev 7895)
@@ -18,6 +18,6 @@
*/
eXo.i18n.I18NMessage.SessionTimeout = "Session timeout ! Refresh your browser.";
-eXo.i18n.I18NMessage.TargetBlockNotFound = "The target blockId to update is not found : {0}";
+eXo.i18n.I18NMessage.TargetBlockNotFound = "Cannot complete request as the component to update cannot be found (blockId: {0}). If the page's contents have changed, a page refresh may be needed."
eXo.i18n.I18NMessage.BlockUpdateNotFound = "The blockId to update is not found : {0}";
eXo.i18n.I18NMessage.DefaultTheme = "Default Theme";
\ No newline at end of file
Modified: epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/javascript/eXo/i18n/MessageResource_uk.js
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/javascript/eXo/i18n/MessageResource_uk.js 2011-10-26 15:20:53 UTC (rev 7894)
+++ epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/javascript/eXo/i18n/MessageResource_uk.js 2011-10-26 15:48:44 UTC (rev 7895)
@@ -18,6 +18,6 @@
*/
eXo.i18n.I18NMessage.SessionTimeout = "Session timeout ! Refresh your browser.";
-eXo.i18n.I18NMessage.TargetBlockNotFound = "The target blockId to update is not found : {0}";
+eXo.i18n.I18NMessage.TargetBlockNotFound = "Cannot complete request as the component to update cannot be found (blockId: {0}). If the page's contents have changed, a page refresh may be needed."
eXo.i18n.I18NMessage.BlockUpdateNotFound = "The blockId to update is not found : {0}";
eXo.i18n.I18NMessage.DefaultTheme = "Default Theme";
\ No newline at end of file
Modified: epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/javascript/eXo/i18n/MessageResource_zh.js
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/javascript/eXo/i18n/MessageResource_zh.js 2011-10-26 15:20:53 UTC (rev 7894)
+++ epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/javascript/eXo/i18n/MessageResource_zh.js 2011-10-26 15:48:44 UTC (rev 7895)
@@ -18,6 +18,6 @@
*/
eXo.i18n.I18NMessage.SessionTimeout = "Session timeout ! Refresh your browser.";
-eXo.i18n.I18NMessage.TargetBlockNotFound = "The target blockId to update is not found : {0}";
+eXo.i18n.I18NMessage.TargetBlockNotFound = "Cannot complete request as the component to update cannot be found (blockId: {0}). If the page's contents have changed, a page refresh may be needed."
eXo.i18n.I18NMessage.BlockUpdateNotFound = "The blockId to update is not found : {0}";
eXo.i18n.I18NMessage.DefaultTheme = "Default theme";
\ No newline at end of file
Modified: epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/javascript/eXo/i18n/MessageResource_zh_TW.js
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/javascript/eXo/i18n/MessageResource_zh_TW.js 2011-10-26 15:20:53 UTC (rev 7894)
+++ epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/javascript/eXo/i18n/MessageResource_zh_TW.js 2011-10-26 15:48:44 UTC (rev 7895)
@@ -18,6 +18,6 @@
*/
eXo.i18n.I18NMessage.SessionTimeout = "Session timeout ! Refresh your browser.";
-eXo.i18n.I18NMessage.TargetBlockNotFound = "The target blockId to update is not found : {0}";
+eXo.i18n.I18NMessage.TargetBlockNotFound = "Cannot complete request as the component to update cannot be found (blockId: {0}). If the page's contents have changed, a page refresh may be needed."
eXo.i18n.I18NMessage.BlockUpdateNotFound = "The blockId to update is not found : {0}";
eXo.i18n.I18NMessage.DefaultTheme = "Default Theme";
\ No newline at end of file
Modified: epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/javascript/eXo/portal/PortalHttpRequest.js
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/javascript/eXo/portal/PortalHttpRequest.js 2011-10-26 15:20:53 UTC (rev 7894)
+++ epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/javascript/eXo/portal/PortalHttpRequest.js 2011-10-26 15:48:44 UTC (rev 7895)
@@ -524,7 +524,9 @@
} else {
target = document.getElementById(blockToUpdate.blockId) ;
}
- if(target == null) alert(eXo.i18n.I18NMessage.getMessage("TargetBlockNotFound", new Array (blockToUpdate.blockId))) ;
+ if(target == null) {
+ throw new Error(eXo.i18n.I18NMessage.getMessage("TargetBlockNotFound", new Array (blockToUpdate.blockId)));
+ }
var newData = eXo.core.DOMUtil.findDescendantById(blockToUpdate.data, blockToUpdate.blockId) ;
//var newData = blockToUpdate.data.getElementById(blockToUpdate.blockId) ;
if(newData == null) alert(eXo.i18n.I18NMessage.getMessage("BlockUpdateNotFound", new Array (blockToUpdate.blockId))) ;
@@ -610,8 +612,14 @@
if(confirm(eXo.i18n.I18NMessage.getMessage("SessionTimeout"))) instance.ajaxTimeout(request) ;
}
//Handle the portal responses
- instance.updateBlocks(response.blocksToUpdate) ;
- instance.executeScript(response.script) ;
+ try {
+ instance.updateBlocks(response.blocksToUpdate);
+ instance.updateHtmlHead(response);
+ instance.executeScript(response.script) ;
+ }
+ catch (error) {
+ alert(error.message) ;
+ }
/**
* Clears the instance.to timeout if the request takes less time than expected to get response
* Removes the transparent mask so the UI is available again, with cursor "auto"
12 years, 8 months
- 1
- 0
gatein SVN: r7894 - epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/skin/applicationregistry/webui/component/UIApplicationRegistryPortlet.
by do-not-reply＠jboss.org
Author: mwringe
Date: 2011-10-26 11:20:53 -0400 (Wed, 26 Oct 2011)
New Revision: 7894
Modified:
epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/skin/applicationregistry/webui/component/UIApplicationRegistryPortlet/DefaultStylesheet.css
Log:
JBEPP-1198: add missing component PortletCategory UIGrid. If not defined, Chrome will assume a width of 0 which will not render properly.
Modified: epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/skin/applicationregistry/webui/component/UIApplicationRegistryPortlet/DefaultStylesheet.css
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/skin/applicationregistry/webui/component/UIApplicationRegistryPortlet/DefaultStylesheet.css 2011-10-26 15:01:09 UTC (rev 7893)
+++ epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/skin/applicationregistry/webui/component/UIApplicationRegistryPortlet/DefaultStylesheet.css 2011-10-26 15:20:53 UTC (rev 7894)
@@ -462,6 +462,11 @@
padding: 4px 0px;
}
+.UIPortletManagement .PortletCategory .UIFormGrid {
+ width: 100%;
+}
+
+
/******************************** UIGadgetManagement ******************************/
.UIApplicationRegistryPortlet .UIGadgetManagement .PortletIcons {
width: 150px;
12 years, 8 months
- 1
- 0
gatein SVN: r7893 - in epp/portal/branches/EPP_5_2_Branch: webui/core/src/main/java/org/exoplatform/webui/form and 1 other directory.
by do-not-reply＠jboss.org
Author: mwringe
Date: 2011-10-26 11:01:09 -0400 (Wed, 26 Oct 2011)
New Revision: 7893
Modified:
epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UIPageNodeForm.java
epp/portal/branches/EPP_5_2_Branch/webui/core/src/main/java/org/exoplatform/webui/form/UIFormCheckBoxInput.java
Log:
JBEPP-1220: fix a couple of issues with the extendedmode checkbox not acting as expected.
Modified: epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UIPageNodeForm.java
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UIPageNodeForm.java 2011-10-26 10:53:21 UTC (rev 7892)
+++ epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UIPageNodeForm.java 2011-10-26 15:01:09 UTC (rev 7893)
@@ -174,7 +174,7 @@
getUIStringInput("name").setEditable(UIFormStringInput.ENABLE);
getChild(UIFormInputIconSelector.class).setSelectedIcon("Default");
setShowPublicationDate(false);
- switchLabelMode(false);
+ switchLabelMode(true);
return;
}
getUIStringInput("name").setEditable(UIFormStringInput.DISABLE);
@@ -392,9 +392,11 @@
}
node.setI18nizedLabels(labels);
-
+
if (getUIFormCheckBoxInput(SWITCH_MODE).getValue().toString().equals("true"))
node.setLabel(null);
+ else if (node.getLabel() == null)
+ node.setLabel(node.getName());
}
public void setShowCheckPublicationDate(boolean show)
Modified: epp/portal/branches/EPP_5_2_Branch/webui/core/src/main/java/org/exoplatform/webui/form/UIFormCheckBoxInput.java
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/webui/core/src/main/java/org/exoplatform/webui/form/UIFormCheckBoxInput.java 2011-10-26 10:53:21 UTC (rev 7892)
+++ epp/portal/branches/EPP_5_2_Branch/webui/core/src/main/java/org/exoplatform/webui/form/UIFormCheckBoxInput.java 2011-10-26 15:01:09 UTC (rev 7893)
@@ -56,7 +56,7 @@
super(name, bindingExpression, null);
if (value != null)
typeValue_ = (Class<T>)value.getClass();
- value_ = value;
+ setValue(value);
setId(name);
}
12 years, 8 months
- 1
- 0
gatein SVN: r7892 - in portal/trunk/web/portal/src/main/webapp/groovy/portal/webui: container and 1 other directories.
by do-not-reply＠jboss.org
Author: phuong_vu
Date: 2011-10-26 06:53:21 -0400 (Wed, 26 Oct 2011)
New Revision: 7892
Modified:
portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/application/UIPortlet.gtmpl
portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/container/UIColumnContainer.gtmpl
portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/container/UIContainer.gtmpl
portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/container/UITableAutofitColumnContainer.gtmpl
portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/container/UITableColumnContainer.gtmpl
portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/container/UIToolbarContainer.gtmpl
portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/portal/UIPortalComposer.gtmpl
Log:
GTNPORTAL-2235 Fix some small typos in templates that cause wrong status of composer's Finish button
Modified: portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/application/UIPortlet.gtmpl
===================================================================
--- portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/application/UIPortlet.gtmpl 2011-10-26 10:17:49 UTC (rev 7891)
+++ portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/application/UIPortlet.gtmpl 2011-10-26 10:53:21 UTC (rev 7892)
@@ -233,7 +233,7 @@
%>
<div class="PortletIcon $portletIcon"><%=hasPermission ? title : _ctx.appRes("UIPortlet.label.protectedContent")%></div>
<%if(hasPermission) {%>
- <a href="<%=uicomponent.event("EditPortlet","$uicomponent.id")%>;eXo.portal.UIPortal.changeComposerSaveButton()" class="EditIcon" title="<%=_ctx.appRes("UIPortlet.tooltip.editPortlet");%>"></a>
+ <a href="<%=uicomponent.event("EditPortlet","$uicomponent.id")%>" class="EditIcon" title="<%=_ctx.appRes("UIPortlet.tooltip.editPortlet");%>"></a>
<a href="<%=uicomponent.event("DeleteComponent","$uicomponent.id")%>" class="DeleteIcon" title="<%=_ctx.appRes("UIPortlet.tooltip.deletePortlet");%>"></a>
<%}%>
</div>
Modified: portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/container/UIColumnContainer.gtmpl
===================================================================
--- portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/container/UIColumnContainer.gtmpl 2011-10-26 10:17:49 UTC (rev 7891)
+++ portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/container/UIColumnContainer.gtmpl 2011-10-26 10:53:21 UTC (rev 7892)
@@ -85,7 +85,7 @@
</div>
<% /*End Popup Menu*/ %>
</div>
- <a href="<%=uicomponent.event("EditContainer")%>;eXo.portal.UIPortal.changeComposerSaveButton()" class="EditIcon" title="<%=_ctx.appRes("UIColumnContainer.tooltip.editContainer")%>"><span></span></a>
+ <a href="<%=uicomponent.event("EditContainer")%>" class="EditIcon" title="<%=_ctx.appRes("UIColumnContainer.tooltip.editContainer")%>"><span></span></a>
<a href="<%=uicomponent.event("DeleteComponent")%>" class="DeleteIcon" title="<%=_ctx.appRes("UIColumnContainer.tooltip.closeContainer")%>"><span></span></a>
<%}%>
Modified: portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/container/UIContainer.gtmpl
===================================================================
--- portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/container/UIContainer.gtmpl 2011-10-26 10:17:49 UTC (rev 7891)
+++ portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/container/UIContainer.gtmpl 2011-10-26 10:53:21 UTC (rev 7892)
@@ -63,7 +63,7 @@
%>
<div class="ContainerIcon"><%=hasPermission ? strTitle : _ctx.appRes("UIPortlet.label.protectedContent")%></div>
<%if(hasPermission) {%>
- <a href="<%=uicomponent.event("EditContainer")%>;eXo.portal.UIPortal.changeComposerSaveButton()" class="EditIcon" title="<%=_ctx.appRes("UIContainer.tooltip.editContainer")%>"></a>
+ <a href="<%=uicomponent.event("EditContainer")%>" class="EditIcon" title="<%=_ctx.appRes("UIContainer.tooltip.editContainer")%>"></a>
<a href="<%=uicomponent.event("DeleteComponent")%>" class="DeleteIcon" title="<%=_ctx.appRes("UIContainer.tooltip.closeContainer")%>"><span></span></a>
<%}%>
</div>
Modified: portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/container/UITableAutofitColumnContainer.gtmpl
===================================================================
--- portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/container/UITableAutofitColumnContainer.gtmpl 2011-10-26 10:17:49 UTC (rev 7891)
+++ portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/container/UITableAutofitColumnContainer.gtmpl 2011-10-26 10:53:21 UTC (rev 7892)
@@ -63,7 +63,7 @@
%>
<div class="ContainerIcon DefaultContainer16x16Icon"><%=hasPermission ? strTitle : _ctx.appRes("UIPortlet.label.protectedContent")%></div>
<%if(hasPermission) {%>
- <a href="<%=uicomponent.event("EditContainer","$uicomponent.id")%>;eXo.portal.UIPortal.changeComposerSaveButton()" class="EditIcon" title="<%=_ctx.appRes("UITableColumnContainer.tooltip.editContainer")%>"><span></span></a>
+ <a href="<%=uicomponent.event("EditContainer","$uicomponent.id")%>" class="EditIcon" title="<%=_ctx.appRes("UITableColumnContainer.tooltip.editContainer")%>"><span></span></a>
<a href="<%=uicomponent.event("DeleteComponent","$uicomponent.id")%>" class="DeleteIcon" title="<%=_ctx.appRes("UITableColumnContainer.tooltip.closeContainer")%>"><span></span></a>
<%}%>
</div>
Modified: portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/container/UITableColumnContainer.gtmpl
===================================================================
--- portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/container/UITableColumnContainer.gtmpl 2011-10-26 10:17:49 UTC (rev 7891)
+++ portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/container/UITableColumnContainer.gtmpl 2011-10-26 10:53:21 UTC (rev 7892)
@@ -63,7 +63,7 @@
%>
<div class="ContainerIcon DefaultContainer16x16Icon"><%=hasPermission ? strTitle : _ctx.appRes("UIPortlet.label.protectedContent")%></div>
<%if(hasPermission) {%>
- <a href="<%=uicomponent.event("EditContainer","$uicomponent.id")%>;eXo.portal.UIPortal.changeComposerSaveButton()" class="EditIcon" title="<%=_ctx.appRes("UITableColumnContainer.tooltip.editContainer")%>"></a>
+ <a href="<%=uicomponent.event("EditContainer","$uicomponent.id")%>" class="EditIcon" title="<%=_ctx.appRes("UITableColumnContainer.tooltip.editContainer")%>"></a>
<a href="<%=uicomponent.event("DeleteComponent","$uicomponent.id")%>" class="DeleteIcon" title="<%=_ctx.appRes("UITableColumnContainer.tooltip.closeContainer")%>"></a>
<%}%>
</div>
Modified: portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/container/UIToolbarContainer.gtmpl
===================================================================
--- portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/container/UIToolbarContainer.gtmpl 2011-10-26 10:17:49 UTC (rev 7891)
+++ portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/container/UIToolbarContainer.gtmpl 2011-10-26 10:53:21 UTC (rev 7892)
@@ -63,7 +63,7 @@
%>
<div class="ContainerIcon DefaultContainer16x16Icon"><%=hasPermission ? strTitle : _ctx.appRes("UIPortlet.label.protectedContent")%></div>
<%if(hasPermission) {%>
- <a href="<%=uicomponent.event("EditContainer","$uicomponent.id")%>;eXo.portal.UIPortal.changeComposerSaveButton()" class="EditIcon" title="<%=_ctx.appRes("UIContainer.tooltip.editContainer")%>"><span></span></a>
+ <a href="<%=uicomponent.event("EditContainer","$uicomponent.id")%>" class="EditIcon" title="<%=_ctx.appRes("UIContainer.tooltip.editContainer")%>"><span></span></a>
<a href="<%=uicomponent.event("DeleteComponent","$uicomponent.id")%>" class="DeleteIcon" title="<%=_ctx.appRes("UIContainer.tooltip.closeContainer")%>"><span></span></a>
<%}%>
</div>
Modified: portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/portal/UIPortalComposer.gtmpl
===================================================================
--- portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/portal/UIPortalComposer.gtmpl 2011-10-26 10:17:49 UTC (rev 7891)
+++ portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/portal/UIPortalComposer.gtmpl 2011-10-26 10:53:21 UTC (rev 7892)
@@ -28,7 +28,7 @@
</div>
<div class="UIAction" style="display: <%=uicomponent.isCollapsed ? "none": "block"%>">
- <span onclick="<%= uicomponent.event("ViewProperties") %>;eXo.portal.UIPortal.changeComposerSaveButton()" class="ActionButton SimpleStyle1">
+ <span onclick="<%= uicomponent.event("ViewProperties") %>" class="ActionButton SimpleStyle1">
<a href="javascript:void(0);" class="PageProfileIcon"><%=_ctx.appRes(popupId + ".action.ViewProperties")%></a>
</span>
<% String changeEditMode = uicomponent.event("SwitchMode", null, null); %>
12 years, 8 months
- 1
- 0
gatein SVN: r7891 - in portal/trunk/web/portal/src/main/webapp/WEB-INF/conf: portal and 1 other directory.
by do-not-reply＠jboss.org
Author: hoang_to
Date: 2011-10-26 06:17:49 -0400 (Wed, 26 Oct 2011)
New Revision: 7891
Modified:
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/common/common-configuration.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal-configuration.xml
Log:
GTNPORTAL-2197: Allow to tune caches easily
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/common/common-configuration.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/common/common-configuration.xml 2011-10-26 09:21:58 UTC (rev 7890)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/common/common-configuration.xml 2011-10-26 10:17:49 UTC (rev 7891)
@@ -117,8 +117,8 @@
<description>The default cache configuration</description>
<object type="org.exoplatform.services.cache.ExoCacheConfig">
<field name="name"><string>default</string></field>
- <field name="maxSize"><int>${cache.config.default.maxSize:300}</int></field>
- <field name="liveTime"><long>${cache.config.default.liveTime:600}</long></field>
+ <field name="maxSize"><int>${gatein.cache.default.maxsize:300}</int></field>
+ <field name="liveTime"><long>${gatein.cache.default.livetime:600}</long></field>
<field name="distributed"><boolean>false</boolean></field>
<field name="implementation"><string>org.exoplatform.services.cache.concurrent.ConcurrentFIFOExoCache</string></field>
</object>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal-configuration.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal-configuration.xml 2011-10-26 09:21:58 UTC (rev 7890)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal-configuration.xml 2011-10-26 10:17:49 UTC (rev 7891)
@@ -334,10 +334,10 @@
<string>MOPSessionManager</string>
</field>
<field name="maxSize">
- <int>${cache.config.MOPSessionManager.maxSize:5000}</int>
+ <int>${gatein.cache.mop.maxsize:5000}</int>
</field>
<field name="liveTime">
- <long>${cache.config.MOPSessionManager.liveTime:600}</long>
+ <long>${gatein.cache.mop.livetime:600}</long>
</field>
<field name="implementation">
<string>org.exoplatform.services.cache.concurrent.ConcurrentFIFOExoCache</string>
@@ -360,10 +360,10 @@
<string>MOPSessionManager</string>
</field>
<field name="expirationTimeout">
- <long>${cache.config.MOPSessionManager.expirationTimeout:600000}</long>
+ <long>${gatein.cache.mop.expiration:600000}</long>
</field>
<field name="maxNodes">
- <int>${cache.config.MOPSessionManager.maxNodes:5000}</int>
+ <int>${gatein.cache.mop.maxnodes:5000}</int>
</field>
<field name="distributed">
<boolean>true</boolean>
@@ -388,10 +388,10 @@
<string>NavigationService</string>
</field>
<field name="maxSize">
- <int>${cache.config.NavigationService.maxSize:5000}</int>
+ <int>${gatein.cache.navigation.maxsize:5000}</int>
</field>
<field name="liveTime">
- <long>${cache.config.NavigationService.liveTime:600}</long>
+ <long>${gatein.cache.navigation.livetime:600}</long>
</field>
<field name="implementation">
<string>org.exoplatform.services.cache.concurrent.ConcurrentFIFOExoCache</string>
@@ -414,10 +414,10 @@
<string>NavigationService</string>
</field>
<field name="expirationTimeout">
- <long>${cache.config.NavigationService.expirationTimeout:600000}</long>
+ <long>${gatein.cache.navigation.expiration:600000}</long>
</field>
<field name="maxNodes">
- <int>${cache.config.NavigationService.maxNodes:5000}</int>
+ <int>${gatein.cache.navigation.maxnodes:5000}</int>
</field>
<field name="distributed">
<boolean>true</boolean>
@@ -442,10 +442,10 @@
<string>DescriptionService</string>
</field>
<field name="maxSize">
- <int>${cache.config.DescriptionService.maxSize:5000}</int>
+ <int>${gatein.cache.description.maxsize:5000}</int>
</field>
<field name="liveTime">
- <long>${cache.config.DescriptionService.liveTime:600}</long>
+ <long>${gatein.cache.description.livetime:600}</long>
</field>
<field name="implementation">
<string>org.exoplatform.services.cache.concurrent.ConcurrentFIFOExoCache</string>
@@ -468,10 +468,10 @@
<string>DescriptionService</string>
</field>
<field name="expirationTimeout">
- <long>${cache.config.DescriptionService.expirationTimeout:600000}</long>
+ <long>${gatein.cache.description.expiration:600000}</long>
</field>
<field name="maxNodes">
- <int>${cache.config.DescriptionService.maxNodes:5000}</int>
+ <int>${gatein.cache.description.maxnodes:5000}</int>
</field>
<field name="distributed">
<boolean>true</boolean>
12 years, 8 months
- 1
- 0
gatein SVN: r7890 - in components/wsrp/trunk: producer/src/main/java/org/gatein/registration/impl and 1 other directory.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2011-10-26 05:21:58 -0400 (Wed, 26 Oct 2011)
New Revision: 7890
Modified:
components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/RegistrationInfo.java
components/wsrp/trunk/producer/src/main/java/org/gatein/registration/impl/RegistrationManagerImpl.java
Log:
- GTNWSRP-251, GTNWSRP-253: Reverted change of behavior since it would require adding the identity of the consumer to the consumer name to work properly and thus might not work well with existing data.
Modified: components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/RegistrationInfo.java
===================================================================
--- components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/RegistrationInfo.java 2011-10-26 09:20:19 UTC (rev 7889)
+++ components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/RegistrationInfo.java 2011-10-26 09:21:58 UTC (rev 7890)
@@ -428,7 +428,10 @@
{
Version version = parent.getEndpointConfigurationInfo().getWSRPVersion();
String versionInfo = version != null ? " WSRP v" + version.getMajor() + " version" : " unknown WSRP version";
- setConsumerName(parent.getId() + " " + WSRPConstants.DEFAULT_CONSUMER_NAME + versionInfo);
+ setConsumerName(WSRPConstants.DEFAULT_CONSUMER_NAME + versionInfo);
+
+ // todo: GTNWSRP-251, GTNWSRP-253: implemented but requires adding consumer identity to consumer name to work properly
+ // setConsumerName(parent.getId() + " " + WSRPConstants.DEFAULT_CONSUMER_NAME + versionInfo);
}
// get a service description if we don't already have one
Modified: components/wsrp/trunk/producer/src/main/java/org/gatein/registration/impl/RegistrationManagerImpl.java
===================================================================
--- components/wsrp/trunk/producer/src/main/java/org/gatein/registration/impl/RegistrationManagerImpl.java 2011-10-26 09:20:19 UTC (rev 7889)
+++ components/wsrp/trunk/producer/src/main/java/org/gatein/registration/impl/RegistrationManagerImpl.java 2011-10-26 09:21:58 UTC (rev 7890)
@@ -26,7 +26,6 @@
import org.gatein.common.util.ParameterValidation;
import org.gatein.registration.Consumer;
import org.gatein.registration.ConsumerGroup;
-import org.gatein.registration.DuplicateRegistrationException;
import org.gatein.registration.InvalidConsumerDataException;
import org.gatein.registration.NoSuchRegistrationException;
import org.gatein.registration.Registration;
@@ -117,7 +116,10 @@
String identity = policy.getConsumerIdFrom(consumerName, registrationProperties);
// validate the registration information
- try
+ policy.validateRegistrationDataFor(registrationProperties, identity, expectations, this);
+
+ // todo: GTNWSRP-251, GTNWSRP-253: implemented but requires changing the consumer names to work properly
+ /*try
{
policy.validateRegistrationDataFor(registrationProperties, identity, expectations, this);
}
@@ -136,7 +138,7 @@
// if we didn't get a registration to return, just throw the exception
throw e;
}
- }
+ }*/
Consumer consumer = getOrCreateConsumer(identity, createConsumerIfNeeded, consumerName);
12 years, 8 months
- 1
- 0
gatein SVN: r7889 - portal/trunk/docs/reference-guide/en-US/modules/GadgetDevelopment.
by do-not-reply＠jboss.org
Author: kien_nguyen
Date: 2011-10-26 05:20:19 -0400 (Wed, 26 Oct 2011)
New Revision: 7889
Modified:
portal/trunk/docs/reference-guide/en-US/modules/GadgetDevelopment/SetupGadgetServer.xml
Log:
GTNPORTAL-2216 Update document for security token keys configuration of GateIn gadget container
Modified: portal/trunk/docs/reference-guide/en-US/modules/GadgetDevelopment/SetupGadgetServer.xml
===================================================================
--- portal/trunk/docs/reference-guide/en-US/modules/GadgetDevelopment/SetupGadgetServer.xml 2011-10-26 09:10:08 UTC (rev 7888)
+++ portal/trunk/docs/reference-guide/en-US/modules/GadgetDevelopment/SetupGadgetServer.xml 2011-10-26 09:20:19 UTC (rev 7889)
@@ -33,23 +33,67 @@
It is also possible to have multiple rendering servers. This helps to balance the rendering load across multiple servers.
</para>
<para>
- When deploying on the same server ensure the gadget initiates before anything that calls it (for example; the webapp <literal>GateInGadgets</literal> which uses <literal>org.exoplatform.application.gadget.GadgetRegister</literal>).
+ When deploying on the same server, ensure the gadget initiates before anything that calls it (for example; the webapp <literal>GateInGadgets</literal> which uses <literal>org.exoplatform.application.gadget.GadgetRegister</literal>).
</para>
</section>
<section id="sect-Reference_Guide-Setup_a_Gadget_Server-Configuration">
<title>Configuration</title>
<section id="sect-Reference_Guide-Configuration-Security_key">
- <title>Security key</title>
- <para>
- A file called <emphasis role="bold">key.txt</emphasis> has to be generated for every installation of &PRODUCT; to be secure. This file contains a secret key used to encrypt the security token used for authenticating the user.
- </para>
- <para>
- In Linux systems this file can be generated with:
- </para>
-
-<programlisting><command>dd if=/dev/random bs=32 count=1 | openssl base64 > /tmp/key.txt</command>
-</programlisting>
+ <title>Security key</title>
+ <para>In GateIn, the gadget container is using three security files for authentication and authorization
+ gadgets:
+ </para>
+ <itemizedlist>
+ <listitem>
+ <para>
+ <emphasis>key.txt</emphasis>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <emphasis>oauthkey.pem</emphasis>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <emphasis>oauthkey_pub.pem</emphasis>
+ </para>
+ </listitem>
+ </itemizedlist>
+ <para>By default, they are located in the
+ <emphasis>$JBOSS_HOME/server/default/conf/gatein/gadgets</emphasis> or For Tomcat: <emphasis>$TOMCAT_HOME/gatein/conf/gadgets</emphasis>
+ folder and are configured by system variables in the
+ <emphasis>$JBOSS_HOME/server/default/conf/gatein/configuration.properties</emphasis> or For Tomcat: <emphasis>$TOMCAT_HOME/gatein/conf/configuration.properties</emphasis>
+ file:
+ </para>
+ <programlisting>
+ <command>gatein.gadgets.securitytokenkeyfile=${gatein.conf.dir}/gadgets/key.txt</command>
+ <command>gatein.gadgets.signingkeyfile=${gatein.conf.dir}/gadgets/oauthkey.pem</command>
+ </programlisting>
+ <para>In case you have other files, you can change these variables to point to them.</para>
+ <para>The
+ <emphasis>key.txt</emphasis>
+ file contains a secret key used to encrypt the security token used for the user authentication. When starting
+ GateIn, this file is read via the
+ <emphasis>gatein.gadgets.securitytokenkeyfile</emphasis>
+ path. In case the <emphasis>key.txt</emphasis> file is not found, GateIn automatically generates a new
+ <emphasis>key.txt</emphasis>
+ one and save it to the
+ <emphasis>gatein.gadgets.securitytokenkeyfile</emphasis>
+ path.
+ </para>
+ <para>
+ <emphasis>oauthkey.pem</emphasis>
+ and
+ <emphasis>oauthkey_pub.pem</emphasis>
+ are a key pair of RSA cryptography standard.
+ <emphasis>oauthkey.pem</emphasis>
+ is known as a private key and
+ <emphasis>oauthkey_pub.pem</emphasis>
+ is a public key. They are the default keys of the gadget container which OAuth gadgets will use to authorize
+ with external service providers.
+ </para>
</section>
<section id="sect-Reference_Guide-Configuration-Gadget_proxy_and_concat_configuration">
12 years, 8 months
- 1
- 0
gatein SVN: r7888 - components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2011-10-26 05:10:08 -0400 (Wed, 26 Oct 2011)
New Revision: 7888
Modified:
components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/RegistrationInfo.java
Log:
- GTNWSRP-253, GTNWSRP-251: Add consumer id to consumer name to avoid collisions.
Modified: components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/RegistrationInfo.java
===================================================================
--- components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/RegistrationInfo.java 2011-10-26 09:01:00 UTC (rev 7887)
+++ components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/RegistrationInfo.java 2011-10-26 09:10:08 UTC (rev 7888)
@@ -1,6 +1,6 @@
/*
* JBoss, a division of Red Hat
- * Copyright 2010, Red Hat Middleware, LLC, and individual
+ * Copyright 2011, Red Hat Middleware, LLC, and individual
* contributors as indicated by the @authors tag. See the
* copyright.txt in the distribution for a full listing of
* individual contributors.
@@ -428,7 +428,7 @@
{
Version version = parent.getEndpointConfigurationInfo().getWSRPVersion();
String versionInfo = version != null ? " WSRP v" + version.getMajor() + " version" : " unknown WSRP version";
- setConsumerName(WSRPConstants.DEFAULT_CONSUMER_NAME + versionInfo);
+ setConsumerName(parent.getId() + " " + WSRPConstants.DEFAULT_CONSUMER_NAME + versionInfo);
}
// get a service description if we don't already have one
12 years, 8 months
- 1
- 0
gatein SVN: r7887 - in portal/trunk: component/common/src/main/java/conf/jcr and 18 other directories.
by do-not-reply＠jboss.org
Author: mposolda
Date: 2011-10-26 05:01:00 -0400 (Wed, 26 Oct 2011)
New Revision: 7887
Added:
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/jgroups/
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/jgroups/gatein-tcp.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/jgroups/gatein-udp.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jbosscache/
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jbosscache/cluster/
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jbosscache/cluster/config.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jbosscache/local/
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jbosscache/local/config.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/jbosscache/
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/jbosscache/cluster/
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/jbosscache/cluster/config.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/jbosscache/cluster/indexer-config.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/jbosscache/cluster/lock-config.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/jbosscache/local/
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/jbosscache/local/config.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/jbosscache/local/lock-config.xml
Removed:
portal/trunk/component/common/src/main/java/conf/jbosscache/
portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/jboss-cache-cluster.xml
Modified:
portal/trunk/component/common/src/main/java/conf/configuration-jboss.properties
portal/trunk/component/common/src/main/java/conf/configuration-jetty.properties
portal/trunk/component/common/src/main/java/conf/configuration-tomcat.properties
portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/PicketLinkIDMServiceImpl.java
portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/jcr/repository-configuration.xml
portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/jcr/repository-configuration.xml
portal/trunk/packaging/jboss-as7/pkg/src/main/resources/jboss/standalone/configuration/gatein/configuration.properties
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/common/common-configuration.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/repository-configuration.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/idm-configuration.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/jboss-cache-api-cluster.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/jboss-cache-store-cluster.xml
portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/repository-configuration.xml
Log:
GTNPORTAL-2234 Improve configuration of JBoss cache and JGroups
Modified: portal/trunk/component/common/src/main/java/conf/configuration-jboss.properties
===================================================================
--- portal/trunk/component/common/src/main/java/conf/configuration-jboss.properties 2011-10-26 04:55:00 UTC (rev 7886)
+++ portal/trunk/component/common/src/main/java/conf/configuration-jboss.properties 2011-10-26 09:01:00 UTC (rev 7887)
@@ -35,12 +35,12 @@
gatein.jcr.data.dir=${gatein.data.dir}/jcr
gatein.jcr.storage.data.dir=${gatein.jcr.data.dir}/values
-gatein.jcr.cache.config=classpath:/conf/jcr/jbosscache/${gatein.jcr.config.type}/config.xml
-gatein.jcr.lock.cache.config=classpath:/conf/jcr/jbosscache/${gatein.jcr.config.type}/lock-config.xml
+gatein.jcr.cache.config=war:/conf/jcr/jbosscache/${gatein.jcr.config.type}/config.xml
+gatein.jcr.lock.cache.config=war:/conf/jcr/jbosscache/${gatein.jcr.config.type}/lock-config.xml
gatein.jcr.index.data.dir=${gatein.jcr.data.dir}/lucene
gatein.jcr.index.changefilterclass=org.exoplatform.services.jcr.impl.core.query.DefaultChangesFilter
-gatein.jcr.index.cache.config=classpath:/conf/jcr/jbosscache/cluster/indexer-config.xml
-gatein.jcr.jgroups.config=classpath:/conf/jcr/jbosscache/cluster/udp-mux.xml
+gatein.jcr.index.cache.config=war:/conf/jcr/jbosscache/cluster/indexer-config.xml
+gatein.jcr.jgroups.config=classpath:/jgroups/gatein-${gatein.default.jgroups.stack:udp}.xml
# IDM
gatein.idm.datasource.name=java:jdbcidm
Modified: portal/trunk/component/common/src/main/java/conf/configuration-jetty.properties
===================================================================
--- portal/trunk/component/common/src/main/java/conf/configuration-jetty.properties 2011-10-26 04:55:00 UTC (rev 7886)
+++ portal/trunk/component/common/src/main/java/conf/configuration-jetty.properties 2011-10-26 09:01:00 UTC (rev 7887)
@@ -35,12 +35,12 @@
gatein.jcr.data.dir=${gatein.data.dir}/jcr
gatein.jcr.storage.data.dir=${gatein.jcr.data.dir}/values
-gatein.jcr.cache.config=classpath:/conf/jcr/jbosscache/${gatein.jcr.config.type}/config.xml
-gatein.jcr.lock.cache.config=classpath:/conf/jcr/jbosscache/${gatein.jcr.config.type}/lock-config.xml
+gatein.jcr.cache.config=war:/conf/jcr/jbosscache/${gatein.jcr.config.type}/config.xml
+gatein.jcr.lock.cache.config=war:/conf/jcr/jbosscache/${gatein.jcr.config.type}/lock-config.xml
gatein.jcr.index.data.dir=${gatein.jcr.data.dir}/lucene
gatein.jcr.index.changefilterclass=org.exoplatform.services.jcr.impl.core.query.DefaultChangesFilter
-gatein.jcr.index.cache.config=classpath:/conf/jcr/jbosscache/cluster/indexer-config.xml
-gatein.jcr.jgroups.config=classpath:/conf/jcr/jbosscache/cluster/udp-mux.xml
+gatein.jcr.index.cache.config=war:/conf/jcr/jbosscache/cluster/indexer-config.xml
+gatein.jcr.jgroups.config=classpath:/jgroups/gatein-${gatein.default.jgroups.stack:udp}.xml
# IDM
gatein.idm.datasource.name=jdbcidm
Modified: portal/trunk/component/common/src/main/java/conf/configuration-tomcat.properties
===================================================================
--- portal/trunk/component/common/src/main/java/conf/configuration-tomcat.properties 2011-10-26 04:55:00 UTC (rev 7886)
+++ portal/trunk/component/common/src/main/java/conf/configuration-tomcat.properties 2011-10-26 09:01:00 UTC (rev 7887)
@@ -35,12 +35,12 @@
gatein.jcr.data.dir=${gatein.data.dir}/jcr
gatein.jcr.storage.data.dir=${gatein.jcr.data.dir}/values
-gatein.jcr.cache.config=classpath:/conf/jcr/jbosscache/${gatein.jcr.config.type}/config.xml
-gatein.jcr.lock.cache.config=classpath:/conf/jcr/jbosscache/${gatein.jcr.config.type}/lock-config.xml
+gatein.jcr.cache.config=war:/conf/jcr/jbosscache/${gatein.jcr.config.type}/config.xml
+gatein.jcr.lock.cache.config=war:/conf/jcr/jbosscache/${gatein.jcr.config.type}/lock-config.xml
gatein.jcr.index.data.dir=${gatein.jcr.data.dir}/lucene
gatein.jcr.index.changefilterclass=org.exoplatform.services.jcr.impl.core.query.DefaultChangesFilter
-gatein.jcr.index.cache.config=classpath:/conf/jcr/jbosscache/cluster/indexer-config.xml
-gatein.jcr.jgroups.config=classpath:/conf/jcr/jbosscache/cluster/udp-mux.xml
+gatein.jcr.index.cache.config=war:/conf/jcr/jbosscache/cluster/indexer-config.xml
+gatein.jcr.jgroups.config=classpath:/jgroups/gatein-${gatein.default.jgroups.stack:udp}.xml
# IDM
gatein.idm.datasource.name=jdbcidm
Modified: portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/PicketLinkIDMServiceImpl.java
===================================================================
--- portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/PicketLinkIDMServiceImpl.java 2011-10-26 04:55:00 UTC (rev 7886)
+++ portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/PicketLinkIDMServiceImpl.java 2011-10-26 09:01:00 UTC (rev 7887)
@@ -19,6 +19,7 @@
package org.exoplatform.services.organization.idm;
+import org.exoplatform.container.ExoContainerContext;
import org.exoplatform.container.configuration.ConfigurationManager;
import org.exoplatform.container.xml.InitParams;
import org.exoplatform.container.xml.ValueParam;
@@ -30,6 +31,7 @@
import org.jboss.cache.CacheFactory;
import org.jboss.cache.DefaultCacheFactory;
+import org.jboss.cache.config.Configuration;
import org.jgroups.JChannelFactory;
import org.picketlink.idm.api.IdentitySession;
import org.picketlink.idm.api.IdentitySessionFactory;
@@ -97,6 +99,7 @@
}
public PicketLinkIDMServiceImpl(
+ ExoContainerContext exoContainerContext,
InitParams initParams,
HibernateService hibernateService,
ConfigurationManager confManager,
@@ -164,8 +167,17 @@
throw new IllegalArgumentException("JBoss Cache configuration InputStream is null");
}
- Cache cache = factory.createCache(configStream);
+ Cache cache = factory.createCache(configStream, false);
+ Configuration cfg = cache.getConfiguration();
+ // we need unique cluster name for each portal container
+ String clusterName = cfg.getClusterName();
+ if (clusterName != null && (clusterName = clusterName.trim()).length() > 0)
+ {
+ cfg.setClusterName(clusterName + "-" + exoContainerContext.getName());
+ }
+
+
applyJGroupsConfig(cache, confManager, jgroupsStack, jgroupsConfig);
cache.create();
@@ -200,8 +212,16 @@
throw new IllegalArgumentException("JBoss Cache configuration InputStream is null");
}
- Cache cache = factory.createCache(configStream);
+ Cache cache = factory.createCache(configStream, false);
+ Configuration cfg = cache.getConfiguration();
+ // we need unique cluster name for each portal container
+ String clusterName = cfg.getClusterName();
+ if (clusterName != null && (clusterName = clusterName.trim()).length() > 0)
+ {
+ cfg.setClusterName(clusterName + "-" + exoContainerContext.getName());
+ }
+
applyJGroupsConfig(cache, confManager, jgroupsStack, jgroupsConfig);
cache.create();
Modified: portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/jcr/repository-configuration.xml
===================================================================
--- portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/jcr/repository-configuration.xml 2011-10-26 04:55:00 UTC (rev 7886)
+++ portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/jcr/repository-configuration.xml 2011-10-26 09:01:00 UTC (rev 7887)
@@ -57,8 +57,9 @@
<properties>
<property name="jbosscache-configuration" value="${gatein.jcr.cache.config}" />
<property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}" />
- <property name="jgroups-multiplexer-stack" value="true" />
- <property name="jbosscache-cluster-name" value="jcr-${container.name.suffix}-sample-ws" />
+ <property name="jgroups-multiplexer-stack" value="false" />
+ <property name="jbosscache-cluster-name" value="jcr${container.name.suffix}" />
+ <property name="jbosscache-shareable" value="true" />
</properties>
</cache>
<query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">
@@ -67,8 +68,9 @@
<property name="changesfilter-class" value="${gatein.jcr.index.changefilterclass}" />
<property name="jbosscache-configuration" value="${gatein.jcr.index.cache.config}" />
<property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}" />
- <property name="jgroups-multiplexer-stack" value="true" />
- <property name="jbosscache-cluster-name" value="jcrindexer-${container.name.suffix}-sample-ws" />
+ <property name="jgroups-multiplexer-stack" value="false" />
+ <property name="jbosscache-cluster-name" value="jcrindexer${container.name.suffix}" />
+ <property name="jbosscache-shareable" value="true" />
<property name="max-volatile-time" value="60" />
</properties>
</query-handler>
@@ -77,9 +79,10 @@
<property name="time-out" value="15m" />
<property name="jbosscache-configuration" value="${gatein.jcr.lock.cache.config}" />
<property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}" />
- <property name="jgroups-multiplexer-stack" value="true" />
- <property name="jbosscache-cluster-name" value="jcrlock-${container.name.suffix}-sample-ws" />
- <property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlock_sample_ws" />
+ <property name="jgroups-multiplexer-stack" value="false" />
+ <property name="jbosscache-cluster-name" value="jcrlock${container.name.suffix}" />
+ <property name="jbosscache-shareable" value="true" />
+ <property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlock" />
<property name="jbosscache-cl-cache.jdbc.table.create" value="true" />
<property name="jbosscache-cl-cache.jdbc.table.drop" value="false" />
<property name="jbosscache-cl-cache.jdbc.table.primarykey" value="pk" />
Modified: portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/jcr/repository-configuration.xml
===================================================================
--- portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/jcr/repository-configuration.xml 2011-10-26 04:55:00 UTC (rev 7886)
+++ portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/jcr/repository-configuration.xml 2011-10-26 09:01:00 UTC (rev 7887)
@@ -57,8 +57,9 @@
<properties>
<property name="jbosscache-configuration" value="${gatein.jcr.cache.config}" />
<property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}" />
- <property name="jgroups-multiplexer-stack" value="true" />
- <property name="jbosscache-cluster-name" value="jcr-${container.name.suffix}-sample-ws" />
+ <property name="jgroups-multiplexer-stack" value="false" />
+ <property name="jbosscache-cluster-name" value="jcr${container.name.suffix}" />
+ <property name="jbosscache-shareable" value="true" />
</properties>
</cache>
<query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">
@@ -67,8 +68,9 @@
<property name="changesfilter-class" value="${gatein.jcr.index.changefilterclass}" />
<property name="jbosscache-configuration" value="${gatein.jcr.index.cache.config}" />
<property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}" />
- <property name="jgroups-multiplexer-stack" value="true" />
- <property name="jbosscache-cluster-name" value="jcrindexer-${container.name.suffix}-sample-ws" />
+ <property name="jgroups-multiplexer-stack" value="false" />
+ <property name="jbosscache-cluster-name" value="jcrindexer${container.name.suffix}" />
+ <property name="jbosscache-shareable" value="true" />
<property name="max-volatile-time" value="60" />
</properties>
</query-handler>
@@ -77,9 +79,10 @@
<property name="time-out" value="15m" />
<property name="jbosscache-configuration" value="${gatein.jcr.lock.cache.config}" />
<property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}" />
- <property name="jgroups-multiplexer-stack" value="true" />
- <property name="jbosscache-cluster-name" value="jcrlock-${container.name.suffix}-sample-ws" />
- <property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlock_sample_ws" />
+ <property name="jgroups-multiplexer-stack" value="false" />
+ <property name="jbosscache-cluster-name" value="jcrlock${container.name.suffix}" />
+ <property name="jbosscache-shareable" value="true" />
+ <property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlock" />
<property name="jbosscache-cl-cache.jdbc.table.create" value="true" />
<property name="jbosscache-cl-cache.jdbc.table.drop" value="false" />
<property name="jbosscache-cl-cache.jdbc.table.primarykey" value="pk" />
Modified: portal/trunk/packaging/jboss-as7/pkg/src/main/resources/jboss/standalone/configuration/gatein/configuration.properties
===================================================================
--- portal/trunk/packaging/jboss-as7/pkg/src/main/resources/jboss/standalone/configuration/gatein/configuration.properties 2011-10-26 04:55:00 UTC (rev 7886)
+++ portal/trunk/packaging/jboss-as7/pkg/src/main/resources/jboss/standalone/configuration/gatein/configuration.properties 2011-10-26 09:01:00 UTC (rev 7887)
@@ -35,12 +35,12 @@
gatein.jcr.data.dir=${gatein.data.dir}/jcr
gatein.jcr.storage.data.dir=${gatein.jcr.data.dir}/values
-gatein.jcr.cache.config=classpath:/conf/jcr/jbosscache/${gatein.jcr.config.type}/config.xml
-gatein.jcr.lock.cache.config=classpath:/conf/jcr/jbosscache/${gatein.jcr.config.type}/lock-config.xml
+gatein.jcr.cache.config=war:/conf/jcr/jbosscache/${gatein.jcr.config.type}/config.xml
+gatein.jcr.lock.cache.config=war:/conf/jcr/jbosscache/${gatein.jcr.config.type}/lock-config.xml
gatein.jcr.index.data.dir=${gatein.jcr.data.dir}/lucene
gatein.jcr.index.changefilterclass=org.exoplatform.services.jcr.impl.core.query.DefaultChangesFilter
-gatein.jcr.index.cache.config=classpath:/conf/jcr/jbosscache/cluster/indexer-config.xml
-gatein.jcr.jgroups.config=classpath:/conf/jcr/jbosscache/cluster/udp-mux.xml
+gatein.jcr.index.cache.config=war:/conf/jcr/jbosscache/cluster/indexer-config.xml
+gatein.jcr.jgroups.config=classpath:/jgroups/gatein-${gatein.default.jgroups.stack:udp}.xml
# IDM
gatein.idm.datasource.name=java:jdbcidm
Added: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/jgroups/gatein-tcp.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/jgroups/gatein-tcp.xml (rev 0)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/jgroups/gatein-tcp.xml 2011-10-26 09:01:00 UTC (rev 7887)
@@ -0,0 +1,96 @@
+<!--
+ ~ JBoss, a division of Red Hat
+ ~ Copyright 2011, Red Hat Middleware, LLC, and individual
+ ~ contributors as indicated by the @authors tag. See the
+ ~ copyright.txt in the distribution for a full listing of
+ ~ individual contributors.
+ ~
+ ~ 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.
+ -->
+
+<config>
+ <TCP
+ singleton_name="gatein-tcp"
+ start_port="${gatein.jgroups.tcp.tcp_port:8600}"
+ tcp_nodelay="true"
+ loopback="true"
+ recv_buf_size="20000000"
+ send_buf_size="640000"
+ discard_incompatible_packets="true"
+ max_bundle_size="64000"
+ max_bundle_timeout="30"
+ use_incoming_packet_handler="true"
+ enable_bundling="false"
+ use_send_queues="false"
+ sock_conn_timeout="300"
+ skip_suspected_members="true"
+ timer.num_threads="12"
+ enable_diagnostics="${jboss.jgroups.enable_diagnostics:true}"
+ diagnostics_addr="${jboss.jgroups.diagnostics_addr:224.0.75.75}"
+ diagnostics_port="${jboss.jgroups.diagnostics_port:7500}"
+
+ thread_pool.enabled="true"
+ thread_pool.min_threads="20"
+ thread_pool.max_threads="200"
+ thread_pool.keep_alive_time="5000"
+ thread_pool.queue_enabled="true"
+ thread_pool.queue_max_size="1000"
+ thread_pool.rejection_policy="discard"
+
+ oob_thread_pool.enabled="true"
+ oob_thread_pool.min_threads="20"
+ oob_thread_pool.max_threads="200"
+ oob_thread_pool.keep_alive_time="1000"
+ oob_thread_pool.queue_enabled="false"
+ oob_thread_pool.rejection_policy="discard"/>
+ <!-- Alternative 1: multicast-based automatic discovery. -->
+ <MPING timeout="3000"
+ num_initial_members="3"
+ mcast_addr="${gatein.jgroups.tcp.mping_mcast_addr:235.15.15.15}"
+ mcast_port="${gatein.tcp.mping_mcast_port:46700}"
+ ip_ttl="${jgroups.udp.ip_ttl:2}"/>
+ <!-- Alternative 2: non multicast-based replacement for MPING. Requires a static configuration
+ of *all* possible cluster members.
+ <TCPPING timeout="3000"
+ initial_hosts="${gatein.jgroups.tcp.tcpping.initial_hosts:localhost[8600],localhost[8601]}"
+ port_range="1"
+ num_initial_members="3"/>
+ -->
+ <MERGE2 max_interval="100000" min_interval="20000"/>
+ <FD_SOCK start_port="${gatein.jgroups.tcp.fd_sock_port:58600}"/>
+ <FD timeout="6000" max_tries="5" shun="true"/>
+ <VERIFY_SUSPECT timeout="1500"/>
+ <BARRIER/>
+ <pbcast.NAKACK use_mcast_xmit="false" gc_lag="0"
+ retransmit_timeout="300,600,1200,2400,4800"
+ discard_delivered_msgs="true"/>
+ <UNICAST timeout="300,600,1200,2400,3600"/>
+ <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
+ max_bytes="400000"/>
+ <VIEW_SYNC avg_send_interval="10000"/>
+ <pbcast.GMS print_local_addr="true" join_timeout="3000"
+ shun="true"
+ view_bundling="true"
+ view_ack_collection_timeout="5000"
+ resume_task_timeout="7500"/>
+ <FC max_credits="2000000" min_threshold="0.10"
+ ignore_synchronous_response="true"/>
+ <FRAG2 frag_size="60000"/>
+ <!-- pbcast.STREAMING_STATE_TRANSFER/ -->
+ <pbcast.STATE_TRANSFER/>
+ <pbcast.FLUSH timeout="0" start_flush_timeout="10000"/>
+ </config>
+
Added: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/jgroups/gatein-udp.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/jgroups/gatein-udp.xml (rev 0)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/jgroups/gatein-udp.xml 2011-10-26 09:01:00 UTC (rev 7887)
@@ -0,0 +1,56 @@
+<!--
+ ~ JBoss, a division of Red Hat
+ ~ Copyright 2011, Red Hat Middleware, LLC, and individual
+ ~ contributors as indicated by the @authors tag. See the
+ ~ copyright.txt in the distribution for a full listing of
+ ~ individual contributors.
+ ~
+ ~ 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.
+ -->
+ <config>
+ <UDP
+ singleton_name="gatein-udp"
+ bind_port="${gatein.jgroups.udp.bind_port:56200}"
+ mcast_addr="${jboss.jgroups.udp_async.mcast_addr:228.10.10.10}" mcast_port="${jboss.jgroups.udp_async.mcast_port:45588}" tos="8" ucast_recv_buf_size="20000000"
+ ucast_send_buf_size="640000" mcast_recv_buf_size="25000000" mcast_send_buf_size="640000" loopback="false"
+ discard_incompatible_packets="true" max_bundle_size="64000" max_bundle_timeout="30"
+ use_incoming_packet_handler="true" ip_ttl="${jgroups.udp.ip_ttl:2}" enable_bundling="false" enable_diagnostics="${jboss.jgroups.enable_diagnostics:true}"
+ diagnostics_addr="${jboss.jgroups.diagnostics_addr:224.0.75.75}" diagnostics_port="${jboss.jgroups.diagnostics_port:7500}"
+ thread_naming_pattern="cl" use_concurrent_stack="true" thread_pool.enabled="true" thread_pool.min_threads="2"
+ thread_pool.max_threads="8" thread_pool.keep_alive_time="5000" thread_pool.queue_enabled="true"
+ thread_pool.queue_max_size="1000" thread_pool.rejection_policy="discard" oob_thread_pool.enabled="true"
+ oob_thread_pool.min_threads="1" oob_thread_pool.max_threads="8" oob_thread_pool.keep_alive_time="5000"
+ oob_thread_pool.queue_enabled="false" oob_thread_pool.queue_max_size="100" oob_thread_pool.rejection_policy="Run" />
+
+ <PING timeout="2000" num_initial_members="3" />
+ <MERGE2 max_interval="30000" min_interval="10000" />
+ <FD_SOCK />
+ <FD timeout="10000" max_tries="5" shun="true" />
+ <VERIFY_SUSPECT timeout="1500" />
+ <BARRIER />
+ <pbcast.NAKACK use_stats_for_retransmission="false" exponential_backoff="150" use_mcast_xmit="true"
+ gc_lag="0" retransmit_timeout="50,300,600,1200" discard_delivered_msgs="true" />
+ <UNICAST timeout="300,600,1200" />
+ <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000" max_bytes="1000000" />
+ <VIEW_SYNC avg_send_interval="60000" />
+ <pbcast.GMS print_local_addr="true" join_timeout="3000" shun="false" view_bundling="true" />
+ <FC max_credits="500000" min_threshold="0.20" />
+ <FRAG2 frag_size="60000" />
+ <!--pbcast.STREAMING_STATE_TRANSFER /-->
+ <pbcast.STATE_TRANSFER />
+ <pbcast.FLUSH />
+ </config>
+
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/common/common-configuration.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/common/common-configuration.xml 2011-10-26 04:55:00 UTC (rev 7886)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/common/common-configuration.xml 2011-10-26 09:01:00 UTC (rev 7887)
@@ -132,11 +132,11 @@
<init-params>
<value-param>
<name>cache.config.template</name>
- <value>classpath:/conf/jbosscache/local/config.xml</value>
+ <value>war:/conf/jbosscache/local/config.xml</value>
</value-param>
<value-param profiles="cluster">
<name>cache.config.template</name>
- <value>classpath:/conf/jbosscache/cluster/config.xml</value>
+ <value>war:/conf/jbosscache/cluster/config.xml</value>
</value-param>
</init-params>
</component>
Added: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jbosscache/cluster/config.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jbosscache/cluster/config.xml (rev 0)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jbosscache/cluster/config.xml 2011-10-26 09:01:00 UTC (rev 7887)
@@ -0,0 +1,27 @@
+<!--
+ ~ Copyright (C) 2009 eXo Platform SAS.
+ ~
+ ~ This is free software; you can redistribute it and/or modify it
+ ~ under the terms of the GNU Lesser General Public License as
+ ~ published by the Free Software Foundation; either version 2.1 of
+ ~ the License, or (at your option) any later version.
+ ~
+ ~ This software is distributed in the hope that it will be useful,
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ ~ Lesser General Public License for more details.
+ ~
+ ~ You should have received a copy of the GNU Lesser General Public
+ ~ License along with this software; if not, write to the Free
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ -->
+
+<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:jbosscache-core:config:3.1">
+
+ <!-- The cluster name should be changed by the kernel cache configuration -->
+ <clustering mode="replication" clusterName="${jboss.partition.name:DefaultPartition}-gatein">
+ <jgroupsConfig configFile="jgroups/gatein-${gatein.default.jgroups.stack:udp}.xml" />
+ </clustering>
+
+</jbosscache>
\ No newline at end of file
Added: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jbosscache/local/config.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jbosscache/local/config.xml (rev 0)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jbosscache/local/config.xml 2011-10-26 09:01:00 UTC (rev 7887)
@@ -0,0 +1,22 @@
+<!--
+ ~ Copyright (C) 2009 eXo Platform SAS.
+ ~
+ ~ This is free software; you can redistribute it and/or modify it
+ ~ under the terms of the GNU Lesser General Public License as
+ ~ published by the Free Software Foundation; either version 2.1 of
+ ~ the License, or (at your option) any later version.
+ ~
+ ~ This software is distributed in the hope that it will be useful,
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ ~ Lesser General Public License for more details.
+ ~
+ ~ You should have received a copy of the GNU Lesser General Public
+ ~ License along with this software; if not, write to the Free
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ -->
+
+<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:jbosscache-core:config:3.1">
+
+</jbosscache>
\ No newline at end of file
Added: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/jbosscache/cluster/config.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/jbosscache/cluster/config.xml (rev 0)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/jbosscache/cluster/config.xml 2011-10-26 09:01:00 UTC (rev 7887)
@@ -0,0 +1,40 @@
+<!--
+ ~ Copyright (C) 2009 eXo Platform SAS.
+ ~
+ ~ This is free software; you can redistribute it and/or modify it
+ ~ under the terms of the GNU Lesser General Public License as
+ ~ published by the Free Software Foundation; either version 2.1 of
+ ~ the License, or (at your option) any later version.
+ ~
+ ~ This software is distributed in the hope that it will be useful,
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ ~ Lesser General Public License for more details.
+ ~
+ ~ You should have received a copy of the GNU Lesser General Public
+ ~ License along with this software; if not, write to the Free
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ -->
+
+<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:jbosscache-core:config:3.1">
+
+ <locking useLockStriping="false" concurrencyLevel="64" lockParentForChildInsertRemove="false"
+ lockAcquisitionTimeout="20000" />
+
+ <clustering mode="replication" clusterName="${jboss.partition.name:DefaultPartition}-${jbosscache-cluster-name}">
+ <stateRetrieval timeout="20000" fetchInMemoryState="false" />
+ <jgroupsConfig configFile="jgroups/gatein-${gatein.default.jgroups.stack:udp}.xml" />
+ <sync />
+ </clustering>
+
+ <!-- Eviction configuration -->
+ <eviction wakeUpInterval="5000">
+ <default algorithmClass="org.jboss.cache.eviction.LRUAlgorithm"
+ actionPolicyClass="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.ParentNodeEvictionActionPolicy"
+ eventQueueSize="1000000">
+ <property name="maxNodes" value="5000" />
+ <property name="timeToLive" value="20000" />
+ </default>
+ </eviction>
+</jbosscache>
\ No newline at end of file
Added: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/jbosscache/cluster/indexer-config.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/jbosscache/cluster/indexer-config.xml (rev 0)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/jbosscache/cluster/indexer-config.xml 2011-10-26 09:01:00 UTC (rev 7887)
@@ -0,0 +1,32 @@
+<!--
+ ~ Copyright (C) 2009 eXo Platform SAS.
+ ~
+ ~ This is free software; you can redistribute it and/or modify it
+ ~ under the terms of the GNU Lesser General Public License as
+ ~ published by the Free Software Foundation; either version 2.1 of
+ ~ the License, or (at your option) any later version.
+ ~
+ ~ This software is distributed in the hope that it will be useful,
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ ~ Lesser General Public License for more details.
+ ~
+ ~ You should have received a copy of the GNU Lesser General Public
+ ~ License along with this software; if not, write to the Free
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ -->
+<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:jbosscache-core:config:3.1">
+
+ <locking useLockStriping="false" concurrencyLevel="64" lockParentForChildInsertRemove="false"
+ lockAcquisitionTimeout="20000" />
+
+ <!-- Configure the TransactionManager -->
+ <transaction transactionManagerLookupClass="org.jboss.cache.transaction.JBossStandaloneJTAManagerLookup" />
+
+ <clustering mode="replication" clusterName="${jboss.partition.name:DefaultPartition}-${jbosscache-cluster-name}">
+ <stateRetrieval timeout="20000" fetchInMemoryState="false" />
+ <jgroupsConfig configFile="jgroups/gatein-${gatein.default.jgroups.stack:udp}.xml" />
+ <sync />
+ </clustering>
+</jbosscache>
Added: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/jbosscache/cluster/lock-config.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/jbosscache/cluster/lock-config.xml (rev 0)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/jbosscache/cluster/lock-config.xml 2011-10-26 09:01:00 UTC (rev 7887)
@@ -0,0 +1,50 @@
+<!--
+ ~ Copyright (C) 2009 eXo Platform SAS.
+ ~
+ ~ This is free software; you can redistribute it and/or modify it
+ ~ under the terms of the GNU Lesser General Public License as
+ ~ published by the Free Software Foundation; either version 2.1 of
+ ~ the License, or (at your option) any later version.
+ ~
+ ~ This software is distributed in the hope that it will be useful,
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ ~ Lesser General Public License for more details.
+ ~
+ ~ You should have received a copy of the GNU Lesser General Public
+ ~ License along with this software; if not, write to the Free
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ -->
+
+<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:jbosscache-core:config:3.1">
+
+ <locking useLockStriping="false" concurrencyLevel="64" lockParentForChildInsertRemove="false" lockAcquisitionTimeout="20000" />
+
+ <clustering mode="replication" clusterName="${jboss.partition.name:DefaultPartition}-${jbosscache-cluster-name}">
+ <stateRetrieval timeout="20000" fetchInMemoryState="false" />
+ <jgroupsConfig configFile="jgroups/gatein-${gatein.default.jgroups.stack:udp}.xml" />
+ <sync />
+ </clustering>
+
+ <loaders passivation="false" shared="true">
+ <preload>
+ <node fqn="/" />
+ </preload>
+ <loader class="org.jboss.cache.loader.JDBCCacheLoader" async="false" fetchPersistentState="false"
+ ignoreModifications="false" purgeOnStartup="false">
+ <properties>
+ cache.jdbc.table.name=${jbosscache-cl-cache.jdbc.table.name}
+ cache.jdbc.table.create=${jbosscache-cl-cache.jdbc.table.create}
+ cache.jdbc.table.drop=${jbosscache-cl-cache.jdbc.table.drop}
+ cache.jdbc.table.primarykey=${jbosscache-cl-cache.jdbc.table.primarykey}
+ cache.jdbc.fqn.column=${jbosscache-cl-cache.jdbc.fqn.column}
+ cache.jdbc.fqn.type=${jbosscache-cl-cache.jdbc.fqn.type}
+ cache.jdbc.node.column=${jbosscache-cl-cache.jdbc.node.column}
+ cache.jdbc.node.type=${jbosscache-cl-cache.jdbc.node.type}
+ cache.jdbc.parent.column=${jbosscache-cl-cache.jdbc.parent.column}
+ cache.jdbc.datasource=${jbosscache-cl-cache.jdbc.datasource}
+ </properties>
+ </loader>
+ </loaders>
+</jbosscache>
Added: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/jbosscache/local/config.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/jbosscache/local/config.xml (rev 0)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/jbosscache/local/config.xml 2011-10-26 09:01:00 UTC (rev 7887)
@@ -0,0 +1,37 @@
+<!--
+ ~ Copyright (C) 2009 eXo Platform SAS.
+ ~
+ ~ This is free software; you can redistribute it and/or modify it
+ ~ under the terms of the GNU Lesser General Public License as
+ ~ published by the Free Software Foundation; either version 2.1 of
+ ~ the License, or (at your option) any later version.
+ ~
+ ~ This software is distributed in the hope that it will be useful,
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ ~ Lesser General Public License for more details.
+ ~
+ ~ You should have received a copy of the GNU Lesser General Public
+ ~ License along with this software; if not, write to the Free
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ -->
+<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:jbosscache-core:config:3.1">
+
+ <locking useLockStriping="false" concurrencyLevel="64" lockParentForChildInsertRemove="false" lockAcquisitionTimeout="20000"/>
+
+ <!-- Configure the TransactionManager -->
+ <transaction transactionManagerLookupClass="org.jboss.cache.transaction.JBossStandaloneJTAManagerLookup" />
+
+ <!-- Enable batching -->
+ <invocationBatching enabled="true" />
+
+ <!-- Eviction configuration -->
+ <eviction wakeUpInterval="5000">
+ <default algorithmClass="org.jboss.cache.eviction.FIFOAlgorithm" actionPolicyClass="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.ParentNodeEvictionActionPolicy" eventQueueSize="1000000">
+ <property name="maxNodes" value="5000" />
+ <property name="minTimeToLive" value="20000" />
+ </default>
+ </eviction>
+
+</jbosscache>
Added: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/jbosscache/local/lock-config.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/jbosscache/local/lock-config.xml (rev 0)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/jbosscache/local/lock-config.xml 2011-10-26 09:01:00 UTC (rev 7887)
@@ -0,0 +1,43 @@
+<!--
+ ~ Copyright (C) 2009 eXo Platform SAS.
+ ~
+ ~ This is free software; you can redistribute it and/or modify it
+ ~ under the terms of the GNU Lesser General Public License as
+ ~ published by the Free Software Foundation; either version 2.1 of
+ ~ the License, or (at your option) any later version.
+ ~
+ ~ This software is distributed in the hope that it will be useful,
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ ~ Lesser General Public License for more details.
+ ~
+ ~ You should have received a copy of the GNU Lesser General Public
+ ~ License along with this software; if not, write to the Free
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ -->
+<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:jbosscache-core:config:3.1">
+
+ <locking useLockStriping="false" concurrencyLevel="64" lockParentForChildInsertRemove="false" lockAcquisitionTimeout="20000" />
+
+ <loaders passivation="false" shared="true">
+ <preload>
+ <node fqn="/" />
+ </preload>
+ <loader class="org.jboss.cache.loader.JDBCCacheLoader" async="false" fetchPersistentState="false"
+ ignoreModifications="false" purgeOnStartup="false">
+ <properties>
+ cache.jdbc.table.name=${jbosscache-cl-cache.jdbc.table.name}
+ cache.jdbc.table.create=${jbosscache-cl-cache.jdbc.table.create}
+ cache.jdbc.table.drop=${jbosscache-cl-cache.jdbc.table.drop}
+ cache.jdbc.table.primarykey=${jbosscache-cl-cache.jdbc.table.primarykey}
+ cache.jdbc.fqn.column=${jbosscache-cl-cache.jdbc.fqn.column}
+ cache.jdbc.fqn.type=${jbosscache-cl-cache.jdbc.fqn.type}
+ cache.jdbc.node.column=${jbosscache-cl-cache.jdbc.node.column}
+ cache.jdbc.node.type=${jbosscache-cl-cache.jdbc.node.type}
+ cache.jdbc.parent.column=${jbosscache-cl-cache.jdbc.parent.column}
+ cache.jdbc.datasource=${jbosscache-cl-cache.jdbc.datasource}
+ </properties>
+ </loader>
+ </loaders>
+</jbosscache>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/repository-configuration.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/repository-configuration.xml 2011-10-26 04:55:00 UTC (rev 7886)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/repository-configuration.xml 2011-10-26 09:01:00 UTC (rev 7887)
@@ -59,8 +59,9 @@
<properties>
<property name="jbosscache-configuration" value="${gatein.jcr.cache.config}" />
<property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}" />
- <property name="jgroups-multiplexer-stack" value="true" />
- <property name="jbosscache-cluster-name" value="jcr-${container.name.suffix}-system" />
+ <property name="jgroups-multiplexer-stack" value="false" />
+ <property name="jbosscache-cluster-name" value="jcr${container.name.suffix}" />
+ <property name="jbosscache-shareable" value="true" />
</properties>
</cache>
<query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">
@@ -69,8 +70,9 @@
<property name="changesfilter-class" value="${gatein.jcr.index.changefilterclass}" />
<property name="jbosscache-configuration" value="${gatein.jcr.index.cache.config}" />
<property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}" />
- <property name="jgroups-multiplexer-stack" value="true" />
- <property name="jbosscache-cluster-name" value="jcrindexer-${container.name.suffix}-system" />
+ <property name="jgroups-multiplexer-stack" value="false" />
+ <property name="jbosscache-cluster-name" value="jcrindexer${container.name.suffix}" />
+ <property name="jbosscache-shareable" value="true" />
<property name="max-volatile-time" value="60" />
</properties>
</query-handler>
@@ -79,9 +81,10 @@
<property name="time-out" value="15m" />
<property name="jbosscache-configuration" value="${gatein.jcr.lock.cache.config}" />
<property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}" />
- <property name="jgroups-multiplexer-stack" value="true" />
- <property name="jbosscache-cluster-name" value="jcrlock-${container.name.suffix}-system" />
- <property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlock_system" />
+ <property name="jgroups-multiplexer-stack" value="false" />
+ <property name="jbosscache-cluster-name" value="jcrlock${container.name.suffix}" />
+ <property name="jbosscache-shareable" value="true" />
+ <property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlock" />
<property name="jbosscache-cl-cache.jdbc.table.create" value="true" />
<property name="jbosscache-cl-cache.jdbc.table.drop" value="false" />
<property name="jbosscache-cl-cache.jdbc.table.primarykey" value="pk" />
@@ -125,8 +128,9 @@
<properties>
<property name="jbosscache-configuration" value="${gatein.jcr.cache.config}" />
<property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}" />
- <property name="jgroups-multiplexer-stack" value="true" />
- <property name="jbosscache-cluster-name" value="jcr-${container.name.suffix}-portal-system" />
+ <property name="jgroups-multiplexer-stack" value="false" />
+ <property name="jbosscache-cluster-name" value="jcr${container.name.suffix}" />
+ <property name="jbosscache-shareable" value="true" />
</properties>
</cache>
<query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">
@@ -135,8 +139,9 @@
<property name="changesfilter-class" value="${gatein.jcr.index.changefilterclass}" />
<property name="jbosscache-configuration" value="${gatein.jcr.index.cache.config}" />
<property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}" />
- <property name="jgroups-multiplexer-stack" value="true" />
- <property name="jbosscache-cluster-name" value="jcrindexer-${container.name.suffix}-portal-system" />
+ <property name="jgroups-multiplexer-stack" value="false" />
+ <property name="jbosscache-cluster-name" value="jcrindexer${container.name.suffix}" />
+ <property name="jbosscache-shareable" value="true" />
<property name="max-volatile-time" value="60" />
</properties>
</query-handler>
@@ -145,9 +150,10 @@
<property name="time-out" value="15m" />
<property name="jbosscache-configuration" value="${gatein.jcr.lock.cache.config}" />
<property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}" />
- <property name="jgroups-multiplexer-stack" value="true" />
- <property name="jbosscache-cluster-name" value="jcrlock-${container.name.suffix}-portal-system" />
- <property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlock_portal_system" />
+ <property name="jgroups-multiplexer-stack" value="false" />
+ <property name="jbosscache-cluster-name" value="jcrlock${container.name.suffix}" />
+ <property name="jbosscache-shareable" value="true" />
+ <property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlock" />
<property name="jbosscache-cl-cache.jdbc.table.create" value="true" />
<property name="jbosscache-cl-cache.jdbc.table.drop" value="false" />
<property name="jbosscache-cl-cache.jdbc.table.primarykey" value="pk" />
@@ -191,8 +197,9 @@
<properties>
<property name="jbosscache-configuration" value="${gatein.jcr.cache.config}" />
<property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}" />
- <property name="jgroups-multiplexer-stack" value="true" />
- <property name="jbosscache-cluster-name" value="jcr-${container.name.suffix}-portal-work" />
+ <property name="jgroups-multiplexer-stack" value="false" />
+ <property name="jbosscache-cluster-name" value="jcr${container.name.suffix}" />
+ <property name="jbosscache-shareable" value="true" />
</properties>
</cache>
<query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">
@@ -201,8 +208,9 @@
<property name="changesfilter-class" value="${gatein.jcr.index.changefilterclass}" />
<property name="jbosscache-configuration" value="${gatein.jcr.index.cache.config}" />
<property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}" />
- <property name="jgroups-multiplexer-stack" value="true" />
- <property name="jbosscache-cluster-name" value="jcrindexer-${container.name.suffix}-portal-work" />
+ <property name="jgroups-multiplexer-stack" value="false" />
+ <property name="jbosscache-cluster-name" value="jcrindexer${container.name.suffix}" />
+ <property name="jbosscache-shareable" value="true" />
<property name="max-volatile-time" value="60" />
</properties>
</query-handler>
@@ -211,9 +219,10 @@
<property name="time-out" value="15m" />
<property name="jbosscache-configuration" value="${gatein.jcr.lock.cache.config}" />
<property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}" />
- <property name="jgroups-multiplexer-stack" value="true" />
- <property name="jbosscache-cluster-name" value="jcrlock-${container.name.suffix}-portal-work" />
- <property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlock_portal_work" />
+ <property name="jgroups-multiplexer-stack" value="false" />
+ <property name="jbosscache-cluster-name" value="jcrlock${container.name.suffix}" />
+ <property name="jbosscache-shareable" value="true" />
+ <property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlock" />
<property name="jbosscache-cl-cache.jdbc.table.create" value="true" />
<property name="jbosscache-cl-cache.jdbc.table.drop" value="false" />
<property name="jbosscache-cl-cache.jdbc.table.primarykey" value="pk" />
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/idm-configuration.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/idm-configuration.xml 2011-10-26 04:55:00 UTC (rev 7886)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/idm-configuration.xml 2011-10-26 09:01:00 UTC (rev 7887)
@@ -116,7 +116,7 @@
<value-param profiles="cluster">
<name>jgroups-multiplexer-stack</name>
- <value>true</value>
+ <value>false</value>
</value-param>
<value-param>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/jboss-cache-api-cluster.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/jboss-cache-api-cluster.xml 2011-10-26 04:55:00 UTC (rev 7886)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/jboss-cache-api-cluster.xml 2011-10-26 09:01:00 UTC (rev 7887)
@@ -1,8 +1,9 @@
<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:jbosscache-core:config:3.1">
+ <!-- The cluster name will be changed programmatically. Portal container name will be added to the end of cluster name. -->
<clustering mode="replication" clusterName="${jboss.partition.name:DefaultPartition}-idm-api-cluster">
<stateRetrieval timeout="20000" fetchInMemoryState="false" />
- <jgroupsConfig multiplexerStack="jcr.stack" />
+ <jgroupsConfig configFile="jgroups/gatein-${gatein.default.jgroups.stack:udp}.xml" />
<sync />
</clustering>
Deleted: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/jboss-cache-cluster.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/jboss-cache-cluster.xml 2011-10-26 04:55:00 UTC (rev 7886)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/jboss-cache-cluster.xml 2011-10-26 09:01:00 UTC (rev 7887)
@@ -1,19 +0,0 @@
-<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:jbosscache-core:config:3.1">
-
- <clustering mode="replication" clusterName="idm-cluster">
- <stateRetrieval timeout="20000" fetchInMemoryState="false" />
- <jgroupsConfig multiplexerStack="jcr.stack" />
- <sync />
- </clustering>
-
- <!-- Eviction configuration -->
- <eviction wakeUpInterval="5000">
- <default algorithmClass="org.jboss.cache.eviction.ExpirationAlgorithm"
- eventQueueSize="1000000">
- <property name="maxNodes" value="100000" />
- <property name="timeToLive" value="120000" />
- <property name="warnNoExpirationKey" value="false" />
- </default>
- </eviction>
-
-</jbosscache>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/jboss-cache-store-cluster.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/jboss-cache-store-cluster.xml 2011-10-26 04:55:00 UTC (rev 7886)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/jboss-cache-store-cluster.xml 2011-10-26 09:01:00 UTC (rev 7887)
@@ -1,8 +1,9 @@
<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:jbosscache-core:config:3.1">
+ <!-- The cluster name will be changed programmatically. Portal container name will be added to the end of cluster name. -->
<clustering mode="replication" clusterName="${jboss.partition.name:DefaultPartition}-idm-store-cluster">
<stateRetrieval timeout="20000" fetchInMemoryState="false" />
- <jgroupsConfig multiplexerStack="jcr.stack" />
+ <jgroupsConfig configFile="jgroups/gatein-${gatein.default.jgroups.stack:udp}.xml" />
<sync />
</clustering>
Modified: portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/repository-configuration.xml
===================================================================
--- portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/repository-configuration.xml 2011-10-26 04:55:00 UTC (rev 7886)
+++ portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/repository-configuration.xml 2011-10-26 09:01:00 UTC (rev 7887)
@@ -64,8 +64,9 @@
<properties>
<property name="jbosscache-configuration" value="${gatein.jcr.cache.config}"/>
<property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}"/>
- <property name="jgroups-multiplexer-stack" value="true"/>
- <property name="jbosscache-cluster-name" value="jcr-${container.name.suffix}-wsrp-system"/>
+ <property name="jgroups-multiplexer-stack" value="false" />
+ <property name="jbosscache-cluster-name" value="jcr${container.name.suffix}" />
+ <property name="jbosscache-shareable" value="true" />
</properties>
</cache>
<query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">
@@ -75,8 +76,9 @@
<property name="changesfilter-class" value="${gatein.jcr.index.changefilterclass}"/>
<property name="jbosscache-configuration" value="${gatein.jcr.index.cache.config}"/>
<property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}"/>
- <property name="jgroups-multiplexer-stack" value="true"/>
- <property name="jbosscache-cluster-name" value="jcrindexer-${container.name.suffix}-wsrp-system"/>
+ <property name="jgroups-multiplexer-stack" value="false" />
+ <property name="jbosscache-cluster-name" value="jcrindexer${container.name.suffix}" />
+ <property name="jbosscache-shareable" value="true" />
<property name="max-volatile-time" value="60"/>
</properties>
</query-handler>
@@ -85,9 +87,10 @@
<property name="time-out" value="15m"/>
<property name="jbosscache-configuration" value="${gatein.jcr.lock.cache.config}"/>
<property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}"/>
- <property name="jgroups-multiplexer-stack" value="true"/>
- <property name="jbosscache-cluster-name" value="jcrlock-${container.name.suffix}-wsrp-system"/>
- <property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlock_wsrp_system"/>
+ <property name="jgroups-multiplexer-stack" value="false" />
+ <property name="jbosscache-cluster-name" value="jcrlock${container.name.suffix}" />
+ <property name="jbosscache-shareable" value="true" />
+ <property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlock" />
<property name="jbosscache-cl-cache.jdbc.table.create" value="true"/>
<property name="jbosscache-cl-cache.jdbc.table.drop" value="false"/>
<property name="jbosscache-cl-cache.jdbc.table.primarykey" value="pk"/>
@@ -136,8 +139,9 @@
<properties>
<property name="jbosscache-configuration" value="${gatein.jcr.cache.config}"/>
<property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}"/>
- <property name="jgroups-multiplexer-stack" value="true"/>
- <property name="jbosscache-cluster-name" value="jcr-${container.name.suffix}-pc-system"/>
+ <property name="jgroups-multiplexer-stack" value="false" />
+ <property name="jbosscache-cluster-name" value="jcr${container.name.suffix}" />
+ <property name="jbosscache-shareable" value="true" />
</properties>
</cache>
<query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">
@@ -146,8 +150,9 @@
<property name="changesfilter-class" value="${gatein.jcr.index.changefilterclass}"/>
<property name="jbosscache-configuration" value="${gatein.jcr.index.cache.config}"/>
<property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}"/>
- <property name="jgroups-multiplexer-stack" value="true"/>
- <property name="jbosscache-cluster-name" value="jcrindexer-${container.name.suffix}-pc-system"/>
+ <property name="jgroups-multiplexer-stack" value="false" />
+ <property name="jbosscache-cluster-name" value="jcrindexer${container.name.suffix}" />
+ <property name="jbosscache-shareable" value="true" />
<property name="max-volatile-time" value="60"/>
</properties>
</query-handler>
@@ -156,9 +161,10 @@
<property name="time-out" value="15m"/>
<property name="jbosscache-configuration" value="${gatein.jcr.lock.cache.config}"/>
<property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}"/>
- <property name="jgroups-multiplexer-stack" value="true"/>
- <property name="jbosscache-cluster-name" value="jcrlock-${container.name.suffix}-pc-system"/>
- <property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlock_portlet_state_system"/>
+ <property name="jgroups-multiplexer-stack" value="false" />
+ <property name="jbosscache-cluster-name" value="jcrlock${container.name.suffix}" />
+ <property name="jbosscache-shareable" value="true" />
+ <property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlock" />
<property name="jbosscache-cl-cache.jdbc.table.create" value="true"/>
<property name="jbosscache-cl-cache.jdbc.table.drop" value="false"/>
<property name="jbosscache-cl-cache.jdbc.table.primarykey" value="pk"/>
12 years, 8 months
- 1
- 0