Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
rename org.fcrepo.kernel package to org.fcrepo.kernel.api
rename org.fcrepo.kernel.impl package to org.fcrepo.kernel.modeshape
  • Loading branch information
acoburn authored and Andrew Woods committed Jul 20, 2015
1 parent 8845a22 commit 5b4f3d3
Show file tree
Hide file tree
Showing 382 changed files with 1,571 additions and 1,583 deletions.
2 changes: 1 addition & 1 deletion fcrepo-auth-common/pom.xml
Expand Up @@ -132,7 +132,7 @@
</dependency>
<dependency>
<groupId>org.fcrepo</groupId>
<artifactId>fcrepo-kernel-impl</artifactId>
<artifactId>fcrepo-kernel-modeshape</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
Expand Down
Expand Up @@ -19,8 +19,8 @@

import org.fcrepo.auth.common.FedoraAuthorizationDelegate;
import org.fcrepo.auth.common.ServletContainerAuthenticationProvider;
import org.fcrepo.kernel.impl.services.ContainerServiceImpl;
import org.fcrepo.kernel.services.ContainerService;
import org.fcrepo.kernel.modeshape.services.ContainerServiceImpl;
import org.fcrepo.kernel.api.services.ContainerService;

import org.junit.Assert;
import org.junit.Test;
Expand Down
Expand Up @@ -19,8 +19,8 @@

import org.fcrepo.auth.common.FedoraAuthorizationDelegate;
import org.fcrepo.auth.common.ServletContainerAuthenticationProvider;
import org.fcrepo.kernel.impl.services.ContainerServiceImpl;
import org.fcrepo.kernel.services.ContainerService;
import org.fcrepo.kernel.modeshape.services.ContainerServiceImpl;
import org.fcrepo.kernel.api.services.ContainerService;

import org.junit.Assert;
import org.junit.Test;
Expand Down
Expand Up @@ -26,9 +26,9 @@

import org.fcrepo.auth.common.FedoraAuthorizationDelegate;
import org.fcrepo.auth.common.ServletContainerAuthenticationProvider;
import org.fcrepo.kernel.exception.RepositoryRuntimeException;
import org.fcrepo.kernel.services.ContainerService;
import org.fcrepo.kernel.impl.services.ContainerServiceImpl;
import org.fcrepo.kernel.api.exception.RepositoryRuntimeException;
import org.fcrepo.kernel.api.services.ContainerService;
import org.fcrepo.kernel.modeshape.services.ContainerServiceImpl;

import org.junit.Assert;
import org.junit.Before;
Expand Down
Expand Up @@ -18,8 +18,8 @@
import com.hp.hpl.jena.rdf.model.Resource;
import org.fcrepo.http.commons.AbstractResource;
import org.fcrepo.http.commons.api.rdf.HttpResourceConverter;
import org.fcrepo.kernel.models.FedoraResource;
import org.fcrepo.kernel.identifiers.IdentifierConverter;
import org.fcrepo.kernel.api.models.FedoraResource;
import org.fcrepo.kernel.api.identifiers.IdentifierConverter;
import org.modeshape.jcr.api.JcrTools;
import org.slf4j.Logger;
import org.springframework.context.annotation.Scope;
Expand Down
Expand Up @@ -11,7 +11,7 @@

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

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

Expand Down
Expand Up @@ -11,7 +11,7 @@

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

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

Expand Down
Expand Up @@ -13,7 +13,7 @@

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

<bean name="modeshapeRepofactory" class="org.fcrepo.kernel.impl.spring.ModeShapeRepositoryFactoryBean"
<bean name="modeshapeRepofactory" class="org.fcrepo.kernel.modeshape.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
2 changes: 1 addition & 1 deletion fcrepo-auth-common/src/test/resources/spring-test/repo.xml
Expand Up @@ -12,7 +12,7 @@

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

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

