Author: pnedonosko
Date: 2009-12-25 10:03:26 -0500 (Fri, 25 Dec 2009)
New Revision: 1188
Modified:
jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/TransientValueData.java
jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/writing/TestCorrespondingNode.java
Log:
EXOJCR-347 transient VD & corr nodes test cleanup
Modified:
jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/TransientValueData.java
===================================================================
---
jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/TransientValueData.java 2009-12-25
15:02:53 UTC (rev 1187)
+++
jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/TransientValueData.java 2009-12-25
15:03:26 UTC (rev 1188)
@@ -125,7 +125,7 @@
* @param orderNumber
* int
*/
- protected TransientValueData(InputStream stream, int orderNumber)
+ public TransientValueData(InputStream stream, int orderNumber)
{
super(orderNumber);
this.tmpStream = stream;
@@ -428,37 +428,6 @@
}
/**
- * Create TransientCopy of data.
- *
- * TODO workaround for JBC branch, issued by the FileRestoreTest.
- *
- * @return TransientValueData
- * @throws RepositoryException
- */
- public TransientValueData createTransientCopy1() throws RepositoryException
- {
- try
- {
- if (isByteArray())
- {
- // bytes based
- return new TransientValueData(orderNumber, data, null, null, fileCleaner,
maxBufferSize, tempDirectory,
- deleteSpoolFile);
- }
- else
- {
- // stream (or file) based , i.e. shared across sessions
- return new TransientValueData(orderNumber, null, getAsStream(), null,
fileCleaner, maxBufferSize,
- tempDirectory, true);
- }
- }
- catch (IOException e)
- {
- throw new RepositoryException(e);
- }
- }
-
- /**
* Create editable ValueData copy.
*
* @return EditableValueData
Modified:
jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/writing/TestCorrespondingNode.java
===================================================================
---
jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/writing/TestCorrespondingNode.java 2009-12-25
15:02:53 UTC (rev 1187)
+++
jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/writing/TestCorrespondingNode.java 2009-12-25
15:03:26 UTC (rev 1188)
@@ -39,16 +39,6 @@
public class TestCorrespondingNode extends JcrAPIBaseTest
{
- public void setUp() throws Exception
- {
- super.setUp();
-
- // TODO
- // if(!((RepositoryImpl) repository).isWorkspaceInitialized("ws2"));
- // ((RepositoryImpl) repository).initWorkspace("ws2",
"nt:unstructured");
-
- }
-
public void testDifferentWs() throws RepositoryException
{