Merge branch 'seda_timeout' into 'master'

Puts the seda timeout in the correct place

See merge request !102

acrepo-exts-ore/src/main/java/edu/amherst/acdc/exts/ore/OreRouter.java

@@ -65,7 +65,7 @@ public class OreRouter extends RouteBuilder {
           .setHeader(ORE_ACCEPT, header("Accept"))
           .log("Building ORE Object ${body}")
           .setBody().header(FCREPO_URI)
-          .to("seda:recurse")
+          .to("seda:recurse?timeout={{ore.timeout}}")
           .removeHeader("breadcrumbId")
           .process(exchange -> {
               final String contentType = exchange.getIn().getHeader(ORE_ACCEPT, String.class);
@@ -75,7 +75,7 @@ public class OreRouter extends RouteBuilder {
           })
           .to("direct:serialize");
 
-        from("seda:recurse?concurrentConsumers={{ore.concurrency}}&timeout={{ore.timeout}}")
+        from("seda:recurse?concurrentConsumers={{ore.concurrency}}")
           .routeId("OreBuildRecursive")
           .setHeader(FCREPO_URI, body())
           .to("direct:getResource")

acrepo-exts-pcdm/src/main/java/edu/amherst/acdc/exts/pcdm/PcdmRouter.java

@@ -66,7 +66,7 @@ public class PcdmRouter extends RouteBuilder {
           .setHeader(PCDM_ACCEPT, header("Accept"))
           .log("Building PCDM Object ${body}")
           .setBody().header(FCREPO_URI)
-          .to("seda:recurse")
+          .to("seda:recurse?timeout={{pcdm.timeout}}")
           .removeHeader("breadcrumbId")
           .process(exchange -> {
               final String contentType = exchange.getIn().getHeader(PCDM_ACCEPT, String.class);
@@ -76,7 +76,7 @@ public class PcdmRouter extends RouteBuilder {
           })
           .to("direct:serialize");
 
-        from("seda:recurse?concurrentConsumers={{pcdm.concurrency}}&timeout={{pcdm.timeout}}")
+        from("seda:recurse?concurrentConsumers={{pcdm.concurrency}}")
           .routeId("PcdmBuildRecursive")
           .setHeader(FCREPO_URI, body())
           .to("direct:getResource")