Commit 269719c1 authored by acoburn's avatar acoburn
Browse files

rename acrepo-mint-service to acrepo-services-mint

parent cf51f194
......@@ -12,9 +12,9 @@ Services
* `acrepo-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
* `acrepo-image-service`: An image manipulation service
* `acrepo-services-jsonld`: This service creates expanded or compact JSON-LD representations of input documents
* `acrepo-jsonld-service`: This service exposes an HTTP endpoint for creating compact JSON-LD documents from a fedora repository using a pluggable context document
* `acrepo-mint-service`: This mints random (public) URIs for use with fedora resources
* `acrepo-services-jsonld`: This service creates expanded or compact JSON-LD representations of input documents
* `acrepo-services-mint`: This mints random (public) URIs for use with fedora resources
* `acrepo-services-validation`: An OSGi-based validation service
* `acrepo-xml-metadata`: This service translates Fedora RDF documents into MODS/XML or DC/XML
......@@ -37,9 +37,9 @@ command from its shell:
feature:install acrepo-idiomatic
feature:install acrepo-idiomatic-pgsql
feature:install acrepo-image-service
feature:install acrepo-services-jsonld
feature:install acrepo-jsonld-service
feature:install acrepo-mint-service
feature:install acrepo-services-mint
feature:install acrepo-services-jsonld
feature:install acrepo-services-validation
feature:install acrepo-xml-metadata
......
......@@ -70,7 +70,7 @@
<!-- testing -->
<dependency>
<groupId>edu.amherst.acdc</groupId>
<artifactId>acrepo-mint-service</artifactId>
<artifactId>acrepo-services-mint</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
......
......@@ -25,7 +25,7 @@ import java.util.Properties;
import javax.sql.DataSource;
import edu.amherst.acdc.mint.MinterService;
import edu.amherst.acdc.services.mint.MinterService;
import java.util.function.Supplier;
import org.apache.camel.EndpointInject;
import org.apache.camel.Produce;
......
......@@ -40,7 +40,7 @@
<dependency>
<groupId>edu.amherst.acdc</groupId>
<artifactId>acrepo-mint-service</artifactId>
<artifactId>acrepo-services-mint</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
......
......@@ -78,10 +78,9 @@ public class AcrepoServicesIT extends AbstractOSGiIT {
.type("xml").classifier("features").versionAsInProject(), "activemq-camel"),
features(maven().groupId("edu.amherst.acdc").artifactId("acrepo-karaf")
.type("xml").classifier("features").versionAsInProject(), "acrepo-idiomatic",
"acrepo-idiomatic-pgsql", "acrepo-mint-service", "acrepo-xml-metadata",
"acrepo-services-validation", "acrepo-services-jsonld",
"acrepo-jsonld-service", "acrepo-template-mustache",
"acrepo-image-service", "acrepo-fits-rest"),
"acrepo-idiomatic-pgsql", "acrepo-xml-metadata", "acrepo-image-service",
"acrepo-services-validation", "acrepo-services-jsonld", "acrepo-services-mint",
"acrepo-jsonld-service", "acrepo-template-mustache", "acrepo-fits-rest"),
editConfigurationFilePut("etc/edu.amherst.acdc.jsonld.service.cfg", "rest.port", jsonldPort),
editConfigurationFilePut("etc/edu.amherst.acdc.template.mustache.cfg", "rest.port", templatePort),
......@@ -101,11 +100,11 @@ public class AcrepoServicesIT extends AbstractOSGiIT {
assertTrue(featuresService.isInstalled(featuresService.getFeature("fcrepo-camel")));
assertTrue(featuresService.isInstalled(featuresService.getFeature("acrepo-idiomatic")));
assertTrue(featuresService.isInstalled(featuresService.getFeature("acrepo-idiomatic-pgsql")));
assertTrue(featuresService.isInstalled(featuresService.getFeature("acrepo-mint-service")));
assertTrue(featuresService.isInstalled(featuresService.getFeature("acrepo-services-jsonld")));
assertTrue(featuresService.isInstalled(featuresService.getFeature("acrepo-services-mint")));
assertTrue(featuresService.isInstalled(featuresService.getFeature("acrepo-services-validation")));
assertTrue(featuresService.isInstalled(featuresService.getFeature("acrepo-xml-metadata")));
assertTrue(featuresService.isInstalled(featuresService.getFeature("acrepo-jsonld-service")));
assertTrue(featuresService.isInstalled(featuresService.getFeature("acrepo-services-jsonld")));
assertTrue(featuresService.isInstalled(featuresService.getFeature("acrepo-template-mustache")));
assertTrue(featuresService.isInstalled(featuresService.getFeature("acrepo-image-service")));
assertTrue(featuresService.isInstalled(featuresService.getFeature("acrepo-fits-rest")));
......
......@@ -62,7 +62,7 @@
<dependency>
<groupId>edu.amherst.acdc</groupId>
<artifactId>acrepo-mint-service</artifactId>
<artifactId>acrepo-services-mint</artifactId>
<scope>test</scope>
<version>${project.version}</version>
</dependency>
......
......@@ -53,14 +53,14 @@
<configfile finalname="/etc/edu.amherst.acdc.image.service.cfg">mvn:edu.amherst.acdc/acrepo-image-service/${project.version}/cfg/configuration</configfile>
</feature>
<feature name="acrepo-mint-service" version="${project.version}" resolver="(obr)" start-level="50">
<feature name="acrepo-services-mint" version="${project.version}" resolver="(obr)" start-level="50">
<details>Installs the id minter</details>
<bundle dependency="true">mvn:org.apache.commons/commons-lang3/${commons-lang.version}</bundle>
<bundle>mvn:edu.amherst.acdc/acrepo-mint-service/${project.version}</bundle>
<bundle>mvn:edu.amherst.acdc/acrepo-services-mint/${project.version}</bundle>
<configfile finalname="/etc/edu.amherst.acdc.mint.cfg">mvn:edu.amherst.acdc/acrepo-mint-service/${project.version}/cfg/configuration</configfile>
<configfile finalname="/etc/edu.amherst.acdc.services.mint.cfg">mvn:edu.amherst.acdc/acrepo-services-mint/${project.version}/cfg/configuration</configfile>
</feature>
<feature name="acrepo-services-validation" version="${project.version}" resolver="(orb)" start-level="50">
......
......@@ -80,7 +80,7 @@ public class KarafIT {
final String acrepoValidationSvc = getBundleUri("acrepo-services-validation", version);
final String acrepoJsonLdSvc = getBundleUri("acrepo-services-jsonld", version);
final String acrepoJsonLd = getBundleUri("acrepo-jsonld-service", version);
final String acrepoMint = getBundleUri("acrepo-mint-service", version);
final String acrepoMintSvc = getBundleUri("acrepo-services-mint", version);
return new Option[] {
karafDistributionConfiguration()
......@@ -115,13 +115,13 @@ public class KarafIT {
CoreOptions.systemProperty("acdc.validation-svc-bundle").value(acrepoValidationSvc),
CoreOptions.systemProperty("acdc.jsonld-bundle").value(acrepoJsonLd),
CoreOptions.systemProperty("acdc.jsonld-svc-bundle").value(acrepoJsonLdSvc),
CoreOptions.systemProperty("acdc.mint-bundle").value(acrepoMint),
CoreOptions.systemProperty("acdc.mint-svc-bundle").value(acrepoMintSvc),
bundle(acrepoIdiomatic).start(),
bundle(acrepoValidationSvc).start(),
bundle(acrepoJsonLd).start(),
bundle(acrepoJsonLdSvc).start(),
bundle(acrepoMint).start(),
bundle(acrepoMintSvc).start(),
editConfigurationFilePut("etc/org.apache.karaf.management.cfg", "rmiRegistryPort", rmiRegistryPort),
editConfigurationFilePut("etc/org.apache.karaf.management.cfg", "rmiServerPort", rmiServerPort),
......@@ -144,7 +144,7 @@ public class KarafIT {
assertEquals(ACTIVE, bundleContext.getBundle(System.getProperty("acdc.validation-svc-bundle")).getState());
assertEquals(ACTIVE, bundleContext.getBundle(System.getProperty("acdc.jsonld-bundle")).getState());
assertEquals(ACTIVE, bundleContext.getBundle(System.getProperty("acdc.jsonld-svc-bundle")).getState());
assertEquals(ACTIVE, bundleContext.getBundle(System.getProperty("acdc.mint-bundle")).getState());
assertEquals(ACTIVE, bundleContext.getBundle(System.getProperty("acdc.mint-svc-bundle")).getState());
}
private <T> T getOsgiService(final Class<T> type, final String filter, final long timeout) {
......
......@@ -20,15 +20,13 @@ Each of these projects can be deployed in an OSGi container. For example using
command from its shell:
feature:repo-add mvn:edu.amherst.acdc/acrepo-karaf/LATEST/xml/features
feature:install acrepo-mint-service
Or by copying any of the compiled bundles into `$KARAF_HOME/deploy`.
feature:install acrepo-services-mint
Configuration
-------------
The application can be configured by creating the following configuration
file `$KARAF_HOME/etc/edu.amherst.acdc.mint.cfg`. The following values
file `$KARAF_HOME/etc/edu.amherst.acdc.services.mint.cfg`. The following values
are available for configuration:
Set the length of the newly minted ID field
......
......@@ -26,14 +26,14 @@
<version>1.0.1-SNAPSHOT</version>
</parent>
<artifactId>acrepo-mint-service</artifactId>
<artifactId>acrepo-services-mint</artifactId>
<packaging>bundle</packaging>
<name>Id Minter Blueprint Bundle</name>
<description>Repository Id Minter OSGi blueprint bundle project.</description>
<properties>
<osgi.export.packages>edu.amherst.acdc.mint*;version=${project.version}</osgi.export.packages>
<osgi.export.packages>edu.amherst.acdc.services.mint*;version=${project.version}</osgi.export.packages>
</properties>
<dependencies>
......@@ -84,7 +84,7 @@
<configuration>
<artifacts>
<artifact>
<file>src/main/cfg/edu.amherst.acdc.mint.cfg</file>
<file>src/main/cfg/edu.amherst.acdc.services.mint.cfg</file>
<type>cfg</type>
<classifier>configuration</classifier>
</artifact>
......
......@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package edu.amherst.acdc.mint;
package edu.amherst.acdc.services.mint;
import static org.apache.commons.lang3.RandomStringUtils.randomAlphanumeric;
......
<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The ASF licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
......@@ -23,13 +7,13 @@
http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.1.0 http://aries.apache.org/schemas/blueprint-cm/blueprint-cm-1.1.0.xsd"
default-activation="lazy">
<cm:property-placeholder persistent-id="edu.amherst.acdc.mint" update-strategy="reload" >
<cm:property-placeholder persistent-id="edu.amherst.acdc.services.mint" update-strategy="reload" >
<cm:default-properties>
<cm:property name="minter.length" value="7"/>
</cm:default-properties>
</cm:property-placeholder>
<bean id="minterServiceBean" class="edu.amherst.acdc.mint.MinterService">
<bean id="minterServiceBean" class="edu.amherst.acdc.services.mint.MinterService">
<argument value="${minter.length}"/>
</bean>
......
......@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package edu.amherst.acdc.mint;
package edu.amherst.acdc.services.mint;
import static java.util.regex.Pattern.compile;
import static org.junit.Assert.assertEquals;
......
......@@ -36,7 +36,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<project.copyrightYear>2016</project.copyrightYear>
<activemq.version>5.13.2</activemq.version>
<activemq.version>5.13.3</activemq.version>
<camel.version>2.17.1</camel.version>
<commons-lang.version>3.4</commons-lang.version>
<commons-io.version>2.5</commons-io.version>
......@@ -88,11 +88,11 @@
<module>acrepo-idiomatic</module>
<module>acrepo-image-service</module>
<module>acrepo-karaf</module>
<module>acrepo-mint-service</module>
<module>acrepo-services-jsonld</module>
<module>acrepo-services-mint</module>
<module>acrepo-services-validation</module>
<module>acrepo-xml-metadata</module>
<module>acrepo-jsonld-service</module>
<module>acrepo-services-jsonld</module>
<module>acrepo-template-mustache</module>
<module>acrepo-fits-rest</module>
</modules>
......
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