cleanup
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/bbe79ee5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/bbe79ee5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/bbe79ee5 Branch: refs/heads/develop Commit: bbe79ee5c919135b01eb7664d41d48b9e07ebf83 Parents: 468e810 Author: Sergio Fernández <[email protected]> Authored: Fri Apr 5 19:21:00 2013 +0200 Committer: Sergio Fernández <[email protected]> Committed: Fri Apr 5 19:21:00 2013 +0200 ---------------------------------------------------------------------- .../services/content/FileSystemContentReader.java | 31 ++++++++------- .../core/services/content/HTTPContentReader.java | 27 ++++++------- 2 files changed, 28 insertions(+), 30 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/bbe79ee5/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/content/FileSystemContentReader.java ---------------------------------------------------------------------- diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/content/FileSystemContentReader.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/content/FileSystemContentReader.java index 4fb5e91..d793a1a 100644 --- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/content/FileSystemContentReader.java +++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/content/FileSystemContentReader.java @@ -19,15 +19,23 @@ package org.apache.marmotta.platform.core.services.content; import static org.apache.marmotta.commons.sesame.repository.ExceptionUtils.handleRepositoryException; -import com.google.common.io.ByteStreams; -import com.google.common.io.Files; +import java.io.BufferedInputStream; +import java.io.File; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.InputStream; +import java.net.URI; + +import javax.annotation.PostConstruct; +import javax.enterprise.context.ApplicationScoped; +import javax.inject.Inject; + +import org.apache.marmotta.commons.sesame.facading.FacadingFactory; +import org.apache.marmotta.kiwi.model.rdf.KiWiUriResource; import org.apache.marmotta.platform.core.api.config.ConfigurationService; import org.apache.marmotta.platform.core.api.content.ContentReader; import org.apache.marmotta.platform.core.api.triplestore.SesameService; import org.apache.marmotta.platform.core.model.content.MediaContentItem; - -import org.apache.marmotta.commons.sesame.facading.FacadingFactory; -import org.apache.marmotta.kiwi.model.rdf.KiWiUriResource; import org.apache.tika.detect.DefaultDetector; import org.apache.tika.metadata.Metadata; import org.openrdf.model.Resource; @@ -35,15 +43,8 @@ import org.openrdf.repository.RepositoryConnection; import org.openrdf.repository.RepositoryException; import org.slf4j.Logger; -import javax.annotation.PostConstruct; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import java.io.BufferedInputStream; -import java.io.File; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.io.InputStream; -import java.net.URI; +import com.google.common.io.ByteStreams; +import com.google.common.io.Files; /** * A content reader that reads the content of a resource from the file system. @@ -76,7 +77,7 @@ public class FileSystemContentReader implements ContentReader { @PostConstruct public void initialise() { detector = new DefaultDetector(); - defaultDir = configurationService.getWorkDir()+File.separator+"resources"; + defaultDir = configurationService.getHome()+File.separator+"resources"; log.debug("FileSystem Content Reader started (default directory: {})",defaultDir); http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/bbe79ee5/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/content/HTTPContentReader.java ---------------------------------------------------------------------- diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/content/HTTPContentReader.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/content/HTTPContentReader.java index be29317..b52038e 100644 --- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/content/HTTPContentReader.java +++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/content/HTTPContentReader.java @@ -19,12 +19,13 @@ package org.apache.marmotta.platform.core.services.content; import static org.apache.marmotta.commons.sesame.repository.ExceptionUtils.handleRepositoryException; -import com.google.common.io.ByteStreams; -import org.apache.marmotta.platform.core.api.config.ConfigurationService; -import org.apache.marmotta.platform.core.api.content.ContentReader; -import org.apache.marmotta.platform.core.api.http.HttpClientService; -import org.apache.marmotta.platform.core.api.triplestore.SesameService; -import org.apache.marmotta.platform.core.model.content.MediaContentItem; +import java.io.IOException; +import java.io.InputStream; + +import javax.annotation.PostConstruct; +import javax.enterprise.context.ApplicationScoped; +import javax.inject.Inject; + import org.apache.http.HttpResponse; import org.apache.http.client.ClientProtocolException; import org.apache.http.client.ResponseHandler; @@ -32,16 +33,16 @@ import org.apache.http.client.methods.HttpGet; import org.apache.http.client.methods.HttpHead; import org.apache.marmotta.commons.sesame.facading.FacadingFactory; import org.apache.marmotta.kiwi.model.rdf.KiWiUriResource; +import org.apache.marmotta.platform.core.api.content.ContentReader; +import org.apache.marmotta.platform.core.api.http.HttpClientService; +import org.apache.marmotta.platform.core.api.triplestore.SesameService; +import org.apache.marmotta.platform.core.model.content.MediaContentItem; import org.openrdf.model.Resource; import org.openrdf.repository.RepositoryConnection; import org.openrdf.repository.RepositoryException; import org.slf4j.Logger; -import javax.annotation.PostConstruct; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import java.io.IOException; -import java.io.InputStream; +import com.google.common.io.ByteStreams; /** * Add file description here! @@ -54,14 +55,10 @@ public class HTTPContentReader implements ContentReader { @Inject private Logger log; - @Inject private SesameService sesameService; @Inject - private ConfigurationService configurationService; - - @Inject private HttpClientService httpClientService; public HTTPContentReader() {
