Make updates due to kernel/kernel-impl refactoring

Related to: https://www.pivotaltracker.com/story/show/70718582
fcrepo4-archive · May 28, 2014 · b36e60a · b36e60a
1 parent 96efe97
commit b36e60a
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 10 deletions.
diff --git a/fcrepo-jms-indexer-core/pom.xml b/fcrepo-jms-indexer-core/pom.xml
@@ -106,11 +106,11 @@
     </dependency>
     <dependency>
       <groupId>org.fcrepo</groupId>
-      <artifactId>fcrepo-kernel-api</artifactId>
+      <artifactId>fcrepo-kernel</artifactId>
     </dependency>
     <dependency>
       <groupId>org.fcrepo</groupId>
-      <artifactId>fcrepo-kernel</artifactId>
+      <artifactId>fcrepo-kernel-impl</artifactId>
     </dependency>
     <dependency>
       <groupId>org.fcrepo</groupId>

diff --git a/fcrepo-jms-indexer-core/src/test/resources/spring-test/eventing.xml b/fcrepo-jms-indexer-core/src/test/resources/spring-test/eventing.xml
@@ -12,13 +12,13 @@
     <context:annotation-config/>
 
     <!-- listener that moves JCR Events to the Fedora internal event bus -->
-    <bean class="org.fcrepo.kernel.observer.SimpleObserver"/>
+    <bean class="org.fcrepo.kernel.impl.observer.SimpleObserver"/>
 
     <!-- used by bean above to filter which events get put on the bus -->
-    <bean name="fedoraEventFilter" class="org.fcrepo.kernel.observer.DefaultFilter"/>
+    <bean name="fedoraEventFilter" class="org.fcrepo.kernel.impl.observer.DefaultFilter"/>
 
     <!-- used by observer bean to map JCR events into Fedora events -->
-    <bean name="fedoraEventMapper" class="org.fcrepo.kernel.observer.eventmappings.AllNodeEventsOneEvent"/>
+    <bean name="fedoraEventMapper" class="org.fcrepo.kernel.impl.observer.eventmappings.AllNodeEventsOneEvent"/>
 
     <!-- Fedora's lightweight internal event bus. Currently memory-resident.-->
     <bean name="fedoraInternalEventBus" class="com.google.common.eventbus.EventBus"/>

diff --git a/fcrepo-jms-indexer-core/src/test/resources/spring-test/repo.xml b/fcrepo-jms-indexer-core/src/test/resources/spring-test/repo.xml
@@ -10,11 +10,13 @@
 
     <context:annotation-config/>
 
-    <bean name="modeshapeRepofactory" class="org.fcrepo.kernel.spring.ModeShapeRepositoryFactoryBean">
+    <bean name="modeshapeRepofactory" class="org.fcrepo.kernel.impl.spring.ModeShapeRepositoryFactoryBean">
       <property name="repositoryConfiguration"
                 value="${fcrepo.modeshape.configuration:config/test_repository.json}"/>
     </bean>
 
     <bean class="org.modeshape.jcr.JcrRepositoryFactory"/>
 
+    <bean id="connectionManager" class="org.apache.http.impl.conn.PoolingHttpClientConnectionManager"/>
+
 </beans>
diff --git a/fcrepo-jms-indexer-core/src/test/resources/spring-test/rest.xml b/fcrepo-jms-indexer-core/src/test/resources/spring-test/rest.xml
@@ -7,13 +7,13 @@
   <context:property-placeholder/>
   <context:annotation-config/>
   <context:component-scan
-    base-package="org.fcrepo.kernel.services, org.fcrepo.http, org.fcrepo.serialization, org.fcrepo.indexer, org.fcrepo.transform.http"/>
+    base-package="org.fcrepo.kernel, org.fcrepo.http, org.fcrepo.serialization, org.fcrepo.indexer, org.fcrepo.transform.http"/>
   <bean class="org.fcrepo.http.commons.session.SessionFactory"/>
-  <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>
 
 </beans>
diff --git a/fcrepo-jms-indexer-core/src/test/resources/web.xml b/fcrepo-jms-indexer-core/src/test/resources/web.xml
@@ -21,7 +21,7 @@
     <servlet-class>com.sun.jersey.spi.spring.container.servlet.SpringServlet</servlet-class>
     <init-param>
       <param-name>com.sun.jersey.config.property.packages</param-name>
-      <param-value>org.fcrepo.kernel.services, org.fcrepo.http, org.fcrepo.transform.http</param-value>
+      <param-value>org.fcrepo.kernel, org.fcrepo.http, org.fcrepo.transform.http</param-value>
     </init-param>
     <init-param>
       <param-name>com.sun.jersey.api.json.POJOMappingFeature</param-name>