Commit 60a17dc4 authored by bseeger's avatar bseeger
Browse files

Renames acrepo-jsonld-service to acrepo-exts-jsonld

parent 84f5b9de
......@@ -19,7 +19,7 @@ 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-jsonld-service
feature:install acrepo-exts-jsonld
Or by copying any of the compiled bundles into `$KARAF_HOME/deploy`.
......@@ -27,7 +27,7 @@ Configuration
-------------
The application can be configured by creating the following configuration
file `$KARAF_HOME/etc/edu.amherst.acdc.jsonld.service.cfg`. The following values
file `$KARAF_HOME/etc/edu.amherst.acdc.exts.jsonld.cfg`. The following values
are available for configuration:
In the event of failure, the maximum number of times a redelivery will be attempted.
......
......@@ -9,13 +9,13 @@
<version>1.0.1-SNAPSHOT</version>
</parent>
<artifactId>acrepo-jsonld-service</artifactId>
<artifactId>acrepo-exts-jsonld</artifactId>
<packaging>bundle</packaging>
<name>JSON-LD AppCache Workflow</name>
<properties>
<osgi.export.packages>edu.amherst.acdc.jsonld.service;version=${project.version}</osgi.export.packages>
<osgi.export.packages>edu.amherst.acdc.exts.jsonld;version=${project.version}</osgi.export.packages>
</properties>
<dependencies>
......@@ -80,7 +80,7 @@
<configuration>
<artifacts>
<artifact>
<file>src/main/cfg/edu.amherst.acdc.jsonld.service.cfg</file>
<file>src/main/cfg/edu.amherst.acdc.exts.jsonld.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.jsonld.service;
package edu.amherst.acdc.exts.jsonld;
import static org.apache.camel.Exchange.CONTENT_TYPE;
import static org.apache.camel.Exchange.HTTP_METHOD;
......
......@@ -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.jsonld.service" update-strategy="reload">
<cm:property-placeholder persistent-id="edu.amherst.acdc.exts.jsonld" update-strategy="reload">
<cm:default-properties>
<cm:property name="error.maxRedeliveries" value="10"/>
<cm:property name="rest.port" value="9102"/>
......@@ -22,7 +22,7 @@
<reference id="jsonldService" interface="edu.amherst.acdc.services.jsonld.JsonLdService" filter="(osgi.jndi.service.name=jsonld)" />
<camelContext id="AcrepoJsonLdService" xmlns="http://camel.apache.org/schema/blueprint">
<package>edu.amherst.acdc.jsonld.service</package>
<package>edu.amherst.acdc.exts.jsonld</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.jsonld.service;
package edu.amherst.acdc.exts.jsonld;
import java.util.Dictionary;
import java.util.Map;
......
......@@ -54,7 +54,7 @@
<dependency>
<groupId>edu.amherst.acdc</groupId>
<artifactId>acrepo-jsonld-service</artifactId>
<artifactId>acrepo-exts-jsonld</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
......
......@@ -80,7 +80,7 @@ public class AcrepoJsonLDIT extends AbstractOSGiIT {
.versionAsInProject().classifier("features").type("xml"), "scr"),
features(maven().groupId("edu.amherst.acdc").artifactId("acrepo-karaf")
.type("xml").classifier("features").versionAsInProject(),
"acrepo-jsonld-service", "acrepo-services-jsonld"),
"acrepo-exts-jsonld", "acrepo-services-jsonld"),
mavenBundle().groupId("com.fasterxml.jackson.core").artifactId("jackson-core").versionAsInProject(),
mavenBundle().groupId("com.fasterxml.jackson.core").artifactId("jackson-databind").versionAsInProject(),
......@@ -91,8 +91,8 @@ public class AcrepoJsonLDIT 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.jsonld.service.cfg", "fcrepo.baseUrl", fcrepoBaseUrl),
editConfigurationFilePut("etc/edu.amherst.acdc.jsonld.service.cfg", "rest.port", jsonldServicePort)
editConfigurationFilePut("etc/edu.amherst.acdc.exts.jsonld.cfg", "fcrepo.baseUrl", fcrepoBaseUrl),
editConfigurationFilePut("etc/edu.amherst.acdc.exts.jsonld.cfg", "rest.port", jsonldServicePort)
};
}
......@@ -100,7 +100,7 @@ public class AcrepoJsonLDIT 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-jsonld-service")));
assertTrue(featuresService.isInstalled(featuresService.getFeature("acrepo-exts-jsonld")));
assertTrue(featuresService.isInstalled(featuresService.getFeature("acrepo-services-jsonld")));
}
......
......@@ -80,9 +80,9 @@ 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-jsonld-service", "acrepo-template-mustache", "acrepo-fits-rest"),
"acrepo-exts-jsonld", "acrepo-template-mustache", "acrepo-fits-rest"),
editConfigurationFilePut("etc/edu.amherst.acdc.jsonld.service.cfg", "rest.port", jsonldPort),
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),
......@@ -104,7 +104,7 @@ 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-jsonld-service")));
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")));
......
......@@ -95,7 +95,7 @@
<bundle>mvn:edu.amherst.acdc/acrepo-services-jsonld/${project.version}</bundle>
</feature>
<feature name="acrepo-jsonld-service" version="${project.version}" resolver="(orb)" start-level="50">
<feature name="acrepo-exts-jsonld" version="${project.version}" resolver="(orb)" start-level="50">
<details>Installs a sample JSON-LD transformation workflow</details>
<feature version="${camel.version}">camel</feature>
......@@ -104,9 +104,9 @@
<feature version="${fcrepo-camel.version}">fcrepo-camel</feature>
<feature version="${project.version}">acrepo-services-jsonld</feature>
<bundle>mvn:edu.amherst.acdc/acrepo-jsonld-service/${project.version}</bundle>
<bundle>mvn:edu.amherst.acdc/acrepo-exts-jsonld/${project.version}</bundle>
<configfile finalname="/etc/edu.amherst.acdc.jsonld.service.cfg">mvn:edu.amherst.acdc/acrepo-jsonld-service/${project.version}/cfg/configuration</configfile>
<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}" resolver="(orb)" start-level="50">
......
......@@ -94,7 +94,7 @@
<module>acrepo-services-mint</module>
<module>acrepo-services-validation</module>
<module>acrepo-xml-metadata</module>
<module>acrepo-jsonld-service</module>
<module>acrepo-exts-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