Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
acdc
repository-extension-services
Commits
1af43eed
Commit
1af43eed
authored
Feb 15, 2017
by
acoburn
Browse files
add API-X configuration options to .cfg files; add a better OSGi wait step for LDCache service
parent
741cd529
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
26 additions
and
3 deletions
+26
-3
acrepo-exts-fits/src/main/cfg/edu.amherst.acdc.exts.fits.cfg
acrepo-exts-fits/src/main/cfg/edu.amherst.acdc.exts.fits.cfg
+5
-0
acrepo-exts-image/src/main/cfg/edu.amherst.acdc.exts.image.cfg
...o-exts-image/src/main/cfg/edu.amherst.acdc.exts.image.cfg
+5
-0
acrepo-exts-pcdm/src/main/cfg/edu.amherst.acdc.exts.pcdm.cfg
acrepo-exts-pcdm/src/main/cfg/edu.amherst.acdc.exts.pcdm.cfg
+4
-0
acrepo-exts-serialize-xml/src/main/cfg/edu.amherst.acdc.exts.serialize.xml.cfg
...-xml/src/main/cfg/edu.amherst.acdc.exts.serialize.xml.cfg
+5
-0
acrepo-exts-template/src/main/cfg/edu.amherst.acdc.exts.template.cfg
...-template/src/main/cfg/edu.amherst.acdc.exts.template.cfg
+4
-0
acrepo-itests/build.gradle
acrepo-itests/build.gradle
+1
-0
acrepo-itests/src/test/java/edu/amherst/acdc/itests/AcrepoTemplateIT.java
...c/test/java/edu/amherst/acdc/itests/AcrepoTemplateIT.java
+2
-3
No files found.
acrepo-exts-fits/src/main/cfg/edu.amherst.acdc.exts.fits.cfg
View file @
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
acrepo-exts-image/src/main/cfg/edu.amherst.acdc.exts.image.cfg
View file @
1af43eed
...
...
@@ -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
acrepo-exts-pcdm/src/main/cfg/edu.amherst.acdc.exts.pcdm.cfg
View file @
1af43eed
...
...
@@ -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
acrepo-exts-serialize-xml/src/main/cfg/edu.amherst.acdc.exts.serialize.xml.cfg
View file @
1af43eed
...
...
@@ -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
acrepo-exts-template/src/main/cfg/edu.amherst.acdc.exts.template.cfg
View file @
1af43eed
...
...
@@ -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
acrepo-itests/build.gradle
View file @
1af43eed
...
...
@@ -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'
)
}
...
...
acrepo-itests/src/test/java/edu/amherst/acdc/itests/AcrepoTemplateIT.java
View file @
1af43eed
...
...
@@ -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
->
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment