Skip to content

GitLab

Commit 66a03572 authored by bseeger's avatar bseeger
Browse files

Renames acrepo-image-service to acrepo-exts-image

parent ab3ff767
Hide whitespace changes
Inline Side-by-side
Showing with 33 additions and 33 deletions
README.md
View file @ 66a03572
......@@ -13,8 +13,8 @@ by making available a REST-based HTTP interface. The intention is that these ext
[Fedora API Extension](https://wiki.duraspace.org/display/FF/Design+-+API+Extension+Architecture) architecture.
* `acrepo-exts-fits`: This service will return FITS information associated with a Fedora Binary, in XML format
* `acrepo-exts-jsonld`: This module exposes an HTTP endpoint for creating compact JSON-LD documents from a fedora repository using a pluggable context document
* `acrepo-image-service`: An image manipulation service
* `acrepo-exts-image`: An image manipulation service
* `acrepo-exts-jsonld`: This module exposes an HTTP endpoint for creating compact JSON-LD documents from a Fedora repository using a pluggable context document
* `acrepo-exts-serialize-xml`: This service translates Fedora RDF documents into MODS/XML or DC/XML
* `acrepo-template-mustache`: A module for converting Fedora resources into some other form, using a [mustache](https://mustache.github.io/) template.
......@@ -26,7 +26,7 @@ These modules provide particular services, independent of Fedora Resources.
* `acrepo-services-jsonld`: This service creates expanded or compact JSON-LD representations of input documents
* `acrepo-services-ldcache`: This service dereferences and caches URIs, retrieving the `object` of particular triples on demand
* `acrepo-services-ldcache-file`: A file-based backend for the `acrepo-services-ldcache` service
* `acrepo-services-mint`: This mints random (public) URIs for use with fedora resources
* `acrepo-services-mint`: This mints random (public) URIs for use with Fedora resources
* `acrepo-services-pcdm`: This makes it easy to work with PCDM objects
* `acrepo-services-validation`: An OSGi-based validation service
......@@ -35,7 +35,7 @@ Connectors
These modules listen to repository events and react accordingly.
* `acrepo-idiomatic`: Id Mapping Service: This maps a public ID to a (internal and typically much longer) fedora URI
* `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
Other OSGi Features
......@@ -66,12 +66,12 @@ command from its shell:
feature:repo-add mvn:edu.amherst.acdc/acrepo-karaf/LATEST/xml/features
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-image-service
feature:install acrepo-services-jsonld
feature:install acrepo-services-ldcache
feature:install acrepo-services-ldcache-file
......
acrepo-image-service/README.md → acrepo-exts-image/README.md
View file @ 66a03572
......@@ -31,13 +31,13 @@ This 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-image-service
feature:install acrepo-exts-image
Configuration
-------------
The application can be configured by creating the following configuration
file `$KARAF_HOME/etc/edu.amherst.acdc.image.service.cfg`. The following values
file `$KARAF_HOME/etc/edu.amherst.acdc.exts.image.cfg`. The following values
are available for configuration:
The base url of the fedora repository and any authentication parameters
......
acrepo-image-service/pom.xml → acrepo-exts-image/pom.xml
View file @ 66a03572
......@@ -9,13 +9,13 @@
<version>1.0.1-SNAPSHOT</version>
</parent>
<artifactId>acrepo-image-service</artifactId>
<artifactId>acrepo-exts-image</artifactId>
<packaging>bundle</packaging>
<name>Image manipulation service</name>
<properties>
<osgi.export.packages>edu.amherst.acdc.image.service;version=${project.version}</osgi.export.packages>
<osgi.export.packages>edu.amherst.acdc.exts.image;version=${project.version}</osgi.export.packages>
</properties>
<dependencies>
......@@ -84,7 +84,7 @@
<configuration>
<artifacts>
<artifact>
<file>src/main/cfg/edu.amherst.acdc.image.service.cfg</file>
<file>src/main/cfg/edu.amherst.acdc.exts.image.cfg</file>
<type>cfg</type>
<classifier>configuration</classifier>
</artifact>
......
acrepo-image-service/src/main/java/edu/amherst/acdc/image/service/EventRouter.java → acrepo-exts-image/src/main/java/edu/amherst/acdc/exts/image/EventRouter.java
View file @ 66a03572
......@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package edu.amherst.acdc.image.service;
package edu.amherst.acdc.exts.image;
import static java.util.Arrays.stream;
import static org.apache.camel.Exchange.CONTENT_TYPE;
......
acrepo-image-service/src/main/resources/OSGI-INF/blueprint/blueprint.xml → acrepo-exts-image/src/main/resources/OSGI-INF/blueprint/blueprint.xml
View file @ 66a03572
......@@ -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.image.service" update-strategy="reload">
<cm:property-placeholder persistent-id="edu.amherst.acdc.exts.image" update-strategy="reload">
<cm:default-properties>
<cm:property name="rest.port" value="9105"/>
<cm:property name="rest.prefix" value="/image"/>
......@@ -22,7 +22,7 @@
</cm:property-placeholder>
<camelContext id="AcrepoImageService" xmlns="http://camel.apache.org/schema/blueprint">
<package>edu.amherst.acdc.image.service</package>
<package>edu.amherst.acdc.exts.image</package>
</camelContext>
</blueprint>
acrepo-image-service/src/test/resources/logback-test.xml → acrepo-exts-image/src/test/resources/logback-test.xml
View file @ 66a03572
......@@ -7,7 +7,7 @@
</encoder>
</appender>
<logger name="edu.amherst.acdc.image.service" additivity="false" level="INFO">
<logger name="edu.amherst.acdc.exts.image" additivity="false" level="INFO">
<appender-ref ref="STDOUT"/>
</logger>
<logger name="org.apache.camel" additivity="false" level="INFO">
......
acrepo-itests/src/test/java/edu/amherst/acdc/itests/AcrepoServicesIT.java
View file @ 66a03572
......@@ -78,19 +78,19 @@ 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-exts-serialize-xml", "acrepo-image-service",
"acrepo-services-validation", "acrepo-services-jsonld", "acrepo-services-mint",
"acrepo-exts-jsonld", "acrepo-template-mustache", "acrepo-exts-fits",
"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",
"acrepo-libs-jackson", "acrepo-libs-marmotta", "acrepo-services-ldcache",
"acrepo-services-pcdm"),
"acrepo-libs-jackson", "acrepo-libs-marmotta",
"acrepo-services-jsonld", "acrepo-services-ldcache",
"acrepo-services-mint", "acrepo-services-pcdm", "acrepo-services-validation"),
editConfigurationFilePut("etc/edu.amherst.acdc.exts.fits.cfg", "rest.port", fitsPort),
editConfigurationFilePut("etc/edu.amherst.acdc.exts.image.cfg", "rest.port", imagePort),
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.image.service.cfg", "rest.port", imagePort),
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,20 +103,20 @@ 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-services-jsonld")));
assertTrue(featuresService.isInstalled(featuresService.getFeature("acrepo-services-ldcache")));
assertTrue(featuresService.isInstalled(featuresService.getFeature("acrepo-services-mint")));
assertTrue(featuresService.isInstalled(featuresService.getFeature("acrepo-services-pcdm")));
assertTrue(featuresService.isInstalled(featuresService.getFeature("acrepo-services-validation")));
assertTrue(featuresService.isInstalled(featuresService.getFeature("acrepo-exts-fits")));
assertTrue(featuresService.isInstalled(featuresService.getFeature("acrepo-exts-image")));
assertTrue(featuresService.isInstalled(featuresService.getFeature("acrepo-exts-jsonld")));
assertTrue(featuresService.isInstalled(featuresService.getFeature("acrepo-exts-serialize-xml")));
assertTrue(featuresService.isInstalled(featuresService.getFeature("acrepo-template-mustache")));
assertTrue(featuresService.isInstalled(featuresService.getFeature("acrepo-image-service")));
assertTrue(featuresService.isInstalled(featuresService.getFeature("acrepo-libs-sesame")));
assertTrue(featuresService.isInstalled(featuresService.getFeature("acrepo-libs-marmotta")));
assertTrue(featuresService.isInstalled(featuresService.getFeature("acrepo-libs-jena")));
assertTrue(featuresService.isInstalled(featuresService.getFeature("acrepo-libs-jsonld")));
assertTrue(featuresService.isInstalled(featuresService.getFeature("acrepo-libs-jackson")));
assertTrue(featuresService.isInstalled(featuresService.getFeature("acrepo-services-jsonld")));
assertTrue(featuresService.isInstalled(featuresService.getFeature("acrepo-services-ldcache")));
assertTrue(featuresService.isInstalled(featuresService.getFeature("acrepo-services-mint")));
assertTrue(featuresService.isInstalled(featuresService.getFeature("acrepo-services-pcdm")));
assertTrue(featuresService.isInstalled(featuresService.getFeature("acrepo-services-validation")));
}
}
acrepo-karaf/src/main/resources/features.xml
View file @ 66a03572
......@@ -39,7 +39,7 @@
<configfile finalname="/etc/org.ops4j.datasource-idiomatic.cfg">mvn:edu.amherst.acdc/acrepo-idiomatic-pgsql/${project.version}/cfg/configuration</configfile>
</feature>
<feature name="acrepo-image-service" version="${project.version}">
<feature name="acrepo-exts-image" version="${project.version}">
<details>Installs the image service</details>
<feature version="${camel.version}">camel</feature>
......@@ -48,9 +48,9 @@
<feature version="${camel.version}">camel-http4</feature>
<feature version="${camel.version}">camel-exec</feature>
<bundle>mvn:edu.amherst.acdc/acrepo-image-service/${project.version}</bundle>
<bundle>mvn:edu.amherst.acdc/acrepo-exts-image/${project.version}</bundle>
<configfile finalname="/etc/edu.amherst.acdc.image.service.cfg">mvn:edu.amherst.acdc/acrepo-image-service/${project.version}/cfg/configuration</configfile>
<configfile finalname="/etc/edu.amherst.acdc.exts.image.cfg">mvn:edu.amherst.acdc/acrepo-exts-image/${project.version}/cfg/configuration</configfile>
</feature>
<feature name="acrepo-services-ldcache" version="${project.version}">
......
pom.xml
View file @ 66a03572
......@@ -108,7 +108,10 @@
<modules>
<module>acrepo-idiomatic-pgsql</module>
<module>acrepo-idiomatic</module>
<module>acrepo-image-service</module>
<module>acrepo-exts-fits</module>
<module>acrepo-exts-image</module>
<module>acrepo-exts-jsonld</module>
<module>acrepo-exts-serialize-xml</module>
<module>acrepo-karaf</module>
<module>acrepo-services-jsonld</module>
<module>acrepo-services-ldcache</module>
......@@ -117,9 +120,6 @@
<module>acrepo-services-pcdm</module>
<module>acrepo-services-validation</module>
<module>acrepo-template-mustache</module>
<module>acrepo-exts-fits</module>
<module>acrepo-exts-jsonld</module>
<module>acrepo-exts-serialize-xml</module>
</modules>
<dependencyManagement>
......
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