You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by ju...@apache.org on 2009/10/19 17:31:41 UTC
svn commit: r826702 - in /jackrabbit/commons/jcr-rmi/trunk: ./ jcr-rmi-it/
jcr-rmi/ jcr-rmi/src/test/java/org/apache/jackrabbit/rmi/
jcr-rmi/src/test/resources/
Author: jukka
Date: Mon Oct 19 15:31:41 2009
New Revision: 826702
URL: http://svn.apache.org/viewvc?rev=826702&view=rev
Log:
JCRRMI-14: Integration tests for JCR-RMI
Move the integration test into the main jcr-rmi project to get more accurate code coverage reports.
Added:
jackrabbit/commons/jcr-rmi/trunk/jcr-rmi/src/test/java/org/apache/jackrabbit/rmi/
- copied from r826691, jackrabbit/commons/jcr-rmi/trunk/jcr-rmi-it/src/test/java/org/apache/jackrabbit/rmi/it/
jackrabbit/commons/jcr-rmi/trunk/jcr-rmi/src/test/resources/repositoryStubImpl.properties
- copied, changed from r826691, jackrabbit/commons/jcr-rmi/trunk/jcr-rmi-it/src/test/resources/repositoryStubImpl.properties
jackrabbit/commons/jcr-rmi/trunk/jcr-rmi/src/test/resources/test-nodetypes.xml
- copied unchanged from r826691, jackrabbit/commons/jcr-rmi/trunk/jcr-rmi-it/src/test/resources/test-nodetypes.xml
jackrabbit/commons/jcr-rmi/trunk/jcr-rmi/testng.xml
- copied, changed from r826691, jackrabbit/commons/jcr-rmi/trunk/jcr-rmi-it/testng.xml
Removed:
jackrabbit/commons/jcr-rmi/trunk/jcr-rmi-it/
Modified:
jackrabbit/commons/jcr-rmi/trunk/jcr-rmi/pom.xml
jackrabbit/commons/jcr-rmi/trunk/jcr-rmi/src/test/java/org/apache/jackrabbit/rmi/ConformanceTest.java
jackrabbit/commons/jcr-rmi/trunk/jcr-rmi/src/test/java/org/apache/jackrabbit/rmi/RepositoryServer.java
jackrabbit/commons/jcr-rmi/trunk/jcr-rmi/src/test/java/org/apache/jackrabbit/rmi/RepositoryStubImpl.java
jackrabbit/commons/jcr-rmi/trunk/jcr-rmi/src/test/java/org/apache/jackrabbit/rmi/RepositoryTest.java
jackrabbit/commons/jcr-rmi/trunk/jcr-rmi/src/test/resources/log4j.properties
jackrabbit/commons/jcr-rmi/trunk/pom.xml
Modified: jackrabbit/commons/jcr-rmi/trunk/jcr-rmi/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/commons/jcr-rmi/trunk/jcr-rmi/pom.xml?rev=826702&r1=826701&r2=826702&view=diff
==============================================================================
--- jackrabbit/commons/jcr-rmi/trunk/jcr-rmi/pom.xml (original)
+++ jackrabbit/commons/jcr-rmi/trunk/jcr-rmi/pom.xml Mon Oct 19 15:31:41 2009
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>parent</artifactId>
- <version>3</version>
+ <version>5</version>
</parent>
<!-- =================================================================== -->
@@ -47,12 +47,11 @@
<!-- =================================================================== -->
<build>
<plugins>
- <!-- Use Java 1.4 for now -->
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <target>1.4</target>
- <source>1.4</source>
+ <target>1.5</target>
+ <source>1.5</source>
</configuration>
</plugin>
<plugin>
@@ -145,25 +144,6 @@
</plugins>
</build>
</profile>
- <profile>
- <id>release</id>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-gpg-plugin</artifactId>
- <executions>
- <execution>
- <id>sign-artifacts</id>
- <phase>verify</phase>
- <goals>
- <goal>sign</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
</profiles>
<!-- =================================================================== -->
@@ -179,12 +159,12 @@
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-api</artifactId>
- <version>1.5.0</version>
+ <version>1.6.0</version>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-jcr-commons</artifactId>
- <version>1.5.0</version>
+ <version>1.6.0</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
@@ -194,15 +174,22 @@
<!-- Test dependencies -->
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.2</version>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <version>5.8</version>
<scope>test</scope>
+ <classifier>jdk15</classifier>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-core</artifactId>
- <version>1.5.0</version>
+ <version>1.6.0</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>jackrabbit-jcr-tests</artifactId>
+ <version>1.6.0</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: jackrabbit/commons/jcr-rmi/trunk/jcr-rmi/src/test/java/org/apache/jackrabbit/rmi/ConformanceTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/jcr-rmi/trunk/jcr-rmi/src/test/java/org/apache/jackrabbit/rmi/ConformanceTest.java?rev=826702&r1=826691&r2=826702&view=diff
==============================================================================
--- jackrabbit/commons/jcr-rmi/trunk/jcr-rmi/src/test/java/org/apache/jackrabbit/rmi/ConformanceTest.java (original)
+++ jackrabbit/commons/jcr-rmi/trunk/jcr-rmi/src/test/java/org/apache/jackrabbit/rmi/ConformanceTest.java Mon Oct 19 15:31:41 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.rmi.it;
+package org.apache.jackrabbit.rmi;
import junit.framework.TestSuite;
Modified: jackrabbit/commons/jcr-rmi/trunk/jcr-rmi/src/test/java/org/apache/jackrabbit/rmi/RepositoryServer.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/jcr-rmi/trunk/jcr-rmi/src/test/java/org/apache/jackrabbit/rmi/RepositoryServer.java?rev=826702&r1=826691&r2=826702&view=diff
==============================================================================
--- jackrabbit/commons/jcr-rmi/trunk/jcr-rmi/src/test/java/org/apache/jackrabbit/rmi/RepositoryServer.java (original)
+++ jackrabbit/commons/jcr-rmi/trunk/jcr-rmi/src/test/java/org/apache/jackrabbit/rmi/RepositoryServer.java Mon Oct 19 15:31:41 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.rmi.it;
+package org.apache.jackrabbit.rmi;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
Modified: jackrabbit/commons/jcr-rmi/trunk/jcr-rmi/src/test/java/org/apache/jackrabbit/rmi/RepositoryStubImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/jcr-rmi/trunk/jcr-rmi/src/test/java/org/apache/jackrabbit/rmi/RepositoryStubImpl.java?rev=826702&r1=826691&r2=826702&view=diff
==============================================================================
--- jackrabbit/commons/jcr-rmi/trunk/jcr-rmi/src/test/java/org/apache/jackrabbit/rmi/RepositoryStubImpl.java (original)
+++ jackrabbit/commons/jcr-rmi/trunk/jcr-rmi/src/test/java/org/apache/jackrabbit/rmi/RepositoryStubImpl.java Mon Oct 19 15:31:41 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.rmi.it;
+package org.apache.jackrabbit.rmi;
import java.util.Properties;
Modified: jackrabbit/commons/jcr-rmi/trunk/jcr-rmi/src/test/java/org/apache/jackrabbit/rmi/RepositoryTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/jcr-rmi/trunk/jcr-rmi/src/test/java/org/apache/jackrabbit/rmi/RepositoryTest.java?rev=826702&r1=826691&r2=826702&view=diff
==============================================================================
--- jackrabbit/commons/jcr-rmi/trunk/jcr-rmi/src/test/java/org/apache/jackrabbit/rmi/RepositoryTest.java (original)
+++ jackrabbit/commons/jcr-rmi/trunk/jcr-rmi/src/test/java/org/apache/jackrabbit/rmi/RepositoryTest.java Mon Oct 19 15:31:41 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.rmi.it;
+package org.apache.jackrabbit.rmi;
import javax.jcr.Repository;
import javax.jcr.RepositoryException;
Modified: jackrabbit/commons/jcr-rmi/trunk/jcr-rmi/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/jackrabbit/commons/jcr-rmi/trunk/jcr-rmi/src/test/resources/log4j.properties?rev=826702&r1=826701&r2=826702&view=diff
==============================================================================
--- jackrabbit/commons/jcr-rmi/trunk/jcr-rmi/src/test/resources/log4j.properties (original)
+++ jackrabbit/commons/jcr-rmi/trunk/jcr-rmi/src/test/resources/log4j.properties Mon Oct 19 15:31:41 2009
@@ -16,13 +16,6 @@
# Set root logger level to DEBUG and its only appender to file.
log4j.rootLogger=INFO, file
-# 'stdout' is set to be a ConsoleAppender.
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-
-# 'stdout' uses PatternLayout
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d{dd.MM.yyyy HH:mm:ss} *%-5p* [%t] %c{1}: %m (%F, line %L)\n
-
# 'file' is set to be a FileAppender.
log4j.appender.file=org.apache.log4j.FileAppender
log4j.appender.file.File=target/jcr.log
Copied: jackrabbit/commons/jcr-rmi/trunk/jcr-rmi/src/test/resources/repositoryStubImpl.properties (from r826691, jackrabbit/commons/jcr-rmi/trunk/jcr-rmi-it/src/test/resources/repositoryStubImpl.properties)
URL: http://svn.apache.org/viewvc/jackrabbit/commons/jcr-rmi/trunk/jcr-rmi/src/test/resources/repositoryStubImpl.properties?p2=jackrabbit/commons/jcr-rmi/trunk/jcr-rmi/src/test/resources/repositoryStubImpl.properties&p1=jackrabbit/commons/jcr-rmi/trunk/jcr-rmi-it/src/test/resources/repositoryStubImpl.properties&r1=826691&r2=826702&rev=826702&view=diff
==============================================================================
--- jackrabbit/commons/jcr-rmi/trunk/jcr-rmi-it/src/test/resources/repositoryStubImpl.properties (original)
+++ jackrabbit/commons/jcr-rmi/trunk/jcr-rmi/src/test/resources/repositoryStubImpl.properties Mon Oct 19 15:31:41 2009
@@ -14,7 +14,7 @@
# limitations under the License.
# Stub implementation class
-javax.jcr.tck.repository_stub_impl=org.apache.jackrabbit.rmi.it.RepositoryStubImpl
+javax.jcr.tck.repository_stub_impl=org.apache.jackrabbit.rmi.RepositoryStubImpl
# credential configuration
javax.jcr.tck.superuser.name=admin
Copied: jackrabbit/commons/jcr-rmi/trunk/jcr-rmi/testng.xml (from r826691, jackrabbit/commons/jcr-rmi/trunk/jcr-rmi-it/testng.xml)
URL: http://svn.apache.org/viewvc/jackrabbit/commons/jcr-rmi/trunk/jcr-rmi/testng.xml?p2=jackrabbit/commons/jcr-rmi/trunk/jcr-rmi/testng.xml&p1=jackrabbit/commons/jcr-rmi/trunk/jcr-rmi-it/testng.xml&r1=826691&r2=826702&rev=826702&view=diff
==============================================================================
--- jackrabbit/commons/jcr-rmi/trunk/jcr-rmi-it/testng.xml (original)
+++ jackrabbit/commons/jcr-rmi/trunk/jcr-rmi/testng.xml Mon Oct 19 15:31:41 2009
@@ -20,12 +20,12 @@
<suite name="jcr-rmi-integration-test">
<test name="JCR-RMI Integration Tests">
<packages>
- <package name="org.apache.jackrabbit.rmi.it"/>
+ <package name="org.apache.jackrabbit.rmi"/>
</packages>
</test>
<test name="JCR 1.0 Conformance Tests" junit="true">
<classes>
- <class name="org.apache.jackrabbit.rmi.it.ConformanceTest"/>
+ <class name="org.apache.jackrabbit.rmi.ConformanceTest"/>
</classes>
</test>
</suite>
Modified: jackrabbit/commons/jcr-rmi/trunk/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/commons/jcr-rmi/trunk/pom.xml?rev=826702&r1=826701&r2=826702&view=diff
==============================================================================
--- jackrabbit/commons/jcr-rmi/trunk/pom.xml (original)
+++ jackrabbit/commons/jcr-rmi/trunk/pom.xml Mon Oct 19 15:31:41 2009
@@ -36,7 +36,6 @@
<modules>
<module>jcr-rmi</module>
- <module>jcr-rmi-it</module>
</modules>
<build>