Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Added fcrepo-http-commons as per https://www.pivotaltracker.com/story…
  • Loading branch information
ajs6f committed Feb 12, 2013
1 parent 41ae108 commit 7d401ff
Show file tree
Hide file tree
Showing 18 changed files with 679 additions and 625 deletions.
21 changes: 13 additions & 8 deletions fcrepo-dc/pom.xml
Expand Up @@ -8,7 +8,7 @@
</parent>
<artifactId>fcrepo-dc</artifactId>
<name>fcrepo dc</name>

<packaging>bundle</packaging>

<description>Dublin Core generator</description>
Expand All @@ -19,13 +19,18 @@
<artifactId>fcrepo-kernel</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.fcrepo</groupId>
<artifactId>fcrepo-http-commons</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>org.fcrepo</groupId>
<artifactId>fcrepo-legacy-api</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.fcrepo</groupId>
<artifactId>fcrepo-legacy-api</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
Expand All @@ -51,7 +56,7 @@
<artifactId>httpclient</artifactId>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
Expand Down
49 changes: 49 additions & 0 deletions fcrepo-http-commons/pom.xml
@@ -0,0 +1,49 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.fcrepo</groupId>
<artifactId>fcrepo</artifactId>
<version>4.0-SNAPSHOT</version>
</parent>
<artifactId>fcrepo-http-commons</artifactId>
<name>Fedora HTTP Commons</name>
<description>HTTP (JAX-RS) resources and helpers.</description>

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

<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http-jetty</artifactId>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-extension-providers</artifactId>
</dependency>

<!-- test gear -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>

</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
</plugin>
</plugins>
</build>
</project>
Expand Up @@ -21,7 +21,6 @@

import org.codehaus.jackson.map.ObjectMapper;
import org.fcrepo.identifiers.PidMinter;
import org.fcrepo.utils.Constants;
import org.modeshape.jcr.api.JcrTools;
import org.modeshape.jcr.api.Repository;
import org.slf4j.Logger;
Expand Down
@@ -1,4 +1,4 @@
package org.fcrepo.utils;
package org.fcrepo;

import static javax.ws.rs.core.Response.status;
import static javax.ws.rs.core.Response.Status.FORBIDDEN;
Expand Down
71 changes: 2 additions & 69 deletions fcrepo-kernel/pom.xml
Expand Up @@ -52,24 +52,12 @@
<artifactId>jbossjta</artifactId>
</dependency>

<!-- Logging: we'll use LogBack (which implements the SLF4J API); ModeShape knows
what to do. -->
<!-- Logging: we'll use LogBack (which implements the SLF4J API); ModeShape
knows what to do. -->
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
</dependency>


<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
<version>2.10.0</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
<version>${cxf.version}</version>
</dependency>
<dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
Expand All @@ -88,11 +76,6 @@
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http-jetty</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
Expand All @@ -101,60 +84,10 @@
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-extension-providers</artifactId>
<version>${cxf.version}</version>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.scala-tools</groupId>
<artifactId>maven-scala-plugin</artifactId>
<version>2.15.2</version>
<configuration>
<args>
<arg>-feature</arg>
</args>
</configuration>
<executions>
<execution>
<id>scala-compile-first</id>
<phase>process-resources</phase>
<goals>
<goal>add-source</goal>
<goal>compile</goal>
</goals>
</execution>
<execution>
<id>scala-test-compile</id>
<phase>process-test-resources</phase>
<goals>
<goal>testCompile</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>1.7</version>
<executions>
<execution>
<phase>generate-sources</phase>
<goals>
<goal>add-source</goal>
</goals>
<configuration>
<sources>
<source>src/main/scala</source>
</sources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
Expand Down
51 changes: 0 additions & 51 deletions fcrepo-kernel/src/main/java/org/fcrepo/foxml/FOXMLSequencer.java

This file was deleted.

90 changes: 0 additions & 90 deletions fcrepo-kernel/src/main/java/org/fcrepo/foxml/FedoraOXML.java

This file was deleted.

@@ -1,8 +1,13 @@
package org.fcrepo.services;

import org.modeshape.jcr.api.JcrTools;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import static org.modeshape.jcr.api.JcrConstants.JCR_CONTENT;
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_RESOURCE;

import java.io.IOException;
import java.io.InputStream;
import java.util.Calendar;

import javax.inject.Inject;
import javax.jcr.Node;
Expand All @@ -11,12 +16,10 @@
import javax.jcr.RepositoryException;
import javax.jcr.Session;
import javax.ws.rs.core.MediaType;
import java.io.IOException;
import java.io.InputStream;
import java.net.URI;
import java.util.Calendar;

import static org.modeshape.jcr.api.JcrConstants.*;
import org.modeshape.jcr.api.JcrTools;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;


public class DatastreamService {
Expand Down

0 comments on commit 7d401ff

Please sign in to comment.