Added OSGi HTTP Service to support Felix web console

fcrepo4-archive · Feb 4, 2014 · d37b603 · d37b603
1 parent 0b650db
commit d37b603
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 12 deletions.
diff --git a/fcrepo-jms-indexer-api/src/main/java/org/fcrepo/indexer/NamedFields.java b/fcrepo-jms-indexer-api/src/main/java/org/fcrepo/indexer/NamedFields.java
@@ -28,6 +28,9 @@
  */
 public class NamedFields extends HashMap<String, Collection<String>> {
 
+    public static final String CONFIGURATION_FOLDER =
+            "fedora:system/fedora:transform/fedora:ldpath/";
+
     /**
      * Default constructor
      *

diff --git a/fcrepo-jms-indexer-core/src/main/java/org/fcrepo/indexer/NamedFieldsRetriever.java b/fcrepo-jms-indexer-core/src/main/java/org/fcrepo/indexer/NamedFieldsRetriever.java
@@ -62,16 +62,16 @@ public class NamedFieldsRetriever implements Supplier<NamedFields> {
     private static final Logger LOGGER = getLogger(NamedFieldsRetriever.class);
 
     /**
-     * @param uri
+     * @param resourceUri
      * @param client
-     * @param rdfr Used to determine the transform to use with this indexing
+     * @param rdfRetriever Used to determine the transform to use with this indexing
      *        step
      */
-    public NamedFieldsRetriever(final String uri, final HttpClient client,
-        final Supplier<Model> rdfr) {
-        this.uri = uri;
+    public NamedFieldsRetriever(final String resourceUri, final HttpClient client,
+        final Supplier<Model> rdfRetriever) {
+        this.uri = resourceUri;
         this.httpClient = client;
-        this.rdfr = rdfr;
+        this.rdfr = rdfRetriever;
         final NamedFieldsDeserializer deserializer =
             new NamedFieldsDeserializer();
         this.gson =

diff --git a/fcrepo-jms-indexer-runtime/pom.xml b/fcrepo-jms-indexer-runtime/pom.xml
@@ -142,6 +142,17 @@
       <scope>provided</scope>
       <version>10.0-b28</version>
     </dependency>
+    <dependency>
+      <groupId>org.apache.felix</groupId>
+      <artifactId>org.apache.felix.http.bundle</artifactId>
+      <version>2.2.2</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.jackson</groupId>
+      <artifactId>jackson-mapper-asl</artifactId>
+      <scope>provided</scope>
+    </dependency>
   </dependencies>
 
   <repositories>

diff --git a/fcrepo-jms-indexer-solr/src/main/java/org/fcrepo/indexer/solr/SolrIndexer.java b/fcrepo-jms-indexer-solr/src/main/java/org/fcrepo/indexer/solr/SolrIndexer.java
@@ -52,8 +52,6 @@
  */
 public class SolrIndexer extends AsynchIndexer<NamedFields, UpdateResponse> {
 
-    public static final String CONFIGURATION_FOLDER =
-        "fedora:system/fedora:transform/fedora:ldpath/";
 
     // TODO make index-time boost somehow adjustable, or something
     public static final Long INDEX_TIME_BOOST = 1L;

diff --git a/fcrepo-jms-indexer-solr/src/test/java/org/fcrepo/indexer/system/SolrMappingsIT.java b/fcrepo-jms-indexer-solr/src/test/java/org/fcrepo/indexer/system/SolrMappingsIT.java
@@ -22,7 +22,7 @@
 import static org.apache.http.HttpStatus.SC_CREATED;
 import static org.apache.http.HttpStatus.SC_NO_CONTENT;
 import static org.apache.jena.riot.WebContent.contentTypeN3Alt1;
-import static org.fcrepo.indexer.solr.SolrIndexer.CONFIGURATION_FOLDER;
+import static org.fcrepo.indexer.NamedFields.CONFIGURATION_FOLDER;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 import static org.slf4j.LoggerFactory.getLogger;
@@ -73,9 +73,6 @@ public class SolrMappingsIT extends IndexingIT {
 
     private static final long TIME_TO_WAIT_STEP = 1000;
 
-    @Inject
-    private SolrIndexer testSolrIndexer;
-
     @Test
     public void testOneResource() throws ClientProtocolException, IOException,
         SolrServerException, InterruptedException {