hydra-core 5.0.0.pre9 → 5.0.0.pre10
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/hydra-core.gemspec +2 -2
- data/lib/generators/hydra/head_generator.rb +1 -4
- data/lib/generators/hydra/templates/config/initializers/hydra_config.rb +0 -1
- data/lib/generators/hydra/templates/fedora_conf/conf/development/fedora.fcfg +460 -385
- data/lib/generators/hydra/templates/fedora_conf/conf/test/fedora.fcfg +461 -386
- data/lib/generators/hydra/templates/solr_conf/conf/schema.xml +70 -484
- data/lib/generators/hydra/templates/solr_conf/conf/solrconfig.xml +615 -1663
- data/lib/hydra-head/version.rb +1 -1
- data/spec/controllers/catalog_controller_spec.rb +2 -4
- metadata +8 -25
- data/app/views/_flash_msg.html.erb +0 -5
- data/app/views/catalog/_citation.html.erb +0 -11
- data/app/views/catalog/_delete_partials/_default.html.erb +0 -22
- data/app/views/catalog/_edit_partials/_default.html.erb +0 -57
- data/app/views/catalog/_edit_partials/_default_details.html.erb +0 -13
- data/app/views/catalog/_home.html.erb +0 -4
- data/app/views/catalog/_home_text.html.erb +0 -4
- data/app/views/catalog/_index_partials/_default.html.erb +0 -20
- data/app/views/catalog/_index_partials/_default_details.html.erb +0 -14
- data/app/views/catalog/_show_partials/_default.html.erb +0 -20
- data/app/views/catalog/_show_partials/_default_details.html.erb +0 -15
- data/app/views/catalog/_show_partials/_facets.html.erb +0 -52
- data/app/views/catalog/_sms_form.html.erb +0 -21
- data/app/views/catalog/_uva_tabs.html.erb +0 -10
- data/app/views/catalog/about.html.erb +0 -0
- data/app/views/catalog/show.html.erb +0 -40
- data/app/views/layouts/hydra-head.html.erb +0 -47
data/hydra-core.gemspec
CHANGED
|
@@ -21,11 +21,11 @@ Gem::Specification.new do |gem|
|
|
|
21
21
|
gem.add_dependency "rails", '~>3.2.3'
|
|
22
22
|
gem.add_dependency "blacklight", '~>3.4'
|
|
23
23
|
gem.add_dependency "devise"
|
|
24
|
-
gem.add_dependency "active-fedora", '~>
|
|
24
|
+
gem.add_dependency "active-fedora", '~>5.0.0.rc1'
|
|
25
25
|
gem.add_dependency 'RedCloth', '=4.2.9'
|
|
26
26
|
gem.add_dependency 'block_helpers'
|
|
27
27
|
gem.add_dependency 'sanitize'
|
|
28
|
-
gem.add_dependency 'hydra-mods', ">= 0.0.
|
|
28
|
+
gem.add_dependency 'hydra-mods', ">= 0.0.6"
|
|
29
29
|
gem.add_dependency 'deprecation', ">= 0.0.5"
|
|
30
30
|
gem.add_dependency 'jquery-rails'
|
|
31
31
|
gem.add_dependency 'hydra-access-controls', version
|
|
@@ -149,10 +149,7 @@ EOF
|
|
|
149
149
|
if File.exists?(file_path)
|
|
150
150
|
insert_into_file file_path, :after => 'include Blacklight::Controller' do
|
|
151
151
|
" \n# Adds Hydra behaviors into the application controller \n" +
|
|
152
|
-
" include Hydra::Controller::ControllerBehavior\n"
|
|
153
|
-
" def layout_name\n" +
|
|
154
|
-
" 'hydra-head'\n" +
|
|
155
|
-
" end\n"
|
|
152
|
+
" include Hydra::Controller::ControllerBehavior\n"
|
|
156
153
|
end
|
|
157
154
|
else
|
|
158
155
|
puts " \e[31mFailure\e[0m Could not find #{model_name.underscore}.rb. To add Hydra behaviors to your Blacklight::Catalog Controllers, you must include the Hydra::Controller::ControllerBehavior module in the Controller class definition. See the Hydra::Controller::ControllerBehavior section in the Hydra API Docs for more info."
|
|
@@ -28,7 +28,6 @@ if Hydra.respond_to?(:configure)
|
|
|
28
28
|
# You only need to change these values if you've indexed permissions by some means other than the Hydra's built-in tooling.
|
|
29
29
|
# If you change these, you must also update the permissions request handler in your solrconfig.xml to return those values
|
|
30
30
|
config[:permissions] = {
|
|
31
|
-
:catchall => "access_t",
|
|
32
31
|
:discover => {:group =>"discover_access_group_t", :individual=>"discover_access_person_t"},
|
|
33
32
|
:read => {:group =>"read_access_group_t", :individual=>"read_access_person_t"},
|
|
34
33
|
:edit => {:group =>"edit_access_group_t", :individual=>"edit_access_person_t"},
|
|
@@ -1,53 +1,38 @@
|
|
|
1
1
|
<?xml version="1.0" encoding="UTF-8"?>
|
|
2
2
|
<server xmlns="http://www.fedora.info/definitions/1/0/config/" class="org.fcrepo.server.BasicServer">
|
|
3
|
-
<param name="
|
|
4
|
-
<comment>
|
|
3
|
+
<param name="repositoryName" value="Fedora Repository">
|
|
4
|
+
<comment>Defines a human readable name for the Fedora server; default is
|
|
5
|
+
Fedora Repository.</comment>
|
|
5
6
|
</param>
|
|
6
|
-
<param name="
|
|
7
|
-
<comment>
|
|
8
|
-
|
|
7
|
+
<param name="adminEmailList" value="bob@example.org sally@example.org">
|
|
8
|
+
<comment>Defines one or more email addresses for server administrators;
|
|
9
|
+
list is space delimited.</comment>
|
|
9
10
|
</param>
|
|
10
|
-
<param name="
|
|
11
|
-
<comment>
|
|
11
|
+
<param name="fedoraServerPort" value="8983">
|
|
12
|
+
<comment>Defines the port number on which the Fedora server runs;
|
|
13
|
+
default is 8080.</comment>
|
|
12
14
|
</param>
|
|
13
|
-
<param name="
|
|
14
|
-
<comment>
|
|
15
|
-
|
|
15
|
+
<param name="fedoraShutdownPort" value="8005">
|
|
16
|
+
<comment>Defines the port number used to shutdown the Fedora sever;
|
|
17
|
+
default is 8005.</comment>
|
|
18
|
+
</param>
|
|
19
|
+
<param name="fedoraRedirectPort" value="8443">
|
|
20
|
+
<comment>Defines the redirect port of the Fedora sever; default is 8443.</comment>
|
|
16
21
|
</param>
|
|
17
22
|
<param name="fedoraServerHost" value="localhost">
|
|
18
23
|
<comment>Defines the host name for the Fedora server, as seen from the
|
|
19
24
|
outside world.</comment>
|
|
20
25
|
</param>
|
|
21
|
-
<param name="
|
|
22
|
-
<comment>
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
ifmissing: generate an extension if the filename obtained from the source does not
|
|
26
|
-
already contain one (again returning the default if there is no MIMETYPE-to-extension
|
|
27
|
-
mapping is found); never: never generate an extension, use the filename from the source
|
|
28
|
-
as-is</comment>
|
|
29
|
-
</param>
|
|
30
|
-
<param name="httpClientMaxFollowRedirects" value="3">
|
|
31
|
-
<comment>Maximun number of redirects the Fedora http client will follow (only if
|
|
32
|
-
httpClientFollowRedirects is set to true.)</comment>
|
|
33
|
-
</param>
|
|
34
|
-
<param name="httpClientUserAgent" value="Fedora">
|
|
35
|
-
<comment>The value to be set for the User-Agent HTTP request header.</comment>
|
|
36
|
-
</param>
|
|
37
|
-
<param name="httpClientMaxTotalConnections" value="5">
|
|
38
|
-
<comment>Maximum number of total Fedora http client connections allowed at once.</comment>
|
|
39
|
-
</param>
|
|
40
|
-
<param name="datastreamFilenameSource" value="rels label id">
|
|
41
|
-
<comment>determines the source of the filename generated when download=true
|
|
42
|
-
on a datastream dissemination. Value is space separated list of label: use the datastream label;
|
|
43
|
-
id: use the datastream ID; rels: use the value defined in RELS-INT. Each
|
|
44
|
-
source is checked in order, and the first containing a value is used. Omit
|
|
45
|
-
any of the sources if that source is never to be used. If no sources are to be used,
|
|
46
|
-
and just the default filename and extension below are to be used, specify " ".</comment>
|
|
26
|
+
<param name="fedoraAppServerContext" value="fedora">
|
|
27
|
+
<comment>Defines the context name for the Fedora server within the
|
|
28
|
+
application server. If set to eg "myfedora" the URL for Fedora will result
|
|
29
|
+
in http[s]://fedoraServerHost[:fedoraServerPort]/myfedora.</comment>
|
|
47
30
|
</param>
|
|
48
|
-
<param name="
|
|
49
|
-
<comment>
|
|
50
|
-
|
|
31
|
+
<param name="datastreamExpirationLimit" value="300">
|
|
32
|
+
<comment>Controls the size of the datastream mediation hash by removing
|
|
33
|
+
entries outside the specified threshold. The value is specified in
|
|
34
|
+
seconds. Note this value must be greater than the limit specified for
|
|
35
|
+
the datastreamMediationLimit.</comment>
|
|
51
36
|
</param>
|
|
52
37
|
<param name="datastreamMediationLimit" value="5000">
|
|
53
38
|
<comment>Determines the time interval in which external mechanisms must
|
|
@@ -57,22 +42,6 @@
|
|
|
57
42
|
this value must be less than the limit specified for the
|
|
58
43
|
datastreamExpirationLimit.</comment>
|
|
59
44
|
</param>
|
|
60
|
-
<param name="fedoraServerPort" value="8983">
|
|
61
|
-
<comment>Defines the port number on which the Fedora server runs;
|
|
62
|
-
default is 8080.</comment>
|
|
63
|
-
</param>
|
|
64
|
-
<param name="fedoraRedirectPort" value="8443">
|
|
65
|
-
<comment>Defines the redirect port of the Fedora sever; default is 8443.</comment>
|
|
66
|
-
</param>
|
|
67
|
-
<param name="httpClientFollowRedirects" value="true">
|
|
68
|
-
<comment>Should the Fedora http client follow redirects?</comment>
|
|
69
|
-
</param>
|
|
70
|
-
<param name="datastreamExtensionMappingDefault" value="never">
|
|
71
|
-
<comment>Controls filename extension mapping when no filename can be determined from
|
|
72
|
-
the sources listed in datastreamFilenameSource. Values are always: always generate an extension
|
|
73
|
-
based on the MIMETYPE (using the default if no appropriate mapping is specified);
|
|
74
|
-
never: never generate an extension.</comment>
|
|
75
|
-
</param>
|
|
76
45
|
<param name="datastreamContentDispositionInlineEnabled" value="true">
|
|
77
46
|
<comment>determines if a content-disposition header specifying "inline" and
|
|
78
47
|
a filename is added to the response for the REST API getDatastreamDissemination
|
|
@@ -82,52 +51,85 @@
|
|
|
82
51
|
have it provided when download=true is specified, in which case the content disposition
|
|
83
52
|
of "attachment" will be used; which is generally supported.</comment>
|
|
84
53
|
</param>
|
|
85
|
-
<param name="
|
|
86
|
-
<comment>
|
|
87
|
-
|
|
88
|
-
in
|
|
54
|
+
<param name="datastreamFilenameSource" value="rels label id">
|
|
55
|
+
<comment>determines the source of the filename generated when download=true
|
|
56
|
+
on a datastream dissemination. Value is space separated list of label: use the datastream label;
|
|
57
|
+
id: use the datastream ID; rels: use the value defined in RELS-INT. Each
|
|
58
|
+
source is checked in order, and the first containing a value is used. Omit
|
|
59
|
+
any of the sources if that source is never to be used. If no sources are to be used,
|
|
60
|
+
and just the default filename and extension below are to be used, specify " ".</comment>
|
|
89
61
|
</param>
|
|
90
|
-
<param name="
|
|
91
|
-
<comment>
|
|
92
|
-
|
|
62
|
+
<param name="datastreamExtensionMappingLabel" value="always">
|
|
63
|
+
<comment>Controls filename extension mapping when the datastream label is used
|
|
64
|
+
as the source of the filename. Values are always: always generate an extension
|
|
65
|
+
based on the MIMETYPE, using the default extension if none can be determined;
|
|
66
|
+
ifmissing: generate an extension if the filename obtained from the source does not
|
|
67
|
+
already contain one (again returning the default if there is no MIMETYPE-to-extension
|
|
68
|
+
mapping is found); never: never generate an extension, use the filename from the source
|
|
69
|
+
as-is</comment>
|
|
93
70
|
</param>
|
|
94
|
-
<param name="
|
|
95
|
-
<comment>
|
|
71
|
+
<param name="datastreamExtensionMappingId" value="ifmissing">
|
|
72
|
+
<comment>Controls filename extension mapping when the datastream ID is used
|
|
73
|
+
as the source of the filename. Values are as above.</comment>
|
|
74
|
+
</param>
|
|
75
|
+
<param name="datastreamExtensionMappingRels" value="never">
|
|
76
|
+
<comment>Controls filename extension mapping when RELS-INT is used
|
|
77
|
+
as the source of the filename. Values are as above.</comment>
|
|
78
|
+
</param>
|
|
79
|
+
<param name="datastreamExtensionMappingDefault" value="never">
|
|
80
|
+
<comment>Controls filename extension mapping when no filename can be determined from
|
|
81
|
+
the sources listed in datastreamFilenameSource. Values are always: always generate an extension
|
|
82
|
+
based on the MIMETYPE (using the default if no appropriate mapping is specified);
|
|
83
|
+
never: never generate an extension.</comment>
|
|
96
84
|
</param>
|
|
97
85
|
<param name="datastreamDefaultFilename" value="download">
|
|
98
86
|
<comment>Filename to use for datastream downloads when none can be determined from the
|
|
99
87
|
sources listed in datastreamFilenameSource.</comment>
|
|
100
88
|
</param>
|
|
101
|
-
<param name="
|
|
102
|
-
<comment>
|
|
103
|
-
entries outside the specified threshold. The value is specified in
|
|
104
|
-
seconds. Note this value must be greater than the limit specified for
|
|
105
|
-
the datastreamMediationLimit.</comment>
|
|
89
|
+
<param name="datastreamDefaultExtension" value="bin">
|
|
90
|
+
<comment>Extension to use when none can be determined from mappings</comment>
|
|
106
91
|
</param>
|
|
107
|
-
<param name="
|
|
108
|
-
<comment>
|
|
109
|
-
as the source of the filename. Values are as above.</comment>
|
|
92
|
+
<param name="datastreamExtensionMappingSource" value="mime-to-extensions.xml">
|
|
93
|
+
<comment>Source of mappings from MIMETYPE to file extension</comment>
|
|
110
94
|
</param>
|
|
111
95
|
<param name="httpClientTimeoutSecs" value="20">
|
|
112
96
|
<comment>Number of seconds Fedora http client will wait for a connection before timing
|
|
113
97
|
out.</comment>
|
|
114
98
|
</param>
|
|
115
|
-
<param name="
|
|
116
|
-
<comment>
|
|
117
|
-
|
|
99
|
+
<param name="httpClientSocketTimeoutSecs" value="120">
|
|
100
|
+
<comment>Number of seconds Fedora http client will wait for data coming across an
|
|
101
|
+
established http connection.</comment>
|
|
102
|
+
</param>
|
|
103
|
+
<param name="httpClientMaxConnectionsPerHost" value="5">
|
|
104
|
+
<comment>Maximum number of Fedora http client connections allowed to a given host.</comment>
|
|
105
|
+
</param>
|
|
106
|
+
<param name="httpClientMaxTotalConnections" value="5">
|
|
107
|
+
<comment>Maximum number of total Fedora http client connections allowed at once.</comment>
|
|
108
|
+
</param>
|
|
109
|
+
<param name="httpClientFollowRedirects" value="true">
|
|
110
|
+
<comment>Should the Fedora http client follow redirects?</comment>
|
|
111
|
+
</param>
|
|
112
|
+
<param name="httpClientMaxFollowRedirects" value="3">
|
|
113
|
+
<comment>Maximun number of redirects the Fedora http client will follow (only if
|
|
114
|
+
httpClientFollowRedirects is set to true.)</comment>
|
|
115
|
+
</param>
|
|
116
|
+
<param name="httpClientUserAgent" value="Fedora">
|
|
117
|
+
<comment>The value to be set for the User-Agent HTTP request header.</comment>
|
|
118
118
|
</param>
|
|
119
|
+
<module role="org.fcrepo.server.storage.lowlevel.ILowlevelStorage" class="org.fcrepo.server.storage.lowlevel.akubra.AkubraLowlevelStorageModule">
|
|
120
|
+
</module>
|
|
119
121
|
<module role="org.fcrepo.server.security.Authorization" class="org.fcrepo.server.security.DefaultAuthorization">
|
|
120
122
|
<comment>Builds and manages Fedora's authorization structure.</comment>
|
|
123
|
+
<param name="REPOSITORY-POLICIES-DIRECTORY" value="data/fedora-xacml-policies/repository-policies" isFilePath="true"/>
|
|
121
124
|
<param name="REPOSITORY-POLICY-GUITOOL-POLICIES-DIRECTORY" value="data/fedora-xacml-policies/repository-policies-generated-by-policyguitool" isFilePath="true">
|
|
122
125
|
<comment>This parameter is for future use.</comment>
|
|
123
126
|
</param>
|
|
124
|
-
<param name="POLICY-SCHEMA-PATH" value="xsd/cs-xacml-schema-policy-01.xsd"/>
|
|
125
|
-
<param name="ENFORCE-MODE" value="permit-all-requests"/>
|
|
126
|
-
<param name="VALIDATE-OBJECT-POLICIES-FROM-DATASTREAM" value="false"/>
|
|
127
127
|
<param name="XACML-COMBINING-ALGORITHM" value="com.sun.xacml.combine.OrderedDenyOverridesPolicyAlg"/>
|
|
128
|
-
<param name="
|
|
128
|
+
<param name="ENFORCE-MODE" value="permit-all-requests"/>
|
|
129
|
+
<param name="POLICY-SCHEMA-PATH" value="xsd/cs-xacml-schema-policy-01.xsd"/>
|
|
129
130
|
<param name="VALIDATE-REPOSITORY-POLICIES" value="true"/>
|
|
130
|
-
<param name="
|
|
131
|
+
<param name="VALIDATE-OBJECT-POLICIES-FROM-FILE" value="false"/>
|
|
132
|
+
<param name="VALIDATE-OBJECT-POLICIES-FROM-DATASTREAM" value="false"/>
|
|
131
133
|
</module>
|
|
132
134
|
<module role="org.fcrepo.server.security.BackendSecurity" class="org.fcrepo.server.security.DefaultBackendSecurity">
|
|
133
135
|
<comment>Description: Interface to the backend service security
|
|
@@ -136,43 +138,28 @@
|
|
|
136
138
|
This file is located in the distribution in
|
|
137
139
|
$FEDORA_HOME/dist/server/config/beSecurity.xml. The configuration file
|
|
138
140
|
is read once at server startup.</comment>
|
|
139
|
-
<param name="beSecurity_char_encoding" value="utf-8">
|
|
140
|
-
<comment>The character encoding used for the beSecurity
|
|
141
|
-
configuration file. The default is "utf-8". The value
|
|
142
|
-
specified must correspond to the character encoding used in the
|
|
143
|
-
beSecurity configuration file.</comment>
|
|
144
|
-
</param>
|
|
145
141
|
<param name="beSecurity_validation" value="false">
|
|
146
142
|
<comment>Controls whether beSecurity config file is validated
|
|
147
143
|
against the beSecurityDescription schema. The default is
|
|
148
144
|
"false". Valid values are "true" or
|
|
149
145
|
"false".</comment>
|
|
150
146
|
</param>
|
|
147
|
+
<param name="beSecurity_char_encoding" value="utf-8">
|
|
148
|
+
<comment>The character encoding used for the beSecurity
|
|
149
|
+
configuration file. The default is "utf-8". The value
|
|
150
|
+
specified must correspond to the character encoding used in the
|
|
151
|
+
beSecurity configuration file.</comment>
|
|
152
|
+
</param>
|
|
151
153
|
</module>
|
|
152
154
|
<module role="org.fcrepo.server.storage.DOManager" class="org.fcrepo.server.storage.DefaultDOManager">
|
|
153
155
|
<comment>The interface to the storage subsystem. This provides
|
|
154
156
|
context-appropriate DOReaders and DOWriters for reflecting on and
|
|
155
157
|
writing to the objects stored in the repository. It also provides
|
|
156
158
|
methods for reflecting on the contents of the repository as a whole..</comment>
|
|
157
|
-
<param name="
|
|
158
|
-
<comment>
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
<param name="gSearchPassword" value="examplePassword">
|
|
162
|
-
<comment>The associated password for accessing the REST endpoint
|
|
163
|
-
of the Fedora Generic Search service. This parameter is only
|
|
164
|
-
required if GSearchDOManager is used, and the service requires
|
|
165
|
-
authentication.</comment>
|
|
166
|
-
</param>
|
|
167
|
-
<param name="storageCharacterEncoding" value="UTF-8">
|
|
168
|
-
<comment>If the serialization format is text-based, this is the
|
|
169
|
-
character encoding that should be used. Default is UTF-8.</comment>
|
|
170
|
-
</param>
|
|
171
|
-
<param name="gSearchUsername" value="exampleUsername">
|
|
172
|
-
<comment>The username for accessing the REST endpoint of the
|
|
173
|
-
Fedora Generic Search service. This parameter is only required if
|
|
174
|
-
GSearchDOManager is used, and the service requires
|
|
175
|
-
authentication.</comment>
|
|
159
|
+
<param name="pidNamespace" value="changeme">
|
|
160
|
+
<comment>This is the namespace id for pids of newly-created objects.
|
|
161
|
+
This should be unique for a repository. It can be from 1 to 17
|
|
162
|
+
characters, and may only contain A-Z, a-z, 0-9, '.', or '-' (dash).</comment>
|
|
176
163
|
</param>
|
|
177
164
|
<param name="storagePool" value="localDerbyPool">
|
|
178
165
|
<comment>The named connection pool from which read/write database
|
|
@@ -180,21 +167,36 @@
|
|
|
180
167
|
ConnectionPoolManager module). Default is the default provided by the
|
|
181
168
|
ConnectionPoolManager.</comment>
|
|
182
169
|
</param>
|
|
183
|
-
<param name="
|
|
184
|
-
<comment>
|
|
185
|
-
|
|
186
|
-
used.</comment>
|
|
170
|
+
<param name="storageCharacterEncoding" value="UTF-8">
|
|
171
|
+
<comment>If the serialization format is text-based, this is the
|
|
172
|
+
character encoding that should be used. Default is UTF-8.</comment>
|
|
187
173
|
</param>
|
|
188
174
|
<param name="defaultExportFormat" value="info:fedora/fedora-system:FOXML-1.1"/>
|
|
175
|
+
<param name="defaultDCControlGroup" value="X">
|
|
176
|
+
<comment>The control group to use for the system-generated DC datastream
|
|
177
|
+
if no DC datastream is present on ingest. Must be "X" or "M".</comment>
|
|
178
|
+
</param>
|
|
189
179
|
<param name="defaultRELSControlGroup" value="X">
|
|
190
180
|
<comment>The control group to use for system-generated RELS-EXT and
|
|
191
181
|
RELS-INT datastreams where these are not already present when
|
|
192
182
|
adding relationships via addRelationship. Must be "X" or "M".</comment>
|
|
193
183
|
</param>
|
|
194
|
-
<param name="
|
|
195
|
-
<comment>
|
|
196
|
-
|
|
197
|
-
|
|
184
|
+
<param name="gSearchRESTURL" value="http://localhost:8983/fedoragsearch/rest">
|
|
185
|
+
<comment>The REST endpoint of the Fedora Generic Search service.
|
|
186
|
+
This parameter is only required if GSearchDOManager is
|
|
187
|
+
used.</comment>
|
|
188
|
+
</param>
|
|
189
|
+
<param name="gSearchUsername" value="exampleUsername">
|
|
190
|
+
<comment>The username for accessing the REST endpoint of the
|
|
191
|
+
Fedora Generic Search service. This parameter is only required if
|
|
192
|
+
GSearchDOManager is used, and the service requires
|
|
193
|
+
authentication.</comment>
|
|
194
|
+
</param>
|
|
195
|
+
<param name="gSearchPassword" value="examplePassword">
|
|
196
|
+
<comment>The associated password for accessing the REST endpoint
|
|
197
|
+
of the Fedora Generic Search service. This parameter is only
|
|
198
|
+
required if GSearchDOManager is used, and the service requires
|
|
199
|
+
authentication.</comment>
|
|
198
200
|
</param>
|
|
199
201
|
</module>
|
|
200
202
|
<module role="org.fcrepo.server.management.Management" class="org.fcrepo.server.management.ManagementModule">
|
|
@@ -203,6 +205,18 @@
|
|
|
203
205
|
- how the service is exposed
|
|
204
206
|
- how bytestreams and java types might be marshalled/demarshalled over the wire
|
|
205
207
|
- how the storage subsystem is implemented.</comment>
|
|
208
|
+
<param name="decorator1" value="org.fcrepo.server.messaging.NotificationInvocationHandler"/>
|
|
209
|
+
<param name="autoChecksum" value="false">
|
|
210
|
+
<comment>Controls whether a checksum is automatically computed for
|
|
211
|
+
every datastream as the datastream is added to the repository. This
|
|
212
|
+
will allow the integrity of datastream contents to be periodically
|
|
213
|
+
checked to insure the object is not corrupted.</comment>
|
|
214
|
+
</param>
|
|
215
|
+
<param name="checksumAlgorithm" value="MD5">
|
|
216
|
+
<comment>Specifies which checksumming algorithm is to be used when
|
|
217
|
+
automatically computing checksums as specified by the above
|
|
218
|
+
parameter. Valid values are: MD5 SHA-1 SHA-256 SHA-384 SHA-512.</comment>
|
|
219
|
+
</param>
|
|
206
220
|
<param name="purgeDelayInMillis" value="60000">
|
|
207
221
|
<comment>Optional, default is 60000 (1 minute).
|
|
208
222
|
This specifies the amount of time between checks to remove
|
|
@@ -210,23 +224,11 @@
|
|
|
210
224
|
each check, old files whose age exceeds uploadStorageMinutes
|
|
211
225
|
will be removed.</comment>
|
|
212
226
|
</param>
|
|
213
|
-
<param name="decorator1" value="org.fcrepo.server.messaging.NotificationInvocationHandler"/>
|
|
214
|
-
<param name="checksumAlgorithm" value="SHA-1">
|
|
215
|
-
<comment>Specifies which checksumming algorithm is to be used when
|
|
216
|
-
automatically computing checksums as specified by the above
|
|
217
|
-
parameter. Valid values are: MD5 SHA-1 SHA-256 SHA-384 SHA-512.</comment>
|
|
218
|
-
</param>
|
|
219
227
|
<param name="uploadStorageMinutes" value="5">
|
|
220
228
|
<comment>Optional, default is 5.
|
|
221
229
|
This specifies the minimum amount of time that each uploaded
|
|
222
230
|
file should be kept in temporary storage.</comment>
|
|
223
231
|
</param>
|
|
224
|
-
<param name="autoChecksum" value="true">
|
|
225
|
-
<comment>Controls whether a checksum is automatically computed for
|
|
226
|
-
every datastream as the datastream is added to the repository. This
|
|
227
|
-
will allow the integrity of datastream contents to be periodically
|
|
228
|
-
checked to insure the object is not corrupted.</comment>
|
|
229
|
-
</param>
|
|
230
232
|
</module>
|
|
231
233
|
<module role="org.fcrepo.server.access.Access" class="org.fcrepo.server.access.DefaultAccess">
|
|
232
234
|
<comment>Description: The access subsystem. This implements the methods
|
|
@@ -304,16 +306,18 @@
|
|
|
304
306
|
</module>
|
|
305
307
|
<module role="org.fcrepo.server.search.FieldSearch" class="org.fcrepo.server.search.FieldSearchSQLModule">
|
|
306
308
|
<comment>Supports the API-A simpleSearch and advancedSearch methods.</comment>
|
|
307
|
-
<param name="
|
|
308
|
-
<comment>(
|
|
309
|
-
|
|
310
|
-
|
|
311
|
-
|
|
312
|
-
|
|
313
|
-
|
|
314
|
-
|
|
315
|
-
|
|
316
|
-
|
|
309
|
+
<param name="maxResults" value="100">
|
|
310
|
+
<comment>(required, must be > 0)
|
|
311
|
+
The maximum number of records to
|
|
312
|
+
return as the result of a search. Even if a client requests more
|
|
313
|
+
results at a time, this is the cutoff value.</comment>
|
|
314
|
+
</param>
|
|
315
|
+
<param name="maxSecondsPerSession" value="500">
|
|
316
|
+
<comment>(required, must be > 0)
|
|
317
|
+
The maximum number of seconds that the server guarantees subsequent
|
|
318
|
+
search results may be obtained. This is only used in cases where the
|
|
319
|
+
number of results is greater than maxResults (as specified by the
|
|
320
|
+
server [above] or the client [in the search request]).</comment>
|
|
317
321
|
</param>
|
|
318
322
|
<param name="connectionPool" value="localDerbyPool">
|
|
319
323
|
<comment>(optional) To make unspecified, comment out or delete the
|
|
@@ -332,18 +336,16 @@
|
|
|
332
336
|
and make sure you have a connectionPool large enough to accomodate
|
|
333
337
|
your users.</comment>
|
|
334
338
|
</param>
|
|
335
|
-
<param name="
|
|
336
|
-
<comment>(
|
|
337
|
-
|
|
338
|
-
|
|
339
|
-
|
|
340
|
-
|
|
341
|
-
|
|
342
|
-
|
|
343
|
-
|
|
344
|
-
|
|
345
|
-
return as the result of a search. Even if a client requests more
|
|
346
|
-
results at a time, this is the cutoff value.</comment>
|
|
339
|
+
<param name="indexDCFields" value="true">
|
|
340
|
+
<comment>(optional, default is true) Whether the content of the DC
|
|
341
|
+
datastream should be examined and the contents indexed, for each object.
|
|
342
|
+
You may wish to save time and space by disabling DC field indexing,
|
|
343
|
+
particularly if you have an external search service (such as Fedora
|
|
344
|
+
Generic Search) that already fulfills this need.
|
|
345
|
+
Note: If you change this value on a Fedora repository that has been
|
|
346
|
+
running for some time, you will need to perform a SQL rebuild using the
|
|
347
|
+
Fedora Rebuilder tool if you want to change objects that have already
|
|
348
|
+
been ingested.</comment>
|
|
347
349
|
</param>
|
|
348
350
|
</module>
|
|
349
351
|
<module role="org.fcrepo.server.resourceIndex.ResourceIndex" class="org.fcrepo.server.resourceIndex.ResourceIndexModule">
|
|
@@ -355,6 +357,11 @@
|
|
|
355
357
|
WARNING: changing the level (except to 0) requires
|
|
356
358
|
running the Resource Index Rebuilder.</comment>
|
|
357
359
|
</param>
|
|
360
|
+
<param name="datastore" value="localMulgaraTriplestore">
|
|
361
|
+
<comment>(required)
|
|
362
|
+
Name of the triplestore to use. WARNING: changing the
|
|
363
|
+
triplestore running the Resource Index Rebuilder.</comment>
|
|
364
|
+
</param>
|
|
358
365
|
<param name="syncUpdates" value="false">
|
|
359
366
|
<comment>(optional, default is false)
|
|
360
367
|
Whether to flush the triple buffer before
|
|
@@ -366,11 +373,6 @@
|
|
|
366
373
|
API-M operations (depending on the triplestore
|
|
367
374
|
implementation).</comment>
|
|
368
375
|
</param>
|
|
369
|
-
<param name="datastore" value="localMulgaraTriplestore">
|
|
370
|
-
<comment>(required)
|
|
371
|
-
Name of the triplestore to use. WARNING: changing the
|
|
372
|
-
triplestore running the Resource Index Rebuilder.</comment>
|
|
373
|
-
</param>
|
|
374
376
|
<param name="alias:test" value="http://example.org/terms#">
|
|
375
377
|
<comment>(optional) Aliases that can be used for queries. The param
|
|
376
378
|
name of an alias starts with the string "alias:" and is followed by
|
|
@@ -382,30 +384,30 @@
|
|
|
382
384
|
</module>
|
|
383
385
|
<module role="org.fcrepo.oai.OAIProvider" class="org.fcrepo.server.oai.FedoraOAIProviderModule">
|
|
384
386
|
<comment>Description: Exposes the repository for OAI harvesters.</comment>
|
|
385
|
-
<param name="
|
|
386
|
-
<param name="friends" value="http://arXiv.org/oai2 http://memory.loc.gov/cgi-bin/oai2_0"/>
|
|
387
|
-
<param name="adminEmails" value="oai-admin@example.org bob@example.org"/>
|
|
387
|
+
<param name="repositoryName" value="Your Fedora Repository Name Here"/>
|
|
388
388
|
<param name="repositoryDomainName" value="example.org"/>
|
|
389
|
+
<param name="adminEmails" value="oai-admin@example.org bob@example.org"/>
|
|
390
|
+
<param name="friends" value="http://arXiv.org/oai2 http://memory.loc.gov/cgi-bin/oai2_0"/>
|
|
391
|
+
<param name="maxRecords" value="100"/>
|
|
389
392
|
<param name="maxHeaders" value="100"/>
|
|
390
|
-
<param name="repositoryName" value="Your Fedora Repository Name Here"/>
|
|
391
393
|
</module>
|
|
392
394
|
<module role="org.fcrepo.server.storage.translation.DOTranslator" class="org.fcrepo.server.storage.translation.DOTranslatorModule">
|
|
393
395
|
<comment>Supports translation from DigitalObject to a stream of some
|
|
394
396
|
format, and vice-versa. The parameters below specify
|
|
395
397
|
serializer/deserializer classes to be used for a given format. Those
|
|
396
398
|
classes must implement the DOSerializer/DODeserializer interfaces.</comment>
|
|
397
|
-
<param name="serializer_info:fedora/fedora-system:ATOM-1.1" value="org.fcrepo.server.storage.translation.Atom1_1DOSerializer"/>
|
|
398
|
-
<param name="deserializer_info:fedora/fedora-system:FOXML-1.1" value="org.fcrepo.server.storage.translation.FOXML1_1DODeserializer"/>
|
|
399
|
-
<param name="serializer_info:fedora/fedora-system:METSFedoraExt-1.0" value="org.fcrepo.server.storage.translation.METSFedoraExt1_0DOSerializer"/>
|
|
400
|
-
<param name="deserializer_info:fedora/fedora-system:METSFedoraExt-1.1" value="org.fcrepo.server.storage.translation.METSFedoraExt1_1DODeserializer"/>
|
|
401
399
|
<param name="serializer_info:fedora/fedora-system:METSFedoraExt-1.1" value="org.fcrepo.server.storage.translation.METSFedoraExt1_1DOSerializer"/>
|
|
400
|
+
<param name="deserializer_info:fedora/fedora-system:METSFedoraExt-1.1" value="org.fcrepo.server.storage.translation.METSFedoraExt1_1DODeserializer"/>
|
|
401
|
+
<param name="serializer_info:fedora/fedora-system:METSFedoraExt-1.0" value="org.fcrepo.server.storage.translation.METSFedoraExt1_0DOSerializer"/>
|
|
402
402
|
<param name="deserializer_info:fedora/fedora-system:METSFedoraExt-1.0" value="org.fcrepo.server.storage.translation.METSFedoraExt1_0DODeserializer"/>
|
|
403
|
-
<param name="serializer_info:fedora/fedora-system:FOXML-1.0" value="org.fcrepo.server.storage.translation.FOXML1_0DOSerializer"/>
|
|
404
|
-
<param name="deserializer_info:fedora/fedora-system:ATOMZip-1.1" value="org.fcrepo.server.storage.translation.AtomZip1_1DODeserializer"/>
|
|
405
403
|
<param name="serializer_info:fedora/fedora-system:FOXML-1.1" value="org.fcrepo.server.storage.translation.FOXML1_1DOSerializer"/>
|
|
406
|
-
<param name="deserializer_info:fedora/fedora-system:
|
|
404
|
+
<param name="deserializer_info:fedora/fedora-system:FOXML-1.1" value="org.fcrepo.server.storage.translation.FOXML1_1DODeserializer"/>
|
|
405
|
+
<param name="serializer_info:fedora/fedora-system:FOXML-1.0" value="org.fcrepo.server.storage.translation.FOXML1_0DOSerializer"/>
|
|
407
406
|
<param name="deserializer_info:fedora/fedora-system:FOXML-1.0" value="org.fcrepo.server.storage.translation.FOXML1_0DODeserializer"/>
|
|
407
|
+
<param name="serializer_info:fedora/fedora-system:ATOM-1.1" value="org.fcrepo.server.storage.translation.Atom1_1DOSerializer"/>
|
|
408
|
+
<param name="deserializer_info:fedora/fedora-system:ATOM-1.1" value="org.fcrepo.server.storage.translation.Atom1_1DODeserializer"/>
|
|
408
409
|
<param name="serializer_info:fedora/fedora-system:ATOMZip-1.1" value="org.fcrepo.server.storage.translation.AtomZip1_1DOSerializer"/>
|
|
410
|
+
<param name="deserializer_info:fedora/fedora-system:ATOMZip-1.1" value="org.fcrepo.server.storage.translation.AtomZip1_1DODeserializer"/>
|
|
409
411
|
</module>
|
|
410
412
|
<module role="org.fcrepo.server.management.PIDGenerator" class="org.fcrepo.server.management.BasicPIDGenerator">
|
|
411
413
|
<comment>The pid generator.</comment>
|
|
@@ -415,7 +417,7 @@
|
|
|
415
417
|
<comment>Fedora's Java Messaging Service (JMS) Module</comment>
|
|
416
418
|
<param name="enabled" value="false"/>
|
|
417
419
|
<param name="java.naming.factory.initial" value="org.apache.activemq.jndi.ActiveMQInitialContextFactory"/>
|
|
418
|
-
<param name="java.naming.provider.url" value="vm:(broker:(tcp://localhost:61616))"/>
|
|
420
|
+
<param name="java.naming.provider.url" value="vm:(broker:(tcp://localhost:61616,stomp://localhost:61613))"/>
|
|
419
421
|
<param name="datastore1" value="apimUpdateMessages">
|
|
420
422
|
<comment>A datastore representing a JMS Destination for APIM events which update the repository</comment>
|
|
421
423
|
</param>
|
|
@@ -434,28 +436,6 @@
|
|
|
434
436
|
written in Schematron language), and other programatic validation
|
|
435
437
|
including referential integrity checking of existence and
|
|
436
438
|
availability of distributed data and/or services.</comment>
|
|
437
|
-
<param name="tempDir" value="work">
|
|
438
|
-
<comment>(required)
|
|
439
|
-
This is a directory that the validation module can use as a work space, as
|
|
440
|
-
when it must write a temporary file.</comment>
|
|
441
|
-
</param>
|
|
442
|
-
<param name="rules_info:fedora/fedora-system:ATOM-1.1" value="schematron/atom-bogus.xml">
|
|
443
|
-
<comment>The local path to the Schematron Rules used for
|
|
444
|
-
Fedora-specific on Atom XML files.</comment>
|
|
445
|
-
</param>
|
|
446
|
-
<param name="schtron_preprocessor" value="schematron/preprocessor.xslt"/>
|
|
447
|
-
<param name="rules_info:fedora/fedora-system:ATOMZip-1.1" value="schematron/atom-bogus.xml">
|
|
448
|
-
<comment>The local path to the Schematron Rules used for
|
|
449
|
-
Fedora-specific on Atom Zip files.</comment>
|
|
450
|
-
</param>
|
|
451
|
-
<param name="rules_info:fedora/fedora-system:FOXML-1.1" value="schematron/foxmlRules1-1.xml">
|
|
452
|
-
<comment>The local path to the Schematron Rules used for
|
|
453
|
-
Fedora-specific validation on FOXML 1.1 XML files.</comment>
|
|
454
|
-
</param>
|
|
455
|
-
<param name="rules_info:fedora/fedora-system:FOXML-1.0" value="schematron/foxmlRules1-0.xml">
|
|
456
|
-
<comment>The local path to the Schematron Rules used for
|
|
457
|
-
Fedora-specific validation on FOXML 1.0 XML files.</comment>
|
|
458
|
-
</param>
|
|
459
439
|
<param name="xsd_info:fedora/fedora-system:METSFedoraExt-1.1" value="xsd/mets-fedora-ext1-1.xsd">
|
|
460
440
|
<comment>The local path for the Fedora-METS XML
|
|
461
441
|
schema used to do XML schema validation of digital objects.</comment>
|
|
@@ -464,10 +444,6 @@
|
|
|
464
444
|
<comment>The local path for the Fedora-METS 1.0 XML
|
|
465
445
|
schema used to do XML schema validation of digital objects.</comment>
|
|
466
446
|
</param>
|
|
467
|
-
<param name="xsd_xacml_policy1.0" value="xsd/cs-xacml-schema-policy-1.0.xsd">
|
|
468
|
-
<comment>The local path for the OASIS XACML XML policy schema
|
|
469
|
-
used to do XML schema validation of XACML policies.</comment>
|
|
470
|
-
</param>
|
|
471
447
|
<param name="xsd_info:fedora/fedora-system:FOXML-1.1" value="xsd/foxml1-1.xsd">
|
|
472
448
|
<comment>The local path for the Fedora FOXML 1.1 XML schema
|
|
473
449
|
used to do XML schema validation of digital objects</comment>
|
|
@@ -480,18 +456,44 @@
|
|
|
480
456
|
<comment>The local path for the Atom XML schema used to do XML
|
|
481
457
|
schema validation of digital objects</comment>
|
|
482
458
|
</param>
|
|
483
|
-
<param name="rules_info:fedora/fedora-system:METSFedoraExt-1.0" value="schematron/metsExtRules1-0.xml">
|
|
484
|
-
<comment>The local path to the Schematron Rules used for
|
|
485
|
-
Fedora-specific validation on Fedora-METS 1.0 XML files.</comment>
|
|
486
|
-
</param>
|
|
487
459
|
<param name="xsd_info:fedora/fedora-system:ATOMZip-1.1" value="xsd/atom.xsd">
|
|
488
460
|
<comment>The local path for the Atom XML schema used to do XML
|
|
489
461
|
schema validation of digital objects</comment>
|
|
490
462
|
</param>
|
|
463
|
+
<param name="xsd_xacml_policy1.0" value="xsd/cs-xacml-schema-policy-1.0.xsd">
|
|
464
|
+
<comment>The local path for the OASIS XACML XML policy schema
|
|
465
|
+
used to do XML schema validation of XACML policies.</comment>
|
|
466
|
+
</param>
|
|
491
467
|
<param name="rules_info:fedora/fedora-system:METSFedoraExt-1.1" value="schematron/metsExtRules1-1.xml">
|
|
492
468
|
<comment>The local path to the Schematron Rules used for
|
|
493
469
|
Fedora-specific validation on Fedora-METS XML files.</comment>
|
|
494
470
|
</param>
|
|
471
|
+
<param name="rules_info:fedora/fedora-system:METSFedoraExt-1.0" value="schematron/metsExtRules1-0.xml">
|
|
472
|
+
<comment>The local path to the Schematron Rules used for
|
|
473
|
+
Fedora-specific validation on Fedora-METS 1.0 XML files.</comment>
|
|
474
|
+
</param>
|
|
475
|
+
<param name="rules_info:fedora/fedora-system:FOXML-1.1" value="schematron/foxmlRules1-1.xml">
|
|
476
|
+
<comment>The local path to the Schematron Rules used for
|
|
477
|
+
Fedora-specific validation on FOXML 1.1 XML files.</comment>
|
|
478
|
+
</param>
|
|
479
|
+
<param name="rules_info:fedora/fedora-system:FOXML-1.0" value="schematron/foxmlRules1-0.xml">
|
|
480
|
+
<comment>The local path to the Schematron Rules used for
|
|
481
|
+
Fedora-specific validation on FOXML 1.0 XML files.</comment>
|
|
482
|
+
</param>
|
|
483
|
+
<param name="rules_info:fedora/fedora-system:ATOM-1.1" value="schematron/atom-bogus.xml">
|
|
484
|
+
<comment>The local path to the Schematron Rules used for
|
|
485
|
+
Fedora-specific on Atom XML files.</comment>
|
|
486
|
+
</param>
|
|
487
|
+
<param name="rules_info:fedora/fedora-system:ATOMZip-1.1" value="schematron/atom-bogus.xml">
|
|
488
|
+
<comment>The local path to the Schematron Rules used for
|
|
489
|
+
Fedora-specific on Atom Zip files.</comment>
|
|
490
|
+
</param>
|
|
491
|
+
<param name="schtron_preprocessor" value="schematron/preprocessor.xslt"/>
|
|
492
|
+
<param name="tempDir" value="work">
|
|
493
|
+
<comment>(required)
|
|
494
|
+
This is a directory that the validation module can use as a work space, as
|
|
495
|
+
when it must write a temporary file.</comment>
|
|
496
|
+
</param>
|
|
495
497
|
</module>
|
|
496
498
|
<module role="org.fcrepo.server.storage.ExternalContentManager" class="org.fcrepo.server.storage.DefaultExternalContentManager">
|
|
497
499
|
<comment>This module facilitates obtaining external content via HTTP</comment>
|
|
@@ -505,57 +507,25 @@
|
|
|
505
507
|
information regarding connection pool options, refer to the Apache
|
|
506
508
|
Commons Pool API documentation at
|
|
507
509
|
http://jakarta.apache.org/commons/pool/apidocs/index.html.</comment>
|
|
508
|
-
<param name="maxIdle" value="10">
|
|
509
|
-
<comment>The maximum number of idle instances in pool.</comment>
|
|
510
|
-
</param>
|
|
511
|
-
<param name="testOnBorrow" value="true">
|
|
512
|
-
<comment>When true objects are validated before borrowed from the
|
|
513
|
-
pool.</comment>
|
|
514
|
-
</param>
|
|
515
|
-
<param name="testWhileIdle" value="true">
|
|
516
|
-
<comment>When true, objects are validated by the idle object evictor
|
|
517
|
-
thread.</comment>
|
|
518
|
-
</param>
|
|
519
|
-
<param name="validationQuery" value="select 1">
|
|
520
|
-
<comment>The query to run when validating connections.
|
|
521
|
-
Connections are validated according to the testOnBorrow,
|
|
522
|
-
testOnReturn, and testWhileIdle configuration values.
|
|
523
|
-
If this is specified, it must be a SQL SELECT statement
|
|
524
|
-
that returns at least one row. If this is NOT specified,
|
|
525
|
-
validation tests will not be run.</comment>
|
|
526
|
-
</param>
|
|
527
|
-
<param name="ddlConverter" value="org.fcrepo.server.utilities.MySQLDDLConverter"/>
|
|
528
510
|
<param name="dbUsername" value="fedoraAdmin">
|
|
529
511
|
<comment>The database user name.</comment>
|
|
530
512
|
</param>
|
|
531
|
-
<param name="testOnReturn" value="true">
|
|
532
|
-
<comment>When true, objects are validated before returned to the
|
|
533
|
-
pool.</comment>
|
|
534
|
-
</param>
|
|
535
|
-
<param name="maxActive" value="100">
|
|
536
|
-
<comment>The maximum number of active instances in pool.</comment>
|
|
537
|
-
</param>
|
|
538
513
|
<param name="dbPassword" value="fedoraAdmin">
|
|
539
514
|
<comment>The database password.</comment>
|
|
540
515
|
</param>
|
|
541
516
|
<param name="jdbcURL" value="jdbc:mysql://localhost/fedora3?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true">
|
|
542
517
|
<comment>The JDBC connection URL.</comment>
|
|
543
518
|
</param>
|
|
544
|
-
<param name="whenExhaustedAction" value="1">
|
|
545
|
-
<comment>Action to take when a new object is requested and the the pool has
|
|
546
|
-
reached maximum number of active objects. Valid values are:
|
|
547
|
-
0 (fail i.e., throw Exception)
|
|
548
|
-
1 (block i.e., wait until pool resources are freed)
|
|
549
|
-
2 (grow i.e., increase the size of the pool).</comment>
|
|
550
|
-
</param>
|
|
551
|
-
<param name="numTestsPerEvictionRun" value="3">
|
|
552
|
-
<comment>The number of objects to be examined on each run of idle
|
|
553
|
-
evictor thread (if applicable). A value less than zero indicates
|
|
554
|
-
that ceil(numIdle)/abs(numTestsPerEvictionRun) will be run.</comment>
|
|
555
|
-
</param>
|
|
556
519
|
<param name="jdbcDriverClass" value="com.mysql.jdbc.Driver">
|
|
557
520
|
<comment>The JDBC driver class name.</comment>
|
|
558
521
|
</param>
|
|
522
|
+
<param name="ddlConverter" value="org.fcrepo.server.utilities.MySQLDDLConverter"/>
|
|
523
|
+
<param name="maxActive" value="100">
|
|
524
|
+
<comment>The maximum number of active instances in pool.</comment>
|
|
525
|
+
</param>
|
|
526
|
+
<param name="maxIdle" value="10">
|
|
527
|
+
<comment>The maximum number of idle instances in pool.</comment>
|
|
528
|
+
</param>
|
|
559
529
|
<param name="maxWait" value="-1">
|
|
560
530
|
<comment>The maximum amount of time in milliseconds the
|
|
561
531
|
borrowObject() method should wait before throwing an Exception when
|
|
@@ -571,14 +541,46 @@
|
|
|
571
541
|
less than zero indicates no object will be evicted due to idle time
|
|
572
542
|
alone.</comment>
|
|
573
543
|
</param>
|
|
544
|
+
<param name="numTestsPerEvictionRun" value="3">
|
|
545
|
+
<comment>The number of objects to be examined on each run of idle
|
|
546
|
+
evictor thread (if applicable). A value less than zero indicates
|
|
547
|
+
that ceil(numIdle)/abs(numTestsPerEvictionRun) will be run.</comment>
|
|
548
|
+
</param>
|
|
574
549
|
<param name="timeBetweenEvictionRunsMillis" value="-1">
|
|
575
550
|
<comment>The time in milliseconds to sleep between runs of the idle
|
|
576
551
|
object evictor thread. A value less than zero indicates no idle
|
|
577
552
|
evictor thread is run.</comment>
|
|
578
553
|
</param>
|
|
554
|
+
<param name="validationQuery" value="select 1">
|
|
555
|
+
<comment>The query to run when validating connections.
|
|
556
|
+
Connections are validated according to the testOnBorrow,
|
|
557
|
+
testOnReturn, and testWhileIdle configuration values.
|
|
558
|
+
If this is specified, it must be a SQL SELECT statement
|
|
559
|
+
that returns at least one row. If this is NOT specified,
|
|
560
|
+
validation tests will not be run.</comment>
|
|
561
|
+
</param>
|
|
562
|
+
<param name="testOnBorrow" value="true">
|
|
563
|
+
<comment>When true objects are validated before borrowed from the
|
|
564
|
+
pool.</comment>
|
|
565
|
+
</param>
|
|
566
|
+
<param name="testOnReturn" value="true">
|
|
567
|
+
<comment>When true, objects are validated before returned to the
|
|
568
|
+
pool.</comment>
|
|
569
|
+
</param>
|
|
570
|
+
<param name="testWhileIdle" value="true">
|
|
571
|
+
<comment>When true, objects are validated by the idle object evictor
|
|
572
|
+
thread.</comment>
|
|
573
|
+
</param>
|
|
574
|
+
<param name="whenExhaustedAction" value="1">
|
|
575
|
+
<comment>Action to take when a new object is requested and the the pool has
|
|
576
|
+
reached maximum number of active objects. Valid values are:
|
|
577
|
+
0 (fail i.e., throw Exception)
|
|
578
|
+
1 (block i.e., wait until pool resources are freed)
|
|
579
|
+
2 (grow i.e., increase the size of the pool).</comment>
|
|
580
|
+
</param>
|
|
579
581
|
</datastore>
|
|
580
|
-
<datastore id="
|
|
581
|
-
<comment>
|
|
582
|
+
<datastore id="localMcKoiPool">
|
|
583
|
+
<comment>McKoi database on localhost running on port 9157 Each
|
|
582
584
|
connection pool instance has several configuration parameter that
|
|
583
585
|
can be used to tune the options for the connection pool. It is
|
|
584
586
|
recommended that you not change the default values unless you are
|
|
@@ -586,52 +588,28 @@
|
|
|
586
588
|
information regarding connection pool options, refer to the Apache
|
|
587
589
|
Commons Pool API documentation at
|
|
588
590
|
http://jakarta.apache.org/commons/pool/apidocs/index.html.</comment>
|
|
589
|
-
<param name="maxIdle" value="10">
|
|
590
|
-
<comment>The maximum number of idle instances in pool.</comment>
|
|
591
|
-
</param>
|
|
592
|
-
<param name="testOnBorrow" value="true">
|
|
593
|
-
<comment>When true objects are validated before borrowed from the
|
|
594
|
-
pool.</comment>
|
|
595
|
-
</param>
|
|
596
|
-
<param name="testWhileIdle" value="true">
|
|
597
|
-
<comment>When true, objects are validated by the idle object evictor
|
|
598
|
-
thread.</comment>
|
|
599
|
-
</param>
|
|
600
|
-
<param name="ddlConverter" value="org.fcrepo.server.utilities.DerbyDDLConverter"/>
|
|
601
591
|
<param name="dbUsername" value="fedoraAdmin">
|
|
602
592
|
<comment>The database user name.</comment>
|
|
603
593
|
</param>
|
|
604
|
-
<param name="testOnReturn" value="true">
|
|
605
|
-
<comment>When true, objects are validated before returned to the
|
|
606
|
-
pool.</comment>
|
|
607
|
-
</param>
|
|
608
|
-
<param name="maxActive" value="100">
|
|
609
|
-
<comment>The maximum number of active instances in pool.</comment>
|
|
610
|
-
</param>
|
|
611
594
|
<param name="dbPassword" value="fedoraAdmin">
|
|
612
595
|
<comment>The database password.</comment>
|
|
613
596
|
</param>
|
|
614
|
-
<param name="jdbcURL" value="jdbc:
|
|
597
|
+
<param name="jdbcURL" value="jdbc:mckoi://localhost:9157/">
|
|
615
598
|
<comment>The JDBC connection URL.</comment>
|
|
616
599
|
</param>
|
|
617
|
-
<param name="
|
|
618
|
-
<comment>
|
|
619
|
-
reached maximum number of active objects. Valid values are:
|
|
620
|
-
0 (fail i.e., throw Exception)
|
|
621
|
-
1 (block i.e., wait until pool resources are freed)
|
|
622
|
-
2 (grow i.e., increase the size of the pool).</comment>
|
|
600
|
+
<param name="jdbcDriverClass" value="com.mckoi.JDBCDriver">
|
|
601
|
+
<comment>The JDBC driver class name.</comment>
|
|
623
602
|
</param>
|
|
624
|
-
<param name="
|
|
625
|
-
|
|
626
|
-
|
|
627
|
-
that ceil(numIdle)/abs(numTestsPerEvictionRun) will be run.</comment>
|
|
603
|
+
<param name="ddlConverter" value="org.fcrepo.server.utilities.McKoiDDLConverter"/>
|
|
604
|
+
<param name="maxActive" value="100">
|
|
605
|
+
<comment>The maximum number of active instances in pool.</comment>
|
|
628
606
|
</param>
|
|
629
|
-
<param name="
|
|
630
|
-
<comment>The
|
|
607
|
+
<param name="maxIdle" value="10">
|
|
608
|
+
<comment>The maximum number of idle instances in pool.</comment>
|
|
631
609
|
</param>
|
|
632
610
|
<param name="maxWait" value="-1">
|
|
633
611
|
<comment>The maximum amount of time in milliseconds the
|
|
634
|
-
|
|
612
|
+
borrowObject() method should wait before throwing an Exception when
|
|
635
613
|
whenExhaustedAction is set to WHEN_EXHAUSTED_BLOCK. A value less
|
|
636
614
|
than zero indicates block indefinitely.</comment>
|
|
637
615
|
</param>
|
|
@@ -640,18 +618,42 @@
|
|
|
640
618
|
</param>
|
|
641
619
|
<param name="minEvictableIdleTimeMillis" value="1800000">
|
|
642
620
|
<comment>The minimum amount of time in milliseconds an object can be
|
|
643
|
-
|
|
621
|
+
idle in pool before eligible for eviction (if applicable). A value
|
|
644
622
|
less than zero indicates no object will be evicted due to idle time
|
|
645
623
|
alone.</comment>
|
|
646
624
|
</param>
|
|
625
|
+
<param name="numTestsPerEvictionRun" value="3">
|
|
626
|
+
<comment>The number of objects to be examined on each run of idle
|
|
627
|
+
evictor thread (if applicable). A value less than zero indicates
|
|
628
|
+
that ceil(numIdle)/abs(numTestsPerEvictionRun) will be run.</comment>
|
|
629
|
+
</param>
|
|
647
630
|
<param name="timeBetweenEvictionRunsMillis" value="-1">
|
|
648
631
|
<comment>The time in milliseconds to sleep between runs of the idle
|
|
649
|
-
|
|
650
|
-
|
|
651
|
-
</param>
|
|
632
|
+
object evictor thread. A value less than zero indicates no idle
|
|
633
|
+
evictor thread is run.</comment>
|
|
634
|
+
</param>
|
|
635
|
+
<param name="testOnBorrow" value="true">
|
|
636
|
+
<comment>When true objects are validated before borrowed from the
|
|
637
|
+
pool.</comment>
|
|
638
|
+
</param>
|
|
639
|
+
<param name="testOnReturn" value="true">
|
|
640
|
+
<comment>When true, objects are validated before returned to the
|
|
641
|
+
pool.</comment>
|
|
642
|
+
</param>
|
|
643
|
+
<param name="testWhileIdle" value="true">
|
|
644
|
+
<comment>When true, objects are validated by the idle object evictor
|
|
645
|
+
thread.</comment>
|
|
646
|
+
</param>
|
|
647
|
+
<param name="whenExhaustedAction" value="1">
|
|
648
|
+
<comment>Action to take when a new object is requested and the the pool has
|
|
649
|
+
reached maximum number of active objects. Valid values are:
|
|
650
|
+
0 (fail i.e., throw Exception)
|
|
651
|
+
1 (block i.e., wait until pool resources are freed)
|
|
652
|
+
2 (grow i.e., increase the size of the pool).</comment>
|
|
653
|
+
</param>
|
|
652
654
|
</datastore>
|
|
653
|
-
<datastore id="
|
|
654
|
-
<comment>
|
|
655
|
+
<datastore id="localDerbyPool">
|
|
656
|
+
<comment>Derby database on localhost running on port 1527 Each
|
|
655
657
|
connection pool instance has several configuration parameter that
|
|
656
658
|
can be used to tune the options for the connection pool. It is
|
|
657
659
|
recommended that you not change the default values unless you are
|
|
@@ -659,58 +661,98 @@
|
|
|
659
661
|
information regarding connection pool options, refer to the Apache
|
|
660
662
|
Commons Pool API documentation at
|
|
661
663
|
http://jakarta.apache.org/commons/pool/apidocs/index.html.</comment>
|
|
664
|
+
<param name="dbUsername" value="fedoraAdmin">
|
|
665
|
+
<comment>The database user name.</comment>
|
|
666
|
+
</param>
|
|
667
|
+
<param name="dbPassword" value="fedoraAdmin">
|
|
668
|
+
<comment>The database password.</comment>
|
|
669
|
+
</param>
|
|
670
|
+
<param name="jdbcURL" value="jdbc:derby:fedora/default/derby/fedora3;create=true">
|
|
671
|
+
<comment>The JDBC connection URL.</comment>
|
|
672
|
+
</param>
|
|
673
|
+
<param name="jdbcDriverClass" value="org.apache.derby.jdbc.EmbeddedDriver">
|
|
674
|
+
<comment>The JDBC driver class name.</comment>
|
|
675
|
+
</param>
|
|
676
|
+
<param name="ddlConverter" value="org.fcrepo.server.utilities.DerbyDDLConverter"/>
|
|
677
|
+
<param name="maxActive" value="100">
|
|
678
|
+
<comment>The maximum number of active instances in pool.</comment>
|
|
679
|
+
</param>
|
|
662
680
|
<param name="maxIdle" value="10">
|
|
663
681
|
<comment>The maximum number of idle instances in pool.</comment>
|
|
664
682
|
</param>
|
|
683
|
+
<param name="maxWait" value="-1">
|
|
684
|
+
<comment>The maximum amount of time in milliseconds the
|
|
685
|
+
borrowObject() method should wait before throwing an Exception when
|
|
686
|
+
whenExhaustedAction is set to WHEN_EXHAUSTED_BLOCK. A value less
|
|
687
|
+
than zero indicates block indefinitely.</comment>
|
|
688
|
+
</param>
|
|
689
|
+
<param name="minIdle" value="0">
|
|
690
|
+
<comment>The minimum of idle instances in pool.</comment>
|
|
691
|
+
</param>
|
|
692
|
+
<param name="minEvictableIdleTimeMillis" value="1800000">
|
|
693
|
+
<comment>The minimum amount of time in milliseconds an object can be
|
|
694
|
+
idle in pool before eligible for eviction (if applicable). A value
|
|
695
|
+
less than zero indicates no object will be evicted due to idle time
|
|
696
|
+
alone.</comment>
|
|
697
|
+
</param>
|
|
698
|
+
<param name="numTestsPerEvictionRun" value="3">
|
|
699
|
+
<comment>The number of objects to be examined on each run of idle
|
|
700
|
+
evictor thread (if applicable). A value less than zero indicates
|
|
701
|
+
that ceil(numIdle)/abs(numTestsPerEvictionRun) will be run.</comment>
|
|
702
|
+
</param>
|
|
703
|
+
<param name="timeBetweenEvictionRunsMillis" value="-1">
|
|
704
|
+
<comment>The time in milliseconds to sleep between runs of the idle
|
|
705
|
+
object evictor thread. A value less than zero indicates no idle
|
|
706
|
+
evictor thread is run.</comment>
|
|
707
|
+
</param>
|
|
665
708
|
<param name="testOnBorrow" value="true">
|
|
666
709
|
<comment>When true objects are validated before borrowed from the
|
|
667
|
-
|
|
710
|
+
pool.</comment>
|
|
711
|
+
</param>
|
|
712
|
+
<param name="testOnReturn" value="true">
|
|
713
|
+
<comment>When true, objects are validated before returned to the
|
|
714
|
+
pool.</comment>
|
|
668
715
|
</param>
|
|
669
716
|
<param name="testWhileIdle" value="true">
|
|
670
717
|
<comment>When true, objects are validated by the idle object evictor
|
|
671
|
-
|
|
718
|
+
thread.</comment>
|
|
672
719
|
</param>
|
|
673
|
-
<param name="
|
|
674
|
-
<comment>
|
|
675
|
-
|
|
676
|
-
|
|
677
|
-
|
|
678
|
-
|
|
679
|
-
validation tests will not be run.</comment>
|
|
720
|
+
<param name="whenExhaustedAction" value="1">
|
|
721
|
+
<comment>Action to take when a new object is requested and the the pool has
|
|
722
|
+
reached maximum number of active objects. Valid values are:
|
|
723
|
+
0 (fail i.e., throw Exception)
|
|
724
|
+
1 (block i.e., wait until pool resources are freed)
|
|
725
|
+
2 (grow i.e., increase the size of the pool).</comment>
|
|
680
726
|
</param>
|
|
681
|
-
|
|
727
|
+
</datastore>
|
|
728
|
+
<datastore id="localOraclePool">
|
|
729
|
+
<comment>Oracle database on localhost with SID=fedora3 Each
|
|
730
|
+
connection pool instance has several configuration parameter that
|
|
731
|
+
can be used to tune the options for the connection pool. It is
|
|
732
|
+
recommended that you not change the default values unless you are
|
|
733
|
+
trying to address a specific performance issue. For additional
|
|
734
|
+
information regarding connection pool options, refer to the Apache
|
|
735
|
+
Commons Pool API documentation at
|
|
736
|
+
http://jakarta.apache.org/commons/pool/apidocs/index.html.</comment>
|
|
682
737
|
<param name="dbUsername" value="fedoraAdmin">
|
|
683
738
|
<comment>The database user name.</comment>
|
|
684
739
|
</param>
|
|
685
|
-
<param name="connection.SetBigStringTryClob" value="true"/>
|
|
686
|
-
<param name="testOnReturn" value="true">
|
|
687
|
-
<comment>When true, objects are validated before returned to the
|
|
688
|
-
pool.</comment>
|
|
689
|
-
</param>
|
|
690
|
-
<param name="maxActive" value="100">
|
|
691
|
-
<comment>The maximum number of active instances in pool.</comment>
|
|
692
|
-
</param>
|
|
693
740
|
<param name="dbPassword" value="fedoraAdmin">
|
|
694
741
|
<comment>The database password.</comment>
|
|
695
742
|
</param>
|
|
696
743
|
<param name="jdbcURL" value="jdbc:oracle:thin:@localhost:1521:fedora3">
|
|
697
744
|
<comment>The JDBC connection URL.</comment>
|
|
698
745
|
</param>
|
|
699
|
-
<param name="whenExhaustedAction" value="1">
|
|
700
|
-
<comment>Action to take when a new object is requested and the the pool has
|
|
701
|
-
reached maximum number of active objects. Valid values are:
|
|
702
|
-
0 (fail i.e., throw Exception)
|
|
703
|
-
1 (block i.e., wait until pool resources are freed)
|
|
704
|
-
2 (grow i.e., increase the size of the pool).</comment>
|
|
705
|
-
</param>
|
|
706
|
-
<param name="numTestsPerEvictionRun" value="3">
|
|
707
|
-
<comment>The number of objects to be examined on each run of idle
|
|
708
|
-
evictor thread (if applicable). A value less than zero indicates
|
|
709
|
-
that ceil(numIdle)/abs(numTestsPerEvictionRun) will be run.</comment>
|
|
710
|
-
</param>
|
|
711
746
|
<param name="jdbcDriverClass" value="oracle.jdbc.OracleDriver">
|
|
712
747
|
<comment>The JDBC driver class name.</comment>
|
|
713
748
|
</param>
|
|
749
|
+
<param name="ddlConverter" value="org.fcrepo.server.utilities.OracleDDLConverter"/>
|
|
750
|
+
<param name="maxActive" value="100">
|
|
751
|
+
<comment>The maximum number of active instances in pool.</comment>
|
|
752
|
+
</param>
|
|
753
|
+
<param name="maxIdle" value="10">
|
|
754
|
+
<comment>The maximum number of idle instances in pool.</comment>
|
|
755
|
+
</param>
|
|
714
756
|
<param name="maxWait" value="-1">
|
|
715
757
|
<comment>The maximum amount of time in milliseconds the
|
|
716
758
|
borrowObject() method should wait before throwing an Exception when
|
|
@@ -726,33 +768,17 @@
|
|
|
726
768
|
less than zero indicates no object will be evicted due to idle time
|
|
727
769
|
alone.</comment>
|
|
728
770
|
</param>
|
|
771
|
+
<param name="numTestsPerEvictionRun" value="3">
|
|
772
|
+
<comment>The number of objects to be examined on each run of idle
|
|
773
|
+
evictor thread (if applicable). A value less than zero indicates
|
|
774
|
+
that ceil(numIdle)/abs(numTestsPerEvictionRun) will be run.</comment>
|
|
775
|
+
</param>
|
|
729
776
|
<param name="timeBetweenEvictionRunsMillis" value="-1">
|
|
730
777
|
<comment>The time in milliseconds to sleep between runs of the idle
|
|
731
778
|
object evictor thread. A value less than zero indicates no idle
|
|
732
779
|
evictor thread is run.</comment>
|
|
733
780
|
</param>
|
|
734
|
-
|
|
735
|
-
<datastore id="localPostgreSQLPool">
|
|
736
|
-
<comment>PostgreSQL database on localhost with db name of fedora3. Each
|
|
737
|
-
connection pool instance has several configuration parameter that
|
|
738
|
-
can be used to tune the options for the connection pool. It is
|
|
739
|
-
recommended that you not change the default values unless you are
|
|
740
|
-
trying to address a specific performance issue. For additional
|
|
741
|
-
information regarding connection pool options, refer to the Apache
|
|
742
|
-
Commons Pool API documentation at
|
|
743
|
-
http://jakarta.apache.org/commons/pool/apidocs/index.html.</comment>
|
|
744
|
-
<param name="maxIdle" value="10">
|
|
745
|
-
<comment>The maximum number of idle instances in pool.</comment>
|
|
746
|
-
</param>
|
|
747
|
-
<param name="testOnBorrow" value="true">
|
|
748
|
-
<comment>When true objects are validated before borrowed from the
|
|
749
|
-
pool.</comment>
|
|
750
|
-
</param>
|
|
751
|
-
<param name="testWhileIdle" value="true">
|
|
752
|
-
<comment>When true, objects are validated by the idle object evictor
|
|
753
|
-
thread.</comment>
|
|
754
|
-
</param>
|
|
755
|
-
<param name="validationQuery" value="select 1">
|
|
781
|
+
<param name="validationQuery" value="select 'validationQuery' from dual">
|
|
756
782
|
<comment>The query to run when validating connections.
|
|
757
783
|
Connections are validated according to the testOnBorrow,
|
|
758
784
|
testOnReturn, and testWhileIdle configuration values.
|
|
@@ -760,22 +786,17 @@
|
|
|
760
786
|
that returns at least one row. If this is NOT specified,
|
|
761
787
|
validation tests will not be run.</comment>
|
|
762
788
|
</param>
|
|
763
|
-
<param name="
|
|
764
|
-
|
|
765
|
-
|
|
789
|
+
<param name="testOnBorrow" value="true">
|
|
790
|
+
<comment>When true objects are validated before borrowed from the
|
|
791
|
+
pool.</comment>
|
|
766
792
|
</param>
|
|
767
793
|
<param name="testOnReturn" value="true">
|
|
768
794
|
<comment>When true, objects are validated before returned to the
|
|
769
795
|
pool.</comment>
|
|
770
796
|
</param>
|
|
771
|
-
<param name="
|
|
772
|
-
<comment>
|
|
773
|
-
|
|
774
|
-
<param name="dbPassword" value="fedoraAdmin">
|
|
775
|
-
<comment>The database password.</comment>
|
|
776
|
-
</param>
|
|
777
|
-
<param name="jdbcURL" value="jdbc:postgresql:fedora3">
|
|
778
|
-
<comment>The JDBC connection URL.</comment>
|
|
797
|
+
<param name="testWhileIdle" value="true">
|
|
798
|
+
<comment>When true, objects are validated by the idle object evictor
|
|
799
|
+
thread.</comment>
|
|
779
800
|
</param>
|
|
780
801
|
<param name="whenExhaustedAction" value="1">
|
|
781
802
|
<comment>Action to take when a new object is requested and the the pool has
|
|
@@ -784,14 +805,36 @@
|
|
|
784
805
|
1 (block i.e., wait until pool resources are freed)
|
|
785
806
|
2 (grow i.e., increase the size of the pool).</comment>
|
|
786
807
|
</param>
|
|
787
|
-
<param name="
|
|
788
|
-
|
|
789
|
-
|
|
790
|
-
|
|
808
|
+
<param name="connection.SetBigStringTryClob" value="true"/>
|
|
809
|
+
</datastore>
|
|
810
|
+
<datastore id="localPostgreSQLPool">
|
|
811
|
+
<comment>PostgreSQL database on localhost with db name of fedora3. Each
|
|
812
|
+
connection pool instance has several configuration parameter that
|
|
813
|
+
can be used to tune the options for the connection pool. It is
|
|
814
|
+
recommended that you not change the default values unless you are
|
|
815
|
+
trying to address a specific performance issue. For additional
|
|
816
|
+
information regarding connection pool options, refer to the Apache
|
|
817
|
+
Commons Pool API documentation at
|
|
818
|
+
http://jakarta.apache.org/commons/pool/apidocs/index.html.</comment>
|
|
819
|
+
<param name="dbUsername" value="fedoraAdmin">
|
|
820
|
+
<comment>The database user name.</comment>
|
|
821
|
+
</param>
|
|
822
|
+
<param name="dbPassword" value="fedoraAdmin">
|
|
823
|
+
<comment>The database password.</comment>
|
|
824
|
+
</param>
|
|
825
|
+
<param name="jdbcURL" value="jdbc:postgresql:fedora3">
|
|
826
|
+
<comment>The JDBC connection URL.</comment>
|
|
791
827
|
</param>
|
|
792
828
|
<param name="jdbcDriverClass" value="org.postgresql.Driver">
|
|
793
829
|
<comment>The JDBC driver class name.</comment>
|
|
794
830
|
</param>
|
|
831
|
+
<param name="ddlConverter" value="org.fcrepo.server.utilities.PostgresDDLConverter"/>
|
|
832
|
+
<param name="maxActive" value="100">
|
|
833
|
+
<comment>The maximum number of active instances in pool.</comment>
|
|
834
|
+
</param>
|
|
835
|
+
<param name="maxIdle" value="10">
|
|
836
|
+
<comment>The maximum number of idle instances in pool.</comment>
|
|
837
|
+
</param>
|
|
795
838
|
<param name="maxWait" value="-1">
|
|
796
839
|
<comment>The maximum amount of time in milliseconds the
|
|
797
840
|
borrowObject() method should wait before throwing an Exception when
|
|
@@ -807,14 +850,64 @@
|
|
|
807
850
|
less than zero indicates no object will be evicted due to idle time
|
|
808
851
|
alone.</comment>
|
|
809
852
|
</param>
|
|
853
|
+
<param name="numTestsPerEvictionRun" value="3">
|
|
854
|
+
<comment>The number of objects to be examined on each run of idle
|
|
855
|
+
evictor thread (if applicable). A value less than zero indicates
|
|
856
|
+
that ceil(numIdle)/abs(numTestsPerEvictionRun) will be run.</comment>
|
|
857
|
+
</param>
|
|
810
858
|
<param name="timeBetweenEvictionRunsMillis" value="-1">
|
|
811
859
|
<comment>The time in milliseconds to sleep between runs of the idle
|
|
812
860
|
object evictor thread. A value less than zero indicates no idle
|
|
813
861
|
evictor thread is run.</comment>
|
|
814
862
|
</param>
|
|
863
|
+
<param name="validationQuery" value="select 1">
|
|
864
|
+
<comment>The query to run when validating connections.
|
|
865
|
+
Connections are validated according to the testOnBorrow,
|
|
866
|
+
testOnReturn, and testWhileIdle configuration values.
|
|
867
|
+
If this is specified, it must be a SQL SELECT statement
|
|
868
|
+
that returns at least one row. If this is NOT specified,
|
|
869
|
+
validation tests will not be run.</comment>
|
|
870
|
+
</param>
|
|
871
|
+
<param name="testOnBorrow" value="true">
|
|
872
|
+
<comment>When true objects are validated before borrowed from the
|
|
873
|
+
pool.</comment>
|
|
874
|
+
</param>
|
|
875
|
+
<param name="testOnReturn" value="true">
|
|
876
|
+
<comment>When true, objects are validated before returned to the
|
|
877
|
+
pool.</comment>
|
|
878
|
+
</param>
|
|
879
|
+
<param name="testWhileIdle" value="true">
|
|
880
|
+
<comment>When true, objects are validated by the idle object evictor
|
|
881
|
+
thread.</comment>
|
|
882
|
+
</param>
|
|
883
|
+
<param name="whenExhaustedAction" value="1">
|
|
884
|
+
<comment>Action to take when a new object is requested and the the pool has
|
|
885
|
+
reached maximum number of active objects. Valid values are:
|
|
886
|
+
0 (fail i.e., throw Exception)
|
|
887
|
+
1 (block i.e., wait until pool resources are freed)
|
|
888
|
+
2 (grow i.e., increase the size of the pool).</comment>
|
|
889
|
+
</param>
|
|
815
890
|
</datastore>
|
|
816
891
|
<datastore id="localMulgaraTriplestore">
|
|
817
892
|
<comment>local Mulgara Triplestore used by the Resource Index</comment>
|
|
893
|
+
<param name="connectorClassName" value="org.trippi.impl.mulgara.MulgaraConnector">
|
|
894
|
+
<comment>The name of the Trippi Connector class used to communicate
|
|
895
|
+
with the triplestore.</comment>
|
|
896
|
+
</param>
|
|
897
|
+
<param name="remote" value="false">
|
|
898
|
+
<comment>Tells the connector to communicate with Mulgara in remote or
|
|
899
|
+
local mode. If true, the host parameter must be defined. If false,
|
|
900
|
+
the path parameter must be defined.</comment>
|
|
901
|
+
</param>
|
|
902
|
+
<param name="path" value="data/resourceIndex" isFilePath="true">
|
|
903
|
+
<comment>The local path to the main triplestore directory.</comment>
|
|
904
|
+
</param>
|
|
905
|
+
<param name="serverName" value="fedora">
|
|
906
|
+
<comment>The server name for rmi binding.</comment>
|
|
907
|
+
</param>
|
|
908
|
+
<param name="modelName" value="ri">
|
|
909
|
+
<comment>The name of the model to use.</comment>
|
|
910
|
+
</param>
|
|
818
911
|
<param name="poolInitialSize" value="3">
|
|
819
912
|
<comment>The initial size of the session pool used for queries.
|
|
820
913
|
Note: A value of 0 will cause the Resource Index to operate in
|
|
@@ -822,11 +915,13 @@
|
|
|
822
915
|
and handled in FIFO order; this will severely impair performance and
|
|
823
916
|
is only intended for debugging.</comment>
|
|
824
917
|
</param>
|
|
825
|
-
<param name="
|
|
826
|
-
<comment>
|
|
827
|
-
|
|
828
|
-
|
|
829
|
-
|
|
918
|
+
<param name="poolMaxGrowth" value="-1">
|
|
919
|
+
<comment>Maximum number of additional sessions the pool may add. If
|
|
920
|
+
specified as -1, no limit will be placed on pool growth.</comment>
|
|
921
|
+
</param>
|
|
922
|
+
<param name="readOnly" value="false">
|
|
923
|
+
<comment>Whether the triplestore should be read-only. Most Fedora
|
|
924
|
+
repositories will set this to false.</comment>
|
|
830
925
|
</param>
|
|
831
926
|
<param name="autoCreate" value="true">
|
|
832
927
|
<comment>Create the model if it doesn't already exist.
|
|
@@ -834,11 +929,6 @@
|
|
|
834
929
|
XML schema datatyped model named "xsd" will also be automatically
|
|
835
930
|
created.</comment>
|
|
836
931
|
</param>
|
|
837
|
-
<param name="bufferFlushBatchSize" value="20000">
|
|
838
|
-
<comment>The number of updates to send to the triplestore at a time.
|
|
839
|
-
This should be the same size as, or smaller than
|
|
840
|
-
autoFlushBufferSize.</comment>
|
|
841
|
-
</param>
|
|
842
932
|
<param name="autoTextIndex" value="false">
|
|
843
933
|
<comment>Whether to propagate adds/deletes to a full-text
|
|
844
934
|
[Full-Text] model automatically. While a very useful feature,
|
|
@@ -847,43 +937,28 @@
|
|
|
847
937
|
Note that if this is true and autoCreate is true, the text model
|
|
848
938
|
will also be created if it doesn't already exist.</comment>
|
|
849
939
|
</param>
|
|
850
|
-
<param name="poolMaxGrowth" value="-1">
|
|
851
|
-
<comment>Maximum number of additional sessions the pool may add. If
|
|
852
|
-
specified as -1, no limit will be placed on pool growth.</comment>
|
|
853
|
-
</param>
|
|
854
|
-
<param name="remote" value="false">
|
|
855
|
-
<comment>Tells the connector to communicate with Mulgara in remote or
|
|
856
|
-
local mode. If true, the host parameter must be defined. If false,
|
|
857
|
-
the path parameter must be defined.</comment>
|
|
858
|
-
</param>
|
|
859
940
|
<param name="autoFlushDormantSeconds" value="5">
|
|
860
941
|
<comment>Seconds of buffer inactivity that will trigger an
|
|
861
942
|
auto-flush. If this threshold is reached, flushing will occur in the
|
|
862
943
|
background, during which time the buffer is still available for
|
|
863
944
|
writing.</comment>
|
|
864
945
|
</param>
|
|
865
|
-
<param name="serverName" value="fedora">
|
|
866
|
-
<comment>The server name for rmi binding.</comment>
|
|
867
|
-
</param>
|
|
868
946
|
<param name="autoFlushBufferSize" value="20000">
|
|
869
947
|
<comment>The size at which the buffer should be auto-flushed. If
|
|
870
948
|
this threshold is reached, flushing will occur in the background,
|
|
871
949
|
during which time the buffer is still available for
|
|
872
950
|
writing.</comment>
|
|
873
951
|
</param>
|
|
874
|
-
<param name="
|
|
875
|
-
<comment>The
|
|
876
|
-
|
|
877
|
-
|
|
878
|
-
<comment>Whether the triplestore should be read-only. Most Fedora
|
|
879
|
-
repositories will set this to false.</comment>
|
|
880
|
-
</param>
|
|
881
|
-
<param name="path" value="data/resourceIndex" isFilePath="true">
|
|
882
|
-
<comment>The local path to the main triplestore directory.</comment>
|
|
952
|
+
<param name="bufferFlushBatchSize" value="20000">
|
|
953
|
+
<comment>The number of updates to send to the triplestore at a time.
|
|
954
|
+
This should be the same size as, or smaller than
|
|
955
|
+
autoFlushBufferSize.</comment>
|
|
883
956
|
</param>
|
|
884
|
-
<param name="
|
|
885
|
-
<comment>The
|
|
886
|
-
|
|
957
|
+
<param name="bufferSafeCapacity" value="40000">
|
|
958
|
+
<comment>The maximum size the buffer can reach before being forcibly
|
|
959
|
+
flushed. If this threshold is reached, flushing will occur in the
|
|
960
|
+
foreground and the buffer will be locked for writing until it is
|
|
961
|
+
finished. This should be larger than autoFlushBufferSize.</comment>
|
|
887
962
|
</param>
|
|
888
963
|
</datastore>
|
|
889
964
|
<datastore id="localPostgresMPTTriplestore">
|
|
@@ -904,20 +979,20 @@
|
|
|
904
979
|
http://jdbc.postgresql.org/download.html
|
|
905
980
|
and make sure it's accessible to your servlet container.
|
|
906
981
|
If you're running Tomcat, putting it in common/lib/ will work.</comment>
|
|
907
|
-
<param name="
|
|
982
|
+
<param name="connectorClassName" value="org.trippi.impl.mpt.MPTConnector"/>
|
|
983
|
+
<param name="ddlGenerator" value="org.nsdl.mptstore.impl.postgres.PostgresDDLGenerator"/>
|
|
984
|
+
<param name="jdbcDriver" value="org.postgresql.Driver"/>
|
|
985
|
+
<param name="jdbcURL" value="jdbc:postgresql://localhost/riTriples"/>
|
|
986
|
+
<param name="username" value="fedoraAdmin"/>
|
|
987
|
+
<param name="password" value="fedoraAdmin"/>
|
|
908
988
|
<param name="poolInitialSize" value="3"/>
|
|
909
|
-
<param name="
|
|
910
|
-
<param name="bufferFlushBatchSize" value="1000"/>
|
|
989
|
+
<param name="poolMaxSize" value="10"/>
|
|
911
990
|
<param name="backslashIsEscape" value="true"/>
|
|
991
|
+
<param name="fetchSize" value="1000"/>
|
|
912
992
|
<param name="autoFlushDormantSeconds" value="5"/>
|
|
913
|
-
<param name="password" value="fedoraAdmin"/>
|
|
914
993
|
<param name="autoFlushBufferSize" value="1000"/>
|
|
915
|
-
<param name="
|
|
916
|
-
<param name="
|
|
917
|
-
<param name="jdbcURL" value="jdbc:postgresql://localhost/riTriples"/>
|
|
918
|
-
<param name="ddlGenerator" value="org.nsdl.mptstore.impl.postgres.PostgresDDLGenerator"/>
|
|
919
|
-
<param name="connectorClassName" value="org.trippi.impl.mpt.MPTConnector"/>
|
|
920
|
-
<param name="jdbcDriver" value="org.postgresql.Driver"/>
|
|
994
|
+
<param name="bufferFlushBatchSize" value="1000"/>
|
|
995
|
+
<param name="bufferSafeCapacity" value="2000"/>
|
|
921
996
|
</datastore>
|
|
922
997
|
<datastore id="apimUpdateMessages">
|
|
923
998
|
<comment>Messaging Destination for API-M events which update the repository</comment>
|