7:37 p.m.
Author: pnedonosko
Date: 2010-01-19 20:37:35 -0500 (Tue, 19 Jan 2010)
New Revision: 1495
Modified:
jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/dataflow/persistent/PersistedItemData.java
jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/dataflow/persistent/PersistedPropertyData.java
jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/lab/cluster/test/TestBLOBValue.java
jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/resources/conf/standalone/test-configuration-sjdbc.xml
jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/resources/conf/standalone/test-configuration.xml
Log:
EXOJCR-404 test and cleanup
Modified:
jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/dataflow/persistent/PersistedItemData.java
===================================================================
---
jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/dataflow/persistent/PersistedItemData.java 2010-01-20
01:22:17 UTC (rev 1494)
+++
jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/dataflow/persistent/PersistedItemData.java 2010-01-20
01:37:35 UTC (rev 1495)
@@ -53,7 +53,7 @@
private static final long serialVersionUID = -3845740801904303663L;
protected String id;
-
+
protected QPath qpath;
protected String parentId;
@@ -63,7 +63,7 @@
private final static int NOT_NULL_VALUE = 1;
private final static int NULL_VALUE = -1;
-
+
/**
* Empty constructor to serialization.
*/
@@ -129,7 +129,7 @@
return false;
}
-
+
public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException
{
byte[] buf;
@@ -188,7 +188,9 @@
out.write(parentId.getBytes());
}
else
+ {
out.writeInt(NULL_VALUE);
+ }
out.writeInt(version);
}
Modified:
jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/dataflow/persistent/PersistedPropertyData.java
===================================================================
---
jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/dataflow/persistent/PersistedPropertyData.java 2010-01-20
01:22:17 UTC (rev 1494)
+++
jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/dataflow/persistent/PersistedPropertyData.java 2010-01-20
01:37:35 UTC (rev 1495)
@@ -51,9 +51,9 @@
* serialVersionUID to serialization.
*/
private static final long serialVersionUID = 2035566403758848232L;
-
+
protected final static int NULL_VALUES = -1;
-
+
protected List<ValueData> values;
protected int type;
@@ -134,7 +134,9 @@
int listSize = values.size();
out.writeInt(listSize);
for (int i = 0; i < listSize; i++)
+ {
out.writeObject(values.get(i));
+ }
}
else
{
@@ -158,7 +160,9 @@
{
values = new ArrayList<ValueData>();
for (int i = 0; i < listSize; i++)
+ {
values.add((ValueData)in.readObject());
+ }
}
}
}
Modified:
jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/lab/cluster/test/TestBLOBValue.java
===================================================================
---
jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/lab/cluster/test/TestBLOBValue.java 2010-01-20
01:22:17 UTC (rev 1494)
+++
jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/lab/cluster/test/TestBLOBValue.java 2010-01-20
01:37:35 UTC (rev 1495)
@@ -63,7 +63,7 @@
// read
Session user1 = repository.login(credentials,
root.getSession().getWorkspace().getName());
- Node troot = user1.getRootNode().getNode("TestBLOBValue");
+ Node troot = user1.getRootNode().getNode(TEST_ROOT_NAME);
Property tblob = troot.getProperty("blob");
InputStream blobStream = tblob.getStream();
Modified:
jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/resources/conf/standalone/test-configuration-sjdbc.xml
===================================================================
---
jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/resources/conf/standalone/test-configuration-sjdbc.xml 2010-01-20
01:22:17 UTC (rev 1494)
+++
jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/resources/conf/standalone/test-configuration-sjdbc.xml 2010-01-20
01:37:35 UTC (rev 1495)
@@ -265,33 +265,6 @@
</properties-param>
</init-params>
</component-plugin>
- <!-- Resource configuration for UserTransaction
- use JOTM
- -->
- <component-plugin>
- <name>jotm.tx</name>
- <set-method>addPlugin</set-method>
- <type>org.exoplatform.services.naming.BindReferencePlugin</type>
- <init-params>
- <value-param>
- <name>bind-name</name>
- <value>UserTransaction</value>
- </value-param>
- <value-param>
- <name>class-name</name>
- <value>javax.transaction.UserTransaction</value>
- </value-param>
- <value-param>
- <name>factory</name>
- <value>org.objectweb.jotm.UserTransactionFactory</value>
- </value-param>
- <properties-param>
- <name>ref-addresses</name>
- <description>ref-addresses</description>
- <property name="jotm.timeout" value="60"/>
- </properties-param>
- </init-params>
- </component-plugin>
<component-plugin>
<name>bind.jcr</name>
<set-method>addPlugin</set-method>
Modified:
jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/resources/conf/standalone/test-configuration.xml
===================================================================
---
jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/resources/conf/standalone/test-configuration.xml 2010-01-20
01:22:17 UTC (rev 1494)
+++
jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/resources/conf/standalone/test-configuration.xml 2010-01-20
01:37:35 UTC (rev 1495)
@@ -206,7 +206,7 @@
<init-params>
<value-param>
<name>timeout</name>
- <value>300</value>
+ <value>3000</value>
</value-param>
</init-params>
</component>
@@ -521,34 +521,7 @@
</properties-param>
</init-params>
</component-plugin>
- <!-- Resource configuration for UserTransaction
- use JOTM
- -->
<component-plugin>
- <name>jotm.tx</name>
- <set-method>addPlugin</set-method>
- <type>org.exoplatform.services.naming.BindReferencePlugin</type>
- <init-params>
- <value-param>
- <name>bind-name</name>
- <value>UserTransaction</value>
- </value-param>
- <value-param>
- <name>class-name</name>
- <value>javax.transaction.UserTransaction</value>
- </value-param>
- <value-param>
- <name>factory</name>
- <value>org.objectweb.jotm.UserTransactionFactory</value>
- </value-param>
- <properties-param>
- <name>ref-addresses</name>
- <description>ref-addresses</description>
- <property name="jotm.timeout" value="60"/>
- </properties-param>
- </init-params>
- </component-plugin>
- <component-plugin>
<name>bind.jcr</name>
<set-method>addPlugin</set-method>
<type>org.exoplatform.services.naming.BindReferencePlugin</type>