Skip to content

Commit

Permalink
Split kernel and kernel-api packages
Browse files Browse the repository at this point in the history
  fcrepo-kernel-api -> fcrepo-kernel
  fcrepo-kernel     -> fcrepo-kernel-impl

Resolves: https://www.pivotaltracker.com/story/show/70718582
  • Loading branch information
Andrew Woods committed May 28, 2014
1 parent 015bc64 commit 60ebb96
Show file tree
Hide file tree
Showing 325 changed files with 702 additions and 640 deletions.
2 changes: 1 addition & 1 deletion fcrepo-audit/pom.xml
Expand Up @@ -17,7 +17,7 @@
<dependencies>
<dependency>
<groupId>org.fcrepo</groupId>
<artifactId>fcrepo-kernel</artifactId>
<artifactId>fcrepo-kernel-impl</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion fcrepo-auth-common/pom.xml
Expand Up @@ -121,7 +121,7 @@
</dependency>
<dependency>
<groupId>org.fcrepo</groupId>
<artifactId>fcrepo-kernel</artifactId>
<artifactId>fcrepo-kernel-impl</artifactId>
<version>${project.version}</version>
<classifier>tests</classifier>
<scope>test</scope>
Expand Down
Expand Up @@ -25,7 +25,7 @@
import org.fcrepo.auth.common.FedoraAuthorizationDelegate;
import org.fcrepo.auth.common.ServletContainerAuthenticationProvider;
import org.fcrepo.kernel.services.ObjectService;
import org.fcrepo.kernel.services.ObjectServiceImpl;
import org.fcrepo.kernel.impl.services.ObjectServiceImpl;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
Expand Down
Expand Up @@ -11,9 +11,9 @@

<context:annotation-config />

<context:component-scan base-package="org.fcrepo.kernel.services" />
<context:component-scan base-package="org.fcrepo.kernel" />

<bean name="modeshapeRepofactory" class="org.fcrepo.kernel.spring.ModeShapeRepositoryFactoryBean"
<bean name="modeshapeRepofactory" class="org.fcrepo.kernel.impl.spring.ModeShapeRepositoryFactoryBean"
depends-on="authenticationProvider" p:repositoryConfiguration="${fcrepo.modeshape.configuration:repository.json}"/>

<bean name="fad" class="org.mockito.Mockito" factory-method="mock" c:classToMock="org.fcrepo.auth.common.FedoraAuthorizationDelegate"/>
Expand Down
4 changes: 2 additions & 2 deletions fcrepo-auth-common/src/test/resources/spring-test/repo.xml
Expand Up @@ -10,9 +10,9 @@

<context:annotation-config />

<context:component-scan base-package="org.fcrepo.kernel.services" />
<context:component-scan base-package="org.fcrepo.kernel" />

<bean name="modeshapeRepofactory" class="org.fcrepo.kernel.spring.ModeShapeRepositoryFactoryBean"
<bean name="modeshapeRepofactory" class="org.fcrepo.kernel.impl.spring.ModeShapeRepositoryFactoryBean"
depends-on="authenticationProvider" p:repositoryConfiguration="${fcrepo.modeshape.configuration:repository.json}"/>

<bean name="fad" class="org.fcrepo.auth.integration.PermitRootAndPathEndsWithPermitSuffixFAD"/>
Expand Down
6 changes: 3 additions & 3 deletions fcrepo-auth-common/src/test/resources/spring-test/rest.xml
Expand Up @@ -9,12 +9,12 @@
<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.http, org.fcrepo.kernel.services, org.fcrepo.serialization" />
<context:component-scan base-package="org.fcrepo.http, org.fcrepo.kernel, org.fcrepo.serialization" />
</beans>
2 changes: 1 addition & 1 deletion fcrepo-auth-roles-basic/pom.xml
Expand Up @@ -108,7 +108,7 @@
</dependency>
<dependency>
<groupId>org.fcrepo</groupId>
<artifactId>fcrepo-kernel</artifactId>
<artifactId>fcrepo-kernel-impl</artifactId>
<version>${project.version}</version>
<scope>test</scope>
<classifier>tests</classifier>
Expand Down
Expand Up @@ -21,7 +21,7 @@
import static org.fcrepo.auth.common.FedoraAuthorizationDelegate.FEDORA_ALL_PRINCIPALS;
import static org.fcrepo.auth.common.FedoraAuthorizationDelegate.FEDORA_USER_PRINCIPAL;
import static org.fcrepo.http.commons.test.util.TestHelpers.setField;
import static org.fcrepo.kernel.testutilities.TestNodeIterator.nodeIterator;
import static org.fcrepo.kernel.impl.testutilities.TestNodeIterator.nodeIterator;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.when;
Expand Down
Expand Up @@ -11,7 +11,7 @@

