Skip to content

Commit 809db12

Browse files
committed
Make auto-registration configurable
Add boolean property for whether to add the loader as an extension at all, as well as max redeliveries
1 parent 94dfc6a commit 809db12

File tree

2 files changed

+17
-5
lines changed
  • fcrepo-api-x-listener/src/main/resources/OSGI-INF/blueprint
  • fcrepo-api-x-loader/src/main/resources/OSGI-INF/blueprint

2 files changed

+17
-5
lines changed

fcrepo-api-x-listener/src/main/resources/OSGI-INF/blueprint/blueprint.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<cm:default-properties>
1616
<cm:property name="input.uri" value="activemq:topic:fedora" />
1717
<cm:property name="broker.uri" value="tcp://localhost:61616" />
18-
<cm:property name="fcrepo.BaseURI" value="http://localhost:8080/fcrepo/rest" />
18+
<cm:property name="fcrepo.baseURI" value="http://localhost:8080/fcrepo/rest" />
1919
</cm:default-properties>
2020
</cm:property-placeholder>
2121

fcrepo-api-x-loader/src/main/resources/OSGI-INF/blueprint/blueprint.xml

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@
1515
<cm:default-properties>
1616
<cm:property name="loader.host" value="0.0.0.0" />
1717
<cm:property name="loader.port" value="32080" />
18+
<cm:property name="extension.load" value="true" />
19+
<cm:property name="extension.load.maximumRediveries"
20+
value="60" />
1821
</cm:default-properties>
1922
</cm:property-placeholder>
2023

@@ -41,22 +44,31 @@
4144
<camelContext id="apix-loader"
4245
xmlns="http://camel.apache.org/schema/blueprint">
4346
<routeBuilder ref="loaderRoutes" />
44-
47+
4548
<!-- Self-register the loader service as an extension -->
4649
<route id="load-extension">
4750
<from uri="timer:register?repeatCount=1" />
4851
<onException>
4952
<exception>java.lang.Exception</exception>
50-
<redeliveryPolicy maximumRedeliveries="10" logRetryAttempted="true" retryAttemptedLogLevel="INFO"/>
53+
<redeliveryPolicy maximumRedeliveries="{{extension.load.maximumRediveries}}"
54+
logRetryAttempted="true" retryAttemptedLogLevel="INFO" />
5155
</onException>
5256
<setHeader headerName="Content-Type">
5357
<constant>text/plain</constant>
5458
</setHeader>
59+
<setHeader headerName="CamelHttpMethod">
60+
<constant>POST</constant>
61+
</setHeader>
5562
<setBody>
5663
<simple>http://localhost:{{loader.port}}/load</simple>
5764
</setBody>
58-
<to
59-
uri="jetty:http://localhost:{{loader.port}}/load?okStatusCodeRange=200-399" />
65+
<choice>
66+
<when>
67+
<simple>{{extension.load}}</simple>
68+
<to
69+
uri="jetty:http://localhost:{{loader.port}}/load?okStatusCodeRange=200-399" />
70+
</when>
71+
</choice>
6072
</route>
6173
</camelContext>
6274
</blueprint>

0 commit comments

Comments
 (0)