<bean name="fad" class="org.fcrepo.auth.integration.PermitRootAndPathEndsWithPermitSuffixFAD"/>
Expand Down
4 changes: 2 additions & 2 deletions fcrepo-auth-common/src/test/resources/spring-test/rest.xml
Expand Up @@ -14,8 +14,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>
4 changes: 2 additions & 2 deletions fcrepo-boms/fcrepo4-bom/pom.xml
Expand Up @@ -63,7 +63,7 @@
</dependency>
<dependency>
<groupId>org.fcrepo</groupId>
<artifactId>fcrepo-kernel</artifactId>
<artifactId>fcrepo-kernel-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
Expand All @@ -73,7 +73,7 @@
</dependency>
<dependency>
<groupId>org.fcrepo</groupId>
<artifactId>fcrepo-kernel-impl</artifactId>
<artifactId>fcrepo-kernel-modeshape</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
Expand Down
8 changes: 4 additions & 4 deletions fcrepo-connector-file/pom.xml
Expand Up @@ -14,7 +14,7 @@

<dependency>
<groupId>org.fcrepo</groupId>
<artifactId>fcrepo-kernel-impl</artifactId>
<artifactId>fcrepo-kernel-modeshape</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
Expand Down Expand Up @@ -67,9 +67,9 @@
org.fcrepo.connector.file;version=${project.version}
</Export-Package>
<Import-Package>
org.fcrepo.kernel,
org.fcrepo.kernel.impl.utils,
org.fcrepo.kernel.impl.utils.impl
org.fcrepo.kernel.api,
org.fcrepo.kernel.modeshape.utils,
org.fcrepo.kernel.modeshape.utils.impl
</Import-Package>
<Embed-Transitive>true</Embed-Transitive>
</instructions>
Expand Down
Expand Up @@ -17,7 +17,7 @@

import static java.nio.file.Files.deleteIfExists;

import org.fcrepo.kernel.exception.RepositoryRuntimeException;
import org.fcrepo.kernel.api.exception.RepositoryRuntimeException;

import org.infinispan.schematic.Schematic;
import org.infinispan.schematic.document.Document;
Expand Down
Expand Up @@ -16,15 +16,15 @@
package org.fcrepo.connector.file;

import static java.lang.System.currentTimeMillis;
import static org.fcrepo.kernel.FedoraJcrTypes.CONTENT_DIGEST;
import static org.fcrepo.kernel.FedoraJcrTypes.CONTENT_SIZE;
import static org.fcrepo.kernel.FedoraJcrTypes.FEDORA_BINARY;
import static org.fcrepo.kernel.FedoraJcrTypes.FEDORA_CONTAINER;
import static org.fcrepo.kernel.FedoraJcrTypes.FEDORA_NON_RDF_SOURCE_DESCRIPTION;
import static org.fcrepo.kernel.FedoraJcrTypes.FEDORA_RESOURCE;
import static org.fcrepo.kernel.FedoraJcrTypes.JCR_CREATED;
import static org.fcrepo.kernel.FedoraJcrTypes.JCR_LASTMODIFIED;
import static org.fcrepo.kernel.utils.ContentDigest.asURI;
import static org.fcrepo.kernel.api.FedoraJcrTypes.CONTENT_DIGEST;
import static org.fcrepo.kernel.api.FedoraJcrTypes.CONTENT_SIZE;
import static org.fcrepo.kernel.api.FedoraJcrTypes.FEDORA_BINARY;
import static org.fcrepo.kernel.api.FedoraJcrTypes.FEDORA_CONTAINER;
import static org.fcrepo.kernel.api.FedoraJcrTypes.FEDORA_NON_RDF_SOURCE_DESCRIPTION;
import static org.fcrepo.kernel.api.FedoraJcrTypes.FEDORA_RESOURCE;
import static org.fcrepo.kernel.api.FedoraJcrTypes.JCR_CREATED;
import static org.fcrepo.kernel.api.FedoraJcrTypes.JCR_LASTMODIFIED;
import static org.fcrepo.kernel.api.utils.ContentDigest.asURI;
import static org.modeshape.jcr.api.JcrConstants.JCR_DATA;
import static org.modeshape.jcr.api.JcrConstants.NT_FILE;
import static org.modeshape.jcr.api.JcrConstants.NT_FOLDER;
Expand All @@ -39,7 +39,7 @@

import com.google.common.annotations.VisibleForTesting;

import org.fcrepo.kernel.exception.RepositoryRuntimeException;
import org.fcrepo.kernel.api.exception.RepositoryRuntimeException;
import org.infinispan.schematic.document.Document;
import org.modeshape.connector.filesystem.FileSystemConnector;
import org.modeshape.jcr.api.value.DateTime;
Expand Down
Expand Up @@ -17,8 +17,8 @@