<context:component-scan base-package="org.fcrepo.kernel.services" />

<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>
Expand Down
Expand Up @@ -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>
2 changes: 1 addition & 1 deletion fcrepo-auth-roles-common/pom.xml
Expand Up @@ -89,7 +89,7 @@
</dependency>
<dependency>
<groupId>org.fcrepo</groupId>
<artifactId>fcrepo-kernel</artifactId>
<artifactId>fcrepo-kernel-impl</artifactId>
<version>${project.version}</version>
<classifier>tests</classifier>
<scope>test</scope>
Expand Down
Expand Up @@ -20,7 +20,7 @@
import static org.fcrepo.auth.roles.common.Constants.JcrName.rbacl;
import static org.fcrepo.auth.roles.common.Constants.JcrName.rbaclAssignable;
import static org.fcrepo.auth.roles.common.Constants.JcrName.role;
import static org.fcrepo.kernel.testutilities.TestNodeIterator.nodeIterator;
import static org.fcrepo.kernel.impl.testutilities.TestNodeIterator.nodeIterator;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
Expand Down
Expand Up @@ -9,9 +9,9 @@

<context:annotation-config />

<context:component-scan base-package="org.fcrepo.kernel.services" />
<context:component-scan base-package="org.fcrepo.kernel" />

<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/minimal-default/repository.json}" />
</bean>

Expand Down
Expand Up @@ -9,12 +9,12 @@
<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>
4 changes: 2 additions & 2 deletions fcrepo-boms/fcrepo4-bom/pom.xml
Expand Up @@ -74,7 +74,7 @@
</dependency>
<dependency>
<groupId>org.fcrepo</groupId>
<artifactId>fcrepo-kernel-api</artifactId>
<artifactId>fcrepo-kernel</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
Expand All @@ -84,7 +84,7 @@
</dependency>
<dependency>
<groupId>org.fcrepo</groupId>
<artifactId>fcrepo-kernel</artifactId>
<artifactId>fcrepo-kernel-impl</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion fcrepo-connector-file/pom.xml
Expand Up @@ -14,7 +14,7 @@

<dependency>
<groupId>org.fcrepo</groupId>
<artifactId>fcrepo-kernel</artifactId>
<artifactId>fcrepo-kernel-impl</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
Expand Down
Expand Up @@ -17,7 +17,7 @@

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.junit.Test;

import javax.jcr.PathNotFoundException;
Expand Down
Expand Up @@ -15,7 +15,7 @@
<bean class="org.fcrepo.http.commons.session.SessionFactory"/>

<bean name="modeshapeRepofactory"
class="org.fcrepo.kernel.spring.ModeShapeRepositoryFactoryBean"
class="org.fcrepo.kernel.impl.spring.ModeShapeRepositoryFactoryBean"
p:repositoryConfiguration="${fcrepo.modeshape.configuration:/config/testing/repository.json}"/>

<bean class="org.modeshape.jcr.JcrRepositoryFactory"/>
Expand Down
4 changes: 2 additions & 2 deletions fcrepo-generator-dc/pom.xml
Expand Up @@ -30,7 +30,7 @@
</dependency>
<dependency>
<groupId>org.fcrepo</groupId>
<artifactId>fcrepo-kernel</artifactId>
<artifactId>fcrepo-kernel-impl</artifactId>
<version>${project.version}</version>
<exclusions>
<exclusion>
Expand All @@ -41,7 +41,7 @@
</dependency>
<dependency>
<groupId>org.fcrepo</groupId>
<artifactId>fcrepo-kernel</artifactId>
<artifactId>fcrepo-kernel-impl</artifactId>
<version>${project.version}</version>
<classifier>tests</classifier>
<scope>test</scope>
Expand Down
Expand Up @@ -30,7 +30,7 @@
import javax.jcr.RepositoryException;
import javax.jcr.Session;

