Merge branch 'mohideen/fcrepo-1871'

fcrepo-exts · Mar 30, 2016 · e13924e · e13924e
2 parents 657fe38 + 238a21a
commit e13924e
Show file tree

Hide file tree

Showing 13 changed files with 45 additions and 15 deletions.
diff --git a/fcrepo-fixity/pom.xml b/fcrepo-fixity/pom.xml
@@ -77,6 +77,12 @@
       <artifactId>commons-codec</artifactId>
     </dependency>
 
+    <dependency>
+      <groupId>org.fcrepo.client</groupId>
+      <artifactId>fcrepo-java-client</artifactId>
+      <scope>test</scope>
+    </dependency>
+
   </dependencies>
 
   <build>

diff --git a/fcrepo-fixity/src/test/java/org/fcrepo/camel/fixity/integration/RouteIT.java b/fcrepo-fixity/src/test/java/org/fcrepo/camel/fixity/integration/RouteIT.java
@@ -31,9 +31,9 @@
 import org.apache.camel.test.blueprint.CamelBlueprintTestSupport;
 import org.apache.camel.util.ObjectHelper;
 import org.apache.commons.codec.digest.DigestUtils;
-import org.fcrepo.camel.FcrepoClient;
+import org.fcrepo.client.FcrepoClient;
 import org.fcrepo.camel.FcrepoHeaders;
-import org.fcrepo.camel.FcrepoResponse;
+import org.fcrepo.client.FcrepoResponse;
 import org.fcrepo.camel.RdfNamespaces;
 import org.junit.Test;
 

diff --git a/fcrepo-indexing-solr/pom.xml b/fcrepo-indexing-solr/pom.xml
@@ -45,6 +45,11 @@
       <artifactId>fcrepo-camel</artifactId>
     </dependency>
 
+    <dependency>
+      <groupId>org.fcrepo.client</groupId>
+      <artifactId>fcrepo-java-client</artifactId>
+    </dependency>
+
     <dependency>
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-spring</artifactId>

diff --git a/fcrepo-indexing-solr/src/main/java/org/fcrepo/camel/indexing/solr/SolrRouter.java b/fcrepo-indexing-solr/src/main/java/org/fcrepo/camel/indexing/solr/SolrRouter.java
@@ -27,7 +27,7 @@
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.builder.xml.Namespaces;
 import org.apache.camel.builder.xml.XPathBuilder;
-import org.fcrepo.camel.HttpMethods;
+import org.fcrepo.client.HttpMethods;
 import org.fcrepo.camel.RdfNamespaces;
 import org.slf4j.Logger;
 

diff --git a/...indexing-solr/src/test/java/org/fcrepo/camel/indexing/solr/integration/RouteDeleteIT.java b/...indexing-solr/src/test/java/org/fcrepo/camel/indexing/solr/integration/RouteDeleteIT.java
@@ -33,9 +33,9 @@
 import org.apache.camel.test.junit4.CamelTestSupport;
 import org.apache.camel.util.ObjectHelper;
 import org.fcrepo.camel.JmsHeaders;
-import org.fcrepo.camel.FcrepoClient;
+import org.fcrepo.client.FcrepoClient;
 import org.fcrepo.camel.FcrepoHeaders;
-import org.fcrepo.camel.FcrepoResponse;
+import org.fcrepo.client.FcrepoResponse;
 import org.fcrepo.camel.indexing.solr.SolrRouter;
 
 import org.junit.Test;

diff --git a/...indexing-solr/src/test/java/org/fcrepo/camel/indexing/solr/integration/RouteUpdateIT.java b/...indexing-solr/src/test/java/org/fcrepo/camel/indexing/solr/integration/RouteUpdateIT.java
@@ -34,8 +34,8 @@
 import org.apache.camel.test.junit4.CamelTestSupport;
 import org.apache.camel.util.ObjectHelper;
 import org.fcrepo.camel.JmsHeaders;
-import org.fcrepo.camel.FcrepoClient;
-import org.fcrepo.camel.FcrepoResponse;
+import org.fcrepo.client.FcrepoClient;
+import org.fcrepo.client.FcrepoResponse;
 import org.fcrepo.camel.indexing.solr.SolrRouter;
 
 import org.junit.Test;

diff --git a/fcrepo-indexing-triplestore/pom.xml b/fcrepo-indexing-triplestore/pom.xml
@@ -85,6 +85,13 @@
       <artifactId>jackson-databind</artifactId>
       <scope>test</scope>
     </dependency>
+
+    <dependency>
+      <groupId>org.fcrepo.client</groupId>
+      <artifactId>fcrepo-java-client</artifactId>
+      <scope>test</scope>
+    </dependency>
+
   </dependencies>
 
   <build>