import static java.nio.file.Files.createTempDirectory;
import static java.nio.file.Files.createTempFile;
import static org.fcrepo.kernel.FedoraJcrTypes.CONTENT_DIGEST;
import static org.fcrepo.kernel.RdfLexicon.REPOSITORY_NAMESPACE;
import static org.fcrepo.kernel.api.FedoraJcrTypes.CONTENT_DIGEST;
import static org.fcrepo.kernel.api.RdfLexicon.REPOSITORY_NAMESPACE;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
Expand Down
Expand Up @@ -22,12 +22,12 @@
import static java.nio.file.Files.write;
import static java.util.Arrays.asList;
import static com.google.common.collect.Lists.transform;
import static org.fcrepo.kernel.FedoraJcrTypes.CONTENT_SIZE;
import static org.fcrepo.kernel.FedoraJcrTypes.FEDORA_BINARY;
import static org.fcrepo.kernel.FedoraJcrTypes.FEDORA_NON_RDF_SOURCE_DESCRIPTION;
import static org.fcrepo.kernel.FedoraJcrTypes.FEDORA_CONTAINER;
import static org.fcrepo.kernel.RdfLexicon.HAS_MESSAGE_DIGEST;
import static org.fcrepo.kernel.utils.ContentDigest.asURI;
import static org.fcrepo.kernel.api.FedoraJcrTypes.CONTENT_SIZE;
import static org.fcrepo.kernel.api.FedoraJcrTypes.FEDORA_BINARY;
import static org.fcrepo.kernel.api.FedoraJcrTypes.FEDORA_NON_RDF_SOURCE_DESCRIPTION;
import static org.fcrepo.kernel.api.FedoraJcrTypes.FEDORA_CONTAINER;
import static org.fcrepo.kernel.api.RdfLexicon.HAS_MESSAGE_DIGEST;
import static org.fcrepo.kernel.api.utils.ContentDigest.asURI;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotEquals;
Expand Down Expand Up @@ -60,13 +60,13 @@
import org.apache.commons.io.filefilter.TrueFileFilter;
import org.apache.commons.io.filefilter.WildcardFileFilter;

import org.fcrepo.kernel.models.NonRdfSourceDescription;
import org.fcrepo.kernel.models.FedoraBinary;
import org.fcrepo.kernel.models.Container;
import org.fcrepo.kernel.impl.rdf.impl.DefaultIdentifierTranslator;
import org.fcrepo.kernel.services.BinaryService;
import org.fcrepo.kernel.services.NodeService;
import org.fcrepo.kernel.services.ContainerService;
import org.fcrepo.kernel.api.models.NonRdfSourceDescription;
import org.fcrepo.kernel.api.models.FedoraBinary;
import org.fcrepo.kernel.api.models.Container;
import org.fcrepo.kernel.api.services.BinaryService;
import org.fcrepo.kernel.api.services.NodeService;
import org.fcrepo.kernel.api.services.ContainerService;
import org.fcrepo.kernel.modeshape.rdf.impl.DefaultIdentifierTranslator;

import org.junit.AfterClass;
import org.junit.BeforeClass;
Expand Down
Expand Up @@ -15,19 +15,19 @@
*/
package org.fcrepo.integration.connector.file;

import org.fcrepo.kernel.models.FedoraResource;
import org.fcrepo.kernel.impl.rdf.impl.DefaultIdentifierTranslator;
import org.fcrepo.kernel.impl.rdf.impl.PropertiesRdfContext;
import org.fcrepo.kernel.utils.iterators.RdfStream;
import org.fcrepo.kernel.exception.RepositoryRuntimeException;
import org.fcrepo.kernel.api.exception.RepositoryRuntimeException;
import org.fcrepo.kernel.api.models.FedoraResource;
import org.fcrepo.kernel.api.utils.iterators.RdfStream;
import org.fcrepo.kernel.modeshape.rdf.impl.DefaultIdentifierTranslator;
import org.fcrepo.kernel.modeshape.rdf.impl.PropertiesRdfContext;
import org.junit.Test;

import javax.jcr.PathNotFoundException;
import javax.jcr.Property;
import javax.jcr.RepositoryException;
import javax.jcr.Session;