import org.fcrepo.kernel.FedoraResourceImpl;
import org.fcrepo.kernel.impl.FedoraResourceImpl;
import org.fcrepo.generator.dublincore.DCGenerator;
import org.fcrepo.kernel.services.NodeService;
import org.junit.Before;
Expand Down
Expand Up @@ -11,14 +11,12 @@

<context:annotation-config />

<context:component-scan base-package="org.fcrepo.http,
org.fcrepo.kernel.services, org.fcrepo.serialization,
org.fcrepo.generator"/>
<context:component-scan base-package="org.fcrepo.http,org.fcrepo.kernel, org.fcrepo.serialization,org.fcrepo.generator"/>

<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"/>

<util:list id="dcgenerators" value-type="org.fcrepo.generator.dublincore.DCGenerator">
<bean class="org.fcrepo.generator.dublincore.WellKnownDatastreamGenerator"
Expand Down
4 changes: 2 additions & 2 deletions fcrepo-generator-dc/src/test/resources/spring-test/repo.xml
Expand Up @@ -17,12 +17,12 @@

<!-- 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>


<bean name="modeshapeRepofactory"
class="org.fcrepo.kernel.spring.ModeShapeRepositoryFactoryBean"
class="org.fcrepo.kernel.impl.spring.ModeShapeRepositoryFactoryBean"
p:repositoryConfiguration="${fcrepo.modeshape.configuration:/config/minimal-default/repository.json}"/>

<bean class="org.modeshape.jcr.JcrRepositoryFactory"/>
Expand Down
2 changes: 1 addition & 1 deletion fcrepo-generator-dc/src/test/resources/web.xml
Expand Up @@ -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.generator</param-value>
<param-value>org.fcrepo.kernel, org.fcrepo.http,org.fcrepo.generator</param-value>
</init-param>
<init-param>
<param-name>com.sun.jersey.api.json.POJOMappingFeature</param-name>
Expand Down
4 changes: 2 additions & 2 deletions fcrepo-http-api/pom.xml
Expand Up @@ -26,7 +26,7 @@

<dependency>
<groupId>org.fcrepo</groupId>
<artifactId>fcrepo-kernel</artifactId>
<artifactId>fcrepo-kernel-impl</artifactId>
<version>${project.version}</version>
</dependency>

Expand Down Expand Up @@ -62,7 +62,7 @@
<!-- test gear -->
<dependency>
<groupId>org.fcrepo</groupId>
<artifactId>fcrepo-kernel</artifactId>
<artifactId>fcrepo-kernel-impl</artifactId>
<version>${project.version}</version>
<classifier>tests</classifier>
<scope>test</scope>
Expand Down
Expand Up @@ -24,7 +24,7 @@
import org.fcrepo.http.commons.session.SessionFactory;
import org.fcrepo.kernel.Datastream;
import org.fcrepo.kernel.FedoraResource;
import org.fcrepo.kernel.FedoraResourceImpl;
import org.fcrepo.kernel.impl.FedoraResourceImpl;
import org.fcrepo.kernel.utils.iterators.RdfStream;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
Expand Down
Expand Up @@ -56,7 +56,7 @@
import org.fcrepo.http.commons.responses.HtmlTemplate;
import org.fcrepo.http.commons.session.InjectedSession;
import org.fcrepo.kernel.rdf.IdentifierTranslator;
import org.fcrepo.kernel.rdf.JcrRdfTools;
import org.fcrepo.kernel.impl.rdf.JcrRdfTools;
import org.fcrepo.kernel.utils.iterators.RdfStream;
import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Component;
Expand Down
Expand Up @@ -9,7 +9,7 @@
<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"/>

<context:annotation-config />

