Update camel code to use camel-http4 component (#15)

Addresses: Islandora/documentation#362 This also makes it easier to configure endpoints with HTTPS schemes.
Islandora · Sep 6, 2016 · d2b08d5 · d2b08d5
1 parent f4b6493
commit d2b08d5
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 11 deletions.
diff --git a/indexing/islandora-indexing-triplestore/pom.xml b/indexing/islandora-indexing-triplestore/pom.xml
@@ -15,6 +15,10 @@
 
   <name>Islandora CLAW Triplestore Indexer</name>
   <properties>
+    <islandora.osgi.import.pkg>
+      org.apache.camel.component.http4,
+      org.apache.activemq.camel.component
+    </islandora.osgi.import.pkg>
     <islandora.osgi.export.pkg>ca.islandora.indexing.triplestore</islandora.osgi.export.pkg>
   </properties>
 

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
@@ -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/...exing-triplestore/src/main/java/ca/islandora/indexing/triplestore/TriplestoreIndexer.java b/...exing-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
@@ -15,6 +15,9 @@
     <property name="brokerURL" value="${jms.brokerUrl}"/>
   </bean>
 
+  <bean id="http" class="org.apache.camel.component.http4.HttpComponent"/>
+  <bean id="https" class="org.apache.camel.component.http4.HttpComponent"/>
+
   <camelContext id="IslandoraTriplestoreIndexer" xmlns="http://camel.apache.org/schema/blueprint">
     <package>ca.islandora.indexing.triplestore</package>
   </camelContext>

diff --git a/...store/src/main/resources/log4j.properties → ...store/src/test/resources/log4j.properties b/...store/src/main/resources/log4j.properties → ...store/src/test/resources/log4j.properties
diff --git a/karaf/src/main/resources/features.xml b/karaf/src/main/resources/features.xml
@@ -28,7 +28,7 @@
     <feature version="${camel.version}">camel</feature>
     <feature version="${camel.version}">camel-cache</feature>
     <feature version="${camel.version}">camel-jsonpath</feature>
-    <feature version="${camel.version}">camel-http</feature>
+    <feature version="${camel.version}">camel-http4</feature>
     <feature version="${camel.version}">camel-script</feature>
     <feature version="${camel.version}">camel-script-javascript</feature>
     <feature version="${camel.version}">camel-base64</feature>
@@ -50,7 +50,7 @@
     <feature prerequisite="true">wrap</feature>
     <feature version="${cxf.version}">cxf</feature>
     <feature version="${camel.version}">camel</feature>
-    <feature version="${camel.version}">camel-http</feature>
+    <feature version="${camel.version}">camel-http4</feature>
     <feature version="${camel.version}">camel-servlet</feature>
     <feature version="${camel.version}">camel-jsonpath</feature>
     <feature version="${camel.version}">camel-cxf</feature>
@@ -73,7 +73,7 @@
     <feature prerequisite="true">wrap</feature>
     <feature version="${cxf.version}">cxf</feature>
     <feature version="${camel.version}">camel</feature>
-    <feature version="${camel.version}">camel-http</feature>
+    <feature version="${camel.version}">camel-http4</feature>
     <feature version="${camel.version}">camel-servlet</feature>
     <feature version="${camel.version}">camel-jsonpath</feature>
     <feature version="${camel.version}">camel-cxf</feature>

diff --git a/parent/pom.xml b/parent/pom.xml
@@ -87,11 +87,6 @@
         <artifactId>camel-exec</artifactId>
         <version>${camel.version}</version>
       </dependency>
-      <dependency>
-        <groupId>org.apache.camel</groupId>
-        <artifactId>camel-http</artifactId>
-        <version>${camel.version}</version>
-      </dependency>
       <dependency>
         <groupId>org.apache.activemq</groupId>
         <artifactId>activemq-camel</artifactId>
@@ -152,11 +147,13 @@
         <groupId>org.slf4j</groupId>
         <artifactId>slf4j-log4j12</artifactId>
         <version>${slf4j.version}</version>
+        <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>log4j</groupId>
         <artifactId>log4j</artifactId>
         <version>${log4j.version}</version>
+        <scope>test</scope>
       </dependency>
       <!-- Testing & Camel Plugin -->
       <dependency>