import static org.fcrepo.kernel.RdfLexicon.REPOSITORY_NAMESPACE;
import static org.fcrepo.kernel.api.RdfLexicon.REPOSITORY_NAMESPACE;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
Expand Down
Expand Up @@ -15,7 +15,7 @@
*/
package org.fcrepo.integration.connector.file;

import org.fcrepo.kernel.models.FedoraResource;
import org.fcrepo.kernel.api.models.FedoraResource;

import org.junit.Test;

Expand Down
Expand Up @@ -13,7 +13,7 @@
<context:component-scan base-package="org.fcrepo"/>

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

<bean class="org.modeshape.jcr.ModeShapeEngine" init-method="start"/>
Expand Down
16 changes: 8 additions & 8 deletions fcrepo-http-api/pom.xml
Expand Up @@ -38,7 +38,7 @@

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

Expand Down Expand Up @@ -121,7 +121,7 @@
<!-- test gear -->
<dependency>
<groupId>org.fcrepo</groupId>
<artifactId>fcrepo-kernel-impl</artifactId>
<artifactId>fcrepo-kernel-modeshape</artifactId>
<version>${project.version}</version>
<scope>test</scope>
<type>test-jar</type>
Expand Down Expand Up @@ -218,12 +218,12 @@
org.fcrepo.http.api.url;version=${project.version}
</Export-Package>
<Import-Package>
org.fcrepo.kernel.impl,
org.fcrepo.kernel.impl.rdf,
org.fcrepo.kernel.impl.utils,
org.fcrepo.kernel.impl.utils.impl,
org.fcrepo.kernel.impl.utils.iterators,
org.fcrepo.kernel.impl.utils.infinispan,
org.fcrepo.kernel.api,
org.fcrepo.kernel.modeshape,
org.fcrepo.kernel.modeshape.rdf,
org.fcrepo.kernel.modeshape.utils,
org.fcrepo.kernel.modeshape.utils.impl,
org.fcrepo.kernel.modeshape.utils.iterators,
org.fcrepo.auth.common,
org.fcrepo.mint,
org.fcrepo.serialization,
Expand Down
Expand Up @@ -30,16 +30,16 @@
import static javax.ws.rs.core.Response.Status.REQUESTED_RANGE_NOT_SATISFIABLE;
import static org.apache.commons.lang.StringUtils.isBlank;
import static org.apache.jena.riot.RDFLanguages.contentTypeToLang;
import static org.fcrepo.kernel.FedoraJcrTypes.LDP_BASIC_CONTAINER;
import static org.fcrepo.kernel.FedoraJcrTypes.LDP_DIRECT_CONTAINER;
import static org.fcrepo.kernel.FedoraJcrTypes.LDP_INDIRECT_CONTAINER;
import static org.fcrepo.kernel.RdfLexicon.BASIC_CONTAINER;
import static org.fcrepo.kernel.RdfLexicon.CONTAINER;
import static org.fcrepo.kernel.RdfLexicon.DIRECT_CONTAINER;
import static org.fcrepo.kernel.RdfLexicon.INDIRECT_CONTAINER;
import static org.fcrepo.kernel.RdfLexicon.LDP_NAMESPACE;
import static org.fcrepo.kernel.RdfLexicon.isManagedNamespace;
import static org.fcrepo.kernel.impl.rdf.ManagedRdf.isManagedTriple;
import static org.fcrepo.kernel.api.FedoraJcrTypes.LDP_BASIC_CONTAINER;
import static org.fcrepo.kernel.api.FedoraJcrTypes.LDP_DIRECT_CONTAINER;
import static org.fcrepo.kernel.api.FedoraJcrTypes.LDP_INDIRECT_CONTAINER;
import static org.fcrepo.kernel.api.RdfLexicon.BASIC_CONTAINER;
import static org.fcrepo.kernel.api.RdfLexicon.CONTAINER;
import static org.fcrepo.kernel.api.RdfLexicon.DIRECT_CONTAINER;
import static org.fcrepo.kernel.api.RdfLexicon.INDIRECT_CONTAINER;
import static org.fcrepo.kernel.api.RdfLexicon.LDP_NAMESPACE;
import static org.fcrepo.kernel.api.RdfLexicon.isManagedNamespace;
import static org.fcrepo.kernel.modeshape.rdf.ManagedRdf.isManagedTriple;

