Commit db6d8e51 authored by bseeger's avatar bseeger
Browse files

Merge branch 'rename_libs' into 'master'

rename feature libs to match naming conventions

This renames the feature libs and updates some documentation along the way

See merge request !30
parents beced425 a731c2c3
......@@ -5,19 +5,46 @@ Amherst College Repository Services
This is a collection of OSGi services that extend the functionality of a Fedora4 repository.
Services
--------
Extensions
----------
These modules extend the behavior of Fedora resources. Specifically, they connect Fedora Resources to specific services
by making available a REST-based HTTP interface.
* `acrepo-fits-rest`: This service will return FITS information associated with a Fedora Binary, in XML format
* `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-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-xml-metadata`: This service translates Fedora RDF documents into MODS/XML or DC/XML
Services
--------
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-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
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-pgsql`: Id Mapping Service Database: This exposes a Postgres datastore for use with the Id Mapping service
Other OSGi Features
-------------------
In addition to what is listed above, a number of Karaf features are made available to make it easier to install
sets of related bundles in an OSGi container.
* `acrepo-libs-jena`: The Jena 3.x libraries
* `acrepo-libs-marmotta`: The Marmotta libraries
* `acrepo-libs-sesame`: The Sesame 2.x libraries
* `acrepo-libs-jackson`: The Jackson JSON libraries
* `acrepo-libs-jsonld`: The JSON-LD libraries
Building
--------
......
......@@ -67,7 +67,7 @@ public class AcrepoJenaLibsIT extends AbstractOSGiIT {
features(maven().groupId("org.apache.karaf.features").artifactId("standard")
.versionAsInProject().classifier("features").type("xml"), "scr"),
features(maven().groupId("edu.amherst.acdc").artifactId("acrepo-karaf")
.type("xml").classifier("features").versionAsInProject(), "acrepo-jena-libs"),
.type("xml").classifier("features").versionAsInProject(), "acrepo-libs-jena"),
editConfigurationFilePut("etc/org.apache.karaf.management.cfg", "rmiRegistryPort", rmiRegistryPort),
editConfigurationFilePut("etc/org.apache.karaf.management.cfg", "rmiServerPort", rmiServerPort),
......@@ -77,7 +77,7 @@ public class AcrepoJenaLibsIT extends AbstractOSGiIT {
@Test
public void testInstallation() throws Exception {
assertTrue(featuresService.isInstalled(featuresService.getFeature("acrepo-jena-libs")));
assertTrue(featuresService.isInstalled(featuresService.getFeature("acrepo-jsonld-libs")));
assertTrue(featuresService.isInstalled(featuresService.getFeature("acrepo-libs-jena")));
assertTrue(featuresService.isInstalled(featuresService.getFeature("acrepo-libs-jsonld")));
}
}
......@@ -67,7 +67,7 @@ public class AcrepoJsonLdLibsIT extends AbstractOSGiIT {
features(maven().groupId("org.apache.karaf.features").artifactId("standard")
.versionAsInProject().classifier("features").type("xml"), "scr"),
features(maven().groupId("edu.amherst.acdc").artifactId("acrepo-karaf")
.type("xml").classifier("features").versionAsInProject(), "acrepo-jsonld-libs"),
.type("xml").classifier("features").versionAsInProject(), "acrepo-libs-jsonld"),
editConfigurationFilePut("etc/org.apache.karaf.management.cfg", "rmiRegistryPort", rmiRegistryPort),
editConfigurationFilePut("etc/org.apache.karaf.management.cfg", "rmiServerPort", rmiServerPort),
......@@ -77,6 +77,6 @@ public class AcrepoJsonLdLibsIT extends AbstractOSGiIT {
@Test
public void testInstallation() throws Exception {
assertTrue(featuresService.isInstalled(featuresService.getFeature("acrepo-jsonld-libs")));
assertTrue(featuresService.isInstalled(featuresService.getFeature("acrepo-libs-jsonld")));
}
}
......@@ -81,8 +81,8 @@ public class AcrepoServicesIT extends AbstractOSGiIT {
"acrepo-idiomatic-pgsql", "acrepo-xml-metadata", "acrepo-image-service",
"acrepo-services-validation", "acrepo-services-jsonld", "acrepo-services-mint",
"acrepo-exts-jsonld", "acrepo-template-mustache", "acrepo-fits-rest",
"acrepo-jena-libs", "acrepo-sesame-libs", "acrepo-jsonld-libs",
"acrepo-jackson-libs", "acrepo-marmotta-libs", "acrepo-services-ldcache"),
"acrepo-libs-jena", "acrepo-libs-sesame", "acrepo-libs-jsonld",
"acrepo-libs-jackson", "acrepo-libs-marmotta", "acrepo-services-ldcache"),
editConfigurationFilePut("etc/edu.amherst.acdc.exts.jsonld.cfg", "rest.port", jsonldPort),
editConfigurationFilePut("etc/edu.amherst.acdc.template.mustache.cfg", "rest.port", templatePort),
......@@ -111,10 +111,10 @@ public class AcrepoServicesIT extends AbstractOSGiIT {
assertTrue(featuresService.isInstalled(featuresService.getFeature("acrepo-template-mustache")));
assertTrue(featuresService.isInstalled(featuresService.getFeature("acrepo-image-service")));
assertTrue(featuresService.isInstalled(featuresService.getFeature("acrepo-fits-rest")));
assertTrue(featuresService.isInstalled(featuresService.getFeature("acrepo-sesame-libs")));
assertTrue(featuresService.isInstalled(featuresService.getFeature("acrepo-marmotta-libs")));
assertTrue(featuresService.isInstalled(featuresService.getFeature("acrepo-jena-libs")));
assertTrue(featuresService.isInstalled(featuresService.getFeature("acrepo-jsonld-libs")));
assertTrue(featuresService.isInstalled(featuresService.getFeature("acrepo-jackson-libs")));
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")));
}
}
......@@ -58,7 +58,7 @@
<bundle>mvn:edu.amherst.acdc/acrepo-services-ldcache/${project.version}</bundle>
<feature version="${project.version}">acrepo-marmotta-libs</feature>
<feature version="${project.version}">acrepo-libs-marmotta</feature>
<configfile finalname="/etc/edu.amherst.acdc.services.ldcache.cfg">mvn:edu.amherst.acdc/acrepo-services-ldcache/${project.version}/cfg/configuration</configfile>
</feature>
......@@ -76,7 +76,7 @@
<feature name="acrepo-services-validation" version="${project.version}">
<details>Installs the validation service</details>
<feature version="${project.version}">acrepo-jena-libs</feature>
<feature version="${project.version}">acrepo-libs-jena</feature>
<bundle>mvn:edu.amherst.acdc/acrepo-services-validation/${project.version}</bundle>
......@@ -100,7 +100,7 @@
<feature name="acrepo-services-jsonld" version="${project.version}">
<details>Installs the JSON-LD transformation OSGi service</details>
<feature version="${project.version}">acrepo-jsonld-libs</feature>
<feature version="${project.version}">acrepo-libs-jsonld</feature>
<bundle>mvn:edu.amherst.acdc/acrepo-services-jsonld/${project.version}</bundle>
</feature>
......@@ -149,10 +149,10 @@
<configfile finalname="/etc/edu.amherst.acdc.fits.rest.cfg">mvn:edu.amherst.acdc/acrepo-fits-rest/${project.version}/cfg/configuration</configfile>
</feature>
<feature name="acrepo-jena-libs" version="${project.version}">
<feature name="acrepo-libs-jena" version="${project.version}">
<details>Installs jena and related dependencies</details>
<feature version="${project.version}" dependency="true">acrepo-jsonld-libs</feature>
<feature version="${project.version}" dependency="true">acrepo-libs-jsonld</feature>
<bundle>mvn:org.apache.jena/jena-osgi/${jena.version}</bundle>
......@@ -162,11 +162,11 @@
<bundle dependency="true">mvn:com.github.andrewoma.dexx/collection/${dexx.version}</bundle>
</feature>
<feature name="acrepo-sesame-libs" version="${project.version}">
<feature name="acrepo-libs-sesame" version="${project.version}">
<details>Installs the OpenRDF libraries</details>
<feature prerequisite="true" dependency="false">wrap</feature>
<feature version="${project.version}" dependency="true">acrepo-jackson-libs</feature>
<feature version="${project.version}" dependency="true">acrepo-libs-jackson</feature>
<bundle>wrap:mvn:org.openrdf.sesame/sesame-repository-event/${sesame.version}</bundle>
<bundle>wrap:mvn:org.openrdf.sesame/sesame-sail-memory/${sesame.version}</bundle>
......@@ -205,12 +205,12 @@
<bundle dependency="true">mvn:commons-io/commons-io/${commons-io.version}</bundle>
</feature>
<feature name="acrepo-marmotta-libs" version="${project.version}">
<feature name="acrepo-libs-marmotta" version="${project.version}">
<details>Installs the Marmotta libraries</details>
<feature version="${project.version}" dependency="true">acrepo-sesame-libs</feature>
<feature version="${project.version}" dependency="true">acrepo-jsonld-libs</feature>
<feature version="${project.version}" dependency="true">acrepo-jackson-libs</feature>
<feature version="${project.version}" dependency="true">acrepo-libs-sesame</feature>
<feature version="${project.version}" dependency="true">acrepo-libs-jsonld</feature>
<feature version="${project.version}" dependency="true">acrepo-libs-jackson</feature>
<bundle>mvn:org.apache.marmotta/ldcache-api/${marmotta.version}</bundle>
......@@ -249,12 +249,12 @@
<bundle dependency="true">${wrapped.bundle.location}/org.semarglproject.semargl-sesame-${semargl.version}.jar</bundle>
</feature>
<feature name="acrepo-jsonld-libs" version="${project.version}">
<feature name="acrepo-libs-jsonld" version="${project.version}">
<details>Installs the JSON-LD related bundles</details>
<bundle>mvn:com.github.jsonld-java/jsonld-java/${jsonld.version}</bundle>
<feature version="${project.version}" dependency="true">acrepo-jackson-libs</feature>
<feature version="${project.version}" dependency="true">acrepo-libs-jackson</feature>
<bundle dependency="true">mvn:org.apache.httpcomponents/httpclient-osgi/${httpclient.version}</bundle>
<bundle dependency="true">mvn:org.apache.httpcomponents/httpcore-osgi/${httpcore.version}</bundle>
......@@ -262,7 +262,7 @@
<bundle dependency="true">mvn:commons-io/commons-io/${commons-io.version}</bundle>
</feature>
<feature name="acrepo-jackson-libs" version="${project.version}">
<feature name="acrepo-libs-jackson" version="${project.version}">
<details>Installs the Jackson Libraries</details>
<bundle>mvn:com.fasterxml.jackson.core/jackson-core/${jackson2.version}</bundle>
......
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