Commit bb525efa authored by bseeger's avatar bseeger
Browse files

Renames acrepo-template-mustache to acrepo-exts-template

parent 360a474e
......@@ -16,7 +16,7 @@ by making available a REST-based HTTP interface. The intention is that these ext
* `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.
* `acrepo-exts-template`: A module for converting Fedora resources into some other form, using a [mustache](https://mustache.github.io/) template.
Services
--------
......@@ -73,7 +73,7 @@ command from its shell:
feature:install acrepo-exts-image
feature:install acrepo-exts-jsonld
feature:install acrepo-exts-serialize-xml
feature:install acrepo-template-mustache
feature:install acrepo-exts-template
feature:install acrepo-services-jsonld
feature:install acrepo-services-ldcache
feature:install acrepo-services-ldcache-file
......
......@@ -23,13 +23,13 @@ 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-template-mustache
feature:install acrepo-exts-template
Configuration
-------------
The application can be configured by creating the following configuration
file `$KARAF_HOME/etc/edu.amherst.acdc.template.mustache.cfg`. The following values
file `$KARAF_HOME/etc/edu.amherst.acdc.exts.template.cfg`. The following values
are available for configuration:
In the event of failure, the maximum number of times a redelivery will be attempted.
......@@ -54,7 +54,7 @@ The fedora baseUrl value
The location of the mustache template
mustache.template=edu/amherst/acdc/template/mustache/template.mustache
mustache.template=edu/amherst/acdc/exts/template/mustache/template.mustache
The content-type of the rendered template
......
......@@ -9,13 +9,13 @@
<version>1.0.1-SNAPSHOT</version>
</parent>
<artifactId>acrepo-template-mustache</artifactId>
<artifactId>acrepo-exts-template</artifactId>
<packaging>bundle</packaging>
<name>A template rendering service, based on JSON-LD documents</name>
<properties>
<osgi.export.packages>edu.amherst.acdc.template.mustache;version=${project.version}</osgi.export.packages>
<osgi.export.packages>edu.amherst.acdc.exts.template;version=${project.version}</osgi.export.packages>
</properties>
<dependencies>
......@@ -109,7 +109,7 @@
<configuration>
<artifacts>
<artifact>
<file>src/main/cfg/edu.amherst.acdc.template.mustache.cfg</file>
<file>src/main/cfg/edu.amherst.acdc.exts.template.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.template.mustache;
package edu.amherst.acdc.exts.template;
import static org.apache.camel.Exchange.CONTENT_TYPE;
import static org.apache.camel.Exchange.HTTP_METHOD;
......
......@@ -8,13 +8,13 @@
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.template.mustache" update-strategy="reload">
<cm:property-placeholder persistent-id="edu.amherst.acdc.exts.template" update-strategy="reload">
<cm:default-properties>
<cm:property name="error.maxRedeliveries" value="10"/>
<cm:property name="rest.host" value="localhost"/>
<cm:property name="rest.port" value="9103"/>
<cm:property name="rest.prefix" value="/template"/>
<cm:property name="mustache.template" value="edu/amherst/acdc/template/mustache/template.mustache"/>
<cm:property name="mustache.template" value="edu/amherst/acdc/exts/template/mustache/template.mustache"/>
<cm:property name="mustache.contentType" value="text/html"/>
<cm:property name="jsonld.context" value="https://acdc.amherst.edu/jsonld/models.json"/>
<cm:property name="fcrepo.baseUrl" value="localhost:8080/fcrepo/rest"/>
......@@ -24,7 +24,7 @@
<reference id="jsonldService" interface="edu.amherst.acdc.services.jsonld.JsonLdService" filter="(osgi.jndi.service.name=jsonld)" />
<camelContext id="AcrepoTemplateService" xmlns="http://camel.apache.org/schema/blueprint" streamCache="false">
<package>edu.amherst.acdc.template.mustache</package>
<package>edu.amherst.acdc.exts.template</package>
<route id="JsonLdCompaction">
<from uri="direct:compact"/>
......
......@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package edu.amherst.acdc.template.mustache;
package edu.amherst.acdc.exts.template;
import org.apache.camel.EndpointInject;
import org.apache.camel.Produce;
......
......@@ -7,7 +7,7 @@
</encoder>
</appender>
<logger name="edu.amherst.acdc.template.mustache" additivity="false" level="INFO">
<logger name="edu.amherst.acdc.exts.template" additivity="false" level="INFO">
<appender-ref ref="STDOUT"/>
</logger>
<logger name="org.apache.camel" additivity="false" level="INFO">
......
......@@ -79,7 +79,7 @@ public class AcrepoServicesIT extends AbstractOSGiIT {
features(maven().groupId("edu.amherst.acdc").artifactId("acrepo-karaf")
.type("xml").classifier("features").versionAsInProject(), "acrepo-connector-idiomatic",
"acrepo-connector-idiomatic-pgsql", "acrepo-exts-fits", "acrepo-exts-image",
"acrepo-exts-jsonld", "acrepo-exts-serialize-xml", "acrepo-template-mustache",
"acrepo-exts-jsonld", "acrepo-exts-serialize-xml", "acrepo-exts-template",
"acrepo-libs-jena", "acrepo-libs-sesame", "acrepo-libs-jsonld",
"acrepo-libs-jackson", "acrepo-libs-marmotta",
"acrepo-services-jsonld", "acrepo-services-ldcache",
......@@ -90,7 +90,7 @@ public class AcrepoServicesIT extends AbstractOSGiIT {
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.exts.template.cfg", "rest.port", templatePort),
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),
......@@ -109,12 +109,12 @@ public class AcrepoServicesIT extends AbstractOSGiIT {
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-libs-sesame")));
assertTrue(featuresService.isInstalled(featuresService.getFeature("acrepo-libs-marmotta")));
assertTrue(featuresService.isInstalled(featuresService.getFeature("acrepo-exts-template")));
assertTrue(featuresService.isInstalled(featuresService.getFeature("acrepo-libs-jackson")));
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-libs-marmotta")));
assertTrue(featuresService.isInstalled(featuresService.getFeature("acrepo-libs-sesame")));
assertTrue(featuresService.isInstalled(featuresService.getFeature("acrepo-services-jsonld")));
assertTrue(featuresService.isInstalled(featuresService.getFeature("acrepo-services-ldcache")));
assertTrue(featuresService.isInstalled(featuresService.getFeature("acrepo-services-mint")));
......
......@@ -75,7 +75,7 @@ public class AcrepoTemplateIT extends AbstractOSGiIT {
.versionAsInProject().classifier("features").type("xml"), "scr"),
features(maven().groupId("edu.amherst.acdc").artifactId("acrepo-karaf")
.type("xml").classifier("features").versionAsInProject(),
"acrepo-template-mustache", "acrepo-services-jsonld"),
"acrepo-exts-template", "acrepo-services-jsonld"),
systemProperty("karaf.template.port").value(templateServicePort),
systemProperty("fcrepo.port").value(fcrepoPort),
......@@ -83,8 +83,8 @@ public class AcrepoTemplateIT 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.template.mustache.cfg", "fcrepo.baseUrl", fcrepoBaseUrl),
editConfigurationFilePut("etc/edu.amherst.acdc.template.mustache.cfg", "rest.port", templateServicePort)
editConfigurationFilePut("etc/edu.amherst.acdc.exts.template.cfg", "fcrepo.baseUrl", fcrepoBaseUrl),
editConfigurationFilePut("etc/edu.amherst.acdc.exts.template.cfg", "rest.port", templateServicePort)
};
}
......@@ -92,7 +92,7 @@ public class AcrepoTemplateIT extends AbstractOSGiIT {
public void testInstallation() throws Exception {
assertTrue(featuresService.isInstalled(featuresService.getFeature("camel-core")));
assertTrue(featuresService.isInstalled(featuresService.getFeature("fcrepo-camel")));
assertTrue(featuresService.isInstalled(featuresService.getFeature("acrepo-template-mustache")));
assertTrue(featuresService.isInstalled(featuresService.getFeature("acrepo-exts-template")));
assertTrue(featuresService.isInstalled(featuresService.getFeature("acrepo-services-jsonld")));
}
......
......@@ -139,7 +139,7 @@
<configfile finalname="/etc/edu.amherst.acdc.exts.jsonld.cfg">mvn:edu.amherst.acdc/acrepo-exts-jsonld/${project.version}/cfg/configuration</configfile>
</feature>
<feature name="acrepo-template-mustache" version="${project.version}">
<feature name="acrepo-exts-template" version="${project.version}">
<details>Installs a sample JSON-LD-based template rendering service</details>
<feature version="${camel.version}">camel</feature>
......@@ -151,9 +151,9 @@
<feature version="${fcrepo-camel.version}">fcrepo-camel</feature>
<feature version="${project.version}">acrepo-services-jsonld</feature>
<bundle>mvn:edu.amherst.acdc/acrepo-template-mustache/${project.version}</bundle>
<bundle>mvn:edu.amherst.acdc/acrepo-exts-template/${project.version}</bundle>
<configfile finalname="/etc/edu.amherst.acdc.template.mustache.cfg">mvn:edu.amherst.acdc/acrepo-template-mustache/${project.version}/cfg/configuration</configfile>
<configfile finalname="/etc/edu.amherst.acdc.exts.template.cfg">mvn:edu.amherst.acdc/acrepo-exts-template/${project.version}/cfg/configuration</configfile>
</feature>
<feature name="acrepo-exts-fits" version="${project.version}">
......
......@@ -113,6 +113,7 @@
<module>acrepo-exts-image</module>
<module>acrepo-exts-jsonld</module>
<module>acrepo-exts-serialize-xml</module>
<module>acrepo-exts-template</module>
<module>acrepo-karaf</module>
<module>acrepo-services-jsonld</module>
<module>acrepo-services-ldcache</module>
......@@ -120,7 +121,6 @@
<module>acrepo-services-mint</module>
<module>acrepo-services-pcdm</module>
<module>acrepo-services-validation</module>
<module>acrepo-template-mustache</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