Make configuration properties consistent

Add new fcrepo-camel-webapp module Remove individual web modules Completes: https://jira.duraspace.org/browse/FCREPO-1523
fcrepo-exts · May 7, 2015 · 3b012c7 · 3b012c7
1 parent d142b43
commit 3b012c7
Show file tree

Hide file tree

Showing 25 changed files with 353 additions and 628 deletions.
diff --git a/fcrepo-audit-triplestore-web/README.md b/fcrepo-audit-triplestore-web/README.md
diff --git a/fcrepo-audit-triplestore-web/pom.xml b/fcrepo-audit-triplestore-web/pom.xml
diff --git a/fcrepo-audit-triplestore-web/src/main/resources/application.properties b/fcrepo-audit-triplestore-web/src/main/resources/application.properties
diff --git a/fcrepo-audit-triplestore-web/src/main/resources/logback.xml b/fcrepo-audit-triplestore-web/src/main/resources/logback.xml
diff --git a/fcrepo-audit-triplestore-web/src/main/webapp/WEB-INF/applicationContext.xml b/fcrepo-audit-triplestore-web/src/main/webapp/WEB-INF/applicationContext.xml
diff --git a/fcrepo-audit-triplestore/README.md b/fcrepo-audit-triplestore/README.md
@@ -54,9 +54,9 @@ The connection URI used to connect to a local or remote ActiveMQ broker
 
     jms.brokerUrl=tcp://localhost:61616
 
-The name of the JMS topic (or queue) from which the event stream is to be read.
+The camel URI for the incoming message stream.
 
-    jms.fcrepoEndpoint=topic:fedora
+    input.stream=activemq:topic:fedora
 
 The base URL of the triplestore being used.
 

diff --git a/fcrepo-audit-triplestore/src/main/java/org/fcrepo/camel/audit/triplestore/EventRouter.java b/fcrepo-audit-triplestore/src/main/java/org/fcrepo/camel/audit/triplestore/EventRouter.java
@@ -45,7 +45,7 @@ public void configure() throws Exception {
         /**
          * Process a message.
          */
-        from("activemq:{{jms.fcrepoEndpoint}}")
+        from("{{input.stream}}")
             .routeId("AuditFcrepoRouter")
             .filter(not(or(header(IDENTIFIER).startsWith(simple("{{audit.container}}/")),
                            header(IDENTIFIER).isEqualTo(simple("{{audit.container}}")))))

diff --git a/fcrepo-audit-triplestore/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/fcrepo-audit-triplestore/src/main/resources/OSGI-INF/blueprint/blueprint.xml
@@ -12,7 +12,7 @@
      <cm:default-properties>
        <cm:property name="error.maxRedeliveries" value="10"/>
        <cm:property name="jms.brokerUrl" value="tcp://localhost:61616"/>
-       <cm:property name="jms.fcrepoEndpoint" value="topic:fedora"/>
+       <cm:property name="input.stream" value="activemq:topic:fedora"/>
        <cm:property name="triplestore.baseUrl" value="localhost:3030/test/update"/>
        <!-- Base URI to be used in contructing the URI for the JMS event -->
        <cm:property name="event.baseUri" value="http://example.com/event"/>