Expand Down
Expand Up @@ -62,7 +62,7 @@
import com.hp.hpl.jena.rdf.model.Model;
import org.apache.commons.io.IOUtils;
import org.fcrepo.kernel.Datastream;
import org.fcrepo.kernel.FedoraResourceImpl;
import org.fcrepo.kernel.impl.FedoraResourceImpl;
import org.fcrepo.kernel.rdf.IdentifierTranslator;
import org.fcrepo.kernel.services.DatastreamService;
import org.fcrepo.kernel.services.NodeService;
Expand Down
Expand Up @@ -72,7 +72,7 @@
import org.fcrepo.http.commons.domain.Prefer;
import org.fcrepo.kernel.Datastream;
import org.fcrepo.kernel.FedoraObject;
import org.fcrepo.kernel.FedoraResourceImpl;
import org.fcrepo.kernel.impl.FedoraResourceImpl;
import org.fcrepo.kernel.identifiers.PidMinter;
import org.fcrepo.kernel.rdf.HierarchyRdfContextOptions;
import org.fcrepo.kernel.rdf.IdentifierTranslator;
Expand Down
Expand Up @@ -30,7 +30,7 @@
import javax.ws.rs.core.Response;

import org.fcrepo.kernel.Transaction;
import org.fcrepo.kernel.TxAwareSession;
import org.fcrepo.kernel.impl.TxAwareSession;
import org.fcrepo.kernel.TxSession;
import org.fcrepo.kernel.services.TransactionService;
import org.junit.Before;
Expand Down
Expand Up @@ -45,7 +45,7 @@

import org.fcrepo.http.commons.api.rdf.HttpIdentifierTranslator;
import org.fcrepo.http.commons.session.SessionFactory;
import org.fcrepo.kernel.FedoraResourceImpl;
import org.fcrepo.kernel.impl.FedoraResourceImpl;
import org.fcrepo.kernel.services.NodeService;
import org.fcrepo.kernel.services.VersionService;
import org.fcrepo.kernel.utils.iterators.RdfStream;
Expand Down
Expand Up @@ -40,7 +40,7 @@

import org.fcrepo.http.api.FedoraNodes;
import org.fcrepo.http.commons.api.rdf.HttpIdentifierTranslator;
import org.fcrepo.kernel.FedoraResourceImpl;
import org.fcrepo.kernel.impl.FedoraResourceImpl;
import org.fcrepo.kernel.rdf.IdentifierTranslator;
import org.fcrepo.serialization.SerializerUtil;
import org.junit.Before;
Expand Down
Expand Up @@ -60,7 +60,7 @@
import static org.fcrepo.kernel.RdfLexicon.REPOSITORY_NAMESPACE;
import static org.fcrepo.kernel.RdfLexicon.RESTAPI_NAMESPACE;
import static org.fcrepo.kernel.RdfLexicon.RDF_NAMESPACE;
import static org.fcrepo.kernel.utils.FedoraTypesUtils.map;
import static org.fcrepo.kernel.impl.utils.FedoraTypesUtils.map;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotEquals;
Expand Down
Expand Up @@ -46,9 +46,9 @@
import static javax.ws.rs.core.Response.Status.NO_CONTENT;
import static org.fcrepo.kernel.RdfLexicon.DC_TITLE;
import static org.jgroups.util.Util.assertFalse;
import static org.fcrepo.kernel.TransactionImpl.DEFAULT_TIMEOUT;
import static org.fcrepo.kernel.TransactionImpl.TIMEOUT_SYSTEM_PROPERTY;
import static org.fcrepo.kernel.services.TransactionServiceImpl.REAP_INTERVAL;
import static org.fcrepo.kernel.impl.TransactionImpl.DEFAULT_TIMEOUT;
import static org.fcrepo.kernel.impl.TransactionImpl.TIMEOUT_SYSTEM_PROPERTY;
import static org.fcrepo.kernel.impl.services.TransactionServiceImpl.REAP_INTERVAL;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertTrue;
Expand Down
6 changes: 3 additions & 3 deletions fcrepo-http-api/src/test/resources/spring-test/eventing.xml
Expand Up @@ -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"/>
Expand Down

0 comments on commit 60ebb96

Please sign in to comment.