Commit 4f5b81f2 authored by bseeger's avatar bseeger
Browse files

Renames acrepo-idiomatic to acrepo-connector-idiomatic

parent 85d634a9
......@@ -36,7 +36,7 @@ Connectors
These modules listen to repository events and react accordingly.
* `acrepo-connector-broadcast`: ActiveMQ Message Broadcast Service: This rebroadcasts messages from one queue/topic to every queue/topic in a specified list
* `acrepo-idiomatic`: Id Mapping Service: This maps a public ID to a (internal and typically much longer) Fedora URI
* `acrepo-connector-idiomatic`: Id Mapping Service: This maps a public ID to a (internal and typically much longer) Fedora URI
* `acrepo-idiomatic-pgsql`: Id Mapping Service Database: This exposes a Postgres datastore for use with the Id Mapping service
Other OSGi Features
......@@ -67,13 +67,13 @@ command from its shell:
feature:repo-add mvn:edu.amherst.acdc/acrepo-karaf/LATEST/xml/features
feature:install acrepo-connector-broadcast
feature:install acrepo-connector-idiomatic
feature:install acrepo-idiomatic-pgsql
feature:install acrepo-exts-fits
feature:install acrepo-exts-image
feature:install acrepo-exts-jsonld
feature:install acrepo-exts-serialize-xml
feature:install acrepo-template-mustache
feature:install acrepo-idiomatic
feature:install acrepo-idiomatic-pgsql
feature:install acrepo-services-jsonld
feature:install acrepo-services-ldcache
feature:install acrepo-services-ldcache-file
......
......@@ -28,7 +28,7 @@ This project can be deployed in an OSGi container. For example using
command from its shell:
feature:repo-add mvn:edu.amherst.acdc/repository-services/LATEST/xml/features
feature:install acrepo-idiomatic
feature:install acrepo-connector-idiomatic
Or by copying the compiled bundle into `$KARAF_HOME/deploy`.
......@@ -36,7 +36,7 @@ Configuration
-------------
The application can be configured by creating the following configuration
file `$KARAF_HOME/etc/edu.amherst.acdc.idiomatic.cfg`. The following values
file `$KARAF_HOME/etc/edu.amherst.acdc.connector.idiomatic.cfg`. The following values
are available for configuration:
In the event of failure, the maximum number of times a redelivery will be attempted.
......
......@@ -9,14 +9,14 @@
<version>1.0.1-SNAPSHOT</version>
</parent>
<artifactId>acrepo-idiomatic</artifactId>
<artifactId>acrepo-connector-idiomatic</artifactId>
<packaging>bundle</packaging>
<name>ID mapping service</name>
<description>Camel-based service for mapping public IDs to Fedora IDs</description>
<properties>
<osgi.export.packages>edu.amherst.acdc.idiomatic;version=${project.version}</osgi.export.packages>
<osgi.export.packages>edu.amherst.acdc.connector.idiomatic;version=${project.version}</osgi.export.packages>
<osgi.import.packages>javax.sql,*</osgi.import.packages>
</properties>
......@@ -110,7 +110,7 @@
<configuration>
<artifacts>
<artifact>
<file>src/main/cfg/edu.amherst.acdc.idiomatic.cfg</file>
<file>src/main/cfg/edu.amherst.acdc.connector.idiomatic.cfg</file>
<type>cfg</type>
<classifier>configuration</classifier>
</artifact>
......
......@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package edu.amherst.acdc.idiomatic;
package edu.amherst.acdc.connector.idiomatic;
import static edu.amherst.acdc.idiomatic.IdiomaticHeaders.FEDORA;
import static edu.amherst.acdc.idiomatic.IdiomaticHeaders.ID;
import static edu.amherst.acdc.connector.idiomatic.IdiomaticHeaders.FEDORA;
import static edu.amherst.acdc.connector.idiomatic.IdiomaticHeaders.ID;
import static org.apache.camel.builder.PredicateBuilder.not;
import static org.fcrepo.camel.JmsHeaders.IDENTIFIER;
......
......@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package edu.amherst.acdc.idiomatic;
package edu.amherst.acdc.connector.idiomatic;
/**
* Common Headers for this set of routes
......
......@@ -8,7 +8,7 @@
http://camel.apache.org/schema/blueprint http://camel.apache.org/schema/blueprint/camel-blueprint.xsd">
<!-- OSGI blueprint property placeholder -->
<cm:property-placeholder persistent-id="edu.amherst.acdc.idiomatic" update-strategy="reload">
<cm:property-placeholder persistent-id="edu.amherst.acdc.connector.idiomatic" update-strategy="reload">
<cm:default-properties>
<cm:property name="error.maxRedeliveries" value="10"/>
<cm:property name="jms.brokerUrl" value="tcp://localhost:61616"/>
......@@ -38,7 +38,7 @@
<camelContext xmlns="http://camel.apache.org/schema/blueprint">
<package>edu.amherst.acdc.idiomatic</package>
<package>edu.amherst.acdc.connector.idiomatic</package>
<restConfiguration component="jetty" host="{{rest.host}}" port="{{rest.port}}"/>
......
......@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package edu.amherst.acdc.idiomatic;
package edu.amherst.acdc.connector.idiomatic;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
......
......@@ -7,7 +7,7 @@
</encoder>
</appender>
<logger name="edu.amherst.acdc.idiomatic" additivity="false" level="INFO">
<logger name="edu.amherst.acdc.connector.idiomatic" additivity="false" level="INFO">
<appender-ref ref="STDOUT"/>
</logger>
<logger name="org.apache.camel" additivity="false" level="INFO">
......
......@@ -29,7 +29,7 @@
<dependency>
<groupId>edu.amherst.acdc</groupId>
<artifactId>acrepo-idiomatic</artifactId>
<artifactId>acrepo-connector-idiomatic</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
......
......@@ -77,7 +77,7 @@ public class AcrepoServicesIT extends AbstractOSGiIT {
features(maven().groupId("org.apache.activemq").artifactId("activemq-karaf")
.type("xml").classifier("features").versionAsInProject(), "activemq-camel"),
features(maven().groupId("edu.amherst.acdc").artifactId("acrepo-karaf")
.type("xml").classifier("features").versionAsInProject(), "acrepo-idiomatic",
.type("xml").classifier("features").versionAsInProject(), "acrepo-connector-idiomatic",
"acrepo-idiomatic-pgsql", "acrepo-exts-fits", "acrepo-exts-image",
"acrepo-exts-jsonld", "acrepo-exts-serialize-xml", "acrepo-template-mustache",
"acrepo-libs-jena", "acrepo-libs-sesame", "acrepo-libs-jsonld",
......@@ -91,7 +91,7 @@ public class AcrepoServicesIT extends AbstractOSGiIT {
editConfigurationFilePut("etc/edu.amherst.acdc.exts.jsonld.cfg", "rest.port", jsonldPort),
editConfigurationFilePut("etc/edu.amherst.acdc.exts.serialize.xml.cfg", "rest.port", metadataPort),
editConfigurationFilePut("etc/edu.amherst.acdc.template.mustache.cfg", "rest.port", templatePort),
editConfigurationFilePut("etc/edu.amherst.acdc.idiomatic.cfg", "rest.port", idiomaticPort),
editConfigurationFilePut("etc/edu.amherst.acdc.connector.idiomatic.cfg", "rest.port", idiomaticPort),
editConfigurationFilePut("etc/org.apache.karaf.management.cfg", "rmiRegistryPort", rmiRegistryPort),
editConfigurationFilePut("etc/org.apache.karaf.management.cfg", "rmiServerPort", rmiServerPort),
editConfigurationFilePut("etc/org.apache.karaf.shell.cfg", "sshPort", sshPort)
......@@ -103,7 +103,7 @@ public class AcrepoServicesIT extends AbstractOSGiIT {
assertTrue(featuresService.isInstalled(featuresService.getFeature("camel-core")));
assertTrue(featuresService.isInstalled(featuresService.getFeature("fcrepo-camel")));
assertTrue(featuresService.isInstalled(featuresService.getFeature("acrepo-connector-broadcast")));
assertTrue(featuresService.isInstalled(featuresService.getFeature("acrepo-idiomatic")));
assertTrue(featuresService.isInstalled(featuresService.getFeature("acrepo-connector-idiomatic")));
assertTrue(featuresService.isInstalled(featuresService.getFeature("acrepo-idiomatic-pgsql")));
assertTrue(featuresService.isInstalled(featuresService.getFeature("acrepo-exts-fits")));
assertTrue(featuresService.isInstalled(featuresService.getFeature("acrepo-exts-image")));
......
......@@ -17,7 +17,7 @@
<dependencies>
<dependency>
<groupId>edu.amherst.acdc</groupId>
<artifactId>acrepo-idiomatic</artifactId>
<artifactId>acrepo-connector-idiomatic</artifactId>
<scope>test</scope>
<version>${project.version}</version>
</dependency>
......
......@@ -5,7 +5,7 @@
<repository>mvn:org.apache.activemq/activemq-karaf/${activemq.version}/xml/features</repository>
<repository>mvn:org.ops4j.pax.jdbc/pax-jdbc-features/${pax-jdbc.version}/xml/features</repository>
<feature name="acrepo-idiomatic" version="${project.version}">
<feature name="acrepo-connector-idiomatic" version="${project.version}">
<details>Installs the id mapping service</details>
<feature>jndi</feature>
......@@ -20,9 +20,9 @@
<bundle dependency="true">mvn:org.codehaus.woodstox/woodstox-core-asl/${woodstox.version}</bundle>
<bundle>mvn:edu.amherst.acdc/acrepo-idiomatic/${project.version}</bundle>
<bundle>mvn:edu.amherst.acdc/acrepo-connector-idiomatic/${project.version}</bundle>
<configfile finalname="/etc/edu.amherst.acdc.idiomatic.cfg">mvn:edu.amherst.acdc/acrepo-idiomatic/${project.version}/cfg/configuration</configfile>
<configfile finalname="/etc/edu.amherst.acdc.connector.idiomatic.cfg">mvn:edu.amherst.acdc/acrepo-connector-idiomatic/${project.version}/cfg/configuration</configfile>
</feature>
<feature name="acrepo-idiomatic-pgsql" version="${project.version}">
......
......@@ -76,7 +76,7 @@ public class KarafIT {
final String sshPort = cm.getProperty("karaf.ssh.port");
final String version = cm.getProperty("project.version");
final String acrepoIdiomatic = getBundleUri("acrepo-idiomatic", version);
final String acrepoIdiomatic = getBundleUri("acrepo-connector-idiomatic", version);
final String acrepoPcdmSvc = getBundleUri("acrepo-services-pcdm", version);
final String acrepoValidationSvc = getBundleUri("acrepo-services-validation", version);
final String acrepoJsonLdSvc = getBundleUri("acrepo-services-jsonld", version);
......
......@@ -108,7 +108,7 @@
<modules>
<module>acrepo-connector-broadcast</module>
<module>acrepo-idiomatic-pgsql</module>
<module>acrepo-idiomatic</module>
<module>acrepo-connector-idiomatic</module>
<module>acrepo-exts-fits</module>
<module>acrepo-exts-image</module>
<module>acrepo-exts-jsonld</module>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment