Make updates due to kernel/kernel-impl refactoring

Related to: https://www.pivotaltracker.com/story/show/70718582
fcrepo-exts · May 28, 2014 · 4d821d1 · 4d821d1
1 parent 0c6ead3
commit 4d821d1
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 9 deletions.
diff --git a/pom.xml b/pom.xml
@@ -91,7 +91,7 @@
 
     <dependency>
       <groupId>org.fcrepo</groupId>
-      <artifactId>fcrepo-kernel</artifactId>
+      <artifactId>fcrepo-kernel-impl</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
       <classifier>tests</classifier>

diff --git a/src/main/java/org/fcrepo/auth/xacml/FedoraResourceFinderModule.java b/src/main/java/org/fcrepo/auth/xacml/FedoraResourceFinderModule.java
@@ -15,7 +15,7 @@
  */
 package org.fcrepo.auth.xacml;
 
-import static org.fcrepo.kernel.utils.FedoraTypesUtils.isInternalNode;
+import static org.fcrepo.kernel.impl.utils.FedoraTypesUtils.isInternalNode;
 import static org.modeshape.jcr.api.JcrConstants.JCR_CONTENT;
 import static org.jboss.security.xacml.sunxacml.ctx.Status.STATUS_PROCESSING_ERROR;
 

diff --git a/src/main/java/org/fcrepo/auth/xacml/TripleAttributeFinderModule.java b/src/main/java/org/fcrepo/auth/xacml/TripleAttributeFinderModule.java
@@ -34,7 +34,7 @@
 import org.fcrepo.http.commons.session.SessionFactory;
 import org.fcrepo.kernel.FedoraResource;
 import org.fcrepo.kernel.rdf.IdentifierTranslator;
-import org.fcrepo.kernel.rdf.impl.DefaultIdentifierTranslator;
+import org.fcrepo.kernel.impl.rdf.impl.DefaultIdentifierTranslator;
 import org.fcrepo.kernel.services.NodeService;
 
 import org.jboss.security.xacml.sunxacml.EvaluationCtx;

diff --git a/src/test/resources/spring-test/repo.xml b/src/test/resources/spring-test/repo.xml
@@ -10,10 +10,9 @@
   <!-- Context that supports the actual ModeShape JCR itself -->
   <context:annotation-config />
 
-  <context:component-scan base-package="org.fcrepo.kernel.services" />
-  <context:component-scan base-package="org.fcrepo.auth.xacml" />
+  <context:component-scan base-package="org.fcrepo.kernel,org.fcrepo.auth.xacml" />
 
-  <bean name="modeshapeRepofactory" class="org.fcrepo.kernel.spring.ModeShapeRepositoryFactoryBean"
+  <bean name="modeshapeRepofactory" class="org.fcrepo.kernel.impl.spring.ModeShapeRepositoryFactoryBean"
     depends-on="authenticationProvider">
     <property name="repositoryConfiguration" value="${fcrepo.modeshape.configuration:repository.json}" />
   </bean>
@@ -29,4 +28,6 @@
     <property name="initialRootPolicyFile" value="${fcrepo.xacml.initial.root.policy.file:src/main/resources/policies/GlobalRolesPolicySet.xml}"/>
   </bean>
 
+  <bean id="connectionManager" class="org.apache.http.impl.conn.PoolingHttpClientConnectionManager"/>
+
 </beans>
diff --git a/src/test/resources/spring-test/rest.xml b/src/test/resources/spring-test/rest.xml
@@ -9,11 +9,11 @@
   <bean class="org.fcrepo.http.commons.session.SessionFactory"/>
 
   <!-- Mints PIDs-->
-  <bean class="org.fcrepo.kernel.identifiers.UUIDPidMinter"/>
+  <bean class="org.fcrepo.kernel.impl.identifiers.UUIDPidMinter"/>
 
   <!-- Identifier translation chain -->
   <util:list id="translationChain" value-type="org.fcrepo.kernel.identifiers.InternalIdentifierConverter">
-    <bean class="org.fcrepo.kernel.identifiers.NamespaceConverter"/>
+    <bean class="org.fcrepo.kernel.impl.identifiers.NamespaceConverter"/>
   </util:list>
-  <context:component-scan base-package="org.fcrepo.kernel.services, org.fcrepo.http, org.fcrepo.serialization, org.fcrepo.auth.roles.common"  />
+  <context:component-scan base-package="org.fcrepo.kernel, org.fcrepo.http, org.fcrepo.serialization, org.fcrepo.auth.roles.common"  />
 </beans>