exo-jcr SVN: r1102 - ws/trunk.
by do-not-reply＠jboss.org
Author: sergiykarpenko
Date: 2009-12-16 11:38:49 -0500 (Wed, 16 Dec 2009)
New Revision: 1102
Modified:
ws/trunk/pom.xml
Log:
EXOJCR-322: kernel dependency changed to 2.2.0-Beta05-SNAPSHOT and core changed to 2.3.0-Beta05-SNAPSHOT
Modified: ws/trunk/pom.xml
===================================================================
--- ws/trunk/pom.xml 2009-12-16 16:09:39 UTC (rev 1101)
+++ ws/trunk/pom.xml 2009-12-16 16:38:49 UTC (rev 1102)
@@ -45,8 +45,8 @@
<exo.product.name>exo-ws</exo.product.name>
<exo.product.specification>2.1</exo.product.specification>
- <org.exoplatform.kernel.version>2.2.0-Beta04</org.exoplatform.kernel.version>
- <org.exoplatform.core.version>2.3.0-Beta04</org.exoplatform.core.version>
+ <org.exoplatform.kernel.version>2.2.0-Beta05-SNAPSHOT</org.exoplatform.kernel.version>
+ <org.exoplatform.core.version>2.3.0-Beta05-SNAPSHOT</org.exoplatform.core.version>
<exo.test.includes>*Test*</exo.test.includes>
</properties>
16 years, 7 months
exo-jcr SVN: r1101 - core/trunk.
by do-not-reply＠jboss.org
Author: sergiykarpenko
Date: 2009-12-16 11:09:39 -0500 (Wed, 16 Dec 2009)
New Revision: 1101
Modified:
core/trunk/pom.xml
Log:
EXOJCR-322: kernel dependency changed to 2.2.0-Beta05-SNAPSHOT
Modified: core/trunk/pom.xml
===================================================================
--- core/trunk/pom.xml 2009-12-16 15:27:21 UTC (rev 1100)
+++ core/trunk/pom.xml 2009-12-16 16:09:39 UTC (rev 1101)
@@ -38,7 +38,7 @@
<exo.product.name>exo-core</exo.product.name>
<exo.product.specification>2.3</exo.product.specification>
- <org.exoplatform.kernel.version>2.2.0-Beta04</org.exoplatform.kernel.version>
+ <org.exoplatform.kernel.version>2.2.0-Beta05-SNAPSHOT</org.exoplatform.kernel.version>
<exo.test.includes>*Test*</exo.test.includes>
</properties>
16 years, 7 months
exo-jcr SVN: r1100 - jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache.
by do-not-reply＠jboss.org
Author: nfilotto
Date: 2009-12-16 10:27:21 -0500 (Wed, 16 Dec 2009)
New Revision: 1100
Modified:
jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JBossCacheStorageConnectionContextHolder.java
Log:
EXOJCR-321: Prevent useless database access for the methods add(NodeData) and add(PropertyData)
Typo in the comment
Modified: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JBossCacheStorageConnectionContextHolder.java
===================================================================
--- jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JBossCacheStorageConnectionContextHolder.java 2009-12-16 15:26:03 UTC (rev 1099)
+++ jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JBossCacheStorageConnectionContextHolder.java 2009-12-16 15:27:21 UTC (rev 1100)
@@ -225,7 +225,7 @@
}
/**
- * Checks if the given uuid is a real one. By definition a valid uuid is not a predictable since it is not possible to create twice
+ * Checks if the given uuid is a real one. By definition a valid uuid is not predictable since it is not possible to create twice
* the same uuid thus the special ids such as Constants.ROOT_UUID, Constants.SYSTEM_UUID, Constants.VERSIONSTORAGE_UUID and
* Constants.NODETYPESROOT_UUID cannot be considered as real uuids. This method will return <code>true</code> if the uuid
* is not a special id, <code>false</code> otherwise.
16 years, 7 months
exo-jcr SVN: r1099 - jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache.
by do-not-reply＠jboss.org
Author: nfilotto
Date: 2009-12-16 10:26:03 -0500 (Wed, 16 Dec 2009)
New Revision: 1099
Modified:
jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JBossCacheStorageConnectionContextHolder.java
Log:
EXOJCR-321: Prevent useless database access for the methods add(NodeData) and add(PropertyData)
Comments on the method validUUID added
Modified: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JBossCacheStorageConnectionContextHolder.java
===================================================================
--- jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JBossCacheStorageConnectionContextHolder.java 2009-12-16 14:22:11 UTC (rev 1098)
+++ jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JBossCacheStorageConnectionContextHolder.java 2009-12-16 15:26:03 UTC (rev 1099)
@@ -225,7 +225,10 @@
}
/**
- * Checks if the given uuid is a real one
+ * Checks if the given uuid is a real one. By definition a valid uuid is not a predictable since it is not possible to create twice
+ * the same uuid thus the special ids such as Constants.ROOT_UUID, Constants.SYSTEM_UUID, Constants.VERSIONSTORAGE_UUID and
+ * Constants.NODETYPESROOT_UUID cannot be considered as real uuids. This method will return <code>true</code> if the uuid
+ * is not a special id, <code>false</code> otherwise.
*/
private boolean validUUID(String uuid)
{
16 years, 7 months
exo-jcr SVN: r1098 - jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache.
by do-not-reply＠jboss.org
Author: nfilotto
Date: 2009-12-16 09:22:11 -0500 (Wed, 16 Dec 2009)
New Revision: 1098
Modified:
jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JBossCacheStorageConnectionContextHolder.java
Log:
EXOJCR-321: Prevent useless database access for the methods add(NodeData) and add(PropertyData)
disable this improvement for special uuid
Modified: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JBossCacheStorageConnectionContextHolder.java
===================================================================
--- jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JBossCacheStorageConnectionContextHolder.java 2009-12-16 14:15:14 UTC (rev 1097)
+++ jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JBossCacheStorageConnectionContextHolder.java 2009-12-16 14:22:11 UTC (rev 1098)
@@ -18,6 +18,7 @@
*/
package org.exoplatform.services.jcr.impl.storage.jbosscache;
+import org.exoplatform.services.jcr.impl.Constants;
import org.exoplatform.services.jcr.impl.storage.jdbc.JDBCStorageConnection;
import org.exoplatform.services.jcr.storage.WorkspaceDataContainer;
@@ -202,6 +203,10 @@
public void addNewItemsId(String id)
{
+ if (!validUUID(id))
+ {
+ return;
+ }
if (newItemsId == null)
{
this.newItemsId = new HashSet<String>();
@@ -218,5 +223,16 @@
connection.close();
connection = null;
}
+
+ /**
+ * Checks if the given uuid is a real one
+ */
+ private boolean validUUID(String uuid)
+ {
+ boolean isSpecial =
+ Constants.ROOT_UUID.endsWith(uuid) || Constants.SYSTEM_UUID.endsWith(uuid)
+ || Constants.VERSIONSTORAGE_UUID.endsWith(uuid) || Constants.NODETYPESROOT_UUID.endsWith(uuid);
+ return !isSpecial;
+ }
}
}
16 years, 7 months
exo-jcr SVN: r1097 - jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/core.
by do-not-reply＠jboss.org
Author: skabashnyuk
Date: 2009-12-16 09:15:14 -0500 (Wed, 16 Dec 2009)
New Revision: 1097
Modified:
jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionDataManager.java
Log:
EXOJCR-199: Nicolas suggestion applied in getItemData(String uuid) method. Direct cache access
Modified: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionDataManager.java
===================================================================
--- jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionDataManager.java 2009-12-16 14:13:03 UTC (rev 1096)
+++ jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionDataManager.java 2009-12-16 14:15:14 UTC (rev 1097)
@@ -1423,7 +1423,17 @@
if (!isModified(item) && itemsPool.contains(item.getIdentifier()))
{
// if not modified but was pooled, load data from persistent storage
- ItemData persisted = transactionableManager.getItemData(item.getIdentifier());
+ ItemData persisted = null;
+ if (item.isNode())
+ {
+ persisted = transactionableManager.getItemData(item.getIdentifier());
+ }
+ else
+ {
+ NodeData parent = (NodeData)transactionableManager.getItemData(item.getParentIdentifier());
+ if (parent != null)
+ persisted = transactionableManager.getItemData(parent, (QPathEntry)item.getQPath().getName());
+ }
if (persisted == null)
{
// ...try by path
@@ -1443,7 +1453,20 @@
// the childs is acquired in the session.
for (ItemImpl pooled : itemsPool.getDescendats(persisted.getQPath()))
{
- persisted = transactionableManager.getItemData(pooled.getInternalIdentifier());
+
+ if (pooled.isNode())
+ {
+ persisted = transactionableManager.getItemData(pooled.getData().getIdentifier());
+ }
+ else
+ {
+ NodeData parent =
+ (NodeData)transactionableManager.getItemData(pooled.getData().getParentIdentifier());
+ if (parent != null)
+ persisted =
+ transactionableManager.getItemData(parent, (QPathEntry)pooled.getData().getQPath().getName());
+ }
+
if (persisted == null)
{
// ...try by path
16 years, 7 months
exo-jcr SVN: r1096 - kernel/trunk/exo.kernel.component.cache/src/test/java/org/exoplatform/services/cache/test.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2009-12-16 09:13:03 -0500 (Wed, 16 Dec 2009)
New Revision: 1096
Modified:
kernel/trunk/exo.kernel.component.cache/src/test/java/org/exoplatform/services/cache/test/TestCacheService.java
Log:
fix jmx issue with the unit test TestCacheService
Modified: kernel/trunk/exo.kernel.component.cache/src/test/java/org/exoplatform/services/cache/test/TestCacheService.java
===================================================================
--- kernel/trunk/exo.kernel.component.cache/src/test/java/org/exoplatform/services/cache/test/TestCacheService.java 2009-12-16 13:17:41 UTC (rev 1095)
+++ kernel/trunk/exo.kernel.component.cache/src/test/java/org/exoplatform/services/cache/test/TestCacheService.java 2009-12-16 14:13:03 UTC (rev 1096)
@@ -159,7 +159,7 @@
(MBeanServerLocator)PortalContainer.getInstance().getComponentInstanceOfType(MBeanServerLocator.class);
MBeanServer server = locator.server;
assertNotNull(locator.server);
- ObjectName name = new ObjectName("exo:service=cache,name=\"cacheLiveTime2s\"");
+ ObjectName name = new ObjectName("exo:service=cache,name=\"cacheLiveTime2s\",portal=\"portal\"");
MBeanInfo info = server.getMBeanInfo(name);
assertNotNull(info);
Map<String, MBeanAttributeInfo> infoMap = new HashMap<String, MBeanAttributeInfo>();
16 years, 7 months
exo-jcr SVN: r1095 - jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache.
by do-not-reply＠jboss.org
Author: skabashnyuk
Date: 2009-12-16 08:17:41 -0500 (Wed, 16 Dec 2009)
New Revision: 1095
Modified:
jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/IdTreeHelper.java
Log:
EXOJCR-199: removed tree algorithm
Modified: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/IdTreeHelper.java
===================================================================
--- jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/IdTreeHelper.java 2009-12-16 11:53:08 UTC (rev 1094)
+++ jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/IdTreeHelper.java 2009-12-16 13:17:41 UTC (rev 1095)
@@ -16,7 +16,6 @@
*/
package org.exoplatform.services.jcr.impl.storage.jbosscache;
-import org.exoplatform.services.jcr.util.IdGenerator;
import org.jboss.cache.Fqn;
/**
@@ -29,11 +28,11 @@
*/
public class IdTreeHelper
{
-
+
private final static int X_LENGTH = 8;
-
- private final static int FQN_ID_LENGTH = X_LENGTH + 2;
-
+
+ private final static int FQN_ID_LENGTH = X_LENGTH + 2;
+
/**
* Build path by UUID.
*
@@ -44,6 +43,7 @@
*/
public static String[] buildPath(String id)
{
+ /*
String tree[] = new String[X_LENGTH +1];
char[] chs = id.toCharArray();
@@ -51,10 +51,11 @@
tree[i] = String.valueOf(chs[i]);
tree[X_LENGTH] = id.substring(X_LENGTH);
-
- return tree;
+ */
+ return new String[]{id};
+
}
-
+
/**
* Create that transformation
*
@@ -72,38 +73,41 @@
*/
public static Fqn buildFqn(Fqn treeFqn)
{
+ return treeFqn;
+ /*
String oldId = treeFqn.getSubFqn(1, X_LENGTH + 2).toString();
String id = oldId.replaceAll(Fqn.SEPARATOR, "");
-
+
String[] sArray = new String[treeFqn.size() - (X_LENGTH)];
-
- sArray[0] = (String) treeFqn.get(0);
+
+ sArray[0] = (String)treeFqn.get(0);
sArray[1] = id;
-
+
int sArrayIndex = 1;
-
- for (int i=(X_LENGTH + 2); i < treeFqn.size(); i++)
+
+ for (int i = (X_LENGTH + 2); i < treeFqn.size(); i++)
{
- sArray[++sArrayIndex] = (String) treeFqn.get(i);
+ sArray[++sArrayIndex] = (String)treeFqn.get(i);
}
-
- return Fqn.fromElements(sArray);
+
+ return Fqn.fromElements(sArray);*/
}
-
+
/**
* Check the sub Fqn like /$LOCKs/2/5/6
* @return
*/
- public static boolean isSubFqn (Fqn fqn) {
- if (FQN_ID_LENGTH - fqn.size() > 1)
- {
- return true;
- }
- else
- {
- return false;
- }
-
+ public static boolean isSubFqn(Fqn fqn)
+ {
+// if (FQN_ID_LENGTH - fqn.size() > 1)
+// {
+// return true;
+// }
+// else
+// {
+// return false;
+// }
+ return false;
}
}
16 years, 7 months
exo-jcr SVN: r1094 - jcr/branches/1.12.0-OPT.
by do-not-reply＠jboss.org
Author: pnedonosko
Date: 2009-12-16 06:53:08 -0500 (Wed, 16 Dec 2009)
New Revision: 1094
Modified:
jcr/branches/1.12.0-OPT/pom.xml
Log:
OPT branch deps on Beta04 tags
Modified: jcr/branches/1.12.0-OPT/pom.xml
===================================================================
--- jcr/branches/1.12.0-OPT/pom.xml 2009-12-16 11:52:07 UTC (rev 1093)
+++ jcr/branches/1.12.0-OPT/pom.xml 2009-12-16 11:53:08 UTC (rev 1094)
@@ -38,9 +38,9 @@
<properties>
<exo.product.name>exo-jcr</exo.product.name>
<exo.product.specification>1.12</exo.product.specification>
- <org.exoplatform.kernel.version>2.2.0-Beta03-SNAPSHOT</org.exoplatform.kernel.version>
- <org.exoplatform.core.version>2.3.0-Beta03-SNAPSHOT</org.exoplatform.core.version>
- <org.exoplatform.ws.version>2.1.0-Beta03-SNAPSHOT</org.exoplatform.ws.version>
+ <org.exoplatform.kernel.version>2.2.0-Beta04</org.exoplatform.kernel.version>
+ <org.exoplatform.core.version>2.3.0-Beta04</org.exoplatform.core.version>
+ <org.exoplatform.ws.version>2.1.0-Beta04</org.exoplatform.ws.version>
</properties>
<scm>
16 years, 7 months
exo-jcr SVN: r1093 - jcr/branches/1.12.0-OPT/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl.
by do-not-reply＠jboss.org
Author: pnedonosko
Date: 2009-12-16 06:52:07 -0500 (Wed, 16 Dec 2009)
New Revision: 1093
Modified:
jcr/branches/1.12.0-OPT/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/PendingChangesLog.java
Log:
EXOJCR-274: ValueData recreation in backup
Modified: jcr/branches/1.12.0-OPT/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/PendingChangesLog.java
===================================================================
--- jcr/branches/1.12.0-OPT/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/PendingChangesLog.java 2009-12-16 11:27:46 UTC (rev 1092)
+++ jcr/branches/1.12.0-OPT/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/PendingChangesLog.java 2009-12-16 11:52:07 UTC (rev 1093)
@@ -471,6 +471,8 @@
*/
public void restore() throws IOException
{
+ // TODO same code as in BackupWorkspaceInitializer?
+
List<ItemState> listItemState = itemDataChangesLog.getAllStates();
for (int i = 0; i < this.listFixupStream.size(); i++)
{
@@ -478,11 +480,12 @@
ItemData itemData = itemState.getData();
TransientPropertyData propertyData = (TransientPropertyData)itemData;
- TransientValueData transientValueData =
+ TransientValueData tvd =
(TransientValueData)(propertyData.getValues().get(listFixupStream.get(i).getValueDataId()));
- transientValueData.setStream(new FileInputStream(listFile.get(i)));
- transientValueData.setFileCleaner(fileCleaner);
- transientValueData.isByteArray();
+
+ // re-init the value
+ tvd.delegate(new TransientValueData(tvd.getOrderNumber(), null, null, listFile.get(i), fileCleaner, -1,
+ null, true));
}
if (listRandomAccessFile != null)
16 years, 7 months