diff --git a/indexing/islandora-indexing-triplestore/pom.xml b/indexing/islandora-indexing-triplestore/pom.xml index e6f16ee0..2bdabc32 100644 --- a/indexing/islandora-indexing-triplestore/pom.xml +++ b/indexing/islandora-indexing-triplestore/pom.xml @@ -15,6 +15,10 @@ Islandora CLAW Triplestore Indexer + + org.apache.camel.component.http4, + org.apache.activemq.camel.component + ca.islandora.indexing.triplestore diff --git a/indexing/islandora-indexing-triplestore/src/main/cfg/ca.islandora.indexing.triplestore.cfg b/indexing/islandora-indexing-triplestore/src/main/cfg/ca.islandora.indexing.triplestore.cfg index a6553552..dd94a4ba 100644 --- a/indexing/islandora-indexing-triplestore/src/main/cfg/ca.islandora.indexing.triplestore.cfg +++ b/indexing/islandora-indexing-triplestore/src/main/cfg/ca.islandora.indexing.triplestore.cfg @@ -8,4 +8,4 @@ jms.brokerUrl=tcp://localhost:61616 input.stream=activemq:queue:islandora/triplestore/index # The base URL of the triplestore being used. -triplestore.baseUrl=localhost:8080/bigdata/namespace/kb/sparql +triplestore.baseUrl=http://localhost:8080/bigdata/namespace/kb/sparql diff --git a/indexing/islandora-indexing-triplestore/src/main/java/ca/islandora/indexing/triplestore/TriplestoreIndexer.java b/indexing/islandora-indexing-triplestore/src/main/java/ca/islandora/indexing/triplestore/TriplestoreIndexer.java index 06b39f58..8139ffdc 100644 --- a/indexing/islandora-indexing-triplestore/src/main/java/ca/islandora/indexing/triplestore/TriplestoreIndexer.java +++ b/indexing/islandora-indexing-triplestore/src/main/java/ca/islandora/indexing/triplestore/TriplestoreIndexer.java @@ -54,12 +54,12 @@ public void configure() { from("direct:triplestoreUpsert") .routeId("islandoraTripelstoreIndexerUpsert") .process(new SparqlUpdateProcessor()) - .to("http4://{{triplestore.baseUrl}}"); + .to("{{triplestore.baseUrl}}"); from("direct:triplestoreDelete") .routeId("islandoraTripelstoreIndexerDelete") .process(new SparqlDeleteProcessor()) - .to("http4://{{triplestore.baseUrl}}"); + .to("{{triplestore.baseUrl}}"); } } diff --git a/indexing/islandora-indexing-triplestore/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/indexing/islandora-indexing-triplestore/src/main/resources/OSGI-INF/blueprint/blueprint.xml index 7b907ea6..2b96258c 100644 --- a/indexing/islandora-indexing-triplestore/src/main/resources/OSGI-INF/blueprint/blueprint.xml +++ b/indexing/islandora-indexing-triplestore/src/main/resources/OSGI-INF/blueprint/blueprint.xml @@ -15,6 +15,9 @@ + + + ca.islandora.indexing.triplestore diff --git a/indexing/islandora-indexing-triplestore/src/main/resources/log4j.properties b/indexing/islandora-indexing-triplestore/src/test/resources/log4j.properties similarity index 100% rename from indexing/islandora-indexing-triplestore/src/main/resources/log4j.properties rename to indexing/islandora-indexing-triplestore/src/test/resources/log4j.properties diff --git a/karaf/src/main/resources/features.xml b/karaf/src/main/resources/features.xml index 22813e59..717ff497 100644 --- a/karaf/src/main/resources/features.xml +++ b/karaf/src/main/resources/features.xml @@ -28,7 +28,7 @@ camel camel-cache camel-jsonpath - camel-http + camel-http4 camel-script camel-script-javascript camel-base64 @@ -50,7 +50,7 @@ wrap cxf camel - camel-http + camel-http4 camel-servlet camel-jsonpath camel-cxf @@ -73,7 +73,7 @@ wrap cxf camel - camel-http + camel-http4 camel-servlet camel-jsonpath camel-cxf diff --git a/parent/pom.xml b/parent/pom.xml index 4b78f5bd..3f0c9e20 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -87,11 +87,6 @@ camel-exec ${camel.version} - - org.apache.camel - camel-http - ${camel.version} - org.apache.activemq activemq-camel @@ -152,11 +147,13 @@ org.slf4j slf4j-log4j12 ${slf4j.version} + test log4j log4j ${log4j.version} + test