From do-not-reply at jboss.org Tue Dec 28 02:18:38 2010
Content-Type: multipart/mixed; boundary="===============4233296989905916868=="
MIME-Version: 1.0
From: do-not-reply at jboss.org
To: exo-jcr-commits at lists.jboss.org
Subject: [exo-jcr-commits] exo-jcr SVN: r3735 - in
jcr/trunk/exo.jcr.component.ext/src/test: resources/conf/standalone and 1
other directory.
Date: Tue, 28 Dec 2010 02:18:37 -0500
Message-ID: <201012280718.oBS7IbPQ000367@svn01.web.mwc.hst.phx2.redhat.com>
--===============4233296989905916868==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Author: tolusha
Date: 2010-12-28 02:18:36 -0500 (Tue, 28 Dec 2010)
New Revision: 3735
Modified:
jcr/trunk/exo.jcr.component.ext/src/test/java/org/exoplatform/services/j=
cr/ext/backup/load/TestLoadBackup.java
jcr/trunk/exo.jcr.component.ext/src/test/resources/conf/standalone/test-=
jcr-ext-config.xml
Log:
EXOJCR-1078: make TestLoadBackup independent
Modified: jcr/trunk/exo.jcr.component.ext/src/test/java/org/exoplatform/ser=
vices/jcr/ext/backup/load/TestLoadBackup.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- jcr/trunk/exo.jcr.component.ext/src/test/java/org/exoplatform/services/=
jcr/ext/backup/load/TestLoadBackup.java 2010-12-27 14:08:38 UTC (rev 3734)
+++ jcr/trunk/exo.jcr.component.ext/src/test/java/org/exoplatform/services/=
jcr/ext/backup/load/TestLoadBackup.java 2010-12-28 07:18:36 UTC (rev 3735)
@@ -18,9 +18,15 @@
=
import org.exoplatform.container.xml.InitParams;
import org.exoplatform.container.xml.PropertiesParam;
+import org.exoplatform.services.jcr.config.ContainerEntry;
+import org.exoplatform.services.jcr.config.QueryHandlerEntry;
+import org.exoplatform.services.jcr.config.QueryHandlerParams;
+import org.exoplatform.services.jcr.config.RepositoryConfigurationExceptio=
n;
+import org.exoplatform.services.jcr.config.SimpleParameterEntry;
+import org.exoplatform.services.jcr.config.ValueStorageEntry;
+import org.exoplatform.services.jcr.config.ValueStorageFilterEntry;
import org.exoplatform.services.jcr.config.WorkspaceEntry;
-import org.exoplatform.services.jcr.core.ManageableRepository;
-import org.exoplatform.services.jcr.ext.backup.AbstractBackupTestCase;
+import org.exoplatform.services.jcr.ext.BaseStandaloneTest;
import org.exoplatform.services.jcr.ext.backup.BackupChain;
import org.exoplatform.services.jcr.ext.backup.BackupChainLog;
import org.exoplatform.services.jcr.ext.backup.BackupConfig;
@@ -28,9 +34,12 @@
import org.exoplatform.services.jcr.ext.backup.BackupManager;
import org.exoplatform.services.jcr.ext.backup.ExtendedBackupManager;
import org.exoplatform.services.jcr.ext.backup.impl.BackupManagerImpl;
+import org.exoplatform.services.jcr.ext.backup.impl.JobWorkspaceRestore;
import org.exoplatform.services.jcr.impl.Constants;
import org.exoplatform.services.jcr.impl.core.NodeImpl;
import org.exoplatform.services.jcr.impl.core.PropertyImpl;
+import org.exoplatform.services.jcr.impl.core.RepositoryImpl;
+import org.exoplatform.services.jcr.impl.core.SessionImpl;
=
import java.io.File;
import java.io.FileInputStream;
@@ -40,6 +49,8 @@
import java.util.Iterator;
import java.util.List;
=
+import javax.jcr.LoginException;
+import javax.jcr.NoSuchWorkspaceException;
import javax.jcr.Node;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
@@ -57,7 +68,7 @@
* @author Karpenko Sergiy =
* @version $Id: TestLoadBackup.java 111 2008-11-11 11:11:11Z serg $
*/
-public class TestLoadBackup extends AbstractBackupTestCase
+public class TestLoadBackup extends BaseStandaloneTest
{
protected final String REPOSITORY_NAME =3D "db7";
=
@@ -69,8 +80,6 @@
=
protected final int BACKUP_TYPE =3D BackupManager.FULL_BACKUP_ONLY;
=
- protected ManageableRepository repository;
-
/**
* Writer.
*/
@@ -101,6 +110,7 @@
}
catch (Exception e)
{
+ e.printStackTrace();
}
}
}
@@ -112,7 +122,7 @@
*/
public void testBackupRestore() throws Exception
{
- BackupManagerImpl backupManagerImpl =3D null;
+ BackupManagerImpl backupManagerImpl =3D (BackupManagerImpl)getBackup=
Manager();
=
List threads =3D new ArrayList();
List sessions =3D new ArrayList();
@@ -120,7 +130,7 @@
//writers
for (int i =3D 0; i < WRITER_COUNT; i++)
{
- Session writerSession =3D repository.login(credentials, WORKSPACE=
_NAME);
+ Session writerSession =3D repositoryService.getRepository(REPOSIT=
ORY_NAME).login(credentials, WORKSPACE_NAME);
TreeWriterThread writer =3D new TreeWriterThread(writerSession, "=
subnode" + i);
writer.start();
threads.add(writer);
@@ -136,7 +146,6 @@
backDir.mkdirs();
BackupChain bch =3D null;
=
- backupManagerImpl =3D (BackupManagerImpl)getBackupManager();
backupManagerImpl.start();
=
BackupConfig config =3D new BackupConfig();
@@ -163,10 +172,10 @@
Thread.sleep(5 * 1000);
}
=
- for (Thread thread : threads)
- {
- thread.interrupt();
- }
+ // for (Thread thread : threads)
+ // {
+ // thread.interrupt();
+ // }
=
if (BACKUP_TYPE =3D=3D BackupManager.FULL_AND_INCREMENTAL)
{
@@ -199,7 +208,23 @@
assertNotNull(bchLog.getStartedTime());
assertNotNull(bchLog.getFinishedTime());
=
- backup.restore(bchLog, repositoryNameToBackup, ws1back, false);
+ backupManagerImpl.restore(bchLog, REPOSITORY_NAME, ws1back, false=
);
+
+ JobWorkspaceRestore restore =3D backupManagerImpl.getLastRestore(=
REPOSITORY_NAME, ws1back.getName());
+ if (restore !=3D null)
+ {
+ while (restore.getStateRestore() =3D=3D JobWorkspaceRestore.RE=
STORE_FAIL
+ || restore.getStateRestore() =3D=3D JobWorkspaceRestore.RES=
TORE_SUCCESSFUL)
+ {
+ Thread.sleep(1000);
+ }
+
+ if (restore.getStateRestore() =3D=3D JobWorkspaceRestore.RESTO=
RE_FAIL)
+ {
+ restore.getRestoreException().printStackTrace();
+ fail(restore.getRestoreException().getMessage());
+ }
+ }
}
else
{
@@ -208,7 +233,7 @@
=
System.out.println(" =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D CHECKING I=
NTEGRITY =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D");
=
- checkIntegrity((NodeImpl)repositoryService.getRepository(repositoryN=
ameToBackup).login(credentials, "ws1back")
+ checkIntegrity((NodeImpl)repositoryService.getRepository(REPOSITORY_=
NAME).login(credentials, "ws1back")
.getRootNode());
}
=
@@ -241,7 +266,6 @@
/**
* {@inheritDoc}
*/
- @Override
protected ExtendedBackupManager getBackupManager()
{
InitParams initParams =3D new InitParams();
@@ -308,7 +332,7 @@
=
public void _testTableLock() throws Exception
{
- Session writerSession =3D repository.login(credentials, WORKSPACE_NA=
ME);
+ Session writerSession =3D repositoryService.getRepository(REPOSITORY=
_NAME).login(credentials, WORKSPACE_NAME);
// TreeWriterThread writer =3D new TreeWriterThread(writerSessi=
on, "subnode");
// writer.start();
=
@@ -334,6 +358,79 @@
addChilds(writerSession, writerSession.getRootNode(), 0);
}
=
+ protected WorkspaceEntry makeWorkspaceEntry(String name, String sourceN=
ame) throws LoginException,
+ NoSuchWorkspaceException, RepositoryException, RepositoryConfigurati=
onException
+ {
+ SessionImpl session =3D
+ (SessionImpl)repositoryService.getRepository(REPOSITORY_NAME).log=
in(credentials, WORKSPACE_NAME);
+
+ WorkspaceEntry ws1e =3D (WorkspaceEntry)session.getContainer().getCo=
mponentInstanceOfType(WorkspaceEntry.class);
+
+ WorkspaceEntry ws1back =3D new WorkspaceEntry();
+ ws1back.setName(name);
+ // RepositoryContainer rcontainer =3D (RepositoryContainer)
+ // container.getComponentInstanceOfType(RepositoryContainer.class);
+ ws1back.setUniqueName(((RepositoryImpl)session.getRepository()).getN=
ame() + "_" + ws1back.getName()); // EXOMAN
+
+ ws1back.setAccessManager(ws1e.getAccessManager());
+ ws1back.setCache(ws1e.getCache());
+ // ws1back.setContainer(ws1e.getContainer());
+ ws1back.setLockManager(ws1e.getLockManager());
+ ws1back.setInitializer(ws1e.getInitializer());
+
+ // Indexer
+ ArrayList qParams =3D new ArrayList();
+ // qParams.add(new SimpleParameterEntry("indexDir", "target" + File.=
separator+ "temp" +
+ // File.separator +"index" + name));
+ qParams.add(new SimpleParameterEntry(QueryHandlerParams.PARAM_INDEX_=
DIR, "target/temp/index/" + name
+ + System.currentTimeMillis()));
+ QueryHandlerEntry qEntry =3D
+ new QueryHandlerEntry("org.exoplatform.services.jcr.impl.core.que=
ry.lucene.SearchIndex", qParams);
+
+ ws1back.setQueryHandler(qEntry); // EXOMAN
+
+ ArrayList params =3D new ArrayList();
+ for (Iterator i =3D ws1e.getContainer().getParameters().iterator(); =
i.hasNext();)
+ {
+ SimpleParameterEntry p =3D (SimpleParameterEntry)i.next();
+ SimpleParameterEntry newp =3D new SimpleParameterEntry(p.getName(=
), p.getValue());
+
+ if (newp.getName().equals("source-name") && sourceName !=3D null)
+ newp.setValue(sourceName);
+ else if (newp.getName().equals("swap-directory"))
+ newp.setValue("target/temp/swap/" + name + System.currentTimeM=
illis());
+
+ params.add(newp);
+ }
+
+ ContainerEntry ce =3D
+ new ContainerEntry("org.exoplatform.services.jcr.impl.storage.jdb=
c.JDBCWorkspaceDataContainer", params);
+
+ ArrayList list =3D new ArrayList();
+
+ // value storage
+ ArrayList vsparams =3D new ArrayList();
+ ValueStorageFilterEntry filterEntry =3D new ValueStorageFilterEntry(=
);
+ filterEntry.setPropertyType("Binary");
+ vsparams.add(filterEntry);
+
+ ValueStorageEntry valueStorageEntry =3D
+ new ValueStorageEntry("org.exoplatform.services.jcr.impl.storage.=
value.fs.TreeFileValueStorage", vsparams);
+ ArrayList spe =3D new ArrayList();
+ spe.add(new SimpleParameterEntry("path", "target/temp/values/" + nam=
e + "_" + System.currentTimeMillis()));
+ valueStorageEntry.setId("draft");
+ valueStorageEntry.setParameters(spe);
+ valueStorageEntry.setFilters(vsparams);
+
+ // containerEntry.setValueStorages();
+ list.add(valueStorageEntry);
+ ce.setValueStorages(list);
+
+ ws1back.setContainer(ce);
+
+ return ws1back;
+ }
+
/**
* {@inheritDoc}
*/
@@ -341,8 +438,6 @@
public void setUp() throws Exception
{
super.setUp();
-
- repository =3D repositoryService.getRepository(REPOSITORY_NAME);
}
=
/**
Modified: jcr/trunk/exo.jcr.component.ext/src/test/resources/conf/standalon=
e/test-jcr-ext-config.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- jcr/trunk/exo.jcr.component.ext/src/test/resources/conf/standalone/test=
-jcr-ext-config.xml 2010-12-27 14:08:38 UTC (rev 3734)
+++ jcr/trunk/exo.jcr.component.ext/src/test/resources/conf/standalone/test=
-jcr-ext-config.xml 2010-12-28 07:18:36 UTC (rev 3735)
@@ -30,7 +30,7 @@
-
+
@@ -63,7 +63,7 @@
-
+
@@ -86,7 +86,7 @@
-
+
@@ -105,34 +105,34 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -155,7 +155,7 @@
-
+
@@ -186,7 +186,7 @@
-
+
@@ -217,7 +217,7 @@
-
+
@@ -248,7 +248,7 @@
-
+
@@ -272,7 +272,7 @@
-
+
@@ -303,7 +303,7 @@
-
+
@@ -327,7 +327,7 @@
-
+
@@ -358,7 +358,7 @@
-
+
@@ -381,7 +381,7 @@
-
+
@@ -404,7 +404,7 @@
-
+
@@ -435,7 +435,7 @@
-
+
@@ -468,7 +468,7 @@
-
+
@@ -509,7 +509,7 @@
-
+
@@ -542,7 +542,7 @@
-
+
--===============4233296989905916868==--