Merge pull request #80 from acoburn/fcrepo-1641

rename fcrepo-kernel packages based on proposed upstream change
fcrepo-exts · Jul 21, 2015 · df71563 · df71563
2 parents 8a348ee + dc3e156
commit df71563
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 4 deletions.
diff --git a/pom.xml b/pom.xml
@@ -306,6 +306,20 @@
     </dependency>
 
      <!--fcrepo testing -->
+    <dependency>
+      <groupId>org.fcrepo</groupId>
+      <artifactId>fcrepo-kernel-api</artifactId>
+      <version>4.2.1-SNAPSHOT</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.fcrepo</groupId>
+      <artifactId>fcrepo-kernel-modeshape</artifactId>
+      <version>4.2.1-SNAPSHOT</version>
+      <scope>test</scope>
+    </dependency>
+
     <dependency>
       <groupId>org.fcrepo</groupId>
       <artifactId>fcrepo-jms</artifactId>

diff --git a/src/test/java/org/fcrepo/camel/integration/FcrepoConstantsIT.java b/src/test/java/org/fcrepo/camel/integration/FcrepoConstantsIT.java
@@ -20,7 +20,7 @@
 import org.fcrepo.camel.JmsHeaders;
 import org.fcrepo.camel.RdfNamespaces;
 import org.fcrepo.jms.headers.DefaultMessageFactory;
-import org.fcrepo.kernel.RdfLexicon;
+import org.fcrepo.kernel.api.RdfLexicon;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.runners.MockitoJUnitRunner;

diff --git a/src/test/resources/spring-test/repo.xml b/src/test/resources/spring-test/repo.xml
@@ -10,7 +10,7 @@
 
     <context:annotation-config/>
 
-    <bean name="modeshapeRepofactory" class="org.fcrepo.kernel.impl.spring.ModeShapeRepositoryFactoryBean">
+    <bean name="modeshapeRepofactory" class="org.fcrepo.kernel.modeshape.spring.ModeShapeRepositoryFactoryBean">
       <property name="repositoryConfiguration"
                 value="${fcrepo.modeshape.configuration:config/test_repository.json}"/>
     </bean>

diff --git a/src/test/resources/spring-test/rest.xml b/src/test/resources/spring-test/rest.xml
@@ -12,8 +12,8 @@
   <bean class="org.fcrepo.mint.UUIDPidMinter"/>
 
   <!-- Identifier translation chain -->
-  <util:list id="translationChain" value-type="org.fcrepo.kernel.identifiers.InternalIdentifierConverter">
-    <bean class="org.fcrepo.kernel.impl.identifiers.NamespaceConverter"/>
+  <util:list id="translationChain" value-type="org.fcrepo.kernel.api.identifiers.InternalIdentifierConverter">
+    <bean class="org.fcrepo.kernel.modeshape.identifiers.NamespaceConverter"/>
   </util:list>
 
 </beans>