exo-jcr SVN: r4374 - jcr/trunk/applications/exo.jcr.applications.backupconsole/src/main/java/org/exoplatform/jcr/backupconsole.
by do-not-reply＠jboss.org
Author: tolusha
Date: 2011-05-12 02:15:30 -0400 (Thu, 12 May 2011)
New Revision: 4374
Modified:
jcr/trunk/applications/exo.jcr.applications.backupconsole/src/main/java/org/exoplatform/jcr/backupconsole/BackupConsole.java
Log:
EXOJCR-1221: fix violations
Modified: jcr/trunk/applications/exo.jcr.applications.backupconsole/src/main/java/org/exoplatform/jcr/backupconsole/BackupConsole.java
===================================================================
--- jcr/trunk/applications/exo.jcr.applications.backupconsole/src/main/java/org/exoplatform/jcr/backupconsole/BackupConsole.java 2011-05-11 14:10:09 UTC (rev 4373)
+++ jcr/trunk/applications/exo.jcr.applications.backupconsole/src/main/java/org/exoplatform/jcr/backupconsole/BackupConsole.java 2011-05-12 06:15:30 UTC (rev 4374)
@@ -150,10 +150,10 @@
if (url.getUserInfo() != null)
{
- System.out
- .println(INCORRECT_PARAM
- + "Parameters Login:Password should not be specified in url parameter to form authentication - "
- + sUrl); //NOSONAR
+ System.out //NOSONAR
+ .println(INCORRECT_PARAM
+ + "Parameters Login:Password should not be specified in url parameter to form authentication - "
+ + sUrl);
return;
}
}
@@ -175,8 +175,8 @@
if (!method.equalsIgnoreCase("GET") && !method.equalsIgnoreCase("POST"))
{
- System.out.println(INCORRECT_PARAM
- + "Method to form authentication shulde be GET or POST to form parameter - " + method); //NOSONAR
+ System.out.println(INCORRECT_PARAM //NOSONAR
+ + "Method to form authentication shulde be GET or POST to form parameter - " + method);
return;
}
@@ -190,8 +190,8 @@
if (params.length != 2)
{
- System.out
- .println(INCORRECT_PARAM + "From parameters is not spacified to form parameter - " + args[curArg]); //NOSONAR
+ System.out //NOSONAR
+ .println(INCORRECT_PARAM + "From parameters is not spacified to form parameter - " + args[curArg]);
return;
}
String formUrl = params[0];
@@ -215,8 +215,8 @@
if (para.length != 2)
{
- System.out.println(INCORRECT_PARAM + "From parameters is incorect, shoulde be as \"name=value\" - "
- + fParam); //NOSONAR
+ System.out.println(INCORRECT_PARAM + "From parameters is incorect, shoulde be as \"name=value\" - " //NOSONAR
+ + fParam);
return;
}
@@ -500,8 +500,8 @@
//5. restore remove-exists <backup_id>
//11. restore <backup_id>
- System.out.println(client.restore(repositoryName, workspaceName, backupId, null, backupSetPath,
- removeExists)); //NOSONAR
+ System.out.println(client.restore(repositoryName, workspaceName, backupId, null, backupSetPath, //NOSONAR
+ removeExists));
return;
}
//check /repo/ws or /repo
@@ -527,8 +527,8 @@
//6. restore remove-exists <backup_set_path>
//12. restore <backup_set_path>
- System.out.println(client.restore(repositoryName, workspaceName, backupId, null, backupSetPath,
- removeExists)); //NOSONAR
+ System.out.println(client.restore(repositoryName, workspaceName, backupId, null, backupSetPath, //NOSONAR
+ removeExists));
return;
}
@@ -591,12 +591,12 @@
catch (IOException e)
{
System.out.println("ERROR: " + e.getMessage()); //NOSONAR
- e.printStackTrace();
+ e.printStackTrace(); //NOSONAR
}
catch (BackupExecuteException e)
{
System.out.println("ERROR: " + e.getMessage()); //NOSONAR
- e.printStackTrace();
+ e.printStackTrace(); //NOSONAR
}
System.exit(0);
13 years
exo-jcr SVN: r4373 - in jcr/trunk/exo.jcr.component.ext/src: test/java/org/exoplatform/services/jcr/ext/metadata and 1 other directory.
by do-not-reply＠jboss.org
Author: areshetnyak
Date: 2011-05-11 10:10:09 -0400 (Wed, 11 May 2011)
New Revision: 4373
Modified:
jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/metadata/AddMetadataAction.java
jcr/trunk/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/metadata/MetaDataActionTest.java
Log:
EXOJCR-1334 : Problem with catching DocumentReaderException in AddMetadataAction was fixed.
Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/metadata/AddMetadataAction.java
===================================================================
--- jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/metadata/AddMetadataAction.java 2011-05-11 14:08:32 UTC (rev 4372)
+++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/metadata/AddMetadataAction.java 2011-05-11 14:10:09 UTC (rev 4373)
@@ -22,6 +22,7 @@
import org.exoplatform.commons.utils.QName;
import org.exoplatform.container.ExoContainer;
import org.exoplatform.services.command.action.Action;
+import org.exoplatform.services.document.DocumentReadException;
import org.exoplatform.services.document.DocumentReaderService;
import org.exoplatform.services.document.HandlerNotFoundException;
import org.exoplatform.services.jcr.core.nodetype.PropertyDefinitionDatas;
@@ -124,6 +125,10 @@
{
log.debug(e.getMessage());
}
+ catch (DocumentReadException e)
+ {
+ log.warn(e.getMessage(), e);
+ }
Iterator entries = props.entrySet().iterator();
while (entries.hasNext())
Modified: jcr/trunk/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/metadata/MetaDataActionTest.java
===================================================================
--- jcr/trunk/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/metadata/MetaDataActionTest.java 2011-05-11 14:08:32 UTC (rev 4372)
+++ jcr/trunk/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/metadata/MetaDataActionTest.java 2011-05-11 14:10:09 UTC (rev 4373)
@@ -22,6 +22,7 @@
import java.io.InputStream;
import java.util.Calendar;
+import java.util.GregorianCalendar;
import javax.jcr.Node;
@@ -161,4 +162,19 @@
assertFalse(testNode.hasProperty("dc:title"));
assertFalse(testNode.hasProperty("dc:creator"));
}
+
+ public void testJcrSetPropertyTestCase() throws Exception
+ {
+ Node rootNode = session.getRootNode().addNode("MetaDataActionTest");
+ Node contentNode = rootNode.addNode("testAddContent", "nt:resource");
+ contentNode.setProperty("jcr:mimeType", "");
+ contentNode.setProperty("jcr:data", "");
+ contentNode.setProperty("jcr:lastModified", new GregorianCalendar());
+ session.save();
+
+ //try set property
+ contentNode.setProperty("jcr:mimeType", "image/jpeg");
+ session.save();
+ }
+
}
13 years
exo-jcr SVN: r4372 - core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/tika.
by do-not-reply＠jboss.org
Author: areshetnyak
Date: 2011-05-11 10:08:32 -0400 (Wed, 11 May 2011)
New Revision: 4372
Modified:
core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/tika/TikaDocumentReader.java
Log:
EXOJCR-1334 : Fix problem with throwing RuntimeException in TikaDocumentReader.
Modified: core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/tika/TikaDocumentReader.java
===================================================================
--- core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/tika/TikaDocumentReader.java 2011-05-11 13:58:28 UTC (rev 4371)
+++ core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/tika/TikaDocumentReader.java 2011-05-11 14:08:32 UTC (rev 4372)
@@ -352,7 +352,7 @@
}
else
{
- throw new RuntimeException(cause);
+ throw new DocumentReadException("Can not get properties: " + cause.getMessage(), cause);
}
}
}
13 years
exo-jcr SVN: r4371 - in jcr/branches/1.12.x/patch/1.12.9-GA: JCR-1618 and 1 other directory.
by do-not-reply＠jboss.org
Author: nzamosenchuk
Date: 2011-05-11 09:58:28 -0400 (Wed, 11 May 2011)
New Revision: 4371
Added:
jcr/branches/1.12.x/patch/1.12.9-GA/JCR-1618/
jcr/branches/1.12.x/patch/1.12.9-GA/JCR-1618/JCR-1618.patch
Log:
JCR-1618 : documentation patch proposed
Added: jcr/branches/1.12.x/patch/1.12.9-GA/JCR-1618/JCR-1618.patch
===================================================================
--- jcr/branches/1.12.x/patch/1.12.9-GA/JCR-1618/JCR-1618.patch (rev 0)
+++ jcr/branches/1.12.x/patch/1.12.9-GA/JCR-1618/JCR-1618.patch 2011-05-11 13:58:28 UTC (rev 4371)
@@ -0,0 +1,26 @@
+Index: exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/configuration/jdbc-data-container-config.xml
+===================================================================
+--- exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/configuration/jdbc-data-container-config.xml (revision 4367)
++++ exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/configuration/jdbc-data-container-config.xml (revision 4368)
+@@ -56,11 +56,16 @@
+ </listitem>
+ </itemizedlist></para>
+
+- <para>Each database software supports ANSI SQL standards but also has its
+- own specifics. So, each database has its own configuration in eXo JCR as a
+- database dialect parameter. If you need a more detailed configuration of
+- the database, it's possible to do that by editing the metadata SQL-script
+- files.</para>
++ <para><note>
++ <para>Please note, that JCR supports only READ_COMMITED isolation
++ level and any other RDBMS configurations can cause some side-effects
++ and issues. So, please, make sure proper isolation level is configured
++ on database server side.</para>
++ </note>Each database software supports ANSI SQL standards but also has
++ its own specifics. So, each database has its own configuration in eXo JCR
++ as a database dialect parameter. If you need a more detailed configuration
++ of the database, it's possible to do that by editing the metadata
++ SQL-script files.</para>
+
+ <para>In case the non-ANSI node name is used, it's necessary to use a
+ database with MultiLanguage support[TODO link to MultiLanguage]. Some JDBC
13 years
exo-jcr SVN: r4370 - jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow.
by do-not-reply＠jboss.org
Author: tolusha
Date: 2011-05-11 09:54:42 -0400 (Wed, 11 May 2011)
New Revision: 4370
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/DefaultItemDataCopyVisitor.java
Log:
EXOJCR-1234: small improvements: no need to calculate last order number for others level except 0
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/DefaultItemDataCopyVisitor.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/DefaultItemDataCopyVisitor.java 2011-05-11 13:46:25 UTC (rev 4369)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/DefaultItemDataCopyVisitor.java 2011-05-11 13:54:42 UTC (rev 4370)
@@ -154,7 +154,8 @@
// If ordering is supported by the node type of the parent node of the new
// location, then the newly moved node is appended to the end of the child node list.
int orderNum = 0;
- if (ntManager.isOrderableChildNodesSupported(parent.getPrimaryTypeName(), parent.getMixinTypeNames()))
+ if (level == 0
+ && ntManager.isOrderableChildNodesSupported(parent.getPrimaryTypeName(), parent.getMixinTypeNames()))
{
orderNum = calculateNewNodeOrderNumber();
}
@@ -162,7 +163,6 @@
{
orderNum = node.getOrderNumber(); // has no matter
}
-
String id = keepIdentifiers ? node.getIdentifier() : IdGenerator.generate();
AccessControlList acl = parent.getACL();
13 years
exo-jcr SVN: r4369 - jcr/branches/1.12.x/patch/1.12.9-GA/JCR-1611.
by do-not-reply＠jboss.org
Author: tolusha
Date: 2011-05-11 09:46:25 -0400 (Wed, 11 May 2011)
New Revision: 4369
Modified:
jcr/branches/1.12.x/patch/1.12.9-GA/JCR-1611/JCR-1611.patch
Log:
JCR-1611: patch proposed
Modified: jcr/branches/1.12.x/patch/1.12.9-GA/JCR-1611/JCR-1611.patch
===================================================================
--- jcr/branches/1.12.x/patch/1.12.9-GA/JCR-1611/JCR-1611.patch 2011-05-11 13:39:39 UTC (rev 4368)
+++ jcr/branches/1.12.x/patch/1.12.9-GA/JCR-1611/JCR-1611.patch 2011-05-11 13:46:25 UTC (rev 4369)
@@ -1,6 +1,6 @@
Index: exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/TestJBossCacheWorkspaceStorageCacheInClusterMode.java
===================================================================
---- exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/TestJBossCacheWorkspaceStorageCacheInClusterMode.java (revision 4327)
+--- exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/TestJBossCacheWorkspaceStorageCacheInClusterMode.java (revision 4354)
+++ exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/TestJBossCacheWorkspaceStorageCacheInClusterMode.java (working copy)
@@ -96,6 +96,7 @@
// Test getChildNodesData
@@ -112,7 +112,7 @@
private static class MyWorkspaceDataContainer extends WorkspaceDataContainerBase
Index: exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/persistent/TestCacheableWorkspaceDataManager.java
===================================================================
---- exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/persistent/TestCacheableWorkspaceDataManager.java (revision 4327)
+--- exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/persistent/TestCacheableWorkspaceDataManager.java (revision 4354)
+++ exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/persistent/TestCacheableWorkspaceDataManager.java (working copy)
@@ -526,6 +526,12 @@
{
@@ -129,7 +129,7 @@
private static class MyWorkspaceDataContainer extends WorkspaceDataContainerBase
Index: exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/TestNodeOrder.java
===================================================================
---- exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/TestNodeOrder.java (revision 4327)
+--- exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/TestNodeOrder.java (revision 4354)
+++ exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/TestNodeOrder.java (working copy)
@@ -36,14 +36,14 @@
*/
@@ -202,7 +202,7 @@
}
Index: exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/dataflow/ItemDataConsumer.java
===================================================================
---- exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/dataflow/ItemDataConsumer.java (revision 4327)
+--- exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/dataflow/ItemDataConsumer.java (revision 4354)
+++ exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/dataflow/ItemDataConsumer.java (working copy)
@@ -91,6 +91,15 @@
* @return int, child nodes count
@@ -222,7 +222,7 @@
* Get child Properties of the parent node.
Index: exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/NodeImpl.java
===================================================================
---- exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/NodeImpl.java (revision 4327)
+--- exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/NodeImpl.java (revision 4354)
+++ exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/NodeImpl.java (working copy)
@@ -2824,7 +2824,7 @@
@@ -235,7 +235,7 @@
private int getNextChildIndex(InternalQName nameToAdd, NodeData parentNode) throws RepositoryException,
Index: exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionDataManager.java
===================================================================
---- exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionDataManager.java (revision 4327)
+--- exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionDataManager.java (revision 4354)
+++ exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionDataManager.java (working copy)
@@ -843,6 +843,17 @@
/**
@@ -257,7 +257,7 @@
int childsCount =
Index: exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/session/LocalWorkspaceStorageDataManagerProxy.java
===================================================================
---- exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/session/LocalWorkspaceStorageDataManagerProxy.java (revision 4327)
+--- exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/session/LocalWorkspaceStorageDataManagerProxy.java (revision 4354)
+++ exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/session/LocalWorkspaceStorageDataManagerProxy.java (working copy)
@@ -135,6 +135,14 @@
/**
@@ -276,7 +276,7 @@
return storageDataManager.getChildNodesCount(parent);
Index: exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/session/SessionChangesLog.java
===================================================================
---- exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/session/SessionChangesLog.java (revision 4327)
+--- exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/session/SessionChangesLog.java (revision 4354)
+++ exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/session/SessionChangesLog.java (working copy)
@@ -62,11 +62,24 @@
new HashMap<String, Map<String, ItemState>>();
@@ -398,7 +398,7 @@
Index: exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/session/TransactionableDataManager.java
===================================================================
---- exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/session/TransactionableDataManager.java (revision 4327)
+--- exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/session/TransactionableDataManager.java (revision 4354)
+++ exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/session/TransactionableDataManager.java (working copy)
@@ -114,6 +114,37 @@
/**
@@ -440,9 +440,19 @@
if (txStarted())
Index: exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/DefaultItemDataCopyVisitor.java
===================================================================
---- exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/DefaultItemDataCopyVisitor.java (revision 4327)
+--- exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/DefaultItemDataCopyVisitor.java (revision 4354)
+++ exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/DefaultItemDataCopyVisitor.java (working copy)
-@@ -264,7 +264,7 @@
+@@ -154,7 +154,8 @@
+ // If ordering is supported by the node type of the parent node of the new
+ // location, then the newly moved node is appended to the end of the child node list.
+ int orderNum = 0;
+- if (ntManager.isOrderableChildNodesSupported(parent.getPrimaryTypeName(), parent.getMixinTypeNames()))
++ if (level == 0
++ && ntManager.isOrderableChildNodesSupported(parent.getPrimaryTypeName(), parent.getMixinTypeNames()))
+ {
+ orderNum = calculateNewNodeOrderNumber();
+ }
+@@ -264,7 +265,7 @@
protected int calculateNewNodeOrderNumber() throws RepositoryException
{
@@ -453,7 +463,7 @@
protected QPath calculateNewNodePath(NodeData node, int level) throws RepositoryException
Index: exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/WorkspacePersistentDataManager.java
===================================================================
---- exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/WorkspacePersistentDataManager.java (revision 4327)
+--- exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/WorkspacePersistentDataManager.java (revision 4354)
+++ exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/WorkspacePersistentDataManager.java (working copy)
@@ -473,10 +473,27 @@
con.close();
@@ -486,7 +496,7 @@
final WorkspaceStorageConnection con = dataContainer.openConnection();
Index: exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/ACLInheritanceSupportedWorkspaceDataManager.java
===================================================================
---- exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/ACLInheritanceSupportedWorkspaceDataManager.java (revision 4327)
+--- exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/ACLInheritanceSupportedWorkspaceDataManager.java (revision 4354)
+++ exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/ACLInheritanceSupportedWorkspaceDataManager.java (working copy)
@@ -158,6 +158,14 @@
/**
@@ -505,7 +515,7 @@
return persistentManager.getChildNodesCount(parent);
Index: exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/inmemory/InmemoryStorageConnection.java
===================================================================
---- exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/inmemory/InmemoryStorageConnection.java (revision 4327)
+--- exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/inmemory/InmemoryStorageConnection.java (revision 4354)
+++ exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/inmemory/InmemoryStorageConnection.java (working copy)
@@ -126,6 +126,11 @@
return null;
@@ -521,7 +531,7 @@
return 0;
Index: exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/HSQLDBMultiDbJDBCConnection.java
===================================================================
---- exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/HSQLDBMultiDbJDBCConnection.java (revision 4327)
+--- exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/HSQLDBMultiDbJDBCConnection.java (revision 4354)
+++ exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/HSQLDBMultiDbJDBCConnection.java (working copy)
@@ -78,6 +78,10 @@
"select V.DATA" + " from JCR_MITEM I, JCR_MVALUE V"
@@ -536,7 +546,7 @@
FIND_NODES_BY_PARENTID_CQ =
Index: exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/MultiDbJDBCConnection.java
===================================================================
---- exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/MultiDbJDBCConnection.java (revision 4327)
+--- exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/MultiDbJDBCConnection.java (revision 4354)
+++ exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/MultiDbJDBCConnection.java (working copy)
@@ -151,6 +151,9 @@
+ " from JCR_MITEM I, (SELECT ID, PARENT_ID from JCR_MITEM where ID=?) J"
@@ -572,7 +582,7 @@
if (findNodesCountByParentId == null)
Index: exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/HSQLDBSingleDbJDBCConnection.java
===================================================================
---- exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/HSQLDBSingleDbJDBCConnection.java (revision 4327)
+--- exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/HSQLDBSingleDbJDBCConnection.java (revision 4354)
+++ exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/HSQLDBSingleDbJDBCConnection.java (working copy)
@@ -85,6 +85,10 @@
+ " where I.PARENT_ID=? and I.I_CLASS=2 and I.CONTAINER_NAME=? and I.NAME=? and I.ID=V.PROPERTY_ID order by V.ORDER_NUM";
@@ -611,7 +621,7 @@
if (findNodesCountByParentId == null)
Index: exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/SingleDbJDBCConnection.java
===================================================================
---- exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/SingleDbJDBCConnection.java (revision 4327)
+--- exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/SingleDbJDBCConnection.java (revision 4354)
+++ exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/SingleDbJDBCConnection.java (working copy)
@@ -157,6 +157,9 @@
+ " from JCR_SITEM I, (SELECT ID, PARENT_ID from JCR_SITEM where ID=?) J"
@@ -648,7 +658,7 @@
if (findNodesCountByParentId == null)
Index: exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/DBConstants.java
===================================================================
---- exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/DBConstants.java (revision 4327)
+--- exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/DBConstants.java (revision 4354)
+++ exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/DBConstants.java (working copy)
@@ -128,8 +128,13 @@
* FIND_NODES_BY_PARENTID.
@@ -667,7 +677,7 @@
protected String FIND_NODES_COUNT_BY_PARENTID;
Index: exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/HSQLDBMultiDbJDBCConnection.java
===================================================================
---- exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/HSQLDBMultiDbJDBCConnection.java (revision 4327)
+--- exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/HSQLDBMultiDbJDBCConnection.java (revision 4354)
+++ exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/HSQLDBMultiDbJDBCConnection.java (working copy)
@@ -74,6 +74,8 @@
"select V.DATA" + " from JCR_MITEM I, JCR_MVALUE V"
@@ -680,7 +690,7 @@
}
Index: exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/MultiDbJDBCConnection.java
===================================================================
---- exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/MultiDbJDBCConnection.java (revision 4327)
+--- exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/MultiDbJDBCConnection.java (revision 4354)
+++ exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/MultiDbJDBCConnection.java (working copy)
@@ -127,6 +127,9 @@
@@ -716,7 +726,7 @@
if (findNodesCountByParentId == null)
Index: exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/HSQLDBSingleDbJDBCConnection.java
===================================================================
---- exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/HSQLDBSingleDbJDBCConnection.java (revision 4327)
+--- exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/HSQLDBSingleDbJDBCConnection.java (revision 4354)
+++ exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/HSQLDBSingleDbJDBCConnection.java (working copy)
@@ -81,6 +81,8 @@
+ " where I.PARENT_ID=? and I.I_CLASS=2 and I.CONTAINER_NAME=? and I.NAME=? and I.ID=V.PROPERTY_ID order by V.ORDER_NUM";
@@ -753,7 +763,7 @@
if (findNodesCountByParentId == null)
Index: exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/SingleDbJDBCConnection.java
===================================================================
---- exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/SingleDbJDBCConnection.java (revision 4327)
+--- exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/SingleDbJDBCConnection.java (revision 4354)
+++ exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/SingleDbJDBCConnection.java (working copy)
@@ -133,6 +133,9 @@
FIND_NODES_BY_PARENTID =
@@ -790,7 +800,7 @@
if (findNodesCountByParentId == null)
Index: exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCStorageConnection.java
===================================================================
---- exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCStorageConnection.java (revision 4327)
+--- exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCStorageConnection.java (revision 4354)
+++ exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCStorageConnection.java (working copy)
@@ -151,6 +151,8 @@
@@ -869,7 +879,7 @@
protected abstract ResultSet findChildPropertiesByParentIdentifier(String parentIdentifier) throws SQLException;
Index: exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/statistics/StatisticsJDBCStorageConnection.java
===================================================================
---- exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/statistics/StatisticsJDBCStorageConnection.java (revision 4327)
+--- exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/statistics/StatisticsJDBCStorageConnection.java (revision 4354)
+++ exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/statistics/StatisticsJDBCStorageConnection.java (working copy)
@@ -117,6 +117,12 @@
* <code>getChildNodesCount(NodeData parent)</code>
@@ -1066,7 +1076,7 @@
InvalidItemStateException, IllegalStateException
Index: exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/storage/WorkspaceStorageConnection.java
===================================================================
---- exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/storage/WorkspaceStorageConnection.java (revision 4327)
+--- exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/storage/WorkspaceStorageConnection.java (revision 4354)
+++ exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/storage/WorkspaceStorageConnection.java (working copy)
@@ -126,6 +126,15 @@
int getChildNodesCount(NodeData parent) throws RepositoryException;
13 years
exo-jcr SVN: r4368 - jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/configuration.
by do-not-reply＠jboss.org
Author: nzamosenchuk
Date: 2011-05-11 09:39:39 -0400 (Wed, 11 May 2011)
New Revision: 4368
Modified:
jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/configuration/jdbc-data-container-config.xml
Log:
EXOJCR-1340 : Isolation level notice added to the doc
Modified: jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/configuration/jdbc-data-container-config.xml
===================================================================
--- jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/configuration/jdbc-data-container-config.xml 2011-05-11 12:26:43 UTC (rev 4367)
+++ jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/configuration/jdbc-data-container-config.xml 2011-05-11 13:39:39 UTC (rev 4368)
@@ -56,11 +56,16 @@
</listitem>
</itemizedlist></para>
- <para>Each database software supports ANSI SQL standards but also has its
- own specifics. So, each database has its own configuration in eXo JCR as a
- database dialect parameter. If you need a more detailed configuration of
- the database, it's possible to do that by editing the metadata SQL-script
- files.</para>
+ <para><note>
+ <para>Please note, that JCR supports only READ_COMMITED isolation
+ level and any other RDBMS configurations can cause some side-effects
+ and issues. So, please, make sure proper isolation level is configured
+ on database server side.</para>
+ </note>Each database software supports ANSI SQL standards but also has
+ its own specifics. So, each database has its own configuration in eXo JCR
+ as a database dialect parameter. If you need a more detailed configuration
+ of the database, it's possible to do that by editing the metadata
+ SQL-script files.</para>
<para>In case the non-ANSI node name is used, it's necessary to use a
database with MultiLanguage support[TODO link to MultiLanguage]. Some JDBC
13 years
exo-jcr SVN: r4367 - jcr/tags/1.12.8-bonita.
by do-not-reply＠jboss.org
Author: tolusha
Date: 2011-05-11 08:26:43 -0400 (Wed, 11 May 2011)
New Revision: 4367
Modified:
jcr/tags/1.12.8-bonita/pom.xml
Log:
JCR-1622: make bonita tag: fix deps
Modified: jcr/tags/1.12.8-bonita/pom.xml
===================================================================
--- jcr/tags/1.12.8-bonita/pom.xml 2011-05-11 12:03:08 UTC (rev 4366)
+++ jcr/tags/1.12.8-bonita/pom.xml 2011-05-11 12:26:43 UTC (rev 4367)
@@ -46,6 +46,7 @@
<org.exoplatform.core.version>2.3.8-GA</org.exoplatform.core.version>
<org.exoplatform.ws.version>2.1.8-GA</org.exoplatform.ws.version>
<org.exoplatform.ws.bonita.version>2.1.8-bonita</org.exoplatform.ws.bonita.version>
+ <org.exoplatform.jcr.version>1.12.8-GA</org.exoplatform.jcr.version>
<org.exoplatform.doc-style.version>1</org.exoplatform.doc-style.version>
</properties>
@@ -121,17 +122,17 @@
<artifactId>exo.ws.frameworks.servlet</artifactId>
<version>${org.exoplatform.ws.bonita.version}</version>
</dependency>
- <dependency>
+ <!--dependency>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>exo.jcr.component.ext</artifactId>
<version>${project.version}</version>
- </dependency>
+ </dependency-->
<dependency>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>exo.jcr.component.core</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
+ <!--dependency>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>exo.jcr.framework.command</artifactId>
<version>${project.version}</version>
@@ -155,13 +156,13 @@
<groupId>org.exoplatform.jcr</groupId>
<artifactId>exo.jcr.framework.ftpclient</artifactId>
<version>${project.version}</version>
- </dependency>
+ </dependency-->
<dependency>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>exo.jcr.cluster.testclient</artifactId>
- <version>${project.version}</version>
+ <version>${org.exoplatform.jcr.version}</version>
</dependency>
- <dependency>
+ <!--dependency>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>exo.jcr.applications.fckeditor</artifactId>
<version>${project.version}</version>
@@ -184,7 +185,7 @@
<artifactId>exo.jcr.connectors.localadapter</artifactId>
<type>rar</type>
<version>${project.version}</version>
- </dependency>
+ </dependency-->
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
13 years
exo-jcr SVN: r4365 - ws/tags/2.1.8-bonita/exo.ws.frameworks.servlet/src/main/java/org/exoplatform/ws/frameworks/servlet.
by do-not-reply＠jboss.org
Author: tolusha
Date: 2011-05-11 06:57:41 -0400 (Wed, 11 May 2011)
New Revision: 4365
Modified:
ws/tags/2.1.8-bonita/exo.ws.frameworks.servlet/src/main/java/org/exoplatform/ws/frameworks/servlet/StandaloneContainerInitializedListener.java
Log:
WS-265: Stop the StandaloneContainer on context destroyed
Modified: ws/tags/2.1.8-bonita/exo.ws.frameworks.servlet/src/main/java/org/exoplatform/ws/frameworks/servlet/StandaloneContainerInitializedListener.java
===================================================================
--- ws/tags/2.1.8-bonita/exo.ws.frameworks.servlet/src/main/java/org/exoplatform/ws/frameworks/servlet/StandaloneContainerInitializedListener.java 2011-05-11 10:08:14 UTC (rev 4364)
+++ ws/tags/2.1.8-bonita/exo.ws.frameworks.servlet/src/main/java/org/exoplatform/ws/frameworks/servlet/StandaloneContainerInitializedListener.java 2011-05-11 10:57:41 UTC (rev 4365)
@@ -19,7 +19,6 @@
package org.exoplatform.ws.frameworks.servlet;
import org.exoplatform.container.StandaloneContainer;
-import org.exoplatform.container.configuration.ConfigurationManagerImpl;
import org.exoplatform.services.log.ExoLogger;
import org.exoplatform.services.log.Log;
import org.exoplatform.services.naming.InitialContextInitializer;
@@ -128,6 +127,6 @@
*/
public void contextDestroyed(ServletContextEvent event)
{
- // container.stop();
+ container.stop();
}
}
13 years
exo-jcr SVN: r4364 - jcr/trunk/exo.jcr.component.ext/src/test/resources/conf/standalone.
by do-not-reply＠jboss.org
Author: tolusha
Date: 2011-05-11 06:08:14 -0400 (Wed, 11 May 2011)
New Revision: 4364
Modified:
jcr/trunk/exo.jcr.component.ext/src/test/resources/conf/standalone/test-configuration.xml
Log:
EXOJCR-1338: Remove unnecessary from configuration to avoid failed builds on Jenkins
Modified: jcr/trunk/exo.jcr.component.ext/src/test/resources/conf/standalone/test-configuration.xml
===================================================================
--- jcr/trunk/exo.jcr.component.ext/src/test/resources/conf/standalone/test-configuration.xml 2011-05-11 07:15:42 UTC (rev 4363)
+++ jcr/trunk/exo.jcr.component.ext/src/test/resources/conf/standalone/test-configuration.xml 2011-05-11 10:08:14 UTC (rev 4364)
@@ -399,7 +399,7 @@
</init-params>
</component>
- <component>
+ <!--component>
<key>org.exoplatform.services.rpc.RPCService</key>
<type>org.exoplatform.services.rpc.impl.RPCServiceImpl</type>
<init-params>
@@ -416,7 +416,7 @@
<value>0</value>
</value-param>
</init-params>
- </component>
+ </component-->
<component>
<key>org.exoplatform.services.jcr.ext.repository.creation.RepositoryCreationService</key>
13 years