Commit 1dae35d0 authored by bseeger's avatar bseeger
Browse files

Renames module from acrepo-fits-rest to acrepo-exts-fits

parent db6d8e51
......@@ -11,7 +11,7 @@ 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-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-xml-metadata`: This service translates Fedora RDF documents into MODS/XML or DC/XML
......@@ -61,11 +61,11 @@ 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-fits-rest
feature:install acrepo-exts-fits
feature:install acrepo-exts-jsonld
feature:install acrepo-idiomatic
feature:install acrepo-idiomatic-pgsql
feature:install acrepo-image-service
feature:install acrepo-exts-jsonld
feature:install acrepo-services-mint
feature:install acrepo-services-jsonld
feature:install acrepo-services-ldcache
......
......@@ -19,5 +19,39 @@ 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-fits-rest
feature:install acrepo-exts-fits
Configuration
-------------
The application can be configured by creating the following configuration
file `KARAF_HOME/etc/edu.amherst.acdc.exts.fits.cfg`. The following values
are available for configuration:
The base URL of the Fedora repository and any authentication parameters
fcrepo.baseUrl=localhost:8080/fcrepo/rest
fcrepo.authHost=
fcrepo.authUsername=
fcrepo.password=
The prefix for the service
rest.prefix=/fits
The port on which the service is made available
rest.port=9601
The hostname on which the service is available
rest.host=localhost
The endpoint on which the FITS server is located
fits.endpoint=localhost:8080/fits
By editing this file, any currently running routes will be immediately redeployed
with the new values.
For more help see the [Apache Camel](http://camel.apache.org) documentation
......@@ -8,14 +8,14 @@
<version>1.0.1-SNAPSHOT</version>
</parent>
<artifactId>acrepo-fits-rest</artifactId>
<artifactId>acrepo-exts-fits</artifactId>
<packaging>bundle</packaging>
<name>FITS service bundle</name>
<description>Repository FITS service, which will retrieve FITS information associated with a NonRdfSource located in a Fedora Repository.</description>
<properties>
<osgi.export.packages>edu.amherst.acdc.fits.rest;version=${project.version}</osgi.export.packages>
<osgi.export.packages>edu.amherst.acdc.exts.fits;version=${project.version}</osgi.export.packages>
</properties>
<dependencies>
......@@ -109,7 +109,7 @@
<configuration>
<artifacts>
<artifact>
<file>src/main/cfg/edu.amherst.acdc.fits.rest.cfg</file>
<file>src/main/cfg/edu.amherst.acdc.exts.fits.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.fits.rest;
package edu.amherst.acdc.exts.fits;
import static org.apache.camel.Exchange.CONTENT_TYPE;
import static org.apache.camel.Exchange.HTTP_METHOD;
......
......@@ -7,7 +7,7 @@
http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.1.0 http://aries.apache.org/schemas/blueprint-cm/blueprint-cm-1.1.0.xsd" >
<!-- OSGi blueprint property placeholder -->
<cm:property-placeholder id="properties" persistent-id="edu.amherst.acdc.fits.rest" update-strategy="reload">
<cm:property-placeholder id="properties" persistent-id="edu.amherst.acdc.exts.fits" update-strategy="reload">
<cm:default-properties>
<cm:property name="fcrepo.baseUrl" value="localhost:8080/fcrepo/rest"/>
<cm:property name="fcrepo.authHost" value=""/>
......@@ -22,7 +22,7 @@
<camelContext id="FitsService" xmlns="http://camel.apache.org/schema/blueprint">
<package>edu.amherst.acdc.fits.rest</package>
<package>edu.amherst.acdc.exts.fits</package>
</camelContext>
......
......@@ -7,7 +7,7 @@
</encoder>
</appender>
<logger name="edu.amherst.acdc.fits.rest" additivity="false" level="INFO">
<logger name="edu.amherst.acdc.exts.fits" additivity="false" level="INFO">
<appender-ref ref="STDOUT"/>
</logger>
<logger name="org.apache.camel" additivity="false" level="INFO">
......
......@@ -76,7 +76,7 @@ public class AcrepoFitsIT extends AbstractOSGiIT {
.versionAsInProject().classifier("features").type("xml"), "scr"),
features(maven().groupId("edu.amherst.acdc").artifactId("acrepo-karaf")
.type("xml").classifier("features").versionAsInProject(),
"acrepo-fits-rest"),
"acrepo-exts-fits"),
systemProperty("karaf.fits.port").value(fitsServicePort),
systemProperty("fcrepo.port").value(fcrepoPort),
......@@ -84,8 +84,8 @@ public class AcrepoFitsIT extends AbstractOSGiIT {
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),
editConfigurationFilePut("etc/edu.amherst.acdc.fits.rest.cfg", "fcrepo.baseUrl", fcrepoBaseUrl),
editConfigurationFilePut("etc/edu.amherst.acdc.fits.rest.cfg", "rest.port", fitsServicePort)
editConfigurationFilePut("etc/edu.amherst.acdc.exts.fits.cfg", "fcrepo.baseUrl", fcrepoBaseUrl),
editConfigurationFilePut("etc/edu.amherst.acdc.exts.fits.cfg", "rest.port", fitsServicePort)
};
}
......@@ -95,7 +95,7 @@ public class AcrepoFitsIT extends AbstractOSGiIT {
assertTrue(featuresService.isInstalled(featuresService.getFeature("camel-blueprint")));
assertTrue(featuresService.isInstalled(featuresService.getFeature("camel-jetty9")));
assertTrue(featuresService.isInstalled(featuresService.getFeature("camel-http4")));
assertTrue(featuresService.isInstalled(featuresService.getFeature("acrepo-fits-rest")));
assertTrue(featuresService.isInstalled(featuresService.getFeature("acrepo-exts-fits")));
}
@Test
......
......@@ -80,16 +80,16 @@ public class AcrepoServicesIT extends AbstractOSGiIT {
.type("xml").classifier("features").versionAsInProject(), "acrepo-idiomatic",
"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-exts-jsonld", "acrepo-template-mustache", "acrepo-exts-fits",
"acrepo-libs-jena", "acrepo-libs-sesame", "acrepo-libs-jsonld",
"acrepo-libs-jackson", "acrepo-libs-marmotta", "acrepo-services-ldcache"),
editConfigurationFilePut("etc/edu.amherst.acdc.exts.fits.cfg", "rest.port", fitsPort),
editConfigurationFilePut("etc/edu.amherst.acdc.exts.jsonld.cfg", "rest.port", jsonldPort),
editConfigurationFilePut("etc/edu.amherst.acdc.template.mustache.cfg", "rest.port", templatePort),
editConfigurationFilePut("etc/edu.amherst.acdc.xml.metadata.cfg", "rest.port", metadataPort),
editConfigurationFilePut("etc/edu.amherst.acdc.idiomatic.cfg", "rest.port", idiomaticPort),
editConfigurationFilePut("etc/edu.amherst.acdc.image.service.cfg", "rest.port", imagePort),
editConfigurationFilePut("etc/edu.amherst.acdc.fits.rest.cfg", "rest.port", fitsPort),
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)
......@@ -107,10 +107,10 @@ public class AcrepoServicesIT extends AbstractOSGiIT {
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-exts-fits")));
assertTrue(featuresService.isInstalled(featuresService.getFeature("acrepo-exts-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")));
assertTrue(featuresService.isInstalled(featuresService.getFeature("acrepo-libs-sesame")));
assertTrue(featuresService.isInstalled(featuresService.getFeature("acrepo-libs-marmotta")));
assertTrue(featuresService.isInstalled(featuresService.getFeature("acrepo-libs-jena")));
......
......@@ -136,7 +136,7 @@
<configfile finalname="/etc/edu.amherst.acdc.template.mustache.cfg">mvn:edu.amherst.acdc/acrepo-template-mustache/${project.version}/cfg/configuration</configfile>
</feature>
<feature name="acrepo-fits-rest" version="${project.version}">
<feature name="acrepo-exts-fits" version="${project.version}">
<details>Installs a FITS RESTful service</details>
<feature version="${camel.version}">camel</feature>
......@@ -144,9 +144,9 @@
<feature version="${camel.version}">camel-jetty9</feature>
<feature version="${camel.version}">camel-http4</feature>
<bundle>mvn:edu.amherst.acdc/acrepo-fits-rest/${project.version}</bundle>
<bundle>mvn:edu.amherst.acdc/acrepo-exts-fits/${project.version}</bundle>
<configfile finalname="/etc/edu.amherst.acdc.fits.rest.cfg">mvn:edu.amherst.acdc/acrepo-fits-rest/${project.version}/cfg/configuration</configfile>
<configfile finalname="/etc/edu.amherst.acdc.exts.fits.cfg">mvn:edu.amherst.acdc/acrepo-exts-fits/${project.version}/cfg/configuration</configfile>
</feature>
<feature name="acrepo-libs-jena" version="${project.version}">
......
......@@ -117,7 +117,7 @@
<module>acrepo-xml-metadata</module>
<module>acrepo-exts-jsonld</module>
<module>acrepo-template-mustache</module>
<module>acrepo-fits-rest</module>
<module>acrepo-exts-fits</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