diff --git a/...estore/src/test/java/org/fcrepo/camel/indexing/triplestore/integration/RouteDeleteIT.java b/...estore/src/test/java/org/fcrepo/camel/indexing/triplestore/integration/RouteDeleteIT.java
@@ -35,9 +35,9 @@
 import org.apache.camel.util.ObjectHelper;
 import org.apache.jena.fuseki.EmbeddedFusekiServer;
 import org.fcrepo.camel.JmsHeaders;
-import org.fcrepo.camel.FcrepoClient;
+import org.fcrepo.client.FcrepoClient;
 import org.fcrepo.camel.FcrepoHeaders;
-import org.fcrepo.camel.FcrepoResponse;
+import org.fcrepo.client.FcrepoResponse;
 
 import org.junit.After;
 import org.junit.Before;

diff --git a/...estore/src/test/java/org/fcrepo/camel/indexing/triplestore/integration/RouteUpdateIT.java b/...estore/src/test/java/org/fcrepo/camel/indexing/triplestore/integration/RouteUpdateIT.java
@@ -36,8 +36,8 @@
 import org.apache.camel.util.ObjectHelper;
 import org.apache.jena.fuseki.EmbeddedFusekiServer;
 import org.fcrepo.camel.JmsHeaders;
-import org.fcrepo.camel.FcrepoClient;
-import org.fcrepo.camel.FcrepoResponse;
+import org.fcrepo.client.FcrepoClient;
+import org.fcrepo.client.FcrepoResponse;
 
 import org.junit.After;
 import org.junit.Before;

diff --git a/fcrepo-reindexing/src/main/java/org/fcrepo/camel/reindexing/ReindexingRouter.java b/fcrepo-reindexing/src/main/java/org/fcrepo/camel/reindexing/ReindexingRouter.java
@@ -25,7 +25,7 @@
 import org.apache.camel.PropertyInject;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.builder.xml.Namespaces;
-import org.fcrepo.camel.HttpMethods;
+import org.fcrepo.client.HttpMethods;
 import org.fcrepo.camel.RdfNamespaces;
 import org.slf4j.Logger;
 

diff --git a/fcrepo-serialization/pom.xml b/fcrepo-serialization/pom.xml
@@ -103,6 +103,12 @@
       <scope>test</scope>
     </dependency>
 
+    <dependency>
+      <groupId>org.fcrepo.client</groupId>
+      <artifactId>fcrepo-java-client</artifactId>
+      <scope>test</scope>
+    </dependency>
+
   </dependencies>
 
   <build>

diff --git a/fcrepo-serialization/src/test/java/org/fcrepo/camel/serialization/integration/RouteIT.java b/fcrepo-serialization/src/test/java/org/fcrepo/camel/serialization/integration/RouteIT.java
@@ -35,8 +35,8 @@
 import org.apache.camel.test.blueprint.CamelBlueprintTestSupport;
 import org.apache.camel.util.ObjectHelper;
 import org.fcrepo.camel.JmsHeaders;
-import org.fcrepo.camel.FcrepoClient;
-import org.fcrepo.camel.FcrepoResponse;
+import org.fcrepo.client.FcrepoClient;
+import org.fcrepo.client.FcrepoResponse;
 
 import org.junit.Test;
 import org.slf4j.Logger;

diff --git a/pom.xml b/pom.xml
@@ -41,8 +41,9 @@
     <spring.version>4.1.5.RELEASE</spring.version>
     <fcrepo.version>4.5.0</fcrepo.version>
     <fcrepo-audit.version>4.5.0</fcrepo-audit.version>
-    <fcrepo-camel.version>4.4.0</fcrepo-camel.version>
     <fcrepo-transform.version>4.5.0</fcrepo-transform.version>
+    <fcrepo-java-client.version>0.1.2</fcrepo-java-client.version>
+    <fcrepo-camel.version>4.4.1</fcrepo-camel.version>
     <fcrepo-build-tools.version>4.3.0</fcrepo-build-tools.version>
     <woodstox.version>4.4.1</woodstox.version>
     <!-- testing -->
@@ -140,6 +141,11 @@
           </exclusion>
         </exclusions>
       </dependency>
+      <dependency>
+        <groupId>org.fcrepo.client</groupId>
+        <artifactId>fcrepo-java-client</artifactId>
+        <version>${fcrepo-java-client.version}</version>
+      </dependency>
       <dependency>
         <groupId>org.codehaus.woodstox</groupId>
         <artifactId>woodstox-core-asl</artifactId>