Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Address #157 - Update IslandoraSync to use a configurable activeMQ br… #158

Merged
merged 4 commits into from
Mar 9, 2016
Merged

Address #157 - Update IslandoraSync to use a configurable activeMQ br… #158

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5abb07e
Address #157 - Update IslandoraSync to use a configurable activeMQ br…
ruebot Feb 22, 2016
fff3fbb
Code review updates.
ruebot Feb 22, 2016
d7ddf08
code review updates
ruebot Mar 3, 2016
f387ccd
Code review updates.
ruebot Mar 4, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions camel/sync/src/main/cfg/ca.islandora.sync.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ islandora.fcrepo.baseurl = localhost:8080/fcrepo/rest
islandora.php.workingDir = /home/vagrant/islandora/camel/commands/bin
islandora.php.executable = islandora.php
islandora.triplestore.baseurl = localhost:8080/bigdata/namespace/kb/sparql
islandora.brokerUrl = localhost:61616
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be tcp://localhost:61616

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

doh. updating now.

6 changes: 6 additions & 0 deletions camel/sync/src/main/resources/OSGI-INF/blueprint/blueprint.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
<cm:property name="islandora.drupal.password" value=""/>
<cm:property name="islandora.fcrepo.baseurl" value="localhost:8080/fcrepo/rest"/>
<cm:property name="islandora.php.workingDir" value="/home/vagrant/islandora/camel/commands/bin"/>
<cm:property name="islandora.brokerUrl" value="localhost:61616"/>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should also be tcp://localhost:61616

</cm:default-properties>
</cm:property-placeholder>

Expand All @@ -34,4 +35,9 @@
<routeContextRef ref="drupalAuthentication"/>
</camelContext>

<!-- configuration of activemq component -->
<bean id="activemq" class="org.apache.activemq.camel.component.ActiveMQComponent">
<property name="islandora.brokerUrl" value="${islandora.brokerUrl}"/>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be <property name="brokerUrl" value="${islandora.brokerUrl}"/>

Like this https://github.com/fcrepo4-exts/fcrepo-camel-toolbox/blob/master/fcrepo-fixity/src/main/resources/OSGI-INF/blueprint/blueprint.xml#L35

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@whikloj , since brokers don't run on HTTP (TCP), should we add the prefix directly to where we are going to use this instead of allowing people to decide on the cfg? I mean, tripe store does not use http:// in ca.islandora.sync.cfg

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@DiegoPino sorry I totally missed this.

Because you could have stomp://localhost:61613 as your brokerURL, so I would not hardcode any part of it.

</bean>

</blueprint>