Author: norman
Date: Sat Mar 13 19:11:50 2010
New Revision: 922651
URL: http://svn.apache.org/viewvc?rev=922651&view=rev
Log:
start to work on jcr unit tests (IMAP-93)
Added:
james/imap/trunk/deployment/src/test/resources/test-repository.xml
- copied, changed from r922406,
james/imap/trunk/deployment/src/test/resources/test-repository.xml
Modified:
james/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/jcr/JCRHostSystem.java
james/imap/trunk/deployment/src/test/resources/log4j.properties
Modified:
james/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/jcr/JCRHostSystem.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/jcr/JCRHostSystem.java?rev=922651&r1=922650&r2=922651&view=diff
==============================================================================
---
james/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/jcr/JCRHostSystem.java
(original)
+++
james/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/jcr/JCRHostSystem.java
Sat Mar 13 19:11:50 2010
@@ -20,6 +20,9 @@ package org.apache.james.imap.functional
import java.io.File;
+import javax.jcr.Session;
+import javax.jcr.SimpleCredentials;
+
import org.apache.commons.io.FileUtils;
import org.apache.jackrabbit.core.RepositoryImpl;
import org.apache.jackrabbit.core.config.RepositoryConfig;
@@ -37,9 +40,9 @@ public class JCRHostSystem extends ImapH
public static final String META_DATA_DIRECTORY = "target/user-meta-data";
-
- public static HostSystem build() throws Exception {
- JCRHostSystem host = new JCRHostSystem();
+ private static JCRHostSystem host;
+ public static HostSystem build() throws Exception {
+ if (host == null) host = new JCRHostSystem();
return host;
}
@@ -61,7 +64,8 @@ public class JCRHostSystem extends ImapH
RepositoryConfig config = RepositoryConfig.create(new
InputSource(this.getClass().getClassLoader().getResourceAsStream("test-repository.xml")),
JACKRABBIT_HOME);
repository = RepositoryImpl.create(config);
- mailboxManager = new JCRGlobalUserMailboxManager(userManager, new
JCRGlobalUserSubscriptionManager(repository, null, null, null), repository,
null, null, null);
+
+ mailboxManager = new JCRGlobalUserMailboxManager(userManager, new
JCRGlobalUserSubscriptionManager(repository, "default", "user", "pass"),
repository, "default", "user", "pass");
final DefaultImapProcessorFactory defaultImapProcessorFactory = new
DefaultImapProcessorFactory();
resetUserMetaData();
@@ -87,7 +91,14 @@ public class JCRHostSystem extends ImapH
public void resetData() throws Exception {
resetUserMetaData();
- mailboxManager.deleteEverything();
+
+ Session session = repository.login(new SimpleCredentials("user", new
char[0]), "default");
+ javax.jcr.Node root = session.getRootNode();
+ if (root.hasNode("mailboxes")) {
+ root.getNode("mailboxes").remove();
+ }
+ session.save();
+ //repository.shutdown();
}
public void resetUserMetaData() throws Exception {
@@ -98,4 +109,12 @@ public class JCRHostSystem extends ImapH
dir.mkdirs();
}
+ @Override
+ protected void stop() throws Exception {
+ //repository.shutdown();
+ System.out.println("HERE");
+ }
+
+
+
}
Modified: james/imap/trunk/deployment/src/test/resources/log4j.properties
URL:
http://svn.apache.org/viewvc/james/imap/trunk/deployment/src/test/resources/log4j.properties?rev=922651&r1=922650&r2=922651&view=diff
==============================================================================
--- james/imap/trunk/deployment/src/test/resources/log4j.properties (original)
+++ james/imap/trunk/deployment/src/test/resources/log4j.properties Sat Mar 13
19:11:50 2010
@@ -6,4 +6,5 @@ log4j.appender.A1.layout=org.apache.log4
log4j.appender.A1.layout.ConversionPattern=%d [%t] %-5p %c - %m%n
-org.apache.jackrabbit.core.config.ConfigurationErrorHandler=DEBUG,CONS
\ No newline at end of file
+org.apache.jackrabbit.core.config.ConfigurationErrorHandler=DEBUG,CONS
+org.apache.james.imap=DEBUG,CONS
\ No newline at end of file
Copied: james/imap/trunk/deployment/src/test/resources/test-repository.xml
(from r922406,
james/imap/trunk/deployment/src/test/resources/test-repository.xml)
URL:
http://svn.apache.org/viewvc/james/imap/trunk/deployment/src/test/resources/test-repository.xml?p2=james/imap/trunk/deployment/src/test/resources/test-repository.xml&p1=james/imap/trunk/deployment/src/test/resources/test-repository.xml&r1=922406&r2=922651&rev=922651&view=diff
==============================================================================
--- james/imap/trunk/deployment/src/test/resources/test-repository.xml
(original)
+++ james/imap/trunk/deployment/src/test/resources/test-repository.xml Sat Mar
13 19:11:50 2010
@@ -72,6 +72,11 @@
<param name="schemaObjectPrefix" value="default_"/>
</PersistenceManager>
+ <SearchIndex
+ class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
+ <param name="path" value="${wsp.home}/index" />
+ </SearchIndex>
+
</Workspace>
<!--
@@ -89,6 +94,11 @@
<param name="schema" value="h2"/>
<param name="schemaObjectPrefix"
value="version_"/>
</PersistenceManager>
+
+ <SearchIndex
+ class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
+ <param name="path" value="${wsp.home}/index" />
+ </SearchIndex>
</Versioning>
</Repository>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
