gatein SVN: r1562 - in portal/trunk: component/portal/src/main/java/org/exoplatform/portal/pom/data and 25 other directories.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2010-02-08 14:54:59 -0500 (Mon, 08 Feb 2010)
New Revision: 1562
Modified:
portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/PageNavigation.java
portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/Mapper.java
portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/NavigationData.java
portal/trunk/component/portal/src/main/resources/binding.xml
portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestLoadedPOM.java
portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestSavedPOM.java
portal/trunk/component/portal/src/test/resources/portal/group/platform/guests/navigation.xml
portal/trunk/component/portal/src/test/resources/portal/group/platform/test/legacy/navigation.xml
portal/trunk/component/portal/src/test/resources/portal/group/platform/test/normalized/navigation.xml
portal/trunk/component/portal/src/test/resources/portal/group/platform/users/navigation.xml
portal/trunk/component/portal/src/test/resources/portal/portal/template/test/navigation.xml
portal/trunk/component/portal/src/test/resources/portal/portal/test/navigation.xml
portal/trunk/component/portal/src/test/resources/portal/user/demo/navigation.xml
portal/trunk/component/portal/src/test/resources/portal/user/john/navigation.xml
portal/trunk/component/portal/src/test/resources/portal/user/mary/navigation.xml
portal/trunk/component/portal/src/test/resources/portal/user/root/navigation.xml
portal/trunk/component/portal/src/test/resources/portal/user/template/user/navigation.xml
portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/group/platform/users/navigation.xml
portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/user/root/navigation.xml
portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/group/platform/users/navigation.xml
portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/user/root/navigation.xml
portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UIGroupNavigationManagement.java
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/guests/navigation.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/users/navigation.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/demo/navigation.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/john/navigation.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/marry/navigation.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/root/navigation.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/template/user/navigation.xml
Log:
remove description from node navigation as it's not really implemented and used and useful
Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/PageNavigation.java
===================================================================
--- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/PageNavigation.java 2010-02-08 19:08:52 UTC (rev 1561)
+++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/PageNavigation.java 2010-02-08 19:54:59 UTC (rev 1562)
@@ -34,8 +34,6 @@
private String ownerId;
- private String description;
-
private transient boolean modifiable;
private String creator;
@@ -73,7 +71,6 @@
//
this.ownerType = nav.getOwnerType();
this.ownerId = nav.getOwnerId();
- this.description = nav.getDescription();
this.creator = nav.getCreator();
this.modifier = nav.getModifier();
this.priority = nav.getPriority();
@@ -115,16 +112,6 @@
modifiable = b;
}
- public void setDescription(String des)
- {
- description = des;
- }
-
- public String getDescription()
- {
- return description;
- }
-
public int getPriority()
{
return priority;
@@ -219,8 +206,6 @@
setPriority(nav.priority);
if (!modifiable)
setModifiable(nav.modifiable);
- if (description == null)
- setDescription(nav.description);
if (creator == null)
setCreator(nav.creator);
if (modifier == null)
@@ -260,6 +245,6 @@
public NavigationData build()
{
List<NavigationNodeData> children = buildNavigationChildren();
- return new NavigationData(storageId, ownerType, ownerId, description, creator, modifier, priority, children);
+ return new NavigationData(storageId, ownerType, ownerId, creator, modifier, priority, children);
}
}
\ No newline at end of file
Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/Mapper.java
===================================================================
--- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/Mapper.java 2010-02-08 19:08:52 UTC (rev 1561)
+++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/Mapper.java 2010-02-08 19:54:59 UTC (rev 1562)
@@ -25,7 +25,6 @@
import org.exoplatform.portal.config.model.ApplicationType;
import org.exoplatform.portal.config.model.CloneApplicationState;
import org.exoplatform.portal.mop.ProtectedResource;
-import org.exoplatform.portal.pom.data.ModelChange;
import org.exoplatform.portal.config.model.PersistentApplicationState;
import org.exoplatform.portal.config.model.PortalConfig;
import org.exoplatform.portal.config.model.TransientApplicationState;
@@ -61,7 +60,6 @@
import java.util.Set;
import java.util.UUID;
-import static org.exoplatform.portal.pom.config.Utils.join;
import static org.exoplatform.portal.pom.config.Utils.split;
/**
@@ -137,7 +135,6 @@
src.getObjectId(),
ownerType,
ownerId,
- attrs.getValue(MappedAttributes.DESCRIPTION),
attrs.getValue(MappedAttributes.CREATOR),
attrs.getValue(MappedAttributes.MODIFIER),
attrs.getValue(MappedAttributes.PRIORITY, 1),
@@ -226,7 +223,6 @@
attrs.setValue(MappedAttributes.PRIORITY, pageNav.getPriority());
attrs.setValue(MappedAttributes.CREATOR, pageNav.getCreator());
attrs.setValue(MappedAttributes.MODIFIER, pageNav.getModifier());
- attrs.setValue(MappedAttributes.DESCRIPTION, pageNav.getDescription());
}
else
{
Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/NavigationData.java
===================================================================
--- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/NavigationData.java 2010-02-08 19:08:52 UTC (rev 1561)
+++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/NavigationData.java 2010-02-08 19:54:59 UTC (rev 1562)
@@ -31,9 +31,6 @@
private final NavigationKey key;
/** . */
- private final String description;
-
- /** . */
private final String creator;
/** . */
@@ -45,20 +42,18 @@
public NavigationData(
String ownerType,
String ownerId,
- String description,
String creator,
String modifier,
Integer priority,
List<NavigationNodeData> children)
{
- this(null, ownerType, ownerId, description, creator, modifier, priority, children);
+ this(null, ownerType, ownerId, creator, modifier, priority, children);
}
public NavigationData(
String storageId,
String ownerType,
String ownerId,
- String description,
String creator,
String modifier,
Integer priority,
@@ -78,7 +73,6 @@
//
this.key = new NavigationKey(ownerType, ownerId);
- this.description = description;
this.creator = creator;
this.modifier = modifier;
this.priority = priority != null ? priority : 1;
@@ -99,11 +93,6 @@
return key.getId();
}
- public String getDescription()
- {
- return description;
- }
-
public String getCreator()
{
return creator;
Modified: portal/trunk/component/portal/src/main/resources/binding.xml
===================================================================
--- portal/trunk/component/portal/src/main/resources/binding.xml 2010-02-08 19:08:52 UTC (rev 1561)
+++ portal/trunk/component/portal/src/main/resources/binding.xml 2010-02-08 19:54:59 UTC (rev 1562)
@@ -189,7 +189,6 @@
<value name="priority" field="priority" usage="optional"/>
<value name="creator" field="creator" usage="optional"/>
<value name="modifier" field="modifier" usage="optional"/>
- <value name="description" field="description" usage="optional"/>
<collection name="page-nodes" field="pageNodes" usage="optional"
item-type="org.exoplatform.portal.config.model.PageNode"/>
</mapping>
Modified: portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestLoadedPOM.java
===================================================================
--- portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestLoadedPOM.java 2010-02-08 19:08:52 UTC (rev 1561)
+++ portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestLoadedPOM.java 2010-02-08 19:54:59 UTC (rev 1562)
@@ -131,7 +131,6 @@
assertEquals(1, nav.getPriority());
assertEquals("navigation_creator", nav.getCreator());
assertEquals("navigation_modifier", nav.getModifier());
- assertEquals("navigation_description", nav.getDescription());
//
assertEquals(2, nav.getNodes().size());
Modified: portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestSavedPOM.java
===================================================================
--- portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestSavedPOM.java 2010-02-08 19:08:52 UTC (rev 1561)
+++ portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestSavedPOM.java 2010-02-08 19:54:59 UTC (rev 1562)
@@ -96,7 +96,6 @@
assertEquals(1, (int)defaultAttrs.getInteger("priority"));
assertEquals("navigation_creator", defaultAttrs.getString("creator"));
assertEquals("navigation_modifier", defaultAttrs.getString("modifier"));
- assertEquals("navigation_description", defaultAttrs.getString("description"));
//
Collection<? extends Navigation> childrenNavigations = defaultNav.getChildren();
Modified: portal/trunk/component/portal/src/test/resources/portal/group/platform/guests/navigation.xml
===================================================================
--- portal/trunk/component/portal/src/test/resources/portal/group/platform/guests/navigation.xml 2010-02-08 19:08:52 UTC (rev 1561)
+++ portal/trunk/component/portal/src/test/resources/portal/group/platform/guests/navigation.xml 2010-02-08 19:54:59 UTC (rev 1562)
@@ -24,7 +24,6 @@
<owner-type>group</owner-type>
<owner-id>platform/guests</owner-id>
<priority>9</priority>
- <description>description for node navigation </description>
<page-nodes>
<node>
Modified: portal/trunk/component/portal/src/test/resources/portal/group/platform/test/legacy/navigation.xml
===================================================================
--- portal/trunk/component/portal/src/test/resources/portal/group/platform/test/legacy/navigation.xml 2010-02-08 19:08:52 UTC (rev 1561)
+++ portal/trunk/component/portal/src/test/resources/portal/group/platform/test/legacy/navigation.xml 2010-02-08 19:54:59 UTC (rev 1562)
@@ -24,7 +24,6 @@
<owner-type>group</owner-type>
<owner-id>platform/test/legacy</owner-id>
<priority>9</priority>
- <description>description for node navigation </description>
<page-nodes>
<node>
Modified: portal/trunk/component/portal/src/test/resources/portal/group/platform/test/normalized/navigation.xml
===================================================================
--- portal/trunk/component/portal/src/test/resources/portal/group/platform/test/normalized/navigation.xml 2010-02-08 19:08:52 UTC (rev 1561)
+++ portal/trunk/component/portal/src/test/resources/portal/group/platform/test/normalized/navigation.xml 2010-02-08 19:54:59 UTC (rev 1562)
@@ -24,7 +24,6 @@
<owner-type>group</owner-type>
<owner-id>/platform/test/normalized</owner-id>
<priority>9</priority>
- <description>description for node navigation </description>
<page-nodes>
<node>
Modified: portal/trunk/component/portal/src/test/resources/portal/group/platform/users/navigation.xml
===================================================================
--- portal/trunk/component/portal/src/test/resources/portal/group/platform/users/navigation.xml 2010-02-08 19:08:52 UTC (rev 1561)
+++ portal/trunk/component/portal/src/test/resources/portal/group/platform/users/navigation.xml 2010-02-08 19:54:59 UTC (rev 1562)
@@ -24,7 +24,6 @@
<owner-type>group</owner-type>
<owner-id>/platform/users</owner-id>
<priority>8</priority>
- <description>description for node navigation </description>
<page-nodes>
<node>
Modified: portal/trunk/component/portal/src/test/resources/portal/portal/template/test/navigation.xml
===================================================================
--- portal/trunk/component/portal/src/test/resources/portal/portal/template/test/navigation.xml 2010-02-08 19:08:52 UTC (rev 1561)
+++ portal/trunk/component/portal/src/test/resources/portal/portal/template/test/navigation.xml 2010-02-08 19:54:59 UTC (rev 1562)
@@ -26,7 +26,6 @@
<priority>1</priority>
<creator>creator</creator>
<modifier>modifier</modifier>
- <description>description</description>
<page-nodes>
<node>
Modified: portal/trunk/component/portal/src/test/resources/portal/portal/test/navigation.xml
===================================================================
--- portal/trunk/component/portal/src/test/resources/portal/portal/test/navigation.xml 2010-02-08 19:08:52 UTC (rev 1561)
+++ portal/trunk/component/portal/src/test/resources/portal/portal/test/navigation.xml 2010-02-08 19:54:59 UTC (rev 1562)
@@ -26,7 +26,6 @@
<priority>1</priority>
<creator>navigation_creator</creator>
<modifier>navigation_modifier</modifier>
- <description>navigation_description</description>
<page-nodes>
<node>
Modified: portal/trunk/component/portal/src/test/resources/portal/user/demo/navigation.xml
===================================================================
--- portal/trunk/component/portal/src/test/resources/portal/user/demo/navigation.xml 2010-02-08 19:08:52 UTC (rev 1561)
+++ portal/trunk/component/portal/src/test/resources/portal/user/demo/navigation.xml 2010-02-08 19:54:59 UTC (rev 1562)
@@ -24,7 +24,6 @@
<owner-type>user</owner-type>
<owner-id>demo</owner-id>
<priority>3</priority>
- <description>description for node navigation </description>
<page-nodes />
</node-navigation>
Modified: portal/trunk/component/portal/src/test/resources/portal/user/john/navigation.xml
===================================================================
--- portal/trunk/component/portal/src/test/resources/portal/user/john/navigation.xml 2010-02-08 19:08:52 UTC (rev 1561)
+++ portal/trunk/component/portal/src/test/resources/portal/user/john/navigation.xml 2010-02-08 19:54:59 UTC (rev 1562)
@@ -24,7 +24,6 @@
<owner-type>user</owner-type>
<owner-id>john</owner-id>
<priority>3</priority>
- <description>description for node navigation </description>
<page-nodes />
</node-navigation>
Modified: portal/trunk/component/portal/src/test/resources/portal/user/mary/navigation.xml
===================================================================
--- portal/trunk/component/portal/src/test/resources/portal/user/mary/navigation.xml 2010-02-08 19:08:52 UTC (rev 1561)
+++ portal/trunk/component/portal/src/test/resources/portal/user/mary/navigation.xml 2010-02-08 19:54:59 UTC (rev 1562)
@@ -24,7 +24,6 @@
<owner-type>user</owner-type>
<owner-id>mary</owner-id>
<priority>3</priority>
- <description>description for node navigation </description>
<page-nodes />
</node-navigation>
Modified: portal/trunk/component/portal/src/test/resources/portal/user/root/navigation.xml
===================================================================
--- portal/trunk/component/portal/src/test/resources/portal/user/root/navigation.xml 2010-02-08 19:08:52 UTC (rev 1561)
+++ portal/trunk/component/portal/src/test/resources/portal/user/root/navigation.xml 2010-02-08 19:54:59 UTC (rev 1562)
@@ -24,7 +24,6 @@
<owner-type>user</owner-type>
<owner-id>root</owner-id>
<priority>3</priority>
- <description>description for node navigation </description>
<page-nodes />
</node-navigation>
Modified: portal/trunk/component/portal/src/test/resources/portal/user/template/user/navigation.xml
===================================================================
--- portal/trunk/component/portal/src/test/resources/portal/user/template/user/navigation.xml 2010-02-08 19:08:52 UTC (rev 1561)
+++ portal/trunk/component/portal/src/test/resources/portal/user/template/user/navigation.xml 2010-02-08 19:54:59 UTC (rev 1562)
@@ -24,7 +24,6 @@
<owner-type>user</owner-type>
<owner-id>@owner@</owner-id>
<priority>3</priority>
- <description>description for node navigation </description>
-
+
<page-nodes />
</node-navigation>
Modified: portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/group/platform/users/navigation.xml
===================================================================
--- portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/group/platform/users/navigation.xml 2010-02-08 19:08:52 UTC (rev 1561)
+++ portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/group/platform/users/navigation.xml 2010-02-08 19:54:59 UTC (rev 1562)
@@ -24,8 +24,7 @@
<owner-type>group</owner-type>
<owner-id>/platform/users</owner-id>
<priority>8</priority>
- <description>description for node navigation </description>
-
+
<page-nodes>
<node>
<uri>sample-group</uri>
Modified: portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/user/root/navigation.xml
===================================================================
--- portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/user/root/navigation.xml 2010-02-08 19:08:52 UTC (rev 1561)
+++ portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/user/root/navigation.xml 2010-02-08 19:54:59 UTC (rev 1562)
@@ -24,7 +24,6 @@
<owner-type>user</owner-type>
<owner-id>root</owner-id>
<priority>3</priority>
- <description>description for node navigation </description>
<page-nodes>
<node>
Modified: portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/group/platform/users/navigation.xml
===================================================================
--- portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/group/platform/users/navigation.xml 2010-02-08 19:08:52 UTC (rev 1561)
+++ portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/group/platform/users/navigation.xml 2010-02-08 19:54:59 UTC (rev 1562)
@@ -24,8 +24,7 @@
<owner-type>group</owner-type>
<owner-id>/platform/users</owner-id>
<priority>8</priority>
- <description>description for node navigation </description>
-
+
<page-nodes>
<node>
<uri>sample-group</uri>
Modified: portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/user/root/navigation.xml
===================================================================
--- portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/user/root/navigation.xml 2010-02-08 19:08:52 UTC (rev 1561)
+++ portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/user/root/navigation.xml 2010-02-08 19:54:59 UTC (rev 1562)
@@ -24,7 +24,6 @@
<owner-type>user</owner-type>
<owner-id>root</owner-id>
<priority>3</priority>
- <description>description for node navigation </description>
<page-nodes>
<node>
Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UIGroupNavigationManagement.java
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UIGroupNavigationManagement.java 2010-02-08 19:08:52 UTC (rev 1561)
+++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UIGroupNavigationManagement.java 2010-02-08 19:54:59 UTC (rev 1562)
@@ -239,7 +239,6 @@
UIPageNavigationForm pageNavigation = popUp.createUIComponent(UIPageNavigationForm.class, null, null, popUp);
pageNavigation.setOwnerId(navigation.getOwnerId());
pageNavigation.setOwnerType(navigation.getOwnerType());
- pageNavigation.setDescription(navigation.getDescription());
pageNavigation.setPriority(String.valueOf(navigation.getPriority()));
pageNavigation.addFormInput();
pageNavigation.setPageNav(navigation);
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/guests/navigation.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/guests/navigation.xml 2010-02-08 19:08:52 UTC (rev 1561)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/guests/navigation.xml 2010-02-08 19:54:59 UTC (rev 1562)
@@ -22,7 +22,6 @@
<node-navigation>
<priority>9</priority>
- <description>description for node navigation </description>
<page-nodes>
<!--
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/users/navigation.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/users/navigation.xml 2010-02-08 19:08:52 UTC (rev 1561)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/users/navigation.xml 2010-02-08 19:54:59 UTC (rev 1562)
@@ -22,7 +22,6 @@
<node-navigation>
<priority>8</priority>
- <description>description for node navigation </description>
<page-nodes>
<node>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/demo/navigation.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/demo/navigation.xml 2010-02-08 19:08:52 UTC (rev 1561)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/demo/navigation.xml 2010-02-08 19:54:59 UTC (rev 1562)
@@ -22,7 +22,6 @@
<node-navigation>
<priority>3</priority>
- <description>description for node navigation </description>
<page-nodes />
</node-navigation>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/john/navigation.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/john/navigation.xml 2010-02-08 19:08:52 UTC (rev 1561)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/john/navigation.xml 2010-02-08 19:54:59 UTC (rev 1562)
@@ -22,7 +22,6 @@
<node-navigation>
<priority>3</priority>
- <description>description for node navigation </description>
<page-nodes />
</node-navigation>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/marry/navigation.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/marry/navigation.xml 2010-02-08 19:08:52 UTC (rev 1561)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/marry/navigation.xml 2010-02-08 19:54:59 UTC (rev 1562)
@@ -22,7 +22,6 @@
<node-navigation>
<priority>3</priority>
- <description>description for node navigation </description>
<page-nodes />
</node-navigation>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/root/navigation.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/root/navigation.xml 2010-02-08 19:08:52 UTC (rev 1561)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/root/navigation.xml 2010-02-08 19:54:59 UTC (rev 1562)
@@ -22,7 +22,6 @@
<node-navigation>
<priority>3</priority>
- <description>description for node navigation </description>
<page-nodes>
<!--
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/template/user/navigation.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/template/user/navigation.xml 2010-02-08 19:08:52 UTC (rev 1561)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/template/user/navigation.xml 2010-02-08 19:54:59 UTC (rev 1562)
@@ -22,7 +22,6 @@
<node-navigation>
<priority>3</priority>
- <description>description for node navigation </description>
<page-nodes>
</page-nodes>
16 years, 2 months
- 1
- 0
gatein SVN: r1561 - in portal/trunk: component/application-registry/src/main/java/org/exoplatform/application/gadget/impl and 7 other directories.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2010-02-08 14:08:52 -0500 (Mon, 08 Feb 2010)
New Revision: 1561
Added:
portal/trunk/component/portal/src/main/java/conf/gatein-nodetypes.xml
portal/trunk/component/portal/src/main/java/org/exoplatform/portal/mop/Described.java
Modified:
portal/trunk/component/application-registry/src/main/java/conf/application-nodetypes.xml
portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/GadgetDefinition.java
portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/CategoryDefinition.java
portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/ContentDefinition.java
portal/trunk/component/application-registry/src/test/java/conf/exo.portal.component.application-registry-configuration.xml
portal/trunk/component/portal/src/main/java/conf/content-nodetypes.xml
portal/trunk/component/portal/src/main/java/org/exoplatform/portal/mop/ProtectedResource.java
portal/trunk/component/portal/src/test/java/conf/exo.portal.component.portal-configuration1.xml
portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestSavedPOM.java
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.xml
Log:
- use gatein namespace for gatein specific mixins
- introduce gtn:described mixin for name+description
- refactor other node types to use the gatein mixins
Modified: portal/trunk/component/application-registry/src/main/java/conf/application-nodetypes.xml
===================================================================
--- portal/trunk/component/application-registry/src/main/java/conf/application-nodetypes.xml 2010-02-08 17:32:04 UTC (rev 1560)
+++ portal/trunk/component/application-registry/src/main/java/conf/application-nodetypes.xml 2010-02-08 19:08:52 UTC (rev 1561)
@@ -39,14 +39,9 @@
<supertypes>
<supertype>nt:base</supertype>
<supertype>mix:referenceable</supertype>
+ <supertype>gtn:described</supertype>
</supertypes>
<propertyDefinitions>
- <propertyDefinition name="app:title" requiredType="String" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false" multiple="false">
- <valueConstraints/>
- </propertyDefinition>
- <propertyDefinition name="app:description" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false">
- <valueConstraints/>
- </propertyDefinition>
<propertyDefinition name="app:thumbnail" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false">
<valueConstraints/>
</propertyDefinition>
@@ -120,23 +115,16 @@
<supertypes>
<supertype>nt:base</supertype>
<supertype>mix:referenceable</supertype>
+ <supertype>gtn:protectedresource</supertype>
+ <supertype>gtn:described</supertype>
</supertypes>
<propertyDefinitions>
- <propertyDefinition name="app:displayname" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="true">
- <valueConstraints/>
- </propertyDefinition>
- <propertyDefinition name="app:description" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false">
- <valueConstraints/>
- </propertyDefinition>
<propertyDefinition name="app:creationdate" requiredType="Date" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false">
<valueConstraints/>
</propertyDefinition>
<propertyDefinition name="app:lastmodificationdate" requiredType="Date" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false">
<valueConstraints/>
</propertyDefinition>
- <propertyDefinition name="app:accesspermissions" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="true">
- <valueConstraints/>
- </propertyDefinition>
</propertyDefinitions>
<childNodeDefinitions>
<childNodeDefinition name="*" defaultPrimaryType="app:application" autoCreated="false" mandatory="false"
@@ -152,23 +140,16 @@
<supertypes>
<supertype>nt:base</supertype>
<supertype>mix:referenceable</supertype>
+ <supertype>gtn:protectedresource</supertype>
+ <supertype>gtn:described</supertype>
</supertypes>
<propertyDefinitions>
- <propertyDefinition name="app:displayname" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="true">
- <valueConstraints/>
- </propertyDefinition>
- <propertyDefinition name="app:description" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false">
- <valueConstraints/>
- </propertyDefinition>
<propertyDefinition name="app:creationdate" requiredType="Date" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false">
<valueConstraints/>
</propertyDefinition>
<propertyDefinition name="app:lastmodificationdate" requiredType="Date" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false">
<valueConstraints/>
</propertyDefinition>
- <propertyDefinition name="app:accesspermissions" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="true">
- <valueConstraints/>
- </propertyDefinition>
</propertyDefinitions>
</nodeType>
Modified: portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/GadgetDefinition.java
===================================================================
--- portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/GadgetDefinition.java 2010-02-08 17:32:04 UTC (rev 1560)
+++ portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/GadgetDefinition.java 2010-02-08 19:08:52 UTC (rev 1561)
@@ -35,12 +35,12 @@
@Name
public abstract String getName();
- @Property(name = "app:title")
+ @Property(name = "gtn:name")
public abstract String getTitle();
public abstract void setTitle(String title);
- @Property(name = "app:description")
+ @Property(name = "gtn:description")
public abstract String getDescription();
public abstract void setDescription(String description);
Modified: portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/CategoryDefinition.java
===================================================================
--- portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/CategoryDefinition.java 2010-02-08 17:32:04 UTC (rev 1560)
+++ portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/CategoryDefinition.java 2010-02-08 19:08:52 UTC (rev 1561)
@@ -50,12 +50,12 @@
@Name
public abstract String getName();
- @Property(name = "app:displayname")
+ @Property(name = "gtn:name")
public abstract String getDisplayName();
public abstract void setDisplayName(String displayName);
- @Property(name = "app:description")
+ @Property(name = "gtn:description")
public abstract String getDescription();
public abstract void setDescription(String description);
@@ -70,7 +70,7 @@
public abstract void setLastModificationDate(Date date);
- @Property(name = "app:accesspermissions")
+ @Property(name = "gtn:access-permissions")
public abstract List<String> getAccessPermissions();
public abstract void setAccessPermissions(List<String> accessPermissions);
Modified: portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/ContentDefinition.java
===================================================================
--- portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/ContentDefinition.java 2010-02-08 17:32:04 UTC (rev 1560)
+++ portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/ContentDefinition.java 2010-02-08 19:08:52 UTC (rev 1561)
@@ -42,12 +42,12 @@
@Name
public abstract String getName();
- @Property(name = "app:displayname")
+ @Property(name = "gtn:name")
public abstract String getDisplayName();
public abstract void setDisplayName(String displayName);
- @Property(name = "app:description")
+ @Property(name = "gtn:description")
public abstract String getDescription();
public abstract void setDescription(String description);
@@ -62,7 +62,7 @@
public abstract void setLastModificationDate(Date date);
- @Property(name = "app:accesspermissions")
+ @Property(name = "gtn:access-permissions")
public abstract List<String> getAccessPermissions();
public abstract void setAccessPermissions(List<String> accessPermissions);
Modified: portal/trunk/component/application-registry/src/test/java/conf/exo.portal.component.application-registry-configuration.xml
===================================================================
--- portal/trunk/component/application-registry/src/test/java/conf/exo.portal.component.application-registry-configuration.xml 2010-02-08 17:32:04 UTC (rev 1560)
+++ portal/trunk/component/application-registry/src/test/java/conf/exo.portal.component.application-registry-configuration.xml 2010-02-08 19:08:52 UTC (rev 1561)
@@ -262,6 +262,7 @@
<init-params>
<properties-param>
<name>namespaces</name>
+ <property name="gtn" value="http://www.gatein.org/jcr/gatein/1.0/"/>
<property name="app" value="http://www.gatein.org/jcr/application-registry/1.0/"/>
</properties-param>
</init-params>
Modified: portal/trunk/component/portal/src/main/java/conf/content-nodetypes.xml
===================================================================
--- portal/trunk/component/portal/src/main/java/conf/content-nodetypes.xml 2010-02-08 17:32:04 UTC (rev 1560)
+++ portal/trunk/component/portal/src/main/java/conf/content-nodetypes.xml 2010-02-08 19:08:52 UTC (rev 1561)
@@ -20,17 +20,6 @@
-->
<nodeTypes xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0">
- <nodeType name="mop:protectedresource" isMixin="true" hasOrderableChildNodes="false" primaryItemName="">
- <propertyDefinitions>
- <propertyDefinition name="mop:access-permissions" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="true">
- <valueConstraints/>
- </propertyDefinition>
- <propertyDefinition name="mop:edit-permissions" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="true">
- <valueConstraints/>
- </propertyDefinition>
- </propertyDefinitions>
- </nodeType>
-
<nodeType name="mop:portletpreferences" isMixin="false" hasOrderableChildNodes="false" primaryItemName="">
<supertypes>
<supertype>mop:customizationstate</supertype>
Added: portal/trunk/component/portal/src/main/java/conf/gatein-nodetypes.xml
===================================================================
--- portal/trunk/component/portal/src/main/java/conf/gatein-nodetypes.xml (rev 0)
+++ portal/trunk/component/portal/src/main/java/conf/gatein-nodetypes.xml 2010-02-08 19:08:52 UTC (rev 1561)
@@ -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.
+ -->
+<nodeTypes xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0">
+
+ <nodeType name="gtn:protectedresource" isMixin="true" hasOrderableChildNodes="false" primaryItemName="">
+ <propertyDefinitions>
+ <propertyDefinition name="gtn:access-permissions" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="true">
+ <valueConstraints/>
+ </propertyDefinition>
+ <propertyDefinition name="gtn:edit-permissions" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="true">
+ <valueConstraints/>
+ </propertyDefinition>
+ </propertyDefinitions>
+ </nodeType>
+
+ <nodeType name="gtn:described" isMixin="true" hasOrderableChildNodes="false" primaryItemName="">
+ <propertyDefinitions>
+ <propertyDefinition name="gtn:name" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false">
+ <valueConstraints/>
+ </propertyDefinition>
+ <propertyDefinition name="gtn:description" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false">
+ <valueConstraints/>
+ </propertyDefinition>
+ </propertyDefinitions>
+ </nodeType>
+
+</nodeTypes>
Added: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/mop/Described.java
===================================================================
--- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/mop/Described.java (rev 0)
+++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/mop/Described.java 2010-02-08 19:08:52 UTC (rev 1561)
@@ -0,0 +1,47 @@
+/*
+ * 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.
+ */
+
+package org.exoplatform.portal.mop;
+
+import org.chromattic.api.annotations.MixinType;
+import org.chromattic.api.annotations.Property;
+
+/**
+ * Something having a human readable name and a description. The semantic of the name is to be human readable, it
+ * can be expressed under various ways : name, display name, label, title, etc...
+ *
+ * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
+ * @version $Revision$
+ */
+@MixinType(name = "gtn:described")
+public abstract class Described
+{
+
+ @Property(name = "gtn:name")
+ public abstract String getName();
+
+ public abstract void setName(String name);
+
+ @Property(name = "gtn:description")
+ public abstract String getDescription();
+
+ public abstract void setDescription(String description);
+
+
+}
Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/mop/ProtectedResource.java
===================================================================
--- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/mop/ProtectedResource.java 2010-02-08 17:32:04 UTC (rev 1560)
+++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/mop/ProtectedResource.java 2010-02-08 19:08:52 UTC (rev 1561)
@@ -22,7 +22,6 @@
import org.chromattic.api.annotations.MixinType;
import org.chromattic.api.annotations.Property;
-import java.util.Collections;
import java.util.List;
/**
@@ -31,36 +30,18 @@
* @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
* @version $Revision$
*/
-@MixinType(name = "mop:protectedresource")
+@MixinType(name = "gtn:protectedresource")
public abstract class ProtectedResource
{
- @Property(name = "mop:access-permissions")
+ @Property(name = "gtn:access-permissions")
public abstract List<String> getAccessPermissions();
public abstract void setAccessPermissions(List<String> accessPermissions);
- @Property(name = "mop:edit-permissions")
+ @Property(name = "gtn:edit-permissions")
public abstract String getEditPermission();
public abstract void setEditPermission(String editPermission);
-/*
- public String getEditPermission()
- {
- List<String> editPermissions = getEditPermissions();
- return editPermissions.isEmpty() ? null : editPermissions.get(0);
- }
-
- public void setEditPermission(String editPermission)
- {
- setEditPermission(Collections.singletonList(editPermission));
- }
-
- @Property(name = "mop:edit-permissions")
- public abstract List<String> getEditPermissions();
-
- public abstract void setEditPermission(List<String> editPermissions);
-*/
-
}
Modified: portal/trunk/component/portal/src/test/java/conf/exo.portal.component.portal-configuration1.xml
===================================================================
--- portal/trunk/component/portal/src/test/java/conf/exo.portal.component.portal-configuration1.xml 2010-02-08 17:32:04 UTC (rev 1560)
+++ portal/trunk/component/portal/src/test/java/conf/exo.portal.component.portal-configuration1.xml 2010-02-08 19:08:52 UTC (rev 1561)
@@ -114,6 +114,7 @@
<init-params>
<properties-param>
<name>namespaces</name>
+ <property name="gtn" value="http://www.gatein.org/jcr/gatein/1.0/"/>
<property name="mop" value="http://www.gatein.org/jcr/mop/1.0/"/>
</properties-param>
</init-params>
@@ -126,8 +127,9 @@
<values-param>
<name>autoCreatedInNewRepository</name>
<description>Node types configuration file</description>
- <value>jar:/conf/mop-nodetypes.xml</value>
- <value>jar:/conf/content-nodetypes.xml</value>
+ <value>jar:/conf/gatein-nodetypes.xml</value>
+ <value>jar:/conf/mop-nodetypes.xml</value>
+ <value>jar:/conf/content-nodetypes.xml</value>
</values-param>
</init-params>
</component-plugin>
Modified: portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestSavedPOM.java
===================================================================
--- portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestSavedPOM.java 2010-02-08 17:32:04 UTC (rev 1560)
+++ portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestSavedPOM.java 2010-02-08 19:08:52 UTC (rev 1561)
@@ -194,12 +194,14 @@
//
UIContainer container1 = (UIContainer)it.next();
+ assertTrue(container1.isAdapted(ProtectedResource.class));
+ ProtectedResource container1PR = container1.adapt(ProtectedResource.class);
+ assertEquals(Collections.singletonList("container_1_access_permissions"), container1PR.getAccessPermissions());
Attributes container1Attrs = container1.getAttributes();
assertEquals("container_1", container1Attrs.getString("name"));
assertEquals("container_1_title", container1Attrs.getString("title"));
assertEquals("container_1_icon", container1Attrs.getString("icon"));
assertEquals("container_1_template", container1Attrs.getString("template"));
- assertEquals("container_1_access_permissions", container1Attrs.getString("access-permissions"));
assertEquals("container_1_factory_id", container1Attrs.getString("factory-id"));
assertEquals("container_1_decorator", container1Attrs.getString("decorator"));
assertEquals("container_1_description", container1Attrs.getString("description"));
@@ -208,10 +210,12 @@
//
UIWindow application1 = (UIWindow)it.next();
+ assertTrue(application1.isAdapted(ProtectedResource.class));
+ ProtectedResource application1PR = application1.adapt(ProtectedResource.class);
+ assertEquals(Collections.singletonList("application_1_access_permissions"), application1PR.getAccessPermissions());
Attributes application1Attrs = application1.getAttributes();
assertEquals("application_1_theme", application1Attrs.getString("theme"));
assertEquals("application_1_title", application1Attrs.getString("title"));
- assertEquals("application_1_access_permissions", application1Attrs.getString("access-permissions"));
assertEquals(true, (boolean)application1Attrs.getBoolean("show-info-bar"));
assertEquals(true, (boolean)application1Attrs.getBoolean("show-state"));
assertEquals(true, (boolean)application1Attrs.getBoolean("show-mode"));
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.xml 2010-02-08 17:32:04 UTC (rev 1560)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.xml 2010-02-08 19:08:52 UTC (rev 1561)
@@ -95,6 +95,7 @@
<properties-param>
<name>namespaces</name>
<property name="dc" value="http://purl.org/dc/elements/1.1/"/>
+ <property name="gtn" value="http://www.gatein.org/jcr/gatein/1.0/"/>
<property name="mop" value="http://www.gatein.org/jcr/mop/1.0/"/>
<property name="app" value="http://www.gatein.org/jcr/application-registry/1.0/"/>
<property name="lgn" value="http://www.gatein.org/jcr/autologin/1.0/"/>
@@ -112,6 +113,7 @@
<description>Node types configuration file</description>
<value>jar:/conf/ext-nodetypes-config.xml</value>
<value>jar:/conf/organization-nodetypes.xml</value>
+ <value>jar:/conf/gatein-nodetypes.xml</value>
<value>jar:/conf/mop-nodetypes.xml</value>
<value>jar:/conf/application-nodetypes.xml</value>
<value>jar:/conf/content-nodetypes.xml</value>
16 years, 2 months
- 1
- 0
gatein SVN: r1560 - in portal/trunk/component/application-registry/src/main/java: org/exoplatform/application and 2 other directories.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2010-02-08 12:32:04 -0500 (Mon, 08 Feb 2010)
New Revision: 1560
Added:
portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/AppFormatter.java
Modified:
portal/trunk/component/application-registry/src/main/java/conf/application-nodetypes.xml
portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/GadgetDefinition.java
portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/GadgetRegistry.java
portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/GadgetRegistryServiceImpl.java
portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/LocalGadgetData.java
portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/RemoteGadgetData.java
portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/ApplicationRegistryServiceImpl.java
portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/CategoryDefinition.java
portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/ContentDefinition.java
portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/ContentRegistry.java
Log:
- use "app:" prefix for application jcr persistence of names
- actually rename "content" to "application" for application related stuff (was a wrong good idea from me)
Modified: portal/trunk/component/application-registry/src/main/java/conf/application-nodetypes.xml
===================================================================
--- portal/trunk/component/application-registry/src/main/java/conf/application-nodetypes.xml 2010-02-08 16:44:23 UTC (rev 1559)
+++ portal/trunk/component/application-registry/src/main/java/conf/application-nodetypes.xml 2010-02-08 17:32:04 UTC (rev 1560)
@@ -41,21 +41,21 @@
<supertype>mix:referenceable</supertype>
</supertypes>
<propertyDefinitions>
- <propertyDefinition name="title" requiredType="String" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false" multiple="false">
+ <propertyDefinition name="app:title" requiredType="String" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false" multiple="false">
<valueConstraints/>
</propertyDefinition>
- <propertyDefinition name="description" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false">
+ <propertyDefinition name="app:description" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false">
<valueConstraints/>
</propertyDefinition>
- <propertyDefinition name="thumbnail" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false">
+ <propertyDefinition name="app:thumbnail" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false">
<valueConstraints/>
</propertyDefinition>
- <propertyDefinition name="referenceurl" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false">
+ <propertyDefinition name="app:referenceurl" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false">
<valueConstraints/>
</propertyDefinition>
</propertyDefinitions>
<childNodeDefinitions>
- <childNodeDefinition name="data" defaultPrimaryType="app:gadgetdata" autoCreated="false" mandatory="true"
+ <childNodeDefinition name="app:data" defaultPrimaryType="app:gadgetdata" autoCreated="false" mandatory="true"
onParentVersion="COPY" protected="false" sameNameSiblings="false">
<requiredPrimaryTypes>
<requiredPrimaryType>app:gadgetdata</requiredPrimaryType>
@@ -76,12 +76,12 @@
<supertype>app:gadgetdata</supertype>
</supertypes>
<propertyDefinitions>
- <propertyDefinition name="filename" requiredType="String" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false" multiple="false">
+ <propertyDefinition name="app:filename" requiredType="String" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false" multiple="false">
<valueConstraints/>
</propertyDefinition>
</propertyDefinitions>
<childNodeDefinitions>
- <childNodeDefinition name="resources" defaultPrimaryType="nt:folder" autoCreated="false" mandatory="true"
+ <childNodeDefinition name="app:resources" defaultPrimaryType="nt:folder" autoCreated="false" mandatory="true"
onParentVersion="COPY" protected="false" sameNameSiblings="false">
<requiredPrimaryTypes>
<requiredPrimaryType>nt:folder</requiredPrimaryType>
@@ -95,78 +95,78 @@
<supertype>app:gadgetdata</supertype>
</supertypes>
<propertyDefinitions>
- <propertyDefinition name="url" requiredType="String" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false" multiple="false">
+ <propertyDefinition name="app:url" requiredType="String" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false" multiple="false">
<valueConstraints/>
</propertyDefinition>
</propertyDefinitions>
</nodeType>
- <nodeType name="app:contentregistry" isMixin="false" hasOrderableChildNodes="true" primaryItemName="">
+ <nodeType name="app:applicationregistry" isMixin="false" hasOrderableChildNodes="true" primaryItemName="">
<supertypes>
<supertype>nt:base</supertype>
<supertype>mix:referenceable</supertype>
</supertypes>
<childNodeDefinitions>
- <childNodeDefinition name="*" defaultPrimaryType="app:contentcategory" autoCreated="false" mandatory="false"
+ <childNodeDefinition name="*" defaultPrimaryType="app:category" autoCreated="false" mandatory="false"
onParentVersion="COPY" protected="false" sameNameSiblings="false">
<requiredPrimaryTypes>
- <requiredPrimaryType>app:contentcategory</requiredPrimaryType>
+ <requiredPrimaryType>app:category</requiredPrimaryType>
</requiredPrimaryTypes>
</childNodeDefinition>
</childNodeDefinitions>
</nodeType>
- <nodeType name="app:contentcategory" isMixin="false" hasOrderableChildNodes="true" primaryItemName="">
+ <nodeType name="app:category" isMixin="false" hasOrderableChildNodes="true" primaryItemName="">
<supertypes>
<supertype>nt:base</supertype>
<supertype>mix:referenceable</supertype>
</supertypes>
<propertyDefinitions>
- <propertyDefinition name="displayname" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="true">
+ <propertyDefinition name="app:displayname" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="true">
<valueConstraints/>
</propertyDefinition>
- <propertyDefinition name="description" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false">
+ <propertyDefinition name="app:description" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false">
<valueConstraints/>
</propertyDefinition>
- <propertyDefinition name="creationdate" requiredType="Date" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false">
+ <propertyDefinition name="app:creationdate" requiredType="Date" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false">
<valueConstraints/>
</propertyDefinition>
- <propertyDefinition name="lastmodificationdate" requiredType="Date" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false">
+ <propertyDefinition name="app:lastmodificationdate" requiredType="Date" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false">
<valueConstraints/>
</propertyDefinition>
- <propertyDefinition name="accesspermissions" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="true">
+ <propertyDefinition name="app:accesspermissions" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="true">
<valueConstraints/>
</propertyDefinition>
</propertyDefinitions>
<childNodeDefinitions>
- <childNodeDefinition name="*" defaultPrimaryType="app:content" autoCreated="false" mandatory="false"
+ <childNodeDefinition name="*" defaultPrimaryType="app:application" autoCreated="false" mandatory="false"
onParentVersion="COPY" protected="false" sameNameSiblings="false">
<requiredPrimaryTypes>
- <requiredPrimaryType>app:content</requiredPrimaryType>
+ <requiredPrimaryType>app:application</requiredPrimaryType>
</requiredPrimaryTypes>
</childNodeDefinition>
</childNodeDefinitions>
</nodeType>
- <nodeType name="app:content" isMixin="false" hasOrderableChildNodes="false" primaryItemName="">
+ <nodeType name="app:application" isMixin="false" hasOrderableChildNodes="false" primaryItemName="">
<supertypes>
<supertype>nt:base</supertype>
<supertype>mix:referenceable</supertype>
</supertypes>
<propertyDefinitions>
- <propertyDefinition name="displayname" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="true">
+ <propertyDefinition name="app:displayname" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="true">
<valueConstraints/>
</propertyDefinition>
- <propertyDefinition name="description" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false">
+ <propertyDefinition name="app:description" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false">
<valueConstraints/>
</propertyDefinition>
- <propertyDefinition name="creationdate" requiredType="Date" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false">
+ <propertyDefinition name="app:creationdate" requiredType="Date" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false">
<valueConstraints/>
</propertyDefinition>
- <propertyDefinition name="lastmodificationdate" requiredType="Date" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false">
+ <propertyDefinition name="app:lastmodificationdate" requiredType="Date" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false">
<valueConstraints/>
</propertyDefinition>
- <propertyDefinition name="accesspermissions" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="true">
+ <propertyDefinition name="app:accesspermissions" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="true">
<valueConstraints/>
</propertyDefinition>
</propertyDefinitions>
Added: portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/AppFormatter.java
===================================================================
--- portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/AppFormatter.java (rev 0)
+++ portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/AppFormatter.java 2010-02-08 17:32:04 UTC (rev 1560)
@@ -0,0 +1,35 @@
+/*
+ * 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.
+ */
+
+package org.exoplatform.application;
+
+import org.chromattic.ext.format.AbstractEncodingObjectFormatter;
+
+/**
+ * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
+ * @version $Revision$
+ */
+public class AppFormatter extends AbstractEncodingObjectFormatter
+{
+
+ public String getPrefix()
+ {
+ return "app:";
+ }
+}
Modified: portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/GadgetDefinition.java
===================================================================
--- portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/GadgetDefinition.java 2010-02-08 16:44:23 UTC (rev 1559)
+++ portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/GadgetDefinition.java 2010-02-08 17:32:04 UTC (rev 1560)
@@ -18,42 +18,39 @@
*/
package org.exoplatform.application.gadget.impl;
-import org.chromattic.api.annotations.Create;
-import org.chromattic.api.annotations.MappedBy;
-import org.chromattic.api.annotations.Name;
+import org.chromattic.api.annotations.*;
import org.chromattic.api.annotations.PrimaryType;
-import org.chromattic.api.annotations.OneToOne;
-import org.chromattic.api.annotations.PrimaryType;
-import org.chromattic.api.annotations.Property;
import org.chromattic.ext.ntdef.NTFolder;
+import org.exoplatform.application.AppFormatter;
/**
* @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
* @version $Revision$
*/
@PrimaryType(name = "app:gadgetdefinition")
+(a)FormattedBy(AppFormatter.class)
public abstract class GadgetDefinition
{
@Name
public abstract String getName();
- @Property(name = "title")
+ @Property(name = "app:title")
public abstract String getTitle();
public abstract void setTitle(String title);
- @Property(name = "description")
+ @Property(name = "app:description")
public abstract String getDescription();
public abstract void setDescription(String description);
- @Property(name = "thumbnail")
+ @Property(name = "app:thumbnail")
public abstract String getThumbnail();
public abstract void setThumbnail(String thumbnail);
- @Property(name = "referenceurl")
+ @Property(name = "app:referenceurl")
public abstract String getReferenceURL();
public abstract void setReferenceURL(String referenceURL);
Modified: portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/GadgetRegistry.java
===================================================================
--- portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/GadgetRegistry.java 2010-02-08 16:44:23 UTC (rev 1559)
+++ portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/GadgetRegistry.java 2010-02-08 17:32:04 UTC (rev 1560)
@@ -19,8 +19,10 @@
package org.exoplatform.application.gadget.impl;
import org.chromattic.api.annotations.Create;
+import org.chromattic.api.annotations.FormattedBy;
import org.chromattic.api.annotations.PrimaryType;
import org.chromattic.api.annotations.OneToMany;
+import org.exoplatform.application.AppFormatter;
import java.util.Collection;
import java.util.Map;
@@ -30,6 +32,7 @@
* @version $Revision$
*/
@PrimaryType(name = "app:gadgetregistry")
+(a)FormattedBy(AppFormatter.class)
public abstract class GadgetRegistry
{
Modified: portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/GadgetRegistryServiceImpl.java
===================================================================
--- portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/GadgetRegistryServiceImpl.java 2010-02-08 16:44:23 UTC (rev 1559)
+++ portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/GadgetRegistryServiceImpl.java 2010-02-08 17:32:04 UTC (rev 1560)
@@ -110,10 +110,10 @@
{
Chromattic chromattic = chromatticLifeCycle.getChromattic();
ChromatticSession session = chromattic.openSession();
- GadgetRegistry registry = session.findByPath(GadgetRegistry.class, "gadgets");
+ GadgetRegistry registry = session.findByPath(GadgetRegistry.class, "app:gadgets");
if (registry == null)
{
- registry = session.insert(GadgetRegistry.class, "gadgets");
+ registry = session.insert(GadgetRegistry.class, "app:gadgets");
}
return registry;
}
@@ -238,7 +238,7 @@
if (data instanceof LocalGadgetData)
{
LocalGadgetData localData = (LocalGadgetData)data;
- url = "jcr/repository/portal-system/gadgets/" + def.getName() + "/data/resources/" + localData.getFileName();
+ url = "jcr/repository/portal-system/production/app:gadgets/app:" + def.getName() + "/app:data/app:resources/" + localData.getFileName();
}
else
{
Modified: portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/LocalGadgetData.java
===================================================================
--- portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/LocalGadgetData.java 2010-02-08 16:44:23 UTC (rev 1559)
+++ portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/LocalGadgetData.java 2010-02-08 17:32:04 UTC (rev 1560)
@@ -21,15 +21,12 @@
import org.apache.shindig.common.uri.Uri;
import org.apache.shindig.gadgets.spec.GadgetSpec;
import org.apache.shindig.gadgets.spec.ModulePrefs;
-import org.chromattic.api.annotations.ManyToOne;
-import org.chromattic.api.annotations.MappedBy;
+import org.chromattic.api.annotations.*;
import org.chromattic.api.annotations.PrimaryType;
-import org.chromattic.api.annotations.OneToOne;
-import org.chromattic.api.annotations.PrimaryType;
-import org.chromattic.api.annotations.Property;
import org.chromattic.ext.ntdef.NTFile;
import org.chromattic.ext.ntdef.Resource;
import org.chromattic.ext.ntdef.NTFolder;
+import org.exoplatform.application.AppFormatter;
import org.exoplatform.application.gadget.EncodingDetector;
@@ -42,6 +39,7 @@
* @version $Revision$
*/
@PrimaryType(name = "app:localgadgetdata")
+(a)FormattedBy(AppFormatter.class)
public abstract class LocalGadgetData extends GadgetData
{
@@ -51,7 +49,7 @@
@ManyToOne
public abstract GadgetDefinition getDefinition();
- @Property(name = "filename")
+ @Property(name = "app:filename")
public abstract String getFileName();
public abstract void setFileName(String fileName);
Modified: portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/RemoteGadgetData.java
===================================================================
--- portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/RemoteGadgetData.java 2010-02-08 16:44:23 UTC (rev 1559)
+++ portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/RemoteGadgetData.java 2010-02-08 17:32:04 UTC (rev 1560)
@@ -18,18 +18,21 @@
*/
package org.exoplatform.application.gadget.impl;
+import org.chromattic.api.annotations.FormattedBy;
import org.chromattic.api.annotations.PrimaryType;
import org.chromattic.api.annotations.Property;
+import org.exoplatform.application.AppFormatter;
/**
* @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
* @version $Revision$
*/
@PrimaryType(name = "app:remotegadgetdata")
+(a)FormattedBy(AppFormatter.class)
public abstract class RemoteGadgetData extends GadgetData
{
- @Property(name = "url")
+ @Property(name = "app:url")
public abstract String getURL();
public abstract void setURL(String url);
Modified: portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/ApplicationRegistryServiceImpl.java
===================================================================
--- portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/ApplicationRegistryServiceImpl.java 2010-02-08 16:44:23 UTC (rev 1559)
+++ portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/ApplicationRegistryServiceImpl.java 2010-02-08 17:32:04 UTC (rev 1560)
@@ -91,10 +91,10 @@
public ContentRegistry getContentRegistry()
{
ChromatticSession session = lifeCycle.getChromattic().openSession();
- ContentRegistry registry = session.findByPath(ContentRegistry.class, "contents");
+ ContentRegistry registry = session.findByPath(ContentRegistry.class, "app:applications");
if (registry == null)
{
- registry = session.insert(ContentRegistry.class, "contents");
+ registry = session.insert(ContentRegistry.class, "app:applications");
}
return registry;
}
Modified: portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/CategoryDefinition.java
===================================================================
--- portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/CategoryDefinition.java 2010-02-08 16:44:23 UTC (rev 1559)
+++ portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/CategoryDefinition.java 2010-02-08 17:32:04 UTC (rev 1560)
@@ -24,6 +24,7 @@
import org.chromattic.api.annotations.PrimaryType;
import org.chromattic.api.annotations.OneToMany;
import org.chromattic.api.annotations.Property;
+import org.exoplatform.application.AppFormatter;
import org.exoplatform.portal.pom.config.POMSession;
import org.gatein.mop.api.content.ContentType;
import org.gatein.mop.api.content.Customization;
@@ -38,8 +39,8 @@
* @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
* @version $Revision$
*/
-@PrimaryType(name = "app:contentcategory")
-(a)FormattedBy(MOPFormatter.class)
+@PrimaryType(name = "app:category")
+(a)FormattedBy(AppFormatter.class)
public abstract class CategoryDefinition
{
@@ -49,27 +50,27 @@
@Name
public abstract String getName();
- @Property(name = "displayname")
+ @Property(name = "app:displayname")
public abstract String getDisplayName();
public abstract void setDisplayName(String displayName);
- @Property(name = "description")
+ @Property(name = "app:description")
public abstract String getDescription();
public abstract void setDescription(String description);
- @Property(name = "creationdate")
+ @Property(name = "app:creationdate")
public abstract Date getCreationDate();
public abstract void setCreationDate(Date date);
- @Property(name = "lastmodificationdate")
+ @Property(name = "app:lastmodificationdate")
public abstract Date getLastModificationDate();
public abstract void setLastModificationDate(Date date);
- @Property(name = "accesspermissions")
+ @Property(name = "app:accesspermissions")
public abstract List<String> getAccessPermissions();
public abstract void setAccessPermissions(List<String> accessPermissions);
Modified: portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/ContentDefinition.java
===================================================================
--- portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/ContentDefinition.java 2010-02-08 16:44:23 UTC (rev 1559)
+++ portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/ContentDefinition.java 2010-02-08 17:32:04 UTC (rev 1560)
@@ -18,11 +18,8 @@
*/
package org.exoplatform.application.registry.impl;
-import org.chromattic.api.annotations.Id;
-import org.chromattic.api.annotations.ManyToOne;
-import org.chromattic.api.annotations.Name;
-import org.chromattic.api.annotations.PrimaryType;
-import org.chromattic.api.annotations.Property;
+import org.chromattic.api.annotations.*;
+import org.exoplatform.application.AppFormatter;
import org.exoplatform.portal.pom.config.POMSession;
import org.gatein.mop.api.content.Customization;
import org.gatein.mop.api.workspace.Workspace;
@@ -34,7 +31,8 @@
* @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
* @version $Revision$
*/
-@PrimaryType(name = "app:content")
+@PrimaryType(name = "app:application")
+(a)FormattedBy(AppFormatter.class)
public abstract class ContentDefinition
{
@@ -44,27 +42,27 @@
@Name
public abstract String getName();
- @Property(name = "displayname")
+ @Property(name = "app:displayname")
public abstract String getDisplayName();
public abstract void setDisplayName(String displayName);
- @Property(name = "description")
+ @Property(name = "app:description")
public abstract String getDescription();
public abstract void setDescription(String description);
- @Property(name = "creationdate")
+ @Property(name = "app:creationdate")
public abstract Date getCreationDate();
public abstract void setCreationDate(Date date);
- @Property(name = "lastmodificationdate")
+ @Property(name = "app:lastmodificationdate")
public abstract Date getLastModificationDate();
public abstract void setLastModificationDate(Date date);
- @Property(name = "accesspermissions")
+ @Property(name = "app:accesspermissions")
public abstract List<String> getAccessPermissions();
public abstract void setAccessPermissions(List<String> accessPermissions);
Modified: portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/ContentRegistry.java
===================================================================
--- portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/ContentRegistry.java 2010-02-08 16:44:23 UTC (rev 1559)
+++ portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/ContentRegistry.java 2010-02-08 17:32:04 UTC (rev 1560)
@@ -19,8 +19,10 @@
package org.exoplatform.application.registry.impl;
import org.chromattic.api.annotations.Create;
+import org.chromattic.api.annotations.FormattedBy;
import org.chromattic.api.annotations.PrimaryType;
import org.chromattic.api.annotations.OneToMany;
+import org.exoplatform.application.AppFormatter;
import java.util.List;
import java.util.Map;
@@ -29,7 +31,8 @@
* @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
* @version $Revision$
*/
-@PrimaryType(name = "app:contentregistry")
+@PrimaryType(name = "app:applicationregistry")
+(a)FormattedBy(AppFormatter.class)
public abstract class ContentRegistry
{
16 years, 2 months
- 1
- 0
gatein SVN: r1559 - components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2010-02-08 11:44:23 -0500 (Mon, 08 Feb 2010)
New Revision: 1559
Modified:
components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/PortalSite.java
Log:
remove obsolete code
Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/PortalSite.java
===================================================================
--- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/PortalSite.java 2010-02-08 16:26:44 UTC (rev 1558)
+++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/PortalSite.java 2010-02-08 16:44:23 UTC (rev 1559)
@@ -36,21 +36,4 @@
{
return ObjectType.PORTAL_SITE;
}
-
- // Portal implementation *********************************************************************************************
-
- public String getSkinId()
- {
- throw new UnsupportedOperationException();
- }
-
- public String getTitle()
- {
- throw new UnsupportedOperationException();
- }
-
- public String getLocale()
- {
- throw new UnsupportedOperationException();
- }
}
16 years, 2 months
- 1
- 0
gatein SVN: r1558 - in portal/trunk: web/portal/src/main/webapp/WEB-INF/conf/portal and 1 other directory.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2010-02-08 11:26:44 -0500 (Mon, 08 Feb 2010)
New Revision: 1558
Modified:
portal/trunk/component/common/src/main/java/org/exoplatform/commons/chromattic/ChromatticLifeCycle.java
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/application-registry-configuration.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal-configuration.xml
Log:
- GTNPORTAL-606 : Prefix MOP data with a "production"
Modified: portal/trunk/component/common/src/main/java/org/exoplatform/commons/chromattic/ChromatticLifeCycle.java
===================================================================
--- portal/trunk/component/common/src/main/java/org/exoplatform/commons/chromattic/ChromatticLifeCycle.java 2010-02-08 15:45:52 UTC (rev 1557)
+++ portal/trunk/component/common/src/main/java/org/exoplatform/commons/chromattic/ChromatticLifeCycle.java 2010-02-08 16:26:44 UTC (rev 1558)
@@ -66,7 +66,8 @@
ChromatticBuilder.JCR_OPTIMIZE_HAS_NODE_ENABLED,
ChromatticBuilder.JCR_OPTIMIZE_HAS_PROPERTY_ENABLED,
ChromatticBuilder.OBJECT_FORMATTER_CLASSNAME,
- ChromatticBuilder.ROOT_NODE_PATH})
+ ChromatticBuilder.ROOT_NODE_PATH,
+ ChromatticBuilder.CREATE_ROOT_NODE})
{
options.put(option.getName(), option);
}
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/application-registry-configuration.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/application-registry-configuration.xml 2010-02-08 15:45:52 UTC (rev 1557)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/application-registry-configuration.xml 2010-02-08 16:26:44 UTC (rev 1558)
@@ -549,6 +549,11 @@
<value>org.chromattic.ext.ntdef.NTFolder</value>
<value>org.chromattic.ext.ntdef.NTResource</value>
</values-param>
+ <properties-param>
+ <name>options</name>
+ <property name="org.chromattic.api.Option.root_node.path" value="/production"/>
+ <property name="org.chromattic.api.Option.root_node.create" value="true"/>
+ </properties-param>
</init-params>
</component-plugin>
</external-component-plugins>
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 2010-02-08 15:45:52 UTC (rev 1557)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal-configuration.xml 2010-02-08 16:26:44 UTC (rev 1558)
@@ -219,6 +219,11 @@
<value>org.exoplatform.portal.pom.spi.wsrp.WSRPState</value>
<value>org.exoplatform.portal.mop.ProtectedResource</value>
</values-param>
+ <properties-param>
+ <name>options</name>
+ <property name="org.chromattic.api.Option.root_node.path" value="/production"/>
+ <property name="org.chromattic.api.Option.root_node.create" value="true"/>
+ </properties-param>
</init-params>
</component-plugin>
</external-component-plugins>
16 years, 2 months
- 1
- 0
gatein SVN: r1557 - in portal/trunk: examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/jcr and 4 other directories.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2010-02-08 10:45:52 -0500 (Mon, 08 Feb 2010)
New Revision: 1557
Removed:
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/database/
Modified:
portal/trunk/component/common/src/main/java/conf/configuration-jboss.properties
portal/trunk/component/common/src/main/java/conf/configuration-tomcat.properties
portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/jcr/repository-configuration.xml
portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/jcr/repository-configuration.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/configuration.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-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
Log:
GTNPORTAL-605 : Datasource separation
Modified: portal/trunk/component/common/src/main/java/conf/configuration-jboss.properties
===================================================================
--- portal/trunk/component/common/src/main/java/conf/configuration-jboss.properties 2010-02-08 15:33:06 UTC (rev 1556)
+++ portal/trunk/component/common/src/main/java/conf/configuration-jboss.properties 2010-02-08 15:45:52 UTC (rev 1557)
@@ -17,11 +17,6 @@
# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
#
-# Datasource name
-gatein.datasource.name=java:jdbcexo
-gatein.datasource.dialect.hibernate=org.hibernate.dialect.HSQLDialect
-gatein.datasource.dialect.jcr=hsqldb
-
# Data
gatein.data.dir=${jboss.server.data.dir}/gatein
@@ -30,14 +25,16 @@
# JCR
gatein.jcr.config.type=local
-gatein.jcr.datasource.name=${gatein.datasource.name}
+gatein.jcr.datasource.name=jdbcjcr
+gatein.jcr.datasource.dialect=hsqldb
gatein.jcr.data.dir=${gatein.data.dir}/jcr
gatein.jcr.storage.data.dir=${gatein.jcr.data.dir}/values
gatein.jcr.index.data.dir=${gatein.jcr.data.dir}/jcrlucenedb
gatein.jcr.index.changefilterclass=org.exoplatform.services.jcr.impl.core.query.DefaultChangesFilter
#IDM
-gatein.idm.datasource.name=${gatein.datasource.name}
+gatein.idm.datasource.name=jdbcidm
+gatein.idm.datasource.dialect=org.hibernate.dialect.HSQLDialect
# temporary here, need to remove it
jbosscache-cl-cache.jdbc.node.type=OBJECT
Modified: portal/trunk/component/common/src/main/java/conf/configuration-tomcat.properties
===================================================================
--- portal/trunk/component/common/src/main/java/conf/configuration-tomcat.properties 2010-02-08 15:33:06 UTC (rev 1556)
+++ portal/trunk/component/common/src/main/java/conf/configuration-tomcat.properties 2010-02-08 15:45:52 UTC (rev 1557)
@@ -17,11 +17,6 @@
# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
#
-# Datasource name
-gatein.datasource.name=jdbcexo
-gatein.datasource.dialect.hibernate=org.hibernate.dialect.HSQLDialect
-gatein.datasource.dialect.jcr=hsqldb
-
# Data
gatein.data.dir=../temp
@@ -30,14 +25,16 @@
# JCR
gatein.jcr.config.type=local
-gatein.jcr.datasource.name=${gatein.datasource.name}
+gatein.jcr.datasource.name=jdbcjcr
+gatein.jcr.datasource.dialect=hsqldb
gatein.jcr.data.dir=${gatein.data.dir}/jcr
gatein.jcr.storage.data.dir=${gatein.jcr.data.dir}/values
gatein.jcr.index.data.dir=${gatein.jcr.data.dir}/jcrlucenedb
gatein.jcr.index.changefilterclass=org.exoplatform.services.jcr.impl.core.query.DefaultChangesFilter
#IDM
-gatein.idm.datasource.name=${gatein.datasource.name}
+gatein.idm.datasource.name=jdbcidm
+gatein.idm.datasource.dialect=org.hibernate.dialect.HSQLDialect
# temporary here, need to remove it
jbosscache-cl-cache.jdbc.node.type=OBJECT
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 2010-02-08 15:33:06 UTC (rev 1556)
+++ portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/jcr/repository-configuration.xml 2010-02-08 15:45:52 UTC (rev 1557)
@@ -29,7 +29,7 @@
<workspace name="sample-ws">
<container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer">
<properties>
- <property name="source-name" value="${gatein.datasource.name}${container.name.suffix}" />
+ <property name="source-name" value="${gatein.jcr.datasource.name}${container.name.suffix}" />
<property name="dialect" value="hsqldb" />
<property name="multi-db" value="false" />
<property name="update-storage" value="true" />
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 2010-02-08 15:33:06 UTC (rev 1556)
+++ portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/jcr/repository-configuration.xml 2010-02-08 15:45:52 UTC (rev 1557)
@@ -29,7 +29,7 @@
<workspace name="sample-ws">
<container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer">
<properties>
- <property name="source-name" value="${gatein.datasource.name}${container.name.suffix}" />
+ <property name="source-name" value="${gatein.jcr.datasource.namee}${container.name.suffix}" />
<property name="dialect" value="hsqldb" />
<property name="multi-db" value="false" />
<property name="update-storage" value="true" />
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/configuration.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/configuration.xml 2010-02-08 15:33:06 UTC (rev 1556)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/configuration.xml 2010-02-08 15:45:52 UTC (rev 1557)
@@ -29,7 +29,6 @@
<import profiles="jboss">war:/conf/wsrp/wsrp-configuration.xml</import>
<import>war:/conf/common/logs-configuration.xml</import>
<import>war:/conf/common/autologin-configuration.xml</import>
- <import>war:/conf/database/database-configuration.xml</import>
<import>war:/conf/jcr/jcr-configuration.xml</import>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.xml 2010-02-08 15:33:06 UTC (rev 1556)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.xml 2010-02-08 15:45:52 UTC (rev 1557)
@@ -37,8 +37,8 @@
<name>working-conf</name>
<description>working-conf</description>
<property name="persister-class-name" value="org.exoplatform.services.jcr.impl.config.JDBCConfigurationPersister"/>
- <property name="source-name" value="${gatein.datasource.name}${container.name.suffix}"/>
- <property name="dialect" value="${gatein.datasource.dialect.jcr}"/>
+ <property name="source-name" value="${gatein.jcr.datasource.name}${container.name.suffix}"/>
+ <property name="dialect" value="${gatein.jcr.datasource.dialect}"/>
</properties-param>
</init-params>
</component>
@@ -124,4 +124,35 @@
</component-plugin>
</external-component-plugins>
+ <external-component-plugins>
+ <target-component>org.exoplatform.services.naming.InitialContextInitializer</target-component>
+ <component-plugin>
+ <name>bind.datasource</name>
+ <set-method>addPlugin</set-method>
+ <type>org.exoplatform.services.naming.BindReferencePlugin</type>
+ <init-params>
+ <value-param>
+ <name>bind-name</name>
+ <value>${gatein.jcr.datasource.name}${container.name.suffix}</value>
+ </value-param>
+ <value-param>
+ <name>class-name</name>
+ <value>javax.sql.DataSource</value>
+ </value-param>
+ <value-param>
+ <name>factory</name>
+ <value>org.apache.commons.dbcp.BasicDataSourceFactory</value>
+ </value-param>
+ <properties-param>
+ <name>ref-addresses</name>
+ <description>ref-addresses</description>
+ <property name="driverClassName" value="org.hsqldb.jdbcDriver"/>
+ <property name="url" value="jdbc:hsqldb:file:${gatein.db.data.dir}/data/jdbcjcr${container.name.suffix}"/>
+ <property name="username" value="sa"/>
+ <property name="password" value=""/>
+ </properties-param>
+ </init-params>
+ </component-plugin>
+ </external-component-plugins>
+
</configuration>
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 2010-02-08 15:33:06 UTC (rev 1556)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/repository-configuration.xml 2010-02-08 15:45:52 UTC (rev 1557)
@@ -31,8 +31,8 @@
<workspace name="system">
<container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer">
<properties>
- <property name="source-name" value="${gatein.datasource.name}${container.name.suffix}"/>
- <property name="dialect" value="${gatein.datasource.dialect.jcr}"/>
+ <property name="source-name" value="${gatein.jcr.datasource.name}${container.name.suffix}"/>
+ <property name="dialect" value="${gatein.jcr.datasource.dialect}"/>
<property name="multi-db" value="false"/>
<property name="update-storage" value="true"/>
<property name="max-buffer-size" value="204800"/>
@@ -92,7 +92,7 @@
<property name="jbosscache-cl-cache.jdbc.node.type" value="LONGBLOB" />
-->
<property name="jbosscache-cl-cache.jdbc.parent.column" value="parent" />
- <property name="jbosscache-cl-cache.jdbc.datasource" value="${gatein.datasource.name}${container.name.suffix}" />
+ <property name="jbosscache-cl-cache.jdbc.datasource" value="${gatein.jcr.datasource.name}${container.name.suffix}" />
</properties>
</lock-manager>
</workspace>
@@ -101,8 +101,8 @@
<workspace name="portal-system">
<container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer">
<properties>
- <property name="source-name" value="${gatein.datasource.name}${container.name.suffix}"/>
- <property name="dialect" value="${gatein.datasource.dialect.jcr}"/>
+ <property name="source-name" value="${gatein.jcr.datasource.name}${container.name.suffix}"/>
+ <property name="dialect" value="${gatein.jcr.datasource.dialect}"/>
<property name="multi-db" value="false"/>
<property name="update-storage" value="true"/>
<property name="max-buffer-size" value="204800"/>
@@ -162,7 +162,7 @@
<property name="jbosscache-cl-cache.jdbc.node.type" value="LONGBLOB" />
-->
<property name="jbosscache-cl-cache.jdbc.parent.column" value="parent" />
- <property name="jbosscache-cl-cache.jdbc.datasource" value="${gatein.datasource.name}${container.name.suffix}" />
+ <property name="jbosscache-cl-cache.jdbc.datasource" value="${gatein.jcr.datasource.name}${container.name.suffix}" />
</properties>
</lock-manager>
</workspace>
@@ -171,8 +171,8 @@
<workspace name="portal-work">
<container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer">
<properties>
- <property name="source-name" value="${gatein.datasource.name}${container.name.suffix}"/>
- <property name="dialect" value="${gatein.datasource.dialect.jcr}"/>
+ <property name="source-name" value="${gatein.jcr.datasource.name}${container.name.suffix}"/>
+ <property name="dialect" value="${gatein.jcr.datasource.dialect}"/>
<property name="multi-db" value="false"/>
<property name="update-storage" value="true"/>
<property name="max-buffer-size" value="204800"/>
@@ -232,7 +232,7 @@
<property name="jbosscache-cl-cache.jdbc.node.type" value="LONGBLOB" />
-->
<property name="jbosscache-cl-cache.jdbc.parent.column" value="parent" />
- <property name="jbosscache-cl-cache.jdbc.datasource" value="${gatein.datasource.name}${container.name.suffix}" />
+ <property name="jbosscache-cl-cache.jdbc.datasource" value="${gatein.jcr.datasource.name}${container.name.suffix}" />
</properties>
</lock-manager>
</workspace>
@@ -241,8 +241,8 @@
<workspace name="wsrp-system">
<container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer">
<properties>
- <property name="source-name" value="${gatein.datasource.name}${container.name.suffix}"/>
- <property name="dialect" value="${gatein.datasource.dialect.jcr}"/>
+ <property name="source-name" value="${gatein.jcr.datasource.name}${container.name.suffix}"/>
+ <property name="dialect" value="${gatein.jcr.datasource.dialect}"/>
<property name="multi-db" value="false"/>
<property name="update-storage" value="true"/>
<property name="max-buffer-size" value="204800"/>
@@ -303,7 +303,7 @@
<property name="jbosscache-cl-cache.jdbc.node.type" value="LONGBLOB" />
-->
<property name="jbosscache-cl-cache.jdbc.parent.column" value="parent" />
- <property name="jbosscache-cl-cache.jdbc.datasource" value="${gatein.datasource.name}${container.name.suffix}" />
+ <property name="jbosscache-cl-cache.jdbc.datasource" value="${gatein.jcr.datasource.name}${container.name.suffix}" />
</properties>
</lock-manager>
</workspace>
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 2010-02-08 15:33:06 UTC (rev 1556)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/idm-configuration.xml 2010-02-08 15:45:52 UTC (rev 1557)
@@ -25,6 +25,27 @@
xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd">
+ <component>
+ <key>org.exoplatform.services.database.HibernateService</key>
+ <jmx-name>database:type=HibernateService</jmx-name>
+ <type>org.exoplatform.services.database.impl.HibernateServiceImpl</type>
+ <init-params>
+ <properties-param>
+ <name>hibernate.properties</name>
+ <description>Default Hibernate Service</description>
+ <property name="hibernate.show_sql" value="false"/>
+ <property name="hibernate.current_session_context_class" value="thread"/>
+ <property name="hibernate.cache.use_second_level_cache" value="true"/>
+ <property name="hibernate.cache.use_query_cache" value="true"/>
+ <!--CHANGEME HashtableCacheProvider shold not be used in production env-->
+ <property name="hibernate.cache.provider_class" value="org.hibernate.cache.HashtableCacheProvider"/>
+ <property name="hibernate.cglib.use_reflection_optimizer" value="true"/>
+ <property name="hibernate.connection.datasource" value="${gatein.idm.datasource.name}${container.name.suffix}"/>
+ <property name="hibernate.connection.autocommit" value="true"/>
+ <property name="hibernate.dialect" value="${gatein.idm.datasource.dialect}"/>
+ </properties-param>
+ </init-params>
+ </component>
<component>
<key>org.exoplatform.services.organization.idm.PicketLinkIDMService</key>
@@ -124,6 +145,37 @@
</component>
<external-component-plugins>
+ <target-component>org.exoplatform.services.naming.InitialContextInitializer</target-component>
+ <component-plugin>
+ <name>bind.datasource</name>
+ <set-method>addPlugin</set-method>
+ <type>org.exoplatform.services.naming.BindReferencePlugin</type>
+ <init-params>
+ <value-param>
+ <name>bind-name</name>
+ <value>${gatein.idm.datasource.name}${container.name.suffix}</value>
+ </value-param>
+ <value-param>
+ <name>class-name</name>
+ <value>javax.sql.DataSource</value>
+ </value-param>
+ <value-param>
+ <name>factory</name>
+ <value>org.apache.commons.dbcp.BasicDataSourceFactory</value>
+ </value-param>
+ <properties-param>
+ <name>ref-addresses</name>
+ <description>ref-addresses</description>
+ <property name="driverClassName" value="org.hsqldb.jdbcDriver"/>
+ <property name="url" value="jdbc:hsqldb:file:${gatein.db.data.dir}/data/jdbcidm${container.name.suffix}"/>
+ <property name="username" value="sa"/>
+ <property name="password" value=""/>
+ </properties-param>
+ </init-params>
+ </component-plugin>
+ </external-component-plugins>
+
+ <external-component-plugins>
<target-component>org.exoplatform.services.database.HibernateService</target-component>
<component-plugin>
<name>add.hibernate.mapping</name>
@@ -148,5 +200,4 @@
</component-plugin>
</external-component-plugins>
-
</configuration>
16 years, 2 months
- 1
- 0
gatein SVN: r1556 - portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2010-02-08 10:33:06 -0500 (Mon, 08 Feb 2010)
New Revision: 1556
Modified:
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageActionListener.java
Log:
- Removed output to console.
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageActionListener.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageActionListener.java 2010-02-08 14:17:15 UTC (rev 1555)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageActionListener.java 2010-02-08 15:33:06 UTC (rev 1556)
@@ -30,8 +30,6 @@
import org.exoplatform.portal.config.model.PageNode;
import org.exoplatform.portal.config.model.PortalConfig;
import org.exoplatform.portal.webui.application.UIGadget;
-import org.exoplatform.portal.webui.application.UIPortlet;
-import org.exoplatform.portal.webui.navigation.PageNavigationUtils;
import org.exoplatform.portal.webui.portal.PageNodeEvent;
import org.exoplatform.portal.webui.portal.UIPortal;
import org.exoplatform.portal.webui.util.PortalDataMapper;
@@ -44,7 +42,6 @@
import org.exoplatform.webui.event.Event;
import org.exoplatform.webui.event.EventListener;
-import javax.portlet.WindowState;
import java.util.ArrayList;
import java.util.List;
@@ -125,7 +122,7 @@
UIPortal cachedUIPortal = uiPortalApp.getCachedUIPortal(newNavType, newNavId);
if (cachedUIPortal != null)
{
- System.out.println("Found UIPortal with OWNERTYPE: " + newNavType + " OWNERID " + newNavId);
+// System.out.println("Found UIPortal with OWNERTYPE: " + newNavType + " OWNERID " + newNavId);
cachedUIPortal.setSelectedNode(targetPageNode);
cachedUIPortal.setSelectedPath(targetedPathNodes);
uiPortalApp.setShowedUIPortal(cachedUIPortal);
@@ -298,7 +295,7 @@
UIPortal uiPortal = uiPortalApp.createUIComponent(UIPortal.class, null, null);
//Reset selected navigation on userPortalConfig
userPortalConfig.setSelectedNavigation(newPageNav);
- System.out.println("Build new UIPortal with OWNERTYPE: " + newPageNav.getOwnerType() + " OWNERID: " + newPageNav.getOwnerId());
+// System.out.println("Build new UIPortal with OWNERTYPE: " + newPageNav.getOwnerType() + " OWNERID: " + newPageNav.getOwnerId());
PortalDataMapper.toUIPortal(uiPortal, userPortalConfig);
return uiPortal;
}
16 years, 2 months
- 1
- 0
gatein SVN: r1555 - in portal/trunk/component: common/src/test/java/org/exoplatform/commons/utils and 1 other directories.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2010-02-08 09:17:15 -0500 (Mon, 08 Feb 2010)
New Revision: 1555
Removed:
portal/trunk/component/common/src/main/java/org/exoplatform/commons/utils/UndeclaredIOException.java
Modified:
portal/trunk/component/common/src/main/java/org/exoplatform/commons/utils/IOFailureFlow.java
portal/trunk/component/common/src/main/java/org/exoplatform/commons/utils/OutputStreamPrinter.java
portal/trunk/component/common/src/test/java/org/exoplatform/commons/utils/TestOutputStreamPrinter.java
portal/trunk/component/scripting/src/main/java/org/exoplatform/groovyscript/TemplateParser.java
Log:
remove UndeclaredIOException that exists in gatein common
Modified: portal/trunk/component/common/src/main/java/org/exoplatform/commons/utils/IOFailureFlow.java
===================================================================
--- portal/trunk/component/common/src/main/java/org/exoplatform/commons/utils/IOFailureFlow.java 2010-02-08 13:54:36 UTC (rev 1554)
+++ portal/trunk/component/common/src/main/java/org/exoplatform/commons/utils/IOFailureFlow.java 2010-02-08 14:17:15 UTC (rev 1555)
@@ -39,7 +39,7 @@
IGNORE,
/**
- * Wraps and rethrows the exception with an instance of {@link org.exoplatform.commons.utils.UndeclaredIOException}.
+ * Wraps and rethrows the exception with an instance of {@link org.gatein.common.io.UndeclaredIOException}.
*/
THROW_UNDECLARED
Modified: portal/trunk/component/common/src/main/java/org/exoplatform/commons/utils/OutputStreamPrinter.java
===================================================================
--- portal/trunk/component/common/src/main/java/org/exoplatform/commons/utils/OutputStreamPrinter.java 2010-02-08 13:54:36 UTC (rev 1554)
+++ portal/trunk/component/common/src/main/java/org/exoplatform/commons/utils/OutputStreamPrinter.java 2010-02-08 14:17:15 UTC (rev 1555)
@@ -19,6 +19,8 @@
package org.exoplatform.commons.utils;
+import org.gatein.common.io.UndeclaredIOException;
+
import java.io.IOException;
import java.io.OutputStream;
import java.nio.charset.Charset;
@@ -38,7 +40,7 @@
* <li>The {@link IOFailureFlow#IGNORE} value ignores the exception.</li>
* <li>The {@link IOFailureFlow#RETHROW} value rethrows the exception.</li>
* <li>The {@link IOFailureFlow#THROW_UNDECLARED} value throws instead a
- * {@link org.exoplatform.commons.utils.UndeclaredIOException} exception wrapping the original exception.</li>
+ * {@link UndeclaredIOException} exception wrapping the original exception.</li>
* </ul>
*
* </p>
Deleted: portal/trunk/component/common/src/main/java/org/exoplatform/commons/utils/UndeclaredIOException.java
===================================================================
--- portal/trunk/component/common/src/main/java/org/exoplatform/commons/utils/UndeclaredIOException.java 2010-02-08 13:54:36 UTC (rev 1554)
+++ portal/trunk/component/common/src/main/java/org/exoplatform/commons/utils/UndeclaredIOException.java 2010-02-08 14:17:15 UTC (rev 1555)
@@ -1,50 +0,0 @@
-/**
- * Copyright (C) 2009 eXo Platform SAS.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.exoplatform.commons.utils;
-
-/**
- * Denotes an i/o exception that should not be handled as such but should be handled in a different way
- * by the control flow of the system.
- *
- * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
- * @version $Revision$
- */
-public class UndeclaredIOException extends RuntimeException
-{
-
- public UndeclaredIOException()
- {
- }
-
- public UndeclaredIOException(String message)
- {
- super(message);
- }
-
- public UndeclaredIOException(String message, Throwable cause)
- {
- super(message, cause);
- }
-
- public UndeclaredIOException(Throwable cause)
- {
- super(cause);
- }
-}
Modified: portal/trunk/component/common/src/test/java/org/exoplatform/commons/utils/TestOutputStreamPrinter.java
===================================================================
--- portal/trunk/component/common/src/test/java/org/exoplatform/commons/utils/TestOutputStreamPrinter.java 2010-02-08 13:54:36 UTC (rev 1554)
+++ portal/trunk/component/common/src/test/java/org/exoplatform/commons/utils/TestOutputStreamPrinter.java 2010-02-08 14:17:15 UTC (rev 1555)
@@ -21,6 +21,7 @@
import junit.framework.Assert;
import junit.framework.TestCase;
+import org.gatein.common.io.UndeclaredIOException;
import java.io.IOException;
import java.io.OutputStream;
Modified: portal/trunk/component/scripting/src/main/java/org/exoplatform/groovyscript/TemplateParser.java
===================================================================
--- portal/trunk/component/scripting/src/main/java/org/exoplatform/groovyscript/TemplateParser.java 2010-02-08 13:54:36 UTC (rev 1554)
+++ portal/trunk/component/scripting/src/main/java/org/exoplatform/groovyscript/TemplateParser.java 2010-02-08 14:17:15 UTC (rev 1555)
@@ -18,7 +18,7 @@
*/
package org.exoplatform.groovyscript;
-import org.exoplatform.commons.utils.UndeclaredIOException;
+import org.gatein.common.io.UndeclaredIOException;
import java.io.IOException;
import java.io.PushbackReader;
16 years, 2 months
- 1
- 0
gatein SVN: r1554 - in portal/trunk: component/application-registry and 22 other directories.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2010-02-08 08:54:36 -0500 (Mon, 08 Feb 2010)
New Revision: 1554
Added:
portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/config.xml
portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/indexer-config.xml
portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/lock-config.xml
portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/udp-mux.xml
portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/local/config.xml
portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/local/lock-config.xml
portal/trunk/component/portal/src/main/java/org/exoplatform/portal/mop/
portal/trunk/component/portal/src/main/java/org/exoplatform/portal/mop/ProtectedResource.java
portal/trunk/component/test/jcr/src/main/resources/conf/exo.portal.component.test.jcr-jbosscache-lock-config.xml
portal/trunk/component/web/src/main/java/org/exoplatform/web/application/javascript/Javascript.java
Removed:
portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/config-portal-system.xml
portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/config-portal-work.xml
portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/config-system.xml
portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/config-wsrp-system.xml
portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/indexer-config-portal-system.xml
portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/indexer-config-portal-work.xml
portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/indexer-config-system.xml
portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/indexer-config-wsrp-system.xml
portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/lock-config-portal-system.xml
portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/lock-config-portal-work.xml
portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/lock-config-system.xml
portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/lock-config-wsrp-system.xml
portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/local/config-portal-system.xml
portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/local/config-portal-work.xml
portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/local/config-system.xml
portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/local/config-wsrp-system.xml
portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/local/lock-config-portal-system.xml
portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/local/lock-config-portal-work.xml
portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/local/lock-config-system.xml
portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/local/lock-config-wsrp-system.xml
portal/trunk/component/test/jcr/src/main/resources/conf/exo.portal.component.test.jcr-jbosscache-lock-config-portal-test.xml
portal/trunk/component/test/jcr/src/main/resources/conf/exo.portal.component.test.jcr-jbosscache-lock-config-system.xml
portal/trunk/component/web/src/main/java/org/exoplatform/web/application/javascript/JavascriptDependentManager.java
Modified:
portal/trunk/component/application-registry/pom.xml
portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/LocalImporter.java
portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/GadgetDefinition.java
portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/GadgetRegistryServiceImpl.java
portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/LocalGadgetData.java
portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/SourceStorageImpl.java
portal/trunk/component/application-registry/src/test/java/conf/exo.portal.component.application-registry-configuration.xml
portal/trunk/component/common/src/main/java/conf/configuration-jboss.properties
portal/trunk/component/common/src/main/java/conf/configuration-tomcat.properties
portal/trunk/component/common/src/main/java/org/exoplatform/commons/chromattic/ChromatticLifeCycle.java
portal/trunk/component/portal/src/main/java/conf/content-nodetypes.xml
portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/POMSession.java
portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/MappedAttributes.java
portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/Mapper.java
portal/trunk/component/portal/src/test/java/conf/exo.portal.component.portal-configuration1.xml
portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestSavedPOM.java
portal/trunk/component/test/core/src/main/resources/conf/portal-configuration.xml
portal/trunk/component/test/jcr/src/main/resources/conf/exo.portal.component.test.jcr-repository-configuration.xml
portal/trunk/component/web/src/main/java/org/exoplatform/web/application/javascript/JavascriptConfigParser.java
portal/trunk/component/web/src/main/java/org/exoplatform/web/application/javascript/JavascriptConfigService.java
portal/trunk/component/web/src/main/java/org/exoplatform/web/application/javascript/JavascriptKey.java
portal/trunk/component/web/src/main/java/org/exoplatform/web/application/javascript/JavascriptRemoval.java
portal/trunk/component/web/src/main/java/org/exoplatform/web/application/javascript/JavascriptTask.java
portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/JCRPersister.java
portal/trunk/packaging/module/src/main/javascript/portal.packaging.module.js
portal/trunk/pom.xml
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/portal/application-registry-configuration.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal-configuration.xml
Log:
- GTNPORTAL-604 : Thirdparty and component integration
- rework the skin deployer to be less error prone
Modified: portal/trunk/component/application-registry/pom.xml
===================================================================
--- portal/trunk/component/application-registry/pom.xml 2010-02-08 10:32:10 UTC (rev 1553)
+++ portal/trunk/component/application-registry/pom.xml 2010-02-08 13:54:36 UTC (rev 1554)
@@ -50,7 +50,7 @@
<dependency>
<groupId>org.chromattic</groupId>
- <artifactId>chromattic.ntdef</artifactId>
+ <artifactId>chromattic.ext</artifactId>
</dependency>
<dependency>
Modified: portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/LocalImporter.java
===================================================================
--- portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/LocalImporter.java 2010-02-08 10:32:10 UTC (rev 1553)
+++ portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/LocalImporter.java 2010-02-08 13:54:36 UTC (rev 1554)
@@ -22,8 +22,8 @@
import org.apache.shindig.common.uri.Uri;
import org.apache.shindig.gadgets.spec.GadgetSpec;
import org.apache.shindig.gadgets.spec.ModulePrefs;
-import org.chromattic.ntdef.NTFolder;
-import org.chromattic.ntdef.Resource;
+import org.chromattic.ext.ntdef.NTFolder;
+import org.chromattic.ext.ntdef.Resource;
import org.exoplatform.application.gadget.impl.GadgetDefinition;
import org.exoplatform.application.gadget.impl.GadgetRegistry;
import org.exoplatform.application.gadget.impl.LocalGadgetData;
Modified: portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/GadgetDefinition.java
===================================================================
--- portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/GadgetDefinition.java 2010-02-08 10:32:10 UTC (rev 1553)
+++ portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/GadgetDefinition.java 2010-02-08 13:54:36 UTC (rev 1554)
@@ -25,7 +25,7 @@
import org.chromattic.api.annotations.OneToOne;
import org.chromattic.api.annotations.PrimaryType;
import org.chromattic.api.annotations.Property;
-import org.chromattic.ntdef.NTFolder;
+import org.chromattic.ext.ntdef.NTFolder;
/**
* @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
Modified: portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/GadgetRegistryServiceImpl.java
===================================================================
--- portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/GadgetRegistryServiceImpl.java 2010-02-08 10:32:10 UTC (rev 1553)
+++ portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/GadgetRegistryServiceImpl.java 2010-02-08 13:54:36 UTC (rev 1554)
@@ -20,8 +20,7 @@
import org.chromattic.api.Chromattic;
import org.chromattic.api.ChromatticSession;
-import org.chromattic.ntdef.NTFile;
-import org.chromattic.ntdef.Resource;
+import org.chromattic.ext.ntdef.Resource;
import org.exoplatform.application.gadget.Gadget;
import org.exoplatform.application.gadget.GadgetRegistryService;
import org.exoplatform.application.registry.impl.ApplicationRegistryChromatticLifeCycle;
Modified: portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/LocalGadgetData.java
===================================================================
--- portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/LocalGadgetData.java 2010-02-08 10:32:10 UTC (rev 1553)
+++ portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/LocalGadgetData.java 2010-02-08 13:54:36 UTC (rev 1554)
@@ -27,11 +27,11 @@
import org.chromattic.api.annotations.OneToOne;
import org.chromattic.api.annotations.PrimaryType;
import org.chromattic.api.annotations.Property;
-import org.chromattic.ntdef.NTFile;
-import org.chromattic.ntdef.Resource;
+import org.chromattic.ext.ntdef.NTFile;
+import org.chromattic.ext.ntdef.Resource;
+import org.chromattic.ext.ntdef.NTFolder;
import org.exoplatform.application.gadget.EncodingDetector;
-import org.chromattic.ntdef.NTFolder;
import java.io.ByteArrayInputStream;
import java.util.Date;
Modified: portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/SourceStorageImpl.java
===================================================================
--- portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/SourceStorageImpl.java 2010-02-08 10:32:10 UTC (rev 1553)
+++ portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/SourceStorageImpl.java 2010-02-08 13:54:36 UTC (rev 1554)
@@ -21,7 +21,7 @@
import org.apache.shindig.common.uri.Uri;
import org.apache.shindig.gadgets.spec.GadgetSpec;
import org.apache.shindig.gadgets.spec.ModulePrefs;
-import org.chromattic.ntdef.Resource;
+import org.chromattic.ext.ntdef.Resource;
import org.exoplatform.application.gadget.Gadget;
import org.exoplatform.application.gadget.GadgetRegistryService;
import org.exoplatform.application.gadget.Source;
Modified: portal/trunk/component/application-registry/src/test/java/conf/exo.portal.component.application-registry-configuration.xml
===================================================================
--- portal/trunk/component/application-registry/src/test/java/conf/exo.portal.component.application-registry-configuration.xml 2010-02-08 10:32:10 UTC (rev 1553)
+++ portal/trunk/component/application-registry/src/test/java/conf/exo.portal.component.application-registry-configuration.xml 2010-02-08 13:54:36 UTC (rev 1554)
@@ -245,9 +245,9 @@
<value>org.exoplatform.application.gadget.impl.GadgetDefinition</value>
<value>org.exoplatform.application.gadget.impl.LocalGadgetData</value>
<value>org.exoplatform.application.gadget.impl.RemoteGadgetData</value>
- <value>org.chromattic.ntdef.NTFile</value>
- <value>org.chromattic.ntdef.NTFolder</value>
- <value>org.chromattic.ntdef.NTResource</value>
+ <value>org.chromattic.ext.ntdef.NTFile</value>
+ <value>org.chromattic.ext.ntdef.NTFolder</value>
+ <value>org.chromattic.ext.ntdef.NTResource</value>
</values-param>
</init-params>
</component-plugin>
Modified: portal/trunk/component/common/src/main/java/conf/configuration-jboss.properties
===================================================================
--- portal/trunk/component/common/src/main/java/conf/configuration-jboss.properties 2010-02-08 10:32:10 UTC (rev 1553)
+++ portal/trunk/component/common/src/main/java/conf/configuration-jboss.properties 2010-02-08 13:54:36 UTC (rev 1554)
@@ -29,9 +29,16 @@
gatein.db.data.dir=${gatein.data.dir}/db
# JCR
+gatein.jcr.config.type=local
+gatein.jcr.datasource.name=${gatein.datasource.name}
gatein.jcr.data.dir=${gatein.data.dir}/jcr
gatein.jcr.storage.data.dir=${gatein.jcr.data.dir}/values
gatein.jcr.index.data.dir=${gatein.jcr.data.dir}/jcrlucenedb
+gatein.jcr.index.changefilterclass=org.exoplatform.services.jcr.impl.core.query.DefaultChangesFilter
-gatein.jcr.changefilterclass=org.exoplatform.services.jcr.impl.core.query.DefaultChangesFilter
-gatein.jcr.config.type=local
\ No newline at end of file
+#IDM
+gatein.idm.datasource.name=${gatein.datasource.name}
+
+# temporary here, need to remove it
+jbosscache-cl-cache.jdbc.node.type=OBJECT
+
Modified: portal/trunk/component/common/src/main/java/conf/configuration-tomcat.properties
===================================================================
--- portal/trunk/component/common/src/main/java/conf/configuration-tomcat.properties 2010-02-08 10:32:10 UTC (rev 1553)
+++ portal/trunk/component/common/src/main/java/conf/configuration-tomcat.properties 2010-02-08 13:54:36 UTC (rev 1554)
@@ -29,9 +29,16 @@
gatein.db.data.dir=${gatein.data.dir}/db
# JCR
+gatein.jcr.config.type=local
+gatein.jcr.datasource.name=${gatein.datasource.name}
gatein.jcr.data.dir=${gatein.data.dir}/jcr
gatein.jcr.storage.data.dir=${gatein.jcr.data.dir}/values
gatein.jcr.index.data.dir=${gatein.jcr.data.dir}/jcrlucenedb
+gatein.jcr.index.changefilterclass=org.exoplatform.services.jcr.impl.core.query.DefaultChangesFilter
-gatein.jcr.changefilterclass=org.exoplatform.services.jcr.impl.core.query.DefaultChangesFilter
-gatein.jcr.config.type=local
\ No newline at end of file
+#IDM
+gatein.idm.datasource.name=${gatein.datasource.name}
+
+# temporary here, need to remove it
+jbosscache-cl-cache.jdbc.node.type=OBJECT
+
Deleted: portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/config-portal-system.xml
===================================================================
--- portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/config-portal-system.xml 2010-02-08 10:32:10 UTC (rev 1553)
+++ portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/config-portal-system.xml 2010-02-08 13:54:36 UTC (rev 1554)
@@ -1,105 +0,0 @@
-<!--
- ~ Copyright (C) 2009 eXo Platform SAS.
- ~
- ~ This is free software; you can redistribute it and/or modify it
- ~ under the terms of the GNU Lesser General Public License as
- ~ published by the Free Software Foundation; either version 2.1 of
- ~ the License, or (at your option) any later version.
- ~
- ~ This software is distributed in the hope that it will be useful,
- ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
- ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- ~ Lesser General Public License for more details.
- ~
- ~ You should have received a copy of the GNU Lesser General Public
- ~ License along with this software; if not, write to the Free
- ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- -->
-<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="urn:jboss:jbosscache-core:config:3.1">
-
- <locking useLockStriping="false" concurrencyLevel="50000" lockParentForChildInsertRemove="false" lockAcquisitionTimeout="20000" />
-
- <clustering mode="replication" clusterName="JBoss-Cache-Cluster_portal_system">
- <!--
- Fetch in memory state is enable, because second cluster-node
- currently doesn't work properly on clear cache
- -->
- <stateRetrieval timeout="20000" fetchInMemoryState="false" nonBlocking="true"/>
- <!--
- This JGroups configuration is taken from JBC branch, but
- "enable_bundling" is set to false, because of notice, that appeared
- during running
- multiplexerStack="fc-fast-minimalthreads"
- -->
- <jgroupsConfig>
- <!--
- UDP discard_incompatible_packets="true" enable_bundling="false"
- enable_diagnostics="false" ip_ttl="2" loopback="false"
- max_bundle_size="64000" max_bundle_timeout="30"
- mcast_addr="228.10.10.10" mcast_port="45588"
- mcast_recv_buf_size="25000000" mcast_send_buf_size="640000"
- oob_thread_pool.enabled="true"
- oob_thread_pool.keep_alive_time="10000"
- oob_thread_pool.max_threads="4" oob_thread_pool.min_threads="1"
- oob_thread_pool.queue_enabled="true"
- oob_thread_pool.queue_max_size="10"
- oob_thread_pool.rejection_policy="Run" thread_naming_pattern="pl"
- thread_pool.enabled="true" thread_pool.keep_alive_time="30000"
- thread_pool.max_threads="25" thread_pool.min_threads="1"
- thread_pool.queue_enabled="true" thread_pool.queue_max_size="10"
- thread_pool.rejection_policy="Run" tos="8"
- ucast_recv_buf_size="20000000" ucast_send_buf_size="640000"
- use_concurrent_stack="true" use_incoming_packet_handler="true" />
- <PING num_initial_members="3" timeout="2000" /
- -->
-
- <TCP bind_addr="127.0.0.1" start_port="9600" 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" use_concurrent_stack="true"
- thread_pool.enabled="true" thread_pool.min_threads="1"
- thread_pool.max_threads="25" thread_pool.keep_alive_time="5000"
- thread_pool.queue_enabled="false" thread_pool.queue_max_size="100"
- thread_pool.rejection_policy="run" 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" />
- <MPING timeout="2000" num_initial_members="2" mcast_port="34521"
- bind_addr="127.0.0.1" mcast_addr="224.0.0.1" />
-
-
- <MERGE2 max_interval="30000" min_interval="10000" />
- <FD_SOCK />
- <FD max_tries="5" shun="true" timeout="10000" />
- <VERIFY_SUSPECT timeout="1500" />
- <pbcast.NAKACK discard_delivered_msgs="true" gc_lag="0"
- retransmit_timeout="300,600,1200,2400,4800" use_mcast_xmit="false" />
- <UNICAST timeout="300,600,1200,2400,3600" />
- <pbcast.STABLE desired_avg_gossip="50000" max_bytes="400000"
- stability_delay="1000" />
- <pbcast.GMS join_timeout="5000" print_local_addr="true"
- shun="false" view_ack_collection_timeout="5000" view_bundling="true" />
- <FRAG2 frag_size="60000" />
- <pbcast.STREAMING_STATE_TRANSFER />
- <pbcast.FLUSH timeout="0" />
-
- </jgroupsConfig>
-
- <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="10000" />
- <property name="timeToLive" value="120000" />
- </default>
- </eviction>
-</jbosscache>
\ No newline at end of file
Deleted: portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/config-portal-work.xml
===================================================================
--- portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/config-portal-work.xml 2010-02-08 10:32:10 UTC (rev 1553)
+++ portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/config-portal-work.xml 2010-02-08 13:54:36 UTC (rev 1554)
@@ -1,105 +0,0 @@
-<!--
- ~ Copyright (C) 2009 eXo Platform SAS.
- ~
- ~ This is free software; you can redistribute it and/or modify it
- ~ under the terms of the GNU Lesser General Public License as
- ~ published by the Free Software Foundation; either version 2.1 of
- ~ the License, or (at your option) any later version.
- ~
- ~ This software is distributed in the hope that it will be useful,
- ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
- ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- ~ Lesser General Public License for more details.
- ~
- ~ You should have received a copy of the GNU Lesser General Public
- ~ License along with this software; if not, write to the Free
- ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- -->
-<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="urn:jboss:jbosscache-core:config:3.1">
-
- <locking useLockStriping="false" concurrencyLevel="50000" lockParentForChildInsertRemove="false" lockAcquisitionTimeout="20000" />
-
- <clustering mode="replication" clusterName="JBoss-Cache-Cluster_portal_work">
- <!--
- Fetch in memory state is enable, because second cluster-node
- currently doesn't work properly on clear cache
- -->
- <stateRetrieval timeout="20000" fetchInMemoryState="false" nonBlocking="true"/>
- <!--
- This JGroups configuration is taken from JBC branch, but
- "enable_bundling" is set to false, because of notice, that appeared
- during running
- multiplexerStack="fc-fast-minimalthreads"
- -->
- <jgroupsConfig>
- <!--
- UDP discard_incompatible_packets="true" enable_bundling="false"
- enable_diagnostics="false" ip_ttl="2" loopback="false"
- max_bundle_size="64000" max_bundle_timeout="30"
- mcast_addr="228.10.10.10" mcast_port="45588"
- mcast_recv_buf_size="25000000" mcast_send_buf_size="640000"
- oob_thread_pool.enabled="true"
- oob_thread_pool.keep_alive_time="10000"
- oob_thread_pool.max_threads="4" oob_thread_pool.min_threads="1"
- oob_thread_pool.queue_enabled="true"
- oob_thread_pool.queue_max_size="10"
- oob_thread_pool.rejection_policy="Run" thread_naming_pattern="pl"
- thread_pool.enabled="true" thread_pool.keep_alive_time="30000"
- thread_pool.max_threads="25" thread_pool.min_threads="1"
- thread_pool.queue_enabled="true" thread_pool.queue_max_size="10"
- thread_pool.rejection_policy="Run" tos="8"
- ucast_recv_buf_size="20000000" ucast_send_buf_size="640000"
- use_concurrent_stack="true" use_incoming_packet_handler="true" />
- <PING num_initial_members="3" timeout="2000" /
- -->
-
- <TCP bind_addr="127.0.0.1" start_port="9600" 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" use_concurrent_stack="true"
- thread_pool.enabled="true" thread_pool.min_threads="1"
- thread_pool.max_threads="25" thread_pool.keep_alive_time="5000"
- thread_pool.queue_enabled="false" thread_pool.queue_max_size="100"
- thread_pool.rejection_policy="run" 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" />
- <MPING timeout="2000" num_initial_members="2" mcast_port="34521"
- bind_addr="127.0.0.1" mcast_addr="224.0.0.1" />
-
-
- <MERGE2 max_interval="30000" min_interval="10000" />
- <FD_SOCK />
- <FD max_tries="5" shun="true" timeout="10000" />
- <VERIFY_SUSPECT timeout="1500" />
- <pbcast.NAKACK discard_delivered_msgs="true" gc_lag="0"
- retransmit_timeout="300,600,1200,2400,4800" use_mcast_xmit="false" />
- <UNICAST timeout="300,600,1200,2400,3600" />
- <pbcast.STABLE desired_avg_gossip="50000" max_bytes="400000"
- stability_delay="1000" />
- <pbcast.GMS join_timeout="5000" print_local_addr="true"
- shun="false" view_ack_collection_timeout="5000" view_bundling="true" />
- <FRAG2 frag_size="60000" />
- <pbcast.STREAMING_STATE_TRANSFER />
- <pbcast.FLUSH timeout="0" />
-
- </jgroupsConfig>
-
- <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="10000" />
- <property name="timeToLive" value="120000" />
- </default>
- </eviction>
-</jbosscache>
\ No newline at end of file
Deleted: portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/config-system.xml
===================================================================
--- portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/config-system.xml 2010-02-08 10:32:10 UTC (rev 1553)
+++ portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/config-system.xml 2010-02-08 13:54:36 UTC (rev 1554)
@@ -1,105 +0,0 @@
-<!--
- ~ Copyright (C) 2009 eXo Platform SAS.
- ~
- ~ This is free software; you can redistribute it and/or modify it
- ~ under the terms of the GNU Lesser General Public License as
- ~ published by the Free Software Foundation; either version 2.1 of
- ~ the License, or (at your option) any later version.
- ~
- ~ This software is distributed in the hope that it will be useful,
- ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
- ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- ~ Lesser General Public License for more details.
- ~
- ~ You should have received a copy of the GNU Lesser General Public
- ~ License along with this software; if not, write to the Free
- ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- -->
-<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="urn:jboss:jbosscache-core:config:3.1">
-
- <locking useLockStriping="false" concurrencyLevel="50000" lockParentForChildInsertRemove="false" lockAcquisitionTimeout="20000" />
-
- <clustering mode="replication" clusterName="JBoss-Cache-Cluster_system">
- <!--
- Fetch in memory state is enable, because second cluster-node
- currently doesn't work properly on clear cache
- -->
- <stateRetrieval timeout="20000" fetchInMemoryState="false" nonBlocking="true"/>
- <!--
- This JGroups configuration is taken from JBC branch, but
- "enable_bundling" is set to false, because of notice, that appeared
- during running
- multiplexerStack="fc-fast-minimalthreads"
- -->
- <jgroupsConfig>
- <!--
- UDP discard_incompatible_packets="true" enable_bundling="false"
- enable_diagnostics="false" ip_ttl="2" loopback="false"
- max_bundle_size="64000" max_bundle_timeout="30"
- mcast_addr="228.10.10.10" mcast_port="45588"
- mcast_recv_buf_size="25000000" mcast_send_buf_size="640000"
- oob_thread_pool.enabled="true"
- oob_thread_pool.keep_alive_time="10000"
- oob_thread_pool.max_threads="4" oob_thread_pool.min_threads="1"
- oob_thread_pool.queue_enabled="true"
- oob_thread_pool.queue_max_size="10"
- oob_thread_pool.rejection_policy="Run" thread_naming_pattern="pl"
- thread_pool.enabled="true" thread_pool.keep_alive_time="30000"
- thread_pool.max_threads="25" thread_pool.min_threads="1"
- thread_pool.queue_enabled="true" thread_pool.queue_max_size="10"
- thread_pool.rejection_policy="Run" tos="8"
- ucast_recv_buf_size="20000000" ucast_send_buf_size="640000"
- use_concurrent_stack="true" use_incoming_packet_handler="true" />
- <PING num_initial_members="3" timeout="2000" /
- -->
-
- <TCP bind_addr="127.0.0.1" start_port="9600" 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" use_concurrent_stack="true"
- thread_pool.enabled="true" thread_pool.min_threads="1"
- thread_pool.max_threads="25" thread_pool.keep_alive_time="5000"
- thread_pool.queue_enabled="false" thread_pool.queue_max_size="100"
- thread_pool.rejection_policy="run" 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" />
- <MPING timeout="2000" num_initial_members="2" mcast_port="34521"
- bind_addr="127.0.0.1" mcast_addr="224.0.0.1" />
-
-
- <MERGE2 max_interval="30000" min_interval="10000" />
- <FD_SOCK />
- <FD max_tries="5" shun="true" timeout="10000" />
- <VERIFY_SUSPECT timeout="1500" />
- <pbcast.NAKACK discard_delivered_msgs="true" gc_lag="0"
- retransmit_timeout="300,600,1200,2400,4800" use_mcast_xmit="false" />
- <UNICAST timeout="300,600,1200,2400,3600" />
- <pbcast.STABLE desired_avg_gossip="50000" max_bytes="400000"
- stability_delay="1000" />
- <pbcast.GMS join_timeout="5000" print_local_addr="true"
- shun="false" view_ack_collection_timeout="5000" view_bundling="true" />
- <FRAG2 frag_size="60000" />
- <pbcast.STREAMING_STATE_TRANSFER />
- <pbcast.FLUSH timeout="0" />
-
- </jgroupsConfig>
-
- <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="10000" />
- <property name="timeToLive" value="120000" />
- </default>
- </eviction>
-</jbosscache>
\ No newline at end of file
Deleted: portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/config-wsrp-system.xml
===================================================================
--- portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/config-wsrp-system.xml 2010-02-08 10:32:10 UTC (rev 1553)
+++ portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/config-wsrp-system.xml 2010-02-08 13:54:36 UTC (rev 1554)
@@ -1,105 +0,0 @@
-<!--
- ~ Copyright (C) 2009 eXo Platform SAS.
- ~
- ~ This is free software; you can redistribute it and/or modify it
- ~ under the terms of the GNU Lesser General Public License as
- ~ published by the Free Software Foundation; either version 2.1 of
- ~ the License, or (at your option) any later version.
- ~
- ~ This software is distributed in the hope that it will be useful,
- ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
- ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- ~ Lesser General Public License for more details.
- ~
- ~ You should have received a copy of the GNU Lesser General Public
- ~ License along with this software; if not, write to the Free
- ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- -->
-<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="urn:jboss:jbosscache-core:config:3.1">
-
- <locking useLockStriping="false" concurrencyLevel="50000" lockParentForChildInsertRemove="false" lockAcquisitionTimeout="20000" />
-
- <clustering mode="replication" clusterName="JBoss-Cache-Cluster_wsrp_system">
- <!--
- Fetch in memory state is enable, because second cluster-node
- currently doesn't work properly on clear cache
- -->
- <stateRetrieval timeout="20000" fetchInMemoryState="false" nonBlocking="true"/>
- <!--
- This JGroups configuration is taken from JBC branch, but
- "enable_bundling" is set to false, because of notice, that appeared
- during running
- multiplexerStack="fc-fast-minimalthreads"
- -->
- <jgroupsConfig>
- <!--
- UDP discard_incompatible_packets="true" enable_bundling="false"
- enable_diagnostics="false" ip_ttl="2" loopback="false"
- max_bundle_size="64000" max_bundle_timeout="30"
- mcast_addr="228.10.10.10" mcast_port="45588"
- mcast_recv_buf_size="25000000" mcast_send_buf_size="640000"
- oob_thread_pool.enabled="true"
- oob_thread_pool.keep_alive_time="10000"
- oob_thread_pool.max_threads="4" oob_thread_pool.min_threads="1"
- oob_thread_pool.queue_enabled="true"
- oob_thread_pool.queue_max_size="10"
- oob_thread_pool.rejection_policy="Run" thread_naming_pattern="pl"
- thread_pool.enabled="true" thread_pool.keep_alive_time="30000"
- thread_pool.max_threads="25" thread_pool.min_threads="1"
- thread_pool.queue_enabled="true" thread_pool.queue_max_size="10"
- thread_pool.rejection_policy="Run" tos="8"
- ucast_recv_buf_size="20000000" ucast_send_buf_size="640000"
- use_concurrent_stack="true" use_incoming_packet_handler="true" />
- <PING num_initial_members="3" timeout="2000" /
- -->
-
- <TCP bind_addr="127.0.0.1" start_port="9600" 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" use_concurrent_stack="true"
- thread_pool.enabled="true" thread_pool.min_threads="1"
- thread_pool.max_threads="25" thread_pool.keep_alive_time="5000"
- thread_pool.queue_enabled="false" thread_pool.queue_max_size="100"
- thread_pool.rejection_policy="run" 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" />
- <MPING timeout="2000" num_initial_members="2" mcast_port="34521"
- bind_addr="127.0.0.1" mcast_addr="224.0.0.1" />
-
-
- <MERGE2 max_interval="30000" min_interval="10000" />
- <FD_SOCK />
- <FD max_tries="5" shun="true" timeout="10000" />
- <VERIFY_SUSPECT timeout="1500" />
- <pbcast.NAKACK discard_delivered_msgs="true" gc_lag="0"
- retransmit_timeout="300,600,1200,2400,4800" use_mcast_xmit="false" />
- <UNICAST timeout="300,600,1200,2400,3600" />
- <pbcast.STABLE desired_avg_gossip="50000" max_bytes="400000"
- stability_delay="1000" />
- <pbcast.GMS join_timeout="5000" print_local_addr="true"
- shun="false" view_ack_collection_timeout="5000" view_bundling="true" />
- <FRAG2 frag_size="60000" />
- <pbcast.STREAMING_STATE_TRANSFER />
- <pbcast.FLUSH timeout="0" />
-
- </jgroupsConfig>
-
- <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="10000" />
- <property name="timeToLive" value="120000" />
- </default>
- </eviction>
-</jbosscache>
\ No newline at end of file
Added: portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/config.xml
===================================================================
--- portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/config.xml (rev 0)
+++ portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/config.xml 2010-02-08 13:54:36 UTC (rev 1554)
@@ -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="50000" lockParentForChildInsertRemove="false"
+ lockAcquisitionTimeout="20000" />
+
+ <clustering mode="replication" clusterName="${jbosscache-cluster-name}">
+ <stateRetrieval timeout="20000" fetchInMemoryState="false" />
+ <jgroupsConfig multiplexerStack="jcr.stack" />
+ <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="1000000" />
+ <property name="timeToLive" value="120000" />
+ </default>
+ </eviction>
+</jbosscache>
\ No newline at end of file
Deleted: portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/indexer-config-portal-system.xml
===================================================================
--- portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/indexer-config-portal-system.xml 2010-02-08 10:32:10 UTC (rev 1553)
+++ portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/indexer-config-portal-system.xml 2010-02-08 13:54:36 UTC (rev 1554)
@@ -1,76 +0,0 @@
-<!--
- ~ Copyright (C) 2009 eXo Platform SAS.
- ~
- ~ This is free software; you can redistribute it and/or modify it
- ~ under the terms of the GNU Lesser General Public License as
- ~ published by the Free Software Foundation; either version 2.1 of
- ~ the License, or (at your option) any later version.
- ~
- ~ This software is distributed in the hope that it will be useful,
- ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
- ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- ~ Lesser General Public License for more details.
- ~
- ~ You should have received a copy of the GNU Lesser General Public
- ~ License along with this software; if not, write to the Free
- ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- -->
-<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="urn:jboss:jbosscache-core:config:3.1">
-
- <locking useLockStriping="false" concurrencyLevel="50000" lockParentForChildInsertRemove="false" lockAcquisitionTimeout="20000" />
- <!-- Configure the TransactionManager -->
- <transaction
- transactionManagerLookupClass="org.jboss.cache.transaction.JBossStandaloneJTAManagerLookup" />
-
- <clustering mode="replication" clusterName="JBoss-Cache-Indexer-Cluster_portal_system">
- <stateRetrieval timeout="20000" fetchInMemoryState="false" nonBlocking="true"/>
- <jgroupsConfig>
- <TCP bind_addr="127.0.0.1" start_port="9700" 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" use_concurrent_stack="true"
- thread_pool.enabled="true" thread_pool.min_threads="1"
- thread_pool.max_threads="25" thread_pool.keep_alive_time="5000"
- thread_pool.queue_enabled="false" thread_pool.queue_max_size="100"
- thread_pool.rejection_policy="run" 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" />
- <MPING timeout="2000" num_initial_members="2" mcast_port="34530"
- bind_addr="127.0.0.1" mcast_addr="224.0.0.1" />
-
-
- <MERGE2 max_interval="30000" min_interval="10000" />
- <FD_SOCK />
- <FD max_tries="5" shun="true" timeout="10000" />
- <VERIFY_SUSPECT timeout="1500" />
- <pbcast.NAKACK discard_delivered_msgs="true" gc_lag="0"
- retransmit_timeout="300,600,1200,2400,4800" use_mcast_xmit="false" />
- <UNICAST timeout="300,600,1200,2400,3600" />
- <pbcast.STABLE desired_avg_gossip="50000" max_bytes="400000"
- stability_delay="1000" />
- <pbcast.GMS join_timeout="5000" print_local_addr="true"
- shun="false" view_ack_collection_timeout="5000" view_bundling="true" />
- <FRAG2 frag_size="60000" />
- <pbcast.STREAMING_STATE_TRANSFER />
- <pbcast.FLUSH timeout="0" />
-
- </jgroupsConfig>
-
- <sync />
- </clustering>
- <!-- Eviction configuration -->
- <eviction wakeUpInterval="5000">
- <default algorithmClass="org.jboss.cache.eviction.FIFOAlgorithm" eventQueueSize="1000000">
- <property name="maxNodes" value="10000" />
- <property name="minTimeToLive" value="60000" />
- </default>
- </eviction>
-
-</jbosscache>
\ No newline at end of file
Deleted: portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/indexer-config-portal-work.xml
===================================================================
--- portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/indexer-config-portal-work.xml 2010-02-08 10:32:10 UTC (rev 1553)
+++ portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/indexer-config-portal-work.xml 2010-02-08 13:54:36 UTC (rev 1554)
@@ -1,76 +0,0 @@
-<!--
- ~ Copyright (C) 2009 eXo Platform SAS.
- ~
- ~ This is free software; you can redistribute it and/or modify it
- ~ under the terms of the GNU Lesser General Public License as
- ~ published by the Free Software Foundation; either version 2.1 of
- ~ the License, or (at your option) any later version.
- ~
- ~ This software is distributed in the hope that it will be useful,
- ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
- ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- ~ Lesser General Public License for more details.
- ~
- ~ You should have received a copy of the GNU Lesser General Public
- ~ License along with this software; if not, write to the Free
- ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- -->
-<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="urn:jboss:jbosscache-core:config:3.1">
-
- <locking useLockStriping="false" concurrencyLevel="50000" lockParentForChildInsertRemove="false" lockAcquisitionTimeout="20000" />
- <!-- Configure the TransactionManager -->
- <transaction
- transactionManagerLookupClass="org.jboss.cache.transaction.JBossStandaloneJTAManagerLookup" />
-
- <clustering mode="replication" clusterName="JBoss-Cache-Indexer-Cluster_portal_work">
- <stateRetrieval timeout="20000" fetchInMemoryState="false" nonBlocking="true"/>
- <jgroupsConfig>
- <TCP bind_addr="127.0.0.1" start_port="9700" 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" use_concurrent_stack="true"
- thread_pool.enabled="true" thread_pool.min_threads="1"
- thread_pool.max_threads="25" thread_pool.keep_alive_time="5000"
- thread_pool.queue_enabled="false" thread_pool.queue_max_size="100"
- thread_pool.rejection_policy="run" 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" />
- <MPING timeout="2000" num_initial_members="2" mcast_port="34530"
- bind_addr="127.0.0.1" mcast_addr="224.0.0.1" />
-
-
- <MERGE2 max_interval="30000" min_interval="10000" />
- <FD_SOCK />
- <FD max_tries="5" shun="true" timeout="10000" />
- <VERIFY_SUSPECT timeout="1500" />
- <pbcast.NAKACK discard_delivered_msgs="true" gc_lag="0"
- retransmit_timeout="300,600,1200,2400,4800" use_mcast_xmit="false" />
- <UNICAST timeout="300,600,1200,2400,3600" />
- <pbcast.STABLE desired_avg_gossip="50000" max_bytes="400000"
- stability_delay="1000" />
- <pbcast.GMS join_timeout="5000" print_local_addr="true"
- shun="false" view_ack_collection_timeout="5000" view_bundling="true" />
- <FRAG2 frag_size="60000" />
- <pbcast.STREAMING_STATE_TRANSFER />
- <pbcast.FLUSH timeout="0" />
-
- </jgroupsConfig>
-
- <sync />
- </clustering>
- <!-- Eviction configuration -->
- <eviction wakeUpInterval="5000">
- <default algorithmClass="org.jboss.cache.eviction.FIFOAlgorithm" eventQueueSize="1000000">
- <property name="maxNodes" value="10000" />
- <property name="minTimeToLive" value="60000" />
- </default>
- </eviction>
-
-</jbosscache>
\ No newline at end of file
Deleted: portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/indexer-config-system.xml
===================================================================
--- portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/indexer-config-system.xml 2010-02-08 10:32:10 UTC (rev 1553)
+++ portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/indexer-config-system.xml 2010-02-08 13:54:36 UTC (rev 1554)
@@ -1,76 +0,0 @@
-<!--
- ~ Copyright (C) 2009 eXo Platform SAS.
- ~
- ~ This is free software; you can redistribute it and/or modify it
- ~ under the terms of the GNU Lesser General Public License as
- ~ published by the Free Software Foundation; either version 2.1 of
- ~ the License, or (at your option) any later version.
- ~
- ~ This software is distributed in the hope that it will be useful,
- ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
- ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- ~ Lesser General Public License for more details.
- ~
- ~ You should have received a copy of the GNU Lesser General Public
- ~ License along with this software; if not, write to the Free
- ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- -->
-<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="urn:jboss:jbosscache-core:config:3.1">
-
- <locking useLockStriping="false" concurrencyLevel="50000" lockParentForChildInsertRemove="false" lockAcquisitionTimeout="20000" />
- <!-- Configure the TransactionManager -->
- <transaction
- transactionManagerLookupClass="org.jboss.cache.transaction.JBossStandaloneJTAManagerLookup" />
-
- <clustering mode="replication" clusterName="JBoss-Cache-Indexer-Cluster_system">
- <stateRetrieval timeout="20000" fetchInMemoryState="false" nonBlocking="true"/>
- <jgroupsConfig>
- <TCP bind_addr="127.0.0.1" start_port="9700" 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" use_concurrent_stack="true"
- thread_pool.enabled="true" thread_pool.min_threads="1"
- thread_pool.max_threads="25" thread_pool.keep_alive_time="5000"
- thread_pool.queue_enabled="false" thread_pool.queue_max_size="100"
- thread_pool.rejection_policy="run" 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" />
- <MPING timeout="2000" num_initial_members="2" mcast_port="34530"
- bind_addr="127.0.0.1" mcast_addr="224.0.0.1" />
-
-
- <MERGE2 max_interval="30000" min_interval="10000" />
- <FD_SOCK />
- <FD max_tries="5" shun="true" timeout="10000" />
- <VERIFY_SUSPECT timeout="1500" />
- <pbcast.NAKACK discard_delivered_msgs="true" gc_lag="0"
- retransmit_timeout="300,600,1200,2400,4800" use_mcast_xmit="false" />
- <UNICAST timeout="300,600,1200,2400,3600" />
- <pbcast.STABLE desired_avg_gossip="50000" max_bytes="400000"
- stability_delay="1000" />
- <pbcast.GMS join_timeout="5000" print_local_addr="true"
- shun="false" view_ack_collection_timeout="5000" view_bundling="true" />
- <FRAG2 frag_size="60000" />
- <pbcast.STREAMING_STATE_TRANSFER />
- <pbcast.FLUSH timeout="0" />
-
- </jgroupsConfig>
-
- <sync />
- </clustering>
- <!-- Eviction configuration -->
- <eviction wakeUpInterval="5000">
- <default algorithmClass="org.jboss.cache.eviction.FIFOAlgorithm" eventQueueSize="1000000">
- <property name="maxNodes" value="10000" />
- <property name="minTimeToLive" value="60000" />
- </default>
- </eviction>
-
-</jbosscache>
\ No newline at end of file
Deleted: portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/indexer-config-wsrp-system.xml
===================================================================
--- portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/indexer-config-wsrp-system.xml 2010-02-08 10:32:10 UTC (rev 1553)
+++ portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/indexer-config-wsrp-system.xml 2010-02-08 13:54:36 UTC (rev 1554)
@@ -1,77 +0,0 @@
-<!--
- ~ Copyright (C) 2009 eXo Platform SAS.
- ~
- ~ This is free software; you can redistribute it and/or modify it
- ~ under the terms of the GNU Lesser General Public License as
- ~ published by the Free Software Foundation; either version 2.1 of
- ~ the License, or (at your option) any later version.
- ~
- ~ This software is distributed in the hope that it will be useful,
- ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
- ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- ~ Lesser General Public License for more details.
- ~
- ~ You should have received a copy of the GNU Lesser General Public
- ~ License along with this software; if not, write to the Free
- ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- -->
-
-<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="urn:jboss:jbosscache-core:config:3.1">
-
- <locking useLockStriping="false" concurrencyLevel="50000" lockParentForChildInsertRemove="false" lockAcquisitionTimeout="20000" />
- <!-- Configure the TransactionManager -->
- <transaction
- transactionManagerLookupClass="org.jboss.cache.transaction.JBossStandaloneJTAManagerLookup" />
-
- <clustering mode="replication" clusterName="JBoss-Cache-Indexer-Cluster_portal_system">
- <stateRetrieval timeout="20000" fetchInMemoryState="false" nonBlocking="true"/>
- <jgroupsConfig>
- <TCP bind_addr="127.0.0.1" start_port="9700" 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" use_concurrent_stack="true"
- thread_pool.enabled="true" thread_pool.min_threads="1"
- thread_pool.max_threads="25" thread_pool.keep_alive_time="5000"
- thread_pool.queue_enabled="false" thread_pool.queue_max_size="100"
- thread_pool.rejection_policy="run" 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" />
- <MPING timeout="2000" num_initial_members="2" mcast_port="34530"
- bind_addr="127.0.0.1" mcast_addr="224.0.0.1" />
-
-
- <MERGE2 max_interval="30000" min_interval="10000" />
- <FD_SOCK />
- <FD max_tries="5" shun="true" timeout="10000" />
- <VERIFY_SUSPECT timeout="1500" />
- <pbcast.NAKACK discard_delivered_msgs="true" gc_lag="0"
- retransmit_timeout="300,600,1200,2400,4800" use_mcast_xmit="false" />
- <UNICAST timeout="300,600,1200,2400,3600" />
- <pbcast.STABLE desired_avg_gossip="50000" max_bytes="400000"
- stability_delay="1000" />
- <pbcast.GMS join_timeout="5000" print_local_addr="true"
- shun="false" view_ack_collection_timeout="5000" view_bundling="true" />
- <FRAG2 frag_size="60000" />
- <pbcast.STREAMING_STATE_TRANSFER />
- <pbcast.FLUSH timeout="0" />
-
- </jgroupsConfig>
-
- <sync />
- </clustering>
- <!-- Eviction configuration -->
- <eviction wakeUpInterval="5000">
- <default algorithmClass="org.jboss.cache.eviction.FIFOAlgorithm" eventQueueSize="1000000">
- <property name="maxNodes" value="10000" />
- <property name="minTimeToLive" value="60000" />
- </default>
- </eviction>
-
-</jbosscache>
\ No newline at end of file
Added: portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/indexer-config.xml
===================================================================
--- portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/indexer-config.xml (rev 0)
+++ portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/indexer-config.xml 2010-02-08 13:54:36 UTC (rev 1554)
@@ -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="50000" lockParentForChildInsertRemove="false"
+ lockAcquisitionTimeout="20000" />
+
+ <!-- Configure the TransactionManager -->
+ <transaction transactionManagerLookupClass="org.jboss.cache.transaction.JBossStandaloneJTAManagerLookup" />
+
+ <clustering mode="replication" clusterName="${jbosscache-cluster-name}">
+ <stateRetrieval timeout="20000" fetchInMemoryState="false" />
+ <jgroupsConfig multiplexerStack="jcr.stack" />
+ <sync />
+ </clustering>
+ <!-- Eviction configuration -->
+ <eviction wakeUpInterval="5000">
+ <default algorithmClass="org.jboss.cache.eviction.FIFOAlgorithm" eventQueueSize="1000000">
+ <property name="maxNodes" value="10000" />
+ <property name="minTimeToLive" value="60000" />
+ </default>
+ </eviction>
+
+</jbosscache>
\ No newline at end of file
Deleted: portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/lock-config-portal-system.xml
===================================================================
--- portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/lock-config-portal-system.xml 2010-02-08 10:32:10 UTC (rev 1553)
+++ portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/lock-config-portal-system.xml 2010-02-08 13:54:36 UTC (rev 1554)
@@ -1,76 +0,0 @@
-<!--
- ~ Copyright (C) 2009 eXo Platform SAS.
- ~
- ~ This is free software; you can redistribute it and/or modify it
- ~ under the terms of the GNU Lesser General Public License as
- ~ published by the Free Software Foundation; either version 2.1 of
- ~ the License, or (at your option) any later version.
- ~
- ~ This software is distributed in the hope that it will be useful,
- ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
- ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- ~ Lesser General Public License for more details.
- ~
- ~ You should have received a copy of the GNU Lesser General Public
- ~ License along with this software; if not, write to the Free
- ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- -->
-<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:jbosscache-core:config:3.1">
-
- <locking useLockStriping="false" concurrencyLevel="50000" lockParentForChildInsertRemove="false" lockAcquisitionTimeout="20000" />
-
- <clustering mode="replication" clusterName="JBoss-Cache-Lock-Cluster_portal_system">
- <stateRetrieval timeout="20000" fetchInMemoryState="false" nonBlocking="true" />
- <jgroupsConfig>
-
- <TCP bind_addr="127.0.0.1" start_port="9800" 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" use_concurrent_stack="true" thread_pool.enabled="true" thread_pool.min_threads="1" thread_pool.max_threads="25"
- thread_pool.keep_alive_time="5000" thread_pool.queue_enabled="false" thread_pool.queue_max_size="100" thread_pool.rejection_policy="run"
- 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" />
- <MPING timeout="2000" num_initial_members="2" mcast_port="34540" bind_addr="127.0.0.1" mcast_addr="224.0.0.1" />
-
-
- <MERGE2 max_interval="30000" min_interval="10000" />
- <FD_SOCK />
- <FD max_tries="5" shun="true" timeout="10000" />
- <VERIFY_SUSPECT timeout="1500" />
- <pbcast.NAKACK discard_delivered_msgs="true" gc_lag="0" retransmit_timeout="300,600,1200,2400,4800" use_mcast_xmit="false" />
- <UNICAST timeout="300,600,1200,2400,3600" />
- <pbcast.STABLE desired_avg_gossip="50000" max_bytes="400000" stability_delay="1000" />
- <pbcast.GMS join_timeout="5000" print_local_addr="true" shun="false" view_ack_collection_timeout="5000" view_bundling="true" />
- <FRAG2 frag_size="60000" />
- <pbcast.STREAMING_STATE_TRANSFER />
- <pbcast.FLUSH timeout="0" />
-
- </jgroupsConfig>
-
- <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=jcrlocks_db1_ws
- cache.jdbc.table.create=true
- cache.jdbc.table.drop=false
- cache.jdbc.table.primarykey=jcrlocks_db1_ws_pk
- cache.jdbc.fqn.column=fqn
- cache.jdbc.fqn.type=VARCHAR(512)
- cache.jdbc.node.column=node
- cache.jdbc.node.type=LONGBLOB
- cache.jdbc.parent.column=parent
- cache.jdbc.datasource=jdbcjcr
- </properties>
- </loader>
-
- </loaders>
--->
-
-</jbosscache>
\ No newline at end of file
Deleted: portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/lock-config-portal-work.xml
===================================================================
--- portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/lock-config-portal-work.xml 2010-02-08 10:32:10 UTC (rev 1553)
+++ portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/lock-config-portal-work.xml 2010-02-08 13:54:36 UTC (rev 1554)
@@ -1,76 +0,0 @@
-<!--
- ~ Copyright (C) 2009 eXo Platform SAS.
- ~
- ~ This is free software; you can redistribute it and/or modify it
- ~ under the terms of the GNU Lesser General Public License as
- ~ published by the Free Software Foundation; either version 2.1 of
- ~ the License, or (at your option) any later version.
- ~
- ~ This software is distributed in the hope that it will be useful,
- ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
- ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- ~ Lesser General Public License for more details.
- ~
- ~ You should have received a copy of the GNU Lesser General Public
- ~ License along with this software; if not, write to the Free
- ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- -->
-<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:jbosscache-core:config:3.1">
-
- <locking useLockStriping="false" concurrencyLevel="50000" lockParentForChildInsertRemove="false" lockAcquisitionTimeout="20000" />
-
- <clustering mode="replication" clusterName="JBoss-Cache-Lock-Cluster_portal_work">
- <stateRetrieval timeout="20000" fetchInMemoryState="false" nonBlocking="true" />
- <jgroupsConfig>
-
- <TCP bind_addr="127.0.0.1" start_port="9800" 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" use_concurrent_stack="true" thread_pool.enabled="true" thread_pool.min_threads="1" thread_pool.max_threads="25"
- thread_pool.keep_alive_time="5000" thread_pool.queue_enabled="false" thread_pool.queue_max_size="100" thread_pool.rejection_policy="run"
- 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" />
- <MPING timeout="2000" num_initial_members="2" mcast_port="34540" bind_addr="127.0.0.1" mcast_addr="224.0.0.1" />
-
-
- <MERGE2 max_interval="30000" min_interval="10000" />
- <FD_SOCK />
- <FD max_tries="5" shun="true" timeout="10000" />
- <VERIFY_SUSPECT timeout="1500" />
- <pbcast.NAKACK discard_delivered_msgs="true" gc_lag="0" retransmit_timeout="300,600,1200,2400,4800" use_mcast_xmit="false" />
- <UNICAST timeout="300,600,1200,2400,3600" />
- <pbcast.STABLE desired_avg_gossip="50000" max_bytes="400000" stability_delay="1000" />
- <pbcast.GMS join_timeout="5000" print_local_addr="true" shun="false" view_ack_collection_timeout="5000" view_bundling="true" />
- <FRAG2 frag_size="60000" />
- <pbcast.STREAMING_STATE_TRANSFER />
- <pbcast.FLUSH timeout="0" />
-
- </jgroupsConfig>
-
- <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=jcrlocks_db1_ws
- cache.jdbc.table.create=true
- cache.jdbc.table.drop=false
- cache.jdbc.table.primarykey=jcrlocks_db1_ws_pk
- cache.jdbc.fqn.column=fqn
- cache.jdbc.fqn.type=VARCHAR(512)
- cache.jdbc.node.column=node
- cache.jdbc.node.type=LONGBLOB
- cache.jdbc.parent.column=parent
- cache.jdbc.datasource=jdbcjcr
- </properties>
- </loader>
-
- </loaders>
--->
-
-</jbosscache>
\ No newline at end of file
Deleted: portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/lock-config-system.xml
===================================================================
--- portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/lock-config-system.xml 2010-02-08 10:32:10 UTC (rev 1553)
+++ portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/lock-config-system.xml 2010-02-08 13:54:36 UTC (rev 1554)
@@ -1,76 +0,0 @@
-<!--
- ~ Copyright (C) 2009 eXo Platform SAS.
- ~
- ~ This is free software; you can redistribute it and/or modify it
- ~ under the terms of the GNU Lesser General Public License as
- ~ published by the Free Software Foundation; either version 2.1 of
- ~ the License, or (at your option) any later version.
- ~
- ~ This software is distributed in the hope that it will be useful,
- ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
- ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- ~ Lesser General Public License for more details.
- ~
- ~ You should have received a copy of the GNU Lesser General Public
- ~ License along with this software; if not, write to the Free
- ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- -->
-<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:jbosscache-core:config:3.1">
-
- <locking useLockStriping="false" concurrencyLevel="50000" lockParentForChildInsertRemove="false" lockAcquisitionTimeout="20000" />
-
- <clustering mode="replication" clusterName="JBoss-Cache-Lock-Cluster_system">
- <stateRetrieval timeout="20000" fetchInMemoryState="false" nonBlocking="true" />
- <jgroupsConfig>
-
- <TCP bind_addr="127.0.0.1" start_port="9800" 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" use_concurrent_stack="true" thread_pool.enabled="true" thread_pool.min_threads="1" thread_pool.max_threads="25"
- thread_pool.keep_alive_time="5000" thread_pool.queue_enabled="false" thread_pool.queue_max_size="100" thread_pool.rejection_policy="run"
- 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" />
- <MPING timeout="2000" num_initial_members="2" mcast_port="34540" bind_addr="127.0.0.1" mcast_addr="224.0.0.1" />
-
-
- <MERGE2 max_interval="30000" min_interval="10000" />
- <FD_SOCK />
- <FD max_tries="5" shun="true" timeout="10000" />
- <VERIFY_SUSPECT timeout="1500" />
- <pbcast.NAKACK discard_delivered_msgs="true" gc_lag="0" retransmit_timeout="300,600,1200,2400,4800" use_mcast_xmit="false" />
- <UNICAST timeout="300,600,1200,2400,3600" />
- <pbcast.STABLE desired_avg_gossip="50000" max_bytes="400000" stability_delay="1000" />
- <pbcast.GMS join_timeout="5000" print_local_addr="true" shun="false" view_ack_collection_timeout="5000" view_bundling="true" />
- <FRAG2 frag_size="60000" />
- <pbcast.STREAMING_STATE_TRANSFER />
- <pbcast.FLUSH timeout="0" />
-
- </jgroupsConfig>
-
- <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=jcrlocks_db1_ws
- cache.jdbc.table.create=true
- cache.jdbc.table.drop=false
- cache.jdbc.table.primarykey=jcrlocks_db1_ws_pk
- cache.jdbc.fqn.column=fqn
- cache.jdbc.fqn.type=VARCHAR(512)
- cache.jdbc.node.column=node
- cache.jdbc.node.type=LONGBLOB
- cache.jdbc.parent.column=parent
- cache.jdbc.datasource=jdbcjcr
- </properties>
- </loader>
-
- </loaders>
--->
-
-</jbosscache>
\ No newline at end of file
Deleted: portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/lock-config-wsrp-system.xml
===================================================================
--- portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/lock-config-wsrp-system.xml 2010-02-08 10:32:10 UTC (rev 1553)
+++ portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/lock-config-wsrp-system.xml 2010-02-08 13:54:36 UTC (rev 1554)
@@ -1,76 +0,0 @@
-<!--
- ~ Copyright (C) 2009 eXo Platform SAS.
- ~
- ~ This is free software; you can redistribute it and/or modify it
- ~ under the terms of the GNU Lesser General Public License as
- ~ published by the Free Software Foundation; either version 2.1 of
- ~ the License, or (at your option) any later version.
- ~
- ~ This software is distributed in the hope that it will be useful,
- ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
- ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- ~ Lesser General Public License for more details.
- ~
- ~ You should have received a copy of the GNU Lesser General Public
- ~ License along with this software; if not, write to the Free
- ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- -->
-<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:jbosscache-core:config:3.1">
-
- <locking useLockStriping="false" concurrencyLevel="50000" lockParentForChildInsertRemove="false" lockAcquisitionTimeout="20000" />
-
- <clustering mode="replication" clusterName="JBoss-Cache-Lock-Cluster_wsrp_system">
- <stateRetrieval timeout="20000" fetchInMemoryState="false" nonBlocking="true" />
- <jgroupsConfig>
-
- <TCP bind_addr="127.0.0.1" start_port="9800" 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" use_concurrent_stack="true" thread_pool.enabled="true" thread_pool.min_threads="1" thread_pool.max_threads="25"
- thread_pool.keep_alive_time="5000" thread_pool.queue_enabled="false" thread_pool.queue_max_size="100" thread_pool.rejection_policy="run"
- 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" />
- <MPING timeout="2000" num_initial_members="2" mcast_port="34540" bind_addr="127.0.0.1" mcast_addr="224.0.0.1" />
-
-
- <MERGE2 max_interval="30000" min_interval="10000" />
- <FD_SOCK />
- <FD max_tries="5" shun="true" timeout="10000" />
- <VERIFY_SUSPECT timeout="1500" />
- <pbcast.NAKACK discard_delivered_msgs="true" gc_lag="0" retransmit_timeout="300,600,1200,2400,4800" use_mcast_xmit="false" />
- <UNICAST timeout="300,600,1200,2400,3600" />
- <pbcast.STABLE desired_avg_gossip="50000" max_bytes="400000" stability_delay="1000" />
- <pbcast.GMS join_timeout="5000" print_local_addr="true" shun="false" view_ack_collection_timeout="5000" view_bundling="true" />
- <FRAG2 frag_size="60000" />
- <pbcast.STREAMING_STATE_TRANSFER />
- <pbcast.FLUSH timeout="0" />
-
- </jgroupsConfig>
-
- <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=jcrlocks_db1_ws
- cache.jdbc.table.create=true
- cache.jdbc.table.drop=false
- cache.jdbc.table.primarykey=jcrlocks_db1_ws_pk
- cache.jdbc.fqn.column=fqn
- cache.jdbc.fqn.type=VARCHAR(512)
- cache.jdbc.node.column=node
- cache.jdbc.node.type=LONGBLOB
- cache.jdbc.parent.column=parent
- cache.jdbc.datasource=jdbcjcr
- </properties>
- </loader>
-
- </loaders>
--->
-
-</jbosscache>
\ No newline at end of file
Added: portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/lock-config.xml
===================================================================
--- portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/lock-config.xml (rev 0)
+++ portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/lock-config.xml 2010-02-08 13:54:36 UTC (rev 1554)
@@ -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="50000" lockParentForChildInsertRemove="false" lockAcquisitionTimeout="20000" />
+
+ <clustering mode="replication" clusterName="${jbosscache-cluster-name}">
+ <stateRetrieval timeout="20000" fetchInMemoryState="false" />
+ <jgroupsConfig multiplexerStack="jcr.stack" />
+ <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>
\ No newline at end of file
Added: portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/udp-mux.xml
===================================================================
--- portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/udp-mux.xml (rev 0)
+++ portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/udp-mux.xml 2010-02-08 13:54:36 UTC (rev 1554)
@@ -0,0 +1,51 @@
+<!--
+ ~ 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.
+ -->
+<protocol_stacks>
+ <stack name="jcr.stack">
+ <config>
+ <UDP mcast_addr="228.10.10.10" 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="2" enable_bundling="true" enable_diagnostics="true"
+ 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>
+ </stack>
+</protocol_stacks>
\ No newline at end of file
Deleted: portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/local/config-portal-system.xml
===================================================================
--- portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/local/config-portal-system.xml 2010-02-08 10:32:10 UTC (rev 1553)
+++ portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/local/config-portal-system.xml 2010-02-08 13:54:36 UTC (rev 1554)
@@ -1,38 +0,0 @@
-<!--
- ~ Copyright (C) 2009 eXo Platform SAS.
- ~
- ~ This is free software; you can redistribute it and/or modify it
- ~ under the terms of the GNU Lesser General Public License as
- ~ published by the Free Software Foundation; either version 2.1 of
- ~ the License, or (at your option) any later version.
- ~
- ~ This software is distributed in the hope that it will be useful,
- ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
- ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- ~ Lesser General Public License for more details.
- ~
- ~ You should have received a copy of the GNU Lesser General Public
- ~ License along with this software; if not, write to the Free
- ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- -->
-
-<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:jbosscache-core:config:3.1">
-
- <locking useLockStriping="false" concurrencyLevel="50000" 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="60000" />
- </default>
- </eviction>
-
-</jbosscache>
\ No newline at end of file
Deleted: portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/local/config-portal-work.xml
===================================================================
--- portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/local/config-portal-work.xml 2010-02-08 10:32:10 UTC (rev 1553)
+++ portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/local/config-portal-work.xml 2010-02-08 13:54:36 UTC (rev 1554)
@@ -1,38 +0,0 @@
-<!--
- ~ Copyright (C) 2009 eXo Platform SAS.
- ~
- ~ This is free software; you can redistribute it and/or modify it
- ~ under the terms of the GNU Lesser General Public License as
- ~ published by the Free Software Foundation; either version 2.1 of
- ~ the License, or (at your option) any later version.
- ~
- ~ This software is distributed in the hope that it will be useful,
- ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
- ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- ~ Lesser General Public License for more details.
- ~
- ~ You should have received a copy of the GNU Lesser General Public
- ~ License along with this software; if not, write to the Free
- ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- -->
-
-<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:jbosscache-core:config:3.1">
-
- <locking useLockStriping="false" concurrencyLevel="50000" 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="60000" />
- </default>
- </eviction>
-
-</jbosscache>
\ No newline at end of file
Deleted: portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/local/config-system.xml
===================================================================
--- portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/local/config-system.xml 2010-02-08 10:32:10 UTC (rev 1553)
+++ portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/local/config-system.xml 2010-02-08 13:54:36 UTC (rev 1554)
@@ -1,37 +0,0 @@
-<!--
- ~ Copyright (C) 2009 eXo Platform SAS.
- ~
- ~ This is free software; you can redistribute it and/or modify it
- ~ under the terms of the GNU Lesser General Public License as
- ~ published by the Free Software Foundation; either version 2.1 of
- ~ the License, or (at your option) any later version.
- ~
- ~ This software is distributed in the hope that it will be useful,
- ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
- ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- ~ Lesser General Public License for more details.
- ~
- ~ You should have received a copy of the GNU Lesser General Public
- ~ License along with this software; if not, write to the Free
- ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- -->
-<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:jbosscache-core:config:3.1">
-
- <locking useLockStriping="false" concurrencyLevel="50000" 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="60000" />
- </default>
- </eviction>
-
-</jbosscache>
\ No newline at end of file
Deleted: portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/local/config-wsrp-system.xml
===================================================================
--- portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/local/config-wsrp-system.xml 2010-02-08 10:32:10 UTC (rev 1553)
+++ portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/local/config-wsrp-system.xml 2010-02-08 13:54:36 UTC (rev 1554)
@@ -1,38 +0,0 @@
-<!--
- ~ Copyright (C) 2009 eXo Platform SAS.
- ~
- ~ This is free software; you can redistribute it and/or modify it
- ~ under the terms of the GNU Lesser General Public License as
- ~ published by the Free Software Foundation; either version 2.1 of
- ~ the License, or (at your option) any later version.
- ~
- ~ This software is distributed in the hope that it will be useful,
- ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
- ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- ~ Lesser General Public License for more details.
- ~
- ~ You should have received a copy of the GNU Lesser General Public
- ~ License along with this software; if not, write to the Free
- ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- -->
-
-<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:jbosscache-core:config:3.1">
-
- <locking useLockStriping="false" concurrencyLevel="50000" 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="60000" />
- </default>
- </eviction>
-
-</jbosscache>
\ No newline at end of file
Added: portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/local/config.xml
===================================================================
--- portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/local/config.xml (rev 0)
+++ portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/local/config.xml 2010-02-08 13:54:36 UTC (rev 1554)
@@ -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="50000" 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="60000" />
+ </default>
+ </eviction>
+
+</jbosscache>
\ No newline at end of file
Deleted: portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/local/lock-config-portal-system.xml
===================================================================
--- portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/local/lock-config-portal-system.xml 2010-02-08 10:32:10 UTC (rev 1553)
+++ portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/local/lock-config-portal-system.xml 2010-02-08 13:54:36 UTC (rev 1554)
@@ -1,44 +0,0 @@
-<!--
- ~ Copyright (C) 2009 eXo Platform SAS.
- ~
- ~ This is free software; you can redistribute it and/or modify it
- ~ under the terms of the GNU Lesser General Public License as
- ~ published by the Free Software Foundation; either version 2.1 of
- ~ the License, or (at your option) any later version.
- ~
- ~ This software is distributed in the hope that it will be useful,
- ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
- ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- ~ Lesser General Public License for more details.
- ~
- ~ You should have received a copy of the GNU Lesser General Public
- ~ License along with this software; if not, write to the Free
- ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- -->
-<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:jbosscache-core:config:3.2">
-
- <locking useLockStriping="false" concurrencyLevel="50000" lockParentForChildInsertRemove="false" lockAcquisitionTimeout="20000" />
-
-<!--
- <loaders passivation="false" shared="true">
- <preload>
- <node fqn="/" />
- </preload>
- <loader class="org.jboss.cache.loader.JDBCCacheLoader" async="false" fetchPersistentState="true" ignoreModifications="false" purgeOnStartup="false">
- <properties>
- cache.jdbc.table.name=jcr_lock_portal_system
- cache.jdbc.table.create=true
- cache.jdbc.table.drop=false
- cache.jdbc.table.primarykey=exojcr_pk
- cache.jdbc.fqn.column=fqn
- cache.jdbc.fqn.type=VARCHAR(512)
- cache.jdbc.node.column=node
- cache.jdbc.node.type=OBJECT
- cache.jdbc.parent.column=parent
- cache.jdbc.datasource=jdbcexo_portal
- </properties>
- </loader>
- </loaders>
--->
-</jbosscache>
\ No newline at end of file
Deleted: portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/local/lock-config-portal-work.xml
===================================================================
--- portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/local/lock-config-portal-work.xml 2010-02-08 10:32:10 UTC (rev 1553)
+++ portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/local/lock-config-portal-work.xml 2010-02-08 13:54:36 UTC (rev 1554)
@@ -1,44 +0,0 @@
-<!--
- ~ Copyright (C) 2009 eXo Platform SAS.
- ~
- ~ This is free software; you can redistribute it and/or modify it
- ~ under the terms of the GNU Lesser General Public License as
- ~ published by the Free Software Foundation; either version 2.1 of
- ~ the License, or (at your option) any later version.
- ~
- ~ This software is distributed in the hope that it will be useful,
- ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
- ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- ~ Lesser General Public License for more details.
- ~
- ~ You should have received a copy of the GNU Lesser General Public
- ~ License along with this software; if not, write to the Free
- ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- -->
-<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:jbosscache-core:config:3.2">
-
- <locking useLockStriping="false" concurrencyLevel="50000" lockParentForChildInsertRemove="false" lockAcquisitionTimeout="20000" />
-
-<!--
- <loaders passivation="false" shared="true">
- <preload>
- <node fqn="/" />
- </preload>
- <loader class="org.jboss.cache.loader.JDBCCacheLoader" async="false" fetchPersistentState="true" ignoreModifications="false" purgeOnStartup="false">
- <properties>
- cache.jdbc.table.name=jcr_lock_portal_work
- cache.jdbc.table.create=true
- cache.jdbc.table.drop=false
- cache.jdbc.table.primarykey=exojcr_pk
- cache.jdbc.fqn.column=fqn
- cache.jdbc.fqn.type=VARCHAR(512)
- cache.jdbc.node.column=node
- cache.jdbc.node.type=OBJECT
- cache.jdbc.parent.column=parent
- cache.jdbc.datasource=jdbcexo_portal
- </properties>
- </loader>
- </loaders>
--->
-</jbosscache>
\ No newline at end of file
Deleted: portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/local/lock-config-system.xml
===================================================================
--- portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/local/lock-config-system.xml 2010-02-08 10:32:10 UTC (rev 1553)
+++ portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/local/lock-config-system.xml 2010-02-08 13:54:36 UTC (rev 1554)
@@ -1,44 +0,0 @@
-<!--
- ~ Copyright (C) 2009 eXo Platform SAS.
- ~
- ~ This is free software; you can redistribute it and/or modify it
- ~ under the terms of the GNU Lesser General Public License as
- ~ published by the Free Software Foundation; either version 2.1 of
- ~ the License, or (at your option) any later version.
- ~
- ~ This software is distributed in the hope that it will be useful,
- ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
- ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- ~ Lesser General Public License for more details.
- ~
- ~ You should have received a copy of the GNU Lesser General Public
- ~ License along with this software; if not, write to the Free
- ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- -->
-<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:jbosscache-core:config:3.2">
-
- <locking useLockStriping="false" concurrencyLevel="50000" lockParentForChildInsertRemove="false" lockAcquisitionTimeout="20000" />
-
-<!--
- <loaders passivation="false" shared="true">
- <preload>
- <node fqn="/" />
- </preload>
- <loader class="org.jboss.cache.loader.JDBCCacheLoader" async="false" fetchPersistentState="true" ignoreModifications="false" purgeOnStartup="false">
- <properties>
- cache.jdbc.table.name=jcr_lock_system
- cache.jdbc.table.create=true
- cache.jdbc.table.drop=false
- cache.jdbc.table.primarykey=exojcr_pk
- cache.jdbc.fqn.column=fqn
- cache.jdbc.fqn.type=VARCHAR(512)
- cache.jdbc.node.column=node
- cache.jdbc.node.type=OBJECT
- cache.jdbc.parent.column=parent
- cache.jdbc.datasource=jdbcexo_portal
- </properties>
- </loader>
- </loaders>
--->
-</jbosscache>
\ No newline at end of file
Deleted: portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/local/lock-config-wsrp-system.xml
===================================================================
--- portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/local/lock-config-wsrp-system.xml 2010-02-08 10:32:10 UTC (rev 1553)
+++ portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/local/lock-config-wsrp-system.xml 2010-02-08 13:54:36 UTC (rev 1554)
@@ -1,44 +0,0 @@
-<!--
- ~ Copyright (C) 2009 eXo Platform SAS.
- ~
- ~ This is free software; you can redistribute it and/or modify it
- ~ under the terms of the GNU Lesser General Public License as
- ~ published by the Free Software Foundation; either version 2.1 of
- ~ the License, or (at your option) any later version.
- ~
- ~ This software is distributed in the hope that it will be useful,
- ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
- ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- ~ Lesser General Public License for more details.
- ~
- ~ You should have received a copy of the GNU Lesser General Public
- ~ License along with this software; if not, write to the Free
- ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- -->
-<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:jbosscache-core:config:3.2">
-
- <locking useLockStriping="false" concurrencyLevel="50000" lockParentForChildInsertRemove="false" lockAcquisitionTimeout="20000" />
-
-<!--
- <loaders passivation="false" shared="true">
- <preload>
- <node fqn="/" />
- </preload>
- <loader class="org.jboss.cache.loader.JDBCCacheLoader" async="false" fetchPersistentState="true" ignoreModifications="false" purgeOnStartup="false">
- <properties>
- cache.jdbc.table.name=jcr_lock_wsrp_system
- cache.jdbc.table.create=true
- cache.jdbc.table.drop=false
- cache.jdbc.table.primarykey=exojcr_pk
- cache.jdbc.fqn.column=fqn
- cache.jdbc.fqn.type=VARCHAR(512)
- cache.jdbc.node.column=node
- cache.jdbc.node.type=OBJECT
- cache.jdbc.parent.column=parent
- cache.jdbc.datasource=jdbcexo_portal
- </properties>
- </loader>
- </loaders>
--->
-</jbosscache>
\ No newline at end of file
Added: portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/local/lock-config.xml
===================================================================
--- portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/local/lock-config.xml (rev 0)
+++ portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/local/lock-config.xml 2010-02-08 13:54:36 UTC (rev 1554)
@@ -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="50000" 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>
\ No newline at end of file
Modified: portal/trunk/component/common/src/main/java/org/exoplatform/commons/chromattic/ChromatticLifeCycle.java
===================================================================
--- portal/trunk/component/common/src/main/java/org/exoplatform/commons/chromattic/ChromatticLifeCycle.java 2010-02-08 10:32:10 UTC (rev 1553)
+++ portal/trunk/component/common/src/main/java/org/exoplatform/commons/chromattic/ChromatticLifeCycle.java 2010-02-08 13:54:36 UTC (rev 1554)
@@ -22,10 +22,11 @@
import org.chromattic.api.ChromatticBuilder;
import org.exoplatform.container.component.BaseComponentPlugin;
import org.exoplatform.container.xml.InitParams;
+import org.exoplatform.container.xml.PropertiesParam;
import org.gatein.common.logging.Logger;
import org.gatein.common.logging.LoggerFactory;
-import java.util.List;
+import java.util.*;
/**
* <p>The chromattic life cycle objets is a plugin that allow to bootstrap a chromattic builder and make
@@ -56,6 +57,23 @@
{
/** . */
+ private static final Map<String, ChromatticBuilder.Option<?>> RECOGNIZED_OPTIONS;
+
+ static
+ {
+ Map<String, ChromatticBuilder.Option<?>> options = new HashMap<String, ChromatticBuilder.Option<?>>();
+ for (ChromatticBuilder.Option<?> option : new ChromatticBuilder.Option<?>[]{ChromatticBuilder.JCR_OPTIMIZE_ENABLED,
+ ChromatticBuilder.JCR_OPTIMIZE_HAS_NODE_ENABLED,
+ ChromatticBuilder.JCR_OPTIMIZE_HAS_PROPERTY_ENABLED,
+ ChromatticBuilder.OBJECT_FORMATTER_CLASSNAME,
+ ChromatticBuilder.ROOT_NODE_PATH})
+ {
+ options.put(option.getName(), option);
+ }
+ RECOGNIZED_OPTIONS = options;
+ }
+
+ /** . */
private final String domainName;
/** . */
@@ -79,11 +97,22 @@
/** . */
final Logger log = LoggerFactory.getLogger(ChromatticLifeCycle.class);
+ /** . */
+ private final Map<String, String> optionMap;
+
public ChromatticLifeCycle(InitParams params)
{
+ Map<String, String> options = new HashMap<String, String>();
+ PropertiesParam pp = params.getPropertiesParam("options");
+ if (pp != null)
+ {
+ options.putAll(pp.getProperties());
+ }
+
this.domainName = params.getValueParam("domain-name").getValue();
this.workspaceName = params.getValueParam("workspace-name").getValue();
this.entityClassNames = params.getValuesParam("entities").getValues();
+ this.optionMap = options;
}
public String getDomainName()
@@ -290,8 +319,18 @@
//
try
{
+ for (Map.Entry<String, String> optionEntry : optionMap.entrySet())
+ {
+ ChromatticBuilder.Option<?> option = RECOGNIZED_OPTIONS.get(optionEntry.getKey());
+ if (option != null)
+ {
+ log.debug("Setting Chromattic option " + optionEntry);
+ builder.setOptionStringValue(option, optionEntry.getValue());
+ }
+ }
+
// Set it now, so we are sure that it will be the correct life cycle
- builder.setOption(ChromatticBuilder.SESSION_LIFECYCLE_CLASSNAME, PortalSessionLifeCycle.class.getName());
+ builder.setOptionValue(ChromatticBuilder.SESSION_LIFECYCLE_CLASSNAME, PortalSessionLifeCycle.class.getName());
//
log.debug("Building Chromattic " + domainName);
Modified: portal/trunk/component/portal/src/main/java/conf/content-nodetypes.xml
===================================================================
--- portal/trunk/component/portal/src/main/java/conf/content-nodetypes.xml 2010-02-08 10:32:10 UTC (rev 1553)
+++ portal/trunk/component/portal/src/main/java/conf/content-nodetypes.xml 2010-02-08 13:54:36 UTC (rev 1554)
@@ -20,6 +20,17 @@
-->
<nodeTypes xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0">
+ <nodeType name="mop:protectedresource" isMixin="true" hasOrderableChildNodes="false" primaryItemName="">
+ <propertyDefinitions>
+ <propertyDefinition name="mop:access-permissions" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="true">
+ <valueConstraints/>
+ </propertyDefinition>
+ <propertyDefinition name="mop:edit-permissions" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="true">
+ <valueConstraints/>
+ </propertyDefinition>
+ </propertyDefinitions>
+ </nodeType>
+
<nodeType name="mop:portletpreferences" isMixin="false" hasOrderableChildNodes="false" primaryItemName="">
<supertypes>
<supertype>mop:customizationstate</supertype>
Added: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/mop/ProtectedResource.java
===================================================================
--- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/mop/ProtectedResource.java (rev 0)
+++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/mop/ProtectedResource.java 2010-02-08 13:54:36 UTC (rev 1554)
@@ -0,0 +1,66 @@
+/*
+ * 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.
+ */
+
+package org.exoplatform.portal.mop;
+
+import org.chromattic.api.annotations.MixinType;
+import org.chromattic.api.annotations.Property;
+
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * Describe an object that can be secured
+ *
+ * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
+ * @version $Revision$
+ */
+@MixinType(name = "mop:protectedresource")
+public abstract class ProtectedResource
+{
+
+ @Property(name = "mop:access-permissions")
+ public abstract List<String> getAccessPermissions();
+
+ public abstract void setAccessPermissions(List<String> accessPermissions);
+
+ @Property(name = "mop:edit-permissions")
+ public abstract String getEditPermission();
+
+ public abstract void setEditPermission(String editPermission);
+
+/*
+ public String getEditPermission()
+ {
+ List<String> editPermissions = getEditPermissions();
+ return editPermissions.isEmpty() ? null : editPermissions.get(0);
+ }
+
+ public void setEditPermission(String editPermission)
+ {
+ setEditPermission(Collections.singletonList(editPermission));
+ }
+
+ @Property(name = "mop:edit-permissions")
+ public abstract List<String> getEditPermissions();
+
+ public abstract void setEditPermission(List<String> editPermissions);
+*/
+
+}
Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/POMSession.java
===================================================================
--- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/POMSession.java 2010-02-08 10:32:10 UTC (rev 1553)
+++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/POMSession.java 2010-02-08 13:54:36 UTC (rev 1554)
@@ -343,7 +343,7 @@
throw new Error(e);
}
Class<O> mappedClass = (Class<O>)mapping.get(type);
- return session.createQueryBuilder().from(mappedClass).<O> where(statement).get().objects();
+ return session.createQueryBuilder(mappedClass).where(statement).get().objects();
}
private final SynchronizationListener listener = new SynchronizationListener()
Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/MappedAttributes.java
===================================================================
--- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/MappedAttributes.java 2010-02-08 10:32:10 UTC (rev 1553)
+++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/MappedAttributes.java 2010-02-08 13:54:36 UTC (rev 1554)
@@ -56,7 +56,7 @@
public static final Key<String> ACCESS_PERMISSIONS = Key.create("access-permissions", ValueType.STRING);
/** . */
- public static final Key<String> EDIT_PERMISSION = Key.create("edit-permission", ValueType.STRING);
+ public static final Key<String> EDIT_PERMISSION = Key.create("edit-permissions", ValueType.STRING);
/** . */
public static final Key<String> CREATOR = Key.create("creator", ValueType.STRING);
Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/Mapper.java
===================================================================
--- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/Mapper.java 2010-02-08 10:32:10 UTC (rev 1553)
+++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/Mapper.java 2010-02-08 13:54:36 UTC (rev 1554)
@@ -24,6 +24,7 @@
import org.exoplatform.portal.config.model.ApplicationState;
import org.exoplatform.portal.config.model.ApplicationType;
import org.exoplatform.portal.config.model.CloneApplicationState;
+import org.exoplatform.portal.mop.ProtectedResource;
import org.exoplatform.portal.pom.data.ModelChange;
import org.exoplatform.portal.config.model.PersistentApplicationState;
import org.exoplatform.portal.config.model.PortalConfig;
@@ -45,6 +46,7 @@
import org.gatein.mop.api.workspace.ui.UIComponent;
import org.gatein.mop.api.workspace.ui.UIContainer;
import org.gatein.mop.api.workspace.ui.UIWindow;
+import org.gatein.mop.core.util.Tools;
import java.util.ArrayList;
import java.util.Arrays;
@@ -70,19 +72,34 @@
{
/** . */
+ private static final Set<String> propertiesBlackList = Tools.set(
+ "jcr:uuid",
+ "jcr:primaryType",
+ MappedAttributes.ACCESS_PERMISSIONS.getName(),
+ MappedAttributes.EDIT_PERMISSION.getName());
+
+ /** . */
private static final Set<String> portalPropertiesBlackList =
- new HashSet<String>(Arrays.asList("jcr:uuid", "jcr:primaryType", MappedAttributes.LOCALE.getName(),
- MappedAttributes.ACCESS_PERMISSIONS.getName(), MappedAttributes.EDIT_PERMISSION.getName(),
- MappedAttributes.SKIN.getName(), MappedAttributes.TITLE.getName(), MappedAttributes.CREATOR.getName(),
- MappedAttributes.MODIFIER.getName()));
+ Tools.set(
+ MappedAttributes.LOCALE.getName(),
+ MappedAttributes.SKIN.getName(),
+ MappedAttributes.TITLE.getName(),
+ MappedAttributes.CREATOR.getName(),
+ MappedAttributes.MODIFIER.getName());
/** . */
private static final Set<String> windowPropertiesBlackList =
- new HashSet<String>(Arrays.asList("jcr:uuid", "jcr:primaryType", MappedAttributes.TYPE.getName(),
- MappedAttributes.THEME.getName(), MappedAttributes.TITLE.getName(), MappedAttributes.ACCESS_PERMISSIONS
- .getName(), MappedAttributes.SHOW_INFO_BAR.getName(), MappedAttributes.SHOW_STATE.getName(),
- MappedAttributes.SHOW_MODE.getName(), MappedAttributes.DESCRIPTION.getName(), MappedAttributes.ICON.getName(),
- MappedAttributes.WIDTH.getName(), MappedAttributes.HEIGHT.getName()));
+ Tools.set(
+ MappedAttributes.TYPE.getName(),
+ MappedAttributes.THEME.getName(),
+ MappedAttributes.TITLE.getName(),
+ MappedAttributes.SHOW_INFO_BAR.getName(),
+ MappedAttributes.SHOW_STATE.getName(),
+ MappedAttributes.SHOW_MODE.getName(),
+ MappedAttributes.DESCRIPTION.getName(),
+ MappedAttributes.ICON.getName(),
+ MappedAttributes.WIDTH.getName(),
+ MappedAttributes.HEIGHT.getName());
/** . */
private final POMSession session;
@@ -284,13 +301,22 @@
ContainerData layout = load(srcLayout, layoutChildren);
//
+ List<String> accessPermissions = Collections.emptyList();
+ String editPermission = null;
+ if (src.isAdapted(ProtectedResource.class)) {
+ ProtectedResource pr = src.adapt(ProtectedResource.class);
+ accessPermissions = pr.getAccessPermissions();
+ editPermission = pr.getEditPermission();
+ }
+
+ //
return new PortalData(
src.getObjectId(),
src.getName(),
type,
attrs.getValue(MappedAttributes.LOCALE),
- Collections.unmodifiableList(Arrays.asList(split("|", attrs.getValue(MappedAttributes.ACCESS_PERMISSIONS, "")))),
- attrs.getValue(MappedAttributes.EDIT_PERMISSION),
+ accessPermissions,
+ editPermission,
Collections.unmodifiableMap(properties),
attrs.getValue(MappedAttributes.SKIN),
attrs.getValue(MappedAttributes.TITLE),
@@ -312,17 +338,19 @@
//
Attributes attrs = dst.getAttributes();
attrs.setValue(MappedAttributes.LOCALE, src.getLocale());
- attrs.setValue(MappedAttributes.ACCESS_PERMISSIONS, join("|", src.getAccessPermissions()));
- attrs.setValue(MappedAttributes.EDIT_PERMISSION, src.getEditPermission());
attrs.setValue(MappedAttributes.SKIN, src.getSkin());
attrs.setValue(MappedAttributes.TITLE, src.getTitle());
attrs.setValue(MappedAttributes.CREATOR, src.getCreator());
attrs.setValue(MappedAttributes.MODIFIER, src.getModifier());
if (src.getProperties() != null)
{
- save(src.getProperties(), attrs);
+ save(src.getProperties(), attrs, portalPropertiesBlackList);
}
+ ProtectedResource pr = dst.adapt(ProtectedResource.class);
+ pr.setAccessPermissions(src.getAccessPermissions());
+ pr.setEditPermission(src.getEditPermission());
+
//
org.gatein.mop.api.workspace.Page templates = dst.getRootPage().getChild("templates");
org.gatein.mop.api.workspace.Page template = templates.getChild("default");
@@ -353,6 +381,16 @@
Attributes attrs = src.getAttributes();
//
+ List<String> accessPermissions = Collections.emptyList();
+ String editPermission = null;
+ if (src.isAdapted(ProtectedResource.class))
+ {
+ ProtectedResource pr = src.adapt(ProtectedResource.class);
+ accessPermissions = pr.getAccessPermissions();
+ editPermission = pr.getEditPermission();
+ }
+
+ //
return new PageData(
src.getObjectId(),
null,
@@ -365,11 +403,11 @@
null,
null,
null,
- Utils.safeImmutableList(split("|", attrs.getValue(MappedAttributes.ACCESS_PERMISSIONS))),
+ Utils.safeImmutableList(accessPermissions),
children,
ownerType,
ownerId,
- attrs.getValue(MappedAttributes.EDIT_PERMISSION),
+ editPermission,
attrs.getValue(MappedAttributes.SHOW_MAX_WINDOW, false),
attrs.getValue(MappedAttributes.CREATOR),
attrs.getValue(MappedAttributes.MODIFIER)
@@ -378,6 +416,14 @@
private ContainerData load(UIContainer src, List<ComponentData> children)
{
+
+ List<String> accessPermissions = Collections.emptyList();
+ if (src.isAdapted(ProtectedResource.class))
+ {
+ ProtectedResource pr = src.adapt(ProtectedResource.class);
+ accessPermissions = pr.getAccessPermissions();
+ }
+
Attributes attrs = src.getAttributes();
return new ContainerData(
src.getObjectId(),
@@ -391,7 +437,7 @@
attrs.getValue(MappedAttributes.DESCRIPTION),
attrs.getValue(MappedAttributes.WIDTH),
attrs.getValue(MappedAttributes.HEIGHT),
- Utils.safeImmutableList(split("|", attrs.getValue(MappedAttributes.ACCESS_PERMISSIONS))),
+ Utils.safeImmutableList(accessPermissions),
children
);
}
@@ -489,11 +535,14 @@
}
//
+ ProtectedResource pr = dst.adapt(ProtectedResource.class);
+ pr.setAccessPermissions(src.getAccessPermissions());
+ pr.setEditPermission(src.getEditPermission());
+
+ //
Attributes attrs = dst.getAttributes();
attrs.setValue(MappedAttributes.TITLE, src.getTitle());
attrs.setValue(MappedAttributes.FACTORY_ID, src.getFactoryId());
- attrs.setValue(MappedAttributes.ACCESS_PERMISSIONS, join("|", src.getAccessPermissions()));
- attrs.setValue(MappedAttributes.EDIT_PERMISSION, src.getEditPermission());
attrs.setValue(MappedAttributes.SHOW_MAX_WINDOW, src.isShowMaxWindow());
attrs.setValue(MappedAttributes.CREATOR, src.getCreator());
attrs.setValue(MappedAttributes.MODIFIER, src.getModifier());
@@ -511,13 +560,16 @@
private void save(ContainerData src, UIContainer dst)
{
+
+ ProtectedResource pr = dst.adapt(ProtectedResource.class);
+ pr.setAccessPermissions(src.getAccessPermissions());
+
Attributes dstAttrs = dst.getAttributes();
dstAttrs.setValue(MappedAttributes.ID, src.getId());
dstAttrs.setValue(MappedAttributes.TYPE, src instanceof DashboardData ? "dashboard" : null);
dstAttrs.setValue(MappedAttributes.TITLE, src.getTitle());
dstAttrs.setValue(MappedAttributes.ICON, src.getIcon());
dstAttrs.setValue(MappedAttributes.TEMPLATE, src.getTemplate());
- dstAttrs.setValue(MappedAttributes.ACCESS_PERMISSIONS, join("|", src.getAccessPermissions()));
dstAttrs.setValue(MappedAttributes.FACTORY_ID, src.getFactoryId());
dstAttrs.setValue(MappedAttributes.DECORATOR, src.getDecorator());
dstAttrs.setValue(MappedAttributes.DESCRIPTION, src.getDescription());
@@ -795,6 +847,14 @@
load(attrs, properties, windowPropertiesBlackList);
//
+ List<String> accessPermissions = Collections.emptyList();
+ if (src.isAdapted(ProtectedResource.class))
+ {
+ ProtectedResource pr = src.adapt(ProtectedResource.class);
+ accessPermissions = pr.getAccessPermissions();
+ }
+
+ //
return new ApplicationData<S>(
src.getObjectId(),
src.getName(),
@@ -811,16 +871,19 @@
attrs.getValue(MappedAttributes.WIDTH),
attrs.getValue(MappedAttributes.HEIGHT),
Utils.safeImmutableMap(properties),
- Utils.safeImmutableList(split("|", attrs.getValue(MappedAttributes.ACCESS_PERMISSIONS)))
+ Utils.safeImmutableList(accessPermissions)
);
}
public <S> void save(ApplicationData<S> src, UIWindow dst)
{
+
+ ProtectedResource pr = dst.adapt(ProtectedResource.class);
+ pr.setAccessPermissions(src.getAccessPermissions());
+
Attributes attrs = dst.getAttributes();
attrs.setValue(MappedAttributes.THEME, src.getTheme());
attrs.setValue(MappedAttributes.TITLE, src.getTitle());
- attrs.setValue(MappedAttributes.ACCESS_PERMISSIONS, join("|", src.getAccessPermissions()));
attrs.setValue(MappedAttributes.SHOW_INFO_BAR, src.isShowInfoBar());
attrs.setValue(MappedAttributes.SHOW_STATE, src.isShowApplicationState());
attrs.setValue(MappedAttributes.SHOW_MODE, src.isShowApplicationMode());
@@ -828,7 +891,7 @@
attrs.setValue(MappedAttributes.ICON, src.getIcon());
attrs.setValue(MappedAttributes.WIDTH, src.getWidth());
attrs.setValue(MappedAttributes.HEIGHT, src.getHeight());
- save(src.getProperties(), attrs);
+ save(src.getProperties(), attrs, windowPropertiesBlackList);
//
ApplicationState<S> instanceState = src.getState();
@@ -987,6 +1050,14 @@
public DashboardData loadDashboard(UIContainer container)
{
+
+ List<String> accessPermissions = Collections.emptyList();
+ if (container.isAdapted(ProtectedResource.class)) {
+ ProtectedResource pr = container.adapt(ProtectedResource.class);
+ accessPermissions = pr.getAccessPermissions();
+ }
+
+ //
Attributes attrs = container.getAttributes();
List<ComponentData> children = loadChildren(container);
return new DashboardData(
@@ -1001,7 +1072,7 @@
attrs.getValue(MappedAttributes.DESCRIPTION),
attrs.getValue(MappedAttributes.WIDTH),
attrs.getValue(MappedAttributes.HEIGHT),
- Utils.safeImmutableList(split("|", attrs.getValue(MappedAttributes.ACCESS_PERMISSIONS))),
+ Utils.safeImmutableList(accessPermissions),
children
);
}
@@ -1029,7 +1100,7 @@
{
for (String name : src.getKeys())
{
- if (!blackList.contains(name))
+ if (!blackList.contains(name) && !propertiesBlackList.contains(name))
{
Object value = src.getObject(name);
if (value instanceof String)
@@ -1040,11 +1111,14 @@
}
}
- public static void save(Map<String, String> src, Attributes dst)
+ public static void save(Map<String, String> src, Attributes dst, Set<String> blackList)
{
for (Map.Entry<String, String> property : src.entrySet())
{
- dst.setString(property.getKey(), property.getValue());
+ String name = property.getKey();
+ if (!blackList.contains(name) && !propertiesBlackList.contains(name)) {
+ dst.setString(name, property.getValue());
+ }
}
}
Modified: portal/trunk/component/portal/src/test/java/conf/exo.portal.component.portal-configuration1.xml
===================================================================
--- portal/trunk/component/portal/src/test/java/conf/exo.portal.component.portal-configuration1.xml 2010-02-08 10:32:10 UTC (rev 1553)
+++ portal/trunk/component/portal/src/test/java/conf/exo.portal.component.portal-configuration1.xml 2010-02-08 13:54:36 UTC (rev 1554)
@@ -176,6 +176,7 @@
<value>org.exoplatform.portal.pom.spi.portlet.PreferenceState</value>
<value>org.exoplatform.portal.pom.spi.gadget.GadgetState</value>
<value>org.exoplatform.portal.pom.spi.wsrp.WSRPState</value>
+ <value>org.exoplatform.portal.mop.ProtectedResource</value>
</values-param>
</init-params>
</component-plugin>
Modified: portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestSavedPOM.java
===================================================================
--- portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestSavedPOM.java 2010-02-08 10:32:10 UTC (rev 1553)
+++ portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestSavedPOM.java 2010-02-08 13:54:36 UTC (rev 1554)
@@ -20,6 +20,7 @@
package org.exoplatform.portal.config;
import org.exoplatform.container.PortalContainer;
+import org.exoplatform.portal.mop.ProtectedResource;
import org.exoplatform.portal.pom.config.POMSession;
import org.exoplatform.portal.pom.config.POMSessionManager;
import org.exoplatform.test.BasicTestCase;
@@ -34,10 +35,7 @@
import org.gatein.mop.api.workspace.ui.UIContainer;
import org.gatein.mop.api.workspace.ui.UIWindow;
-import java.util.Collection;
-import java.util.GregorianCalendar;
-import java.util.Iterator;
-import java.util.TimeZone;
+import java.util.*;
/**
* Created by The eXo Platform SARL Author : Tung Pham thanhtungty(a)gmail.com Nov
@@ -135,11 +133,16 @@
Site portal = session.getWorkspace().getSite(ObjectType.PORTAL_SITE, "test");
assertNotNull(portal);
+ //
+ assertTrue(portal.isAdapted(ProtectedResource.class));
+ ProtectedResource pr = portal.adapt(ProtectedResource.class);
+ assertEquals(Arrays.asList("test_access_permissions"), pr.getAccessPermissions());
+ assertEquals("test_edit_permission", pr.getEditPermission());
+
+ //
assertEquals("test", portal.getName());
Attributes attrs = portal.getAttributes();
assertEquals("en", attrs.getString("locale"));
- assertEquals("test_access_permissions", attrs.getString("access-permissions"));
- assertEquals("test_edit_permission", attrs.getString("edit-permission"));
assertEquals("test_skin", attrs.getString("skin"));
assertEquals("test_title", attrs.getString("title"));
assertEquals("test_creator", attrs.getString("creator"));
@@ -170,11 +173,15 @@
assertNotNull(testPage);
//
+ assertTrue(testPage.isAdapted(ProtectedResource.class));
+ ProtectedResource pr = testPage.adapt(ProtectedResource.class);
+ assertEquals(Arrays.asList("test_access_permissions"), pr.getAccessPermissions());
+ assertEquals("test_edit_permission", pr.getEditPermission());
+
+ //
Attributes testPageAttrs = testPage.getAttributes();
assertEquals("test_title", testPageAttrs.getString("title"));
assertEquals("test_factory_id", testPageAttrs.getString("factory-id"));
- assertEquals("test_access_permissions", testPageAttrs.getString("access-permissions"));
- assertEquals("test_edit_permission", testPageAttrs.getString("edit-permission"));
assertEquals(true, (boolean)testPageAttrs.getBoolean("show-max-window"));
assertEquals("test_creator", testPageAttrs.getString("creator"));
assertEquals("test_modifier", testPageAttrs.getString("modifier"));
Modified: portal/trunk/component/test/core/src/main/resources/conf/portal-configuration.xml
===================================================================
--- portal/trunk/component/test/core/src/main/resources/conf/portal-configuration.xml 2010-02-08 10:32:10 UTC (rev 1553)
+++ portal/trunk/component/test/core/src/main/resources/conf/portal-configuration.xml 2010-02-08 13:54:36 UTC (rev 1554)
@@ -25,6 +25,22 @@
xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd">
<component>
+ <key>org.jboss.cache.transaction.TransactionManagerLookup</key>
+ <type>org.jboss.cache.transaction.JBossStandaloneJTAManagerLookup</type>
+ </component>
+
+ <component>
+ <key>org.exoplatform.services.transaction.TransactionService</key>
+ <type>org.exoplatform.services.transaction.jbosscache.ArjunaTransactionService</type>
+ <init-params>
+ <value-param>
+ <name>timeout</name>
+ <value>300</value>
+ </value-param>
+ </init-params>
+ </component>
+
+ <component>
<key>org.exoplatform.services.naming.InitialContextInitializer</key>
<type>org.exoplatform.services.naming.InitialContextInitializer</type>
<init-params>
Deleted: portal/trunk/component/test/jcr/src/main/resources/conf/exo.portal.component.test.jcr-jbosscache-lock-config-portal-test.xml
===================================================================
--- portal/trunk/component/test/jcr/src/main/resources/conf/exo.portal.component.test.jcr-jbosscache-lock-config-portal-test.xml 2010-02-08 10:32:10 UTC (rev 1553)
+++ portal/trunk/component/test/jcr/src/main/resources/conf/exo.portal.component.test.jcr-jbosscache-lock-config-portal-test.xml 2010-02-08 13:54:36 UTC (rev 1554)
@@ -1,43 +0,0 @@
-<!--
- ~ Copyright (C) 2009 eXo Platform SAS.
- ~
- ~ This is free software; you can redistribute it and/or modify it
- ~ under the terms of the GNU Lesser General Public License as
- ~ published by the Free Software Foundation; either version 2.1 of
- ~ the License, or (at your option) any later version.
- ~
- ~ This software is distributed in the hope that it will be useful,
- ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
- ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- ~ Lesser General Public License for more details.
- ~
- ~ You should have received a copy of the GNU Lesser General Public
- ~ License along with this software; if not, write to the Free
- ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- -->
-
-<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:jbosscache-core:config:3.2">
-
- <locking useLockStriping="false" concurrencyLevel="50000" lockParentForChildInsertRemove="false" lockAcquisitionTimeout="20000" />
-
- <loaders passivation="false" shared="true">
- <preload>
- <node fqn="/" />
- </preload>
- <loader class="org.jboss.cache.loader.JDBCCacheLoader" async="false" fetchPersistentState="true" ignoreModifications="false" purgeOnStartup="false">
- <properties>
- cache.jdbc.table.name=jcr_lock_portal_test
- cache.jdbc.table.create=true
- cache.jdbc.table.drop=false
- cache.jdbc.table.primarykey=exojcr_pk
- cache.jdbc.fqn.column=fqn
- cache.jdbc.fqn.type=VARCHAR(512)
- cache.jdbc.node.column=node
- cache.jdbc.node.type=OBJECT
- cache.jdbc.parent.column=parent
- cache.jdbc.datasource=jdbcexo
- </properties>
- </loader>
- </loaders>
-</jbosscache>
\ No newline at end of file
Deleted: portal/trunk/component/test/jcr/src/main/resources/conf/exo.portal.component.test.jcr-jbosscache-lock-config-system.xml
===================================================================
--- portal/trunk/component/test/jcr/src/main/resources/conf/exo.portal.component.test.jcr-jbosscache-lock-config-system.xml 2010-02-08 10:32:10 UTC (rev 1553)
+++ portal/trunk/component/test/jcr/src/main/resources/conf/exo.portal.component.test.jcr-jbosscache-lock-config-system.xml 2010-02-08 13:54:36 UTC (rev 1554)
@@ -1,42 +0,0 @@
-<!--
- ~ Copyright (C) 2009 eXo Platform SAS.
- ~
- ~ This is free software; you can redistribute it and/or modify it
- ~ under the terms of the GNU Lesser General Public License as
- ~ published by the Free Software Foundation; either version 2.1 of
- ~ the License, or (at your option) any later version.
- ~
- ~ This software is distributed in the hope that it will be useful,
- ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
- ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- ~ Lesser General Public License for more details.
- ~
- ~ You should have received a copy of the GNU Lesser General Public
- ~ License along with this software; if not, write to the Free
- ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- -->
-<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:jbosscache-core:config:3.2">
-
- <locking useLockStriping="false" concurrencyLevel="50000" lockParentForChildInsertRemove="false" lockAcquisitionTimeout="20000" />
-
- <loaders passivation="false" shared="true">
- <preload>
- <node fqn="/" />
- </preload>
- <loader class="org.jboss.cache.loader.JDBCCacheLoader" async="false" fetchPersistentState="true" ignoreModifications="false" purgeOnStartup="false">
- <properties>
- cache.jdbc.table.name=jcr_lock_system
- cache.jdbc.table.create=true
- cache.jdbc.table.drop=false
- cache.jdbc.table.primarykey=exojcr_pk
- cache.jdbc.fqn.column=fqn
- cache.jdbc.fqn.type=VARCHAR(512)
- cache.jdbc.node.column=node
- cache.jdbc.node.type=OBJECT
- cache.jdbc.parent.column=parent
- cache.jdbc.datasource=jdbcexo
- </properties>
- </loader>
- </loaders>
-</jbosscache>
\ No newline at end of file
Copied: portal/trunk/component/test/jcr/src/main/resources/conf/exo.portal.component.test.jcr-jbosscache-lock-config.xml (from rev 1525, portal/trunk/component/test/jcr/src/main/resources/conf/exo.portal.component.test.jcr-jbosscache-lock-config-system.xml)
===================================================================
--- portal/trunk/component/test/jcr/src/main/resources/conf/exo.portal.component.test.jcr-jbosscache-lock-config.xml (rev 0)
+++ portal/trunk/component/test/jcr/src/main/resources/conf/exo.portal.component.test.jcr-jbosscache-lock-config.xml 2010-02-08 13:54:36 UTC (rev 1554)
@@ -0,0 +1,23 @@
+<!--
+ ~ 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="50000" lockParentForChildInsertRemove="false" lockAcquisitionTimeout="20000" />
+
+</jbosscache>
\ No newline at end of file
Modified: portal/trunk/component/test/jcr/src/main/resources/conf/exo.portal.component.test.jcr-repository-configuration.xml
===================================================================
--- portal/trunk/component/test/jcr/src/main/resources/conf/exo.portal.component.test.jcr-repository-configuration.xml 2010-02-08 10:32:10 UTC (rev 1553)
+++ portal/trunk/component/test/jcr/src/main/resources/conf/exo.portal.component.test.jcr-repository-configuration.xml 2010-02-08 13:54:36 UTC (rev 1554)
@@ -66,7 +66,7 @@
<lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManager">
<properties>
<property name="time-out" value="15m" />
- <property name="jbosscache-configuration" value="conf/exo.portal.component.test.jcr-jbosscache-lock-config-system.xml" />
+ <property name="jbosscache-configuration" value="conf/exo.portal.component.test.jcr-jbosscache-lock-config.xml" />
</properties>
</lock-manager>
</workspace>
@@ -112,7 +112,7 @@
<lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManager">
<properties>
<property name="time-out" value="15m" />
- <property name="jbosscache-configuration" value="conf/exo.portal.component.test.jcr-jbosscache-lock-config-portal-test.xml" />
+ <property name="jbosscache-configuration" value="conf/exo.portal.component.test.jcr-jbosscache-lock-config.xml" />
</properties>
</lock-manager>
</workspace>
Added: portal/trunk/component/web/src/main/java/org/exoplatform/web/application/javascript/Javascript.java
===================================================================
--- portal/trunk/component/web/src/main/java/org/exoplatform/web/application/javascript/Javascript.java (rev 0)
+++ portal/trunk/component/web/src/main/java/org/exoplatform/web/application/javascript/Javascript.java 2010-02-08 13:54:36 UTC (rev 1554)
@@ -0,0 +1,72 @@
+/*
+ * 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.
+ */
+
+package org.exoplatform.web.application.javascript;
+
+import javax.servlet.ServletContext;
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+
+/**
+ * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
+ * @version $Revision$
+ */
+public class Javascript
+{
+
+ /** . */
+ private final JavascriptKey key;
+
+ /** . */
+ private final ServletContext context;
+
+ /** . */
+ private final int priority;
+
+ public Javascript(JavascriptKey key, ServletContext context, Integer priority)
+ {
+ this.key = key;
+ this.context = context;
+ this.priority = priority != null ? priority : -1;
+ }
+
+ public String getPath() {
+ return key.getContextPath() + key.getScriptPath();
+ }
+
+ public JavascriptKey getKey()
+ {
+ return key;
+ }
+
+ public ServletContext getContext()
+ {
+ return context;
+ }
+
+ public int getPriority()
+ {
+ return priority;
+ }
+
+ public BufferedReader getReader()
+ {
+ return new BufferedReader(new InputStreamReader(context.getResourceAsStream(key.getScriptPath())));
+ }
+}
Modified: portal/trunk/component/web/src/main/java/org/exoplatform/web/application/javascript/JavascriptConfigParser.java
===================================================================
--- portal/trunk/component/web/src/main/java/org/exoplatform/web/application/javascript/JavascriptConfigParser.java 2010-02-08 10:32:10 UTC (rev 1553)
+++ portal/trunk/component/web/src/main/java/org/exoplatform/web/application/javascript/JavascriptConfigParser.java 2010-02-08 13:54:36 UTC (rev 1554)
@@ -39,9 +39,18 @@
public class JavascriptConfigParser
{
+ /** . */
+ private ServletContext context;
+
+ private JavascriptConfigParser(ServletContext context)
+ {
+ this.context = context;
+ }
+
public static void processConfigResource(InputStream is, JavascriptConfigService service, ServletContext scontext)
{
- List<JavascriptTask> tasks = fetchTasks(is);
+ JavascriptConfigParser parser = new JavascriptConfigParser(scontext);
+ List<JavascriptTask> tasks = parser.fetchTasks(is);
if (tasks != null)
{
for (JavascriptTask task : tasks)
@@ -51,7 +60,7 @@
}
}
- private static List<JavascriptTask> fetchTasks(InputStream is)
+ private List<JavascriptTask> fetchTasks(InputStream is)
{
try
{
@@ -65,7 +74,7 @@
}
}
- private static List<JavascriptTask> fetchTasksFromXMLConfig(Document document)
+ private List<JavascriptTask> fetchTasksFromXMLConfig(Document document)
{
List<JavascriptTask> tasks = new ArrayList<JavascriptTask>();
Element element = document.getDocumentElement();
@@ -82,7 +91,7 @@
return tasks;
}
- private static JavascriptTask xmlToTask(Element element)
+ private JavascriptTask xmlToTask(Element element)
{
if (!GateinResource.JAVA_SCRIPT_TAG.equals(element.getTagName()))
{
@@ -111,7 +120,9 @@
{
//Js_priority still is null;
}
- task.addJSKey(js_module, js_path, js_priority);
+ JavascriptKey key = new JavascriptKey(js_module, js_path, context.getContextPath());
+ Javascript js = new Javascript(key, context, js_priority);
+ task.addScript(js);
}
return task;
}
Modified: portal/trunk/component/web/src/main/java/org/exoplatform/web/application/javascript/JavascriptConfigService.java
===================================================================
--- portal/trunk/component/web/src/main/java/org/exoplatform/web/application/javascript/JavascriptConfigService.java 2010-02-08 10:32:10 UTC (rev 1553)
+++ portal/trunk/component/web/src/main/java/org/exoplatform/web/application/javascript/JavascriptConfigService.java 2010-02-08 13:54:36 UTC (rev 1554)
@@ -27,16 +27,7 @@
import java.io.BufferedReader;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
-import java.io.InputStreamReader;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.AbstractMap.SimpleEntry;
-import java.util.Map.Entry;
+import java.util.*;
import javax.servlet.ServletContext;
@@ -47,7 +38,7 @@
private Collection<String> availableScriptsPaths_;
- private List<Entry<JavascriptKey, ServletContext>> availableScriptsKey_;
+ private List<Javascript> availableScriptsKey_;
private String mergedJavascript = "";
@@ -67,7 +58,7 @@
{
availableScripts_ = new ArrayList<String>();
availableScriptsPaths_ = new ArrayList<String>();
- availableScriptsKey_ = new ArrayList<Entry<JavascriptKey, ServletContext>>();
+ availableScriptsKey_ = new ArrayList<Javascript>();
extendedJavascripts = new HashMap<String, String>();
deployer = new JavascriptDeployer(context.getPortalContainerName(), this);
removal = new JavascriptRemoval(context.getPortalContainerName(), this);
@@ -90,7 +81,7 @@
return availableScriptsPaths_;
}
- public void addExtendedJavascript(String module, String scriptPath, ServletContext scontext, String scriptData)
+ public synchronized void addExtendedJavascript(String module, String scriptPath, ServletContext scontext, String scriptData)
{
String servletContextName = scontext.getServletContextName();
String path = "/" + servletContextName + scriptPath;
@@ -100,27 +91,23 @@
}
@SuppressWarnings("unchecked")
- public void addJavascripts(List<JavascriptKey> jsKeys, ServletContext scontext)
+ public synchronized void addJavascripts(List<Javascript> jsKeys)
{
- for (JavascriptKey key : jsKeys)
- {
- availableScriptsKey_.add(new SimpleEntry(key, scontext));
- }
+ availableScriptsKey_.addAll(jsKeys);
- Collections.sort(availableScriptsKey_, new Comparator<Entry<JavascriptKey, ServletContext>>()
+
+ Collections.sort(availableScriptsKey_, new Comparator<Javascript>()
{
- public int compare(Entry<JavascriptKey, ServletContext> e1, Entry<JavascriptKey, ServletContext> e2)
+ public int compare(Javascript o1, Javascript o2)
{
- JavascriptKey js1 = e1.getKey();
- JavascriptKey js2 = e2.getKey();
- if (js1.getPriority() == js2.getPriority())
- return js1.getModule().compareTo(js2.getModule());
- else if (js1.getPriority() < 0)
+ if (o1.getPriority() == o2.getPriority())
+ return o1.getKey().getModule().compareTo(o2.getKey().getModule());
+ else if (o1.getPriority() < 0)
return 1;
- else if (js2.getPriority() < 0)
+ else if (o2.getPriority() < 0)
return -1;
else
- return js1.getPriority() - js2.getPriority();
+ return o1.getPriority() - o2.getPriority();
}
});
@@ -128,30 +115,30 @@
availableScripts_.clear();
availableScriptsPaths_.clear();
object_view_of_merged_JS.clear();
- for (Entry<JavascriptKey, ServletContext> e : availableScriptsKey_)
- {
- addJavascript(e.getKey().getModule(), e.getKey().getScriptPath(), e.getValue());
+
+ //
+ for (Javascript script : availableScriptsKey_) {
+ addJavascript(script);
}
}
- private void addJavascript(String module, String scriptPath, ServletContext scontext)
+ private void addJavascript(Javascript javascript)
{
- String servletContextName = scontext.getServletContextName();
- availableScripts_.add(module);
- availableScriptsPaths_.add("/" + servletContextName + scriptPath);
+ availableScripts_.add(javascript.getKey().getModule());
+ availableScriptsPaths_.add(javascript.getPath());
- List<String> mergedJS_list = object_view_of_merged_JS.get("/" + servletContextName);
+ List<String> mergedJS_list = object_view_of_merged_JS.get(javascript.getKey().getContextPath());
if (mergedJS_list == null)
{
mergedJS_list = new ArrayList<String>();
- object_view_of_merged_JS.put("/" + servletContextName, mergedJS_list);
+ object_view_of_merged_JS.put(javascript.getKey().getContextPath(), mergedJS_list);
}
StringBuffer sB = new StringBuffer();
String line = "";
try
{
- BufferedReader reader = new BufferedReader(new InputStreamReader(scontext.getResourceAsStream(scriptPath)));
+ BufferedReader reader = javascript.getReader();
try
{
while ((line = reader.readLine()) != null)
@@ -180,31 +167,32 @@
mergedJavascript = mergedJavascript.concat(sB.toString());
}
- public void removeJavascript(JavascriptKey key, ServletContext scontext)
+ public synchronized void remove(ServletContext context)
{
- String contextPath = scontext.getContextPath();
- availableScripts_.remove(key.getModule());
- availableScriptsPaths_.remove(contextPath + key.getScriptPath());
- object_view_of_merged_JS.remove(contextPath);
+ // We clone to avoid concurrent modification exception
+ for (Javascript script : new ArrayList<Javascript>(availableScriptsKey_))
+ {
+ if (script.getContext().getContextPath().equals(context.getContextPath())) {
+ removeJavascript(script);
+ }
+ }
+ }
- // Minh Hoang TO: Use 2 loops to avoid concurrent exception on fail-fast
- // iterator
- List<Entry<JavascriptKey, ServletContext>> entries_to_remove =
- new ArrayList<Entry<JavascriptKey, ServletContext>>();
+ public synchronized void removeJavascript(Javascript script)
+ {
+ availableScripts_.remove(script.getKey().getModule());
+ availableScriptsPaths_.remove(script.getPath());
+ object_view_of_merged_JS.remove(script.getKey().getContextPath());
// Enlist entries to be removed
- for (Entry<JavascriptKey, ServletContext> entry : availableScriptsKey_)
+ for (Iterator<Javascript> i = availableScriptsKey_.iterator();i.hasNext();)
{
- if (key.equals(entry.getKey())
- && scontext.getServletContextName().equals(entry.getValue().getServletContextName()))
- entries_to_remove.add(entry);
+ Javascript _script = i.next();
+ if (script.getKey().equals(_script.getKey()))
+ {
+ i.remove();
+ }
}
-
- // Remove the entries
- for (Entry<JavascriptKey, ServletContext> entry_to_remove : entries_to_remove)
- {
- availableScriptsKey_.remove(entry_to_remove);
- }
}
/** Refresh the mergedJavascript **/
Deleted: portal/trunk/component/web/src/main/java/org/exoplatform/web/application/javascript/JavascriptDependentManager.java
===================================================================
--- portal/trunk/component/web/src/main/java/org/exoplatform/web/application/javascript/JavascriptDependentManager.java 2010-02-08 10:32:10 UTC (rev 1553)
+++ portal/trunk/component/web/src/main/java/org/exoplatform/web/application/javascript/JavascriptDependentManager.java 2010-02-08 13:54:36 UTC (rev 1554)
@@ -1,58 +0,0 @@
-/*
- * Copyright (C) 2009 eXo Platform SAS.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.exoplatform.web.application.javascript;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author <a href="mailto:hoang281283@gmail.com">Minh Hoang TO</a>
- * @version $Id$
- *
- */
-public class JavascriptDependentManager
-{
- private static Map<String, List<JavascriptKey>> webApp_JScripts_map = new HashMap<String, List<JavascriptKey>>();
-
- public static void addJavascriptDependent(String webApp, List<JavascriptKey> jsKeys)
- {
- List<JavascriptKey> deployedJSs = webApp_JScripts_map.get(webApp);
- if (deployedJSs == null)
- {
- deployedJSs = new ArrayList<JavascriptKey>();
- webApp_JScripts_map.put(webApp, deployedJSs);
- }
- for(JavascriptKey key : jsKeys){
- deployedJSs.add(key);
- }
- }
-
- public static void clearAssociatedJScripts(String webApp)
- {
- webApp_JScripts_map.remove(webApp);
- }
-
- public static List<JavascriptKey> getDeployedJScripts(String webApp)
- {
- return webApp_JScripts_map.get(webApp);
- }
-
-}
Modified: portal/trunk/component/web/src/main/java/org/exoplatform/web/application/javascript/JavascriptKey.java
===================================================================
--- portal/trunk/component/web/src/main/java/org/exoplatform/web/application/javascript/JavascriptKey.java 2010-02-08 10:32:10 UTC (rev 1553)
+++ portal/trunk/component/web/src/main/java/org/exoplatform/web/application/javascript/JavascriptKey.java 2010-02-08 13:54:36 UTC (rev 1554)
@@ -26,21 +26,24 @@
public class JavascriptKey
{
+ /** . */
private final String module;
+ /** . */
private final String scriptPath;
- private final int priority;
+ /** . */
+ private final String contextPath;
- public JavascriptKey(String module, String scriptPath, Integer priority) throws IllegalArgumentException
+ public JavascriptKey(String module, String scriptPath, String contextPath) throws IllegalArgumentException
{
- if (module == null || scriptPath == null)
+ if (module == null || scriptPath == null || contextPath == null)
{
throw new IllegalArgumentException("Module and scriptPath are mandatory for JavascriptKey");
}
this.module = module;
this.scriptPath = scriptPath;
- this.priority = (priority != null ? priority : -1);
+ this.contextPath = contextPath;
}
@Override
@@ -53,7 +56,7 @@
if (obj instanceof JavascriptKey)
{
JavascriptKey that = (JavascriptKey)obj;
- return module.equals(that.module) && scriptPath.equals(that.scriptPath);
+ return module.equals(that.module) && scriptPath.equals(that.scriptPath) && contextPath.equals(that.contextPath);
}
return false;
}
@@ -68,8 +71,8 @@
return scriptPath;
}
- public int getPriority()
+ public String getContextPath()
{
- return priority;
+ return contextPath;
}
}
Modified: portal/trunk/component/web/src/main/java/org/exoplatform/web/application/javascript/JavascriptRemoval.java
===================================================================
--- portal/trunk/component/web/src/main/java/org/exoplatform/web/application/javascript/JavascriptRemoval.java 2010-02-08 10:32:10 UTC (rev 1553)
+++ portal/trunk/component/web/src/main/java/org/exoplatform/web/application/javascript/JavascriptRemoval.java 2010-02-08 13:54:36 UTC (rev 1554)
@@ -62,20 +62,15 @@
}
}
- /** Remove javascript deployed in this web app * */
+ /**
+ * Removes javascript deployed in this web app.
+ *
+ * @param scontext the servlet context
+ */
private void removeJavascript(ServletContext scontext)
{
String webApp = scontext.getContextPath();
- List<JavascriptKey> jsKeys = JavascriptDependentManager.getDeployedJScripts(webApp);
- if (jsKeys == null)
- {
- return;
- }
- for (JavascriptKey key : jsKeys)
- {
- javascriptService.removeJavascript(key, scontext);
- }
- JavascriptDependentManager.clearAssociatedJScripts(webApp);
+ javascriptService.remove(scontext);
}
private void refreshJavascript()
Modified: portal/trunk/component/web/src/main/java/org/exoplatform/web/application/javascript/JavascriptTask.java
===================================================================
--- portal/trunk/component/web/src/main/java/org/exoplatform/web/application/javascript/JavascriptTask.java 2010-02-08 10:32:10 UTC (rev 1553)
+++ portal/trunk/component/web/src/main/java/org/exoplatform/web/application/javascript/JavascriptTask.java 2010-02-08 13:54:36 UTC (rev 1554)
@@ -31,21 +31,20 @@
public class JavascriptTask
{
- private List<JavascriptKey> jsKeys;
+ private List<Javascript> scripts;
public JavascriptTask()
{
- jsKeys = new ArrayList<JavascriptKey>();
+ scripts = new ArrayList<Javascript>();
}
public void execute(JavascriptConfigService service, ServletContext scontext)
{
- service.addJavascripts(jsKeys, scontext);
- JavascriptDependentManager.addJavascriptDependent(scontext.getContextPath(), jsKeys);
+ service.addJavascripts(scripts);
}
- public void addJSKey(String moduleName, String scriptPath, Integer priority)
+ public void addScript(Javascript script)
{
- jsKeys.add(new JavascriptKey(moduleName, scriptPath, priority));
+ scripts.add(script);
}
}
Modified: portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/JCRPersister.java
===================================================================
--- portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/JCRPersister.java 2010-02-08 10:32:10 UTC (rev 1553)
+++ portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/JCRPersister.java 2010-02-08 13:54:36 UTC (rev 1554)
@@ -56,8 +56,8 @@
public void initializeBuilderFor(List<Class> mappingClasses) throws Exception
{
ChromatticBuilder builder = ChromatticBuilder.create();
- builder.setOption(ChromatticBuilder.INSTRUMENTOR_CLASSNAME, "org.chromattic.apt.InstrumentorImpl");
- builder.setOption(ChromatticBuilder.SESSION_LIFECYCLE_CLASSNAME, WSRPSessionLifeCycle.class.getName());
+ builder.setOptionValue(ChromatticBuilder.INSTRUMENTOR_CLASSNAME, "org.chromattic.apt.InstrumentorImpl");
+ builder.setOptionValue(ChromatticBuilder.SESSION_LIFECYCLE_CLASSNAME, WSRPSessionLifeCycle.class.getName());
for (Class mappingClass : mappingClasses)
{
Modified: portal/trunk/packaging/module/src/main/javascript/portal.packaging.module.js
===================================================================
--- portal/trunk/packaging/module/src/main/javascript/portal.packaging.module.js 2010-02-08 10:32:10 UTC (rev 1553)
+++ portal/trunk/packaging/module/src/main/javascript/portal.packaging.module.js 2010-02-08 13:54:36 UTC (rev 1554)
@@ -111,7 +111,7 @@
addDependency(new Project("org.chromattic", "chromattic.spi", "jar", chromatticVersion)).
addDependency(new Project("org.chromattic", "chromattic.core", "jar", chromatticVersion)).
addDependency(new Project("org.chromattic", "chromattic.apt", "jar", chromatticVersion)).
- addDependency(new Project("org.chromattic", "chromattic.ntdef", "jar", chromatticVersion)).
+ addDependency(new Project("org.chromattic", "chromattic.ext", "jar", chromatticVersion)).
addDependency(new Project("org.reflext", "reflext.api", "jar", reflectVersion)).
addDependency(new Project("org.reflext", "reflext.core", "jar", reflectVersion)).
addDependency(new Project("org.reflext", "reflext.spi", "jar", reflectVersion)).
Modified: portal/trunk/pom.xml
===================================================================
--- portal/trunk/pom.xml 2010-02-08 10:32:10 UTC (rev 1553)
+++ portal/trunk/pom.xml 2010-02-08 13:54:36 UTC (rev 1554)
@@ -38,10 +38,10 @@
<name>GateIn - Portal</name>
<properties>
- <org.exoplatform.kernel.version>2.2.0-Beta06</org.exoplatform.kernel.version>
- <org.exoplatform.core.version>2.3.0-Beta06</org.exoplatform.core.version>
- <org.exoplatform.ws.version>2.1.0-Beta06</org.exoplatform.ws.version>
- <org.exoplatform.jcr.version>1.12.0-Beta06</org.exoplatform.jcr.version>
+ <org.exoplatform.kernel.version>2.2.0-CR1</org.exoplatform.kernel.version>
+ <org.exoplatform.core.version>2.3.0-CR1</org.exoplatform.core.version>
+ <org.exoplatform.ws.version>2.1.0-CR1</org.exoplatform.ws.version>
+ <org.exoplatform.jcr.version>1.12.0-CR1</org.exoplatform.jcr.version>
<org.jibx.version>1.2.1</org.jibx.version>
<org.shindig.version>SNAPSHOT-r790473</org.shindig.version>
<org.gatein.common.version>2.0.0-CR03</org.gatein.common.version>
@@ -49,12 +49,12 @@
<org.gatein.pc.version>2.1.0-CR02</org.gatein.pc.version>
<org.picketlink.idm>1.1.0.Beta2</org.picketlink.idm>
<org.gatein.wsrp.version>1.0.0-Beta06</org.gatein.wsrp.version>
- <org.gatein.mop.version>1.0.0-Beta15</org.gatein.mop.version>
+ <org.gatein.mop.version>1.0.0-Beta16</org.gatein.mop.version>
<org.slf4j.version>1.5.6</org.slf4j.version>
<rhino.version>1.6R5</rhino.version>
<org.codehaus.groovy.version>1.6.5</org.codehaus.groovy.version>
<javax.servlet.version>2.5</javax.servlet.version>
- <version.chromattic>1.0.0-beta15</version.chromattic>
+ <version.chromattic>1.0.0-beta17</version.chromattic>
<version.reflect>1.0.0-beta5</version.reflect>
<!-- ************** -->
@@ -273,7 +273,7 @@
</dependency>
<dependency>
<groupId>org.chromattic</groupId>
- <artifactId>chromattic.ntdef</artifactId>
+ <artifactId>chromattic.ext</artifactId>
<version>${version.chromattic}</version>
</dependency>
@@ -523,6 +523,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
+ <argLine>-Xms512m -Xmx512m</argLine>
<systemProperties>
<property>
<name>org.apache.commons.logging.Log</name>
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 2010-02-08 10:32:10 UTC (rev 1553)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/common/common-configuration.xml 2010-02-08 13:54:36 UTC (rev 1554)
@@ -24,6 +24,23 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"
xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd">
+
+ <component>
+ <key>org.jboss.cache.transaction.TransactionManagerLookup</key>
+ <type>org.jboss.cache.transaction.JBossStandaloneJTAManagerLookup</type>
+ </component>
+
+ <component>
+ <key>org.exoplatform.services.transaction.TransactionService</key>
+ <type>org.exoplatform.services.transaction.jbosscache.ArjunaTransactionService</type>
+ <init-params>
+ <value-param>
+ <name>timeout</name>
+ <value>300</value>
+ </value-param>
+ </init-params>
+ </component>
+
<component>
<key>org.exoplatform.services.naming.InitialContextInitializer</key>
<type>org.exoplatform.commons.InitialContextInitializer2</type>
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 2010-02-08 10:32:10 UTC (rev 1553)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/repository-configuration.xml 2010-02-08 13:54:36 UTC (rev 1554)
@@ -57,21 +57,42 @@
</initializer>
<cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache">
<properties>
- <property name="jbosscache-configuration" value="conf/jcr/jbosscache/${gatein.jcr.config.type}/config-system.xml" />
+ <property name="jbosscache-configuration" value="conf/jcr/jbosscache/${gatein.jcr.config.type}/config.xml" />
+ <property name="jgroups-configuration" value="jar:/conf/jcr/jbosscache/cluster/udp-mux.xml" />
+ <property name="jgroups-multiplexer-stack" value="true" />
+ <property name="jbosscache-cluster-name" value="JCR-cluster-repository-system" />
</properties>
</cache>
<query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">
<properties>
<property name="index-dir" value="${gatein.jcr.index.data.dir}/system${container.name.suffix}"/>
- <property name="changesfilter-class" value="${gatein.jcr.changefilterclass}" />
- <property name="changesfilter-config-path" value="conf/jcr/jbosscache/cluster/indexer-config-system.xml" />
+ <property name="changesfilter-class" value="${gatein.jcr.index.changefilterclass}" />
+ <property name="jbosscache-configuration" value="conf/jcr/jbosscache/cluster/indexer-config.xml" />
+ <property name="jgroups-configuration" value="jar:/conf/jcr/jbosscache/cluster/udp-mux.xml" />
+ <property name="jgroups-multiplexer-stack" value="true" />
+ <property name="jbosscache-cluster-name" value="JCR-cluster-indexer-repository-system" />
<property name="max-volatile-time" value="60" />
</properties>
</query-handler>
<lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManager">
<properties>
<property name="time-out" value="15m" />
- <property name="jbosscache-configuration" value="conf/jcr/jbosscache/${gatein.jcr.config.type}/lock-config-system.xml" />
+ <property name="jbosscache-configuration" value="conf/jcr/jbosscache/${gatein.jcr.config.type}/lock-config.xml" />
+ <property name="jgroups-configuration" value="jar:/conf/jcr/jbosscache/cluster/udp-mux.xml" />
+ <property name="jgroups-multiplexer-stack" value="true" />
+ <property name="jbosscache-cluster-name" value="JCR-cluster-locks-repository-system" />
+ <property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlocks_repository_system" />
+ <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="jcrlocks_repositoty_system_pk" />
+ <property name="jbosscache-cl-cache.jdbc.fqn.column" value="fqn" />
+ <property name="jbosscache-cl-cache.jdbc.fqn.type" value="VARCHAR(512)" />
+ <property name="jbosscache-cl-cache.jdbc.node.column" value="node" />
+<!--
+ <property name="jbosscache-cl-cache.jdbc.node.type" value="LONGBLOB" />
+-->
+ <property name="jbosscache-cl-cache.jdbc.parent.column" value="parent" />
+ <property name="jbosscache-cl-cache.jdbc.datasource" value="${gatein.datasource.name}${container.name.suffix}" />
</properties>
</lock-manager>
</workspace>
@@ -106,21 +127,42 @@
</initializer>
<cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache">
<properties>
- <property name="jbosscache-configuration" value="conf/jcr/jbosscache/${gatein.jcr.config.type}/config-portal-system.xml" />
+ <property name="jbosscache-configuration" value="conf/jcr/jbosscache/${gatein.jcr.config.type}/config.xml" />
+ <property name="jgroups-configuration" value="jar:/conf/jcr/jbosscache/cluster/udp-mux.xml" />
+ <property name="jgroups-multiplexer-stack" value="true" />
+ <property name="jbosscache-cluster-name" value="JCR-cluster-repository-portal-system" />
</properties>
</cache>
<query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">
<properties>
<property name="index-dir" value="${gatein.jcr.index.data.dir}/portal-system${container.name.suffix}"/>
- <property name="changesfilter-class" value="${gatein.jcr.changefilterclass}" />
- <property name="changesfilter-config-path" value="conf/jcr/jbosscache/cluster/indexer-config-portal-system.xml" />
+ <property name="changesfilter-class" value="${gatein.jcr.index.changefilterclass}" />
+ <property name="jbosscache-configuration" value="conf/jcr/jbosscache/cluster/indexer-config.xml" />
+ <property name="jgroups-configuration" value="jar:/conf/jcr/jbosscache/cluster/udp-mux.xml" />
+ <property name="jgroups-multiplexer-stack" value="true" />
+ <property name="jbosscache-cluster-name" value="JCR-cluster-indexer-repository-portal-system" />
<property name="max-volatile-time" value="60" />
</properties>
</query-handler>
<lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManager">
<properties>
<property name="time-out" value="15m" />
- <property name="jbosscache-configuration" value="conf/jcr/jbosscache/${gatein.jcr.config.type}/lock-config-portal-system.xml" />
+ <property name="jbosscache-configuration" value="conf/jcr/jbosscache/${gatein.jcr.config.type}/lock-config.xml" />
+ <property name="jgroups-configuration" value="jar:/conf/jcr/jbosscache/cluster/udp-mux.xml" />
+ <property name="jgroups-multiplexer-stack" value="true" />
+ <property name="jbosscache-cluster-name" value="JCR-cluster-locks-repository-system" />
+ <property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlocks_repository_portal_system" />
+ <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="jcrlocks_repositoty_portal_system_pk" />
+ <property name="jbosscache-cl-cache.jdbc.fqn.column" value="fqn" />
+ <property name="jbosscache-cl-cache.jdbc.fqn.type" value="VARCHAR(512)" />
+ <property name="jbosscache-cl-cache.jdbc.node.column" value="node" />
+<!--
+ <property name="jbosscache-cl-cache.jdbc.node.type" value="LONGBLOB" />
+-->
+ <property name="jbosscache-cl-cache.jdbc.parent.column" value="parent" />
+ <property name="jbosscache-cl-cache.jdbc.datasource" value="${gatein.datasource.name}${container.name.suffix}" />
</properties>
</lock-manager>
</workspace>
@@ -155,21 +197,42 @@
</initializer>
<cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache">
<properties>
- <property name="jbosscache-configuration" value="conf/jcr/jbosscache/${gatein.jcr.config.type}/config-portal-work.xml" />
+ <property name="jbosscache-configuration" value="conf/jcr/jbosscache/${gatein.jcr.config.type}/config.xml" />
+ <property name="jgroups-configuration" value="jar:/conf/jcr/jbosscache/cluster/udp-mux.xml" />
+ <property name="jgroups-multiplexer-stack" value="true" />
+ <property name="jbosscache-cluster-name" value="JCR-cluster-repository-portal-work" />
</properties>
</cache>
<query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">
<properties>
<property name="index-dir" value="${gatein.jcr.index.data.dir}/portal-work${container.name.suffix}"/>
- <property name="changesfilter-class" value="${gatein.jcr.changefilterclass}" />
- <property name="changesfilter-config-path" value="conf/jcr/jbosscache/cluster/indexer-config-portal-work.xml" />
+ <property name="changesfilter-class" value="${gatein.jcr.index.changefilterclass}" />
+ <property name="jbosscache-configuration" value="conf/jcr/jbosscache/cluster/indexer-config.xml" />
+ <property name="jgroups-configuration" value="jar:/conf/jcr/jbosscache/cluster/udp-mux.xml" />
+ <property name="jgroups-multiplexer-stack" value="true" />
+ <property name="jbosscache-cluster-name" value="JCR-cluster-indexer-repository-portal-work" />
<property name="max-volatile-time" value="60" />
</properties>
</query-handler>
<lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManager">
<properties>
<property name="time-out" value="15m" />
- <property name="jbosscache-configuration" value="conf/jcr/jbosscache/${gatein.jcr.config.type}/lock-config-portal-work.xml" />
+ <property name="jbosscache-configuration" value="conf/jcr/jbosscache/${gatein.jcr.config.type}/lock-config.xml" />
+ <property name="jgroups-configuration" value="jar:/conf/jcr/jbosscache/cluster/udp-mux.xml" />
+ <property name="jgroups-multiplexer-stack" value="true" />
+ <property name="jbosscache-cluster-name" value="JCR-cluster-locks-repository-system" />
+ <property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlocks_repository_portal_work" />
+ <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="jcrlocks_repositoty_portal_work_pk" />
+ <property name="jbosscache-cl-cache.jdbc.fqn.column" value="fqn" />
+ <property name="jbosscache-cl-cache.jdbc.fqn.type" value="VARCHAR(512)" />
+ <property name="jbosscache-cl-cache.jdbc.node.column" value="node" />
+<!--
+ <property name="jbosscache-cl-cache.jdbc.node.type" value="LONGBLOB" />
+-->
+ <property name="jbosscache-cl-cache.jdbc.parent.column" value="parent" />
+ <property name="jbosscache-cl-cache.jdbc.datasource" value="${gatein.datasource.name}${container.name.suffix}" />
</properties>
</lock-manager>
</workspace>
@@ -200,26 +263,47 @@
<initializer class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer">
<properties>
<property name="root-nodetype" value="nt:unstructured"/>
- <property name="root-permissions" value="any read;*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove"/>
+ <property name="root-permissions" value="any read;*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove"/>
</properties>
</initializer>
<cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache">
<properties>
- <property name="jbosscache-configuration" value="conf/jcr/jbosscache/${gatein.jcr.config.type}/config-wsrp-system.xml" />
+ <property name="jbosscache-configuration" value="conf/jcr/jbosscache/${gatein.jcr.config.type}/config.xml" />
+ <property name="jgroups-configuration" value="jar:/conf/jcr/jbosscache/cluster/udp-mux.xml" />
+ <property name="jgroups-multiplexer-stack" value="true" />
+ <property name="jbosscache-cluster-name" value="JCR-cluster-repository-wsrp-system" />
</properties>
</cache>
<query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">
<properties>
- <property name="index-dir" value="${gatein.jcr.index.data.dir}/wsrp${container.name.suffix}"/>
- <property name="changesfilter-class" value="${gatein.jcr.changefilterclass}" />
- <property name="changesfilter-config-path" value="conf/jcr/jbosscache/cluster/indexer-config-wsrp-system.xml" />
+ <property name="index-dir" value="${gatein.jcr.index.data.dir}/wsrp-system{container.name.suffix}"/>
+ <property name="changesfilter-class" value="${gatein.jcr.index.changefilterclass}" />
+ <property name="jbosscache-configuration" value="conf/jcr/jbosscache/cluster/indexer-config.xml" />
+ <property name="jgroups-configuration" value="jar:/conf/jcr/jbosscache/cluster/udp-mux.xml" />
+ <property name="jgroups-multiplexer-stack" value="true" />
+ <property name="jbosscache-cluster-name" value="JCR-cluster-indexer-repository-wsrp-system" />
<property name="max-volatile-time" value="60" />
</properties>
</query-handler>
<lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManager">
<properties>
<property name="time-out" value="15m" />
- <property name="jbosscache-configuration" value="conf/jcr/jbosscache/${gatein.jcr.config.type}/lock-config-wsrp-system.xml" />
+ <property name="jbosscache-configuration" value="conf/jcr/jbosscache/${gatein.jcr.config.type}/lock-config.xml" />
+ <property name="jgroups-configuration" value="jar:/conf/jcr/jbosscache/cluster/udp-mux.xml" />
+ <property name="jgroups-multiplexer-stack" value="true" />
+ <property name="jbosscache-cluster-namejbosscache-cluster-name" value="JCR-cluster-locks-repository-system" />
+ <property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlocks_wsrp_system_system" />
+ <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="jcrlocks_repositoty_wsrp_system_pk" />
+ <property name="jbosscache-cl-cache.jdbc.fqn.column" value="fqn" />
+ <property name="jbosscache-cl-cache.jdbc.fqn.type" value="VARCHAR(512)" />
+ <property name="jbosscache-cl-cache.jdbc.node.column" value="node" />
+<!--
+ <property name="jbosscache-cl-cache.jdbc.node.type" value="LONGBLOB" />
+-->
+ <property name="jbosscache-cl-cache.jdbc.parent.column" value="parent" />
+ <property name="jbosscache-cl-cache.jdbc.datasource" value="${gatein.datasource.name}${container.name.suffix}" />
</properties>
</lock-manager>
</workspace>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/application-registry-configuration.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/application-registry-configuration.xml 2010-02-08 10:32:10 UTC (rev 1553)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/application-registry-configuration.xml 2010-02-08 13:54:36 UTC (rev 1554)
@@ -545,9 +545,9 @@
<value>org.exoplatform.application.gadget.impl.GadgetDefinition</value>
<value>org.exoplatform.application.gadget.impl.LocalGadgetData</value>
<value>org.exoplatform.application.gadget.impl.RemoteGadgetData</value>
- <value>org.chromattic.ntdef.NTFile</value>
- <value>org.chromattic.ntdef.NTFolder</value>
- <value>org.chromattic.ntdef.NTResource</value>
+ <value>org.chromattic.ext.ntdef.NTFile</value>
+ <value>org.chromattic.ext.ntdef.NTFolder</value>
+ <value>org.chromattic.ext.ntdef.NTResource</value>
</values-param>
</init-params>
</component-plugin>
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 2010-02-08 10:32:10 UTC (rev 1553)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal-configuration.xml 2010-02-08 13:54:36 UTC (rev 1554)
@@ -217,6 +217,7 @@
<value>org.exoplatform.portal.pom.spi.portlet.PreferenceState</value>
<value>org.exoplatform.portal.pom.spi.gadget.GadgetState</value>
<value>org.exoplatform.portal.pom.spi.wsrp.WSRPState</value>
+ <value>org.exoplatform.portal.mop.ProtectedResource</value>
</values-param>
</init-params>
</component-plugin>
16 years, 2 months
- 1
- 0
gatein SVN: r1553 - in portal/trunk: webui/portal/src/main/java/org/exoplatform/portal/webui/page and 1 other directory.
by do-not-reply＠jboss.org
Author: liem_nguyen
Date: 2010-02-08 05:32:10 -0500 (Mon, 08 Feb 2010)
New Revision: 1553
Modified:
portal/trunk/portlet/dashboard/src/main/java/org/exoplatform/dashboard/webui/component/UITabPaneDashboard.java
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBody.java
Log:
GTNPORTAL-601 Encountered an error and could not be displayed when delete tab of Dashbaord page
Modified: portal/trunk/portlet/dashboard/src/main/java/org/exoplatform/dashboard/webui/component/UITabPaneDashboard.java
===================================================================
--- portal/trunk/portlet/dashboard/src/main/java/org/exoplatform/dashboard/webui/component/UITabPaneDashboard.java 2010-02-08 10:09:43 UTC (rev 1552)
+++ portal/trunk/portlet/dashboard/src/main/java/org/exoplatform/dashboard/webui/component/UITabPaneDashboard.java 2010-02-08 10:32:10 UTC (rev 1553)
@@ -200,8 +200,11 @@
Page page = configService.getPage(pageRef);
if (page != null)
configService.remove(page);
+ UIPortal uiPortal = Util.getUIPortal();
+ // Remove from cache
+ uiPortal.setUIPage(pageRef, null);
}
- uiPortal.setSelectedNode(selectedNode);
+ //uiPortal.setSelectedNode(selectedNode);
configService.update(pageNavigation);
}
}
@@ -264,7 +267,7 @@
parentNode.getChildren().add(pageNode);
}
- uiPortal.setSelectedNode(pageNode);
+ //uiPortal.setSelectedNode(pageNode);
configService.create(page);
configService.update(pageNavigation);
@@ -425,7 +428,7 @@
return;
}
String uri = tabPane.createNewPageNode(newTabLabel);
-
+
//If new node is created with success, then redirect to it
if (uri != null)
{
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBody.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBody.java 2010-02-08 10:09:43 UTC (rev 1552)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBody.java 2010-02-08 10:32:10 UTC (rev 1553)
@@ -156,6 +156,7 @@
uiPage = createUIComponent(context, UIPage.class, null, null);
}
PortalDataMapper.toUIPage(uiPage, page);
+ uiPortal.setUIPage(page.getId(), uiPage);
return uiPage;
}
16 years, 2 months
- 1
- 0