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
75e4e499
Commit
75e4e499
authored
Mar 31, 2017
by
acoburn
Browse files
Disable API-X by default
This disables the loading of API-X extensions by default.
parent
82b39507
Changes
20
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
with
14 additions
and
27 deletions
+14
-27
acrepo-exts-fits/src/main/cfg/edu.amherst.acdc.exts.fits.cfg
acrepo-exts-fits/src/main/cfg/edu.amherst.acdc.exts.fits.cfg
+1
-1
acrepo-exts-fits/src/main/resources/OSGI-INF/blueprint/fits-service.xml
...ts/src/main/resources/OSGI-INF/blueprint/fits-service.xml
+1
-1
acrepo-exts-image/src/main/cfg/edu.amherst.acdc.exts.image.cfg
...o-exts-image/src/main/cfg/edu.amherst.acdc.exts.image.cfg
+1
-1
acrepo-exts-image/src/main/resources/OSGI-INF/blueprint/blueprint.xml
...image/src/main/resources/OSGI-INF/blueprint/blueprint.xml
+1
-1
acrepo-exts-ldpath/src/main/cfg/edu.amherst.acdc.exts.ldpath.cfg
...exts-ldpath/src/main/cfg/edu.amherst.acdc.exts.ldpath.cfg
+1
-1
acrepo-exts-ldpath/src/main/resources/OSGI-INF/blueprint/blueprint.xml
...dpath/src/main/resources/OSGI-INF/blueprint/blueprint.xml
+1
-1
acrepo-exts-ore/src/main/cfg/edu.amherst.acdc.exts.ore.cfg
acrepo-exts-ore/src/main/cfg/edu.amherst.acdc.exts.ore.cfg
+1
-1
acrepo-exts-ore/src/main/resources/OSGI-INF/blueprint/blueprint.xml
...s-ore/src/main/resources/OSGI-INF/blueprint/blueprint.xml
+1
-1
acrepo-exts-pcdm/src/main/cfg/edu.amherst.acdc.exts.pcdm.cfg
acrepo-exts-pcdm/src/main/cfg/edu.amherst.acdc.exts.pcdm.cfg
+1
-1
acrepo-exts-pcdm/src/main/resources/OSGI-INF/blueprint/blueprint.xml
...-pcdm/src/main/resources/OSGI-INF/blueprint/blueprint.xml
+1
-1
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
+1
-1
acrepo-exts-serialize-xml/src/main/resources/OSGI-INF/blueprint/blueprint.xml
...e-xml/src/main/resources/OSGI-INF/blueprint/blueprint.xml
+1
-1
acrepo-exts-template/src/main/cfg/edu.amherst.acdc.exts.template.cfg
...-template/src/main/cfg/edu.amherst.acdc.exts.template.cfg
+1
-1
acrepo-exts-template/src/main/resources/OSGI-INF/blueprint/blueprint.xml
...plate/src/main/resources/OSGI-INF/blueprint/blueprint.xml
+1
-1
acrepo-itests/src/test/java/edu/amherst/acdc/itests/AcrepoExtsSerializeXmlIT.java
...ava/edu/amherst/acdc/itests/AcrepoExtsSerializeXmlIT.java
+0
-1
acrepo-itests/src/test/java/edu/amherst/acdc/itests/AcrepoFitsIT.java
...s/src/test/java/edu/amherst/acdc/itests/AcrepoFitsIT.java
+0
-1
acrepo-itests/src/test/java/edu/amherst/acdc/itests/AcrepoOreIT.java
...ts/src/test/java/edu/amherst/acdc/itests/AcrepoOreIT.java
+0
-1
acrepo-itests/src/test/java/edu/amherst/acdc/itests/AcrepoPcdmIT.java
...s/src/test/java/edu/amherst/acdc/itests/AcrepoPcdmIT.java
+0
-1
acrepo-itests/src/test/java/edu/amherst/acdc/itests/AcrepoServicesIT.java
...c/test/java/edu/amherst/acdc/itests/AcrepoServicesIT.java
+0
-7
acrepo-itests/src/test/java/edu/amherst/acdc/itests/AcrepoTemplateIT.java
...c/test/java/edu/amherst/acdc/itests/AcrepoTemplateIT.java
+0
-2
No files found.
acrepo-exts-fits/src/main/cfg/edu.amherst.acdc.exts.fits.cfg
View file @
75e4e499
...
...
@@ -13,6 +13,6 @@ rest.host=localhost
fits.endpoint=http://localhost:8080/fits/examine
# API-X configuration
extension.load=
tru
e
extension.load=
fals
e
extension.load.uri=http://apix/services//apix:load
extension.load.maximumRedeliveries=60
acrepo-exts-fits/src/main/resources/OSGI-INF/blueprint/fits-service.xml
View file @
75e4e499
...
...
@@ -17,7 +17,7 @@
<cm:property
name=
"rest.host"
value=
"localhost"
/>
<cm:property
name=
"rest.port"
value=
"9106"
/>
<cm:property
name=
"fits.endpoint"
value=
"http://localhost:8080/fits/examine"
/>
<cm:property
name=
"extension.load"
value=
"
tru
e"
/>
<cm:property
name=
"extension.load"
value=
"
fals
e"
/>
<cm:property
name=
"extension.load.uri"
value=
"http://apix/services//apix:load"
/>
<cm:property
name=
"extension.load.maximumRedeliveries"
value=
"60"
/>
</cm:default-properties>
...
...
acrepo-exts-image/src/main/cfg/edu.amherst.acdc.exts.image.cfg
View file @
75e4e499
...
...
@@ -16,6 +16,6 @@ fcrepo.authUsername=
fcrepo.authPassword=
# API-X configuration
extension.load=
tru
e
extension.load=
fals
e
extension.load.uri=http://apix/services//apix:load
extension.load.maximumRedeliveries=60
acrepo-exts-image/src/main/resources/OSGI-INF/blueprint/blueprint.xml
View file @
75e4e499
...
...
@@ -19,7 +19,7 @@
<cm:property
name=
"convert.path"
value=
"convert"
/>
<cm:property
name=
"valid.formats"
value=
"jpeg,jp2,tiff"
/>
<cm:property
name=
"default.format"
value=
"jpeg"
/>
<cm:property
name=
"extension.load"
value=
"
tru
e"
/>
<cm:property
name=
"extension.load"
value=
"
fals
e"
/>
<cm:property
name=
"extension.load.uri"
value=
"http://apix/services//apix:load"
/>
<cm:property
name=
"extension.load.maximumRedeliveries"
value=
"60"
/>
</cm:default-properties>
...
...
acrepo-exts-ldpath/src/main/cfg/edu.amherst.acdc.exts.ldpath.cfg
View file @
75e4e499
...
...
@@ -23,6 +23,6 @@ rest.host=localhost
cache.timeout=86400
# API-X configuration
extension.load=
tru
e
extension.load=
fals
e
extension.load.uri=http://apix/services//apix:load
extension.load.maximumRedeliveries=60
acrepo-exts-ldpath/src/main/resources/OSGI-INF/blueprint/blueprint.xml
View file @
75e4e499
...
...
@@ -22,7 +22,7 @@
<cm:property
name=
"rest.host"
value=
"localhost"
/>
<cm:property
name=
"rest.port"
value=
"9086"
/>
<cm:property
name=
"cache.timeout"
value=
"86400"
/>
<cm:property
name=
"extension.load"
value=
"
tru
e"
/>
<cm:property
name=
"extension.load"
value=
"
fals
e"
/>
<cm:property
name=
"extension.load.uri"
value=
"http://apix/services//apix:load"
/>
<cm:property
name=
"extension.load.maximumRedeliveries"
value=
"60"
/>
</cm:default-properties>
...
...
acrepo-exts-ore/src/main/cfg/edu.amherst.acdc.exts.ore.cfg
View file @
75e4e499
...
...
@@ -12,6 +12,6 @@ fcrepo.authUsername=
fcrepo.authPassword=
# API-X configuration
extension.load=
tru
e
extension.load=
fals
e
extension.load.uri=http://apix/services//apix:load
extension.load.maximumRedeliveries=60
acrepo-exts-ore/src/main/resources/OSGI-INF/blueprint/blueprint.xml
View file @
75e4e499
...
...
@@ -17,7 +17,7 @@
<cm:property
name=
"fcrepo.baseUrl"
value=
"http://localhost:8080/fcrepo/rest"
/>
<cm:property
name=
"fcrepo.authUsername"
value=
""
/>
<cm:property
name=
"fcrepo.authPassword"
value=
""
/>
<cm:property
name=
"extension.load"
value=
"
tru
e"
/>
<cm:property
name=
"extension.load"
value=
"
fals
e"
/>
<cm:property
name=
"extension.load.uri"
value=
"http://apix/services//apix:load"
/>
<cm:property
name=
"extension.load.maximumRedeliveries"
value=
"60"
/>
</cm:default-properties>
...
...
acrepo-exts-pcdm/src/main/cfg/edu.amherst.acdc.exts.pcdm.cfg
View file @
75e4e499
...
...
@@ -12,6 +12,6 @@ fcrepo.authUsername=
fcrepo.authPassword=
# API-X configuration
extension.load=
tru
e
extension.load=
fals
e
extension.load.uri=http://apix/services//apix:load
extension.load.maximumRedeliveries=60
acrepo-exts-pcdm/src/main/resources/OSGI-INF/blueprint/blueprint.xml
View file @
75e4e499
...
...
@@ -17,7 +17,7 @@
<cm:property
name=
"fcrepo.baseUrl"
value=
"http://localhost:8080/fcrepo/rest"
/>
<cm:property
name=
"fcrepo.authUsername"
value=
""
/>
<cm:property
name=
"fcrepo.authPassword"
value=
""
/>
<cm:property
name=
"extension.load"
value=
"
tru
e"
/>
<cm:property
name=
"extension.load"
value=
"
fals
e"
/>
<cm:property
name=
"extension.load.uri"
value=
"http://apix/services//apix:load"
/>
<cm:property
name=
"extension.load.maximumRedeliveries"
value=
"60"
/>
</cm:default-properties>
...
...
acrepo-exts-serialize-xml/src/main/cfg/edu.amherst.acdc.exts.serialize.xml.cfg
View file @
75e4e499
...
...
@@ -13,6 +13,6 @@ 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=
tru
e
extension.load=
fals
e
extension.load.uri=http://apix/services//apix:load
extension.load.maximumRedeliveries=60
acrepo-exts-serialize-xml/src/main/resources/OSGI-INF/blueprint/blueprint.xml
View file @
75e4e499
...
...
@@ -18,7 +18,7 @@
<cm:property
name=
"fcrepo.baseUrl"
value=
"http://localhost:8080/fcrepo/rest"
/>
<cm:property
name=
"fcrepo.authUsername"
value=
""
/>
<cm:property
name=
"fcrepo.authPassword"
value=
""
/>
<cm:property
name=
"extension.load"
value=
"
tru
e"
/>
<cm:property
name=
"extension.load"
value=
"
fals
e"
/>
<cm:property
name=
"extension.load.uri"
value=
"http://apix/services//apix:load"
/>
<cm:property
name=
"extension.load.maximumRedeliveries"
value=
"60"
/>
</cm:default-properties>
...
...
acrepo-exts-template/src/main/cfg/edu.amherst.acdc.exts.template.cfg
View file @
75e4e499
...
...
@@ -19,6 +19,6 @@ mustache.templateUri=edu/amherst/acdc/exts/template/template.mustache
ldpath.serviceUrl=http://localhost:9086/ldpath
# API-X configuration
extension.load=
tru
e
extension.load=
fals
e
extension.load.uri=http://apix/services//apix:load
extension.load.maximumRedeliveries=60
acrepo-exts-template/src/main/resources/OSGI-INF/blueprint/blueprint.xml
View file @
75e4e499
...
...
@@ -18,7 +18,7 @@
<cm:property
name=
"mustache.templateUri"
value=
"edu/amherst/acdc/exts/template/template.mustache"
/>
<cm:property
name=
"mustache.contentType"
value=
"text/html"
/>
<cm:property
name=
"ldpath.serviceUrl"
value=
"http://localhost:9086/ldpath"
/>
<cm:property
name=
"extension.load"
value=
"
tru
e"
/>
<cm:property
name=
"extension.load"
value=
"
fals
e"
/>
<cm:property
name=
"extension.load.uri"
value=
"http://apix/services//apix:load"
/>
<cm:property
name=
"extension.load.maximumRedeliveries"
value=
"60"
/>
</cm:default-properties>
...
...
acrepo-itests/src/test/java/edu/amherst/acdc/itests/AcrepoExtsSerializeXmlIT.java
View file @
75e4e499
...
...
@@ -97,7 +97,6 @@ public class AcrepoExtsSerializeXmlIT extends AbstractOSGiIT {
editConfigurationFilePut
(
"etc/org.apache.karaf.shell.cfg"
,
"sshPort"
,
sshPort
),
editConfigurationFilePut
(
"etc/edu.amherst.acdc.exts.serialize.xml.cfg"
,
"fcrepo.baseUrl"
,
fcrepoBaseUrl
),
editConfigurationFilePut
(
"etc/edu.amherst.acdc.exts.serialize.xml.cfg"
,
"rest.port"
,
metadataServicePort
),
editConfigurationFilePut
(
"etc/edu.amherst.acdc.exts.serialize.xml.cfg"
,
"extension.load"
,
"false"
)
};
}
...
...
acrepo-itests/src/test/java/edu/amherst/acdc/itests/AcrepoFitsIT.java
View file @
75e4e499
...
...
@@ -88,7 +88,6 @@ public class AcrepoFitsIT extends AbstractOSGiIT {
editConfigurationFilePut
(
"etc/org.apache.karaf.shell.cfg"
,
"sshPort"
,
sshPort
),
editConfigurationFilePut
(
"etc/edu.amherst.acdc.exts.fits.cfg"
,
"fcrepo.baseUrl"
,
fcrepoBaseUrl
),
editConfigurationFilePut
(
"etc/edu.amherst.acdc.exts.fits.cfg"
,
"rest.port"
,
fitsServicePort
),
editConfigurationFilePut
(
"etc/edu.amherst.acdc.exts.fits.cfg"
,
"extension.load"
,
"false"
)
};
}
...
...
acrepo-itests/src/test/java/edu/amherst/acdc/itests/AcrepoOreIT.java
View file @
75e4e499
...
...
@@ -95,7 +95,6 @@ public class AcrepoOreIT extends AbstractOSGiIT {
editConfigurationFilePut
(
"etc/org.apache.karaf.shell.cfg"
,
"sshPort"
,
sshPort
),
editConfigurationFilePut
(
"etc/edu.amherst.acdc.exts.ore.cfg"
,
"fcrepo.baseUrl"
,
fcrepoBaseUrl
),
editConfigurationFilePut
(
"etc/edu.amherst.acdc.exts.ore.cfg"
,
"rest.port"
,
oreExtPort
),
editConfigurationFilePut
(
"etc/edu.amherst.acdc.exts.ore.cfg"
,
"extension.load"
,
"false"
)
};
}
...
...
acrepo-itests/src/test/java/edu/amherst/acdc/itests/AcrepoPcdmIT.java
View file @
75e4e499
...
...
@@ -95,7 +95,6 @@ public class AcrepoPcdmIT extends AbstractOSGiIT {
editConfigurationFilePut
(
"etc/org.apache.karaf.shell.cfg"
,
"sshPort"
,
sshPort
),
editConfigurationFilePut
(
"etc/edu.amherst.acdc.exts.pcdm.cfg"
,
"fcrepo.baseUrl"
,
fcrepoBaseUrl
),
editConfigurationFilePut
(
"etc/edu.amherst.acdc.exts.pcdm.cfg"
,
"rest.port"
,
pcdmExtPort
),
editConfigurationFilePut
(
"etc/edu.amherst.acdc.exts.pcdm.cfg"
,
"extension.load"
,
"false"
)
};
}
...
...
acrepo-itests/src/test/java/edu/amherst/acdc/itests/AcrepoServicesIT.java
View file @
75e4e499
...
...
@@ -107,19 +107,12 @@ public class AcrepoServicesIT extends AbstractOSGiIT {
"acrepo-services-pcdm"
),
editConfigurationFilePut
(
"etc/edu.amherst.acdc.exts.fits.cfg"
,
"rest.port"
,
fitsPort
),
editConfigurationFilePut
(
"etc/edu.amherst.acdc.exts.fits.cfg"
,
"extension.load"
,
"false"
),
editConfigurationFilePut
(
"etc/edu.amherst.acdc.exts.image.cfg"
,
"rest.port"
,
imagePort
),
editConfigurationFilePut
(
"etc/edu.amherst.acdc.exts.image.cfg"
,
"extension.load"
,
"false"
),
editConfigurationFilePut
(
"etc/edu.amherst.acdc.exts.ldpath.cfg"
,
"rest.port"
,
ldpathPort
),
editConfigurationFilePut
(
"etc/edu.amherst.acdc.exts.ldpath.cfg"
,
"extension.load"
,
"false"
),
editConfigurationFilePut
(
"etc/edu.amherst.acdc.exts.ore.cfg"
,
"rest.port"
,
orePort
),
editConfigurationFilePut
(
"etc/edu.amherst.acdc.exts.ore.cfg"
,
"extension.load"
,
"false"
),
editConfigurationFilePut
(
"etc/edu.amherst.acdc.exts.pcdm.cfg"
,
"rest.port"
,
pcdmPort
),
editConfigurationFilePut
(
"etc/edu.amherst.acdc.exts.pcdm.cfg"
,
"extension.load"
,
"false"
),
editConfigurationFilePut
(
"etc/edu.amherst.acdc.exts.serialize.xml.cfg"
,
"rest.port"
,
metadataPort
),
editConfigurationFilePut
(
"etc/edu.amherst.acdc.exts.serialize.cfg"
,
"extension.load"
,
"false"
),
editConfigurationFilePut
(
"etc/edu.amherst.acdc.exts.template.cfg"
,
"rest.port"
,
templatePort
),
editConfigurationFilePut
(
"etc/edu.amherst.acdc.exts.template.cfg"
,
"extension.load"
,
"false"
),
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
)
...
...
acrepo-itests/src/test/java/edu/amherst/acdc/itests/AcrepoTemplateIT.java
View file @
75e4e499
...
...
@@ -95,8 +95,6 @@ public class AcrepoTemplateIT extends AbstractOSGiIT {
editConfigurationFilePut
(
"etc/org.apache.karaf.management.cfg"
,
"rmiServerPort"
,
rmiServerPort
),
editConfigurationFilePut
(
"etc/org.apache.karaf.shell.cfg"
,
"sshPort"
,
sshPort
),
editConfigurationFilePut
(
"etc/edu.amherst.acdc.exts.ldpath.cfg"
,
"rest.port"
,
ldpathPort
),
editConfigurationFilePut
(
"etc/edu.amherst.acdc.exts.ldpath.cfg"
,
"extension.load"
,
"false"
),
editConfigurationFilePut
(
"etc/edu.amherst.acdc.exts.template.cfg"
,
"extension.load"
,
"false"
),
editConfigurationFilePut
(
"etc/edu.amherst.acdc.exts.template.cfg"
,
"fcrepo.baseUrl"
,
fcrepoBaseUrl
),
editConfigurationFilePut
(
"etc/edu.amherst.acdc.exts.template.cfg"
,
"rest.port"
,
templateServicePort
),
editConfigurationFilePut
(
"etc/edu.amherst.acdc.exts.template.cfg"
,
"ldpath.serviceUrl"
,
...
...
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