Author: norman
Date: Mon Aug 16 17:23:41 2010
New Revision: 986060
URL: http://svn.apache.org/viewvc?rev=986060&view=rev
Log:
Make sure jcr tests work with java6 and java5
Modified:
james/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/ImapHostSystem.java
james/imap/trunk/jcr/pom.xml
james/imap/trunk/memory/src/test/java/org/apache/james/imap/functional/inmemory/InMemoryHostSystem.java
james/imap/trunk/parent/pom.xml
Modified:
james/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/ImapHostSystem.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/ImapHostSystem.java?rev=986060&r1=986059&r2=986060&view=diff
==============================================================================
---
james/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/ImapHostSystem.java
(original)
+++
james/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/ImapHostSystem.java
Mon Aug 16 17:23:41 2010
@@ -248,8 +248,6 @@ public abstract class ImapHostSystem imp
}
}
- public abstract boolean addUser(String user, String password) throws
Exception;
-
public void afterTests() throws Exception {
// default do nothing
}
Modified: james/imap/trunk/jcr/pom.xml
URL:
http://svn.apache.org/viewvc/james/imap/trunk/jcr/pom.xml?rev=986060&r1=986059&r2=986060&view=diff
==============================================================================
--- james/imap/trunk/jcr/pom.xml (original)
+++ james/imap/trunk/jcr/pom.xml Mon Aug 16 17:23:41 2010
@@ -44,12 +44,13 @@
<artifactId>apache-james-imap-store</artifactId>
</dependency>
+<!--
<dependency>
<groupId>org.apache.torque</groupId>
<artifactId>torque-runtime</artifactId>
<scope>test</scope>
</dependency>
-
+-->
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>apache-james-imap-deployment</artifactId>
@@ -93,14 +94,14 @@
<artifactId>jackrabbit-core</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>apache-james-imap-jcr</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-jcr-commons</artifactId>
</dependency>
+ <!-- needed for some java versions -->
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ </dependency>
</dependencies>
Modified:
james/imap/trunk/memory/src/test/java/org/apache/james/imap/functional/inmemory/InMemoryHostSystem.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/memory/src/test/java/org/apache/james/imap/functional/inmemory/InMemoryHostSystem.java?rev=986060&r1=986059&r2=986060&view=diff
==============================================================================
---
james/imap/trunk/memory/src/test/java/org/apache/james/imap/functional/inmemory/InMemoryHostSystem.java
(original)
+++
james/imap/trunk/memory/src/test/java/org/apache/james/imap/functional/inmemory/InMemoryHostSystem.java
Mon Aug 16 17:23:41 2010
@@ -50,7 +50,6 @@ public class InMemoryHostSystem extends
defaultImapProcessorFactory.buildImapProcessor());
}
- @Override
public boolean addUser(String user, String password) throws Exception {
userManager.addUser(user, password);
return true;
Modified: james/imap/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/james/imap/trunk/parent/pom.xml?rev=986060&r1=986059&r2=986060&view=diff
==============================================================================
--- james/imap/trunk/parent/pom.xml (original)
+++ james/imap/trunk/parent/pom.xml Mon Aug 16 17:23:41 2010
@@ -541,11 +541,18 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.5.7</version>
- <scope>test</scope>
- </dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.5.7</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.9.1</version>
+ <scope>test</scope>
+ </dependency>
<!--
END JCR
-->
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