import java.io.IOException;
import java.io.InputStream;
Expand Down Expand Up @@ -71,30 +71,30 @@
import org.fcrepo.http.commons.domain.Range;
import org.fcrepo.http.commons.domain.ldp.LdpPreferTag;
import org.fcrepo.http.commons.responses.RangeRequestInputStream;
import org.fcrepo.kernel.exception.InvalidChecksumException;
import org.fcrepo.kernel.exception.MalformedRdfException;
import org.fcrepo.kernel.exception.RepositoryRuntimeException;
import org.fcrepo.kernel.impl.rdf.impl.AclRdfContext;
import org.fcrepo.kernel.impl.rdf.impl.BlankNodeRdfContext;
import org.fcrepo.kernel.impl.rdf.impl.ChildrenRdfContext;
import org.fcrepo.kernel.impl.rdf.impl.ContentRdfContext;
import org.fcrepo.kernel.impl.rdf.impl.HashRdfContext;
import org.fcrepo.kernel.impl.rdf.impl.LdpContainerRdfContext;
import org.fcrepo.kernel.impl.rdf.impl.LdpIsMemberOfRdfContext;
import org.fcrepo.kernel.impl.rdf.impl.LdpRdfContext;
import org.fcrepo.kernel.impl.rdf.impl.ParentRdfContext;
import org.fcrepo.kernel.impl.rdf.impl.PropertiesRdfContext;
import org.fcrepo.kernel.impl.rdf.impl.ReferencesRdfContext;
import org.fcrepo.kernel.impl.rdf.impl.RootRdfContext;
import org.fcrepo.kernel.impl.rdf.impl.TypeRdfContext;
import org.fcrepo.kernel.impl.services.TransactionServiceImpl;
import org.fcrepo.kernel.models.Container;
import org.fcrepo.kernel.models.FedoraBinary;
import org.fcrepo.kernel.models.FedoraResource;
import org.fcrepo.kernel.models.NonRdfSource;
import org.fcrepo.kernel.models.NonRdfSourceDescription;
import org.fcrepo.kernel.services.policy.StoragePolicyDecisionPoint;
import org.fcrepo.kernel.utils.iterators.RdfStream;
import org.fcrepo.kernel.api.exception.InvalidChecksumException;
import org.fcrepo.kernel.api.exception.MalformedRdfException;
import org.fcrepo.kernel.api.exception.RepositoryRuntimeException;
import org.fcrepo.kernel.api.models.Container;
import org.fcrepo.kernel.api.models.FedoraBinary;
import org.fcrepo.kernel.api.models.FedoraResource;
import org.fcrepo.kernel.api.models.NonRdfSource;
import org.fcrepo.kernel.api.models.NonRdfSourceDescription;
import org.fcrepo.kernel.api.services.policy.StoragePolicyDecisionPoint;
import org.fcrepo.kernel.api.utils.iterators.RdfStream;
import org.fcrepo.kernel.modeshape.rdf.impl.AclRdfContext;
import org.fcrepo.kernel.modeshape.rdf.impl.BlankNodeRdfContext;
import org.fcrepo.kernel.modeshape.rdf.impl.ChildrenRdfContext;
import org.fcrepo.kernel.modeshape.rdf.impl.ContentRdfContext;
import org.fcrepo.kernel.modeshape.rdf.impl.HashRdfContext;
import org.fcrepo.kernel.modeshape.rdf.impl.LdpContainerRdfContext;
import org.fcrepo.kernel.modeshape.rdf.impl.LdpIsMemberOfRdfContext;
import org.fcrepo.kernel.modeshape.rdf.impl.LdpRdfContext;
import org.fcrepo.kernel.modeshape.rdf.impl.ParentRdfContext;
import org.fcrepo.kernel.modeshape.rdf.impl.PropertiesRdfContext;
import org.fcrepo.kernel.modeshape.rdf.impl.ReferencesRdfContext;
import org.fcrepo.kernel.modeshape.rdf.impl.RootRdfContext;
import org.fcrepo.kernel.modeshape.rdf.impl.TypeRdfContext;
import org.fcrepo.kernel.modeshape.services.TransactionServiceImpl;

import org.apache.jena.riot.Lang;
import org.glassfish.jersey.media.multipart.ContentDisposition;
Expand Down

0 comments on commit 5b4f3d3

Please sign in to comment.