Commit cd7ae112 authored by bseeger's avatar bseeger
Browse files

Merge branch 'cleanup' into 'master'

add API-X configuration options to .cfg files; add a better OSGi wait step for LDCache service

After these changes, I think we can cut a 1.0.9 release.

See merge request !90
parents 741cd529 1af43eed
......@@ -11,3 +11,8 @@ rest.host=localhost
# The endpoint for the FITS server
fits.endpoint=localhost:8080/fits/examine
# API-X configuration
extension.load=true
extension.load.uri=http://apix/services//apix:load
extension.load.maximumRedeliveries=60
......@@ -13,3 +13,8 @@ valid.formats=jpeg,jp2,tiff
fcrepo.baseUrl=localhost:8080/fcrepo/rest
fcrepo.authUsername=
fcrepo.authPassword=
# API-X configuration
extension.load=true
extension.load.uri=http://apix/services//apix:load
extension.load.maximumRedeliveries=60
......@@ -9,3 +9,7 @@ pcdm.concurrency=10
# Repository Base URL (it MUST start with http:// or https://)
fcrepo.baseUrl=http://localhost:8080/fcrepo/rest
# API-X configuration
extension.load=true
extension.load.uri=http://apix/services//apix:load
extension.load.maximumRedeliveries=60
......@@ -8,3 +8,8 @@ fcrepo.baseUrl=http://localhost:8080/fcrepo/rest
# The location of the XSLT to convert RDF/XML to MODS/XML and DC/XML
mods.xslt=edu/amherst/acdc/exts/serialize/xml/rdf2mods.xsl
dc.xslt=edu/amherst/acdc/exts/serialize/xml/rdf2dc.xsl
# API-X configuration
extension.load=true
extension.load.uri=http://apix/services//apix:load
extension.load.maximumRedeliveries=60
......@@ -18,3 +18,7 @@ mustache.templateUri=edu/amherst/acdc/exts/template/template.mustache
# The json+ld context file
ldpath.serviceUrl=http://localhost:9086/ldpath
# API-X configuration
extension.load=true
extension.load.uri=http://apix/services//apix:load
extension.load.maximumRedeliveries=60
......@@ -70,6 +70,7 @@ dependencies {
testCompile group: 'org.ops4j.pax.exam', name: 'pax-exam-junit4', version: paxExamVersion
testCompile group: 'org.ops4j.pax.exam', name: 'pax-exam-container-karaf', version: paxExamVersion
testCompile group: 'org.apache.karaf.features', name: 'org.apache.karaf.features.core', version: karafVersion
testCompile group: 'org.apache.marmotta', name: 'ldcache-api', version: marmottaVersion
testCompile(group: 'org.fcrepo.camel', name: 'fcrepo-camel', version: fcrepoCamelVersion) {
exclude(module: 'slf4j-log4j12')
}
......
......@@ -31,6 +31,7 @@ import static org.slf4j.LoggerFactory.getLogger;
import java.io.File;
import org.apache.camel.CamelContext;
import org.apache.marmotta.ldcache.api.LDCachingBackend;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Configuration;
......@@ -111,13 +112,11 @@ public class AcrepoTemplateIT extends AbstractOSGiIT {
// make sure that the camel context has started up.
assertNotNull(getOsgiService(CamelContext.class, "(camel.context.name=AcrepoTemplateService)", 10000));
assertNotNull(getOsgiService(CamelContext.class, "(camel.context.name=AcrepoLDPathContext)", 10000));
assertNotNull(getOsgiService(LDCachingBackend.class, "(osgi.jndi.service.name=fcrepo/LDCacheBackend)", 20000));
final String baseUrl = "http://localhost:" + System.getProperty("fcrepo.port") + "/fcrepo/rest";
final String baseSvcUrl = "http://localhost:" + System.getProperty("karaf.template.port") + "/template";
// Wait 10 seconds
Thread.sleep(10000);
assertTrue(options(baseSvcUrl).contains("apix:bindsTo fedora:Resource"));
range(1, 2).mapToObj(x -> post(baseUrl)).forEach(url -> {
......
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