gatein SVN: r4745 - in epp/portal/branches/EPP_5_1_Branch: component/common/src/test/java/org/exoplatform/commons and 2 other directories.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-10-20 10:00:18 -0400 (Wed, 20 Oct 2010)
New Revision: 4745
Added:
epp/portal/branches/EPP_5_1_Branch/component/common/src/main/java/org/exoplatform/commons/xml/DOMSerializer.java
epp/portal/branches/EPP_5_1_Branch/component/common/src/test/java/org/exoplatform/commons/xml/
epp/portal/branches/EPP_5_1_Branch/component/common/src/test/java/org/exoplatform/commons/xml/TestDOMSerializer.java
Removed:
epp/portal/branches/EPP_5_1_Branch/component/common/src/test/java/org/exoplatform/commons/xml/TestDOMSerializer.java
Modified:
epp/portal/branches/EPP_5_1_Branch/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestContext.java
Log:
JBEPP-556: Performance Improvements
GTNPORTAL-1569: Performance problem with JSR286 header serialization in portal
Copied: epp/portal/branches/EPP_5_1_Branch/component/common/src/main/java/org/exoplatform/commons/xml/DOMSerializer.java (from rev 4710, portal/trunk/component/common/src/main/java/org/exoplatform/commons/xml/DOMSerializer.java)
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/component/common/src/main/java/org/exoplatform/commons/xml/DOMSerializer.java (rev 0)
+++ epp/portal/branches/EPP_5_1_Branch/component/common/src/main/java/org/exoplatform/commons/xml/DOMSerializer.java 2010-10-20 14:00:18 UTC (rev 4745)
@@ -0,0 +1,162 @@
+/*
+ * Copyright (C) 2010 eXo Platform SAS.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.exoplatform.commons.xml;
+
+import org.gatein.common.logging.Logger;
+import org.gatein.common.logging.LoggerFactory;
+import org.w3c.dom.Attr;
+import org.w3c.dom.CharacterData;
+import org.w3c.dom.Element;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+import javax.xml.stream.FactoryConfigurationError;
+import javax.xml.stream.XMLOutputFactory;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamWriter;
+import java.io.IOException;
+import java.io.Writer;
+
+/**
+ * An high performance and custom DOM serializer based on stax {@link XMLStreamWriter}.
+ *
+ * <p>The serializer takes care of correctly writing empty script elements with their non empty form, because we want to ouput
+ * xhtml text that will still work on html browsers.</p>
+ *
+ * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
+ * @version $Revision$
+ */
+public class DOMSerializer
+{
+
+ /** . */
+ private static final Logger log = LoggerFactory.getLogger(DOMSerializer.class);
+
+ /** Thread safe. */
+ private static final XMLOutputFactory outputFactory;
+
+ /** . */
+ private static final String DEFAULT_XML_OUTPUT_FACTORY = "com.sun.xml.internal.stream.XMLOutputFactoryImpl";
+
+ static
+ {
+ XMLOutputFactory tmp;
+ try
+ {
+ Class<XMLOutputFactory> cl = (Class<XMLOutputFactory>)Thread.currentThread().getContextClassLoader().loadClass(DEFAULT_XML_OUTPUT_FACTORY);
+ tmp = cl.newInstance();
+ }
+ catch (Exception e)
+ {
+ tmp = XMLOutputFactory.newInstance();
+ log.warn("Could not instantiate " + DEFAULT_XML_OUTPUT_FACTORY + " will use default provided by runtime instead " +
+ tmp.getClass().getName());
+ }
+
+ //
+ outputFactory = tmp;
+ }
+
+ public static void serialize(Element element, Writer writer) throws IOException, XMLStreamException
+ {
+ XMLStreamWriter xml = outputFactory.createXMLStreamWriter(writer);
+ serialize(element, xml);
+ xml.writeEndDocument();
+ xml.flush();
+ }
+
+ private static void serialize(Element element, XMLStreamWriter writer) throws IOException, XMLStreamException
+ {
+ String tagName = element.getTagName();
+
+ // Determine if empty
+ // Note that we won't accumulate the elements that would be serialized for performance reason
+ // we will just reiterate later before ending the element
+ boolean empty;
+ if (tagName.equalsIgnoreCase("script"))
+ {
+ empty = false;
+ }
+ else
+ {
+ empty = true;
+ NodeList children = element.getChildNodes();
+ int length = children.getLength();
+ for (int i = 0;i < length && empty;i++)
+ {
+ Node child = children.item(i);
+ if (child instanceof CharacterData)
+ {
+ empty = false;
+ }
+ else if (child instanceof Element)
+ {
+ empty = false;
+ }
+ }
+ }
+
+ //
+ if (empty)
+ {
+ writer.writeEmptyElement(tagName);
+ }
+ else
+ {
+ writer.writeStartElement(tagName);
+ }
+
+ // Write attributes
+ if (element.hasAttributes())
+ {
+ NamedNodeMap attrs = element.getAttributes();
+ int length = attrs.getLength();
+ for (int i = 0;i < length;i++)
+ {
+ Attr attr = (Attr)attrs.item(i);
+ writer.writeAttribute(attr.getName(), attr.getValue());
+ }
+ }
+
+ //
+ if (!empty)
+ {
+ // Serialize children that are worth to be
+ NodeList children = element.getChildNodes();
+ int length = children.getLength();
+ for (int i = 0;i < length;i++)
+ {
+ Node child = children.item(i);
+ if (child instanceof CharacterData)
+ {
+ writer.writeCData(((CharacterData)child).getData());
+ }
+ else if (child instanceof Element)
+ {
+ serialize((Element)child, writer);
+ }
+ }
+
+ // Close
+ writer.writeEndElement();
+ }
+ }
+}
Copied: epp/portal/branches/EPP_5_1_Branch/component/common/src/test/java/org/exoplatform/commons/xml (from rev 4710, portal/trunk/component/common/src/test/java/org/exoplatform/commons/xml)
Deleted: epp/portal/branches/EPP_5_1_Branch/component/common/src/test/java/org/exoplatform/commons/xml/TestDOMSerializer.java
===================================================================
--- portal/trunk/component/common/src/test/java/org/exoplatform/commons/xml/TestDOMSerializer.java 2010-10-18 13:40:27 UTC (rev 4710)
+++ epp/portal/branches/EPP_5_1_Branch/component/common/src/test/java/org/exoplatform/commons/xml/TestDOMSerializer.java 2010-10-20 14:00:18 UTC (rev 4745)
@@ -1,69 +0,0 @@
-/*
- * Copyright (C) 2010 eXo Platform SAS.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.exoplatform.commons.xml;
-
-import junit.framework.TestCase;
-import org.w3c.dom.Element;
-import org.xml.sax.InputSource;
-
-import javax.xml.parsers.DocumentBuilderFactory;
-import java.io.StringReader;
-import java.io.StringWriter;
-
-/**
- * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
- * @version $Revision$
- */
-public class TestDOMSerializer extends TestCase
-{
-
- @Override
- protected void setUp() throws Exception
- {
- }
-
- public void testScriptNoAttributes() throws Exception
- {
- assertSerialization("<script></script>", "<script/>");
- }
-
- public void testScriptWithAttribute() throws Exception
- {
- assertSerialization("<script type=\"text/javascript\"></script>", "<script type='text/javascript'/>");
- }
-
- public void testMetaNoAttributes() throws Exception
- {
- assertSerialization("<meta/>", "<meta/>");
- }
-
- public void testMetaWithAttribute() throws Exception
- {
- assertSerialization("<meta http-equiv=\"Content-Type\"/>", "<meta http-equiv='Content-Type'></meta>");
- }
-
- private void assertSerialization(String expectedMarkup, String markup) throws Exception
- {
- Element elt = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(new InputSource(new StringReader(markup))).getDocumentElement();
- StringWriter writer = new StringWriter();
- DOMSerializer.serialize(elt, writer);
- assertEquals(expectedMarkup, writer.toString());
- }
-}
Copied: epp/portal/branches/EPP_5_1_Branch/component/common/src/test/java/org/exoplatform/commons/xml/TestDOMSerializer.java (from rev 4710, portal/trunk/component/common/src/test/java/org/exoplatform/commons/xml/TestDOMSerializer.java)
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/component/common/src/test/java/org/exoplatform/commons/xml/TestDOMSerializer.java (rev 0)
+++ epp/portal/branches/EPP_5_1_Branch/component/common/src/test/java/org/exoplatform/commons/xml/TestDOMSerializer.java 2010-10-20 14:00:18 UTC (rev 4745)
@@ -0,0 +1,69 @@
+/*
+ * Copyright (C) 2010 eXo Platform SAS.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.exoplatform.commons.xml;
+
+import junit.framework.TestCase;
+import org.w3c.dom.Element;
+import org.xml.sax.InputSource;
+
+import javax.xml.parsers.DocumentBuilderFactory;
+import java.io.StringReader;
+import java.io.StringWriter;
+
+/**
+ * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
+ * @version $Revision$
+ */
+public class TestDOMSerializer extends TestCase
+{
+
+ @Override
+ protected void setUp() throws Exception
+ {
+ }
+
+ public void testScriptNoAttributes() throws Exception
+ {
+ assertSerialization("<script></script>", "<script/>");
+ }
+
+ public void testScriptWithAttribute() throws Exception
+ {
+ assertSerialization("<script type=\"text/javascript\"></script>", "<script type='text/javascript'/>");
+ }
+
+ public void testMetaNoAttributes() throws Exception
+ {
+ assertSerialization("<meta/>", "<meta/>");
+ }
+
+ public void testMetaWithAttribute() throws Exception
+ {
+ assertSerialization("<meta http-equiv=\"Content-Type\"/>", "<meta http-equiv='Content-Type'></meta>");
+ }
+
+ private void assertSerialization(String expectedMarkup, String markup) throws Exception
+ {
+ Element elt = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(new InputSource(new StringReader(markup))).getDocumentElement();
+ StringWriter writer = new StringWriter();
+ DOMSerializer.serialize(elt, writer);
+ assertEquals(expectedMarkup, writer.toString());
+ }
+}
Modified: epp/portal/branches/EPP_5_1_Branch/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestContext.java
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestContext.java 2010-10-20 07:55:55 UTC (rev 4744)
+++ epp/portal/branches/EPP_5_1_Branch/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestContext.java 2010-10-20 14:00:18 UTC (rev 4745)
@@ -22,6 +22,7 @@
import org.exoplatform.Constants;
import org.exoplatform.commons.utils.ExpressionUtil;
import org.exoplatform.commons.utils.PortalPrinter;
+import org.exoplatform.commons.xml.DOMSerializer;
import org.exoplatform.container.ExoContainer;
import org.exoplatform.portal.config.UserPortalConfigService;
import org.exoplatform.portal.config.model.Page;
@@ -40,19 +41,12 @@
import org.gatein.common.http.QueryStringParser;
import org.w3c.dom.Element;
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-
import java.io.IOException;
import java.io.StringWriter;
import java.io.UnsupportedEncodingException;
import java.io.Writer;
import java.net.URLDecoder;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
@@ -432,35 +426,16 @@
public List<String> getExtraMarkupHeadersAsStrings() throws Exception
{
List<String> markupHeaders = new ArrayList<String>();
-
if (extraMarkupHeaders != null && !extraMarkupHeaders.isEmpty())
{
- Transformer transformer = TransformerFactory.newInstance().newTransformer();
- transformer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "yes");
-
+ StringWriter sw = new StringWriter();
for (Element element : extraMarkupHeaders)
{
- DOMSource source = new DOMSource(element);
- StreamResult result = new StreamResult(new StringWriter());
-
- // we want to ouput xhtml text that will still work on html browsers.
- // In order to do this we need to have the script tag be not self closing
- // which it will try and do with the xml or xhtml method. If we just use
- // the html method then the other tags will not be closed.
- if (element.getNodeName().equalsIgnoreCase("script"))
- {
- transformer.setOutputProperty(OutputKeys.METHOD, "html");
- }
- else
- {
- transformer.setOutputProperty(OutputKeys.METHOD, "xml");
- }
- transformer.transform(source, result);
- markupHeaders.add(result.getWriter().toString());
+ DOMSerializer.serialize(element, sw);
+ markupHeaders.add(sw.toString());
}
}
-
- return markupHeaders;
+ return markupHeaders;
}
/**
13 years, 8 months
gatein SVN: r4744 - in epp/portal/branches/EPP_5_1_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UISelector/UIItemSelector: background and 1 other directory.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-10-20 03:55:55 -0400 (Wed, 20 Oct 2010)
New Revision: 4744
Modified:
epp/portal/branches/EPP_5_1_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UISelector/UIItemSelector/Stylesheet.css
epp/portal/branches/EPP_5_1_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UISelector/UIItemSelector/background/TemplateContainer.jpg
Log:
JBEPP-547: Change previews for portal templates when creating new portal
Modified: epp/portal/branches/EPP_5_1_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UISelector/UIItemSelector/Stylesheet.css
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UISelector/UIItemSelector/Stylesheet.css 2010-10-20 05:35:51 UTC (rev 4743)
+++ epp/portal/branches/EPP_5_1_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UISelector/UIItemSelector/Stylesheet.css 2010-10-20 07:55:55 UTC (rev 4744)
@@ -56,7 +56,7 @@
.UIItemSelector .ItemDetailList .TemplateContainer .BasicPortalImage {
height: 222px;
- background: url('background/TemplateContainer.jpg') no-repeat center -392px;
+ background: url('background/TemplateContainer.jpg') no-repeat center -1052px;
margin-top: 9px;
}
@@ -683,4 +683,4 @@
width: 270px; height: 170px;
margin: auto;
background: url('background/ItemSelector.gif') no-repeat left -1700px;
-}
\ No newline at end of file
+}
Modified: epp/portal/branches/EPP_5_1_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UISelector/UIItemSelector/background/TemplateContainer.jpg
===================================================================
(Binary files differ)
13 years, 8 months
gatein SVN: r4743 - in epp/docs/branches/EPP_5_1_Branch/Site_Publisher_User_Guide/en-US: modules/Usage and 1 other directory.
by do-not-reply＠jboss.org
Author: smumford
Date: 2010-10-20 01:35:51 -0400 (Wed, 20 Oct 2010)
New Revision: 4743
Modified:
epp/docs/branches/EPP_5_1_Branch/Site_Publisher_User_Guide/en-US/Book_Info.xml
epp/docs/branches/EPP_5_1_Branch/Site_Publisher_User_Guide/en-US/Revision_History.xml
epp/docs/branches/EPP_5_1_Branch/Site_Publisher_User_Guide/en-US/modules/Usage/SitesExplorer.xml
Log:
JBEPP-518: Updates for staging push
Modified: epp/docs/branches/EPP_5_1_Branch/Site_Publisher_User_Guide/en-US/Book_Info.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/Site_Publisher_User_Guide/en-US/Book_Info.xml 2010-10-20 03:46:09 UTC (rev 4742)
+++ epp/docs/branches/EPP_5_1_Branch/Site_Publisher_User_Guide/en-US/Book_Info.xml 2010-10-20 05:35:51 UTC (rev 4743)
@@ -9,10 +9,10 @@
<productname>JBoss Enterprise Portal Platform</productname>
<productnumber>5</productnumber>
<edition>1</edition>
- <pubsnumber>1.3</pubsnumber>
+ <pubsnumber>1.5</pubsnumber>
<abstract>
<para>
- This document provides an easy to follow guide to the functions and options available in &PRODUCT;'s Site Publisher add-on. It is intended to be accessible and useful to both experienced and novice portal users.
+ This document provides an easy to follow guide to the functions and options available in the &PRODUCT; Site Publisher extension. It is intended to be accessible and useful to both experienced and novice portal users.
</para>
</abstract>
Modified: epp/docs/branches/EPP_5_1_Branch/Site_Publisher_User_Guide/en-US/Revision_History.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/Site_Publisher_User_Guide/en-US/Revision_History.xml 2010-10-20 03:46:09 UTC (rev 4742)
+++ epp/docs/branches/EPP_5_1_Branch/Site_Publisher_User_Guide/en-US/Revision_History.xml 2010-10-20 05:35:51 UTC (rev 4743)
@@ -7,6 +7,34 @@
<title>Revision History</title>
<simpara>
<revhistory>
+ <revision>
+ <revnumber>1-1.5</revnumber>
+ <date></date>
+ <author>
+ <firstname>Scott</firstname>
+ <surname>Mumford</surname>
+ <email>smumford(a)redhat.com</email>
+ </author>
+ <revdescription>
+ <simplelist>
+ <member>Further docbook conversion.</member>
+ </simplelist>
+ </revdescription>
+ </revision>
+ <revision>
+ <revnumber>1-1.4</revnumber>
+ <date></date>
+ <author>
+ <firstname>Joshua</firstname>
+ <surname>Wulf</surname>
+ <email>jwulf(a)redhat.com</email>
+ </author>
+ <revdescription>
+ <simplelist>
+ <member>Removed problematic characters in book abstract as workaround to Publican bug</member>
+ </simplelist>
+ </revdescription>
+ </revision>
<revision>
<revnumber>1-1.3</revnumber>
<date>Mon Oct 11 2010</date>
Modified: epp/docs/branches/EPP_5_1_Branch/Site_Publisher_User_Guide/en-US/modules/Usage/SitesExplorer.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/Site_Publisher_User_Guide/en-US/modules/Usage/SitesExplorer.xml 2010-10-20 03:46:09 UTC (rev 4742)
+++ epp/docs/branches/EPP_5_1_Branch/Site_Publisher_User_Guide/en-US/modules/Usage/SitesExplorer.xml 2010-10-20 05:35:51 UTC (rev 4743)
@@ -7544,7 +7544,7 @@
Version viewing is not supported on folder nodes.
</para>
<para>
- If you click <inlinemediaobject><imageobject><imagedata fileref="images/viewdetails.png"/></imageobject></inlinemediaobject> while the selected node is a folder, a message to this effect will appear.
+ If you click <inlinemediaobject><imageobject><imagedata fileref="images/viewdetailsbutton.png"/></imageobject></inlinemediaobject> while the selected node is a folder, a message to this effect will appear.
</para>
</note>
</section> <!-- Close Section: 3.3.7.1.3 View Versions -->
@@ -7881,7 +7881,7 @@
</step>
<step>
<para>
- Click on <inlinemediaobject><imageobject><imagedata fileref="images/managerelationsicons.png"/></imageobject></inlinemediaobject>.
+ Click on <inlinemediaobject><imageobject><imagedata fileref="images/managerelationsicon.png"/></imageobject></inlinemediaobject>.
</para>
</step>
<step>
@@ -7963,7 +7963,7 @@
</step>
<step>
<para>
- Click on <inlinemediaobject><imageobject><imagedata fileref="images/magaeactionsbutton.png"/></imageobject></inlinemediaobject>.
+ Click on <inlinemediaobject><imageobject><imagedata fileref="images/manageactionsbutton.png"/></imageobject></inlinemediaobject>.
</para>
<para>
The <emphasis role="bold">Manage Actions</emphasis> form will appear.
13 years, 8 months
gatein SVN: r4742 - in exo/portal/branches/3.1.5-PLF_REL: component/common/src/main/java/conf/jcr/jbosscache/local and 1 other directories.
by do-not-reply＠jboss.org
Author: trong.tran
Date: 2010-10-19 23:46:09 -0400 (Tue, 19 Oct 2010)
New Revision: 4742
Modified:
exo/portal/branches/3.1.5-PLF_REL/component/common/src/main/java/conf/jcr/jbosscache/cluster/config.xml
exo/portal/branches/3.1.5-PLF_REL/component/common/src/main/java/conf/jcr/jbosscache/local/config.xml
exo/portal/branches/3.1.5-PLF_REL/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/jboss-cache-cluster.xml
exo/portal/branches/3.1.5-PLF_REL/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/jboss-cache.xml
Log:
EXOGTN-94 Revert back to use the old algorithm for jbosscache
Modified: exo/portal/branches/3.1.5-PLF_REL/component/common/src/main/java/conf/jcr/jbosscache/cluster/config.xml
===================================================================
--- exo/portal/branches/3.1.5-PLF_REL/component/common/src/main/java/conf/jcr/jbosscache/cluster/config.xml 2010-10-20 03:34:43 UTC (rev 4741)
+++ exo/portal/branches/3.1.5-PLF_REL/component/common/src/main/java/conf/jcr/jbosscache/cluster/config.xml 2010-10-20 03:46:09 UTC (rev 4742)
@@ -30,12 +30,11 @@
<!-- Eviction configuration -->
<eviction wakeUpInterval="5000">
- <default algorithmClass="org.jboss.cache.eviction.ExpirationAlgorithm"
- actionPolicyClass="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.ParentNodeEvictionActionPolicy"
- eventQueueSize="1000000">
- <property name="maxNodes" value="1000000" />
- <property name="warnNoExpirationKey" value="false" />
- </default>
+ <default algorithmClass="org.jboss.cache.eviction.LRUAlgorithm"
+ actionPolicyClass="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.ParentNodeEvictionActionPolicy"
+ eventQueueSize="1000000">
+ <property name="maxNodes" value="5000" />
+ <property name="timeToLive" value="20000" />
+ </default>
</eviction>
-
</jbosscache>
\ No newline at end of file
Modified: exo/portal/branches/3.1.5-PLF_REL/component/common/src/main/java/conf/jcr/jbosscache/local/config.xml
===================================================================
--- exo/portal/branches/3.1.5-PLF_REL/component/common/src/main/java/conf/jcr/jbosscache/local/config.xml 2010-10-20 03:34:43 UTC (rev 4741)
+++ exo/portal/branches/3.1.5-PLF_REL/component/common/src/main/java/conf/jcr/jbosscache/local/config.xml 2010-10-20 03:46:09 UTC (rev 4742)
@@ -27,13 +27,11 @@
<invocationBatching enabled="true" />
<!-- Eviction configuration -->
- <eviction wakeUpInterval="5000">
- <default algorithmClass="org.jboss.cache.eviction.ExpirationAlgorithm"
- actionPolicyClass="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.ParentNodeEvictionActionPolicy"
- eventQueueSize="1000000">
- <property name="maxNodes" value="1000000" />
- <property name="warnNoExpirationKey" value="false" />
- </default>
- </eviction>
+ <eviction wakeUpInterval="5000">
+ <default algorithmClass="org.jboss.cache.eviction.FIFOAlgorithm" actionPolicyClass="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.ParentNodeEvictionActionPolicy" eventQueueSize="1000000">
+ <property name="maxNodes" value="5000" />
+ <property name="minTimeToLive" value="20000" />
+ </default>
+ </eviction>
</jbosscache>
Modified: exo/portal/branches/3.1.5-PLF_REL/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/jboss-cache-cluster.xml
===================================================================
--- exo/portal/branches/3.1.5-PLF_REL/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/jboss-cache-cluster.xml 2010-10-20 03:34:43 UTC (rev 4741)
+++ exo/portal/branches/3.1.5-PLF_REL/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/jboss-cache-cluster.xml 2010-10-20 03:46:09 UTC (rev 4742)
@@ -8,12 +8,11 @@
<!-- Eviction configuration -->
<eviction wakeUpInterval="5000">
- <default algorithmClass="org.jboss.cache.eviction.ExpirationAlgorithm"
- actionPolicyClass="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.ParentNodeEvictionActionPolicy"
- eventQueueSize="1000000">
- <property name="maxNodes" value="1000000" />
- <property name="warnNoExpirationKey" value="false" />
- </default>
+ <default algorithmClass="org.jboss.cache.eviction.LRUAlgorithm"
+ eventQueueSize="1000000">
+ <property name="maxNodes" value="1000000" />
+ <property name="timeToLive" value="120000" />
+ </default>
</eviction>
</jbosscache>
Modified: exo/portal/branches/3.1.5-PLF_REL/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/jboss-cache.xml
===================================================================
--- exo/portal/branches/3.1.5-PLF_REL/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/jboss-cache.xml 2010-10-20 03:34:43 UTC (rev 4741)
+++ exo/portal/branches/3.1.5-PLF_REL/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/jboss-cache.xml 2010-10-20 03:46:09 UTC (rev 4742)
@@ -2,12 +2,11 @@
<!-- Eviction configuration -->
<eviction wakeUpInterval="5000">
- <default algorithmClass="org.jboss.cache.eviction.ExpirationAlgorithm"
- actionPolicyClass="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.ParentNodeEvictionActionPolicy"
- eventQueueSize="1000000">
- <property name="maxNodes" value="1000000" />
- <property name="warnNoExpirationKey" value="false" />
- </default>
+ <default algorithmClass="org.jboss.cache.eviction.LRUAlgorithm"
+ eventQueueSize="1000000">
+ <property name="maxNodes" value="1000000" />
+ <property name="timeToLive" value="120000" />
+ </default>
</eviction>
</jbosscache>
\ No newline at end of file
13 years, 8 months
gatein SVN: r4741 - in exo/portal/branches/3.1.x: component/common/src/main/java/conf/jcr/jbosscache/local and 1 other directories.
by do-not-reply＠jboss.org
Author: trong.tran
Date: 2010-10-19 23:34:43 -0400 (Tue, 19 Oct 2010)
New Revision: 4741
Modified:
exo/portal/branches/3.1.x/component/common/src/main/java/conf/jcr/jbosscache/cluster/config.xml
exo/portal/branches/3.1.x/component/common/src/main/java/conf/jcr/jbosscache/local/config.xml
exo/portal/branches/3.1.x/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/jboss-cache-cluster.xml
exo/portal/branches/3.1.x/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/jboss-cache.xml
Log:
EXOGTN-94 Revert back to use the old algorithm for jbosscache
Modified: exo/portal/branches/3.1.x/component/common/src/main/java/conf/jcr/jbosscache/cluster/config.xml
===================================================================
--- exo/portal/branches/3.1.x/component/common/src/main/java/conf/jcr/jbosscache/cluster/config.xml 2010-10-20 02:41:39 UTC (rev 4740)
+++ exo/portal/branches/3.1.x/component/common/src/main/java/conf/jcr/jbosscache/cluster/config.xml 2010-10-20 03:34:43 UTC (rev 4741)
@@ -30,12 +30,11 @@
<!-- Eviction configuration -->
<eviction wakeUpInterval="5000">
- <default algorithmClass="org.jboss.cache.eviction.ExpirationAlgorithm"
- actionPolicyClass="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.ParentNodeEvictionActionPolicy"
- eventQueueSize="1000000">
- <property name="maxNodes" value="1000000" />
- <property name="warnNoExpirationKey" value="false" />
- </default>
+ <default algorithmClass="org.jboss.cache.eviction.LRUAlgorithm"
+ actionPolicyClass="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.ParentNodeEvictionActionPolicy"
+ eventQueueSize="1000000">
+ <property name="maxNodes" value="5000" />
+ <property name="timeToLive" value="20000" />
+ </default>
</eviction>
-
</jbosscache>
\ No newline at end of file
Modified: exo/portal/branches/3.1.x/component/common/src/main/java/conf/jcr/jbosscache/local/config.xml
===================================================================
--- exo/portal/branches/3.1.x/component/common/src/main/java/conf/jcr/jbosscache/local/config.xml 2010-10-20 02:41:39 UTC (rev 4740)
+++ exo/portal/branches/3.1.x/component/common/src/main/java/conf/jcr/jbosscache/local/config.xml 2010-10-20 03:34:43 UTC (rev 4741)
@@ -27,13 +27,11 @@
<invocationBatching enabled="true" />
<!-- Eviction configuration -->
- <eviction wakeUpInterval="5000">
- <default algorithmClass="org.jboss.cache.eviction.ExpirationAlgorithm"
- actionPolicyClass="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.ParentNodeEvictionActionPolicy"
- eventQueueSize="1000000">
- <property name="maxNodes" value="1000000" />
- <property name="warnNoExpirationKey" value="false" />
- </default>
- </eviction>
+ <eviction wakeUpInterval="5000">
+ <default algorithmClass="org.jboss.cache.eviction.FIFOAlgorithm" actionPolicyClass="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.ParentNodeEvictionActionPolicy" eventQueueSize="1000000">
+ <property name="maxNodes" value="5000" />
+ <property name="minTimeToLive" value="20000" />
+ </default>
+ </eviction>
</jbosscache>
Modified: exo/portal/branches/3.1.x/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/jboss-cache-cluster.xml
===================================================================
--- exo/portal/branches/3.1.x/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/jboss-cache-cluster.xml 2010-10-20 02:41:39 UTC (rev 4740)
+++ exo/portal/branches/3.1.x/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/jboss-cache-cluster.xml 2010-10-20 03:34:43 UTC (rev 4741)
@@ -8,12 +8,11 @@
<!-- Eviction configuration -->
<eviction wakeUpInterval="5000">
- <default algorithmClass="org.jboss.cache.eviction.ExpirationAlgorithm"
- actionPolicyClass="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.ParentNodeEvictionActionPolicy"
- eventQueueSize="1000000">
- <property name="maxNodes" value="1000000" />
- <property name="warnNoExpirationKey" value="false" />
- </default>
+ <default algorithmClass="org.jboss.cache.eviction.LRUAlgorithm"
+ eventQueueSize="1000000">
+ <property name="maxNodes" value="1000000" />
+ <property name="timeToLive" value="120000" />
+ </default>
</eviction>
</jbosscache>
Modified: exo/portal/branches/3.1.x/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/jboss-cache.xml
===================================================================
--- exo/portal/branches/3.1.x/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/jboss-cache.xml 2010-10-20 02:41:39 UTC (rev 4740)
+++ exo/portal/branches/3.1.x/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/jboss-cache.xml 2010-10-20 03:34:43 UTC (rev 4741)
@@ -2,12 +2,11 @@
<!-- Eviction configuration -->
<eviction wakeUpInterval="5000">
- <default algorithmClass="org.jboss.cache.eviction.ExpirationAlgorithm"
- actionPolicyClass="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.ParentNodeEvictionActionPolicy"
- eventQueueSize="1000000">
- <property name="maxNodes" value="1000000" />
- <property name="warnNoExpirationKey" value="false" />
- </default>
+ <default algorithmClass="org.jboss.cache.eviction.LRUAlgorithm"
+ eventQueueSize="1000000">
+ <property name="maxNodes" value="1000000" />
+ <property name="timeToLive" value="120000" />
+ </default>
</eviction>
</jbosscache>
\ No newline at end of file
13 years, 8 months
gatein SVN: r4740 - exo/portal/branches/3.1.x.
by do-not-reply＠jboss.org
Author: trong.tran
Date: 2010-10-19 22:41:39 -0400 (Tue, 19 Oct 2010)
New Revision: 4740
Modified:
exo/portal/branches/3.1.x/pom.xml
Log:
Upgrade Shindig to 1.0-r790473-Patch04
Modified: exo/portal/branches/3.1.x/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/pom.xml 2010-10-20 02:40:53 UTC (rev 4739)
+++ exo/portal/branches/3.1.x/pom.xml 2010-10-20 02:41:39 UTC (rev 4740)
@@ -42,7 +42,7 @@
<org.exoplatform.ws.version>2.1.6-GA-SNAPSHOT</org.exoplatform.ws.version>
<org.exoplatform.jcr.version>1.12.6-GA-SNAPSHOT</org.exoplatform.jcr.version>
<org.jibx.version>1.2.1</org.jibx.version>
- <org.shindig.version>1.0-r790473-Patch02</org.shindig.version>
+ <org.shindig.version>1.0-r790473-Patch04</org.shindig.version>
<nl.captcha.simplecaptcha.version>1.1.1-GA-Patch01</nl.captcha.simplecaptcha.version>
<org.gatein.common.version>2.0.2-GA</org.gatein.common.version>
<org.gatein.wci.version>2.0.1-GA</org.gatein.wci.version>
13 years, 8 months
gatein SVN: r4739 - exo/portal/branches/3.1.5-PLF_REL.
by do-not-reply＠jboss.org
Author: trong.tran
Date: 2010-10-19 22:40:53 -0400 (Tue, 19 Oct 2010)
New Revision: 4739
Modified:
exo/portal/branches/3.1.5-PLF_REL/pom.xml
Log:
Upgrade Shindig to 1.0-r790473-Patch04
Modified: exo/portal/branches/3.1.5-PLF_REL/pom.xml
===================================================================
--- exo/portal/branches/3.1.5-PLF_REL/pom.xml 2010-10-20 02:31:16 UTC (rev 4738)
+++ exo/portal/branches/3.1.5-PLF_REL/pom.xml 2010-10-20 02:40:53 UTC (rev 4739)
@@ -42,7 +42,7 @@
<org.exoplatform.ws.version>2.1.5-GA-SNAPSHOT</org.exoplatform.ws.version>
<org.exoplatform.jcr.version>1.12.5-GA-SNAPSHOT</org.exoplatform.jcr.version>
<org.jibx.version>1.2.1</org.jibx.version>
- <org.shindig.version>1.0-r790473-Patch02</org.shindig.version>
+ <org.shindig.version>1.0-r790473-Patch04</org.shindig.version>
<nl.captcha.simplecaptcha.version>1.1.1-GA-Patch01</nl.captcha.simplecaptcha.version>
<org.gatein.common.version>2.0.2-GA</org.gatein.common.version>
<org.gatein.wci.version>2.0.1-GA</org.gatein.wci.version>
13 years, 8 months
gatein SVN: r4738 - exo/portal/branches/3.1.5-PLF_REL/gadgets/core/src/main/java/containers/default.
by do-not-reply＠jboss.org
Author: trong.tran
Date: 2010-10-19 22:31:16 -0400 (Tue, 19 Oct 2010)
New Revision: 4738
Modified:
exo/portal/branches/3.1.5-PLF_REL/gadgets/core/src/main/java/containers/default/container.js
Log:
EXOGTN-48 Remove gadget Error 404 in logs
Modified: exo/portal/branches/3.1.5-PLF_REL/gadgets/core/src/main/java/containers/default/container.js
===================================================================
--- exo/portal/branches/3.1.5-PLF_REL/gadgets/core/src/main/java/containers/default/container.js 2010-10-20 02:29:04 UTC (rev 4737)
+++ exo/portal/branches/3.1.5-PLF_REL/gadgets/core/src/main/java/containers/default/container.js 2010-10-20 02:31:16 UTC (rev 4738)
@@ -168,10 +168,10 @@
// E.g. "gadgets.rpc" : ["activities.requestCreate", "messages.requestSend", "requestShareApp", "requestPermission"]
"gadgets.rpc" : ["container.listMethods"]
},
- "osapi" : {
- // The endpoints to query for available JSONRPC/REST services
- "endPoints" : [ "http://%host%/social/rpc", "http://%host%/gadgets/api/rpc" ]
- },
+// "osapi" : {
+// // The endpoints to query for available JSONRPC/REST services
+// "endPoints" : [ "http://%host%/social/rpc", "http://%host%/gadgets/api/rpc" ]
+// },
"osml": {
// OSML library resource. Can be set to null or the empty string to disable OSML
// for a container.
13 years, 8 months
gatein SVN: r4737 - exo/portal/branches/3.1.x/gadgets/core/src/main/java/containers/default.
by do-not-reply＠jboss.org
Author: trong.tran
Date: 2010-10-19 22:29:04 -0400 (Tue, 19 Oct 2010)
New Revision: 4737
Modified:
exo/portal/branches/3.1.x/gadgets/core/src/main/java/containers/default/container.js
Log:
EXOGTN-48 Remove gadget Error 404 in logs
Modified: exo/portal/branches/3.1.x/gadgets/core/src/main/java/containers/default/container.js
===================================================================
--- exo/portal/branches/3.1.x/gadgets/core/src/main/java/containers/default/container.js 2010-10-19 18:20:41 UTC (rev 4736)
+++ exo/portal/branches/3.1.x/gadgets/core/src/main/java/containers/default/container.js 2010-10-20 02:29:04 UTC (rev 4737)
@@ -168,10 +168,10 @@
// E.g. "gadgets.rpc" : ["activities.requestCreate", "messages.requestSend", "requestShareApp", "requestPermission"]
"gadgets.rpc" : ["container.listMethods"]
},
- "osapi" : {
- // The endpoints to query for available JSONRPC/REST services
- "endPoints" : [ "http://%host%/social/rpc", "http://%host%/gadgets/api/rpc" ]
- },
+// "osapi" : {
+// // The endpoints to query for available JSONRPC/REST services
+// "endPoints" : [ "http://%host%/social/rpc", "http://%host%/gadgets/api/rpc" ]
+// },
"osml": {
// OSML library resource. Can be set to null or the empty string to disable OSML
// for a container.
13 years, 8 months
gatein SVN: r4736 - portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2010-10-19 14:20:41 -0400 (Tue, 19 Oct 2010)
New Revision: 4736
Modified:
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal-configuration.xml
Log:
GTNPORTAL-1575 : Create a dedicated configuration section for MOP cache
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-10-19 16:21:41 UTC (rev 4735)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal-configuration.xml 2010-10-19 18:20:41 UTC (rev 4736)
@@ -293,6 +293,9 @@
<field name="maxSize">
<int>5000</int>
</field>
+ <field name="liveTime">
+ <long>600</long>
+ </field>
</object>
</object-param>
</init-params>
13 years, 8 months