svn commit: r1387869 - in /rave/sandbox/content-services/rave-jcr-config: ./ src/main/java/org/apache/rave/jcr/utils/ src/test/java/org/apache/rave/jcr/utils/ src/test/repository/ src/test/resources/

[ate]

Author: ate
Date: Thu Sep 20 06:29:06 2012
New Revision: 1387869

URL: http://svn.apache.org/viewvc?rev=1387869&view=rev
Log:
RAVE-696: clean up
- clean out rave-jcr-utils module, will be removed shortly
- fix and improve unit test setup

Added:
    
rave/sandbox/content-services/rave-jcr-config/src/main/java/org/apache/rave/jcr/utils/
    
rave/sandbox/content-services/rave-jcr-config/src/main/java/org/apache/rave/jcr/utils/JcrUtils.java
      - copied unchanged from r1387598, 
rave/sandbox/content-services/rave-jcr-utils/src/main/java/org/apache/rave/jcr/utils/JcrUtils.java
    
rave/sandbox/content-services/rave-jcr-config/src/test/java/org/apache/rave/jcr/utils/
    
rave/sandbox/content-services/rave-jcr-config/src/test/java/org/apache/rave/jcr/utils/JcrUtilsTest.java
      - copied unchanged from r1387598, 
rave/sandbox/content-services/rave-jcr-utils/src/test/java/org/apache/rave/jcr/utils/JcrUtilsTest.java
    
rave/sandbox/content-services/rave-jcr-config/src/test/resources/one-pixel-image.png
      - copied unchanged from r1387598, 
rave/sandbox/content-services/rave-jcr-utils/src/test/resources/one-pixel-image.png
Removed:
    rave/sandbox/content-services/rave-jcr-config/src/test/repository/
Modified:
    rave/sandbox/content-services/rave-jcr-config/pom.xml
    
rave/sandbox/content-services/rave-jcr-config/src/test/resources/repositoryStubImpl.properties

Modified: rave/sandbox/content-services/rave-jcr-config/pom.xml
URL: 
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-jcr-config/pom.xml?rev=1387869&r1=1387868&r2=1387869&view=diff
==============================================================================
--- rave/sandbox/content-services/rave-jcr-config/pom.xml (original)
+++ rave/sandbox/content-services/rave-jcr-config/pom.xml Thu Sep 20 06:29:06 
2012
@@ -63,16 +63,23 @@
       <version>${commons-io.version}</version>
     </dependency>
     <dependency>
+      <groupId>org.apache.tika</groupId>
+      <artifactId>tika-core</artifactId>
+      <version>${apache.tika.version}</version>
+    </dependency>
+    <dependency>
       <groupId>org.apache.jackrabbit</groupId>
       <artifactId>jackrabbit-core</artifactId>
       <version>${apache.jackrabbit.version}</version>
       <scope>test</scope>
     </dependency>
+<!--
     <dependency>
       <groupId>org.apache.rave.sandbox.jcr</groupId>
       <artifactId>rave-jcr-utils</artifactId>
       <version>${project.version}</version>
     </dependency>
+-->
     <dependency>
       <groupId>org.apache.rave.sandbox.jcr</groupId>
       <artifactId>rave-jcr-service</artifactId>
@@ -99,6 +106,7 @@
 
   <build>
     <plugins>
+<!--
       <plugin>
         <artifactId>maven-antrun-plugin</artifactId>
         <executions>
@@ -125,6 +133,7 @@
           </dependency>
         </dependencies>
       </plugin>
+-->
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>

Modified: 
rave/sandbox/content-services/rave-jcr-config/src/test/resources/repositoryStubImpl.properties
URL: 
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-jcr-config/src/test/resources/repositoryStubImpl.properties?rev=1387869&r1=1387868&r2=1387869&view=diff
==============================================================================
--- 
rave/sandbox/content-services/rave-jcr-config/src/test/resources/repositoryStubImpl.properties
 (original)
+++ 
rave/sandbox/content-services/rave-jcr-config/src/test/resources/repositoryStubImpl.properties
 Thu Sep 20 06:29:06 2012
@@ -15,3 +15,5 @@
 
 # Stub implementation class
 
javax.jcr.tck.repository_stub_impl=org.apache.jackrabbit.core.JackrabbitRepositoryStub
+org.apache.jackrabbit.repository.home=target/repository
+org.apache.jackrabbit.repository.config=target/test-classes/org/apache/rave/jcr/jackrabbit/repository.xml
\ No newline at end of file