exo-jcr SVN: r2198 - jcr/tags/1.12.0-CP01/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/access.
by do-not-reply＠jboss.org
Author: sergiykarpenko
Date: 2010-03-31 06:28:15 -0400 (Wed, 31 Mar 2010)
New Revision: 2198
Modified:
jcr/tags/1.12.0-CP01/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/access/AccessControlList.java
Log:
EXOJCR-621: NullPointerException avoided in equal() and dump() methods
Modified: jcr/tags/1.12.0-CP01/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/access/AccessControlList.java
===================================================================
--- jcr/tags/1.12.0-CP01/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/access/AccessControlList.java 2010-03-31 10:10:49 UTC (rev 2197)
+++ jcr/tags/1.12.0-CP01/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/access/AccessControlList.java 2010-03-31 10:28:15 UTC (rev 2198)
@@ -184,18 +184,55 @@
if (obj instanceof AccessControlList)
{
AccessControlList another = (AccessControlList)obj;
- return dump().equals(another.dump());
+
+ // check owners, it may be null
+ if (!((owner == null && another.owner == null) || (owner != null && owner.equals(another.owner))))
+ {
+ return false;
+ }
+
+ // check accessList
+ List<AccessControlEntry> anotherAccessList = another.accessList;
+ if (accessList == null && anotherAccessList == null)
+ {
+ return true;
+ }
+ else if (accessList != null && anotherAccessList != null && accessList.size() == anotherAccessList.size())
+ {
+ // check content of both accessLists
+ for (int i = 0; i < accessList.size(); i++)
+ {
+ if (!accessList.get(i).getAsString().equals(anotherAccessList.get(i).getAsString()))
+ {
+ return false;
+ }
+ }
+ return true;
+ }
+ else
+ {
+ return false;
+ }
+
+ //return dump().equals(another.dump());
}
return false;
}
public String dump()
{
- String res = "OWNER: " + owner + "\n";
- for (AccessControlEntry a : accessList)
+ String res = "OWNER: " + (owner != null ? owner : "null") + "\n";
+ if (accessList != null)
{
- res += a.getAsString() + "\n";
+ for (AccessControlEntry a : accessList)
+ {
+ res += a.getAsString() + "\n";
+ }
}
+ else
+ {
+ res += "null";
+ }
return res;
}
14 years, 1 month
exo-jcr SVN: r2197 - in jcr/tags/1.12.0-CP01/exo.jcr.component.core/src: test/java/org/exoplatform/services/jcr/api/observation and 1 other directory.
by do-not-reply＠jboss.org
Author: dkatayev
Date: 2010-03-31 06:10:49 -0400 (Wed, 31 Mar 2010)
New Revision: 2197
Modified:
jcr/tags/1.12.0-CP01/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/observation/ActionLauncher.java
jcr/tags/1.12.0-CP01/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/observation/TestObservationManager.java
Log:
EXOJCR-620 merged changes from https://jira.jboss.org/jira/browse/EXOJCR-591
Modified: jcr/tags/1.12.0-CP01/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/observation/ActionLauncher.java
===================================================================
--- jcr/tags/1.12.0-CP01/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/observation/ActionLauncher.java 2010-03-31 09:41:24 UTC (rev 2196)
+++ jcr/tags/1.12.0-CP01/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/observation/ActionLauncher.java 2010-03-31 10:10:49 UTC (rev 2197)
@@ -270,6 +270,6 @@
*/
public boolean isTXAware()
{
- return true;
+ return false;
}
}
Modified: jcr/tags/1.12.0-CP01/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/observation/TestObservationManager.java
===================================================================
--- jcr/tags/1.12.0-CP01/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/observation/TestObservationManager.java 2010-03-31 09:41:24 UTC (rev 2196)
+++ jcr/tags/1.12.0-CP01/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/observation/TestObservationManager.java 2010-03-31 10:10:49 UTC (rev 2197)
@@ -19,6 +19,8 @@
package org.exoplatform.services.jcr.api.observation;
import org.exoplatform.services.jcr.JcrAPIBaseTest;
+import org.exoplatform.services.jcr.core.CredentialsImpl;
+import org.exoplatform.services.jcr.impl.core.RepositoryImpl;
import org.exoplatform.services.log.Log;
import java.util.Calendar;
@@ -277,6 +279,20 @@
}
+ public void testRemoveSourceNodeEvents() throws RepositoryException
+ {
+ ObservationManager observationManager = this.workspace.getObservationManager();
+ testRoot.addNode("testRemoveSourceNode");
+ EventListener listener = new RemoveDummyListener(this.log, this.repository, this.credentials);
+ observationManager.addEventListener(listener, Event.NODE_ADDED, "/", true, null, null, false);
+ root.save();
+ Session session2 = repository.login(credentials, "ws2");
+ Session session = repository.login(credentials, "ws");
+ assertFalse(session.itemExists("/testRoot/testRemoveSourceNode"));
+ assertTrue(session2.itemExists("/testRemoveSourceNode"));
+ observationManager.removeEventListener(listener);
+ }
+
private void checkEventNumAndCleanCounter(int cnt)
{
assertEquals(cnt, counter);
@@ -332,4 +348,48 @@
}
}
+ private static class RemoveDummyListener implements EventListener
+ {
+ protected Log log;
+
+ protected RepositoryImpl repository;
+
+ protected CredentialsImpl credentials;
+
+ public RemoveDummyListener(Log log, RepositoryImpl repository, CredentialsImpl credentials)
+ {
+ this.log = log;
+ this.repository = repository;
+ this.credentials = credentials;
+ }
+
+ public void onEvent(EventIterator events)
+ {
+ while (events.hasNext())
+ {
+ Event event = events.nextEvent();
+ counter++;
+ try
+ {
+ String path = event.getPath();
+ Session session2 = repository.login(credentials, "ws2");
+ session2.getWorkspace().clone("ws", path, "/testRemoveSourceNode", true);
+ Session session = repository.login(credentials, "ws");
+ session.getItem(path).remove();
+ session.save();
+ }
+ catch (RepositoryException re)
+ {
+ System.out.println(re.getMessage());
+ if (log.isErrorEnabled())
+ {
+ log.error(re.getMessage());
+ }
+ }
+ if (log.isDebugEnabled())
+ log.debug("EVENT fired by RemoveDummyListener " + event + " " + event.getType());
+ }
+ }
+ }
+
}
14 years, 1 month
exo-jcr SVN: r2196 - jcr/tags/1.12.0-CP01.
by do-not-reply＠jboss.org
Author: dkatayev
Date: 2010-03-31 05:41:24 -0400 (Wed, 31 Mar 2010)
New Revision: 2196
Modified:
jcr/tags/1.12.0-CP01/pom.xml
Log:
EXOJCR-620 documentation added to parent pom modules
Modified: jcr/tags/1.12.0-CP01/pom.xml
===================================================================
--- jcr/tags/1.12.0-CP01/pom.xml 2010-03-31 09:36:03 UTC (rev 2195)
+++ jcr/tags/1.12.0-CP01/pom.xml 2010-03-31 09:41:24 UTC (rev 2196)
@@ -441,6 +441,7 @@
<module>exo.jcr.framework.web</module>
<module>exo.jcr.framework.ftpclient</module>
<module>applications</module>
+ <module>docs</module>
<module>packaging/module</module>
</modules>
</project>
14 years, 1 month
exo-jcr SVN: r2195 - in jcr/trunk/docs: userguide and 9 other directories.
by do-not-reply＠jboss.org
Author: sergiykarpenko
Date: 2010-03-31 05:36:03 -0400 (Wed, 31 Mar 2010)
New Revision: 2195
Added:
jcr/trunk/docs/userguide/
jcr/trunk/docs/userguide/en/
jcr/trunk/docs/userguide/en/pom.xml
jcr/trunk/docs/userguide/en/src/
jcr/trunk/docs/userguide/en/src/main/
jcr/trunk/docs/userguide/en/src/main/docbook/
jcr/trunk/docs/userguide/en/src/main/docbook/en-US/
jcr/trunk/docs/userguide/en/src/main/docbook/en-US/master.xml
jcr/trunk/docs/userguide/en/src/main/docbook/en-US/modules/
jcr/trunk/docs/userguide/en/src/main/docbook/en-US/modules/performance.xml
jcr/trunk/docs/userguide/en/src/main/docbook/en-US/modules/performance/
jcr/trunk/docs/userguide/en/src/main/docbook/en-US/modules/performance/performance-tuning-guide.xml
jcr/trunk/docs/userguide/en/src/main/resources/
jcr/trunk/docs/userguide/en/src/main/resources/images/
jcr/trunk/docs/userguide/en/src/main/resources/images/perf_EC2_results.jpg
jcr/trunk/docs/userguide/en/src/main/resources/images/perf_EC2_results_2.jpg
jcr/trunk/docs/userguide/pom.xml
Modified:
jcr/trunk/docs/pom.xml
Log:
EXOJCR-492: performance tuning guide added
Modified: jcr/trunk/docs/pom.xml
===================================================================
--- jcr/trunk/docs/pom.xml 2010-03-31 09:31:46 UTC (rev 2194)
+++ jcr/trunk/docs/pom.xml 2010-03-31 09:36:03 UTC (rev 2195)
@@ -34,8 +34,8 @@
<modules>
<module>reference</module>
- <!-- module>userguide</module>
- <module>migrationguide</module>
+ <module>userguide</module>
+ <!-- module>migrationguide</module>
<module>faq</module -->
</modules>
</project>
Added: jcr/trunk/docs/userguide/en/pom.xml
===================================================================
--- jcr/trunk/docs/userguide/en/pom.xml (rev 0)
+++ jcr/trunk/docs/userguide/en/pom.xml 2010-03-31 09:36:03 UTC (rev 2195)
@@ -0,0 +1,118 @@
+<!--
+
+ 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.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.exoplatform.jcr</groupId>
+ <artifactId>userguide-docs</artifactId>
+ <version>1.12.1-GA-SNAPSHOT</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>userguide-docs-${translation}</artifactId>
+
+ <name>eXoJCR reference documentation (${translation})</name>
+ <packaging>jdocbook</packaging>
+
+ <properties>
+ <translation>en</translation>
+ <enforcer.skip>true</enforcer.skip>
+ </properties>
+
+ <build>
+ <finalName>${project.parent.artifactId}_${translation}-${version}</finalName>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>xml-maven-plugin</artifactId>
+ <!-- version>1.0-beta-2</version -->
+ </plugin>
+
+ <plugin>
+ <groupId>org.jboss.maven.plugins</groupId>
+ <artifactId>maven-jdocbook-plugin</artifactId>
+ <version>2.1.1</version>
+ <extensions>true</extensions>
+ <dependencies>
+ <dependency>
+ <groupId>org.exoplatform.doc</groupId>
+ <artifactId>exo-docbook-xslt</artifactId>
+ <version>${org.exoplatform.doc-style.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.exoplatform.doc</groupId>
+ <artifactId>exo-jdocbook-style</artifactId>
+ <version>${org.exoplatform.doc-style.version}</version>
+ <type>jdocbook-style</type>
+ </dependency>
+ </dependencies>
+ <configuration>
+ <sourceDocumentName>master.xml</sourceDocumentName>
+
+ <!--sourceDocumentName>modules/lock-manager-config.xml</sourceDocumentName-->
+ <imageResource>
+ <directory>${pom.basedir}/src/main/resources</directory>
+ <includes>
+ <include>images/**/*</include>
+ </includes>
+ </imageResource>
+
+ <formats>
+ <format>
+ <formatName>html</formatName>
+ <stylesheetResource>classpath:/xslt/org/exojcr/xhtml.xsl</stylesheetResource>
+ <finalName>index.html</finalName>
+ </format>
+ <format>
+ <formatName>html_single</formatName>
+ <stylesheetResource>classpath:/xslt/org/exojcr/xhtml-single.xsl</stylesheetResource>
+ <finalName>index.html</finalName>
+ </format>
+ <!-- format>
+ <formatName>pdf</formatName>
+ <stylesheetResource>classpath://xslt/org/exojcr/pdf.xsl</stylesheetResource>
+ <finalName>${pom.name}.pdf</finalName>
+ </format -->
+ <!-- format>
+ <formatName>eclipse</formatName>
+ <stylesheetResource>classpath:/xslt/org/exojcr/eclipse.xsl</stylesheetResource>
+ <finalName>index.html</finalName>
+ </format -->
+ </formats>
+
+ <options>
+ <xincludeSupported>true</xincludeSupported>
+ <xmlTransformerType>saxon</xmlTransformerType>
+ <!-- needed for uri-resolvers; can be ommitted if using 'current' uri scheme -->
+ <!-- could also locate the docbook dependency and inspect its version... -->
+ <docbookVersion>1.74.0</docbookVersion>
+ </options>
+
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Added: jcr/trunk/docs/userguide/en/src/main/docbook/en-US/master.xml
===================================================================
--- jcr/trunk/docs/userguide/en/src/main/docbook/en-US/master.xml (rev 0)
+++ jcr/trunk/docs/userguide/en/src/main/docbook/en-US/master.xml 2010-03-31 09:36:03 UTC (rev 2195)
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ 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.
+
+-->
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
+<!-- adopted from http://anonsvn.jboss.org/repos/gatein/portal/trunk/docs/reference-guide/e...
+and https://svn.jboss.org/repos/richfaces/tags/3.3.2.GA/docs/userguide/en/src... -->
+<book lang="en">
+ <bookinfo>
+ <title>eXoJCR User Guide</title>
+
+ <!-- corpauthor>
+ <inlinemediaobject>
+ <imageobject role="fo">
+ <imagedata format="PNG" fileref="images/richfaces_logo.png" />
+ </imageobject>
+ <imageobject role="html">
+ <imagedata/>
+ </imageobject>
+ </inlinemediaobject>
+ </corpauthor -->
+
+ <subtitle>JCR Performance and Scalability</subtitle>
+
+ <copyright>
+ <year>2009, 2010</year>
+ <holder>eXoPlatform</holder>
+ </copyright>
+ </bookinfo>
+
+ <toc></toc>
+
+ <!--
+ Table of content in Wiki Format <xi:include
+ xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="modules/Portal_Manual.xml" />
+ -->
+
+
+
+ <xi:include href="modules/performance.xml"
+ xmlns:xi="http://www.w3.org/2001/XInclude" />
+
+</book>
Added: jcr/trunk/docs/userguide/en/src/main/docbook/en-US/modules/performance/performance-tuning-guide.xml
===================================================================
--- jcr/trunk/docs/userguide/en/src/main/docbook/en-US/modules/performance/performance-tuning-guide.xml (rev 0)
+++ jcr/trunk/docs/userguide/en/src/main/docbook/en-US/modules/performance/performance-tuning-guide.xml 2010-03-31 09:36:03 UTC (rev 2195)
@@ -0,0 +1,323 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
+<chapter>
+ <?dbhtml filename="ch-performance.html"?>
+
+ <title>JCR Performance Tuning Guide</title>
+
+ <section>
+ <title>Introduction</title>
+
+ <para>This guide will show you possible ways of improving JCR
+ performance.</para>
+
+ <para>It is intended to GateIn Administrators and those who wants to use
+ JCR features.</para>
+ </section>
+
+ <section>
+ <title>JCR Performance and Scalability</title>
+
+ <section>
+ <title>Cluster configuration</title>
+
+ <para><citetitle>EC2 network</citetitle>: 1Gbit</para>
+
+ <para><citetitle>Servers hardware</citetitle>:<simplelist>
+ <member>7.5 GB memory</member>
+
+ <member>4 EC2 Compute Units (2 virtual cores with 2 EC2 Compute
+ Units each)</member>
+
+ <member>850 GB instance storage (2×420 GB plus 10 GB root
+ partition)</member>
+
+ <member>64-bit platform</member>
+
+ <member>I/O Performance: High</member>
+
+ <member>API name: m1.large</member>
+ </simplelist></para>
+
+ <note>
+ <para>NFS and statistics (cacti snmp) server were located on one
+ physical server.</para>
+ </note>
+
+ <para><citetitle>JBoss AS configuration</citetitle></para>
+
+ <para><code>JAVA_OPTS: -Dprogram.name=run.sh -server -Xms4g -Xmx4g
+ -XX:MaxPermSize=512m -Dorg.jboss.resolver.warning=true
+ -Dsun.rmi.dgc.client.gcInterval=3600000
+ -Dsun.rmi.dgc.server.gcInterval=3600000 -XX:+UseParallelGC
+ -Djava.net.preferIPv4Stack=true</code></para>
+ </section>
+
+ <section>
+ <title>JCR Clustered Performance</title>
+
+ <para>Benchmark test using webdav (Complex read/write load test
+ (benchmark)) with 20K same file. To obtain per-operation results we have
+ used custom output from the testscase threads to CSV file.</para>
+
+ <para><citetitle>Read operation</citetitle>:<simplelist>
+ <member>Warm-up iterations: 100</member>
+
+ <member>Run iterations: 2000</member>
+
+ <member>Background writing threads: 25</member>
+
+ <member>Reading threads: 225</member>
+ </simplelist></para>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/perf_EC2_results.jpg" />
+ </imageobject>
+ </mediaobject>
+
+ <table>
+ <title></title>
+
+ <tgroup cols="4">
+ <thead>
+ <row>
+ <entry>Nodes count</entry>
+
+ <entry>tps</entry>
+
+ <entry> Responses >2s</entry>
+
+ <entry>Responses >4s</entry>
+ </row>
+ </thead>
+
+ <tbody>
+ <row>
+ <entry>1</entry>
+
+ <entry>523</entry>
+
+ <entry>6.87%</entry>
+
+ <entry>1.27% </entry>
+ </row>
+
+ <row>
+ <entry>2</entry>
+
+ <entry>1754</entry>
+
+ <entry>0.64% </entry>
+
+ <entry>0.08% </entry>
+ </row>
+
+ <row>
+ <entry>3</entry>
+
+ <entry>2388</entry>
+
+ <entry>0.49% </entry>
+
+ <entry>0.09% </entry>
+ </row>
+
+ <row>
+ <entry>4</entry>
+
+ <entry>2706</entry>
+
+ <entry>0.46% </entry>
+
+ <entry> 0.1% </entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+
+ <para><citetitle>Read operaion with more threads</citetitle>:</para>
+
+ <simplelist>
+ <member>Warm-up iterations: 100</member>
+
+ <member>Run iterations: 2000</member>
+
+ <member>Background writing threads: 50</member>
+
+ <member>Reading threads: 450</member>
+ </simplelist>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/perf_EC2_results_2.jpg" />
+ </imageobject>
+ </mediaobject>
+
+ <table>
+ <title></title>
+
+ <tgroup cols="4">
+ <thead>
+ <row>
+ <entry>Nodes count</entry>
+
+ <entry>tps</entry>
+
+ <entry>Responses >2s</entry>
+
+ <entry>Responses >4s</entry>
+ </row>
+ </thead>
+
+ <tbody>
+ <row>
+ <entry>1</entry>
+
+ <entry>116</entry>
+
+ <entry>?</entry>
+
+ <entry>?</entry>
+ </row>
+
+ <row>
+ <entry>2</entry>
+
+ <entry>1558</entry>
+
+ <entry>6.1%</entry>
+
+ <entry>0.6%</entry>
+ </row>
+
+ <row>
+ <entry>3</entry>
+
+ <entry>2242</entry>
+
+ <entry>3.1%</entry>
+
+ <entry>0.38%</entry>
+ </row>
+
+ <row>
+ <entry>4</entry>
+
+ <entry>2756 </entry>
+
+ <entry>2.2%</entry>
+
+ <entry>0.41%</entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+ </section>
+ </section>
+
+ <section>
+ <title>Performance Tuning Guide</title>
+
+ <section>
+ <title>JBoss AS Tuning</title>
+
+ <para>You can use <parameter>maxThreads</parameter> parameter to
+ increase maximum amount of threads that can be launched in AS instance.
+ This can improve performance if you need a high level of concurrency.
+ also you can use <code>-XX:+UseParallelGC</code> java directory to use
+ paralel garbage collector.</para>
+
+ <tip>
+ <para>Beware of setting <parameter>maxThreads</parameter> too big,
+ this can cause <exceptionname>OutOfMemoryError</exceptionname>. We've
+ got it with <code>maxThreads=1250</code> on such machine:</para>
+
+ <simplelist>
+ <member>7.5 GB memory</member>
+
+ <member>4 EC2 Compute Units (2 virtual cores with 2 EC2 Compute
+ Units each)</member>
+
+ <member>850 GB instance storage (2×420 GB plus 10 GB root
+ partition)</member>
+
+ <member>64-bit platform</member>
+
+ <member>I/O Performance: High</member>
+
+ <member>API name: m1.large</member>
+
+ <member>java -Xmx 4g</member>
+ </simplelist>
+ </tip>
+ </section>
+
+ <section>
+ <title>JCR Cache Tuning</title>
+
+ <para><citetitle>Cache size</citetitle></para>
+
+ <para>JCR-cluster implementation is built using JBoss Cache as
+ distributed, replicated cache. But there is one particularity related to
+ remove action in it. Speed of this operation depends on the actual size
+ of cache. As many nodes are currently in cache as much time is needed to
+ remove one particular node (subtree) from it.</para>
+
+ <para><citetitle>Eviction</citetitle></para>
+
+ <para>Manipulations with eviction <parameter>wakeUpInterval</parameter>
+ value doestn't affect on performance. Performance results with values
+ from 500 up to 3000 are approximately equal.</para>
+
+ <para><citetitle>Transaction Timeout</citetitle></para>
+
+ <para>Using short timeout for long transactions such as Export/Import,
+ removing huge subtree defined timeout may cause
+ <exceptionname>TransactionTimeoutException</exceptionname>. [TODO] put
+ recomended timeout value</para>
+ </section>
+
+ <section>
+ <title>Clustering</title>
+
+ <para>For performance it is better to have loadbalacer, DB server and
+ shared NFS on different computers. If in some reasons you see that one
+ node gets more load than others you can decrease this load using load
+ value in load balancer.</para>
+
+ <para><citetitle>JGroups configuration</citetitle></para>
+
+ <para>It's recommended to use "multiplexer stack" feature present in
+ JGroups. It is set by default in eXo JCR and offers higher performance
+ in cluster, using less network connections also. If there are two or
+ more clusters in your network, please check that they use different
+ ports and different cluster names.</para>
+
+ <para><citetitle>Write performance in cluster</citetitle></para>
+
+ <para>Exo JCR implementation uses Lucene indexing engine to provide
+ search capabilities. But Lucene brings some limitations for write
+ operations: it can perform indexing only in one thread. Thats why write
+ performance in cluster is not higher than in singleton environment. Data
+ is indexed on coordinator node, so increasing write-load on cluster may
+ lead to ReplicationTimeout exception. It occurs because writing threads
+ queue in the indexer and under high load timeout for replication to
+ coordinator will be exceeded.</para>
+
+ <para>Taking in consideration this fact, it is recommended to exceed
+ <parameter>replTimeout</parameter> value in cache configurations in case
+ of high write-load.</para>
+
+ <para><citetitle>Replication timeout</citetitle></para>
+
+ <para>Some operations may take too much time. So if you get
+ <exceptionname>ReplicationTimeoutException</exceptionname> try
+ increasing replication timeout:<programlisting> <clustering mode="replication" clusterName="${jbosscache-cluster-name}">
+ ...
+ <sync replTimeout="60000" />
+ </clustering></programlisting>value is set in miliseconds.</para>
+ </section>
+ </section>
+</chapter>
Added: jcr/trunk/docs/userguide/en/src/main/docbook/en-US/modules/performance.xml
===================================================================
--- jcr/trunk/docs/userguide/en/src/main/docbook/en-US/modules/performance.xml (rev 0)
+++ jcr/trunk/docs/userguide/en/src/main/docbook/en-US/modules/performance.xml 2010-03-31 09:36:03 UTC (rev 2195)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
+<part>
+ <?dbhtml filename="part-performance.html"?>
+
+ <title>JCR Performance Tuning Guide</title>
+
+ <!--xi:include href="performance/intro.xml"
+ xmlns:xi="http://www.w3.org/2001/XInclude" /-->
+
+ <xi:include href="performance/performance-tuning-guide.xml"
+ xmlns:xi="http://www.w3.org/2001/XInclude" />
+
+</part>
Added: jcr/trunk/docs/userguide/en/src/main/resources/images/perf_EC2_results.jpg
===================================================================
(Binary files differ)
Property changes on: jcr/trunk/docs/userguide/en/src/main/resources/images/perf_EC2_results.jpg
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: jcr/trunk/docs/userguide/en/src/main/resources/images/perf_EC2_results_2.jpg
===================================================================
(Binary files differ)
Property changes on: jcr/trunk/docs/userguide/en/src/main/resources/images/perf_EC2_results_2.jpg
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: jcr/trunk/docs/userguide/pom.xml
===================================================================
--- jcr/trunk/docs/userguide/pom.xml (rev 0)
+++ jcr/trunk/docs/userguide/pom.xml 2010-03-31 09:36:03 UTC (rev 2195)
@@ -0,0 +1,38 @@
+<!--
+
+ 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.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.exoplatform.jcr</groupId>
+ <artifactId>docs</artifactId>
+ <version>1.12.1-GA-SNAPSHOT</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>userguide-docs</artifactId>
+
+ <name>eXoJCR user guide documentation</name>
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>en</module>
+ </modules>
+</project>
14 years, 1 month
exo-jcr SVN: r2194 - in jcr/tags/1.12.0-CP01: applications and 5 other directories.
by do-not-reply＠jboss.org
Author: dkatayev
Date: 2010-03-31 05:31:46 -0400 (Wed, 31 Mar 2010)
New Revision: 2194
Modified:
jcr/tags/1.12.0-CP01/applications/exo.jcr.applications.backupconsole/bin/jcrbackup.cmd
jcr/tags/1.12.0-CP01/applications/exo.jcr.applications.backupconsole/bin/jcrbackup.sh
jcr/tags/1.12.0-CP01/applications/product-exo-jcr-as-jboss-ear.xml
jcr/tags/1.12.0-CP01/applications/product-exo-jcr-as-jonas-ear.xml
jcr/tags/1.12.0-CP01/applications/product-exo-jcr-as-tomcat6.xml
jcr/tags/1.12.0-CP01/docs/pom.xml
jcr/tags/1.12.0-CP01/docs/reference/en/pom.xml
jcr/tags/1.12.0-CP01/docs/reference/pom.xml
jcr/tags/1.12.0-CP01/exo.jcr.connectors.localadapter/src/main/rar/META-INF/ra.xml
jcr/tags/1.12.0-CP01/pom.xml
Log:
EXOJCR-620 version updated in scripts and SCM links
Modified: jcr/tags/1.12.0-CP01/applications/exo.jcr.applications.backupconsole/bin/jcrbackup.cmd
===================================================================
--- jcr/tags/1.12.0-CP01/applications/exo.jcr.applications.backupconsole/bin/jcrbackup.cmd 2010-03-31 09:19:58 UTC (rev 2193)
+++ jcr/tags/1.12.0-CP01/applications/exo.jcr.applications.backupconsole/bin/jcrbackup.cmd 2010-03-31 09:31:46 UTC (rev 2194)
@@ -1 +1 @@
-java -jar exo.jcr.applications.backupconsole-1.12.0-GA.jar %*
+java -jar exo.jcr.applications.backupconsole-1.12.0-CP01.jar %*
Modified: jcr/tags/1.12.0-CP01/applications/exo.jcr.applications.backupconsole/bin/jcrbackup.sh
===================================================================
--- jcr/tags/1.12.0-CP01/applications/exo.jcr.applications.backupconsole/bin/jcrbackup.sh 2010-03-31 09:19:58 UTC (rev 2193)
+++ jcr/tags/1.12.0-CP01/applications/exo.jcr.applications.backupconsole/bin/jcrbackup.sh 2010-03-31 09:31:46 UTC (rev 2194)
@@ -1,3 +1,3 @@
#!/bin/sh
-java -jar exo.jcr.applications.backupconsole-1.12.0-GA.jar $*
+java -jar exo.jcr.applications.backupconsole-1.12.0-CP01.jar $*
Modified: jcr/tags/1.12.0-CP01/applications/product-exo-jcr-as-jboss-ear.xml
===================================================================
--- jcr/tags/1.12.0-CP01/applications/product-exo-jcr-as-jboss-ear.xml 2010-03-31 09:19:58 UTC (rev 2193)
+++ jcr/tags/1.12.0-CP01/applications/product-exo-jcr-as-jboss-ear.xml 2010-03-31 09:31:46 UTC (rev 2194)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>exo.jcr.applications.config</artifactId>
- <version>1.12.0-GA</version>
+ <version>1.12.0-CP01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -30,17 +30,17 @@
<packaging>jar</packaging>
<name>eXo JCR Product</name>
<url>http://www.exoplatform.org</url>
- <description>eXo JCR Product</description>
-
- <properties>
- <enforcer.skip>true</enforcer.skip>
+ <description>eXo JCR Product</description>
+
+ <properties>
+ <enforcer.skip>true</enforcer.skip>
</properties>
<dependencies>
<dependency>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>exo.jcr.ear</artifactId>
- <version>1.12.0-GA</version>
+ <version>1.12.0-CP01</version>
<type>ear</type>
<scope>runtime</scope>
</dependency>
Modified: jcr/tags/1.12.0-CP01/applications/product-exo-jcr-as-jonas-ear.xml
===================================================================
--- jcr/tags/1.12.0-CP01/applications/product-exo-jcr-as-jonas-ear.xml 2010-03-31 09:19:58 UTC (rev 2193)
+++ jcr/tags/1.12.0-CP01/applications/product-exo-jcr-as-jonas-ear.xml 2010-03-31 09:31:46 UTC (rev 2194)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>exo.jcr.applications.config</artifactId>
- <version>1.12.0-GA</version>
+ <version>1.12.0-CP01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -30,17 +30,17 @@
<packaging>jar</packaging>
<name>eXo JCR Product</name>
<url>http://www.exoplatform.org</url>
- <description>eXo JCR Product</description>
-
- <properties>
- <enforcer.skip>true</enforcer.skip>
+ <description>eXo JCR Product</description>
+
+ <properties>
+ <enforcer.skip>true</enforcer.skip>
</properties>
<dependencies>
<dependency>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>exo.jcr.ear</artifactId>
- <version>1.12.0-GA</version>
+ <version>1.12.0-CP01</version>
<type>ear</type>
<scope>runtime</scope>
</dependency>
Modified: jcr/tags/1.12.0-CP01/applications/product-exo-jcr-as-tomcat6.xml
===================================================================
--- jcr/tags/1.12.0-CP01/applications/product-exo-jcr-as-tomcat6.xml 2010-03-31 09:19:58 UTC (rev 2193)
+++ jcr/tags/1.12.0-CP01/applications/product-exo-jcr-as-tomcat6.xml 2010-03-31 09:31:46 UTC (rev 2194)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>exo.jcr.applications.config</artifactId>
- <version>1.12.0-GA</version>
+ <version>1.12.0-CP01</version>
<relativePath>exo.jcr.applications.config</relativePath>
</parent>
@@ -39,11 +39,11 @@
<artifactId>hsqldb</artifactId>
<scope>runtime</scope>
</dependency>
- </dependencies>
-
- <properties>
- <enforcer.skip>true</enforcer.skip>
- </properties>
+ </dependencies>
+
+ <properties>
+ <enforcer.skip>true</enforcer.skip>
+ </properties>
<build>
<plugins>
Modified: jcr/tags/1.12.0-CP01/docs/pom.xml
===================================================================
--- jcr/tags/1.12.0-CP01/docs/pom.xml 2010-03-31 09:19:58 UTC (rev 2193)
+++ jcr/tags/1.12.0-CP01/docs/pom.xml 2010-03-31 09:31:46 UTC (rev 2194)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.12.0-GA</version>
+ <version>1.12.0-CP01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: jcr/tags/1.12.0-CP01/docs/reference/en/pom.xml
===================================================================
--- jcr/tags/1.12.0-CP01/docs/reference/en/pom.xml 2010-03-31 09:19:58 UTC (rev 2193)
+++ jcr/tags/1.12.0-CP01/docs/reference/en/pom.xml 2010-03-31 09:31:46 UTC (rev 2194)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>reference-docs</artifactId>
- <version>1.12.0-GA</version>
+ <version>1.12.0-CP01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: jcr/tags/1.12.0-CP01/docs/reference/pom.xml
===================================================================
--- jcr/tags/1.12.0-CP01/docs/reference/pom.xml 2010-03-31 09:19:58 UTC (rev 2193)
+++ jcr/tags/1.12.0-CP01/docs/reference/pom.xml 2010-03-31 09:31:46 UTC (rev 2194)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>docs</artifactId>
- <version>1.12.0-GA</version>
+ <version>1.12.0-CP01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: jcr/tags/1.12.0-CP01/exo.jcr.connectors.localadapter/src/main/rar/META-INF/ra.xml
===================================================================
--- jcr/tags/1.12.0-CP01/exo.jcr.connectors.localadapter/src/main/rar/META-INF/ra.xml 2010-03-31 09:19:58 UTC (rev 2193)
+++ jcr/tags/1.12.0-CP01/exo.jcr.connectors.localadapter/src/main/rar/META-INF/ra.xml 2010-03-31 09:31:46 UTC (rev 2194)
@@ -25,7 +25,7 @@
<display-name>JCR repository</display-name>
<vendor-name>exoplatform</vendor-name>
<eis-type />
- <resourceadapter-version>1.12.0-GA</resourceadapter-version>
+ <resourceadapter-version>1.12.0-CP01</resourceadapter-version>
<license>
<license-required>false</license-required>
</license>
Modified: jcr/tags/1.12.0-CP01/pom.xml
===================================================================
--- jcr/tags/1.12.0-CP01/pom.xml 2010-03-31 09:19:58 UTC (rev 2193)
+++ jcr/tags/1.12.0-CP01/pom.xml 2010-03-31 09:31:46 UTC (rev 2194)
@@ -32,9 +32,9 @@
<packaging>pom</packaging>
<name>eXo JCR</name>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/exo-jcr/jcr/tags/1.12.0-GA</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/exo-jcr/jcr/tags/1.12.0-GA</developerConnection>
- <url>https://svn.jboss.org/repos/exo-jcr/jcr/tags/1.12.0-GA</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/exo-jcr/jcr/tags/1.12.0-CP01</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/exo-jcr/jcr/tags/1.12.0-CP01</developerConnection>
+ <url>https://svn.jboss.org/repos/exo-jcr/jcr/tags/1.12.0-CP01</url>
</scm>
<properties>
<exo.product.name>exo-jcr</exo.product.name>
14 years, 1 month
exo-jcr SVN: r2193 - in jcr/tags/1.12.0-CP01: applications and 16 other directories.
by do-not-reply＠jboss.org
Author: dkatayev
Date: 2010-03-31 05:19:58 -0400 (Wed, 31 Mar 2010)
New Revision: 2193
Modified:
jcr/tags/1.12.0-CP01/applications/exo.jcr.applications.backupconsole/pom.xml
jcr/tags/1.12.0-CP01/applications/exo.jcr.applications.browser/pom.xml
jcr/tags/1.12.0-CP01/applications/exo.jcr.applications.config/pom.xml
jcr/tags/1.12.0-CP01/applications/exo.jcr.applications.fckeditor/pom.xml
jcr/tags/1.12.0-CP01/applications/exo.jcr.applications.rest/pom.xml
jcr/tags/1.12.0-CP01/applications/exo.jcr.cluster.testclient/pom.xml
jcr/tags/1.12.0-CP01/applications/exo.jcr.ear/pom.xml
jcr/tags/1.12.0-CP01/applications/pom.xml
jcr/tags/1.12.0-CP01/exo.jcr.component.core/pom.xml
jcr/tags/1.12.0-CP01/exo.jcr.component.ext/pom.xml
jcr/tags/1.12.0-CP01/exo.jcr.component.ftp/pom.xml
jcr/tags/1.12.0-CP01/exo.jcr.component.webdav/pom.xml
jcr/tags/1.12.0-CP01/exo.jcr.connectors.localadapter/pom.xml
jcr/tags/1.12.0-CP01/exo.jcr.framework.command/pom.xml
jcr/tags/1.12.0-CP01/exo.jcr.framework.ftpclient/pom.xml
jcr/tags/1.12.0-CP01/exo.jcr.framework.web/pom.xml
jcr/tags/1.12.0-CP01/packaging/module/pom.xml
jcr/tags/1.12.0-CP01/pom.xml
Log:
EXOJCR-620 version changed from 1.12.0-GA to 1.12.0-CP01
Modified: jcr/tags/1.12.0-CP01/applications/exo.jcr.applications.backupconsole/pom.xml
===================================================================
--- jcr/tags/1.12.0-CP01/applications/exo.jcr.applications.backupconsole/pom.xml 2010-03-31 09:08:35 UTC (rev 2192)
+++ jcr/tags/1.12.0-CP01/applications/exo.jcr.applications.backupconsole/pom.xml 2010-03-31 09:19:58 UTC (rev 2193)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-applications-parent</artifactId>
- <version>1.12.0-GA</version>
+ <version>1.12.0-CP01</version>
</parent>
<artifactId>exo.jcr.applications.backupconsole</artifactId>
<name>eXo JCR :: Applications :: Backup Console</name>
Modified: jcr/tags/1.12.0-CP01/applications/exo.jcr.applications.browser/pom.xml
===================================================================
--- jcr/tags/1.12.0-CP01/applications/exo.jcr.applications.browser/pom.xml 2010-03-31 09:08:35 UTC (rev 2192)
+++ jcr/tags/1.12.0-CP01/applications/exo.jcr.applications.browser/pom.xml 2010-03-31 09:19:58 UTC (rev 2193)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-applications-parent</artifactId>
- <version>1.12.0-GA</version>
+ <version>1.12.0-CP01</version>
</parent>
<artifactId>exo.jcr.applications.browser</artifactId>
<packaging>war</packaging>
Modified: jcr/tags/1.12.0-CP01/applications/exo.jcr.applications.config/pom.xml
===================================================================
--- jcr/tags/1.12.0-CP01/applications/exo.jcr.applications.config/pom.xml 2010-03-31 09:08:35 UTC (rev 2192)
+++ jcr/tags/1.12.0-CP01/applications/exo.jcr.applications.config/pom.xml 2010-03-31 09:19:58 UTC (rev 2193)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-applications-parent</artifactId>
- <version>1.12.0-GA</version>
+ <version>1.12.0-CP01</version>
</parent>
<artifactId>exo.jcr.applications.config</artifactId>
<packaging>pom</packaging>
Modified: jcr/tags/1.12.0-CP01/applications/exo.jcr.applications.fckeditor/pom.xml
===================================================================
--- jcr/tags/1.12.0-CP01/applications/exo.jcr.applications.fckeditor/pom.xml 2010-03-31 09:08:35 UTC (rev 2192)
+++ jcr/tags/1.12.0-CP01/applications/exo.jcr.applications.fckeditor/pom.xml 2010-03-31 09:19:58 UTC (rev 2193)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-applications-parent</artifactId>
- <version>1.12.0-GA</version>
+ <version>1.12.0-CP01</version>
</parent>
<artifactId>exo.jcr.applications.fckeditor</artifactId>
<packaging>war</packaging>
Modified: jcr/tags/1.12.0-CP01/applications/exo.jcr.applications.rest/pom.xml
===================================================================
--- jcr/tags/1.12.0-CP01/applications/exo.jcr.applications.rest/pom.xml 2010-03-31 09:08:35 UTC (rev 2192)
+++ jcr/tags/1.12.0-CP01/applications/exo.jcr.applications.rest/pom.xml 2010-03-31 09:19:58 UTC (rev 2193)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-applications-parent</artifactId>
- <version>1.12.0-GA</version>
+ <version>1.12.0-CP01</version>
</parent>
<artifactId>exo.jcr.applications.rest</artifactId>
<packaging>war</packaging>
Modified: jcr/tags/1.12.0-CP01/applications/exo.jcr.cluster.testclient/pom.xml
===================================================================
--- jcr/tags/1.12.0-CP01/applications/exo.jcr.cluster.testclient/pom.xml 2010-03-31 09:08:35 UTC (rev 2192)
+++ jcr/tags/1.12.0-CP01/applications/exo.jcr.cluster.testclient/pom.xml 2010-03-31 09:19:58 UTC (rev 2193)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-applications-parent</artifactId>
- <version>1.12.0-GA</version>
+ <version>1.12.0-CP01</version>
</parent>
<artifactId>exo.jcr.cluster.testclient</artifactId>
<name>eXo JCR :: Cluster :: Test Client</name>
Modified: jcr/tags/1.12.0-CP01/applications/exo.jcr.ear/pom.xml
===================================================================
--- jcr/tags/1.12.0-CP01/applications/exo.jcr.ear/pom.xml 2010-03-31 09:08:35 UTC (rev 2192)
+++ jcr/tags/1.12.0-CP01/applications/exo.jcr.ear/pom.xml 2010-03-31 09:19:58 UTC (rev 2193)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-applications-parent</artifactId>
- <version>1.12.0-GA</version>
+ <version>1.12.0-CP01</version>
</parent>
<artifactId>exo.jcr.ear</artifactId>
<packaging>ear</packaging>
Modified: jcr/tags/1.12.0-CP01/applications/pom.xml
===================================================================
--- jcr/tags/1.12.0-CP01/applications/pom.xml 2010-03-31 09:08:35 UTC (rev 2192)
+++ jcr/tags/1.12.0-CP01/applications/pom.xml 2010-03-31 09:19:58 UTC (rev 2193)
@@ -22,12 +22,12 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.12.0-GA</version>
+ <version>1.12.0-CP01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jcr-applications-parent</artifactId>
- <version>1.12.0-GA</version>
+ <version>1.12.0-CP01</version>
<name>eXo JCR :: Applications :: Reactor</name>
<packaging>pom</packaging>
Modified: jcr/tags/1.12.0-CP01/exo.jcr.component.core/pom.xml
===================================================================
--- jcr/tags/1.12.0-CP01/exo.jcr.component.core/pom.xml 2010-03-31 09:08:35 UTC (rev 2192)
+++ jcr/tags/1.12.0-CP01/exo.jcr.component.core/pom.xml 2010-03-31 09:19:58 UTC (rev 2193)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.12.0-GA</version>
+ <version>1.12.0-CP01</version>
</parent>
<artifactId>exo.jcr.component.core</artifactId>
<name>eXo JCR :: Component :: Core Service</name>
Modified: jcr/tags/1.12.0-CP01/exo.jcr.component.ext/pom.xml
===================================================================
--- jcr/tags/1.12.0-CP01/exo.jcr.component.ext/pom.xml 2010-03-31 09:08:35 UTC (rev 2192)
+++ jcr/tags/1.12.0-CP01/exo.jcr.component.ext/pom.xml 2010-03-31 09:19:58 UTC (rev 2193)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.12.0-GA</version>
+ <version>1.12.0-CP01</version>
</parent>
<artifactId>exo.jcr.component.ext</artifactId>
<name>eXo JCR :: Component :: Extension Service</name>
Modified: jcr/tags/1.12.0-CP01/exo.jcr.component.ftp/pom.xml
===================================================================
--- jcr/tags/1.12.0-CP01/exo.jcr.component.ftp/pom.xml 2010-03-31 09:08:35 UTC (rev 2192)
+++ jcr/tags/1.12.0-CP01/exo.jcr.component.ftp/pom.xml 2010-03-31 09:19:58 UTC (rev 2193)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.12.0-GA</version>
+ <version>1.12.0-CP01</version>
</parent>
<artifactId>exo.jcr.component.ftp</artifactId>
<name>eXo JCR :: Component :: FTP Service</name>
Modified: jcr/tags/1.12.0-CP01/exo.jcr.component.webdav/pom.xml
===================================================================
--- jcr/tags/1.12.0-CP01/exo.jcr.component.webdav/pom.xml 2010-03-31 09:08:35 UTC (rev 2192)
+++ jcr/tags/1.12.0-CP01/exo.jcr.component.webdav/pom.xml 2010-03-31 09:19:58 UTC (rev 2193)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.12.0-GA</version>
+ <version>1.12.0-CP01</version>
</parent>
<artifactId>exo.jcr.component.webdav</artifactId>
<name>eXo JCR :: Component :: Webdav Service</name>
Modified: jcr/tags/1.12.0-CP01/exo.jcr.connectors.localadapter/pom.xml
===================================================================
--- jcr/tags/1.12.0-CP01/exo.jcr.connectors.localadapter/pom.xml 2010-03-31 09:08:35 UTC (rev 2192)
+++ jcr/tags/1.12.0-CP01/exo.jcr.connectors.localadapter/pom.xml 2010-03-31 09:19:58 UTC (rev 2193)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.12.0-GA</version>
+ <version>1.12.0-CP01</version>
</parent>
<artifactId>exo.jcr.connectors.localadapter</artifactId>
<packaging>rar</packaging>
Modified: jcr/tags/1.12.0-CP01/exo.jcr.framework.command/pom.xml
===================================================================
--- jcr/tags/1.12.0-CP01/exo.jcr.framework.command/pom.xml 2010-03-31 09:08:35 UTC (rev 2192)
+++ jcr/tags/1.12.0-CP01/exo.jcr.framework.command/pom.xml 2010-03-31 09:19:58 UTC (rev 2193)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.12.0-GA</version>
+ <version>1.12.0-CP01</version>
</parent>
<artifactId>exo.jcr.framework.command</artifactId>
<name>eXo JCR :: Framework :: Command</name>
Modified: jcr/tags/1.12.0-CP01/exo.jcr.framework.ftpclient/pom.xml
===================================================================
--- jcr/tags/1.12.0-CP01/exo.jcr.framework.ftpclient/pom.xml 2010-03-31 09:08:35 UTC (rev 2192)
+++ jcr/tags/1.12.0-CP01/exo.jcr.framework.ftpclient/pom.xml 2010-03-31 09:19:58 UTC (rev 2193)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.12.0-GA</version>
+ <version>1.12.0-CP01</version>
</parent>
<artifactId>exo.jcr.framework.ftpclient</artifactId>
<name>eXo JCR :: Framework :: FTP Client</name>
Modified: jcr/tags/1.12.0-CP01/exo.jcr.framework.web/pom.xml
===================================================================
--- jcr/tags/1.12.0-CP01/exo.jcr.framework.web/pom.xml 2010-03-31 09:08:35 UTC (rev 2192)
+++ jcr/tags/1.12.0-CP01/exo.jcr.framework.web/pom.xml 2010-03-31 09:19:58 UTC (rev 2193)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.12.0-GA</version>
+ <version>1.12.0-CP01</version>
</parent>
<artifactId>exo.jcr.framework.web</artifactId>
<name>eXo JCR :: Framework :: Web</name>
Modified: jcr/tags/1.12.0-CP01/packaging/module/pom.xml
===================================================================
--- jcr/tags/1.12.0-CP01/packaging/module/pom.xml 2010-03-31 09:08:35 UTC (rev 2192)
+++ jcr/tags/1.12.0-CP01/packaging/module/pom.xml 2010-03-31 09:19:58 UTC (rev 2193)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.12.0-GA</version>
+ <version>1.12.0-CP01</version>
</parent>
<artifactId>jcr.packaging.module</artifactId>
<packaging>pom</packaging>
Modified: jcr/tags/1.12.0-CP01/pom.xml
===================================================================
--- jcr/tags/1.12.0-CP01/pom.xml 2010-03-31 09:08:35 UTC (rev 2192)
+++ jcr/tags/1.12.0-CP01/pom.xml 2010-03-31 09:19:58 UTC (rev 2193)
@@ -28,7 +28,7 @@
</parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.12.0-GA</version>
+ <version>1.12.0-CP01</version>
<packaging>pom</packaging>
<name>eXo JCR</name>
<scm>
14 years, 1 month
exo-jcr SVN: r2191 - jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command.
by do-not-reply＠jboss.org
Author: dkatayev
Date: 2010-03-30 09:52:50 -0400 (Tue, 30 Mar 2010)
New Revision: 2191
Modified:
jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/GetCommand.java
Log:
EXOJCR-623 - Fixed. Peoblem was that we rtyed to get "Last-Modified" property from version, but it doesn't have such property.
Modified: jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/GetCommand.java
===================================================================
--- jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/GetCommand.java 2010-03-30 13:33:59 UTC (rev 2190)
+++ jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/GetCommand.java 2010-03-30 13:52:50 UTC (rev 2191)
@@ -106,19 +106,24 @@
if (ResourceUtil.isFile(node))
{
+ HierarchicalProperty lastModifiedProperty;
+
if (version != null)
{
VersionedResource versionedFile = new VersionedFileResource(uri, node, nsContext);
resource = versionedFile.getVersionHistory().getVersion(version);
+
+ lastModifiedProperty = resource.getProperty(FileResource.CREATIONDATE);
istream = ((VersionResource)resource).getContentAsStream();
}
else
{
resource = new FileResource(uri, node, nsContext);
+
+ lastModifiedProperty = resource.getProperty(FileResource.GETLASTMODIFIED);
istream = ((FileResource)resource).getContentAsStream();
}
- HierarchicalProperty lastModifiedProperty = resource.getProperty(FileResource.GETLASTMODIFIED);
// check before any other reads
if ((ifModifiedSince != null) && (ifModifiedSince.equals(lastModifiedProperty.getValue())))
{
14 years, 1 month
exo-jcr SVN: r2190 - in core/trunk: exo.core.component.security.core/src/main/java/org/exoplatform/services/security/jaas and 1 other directory.
by do-not-reply＠jboss.org
Author: areshetnyak
Date: 2010-03-30 09:33:59 -0400 (Tue, 30 Mar 2010)
New Revision: 2190
Modified:
core/trunk/exo.core.component.organization.api/src/main/java/org/exoplatform/services/organization/auth/OrganizationAuthenticatorImpl.java
core/trunk/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/jaas/DefaultLoginModule.java
Log:
EXOJCR-619 : Apply patch.
Modified: core/trunk/exo.core.component.organization.api/src/main/java/org/exoplatform/services/organization/auth/OrganizationAuthenticatorImpl.java
===================================================================
--- core/trunk/exo.core.component.organization.api/src/main/java/org/exoplatform/services/organization/auth/OrganizationAuthenticatorImpl.java 2010-03-30 12:30:34 UTC (rev 2189)
+++ core/trunk/exo.core.component.organization.api/src/main/java/org/exoplatform/services/organization/auth/OrganizationAuthenticatorImpl.java 2010-03-30 13:33:59 UTC (rev 2190)
@@ -132,7 +132,7 @@
end(orgService);
if (!success)
- throw new LoginException("Login failed for " + user);
+ throw new LoginException("Login failed for " + user.replace("\n", " ").replace("\r", " "));
return user;
}
Modified: core/trunk/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/jaas/DefaultLoginModule.java
===================================================================
--- core/trunk/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/jaas/DefaultLoginModule.java 2010-03-30 12:30:34 UTC (rev 2189)
+++ core/trunk/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/jaas/DefaultLoginModule.java 2010-03-30 13:33:59 UTC (rev 2190)
@@ -126,7 +126,11 @@
}
catch (final Throwable e)
{
- log.error(e.getLocalizedMessage());
+ if (log.isDebugEnabled())
+ {
+ log.debug(e.getMessage());
+ }
+
throw new LoginException(e.getMessage());
}
}
14 years, 1 month
exo-jcr SVN: r2189 - in jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent: jbosscache and 1 other directory.
by do-not-reply＠jboss.org
Author: nzamosenchuk
Date: 2010-03-30 08:30:34 -0400 (Tue, 30 Mar 2010)
New Revision: 2189
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/CacheableWorkspaceDataManager.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/JBossCacheWorkspaceStorageCache.java
Log:
EXOJCR-609: Reverted to r2186.
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/CacheableWorkspaceDataManager.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/CacheableWorkspaceDataManager.java 2010-03-30 10:54:11 UTC (rev 2188)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/CacheableWorkspaceDataManager.java 2010-03-30 12:30:34 UTC (rev 2189)
@@ -60,11 +60,6 @@
protected static final String ITEM_DATA_NULL_VALUE_ID = "$";
/**
- * The name of the <code>null</code> value
- */
- protected static final String ITEM_DATA_NULL_VALUE_NAME = null;
-
- /**
* The <code>null</code> value for the itemData
*/
protected static final ItemData ITEM_DATA_NULL_VALUE = new NodeData()
@@ -89,7 +84,7 @@
return 0;
}
- QPath path = new QPath(new QPathEntry[]{new QPathEntry(null, ITEM_DATA_NULL_VALUE_NAME, 0)});
+ QPath path = new QPath(new QPathEntry[]{new QPathEntry(null, null, 0)});
public QPath getQPath()
{
@@ -121,26 +116,6 @@
return null;
}
- @Override
- public boolean equals(Object obj)
- {
- if (obj == this)
- {
- return true;
- }
-
- if (obj == null)
- {
- return false;
- }
-
- if (obj instanceof NodeData)
- {
- return getIdentifier().equals(((ItemData)obj).getIdentifier());
- }
-
- return false;
- }
};
/**
@@ -508,7 +483,7 @@
fixPropertyValues((PropertyData)data);
}
- return ITEM_DATA_NULL_VALUE.equals(data) ? null : data;
+ return data == ITEM_DATA_NULL_VALUE ? null : data;
}
/**
@@ -550,7 +525,7 @@
fixPropertyValues((PropertyData)data);
}
- return ITEM_DATA_NULL_VALUE.equals(data) ? null : data;
+ return data == ITEM_DATA_NULL_VALUE ? null : data;
}
/**
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/JBossCacheWorkspaceStorageCache.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/JBossCacheWorkspaceStorageCache.java 2010-03-30 10:54:11 UTC (rev 2188)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/JBossCacheWorkspaceStorageCache.java 2010-03-30 12:30:34 UTC (rev 2189)
@@ -65,24 +65,24 @@
* <ul>
* <li>/$ITEMS - stores items by Id (i.e. /$ITEMS/itemId)</li>
* <li>/$CHILD_NODES, /$CHILD_PROPS - stores items by parentId and name (i.e. /$CHILD_NODES/parentId/childName.$ITEM_ID)</li>
- * <li>/$CHILD_NODES_LIST, /$CHILD_PROPS_LIST - stores child list by parentId and child Id
+ * <li>/$CHILD_NODES_LIST, /$CHILD_PROPS_LIST - stores child list by parentId and child Id
* (i.e. /$CHILD_NODES_LIST/parentId.lists = serialized Set<Object>)</li>
* </ul>
- * </li>
+ * </li>
* <li>all child properties/nodes lists should be evicted from parent at same time
* i.e. for /$CHILD_NODES_LIST, /$CHILD_PROPS_LIST we need customized eviction policy (EvictionActionPolicy) to evict
* whole list on one of childs eviction
- * </li>
+ * </li>
* </ul>
*
- * <p/>
- * Current state notes (subject of change):
+ * <p/>
+ * Current state notes (subject of change):
* <ul>
* <li>cache implements WorkspaceStorageCache, without any stuff about references and locks</li>
* <li>transaction style implemented via JBC barches, do with JTA (i.e. via exo's TransactionService + JBoss TM)</li>
* <li>we need customized eviction policy (EvictionActionPolicy) for /$CHILD_NODES_LIST, /$CHILD_PROPS_LIST</li>
* </ul>
- *
+ *
* @author <a href="mailto:peter.nedonosko@exoplatform.com">Peter Nedonosko</a>
* @version $Id: JBossCacheWorkspaceStorageCache.java 13869 2008-05-05 08:40:10Z pnedonosko $
*/
@@ -253,7 +253,7 @@
*/
public JBossCacheWorkspaceStorageCache(WorkspaceEntry wsConfig, TransactionService transactionService,
ConfigurationManager cfm) throws RepositoryException, RepositoryConfigurationException
- {
+ {
if (wsConfig.getCache() == null)
{
throw new RepositoryConfigurationException("Cache configuration not found");
@@ -287,17 +287,17 @@
createResidentNode(childProps);
createResidentNode(childPropsList);
createResidentNode(itemsRoot);
- }
+ }
/**
* Cache constructor with JBossCache JTA transaction support.
*
- * @param wsConfig WorkspaceEntry workspace config
+ * @param wsConfig WorkspaceEntry workspace config
* @throws RepositoryException if error of initialization
* @throws RepositoryConfigurationException if error of configuration
*/
public JBossCacheWorkspaceStorageCache(WorkspaceEntry wsConfig, ConfigurationManager cfm)
- throws RepositoryException, RepositoryConfigurationException
+ throws RepositoryException, RepositoryConfigurationException
{
this(wsConfig, null, cfm);
}
@@ -336,7 +336,7 @@
/**
* Return TransactionManager used by JBossCache backing the JCR cache.
*
- * @return TransactionManager
+ * @return TransactionManager
*/
public TransactionManager getTransactionManager()
{
@@ -406,8 +406,8 @@
{
if (state.isPersisted())
{
- // There was a problem with removing a list of samename siblings in on transaction,
- // so putItemInBufferedCache(..) and updateInBufferedCache(..) used instead put(..) and update (..) methods.
+ // There was a problem with removing a list of samename siblings in on transaction,
+ // so putItemInBufferedCache(..) and updateInBufferedCache(..) used instead put(..) and update (..) methods.
ItemData prevItem = putItemInBufferedCache(state.getData());
if (prevItem != null && state.isNode())
{
@@ -446,8 +446,8 @@
}
/**
- * {@inheritDoc}
- */
+ * {@inheritDoc}
+ */
public void addChildNodes(NodeData parent, List<NodeData> childs)
{
boolean inTransaction = cache.isTransactionActive();
@@ -517,9 +517,7 @@
}
else
{
- // This is really critical situation! Anywhere at least jcr:primaryType should be!
- // At least warn to know is something happens.
- LOG.warn("Empty properties list cached " + (parent != null ? parent.getQPath().getAsString() : parent));
+ cache.put(makeChildListFqn(childPropsList, parent.getIdentifier()), ITEM_LIST, Collections.EMPTY_SET);
}
}
finally
@@ -542,7 +540,7 @@
// {
// cache.beginTransaction();
// cache.setLocal(true);
- //
+ //
// }
// finally
// {
@@ -633,7 +631,7 @@
/**
* Internal get child properties.
*
- * @param parentId String
+ * @param parentId String
* @param withValue boolean, if true only "full" Propeties can be returned
* @return List of PropertyData
*/
@@ -778,7 +776,7 @@
{
// add in CHILD_NODES
cache.put(makeChildFqn(childNodes, node.getParentIdentifier(), node.getQPath().getEntries()[node.getQPath()
- .getEntries().length - 1]), ITEM_ID, node.getIdentifier());
+ .getEntries().length - 1]), ITEM_ID, node.getIdentifier());
// if MODIFY and List present OR FORCE_MODIFY, then write
if ((modifyListsOfChild == ModifyChildOption.MODIFY && cache.getNode(makeChildListFqn(childNodesList, node
.getParentIdentifier())) != null)
@@ -799,7 +797,7 @@
{
// add in CHILD_NODES
cache.put(makeChildFqn(childNodes, node.getParentIdentifier(), node.getQPath().getEntries()[node.getQPath()
- .getEntries().length - 1]), ITEM_ID, node.getIdentifier());
+ .getEntries().length - 1]), ITEM_ID, node.getIdentifier());
// if MODIFY and List present OR FORCE_MODIFY, then write
if ((modifyListsOfChild == ModifyChildOption.MODIFY && cache.getNode(makeChildListFqn(childNodesList, node
.getParentIdentifier())) != null)
@@ -823,7 +821,7 @@
{
// add in CHILD_PROPS
cache.put(makeChildFqn(childProps, prop.getParentIdentifier(), prop.getQPath().getEntries()[prop.getQPath()
- .getEntries().length - 1]), ITEM_ID, prop.getIdentifier());
+ .getEntries().length - 1]), ITEM_ID, prop.getIdentifier());
// if MODIFY and List present OR FORCE_MODIFY, then write
if ((modifyListsOfChild == ModifyChildOption.MODIFY && cache.getNode(makeChildListFqn(childPropsList, prop
.getParentIdentifier())) != null)
@@ -845,7 +843,7 @@
// remove from CHILD_NODES of parent
cache.removeNode(makeChildFqn(childNodes, item.getParentIdentifier(), item.getQPath().getEntries()[item
- .getQPath().getEntries().length - 1]));
+ .getQPath().getEntries().length - 1]));
// remove from CHILD_NODES_LIST of parent
cache.removeFromList(makeChildListFqn(childNodesList, item.getParentIdentifier()), ITEM_LIST, item
@@ -868,7 +866,7 @@
{
// remove from CHILD_PROPS
cache.removeNode(makeChildFqn(childProps, item.getParentIdentifier(), item.getQPath().getEntries()[item
- .getQPath().getEntries().length - 1]));
+ .getQPath().getEntries().length - 1]));
// remove from CHILD_PROPS_LIST
cache.removeFromList(makeChildListFqn(childPropsList, item.getParentIdentifier()), ITEM_LIST, item
@@ -901,7 +899,7 @@
}
/**
- * Update Node hierachy in case of same-name siblings reorder.
+ * Update Node hierachy in case of same-name siblings reorder.
* Assumes the new (updated) nodes already putted in the cache. Previous name of updated nodes will be calculated
* and that node will be deleted (if has same id as the new node). Childs paths will be updated to a new node path.
*
@@ -913,7 +911,7 @@
// get previously cached NodeData and using its name remove child on the parent
Fqn<String> prevFqn =
makeChildFqn(childNodes, node.getParentIdentifier(), prevNode.getQPath().getEntries()[prevNode.getQPath()
- .getEntries().length - 1]);
+ .getEntries().length - 1]);
if (node.getIdentifier().equals(cache.get(prevFqn, ITEM_ID)))
{
// it's same-name siblings re-ordering, delete previous child
@@ -943,7 +941,7 @@
// get previously cached NodeData and using its name remove child on the parent
Fqn<String> prevFqn =
makeChildFqn(childNodes, node.getParentIdentifier(), prevNode.getQPath().getEntries()[prevNode.getQPath()
- .getEntries().length - 1]);
+ .getEntries().length - 1]);
if (node.getIdentifier().equals(cache.getFromBuffer(prevFqn, ITEM_ID)))
{
// it's same-name siblings re-ordering, delete previous child
@@ -979,15 +977,15 @@
PropertyData prevProp = iter.next();
if (inheritACL
- && (prevProp.getQPath().getName().equals(Constants.EXO_PERMISSIONS) || prevProp.getQPath().getName()
- .equals(Constants.EXO_OWNER)))
+ && (prevProp.getQPath().getName().equals(Constants.EXO_PERMISSIONS) || prevProp.getQPath().getName()
+ .equals(Constants.EXO_OWNER)))
{
inheritACL = false;
}
// recreate with new path for child Props only
QPath newPath =
QPath
- .makeChildPath(rootPath, prevProp.getQPath().getEntries()[prevProp.getQPath().getEntries().length - 1]);
+ .makeChildPath(rootPath, prevProp.getQPath().getEntries()[prevProp.getQPath().getEntries().length - 1]);
TransientPropertyData newProp =
new TransientPropertyData(newPath, prevProp.getIdentifier(), prevProp.getPersistedVersion(), prevProp
.getType(), prevProp.getParentIdentifier(), prevProp.isMultiValued(), prevProp.getValues());
@@ -1001,7 +999,7 @@
// recreate with new path for child Nodes only
QPath newPath =
QPath
- .makeChildPath(rootPath, prevNode.getQPath().getEntries()[prevNode.getQPath().getEntries().length - 1]);
+ .makeChildPath(rootPath, prevNode.getQPath().getEntries()[prevNode.getQPath().getEntries().length - 1]);
TransientNodeData newNode =
new TransientNodeData(newPath, prevNode.getIdentifier(), prevNode.getPersistedVersion(), prevNode
.getPrimaryTypeName(), prevNode.getMixinTypeNames(), prevNode.getOrderNumber(), prevNode
@@ -1036,7 +1034,7 @@
TransientNodeData newNode =
new TransientNodeData(prevNode.getQPath(), prevNode.getIdentifier(), prevNode.getPersistedVersion(),
prevNode.getPrimaryTypeName(), prevNode.getMixinTypeNames(), prevNode.getOrderNumber(), prevNode
- .getParentIdentifier(), acl);
+ .getParentIdentifier(), acl);
// update this node
cache.put(makeItemFqn(newNode.getIdentifier()), ITEM_DATA, newNode);
// update childs recursive
14 years, 1 month