Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/jcrnodetype/AllTests.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/jcrnodetype/AllTests.java?view=diff&rev=548484&r1=547884&r2=548484
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/jcrnodetype/AllTests.java
(original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/jcrnodetype/AllTests.java
Mon Jun 18 13:43:33 2007
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.ocm.persistence.jcrnodetype;
+package org.apache.jackrabbit.ocm.manager.jcrnodetype;
import org.apache.jackrabbit.ocm.RepositoryLifecycleTestSetup;
Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/jcrnodetype/PersistenceManagerJcrNodeTypeTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/jcrnodetype/PersistenceManagerJcrNodeTypeTest.java?view=diff&rev=548484&r1=547884&r2=548484
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/jcrnodetype/PersistenceManagerJcrNodeTypeTest.java
(original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/jcrnodetype/PersistenceManagerJcrNodeTypeTest.java
Mon Jun 18 13:43:33 2007
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.ocm.persistence.jcrnodetype;
+package org.apache.jackrabbit.ocm.manager.jcrnodetype;
import java.io.ByteArrayInputStream;
@@ -27,7 +27,7 @@
import org.apache.commons.logging.LogFactory;
import org.apache.jackrabbit.ocm.RepositoryLifecycleTestSetup;
import org.apache.jackrabbit.ocm.TestBase;
-import org.apache.jackrabbit.ocm.persistence.PersistenceManager;
+import org.apache.jackrabbit.ocm.manager.ObjectContentManager;
import org.apache.jackrabbit.ocm.testmodel.File;
import org.apache.jackrabbit.ocm.testmodel.Folder;
import org.apache.jackrabbit.ocm.testmodel.Resource;
@@ -68,7 +68,7 @@
try
{
- PersistenceManager persistenceManager = this.getPersistenceManager();
+ ObjectContentManager persistenceManager = this.getPersistenceManager();
//---------------------------------------------------------------------------------------------------------
// Insert a folder (class mapped to jcr:folder) with one file (class mapped to jcr:file)
Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/jcrnodetype/PersistenceManagerJcrPropertyTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/jcrnodetype/PersistenceManagerJcrPropertyTest.java?view=diff&rev=548484&r1=547884&r2=548484
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/jcrnodetype/PersistenceManagerJcrPropertyTest.java
(original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/jcrnodetype/PersistenceManagerJcrPropertyTest.java
Mon Jun 18 13:43:33 2007
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.ocm.persistence.jcrnodetype;
+package org.apache.jackrabbit.ocm.manager.jcrnodetype;
import junit.framework.Test;
import junit.framework.TestSuite;
@@ -23,7 +23,7 @@
import org.apache.commons.logging.LogFactory;
import org.apache.jackrabbit.ocm.RepositoryLifecycleTestSetup;
import org.apache.jackrabbit.ocm.TestBase;
-import org.apache.jackrabbit.ocm.persistence.PersistenceManager;
+import org.apache.jackrabbit.ocm.manager.ObjectContentManager;
import org.apache.jackrabbit.ocm.testmodel.PropertyTest;
/**
@@ -61,7 +61,7 @@
try
{
- PersistenceManager persistenceManager = this.getPersistenceManager();
+ ObjectContentManager persistenceManager = this.getPersistenceManager();
//---------------------------------------------------------------------------------------------------------
// Insert without the mandatory field
//---------------------------------------------------------------------------------------------------------
Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/lock/AllTests.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/lock/AllTests.java?view=diff&rev=548484&r1=547884&r2=548484
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/lock/AllTests.java
(original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/lock/AllTests.java
Mon Jun 18 13:43:33 2007
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.ocm.persistence.lock;
+package org.apache.jackrabbit.ocm.manager.lock;
import junit.framework.Test;
import junit.framework.TestSuite;
Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/lock/PersistenceManagerLockTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/lock/PersistenceManagerLockTest.java?view=diff&rev=548484&r1=547884&r2=548484
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/lock/PersistenceManagerLockTest.java
(original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/lock/PersistenceManagerLockTest.java
Mon Jun 18 13:43:33 2007
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.ocm.persistence.lock;
+package org.apache.jackrabbit.ocm.manager.lock;
import java.util.ArrayList;
import java.util.Collection;
@@ -27,7 +27,7 @@
import org.apache.jackrabbit.ocm.RepositoryLifecycleTestSetup;
import org.apache.jackrabbit.ocm.TestBase;
import org.apache.jackrabbit.ocm.lock.Lock;
-import org.apache.jackrabbit.ocm.persistence.PersistenceManager;
+import org.apache.jackrabbit.ocm.manager.ObjectContentManager;
import org.apache.jackrabbit.ocm.testmodel.A;
import org.apache.jackrabbit.ocm.testmodel.B;
import org.apache.jackrabbit.ocm.testmodel.C;
@@ -76,7 +76,7 @@
{
try
{
- PersistenceManager persistenceManager = getPersistenceManager();
+ ObjectContentManager persistenceManager = getPersistenceManager();
// --------------------------------------------------------------------------------
@@ -181,7 +181,7 @@
{
try
{
- PersistenceManager persistenceManager = getPersistenceManager();
+ ObjectContentManager persistenceManager = getPersistenceManager();
// --------------------------------------------------------------------------------
Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/proxy/AllTests.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/proxy/AllTests.java?view=diff&rev=548484&r1=547884&r2=548484
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/proxy/AllTests.java
(original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/proxy/AllTests.java
Mon Jun 18 13:43:33 2007
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.ocm.persistence.proxy;
+package org.apache.jackrabbit.ocm.manager.proxy;
import org.apache.jackrabbit.ocm.RepositoryLifecycleTestSetup;
Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/proxy/ProxyTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/proxy/ProxyTest.java?view=diff&rev=548484&r1=547884&r2=548484
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/proxy/ProxyTest.java
(original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/proxy/ProxyTest.java
Mon Jun 18 13:43:33 2007
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.ocm.persistence.proxy;
+package org.apache.jackrabbit.ocm.manager.proxy;
import java.util.ArrayList;
import java.util.Collection;
@@ -26,7 +26,7 @@
import org.apache.commons.logging.LogFactory;
import org.apache.jackrabbit.ocm.RepositoryLifecycleTestSetup;
import org.apache.jackrabbit.ocm.TestBase;
-import org.apache.jackrabbit.ocm.persistence.PersistenceManager;
+import org.apache.jackrabbit.ocm.manager.ObjectContentManager;
import org.apache.jackrabbit.ocm.testmodel.proxy.Detail;
import org.apache.jackrabbit.ocm.testmodel.proxy.Main;
@@ -63,7 +63,7 @@
public void testBeanProxy() {
try {
- PersistenceManager persistenceManager = this.getPersistenceManager();
+ ObjectContentManager persistenceManager = this.getPersistenceManager();
Detail detail = new Detail();
detail.setField("FieldValue");
@@ -138,7 +138,7 @@
public void testCollectionProxy() {
try {
- PersistenceManager persistenceManager = this.getPersistenceManager();
+ ObjectContentManager persistenceManager = this.getPersistenceManager();
ArrayList details= new ArrayList();
for(int i=1; i<=100;i++)
Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/query/AllTests.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/query/AllTests.java?view=diff&rev=548484&r1=547884&r2=548484
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/query/AllTests.java
(original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/query/AllTests.java
Mon Jun 18 13:43:33 2007
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.ocm.persistence.query;
+package org.apache.jackrabbit.ocm.manager.query;
import org.apache.jackrabbit.ocm.RepositoryLifecycleTestSetup;
Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/query/PersistenceManagerAtomicQueryTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/query/PersistenceManagerAtomicQueryTest.java?view=diff&rev=548484&r1=547884&r2=548484
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/query/PersistenceManagerAtomicQueryTest.java
(original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/query/PersistenceManagerAtomicQueryTest.java
Mon Jun 18 13:43:33 2007
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.ocm.persistence.query;
+package org.apache.jackrabbit.ocm.manager.query;
import java.io.ByteArrayInputStream;
import java.sql.Timestamp;
@@ -29,7 +29,7 @@
import org.apache.commons.logging.LogFactory;
import org.apache.jackrabbit.ocm.RepositoryLifecycleTestSetup;
import org.apache.jackrabbit.ocm.TestBase;
-import org.apache.jackrabbit.ocm.persistence.PersistenceManager;
+import org.apache.jackrabbit.ocm.manager.ObjectContentManager;
import org.apache.jackrabbit.ocm.query.Filter;
import org.apache.jackrabbit.ocm.query.Query;
import org.apache.jackrabbit.ocm.query.QueryManager;
@@ -77,7 +77,7 @@
{
this.importData(date);
- PersistenceManager persistenceManager = this.getPersistenceManager();
+ ObjectContentManager persistenceManager = this.getPersistenceManager();
// Test Boolean value
QueryManager queryManager = this.getQueryManager();
@@ -195,7 +195,7 @@
try
{
- PersistenceManager persistenceManager = getPersistenceManager();
+ ObjectContentManager persistenceManager = getPersistenceManager();
for (int i = 1; i <= 100; i++)
{
Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/query/PersistenceManagerIteratorQueryTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/query/PersistenceManagerIteratorQueryTest.java?view=diff&rev=548484&r1=547884&r2=548484
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/query/PersistenceManagerIteratorQueryTest.java
(original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/query/PersistenceManagerIteratorQueryTest.java
Mon Jun 18 13:43:33 2007
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.ocm.persistence.query;
+package org.apache.jackrabbit.ocm.manager.query;
import java.util.ArrayList;
import java.util.Collection;
@@ -32,8 +32,8 @@
import org.apache.jackrabbit.ocm.RepositoryLifecycleTestSetup;
import org.apache.jackrabbit.ocm.TestBase;
import org.apache.jackrabbit.ocm.exception.JcrMappingException;
-import org.apache.jackrabbit.ocm.persistence.PersistenceManager;
-import org.apache.jackrabbit.ocm.persistence.impl.PersistenceManagerImpl;
+import org.apache.jackrabbit.ocm.manager.ObjectContentManager;
+import org.apache.jackrabbit.ocm.manager.impl.PersistenceManagerImpl;
import org.apache.jackrabbit.ocm.query.Filter;
import org.apache.jackrabbit.ocm.query.Query;
import org.apache.jackrabbit.ocm.query.QueryManager;
@@ -101,7 +101,7 @@
QueryManager queryManager = this.getQueryManager();
Filter filter = queryManager.createFilter(Page.class);
Query query = queryManager.createQuery(filter);
- PersistenceManager persistenceManager = this.getPersistenceManager();
+ ObjectContentManager persistenceManager = this.getPersistenceManager();
long start = System.currentTimeMillis();
Iterator iterator = persistenceManager.getObjectIterator(query);
@@ -131,7 +131,7 @@
try
{
- PersistenceManager persistenceManager = getPersistenceManager();
+ ObjectContentManager persistenceManager = getPersistenceManager();
if (persistenceManager.objectExists("/test"))
{
Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/query/PersistenceManagerMultiValueQueryTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/query/PersistenceManagerMultiValueQueryTest.java?view=diff&rev=548484&r1=547884&r2=548484
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/query/PersistenceManagerMultiValueQueryTest.java
(original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/query/PersistenceManagerMultiValueQueryTest.java
Mon Jun 18 13:43:33 2007
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.ocm.persistence.query;
+package org.apache.jackrabbit.ocm.manager.query;
import java.util.ArrayList;
import java.util.Collection;
@@ -29,8 +29,8 @@
import org.apache.commons.logging.LogFactory;
import org.apache.jackrabbit.ocm.RepositoryLifecycleTestSetup;
import org.apache.jackrabbit.ocm.TestBase;
-import org.apache.jackrabbit.ocm.persistence.PersistenceManager;
-import org.apache.jackrabbit.ocm.persistence.impl.PersistenceManagerImpl;
+import org.apache.jackrabbit.ocm.manager.ObjectContentManager;
+import org.apache.jackrabbit.ocm.manager.impl.PersistenceManagerImpl;
import org.apache.jackrabbit.ocm.query.Filter;
import org.apache.jackrabbit.ocm.query.Query;
import org.apache.jackrabbit.ocm.query.QueryManager;
@@ -91,7 +91,7 @@
Filter filter = queryManager.createFilter(MultiValue.class);
filter.addEqualTo("multiValues", "Value1");
Query query = queryManager.createQuery(filter);
- PersistenceManager persistenceManager = this.getPersistenceManager();
+ ObjectContentManager persistenceManager = this.getPersistenceManager();
Collection result = persistenceManager.getObjects(query);
assertTrue("Invalid number of objects - should be = 3", result.size() == 3);
@@ -119,7 +119,7 @@
{
try
{
- PersistenceManager persistenceManager = getPersistenceManager();
+ ObjectContentManager persistenceManager = getPersistenceManager();
PersistenceManagerImpl persistenceManagerImpl = (PersistenceManagerImpl) persistenceManager;
Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/query/PersistenceManagerScopeQueryTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/query/PersistenceManagerScopeQueryTest.java?view=diff&rev=548484&r1=547884&r2=548484
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/query/PersistenceManagerScopeQueryTest.java
(original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/query/PersistenceManagerScopeQueryTest.java
Mon Jun 18 13:43:33 2007
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.ocm.persistence.query;
+package org.apache.jackrabbit.ocm.manager.query;
import java.util.ArrayList;
import java.util.Collection;
@@ -31,8 +31,8 @@
import org.apache.jackrabbit.ocm.RepositoryLifecycleTestSetup;
import org.apache.jackrabbit.ocm.TestBase;
import org.apache.jackrabbit.ocm.exception.JcrMappingException;
-import org.apache.jackrabbit.ocm.persistence.PersistenceManager;
-import org.apache.jackrabbit.ocm.persistence.impl.PersistenceManagerImpl;
+import org.apache.jackrabbit.ocm.manager.ObjectContentManager;
+import org.apache.jackrabbit.ocm.manager.impl.PersistenceManagerImpl;
import org.apache.jackrabbit.ocm.query.Filter;
import org.apache.jackrabbit.ocm.query.Query;
import org.apache.jackrabbit.ocm.query.QueryManager;
@@ -96,7 +96,7 @@
{
- PersistenceManager persistenceManager = this.getPersistenceManager();
+ ObjectContentManager persistenceManager = this.getPersistenceManager();
// Search on subtree (test/node1)
QueryManager queryManager = this.getQueryManager();
Filter filter = queryManager.createFilter(Paragraph.class);
@@ -169,7 +169,7 @@
try
{
- PersistenceManager persistenceManager = getPersistenceManager();
+ ObjectContentManager persistenceManager = getPersistenceManager();
PersistenceManagerImpl persistenceManagerImpl = (PersistenceManagerImpl) persistenceManager;
Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/query/PersistenceManagerSimpleQueryTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/query/PersistenceManagerSimpleQueryTest.java?view=diff&rev=548484&r1=547884&r2=548484
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/query/PersistenceManagerSimpleQueryTest.java
(original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/query/PersistenceManagerSimpleQueryTest.java
Mon Jun 18 13:43:33 2007
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.ocm.persistence.query;
+package org.apache.jackrabbit.ocm.manager.query;
import java.util.ArrayList;
import java.util.Collection;
@@ -27,7 +27,7 @@
import org.apache.jackrabbit.ocm.RepositoryLifecycleTestSetup;
import org.apache.jackrabbit.ocm.TestBase;
import org.apache.jackrabbit.ocm.exception.JcrMappingException;
-import org.apache.jackrabbit.ocm.persistence.PersistenceManager;
+import org.apache.jackrabbit.ocm.manager.ObjectContentManager;
import org.apache.jackrabbit.ocm.query.Filter;
import org.apache.jackrabbit.ocm.query.Query;
import org.apache.jackrabbit.ocm.query.QueryManager;
@@ -98,7 +98,7 @@
Query query = queryManager.createQuery(filter);
- PersistenceManager persistenceManager = this.getPersistenceManager();
+ ObjectContentManager persistenceManager = this.getPersistenceManager();
Paragraph paragraph = (Paragraph) persistenceManager.getObject(query);
assertNotNull("Object is null", paragraph);
assertTrue("Invalid paragraph found" , paragraph.getText().equals("Para 1"));
@@ -130,7 +130,7 @@
Query query = queryManager.createQuery(filter);
- PersistenceManager persistenceManager = this.getPersistenceManager();
+ ObjectContentManager persistenceManager = this.getPersistenceManager();
Collection result = persistenceManager.getObjects(query);
assertEquals("Invalid number of objects - should be = 1", 1, result.size());
Paragraph paragraph = (Paragraph) result.iterator().next();
@@ -162,7 +162,7 @@
Query query = queryManager.createQuery(filter);
- PersistenceManager persistenceManager = this.getPersistenceManager();
+ ObjectContentManager persistenceManager = this.getPersistenceManager();
Collection result = persistenceManager.getObjects(query);
assertEquals("Invalid number of objects - should be = 3", 3, result.size());
@@ -205,7 +205,7 @@
Query query = queryManager.createQuery(filter1);
- PersistenceManager persistenceManager = this.getPersistenceManager();
+ ObjectContentManager persistenceManager = this.getPersistenceManager();
Collection result = persistenceManager.getObjects(query);
assertEquals("Invalid number of objects - should be = 2", 2, result.size());
@@ -237,7 +237,7 @@
Query query = queryManager.createQuery(filter);
query.addOrderByDescending("text");
- PersistenceManager persistenceManager = this.getPersistenceManager();
+ ObjectContentManager persistenceManager = this.getPersistenceManager();
Collection result = persistenceManager.getObjects(query);
assertEquals("Invalid number of objects - should be = 3", 3, result.size());
@@ -258,7 +258,7 @@
private void importData() throws JcrMappingException
{
- PersistenceManager persistenceManager = getPersistenceManager();
+ ObjectContentManager persistenceManager = getPersistenceManager();
Page page = new Page();
page.setPath("/test");
Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/uuid/AllTests.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/uuid/AllTests.java?view=diff&rev=548484&r1=547884&r2=548484
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/uuid/AllTests.java
(original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/uuid/AllTests.java
Mon Jun 18 13:43:33 2007
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.ocm.persistence.uuid;
+package org.apache.jackrabbit.ocm.manager.uuid;
import org.apache.jackrabbit.ocm.RepositoryLifecycleTestSetup;
Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/uuid/PersistenceManagerUuidTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/uuid/PersistenceManagerUuidTest.java?view=diff&rev=548484&r1=547884&r2=548484
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/uuid/PersistenceManagerUuidTest.java
(original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/uuid/PersistenceManagerUuidTest.java
Mon Jun 18 13:43:33 2007
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.ocm.persistence.uuid;
+package org.apache.jackrabbit.ocm.manager.uuid;
import java.util.ArrayList;
import java.util.Collection;
@@ -26,7 +26,7 @@
import org.apache.commons.logging.LogFactory;
import org.apache.jackrabbit.ocm.RepositoryLifecycleTestSetup;
import org.apache.jackrabbit.ocm.TestBase;
-import org.apache.jackrabbit.ocm.persistence.PersistenceManager;
+import org.apache.jackrabbit.ocm.manager.ObjectContentManager;
import org.apache.jackrabbit.ocm.testmodel.uuid.A;
import org.apache.jackrabbit.ocm.testmodel.uuid.B;
import org.apache.jackrabbit.ocm.testmodel.uuid.B2;
@@ -100,7 +100,7 @@
{
try
{
- PersistenceManager persistenceManager = getPersistenceManager();
+ ObjectContentManager persistenceManager = getPersistenceManager();
// --------------------------------------------------------------------------------
@@ -176,7 +176,7 @@
{
try
{
- PersistenceManager persistenceManager = getPersistenceManager();
+ ObjectContentManager persistenceManager = getPersistenceManager();
// --------------------------------------------------------------------------------
// Create and store an object A in the repository
@@ -249,7 +249,7 @@
{
try
{
- PersistenceManager persistenceManager = getPersistenceManager();
+ ObjectContentManager persistenceManager = getPersistenceManager();
// --------------------------------------------------------------------------------
// Create and store an object A in the repository
@@ -320,7 +320,7 @@
{
try
{
- PersistenceManager persistenceManager = getPersistenceManager();
+ ObjectContentManager persistenceManager = getPersistenceManager();
// --------------------------------------------------------------------------------
// Create and store an object A in the repository
@@ -413,7 +413,7 @@
{
try
{
- PersistenceManager persistenceManager = getPersistenceManager();
+ ObjectContentManager persistenceManager = getPersistenceManager();
// --------------------------------------------------------------------------------
// Create and store an object A in the repository
@@ -491,7 +491,7 @@
{
try
{
- PersistenceManager persistenceManager = getPersistenceManager();
+ ObjectContentManager persistenceManager = getPersistenceManager();
// --------------------------------------------------------------------------------
Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/version/AllTests.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/version/AllTests.java?view=diff&rev=548484&r1=547884&r2=548484
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/version/AllTests.java
(original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/version/AllTests.java
Mon Jun 18 13:43:33 2007
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.ocm.persistence.version;
+package org.apache.jackrabbit.ocm.manager.version;
import org.apache.jackrabbit.ocm.RepositoryLifecycleTestSetup;
Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/version/PersistenceManagerBasicVersionningTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/version/PersistenceManagerBasicVersionningTest.java?view=diff&rev=548484&r1=547884&r2=548484
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/version/PersistenceManagerBasicVersionningTest.java
(original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/version/PersistenceManagerBasicVersionningTest.java
Mon Jun 18 13:43:33 2007
@@ -1,4 +1,4 @@
-package org.apache.jackrabbit.ocm.persistence.version;
+package org.apache.jackrabbit.ocm.manager.version;
import java.util.Date;
@@ -10,7 +10,7 @@
import org.apache.commons.logging.LogFactory;
import org.apache.jackrabbit.ocm.RepositoryLifecycleTestSetup;
import org.apache.jackrabbit.ocm.TestBase;
-import org.apache.jackrabbit.ocm.persistence.PersistenceManager;
+import org.apache.jackrabbit.ocm.manager.ObjectContentManager;
import org.apache.jackrabbit.ocm.testmodel.Page;
import org.apache.jackrabbit.ocm.testmodel.Paragraph;
import org.apache.jackrabbit.ocm.version.Version;
@@ -45,7 +45,7 @@
public void tearDown() throws Exception
{
- PersistenceManager persistenceManager = getPersistenceManager();
+ ObjectContentManager persistenceManager = getPersistenceManager();
persistenceManager.remove("/page");
persistenceManager.save();
@@ -54,7 +54,7 @@
public void testSimpleVersion()
{
- PersistenceManager persistenceManager = getPersistenceManager();
+ ObjectContentManager persistenceManager = getPersistenceManager();
try
{
@@ -120,7 +120,7 @@
public void testVersionLabels()
{
- PersistenceManager persistenceManager = getPersistenceManager();
+ ObjectContentManager persistenceManager = getPersistenceManager();
try
{
Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/Residual.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/Residual.java?view=diff&rev=548484&r1=548483&r2=548484
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/Residual.java
(original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/Residual.java
Mon Jun 18 13:43:33 2007
@@ -16,7 +16,7 @@
*/
package org.apache.jackrabbit.ocm.testmodel;
-import org.apache.jackrabbit.ocm.persistence.collectionconverter.impl.ManagedHashMap;
+import org.apache.jackrabbit.ocm.manager.collectionconverter.impl.ManagedHashMap;
/**
*
Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/collection/ArrayListElement.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/collection/ArrayListElement.java?view=diff&rev=548484&r1=548483&r2=548484
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/collection/ArrayListElement.java
(original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/collection/ArrayListElement.java
Mon Jun 18 13:43:33 2007
@@ -19,7 +19,7 @@
import java.util.ArrayList;
import java.util.Iterator;
-import org.apache.jackrabbit.ocm.persistence.collectionconverter.ManageableCollection;
+import org.apache.jackrabbit.ocm.manager.collectionconverter.ManageableCollection;
/**
*
@@ -30,7 +30,7 @@
{
/**
- * @see org.apache.jackrabbit.ocm.persistence.collectionconverter.ManageableCollection#addObject(java.lang.Object)
+ * @see org.apache.jackrabbit.ocm.manager.collectionconverter.ManageableCollection#addObject(java.lang.Object)
*/
public void addObject(Object object)
{
@@ -41,7 +41,7 @@
}
/**
- * @see org.apache.jackrabbit.ocm.persistence.collectionconverter.ManageableCollection#getIterator()
+ * @see org.apache.jackrabbit.ocm.manager.collectionconverter.ManageableCollection#getIterator()
*/
public Iterator getIterator()
{
Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/collection/HashMapElement.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/collection/HashMapElement.java?view=diff&rev=548484&r1=548483&r2=548484
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/collection/HashMapElement.java
(original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/collection/HashMapElement.java
Mon Jun 18 13:43:33 2007
@@ -19,7 +19,7 @@
import java.util.HashMap;
import java.util.Iterator;
-import org.apache.jackrabbit.ocm.persistence.collectionconverter.ManageableCollection;
+import org.apache.jackrabbit.ocm.manager.collectionconverter.ManageableCollection;
/**
*
@@ -30,7 +30,7 @@
{
/**
- * @see org.apache.jackrabbit.ocm.persistence.collectionconverter.ManageableCollection#addObject(java.lang.Object)
+ * @see org.apache.jackrabbit.ocm.manager.collectionconverter.ManageableCollection#addObject(java.lang.Object)
*/
public void addObject(Object object)
{
@@ -41,7 +41,7 @@
}
/**
- * @see org.apache.jackrabbit.ocm.persistence.collectionconverter.ManageableCollection#getIterator()
+ * @see org.apache.jackrabbit.ocm.manager.collectionconverter.ManageableCollection#getIterator()
*/
public Iterator getIterator()
{
|