1 | ---------------------------- |
---|
2 | General upgrade instructions |
---|
3 | ---------------------------- |
---|
4 | |
---|
5 | Quick overview of the upgrade steps (for details see DEPLOY-README) |
---|
6 | |
---|
7 | - Unpack the VLO distribution tarball |
---|
8 | |
---|
9 | - Go to the 'war' directory |
---|
10 | - Run the 'unpack-wars.sh' script in that directory |
---|
11 | (OR execute the following steps manually: |
---|
12 | - Unzip the vlo-solr-#.##.war in a new 'solr' directory |
---|
13 | - Unzip the vlo-web-app-#.##.war in a new 'vlo' directory |
---|
14 | - Recursively assign ownership of the entire unpacked distribution to the |
---|
15 | appropriate user, i.e. 'vlouser' on catalog.clarin.eu) |
---|
16 | |
---|
17 | - In the 'config' directory, inspect VloConfig.xml and the data roots |
---|
18 | configuration file that is included into this file by means of XInclude. It is |
---|
19 | advised to perform a diff between the old and new versions of these files. |
---|
20 | Depending on configuration preferences, you may want to copy settings from the |
---|
21 | old configuration to the new one. |
---|
22 | |
---|
23 | - Stop the Tomcat or at least the VLO web app and Solr applications |
---|
24 | - Replace the 'current' symlink with a link to location of the new VLO directory |
---|
25 | |
---|
26 | - If needed, flush the Solr index (by removing the data directory's content) |
---|
27 | - In 'bin', run the importer using the updated configuration file: |
---|
28 | ./vlo_solr_importer.sh -c ../config/VloConfig.xml |
---|
29 | |
---|
30 | -------------------------- |
---|
31 | Upgrading from 3.2 to 3.3 |
---|
32 | -------------------------- |
---|
33 | * Take note of the change in VloConfig.xml which moves the data roots definition |
---|
34 | out of VloConfig.xml by means of XInclude. The configuration file now gets |
---|
35 | prepared for deployment environments at build time, so it is no longer necessary |
---|
36 | to copy over old configuration values in all cases. |
---|
37 | |
---|
38 | * In the context fragment for the VLO web application, ADD the following |
---|
39 | attribute to the <Context> root element: |
---|
40 | |
---|
41 | sessionCookiePath="/" |
---|
42 | |
---|
43 | and, if set, REMOVE any "crossContext" parameter. |
---|
44 | |
---|
45 | --------------------------- |
---|
46 | Upgrading from 3.1 to 3.2 |
---|
47 | --------------------------- |
---|
48 | * Take note of the following changes in VloConfig.xml: |
---|
49 | |
---|
50 | - 'facetConceptsFile' now defines the location of the facet/concept mapping |
---|
51 | definition on disk; to use the default bundled definition, leave it empty. |
---|
52 | Before this used to have the value '/facetConcepts.xml' which will no longer be |
---|
53 | valid - it can safely be replaced with either the empty string or |
---|
54 | 'facetConcepts.xml' to use the file in the same directory as VloConfig.xml. |
---|
55 | |
---|
56 | - 'languageLinkPrefix' element has been REPLACED by 'languageLinkTemplate'; |
---|
57 | remove the former and add the following to existing configurations: |
---|
58 | |
---|
59 | <languageLinkTemplate>https://infra.clarin.eu/content/language_info/data/{}.html</languageLinkTemplate> |
---|
60 | |
---|
61 | - 'languageNameVariantsUrl' and 'licenseAvailabilityMapUrl' are now required |
---|
62 | mapping configuration elements. So the following should normally be added: |
---|
63 | |
---|
64 | <languageNameVariantsUrl>/LanguageNameVariantsMap.xml</languageNameVariantsUrl> |
---|
65 | <licenseAvailabilityMapUrl>/LicenseAvailabilityMap.xml</licenseAvailabilityMapUrl> |
---|
66 | |
---|
67 | - optional 'showResultScores' element, defaults to false. Should be false except |
---|
68 | when debugging result ranking. |
---|
69 | |
---|
70 | - The facet field 'availability' is now available |
---|
71 | |
---|
72 | * Be aware that the default maximum heap space of the importer has been |
---|
73 | increased from 2GB to 3GB (by means of a change in bin/vlo_solr_importer.sh). |
---|
74 | |
---|
75 | --------------------------- |
---|
76 | Upgrading from 3.0.x to 3.1 |
---|
77 | --------------------------- |
---|
78 | |
---|
79 | * (For stable version) Update the external service running at <http://infra.clarin.eu/ |
---|
80 | service/language/info.php> to select the 'languageCode' facet using ISO639-3 language |
---|
81 | codes, e.g. <http://catalog.clarin.eu/vlo/search?fq=languageCode:code:nep> for 'nep'. |
---|
82 | Contact Sander Maijers <sander@clarin.eu> for more information. |
---|
83 | |
---|
84 | * Take note of the following changes in VloConfig.xml: |
---|
85 | - 'imdiBrowserUrl' element has been removed |
---|
86 | - 'organisationNamesUrl' element has been added (should normally have |
---|
87 | '/OrganisationControlledVocabulary.xml' as its value) |
---|
88 | - the 'language' facet has been replaced with 'languageCode'; the latter replaces the |
---|
89 | former in the 'facetField', 'simpleSearchFacetField' and 'searchResultField' elements |
---|
90 | |
---|
91 | * Flush the solr index (remove the data directory) and run a new import or copy the |
---|
92 | beta index over if it is based on a recent 3.1 import. |
---|
93 | |
---|
94 | --------------------------- |
---|
95 | Upgrading from 3.0 to 3.0.1 |
---|
96 | --------------------------- |
---|
97 | |
---|
98 | No additional actions required, the existing Solr index can be kept |
---|
99 | |
---|
100 | --------------------------- |
---|
101 | Upgrading from 2.18 to 3.0 |
---|
102 | --------------------------- |
---|
103 | |
---|
104 | * In version 3.0, the context parameters for the VLO web application have changed, see |
---|
105 | the file META-INF/context.xml for examples. The following parameters are now being |
---|
106 | processed: |
---|
107 | |
---|
108 | - eu.carlin.cmdi.vlo.config.location |
---|
109 | Optional but recommended. Should point to the location of VloConfig.xml that |
---|
110 | should be used. Replaces The previously available parameter 'externalConfig', which is |
---|
111 | no longer supported. |
---|
112 | |
---|
113 | - eu.carlin.cmdi.vlo.solr.serverUrl |
---|
114 | Optional. Configures the base URL of the SOLR instance to connect to. |
---|
115 | Usage is not recommended, instead configure the Solr URL via VloConfig.xml (see |
---|
116 | below). |
---|
117 | |
---|
118 | * New options have been added to the shared VLO configuration file VloConfig.xml |
---|
119 | (in vlo-3.0/config): |
---|
120 | |
---|
121 | - The 'length' attributes in list elements can be removed |
---|
122 | |
---|
123 | - The Solr endpoint has changed because it is now multicore. Change for example: |
---|
124 | |
---|
125 | <solrUrl>http://localhost:8084/vlo_solr/</solrUrl> |
---|
126 | |
---|
127 | into |
---|
128 | |
---|
129 | <solrUrl>http://localhost:8084/vlo_solr/core0/</solrUrl> |
---|
130 | |
---|
131 | This also applies to the eu.carlin.cmdi.vlo.solr.serverUrl context parameter (see above). |
---|
132 | |
---|
133 | - The following elements should be added: |
---|
134 | |
---|
135 | <!-- begin added in 3.0 --> |
---|
136 | |
---|
137 | <collectionFacet>collection</collectionFacet> |
---|
138 | |
---|
139 | <simpleSearchFacetFields> |
---|
140 | <simpleSearchFacetField>language</simpleSearchFacetField> |
---|
141 | <simpleSearchFacetField>resourceClass</simpleSearchFacetField> |
---|
142 | <simpleSearchFacetField>genre</simpleSearchFacetField> |
---|
143 | <simpleSearchFacetField>nationalProject</simpleSearchFacetField> |
---|
144 | </simpleSearchFacetFields> |
---|
145 | |
---|
146 | <!-- Fields shown in expanded search results on the search page --> |
---|
147 | <searchResultFields> |
---|
148 | <searchResultField>name</searchResultField> |
---|
149 | <searchResultField>country</searchResultField> |
---|
150 | <searchResultField>languages</searchResultField> |
---|
151 | <searchResultField>modality</searchResultField> |
---|
152 | <searchResultField>subject</searchResultField> |
---|
153 | <searchResultField>genre</searchResultField> |
---|
154 | <searchResultField>organisation</searchResultField> |
---|
155 | <searchResultField>collection</searchResultField> |
---|
156 | <searchResultField>nationalProject</searchResultField> |
---|
157 | </searchResultFields> |
---|
158 | |
---|
159 | <!-- Fields ignored in the record page --> |
---|
160 | <ignoredFields> |
---|
161 | <ignoredField>format</ignoredField> |
---|
162 | </ignoredFields> |
---|
163 | |
---|
164 | <!-- Fields shown as technical fields in the record page --> |
---|
165 | <technicalFields> |
---|
166 | <technicalField>id</technicalField> |
---|
167 | <technicalField>dataProvider</technicalField> |
---|
168 | <technicalField>metadataSource</technicalField> |
---|
169 | <technicalField>_landingPageRef</technicalField> |
---|
170 | <technicalField>_searchPageRef</technicalField> |
---|
171 | <technicalField>_contentSearchRef</technicalField> |
---|
172 | <technicalField>_lastSeen</technicalField> |
---|
173 | <technicalField>_componentProfile</technicalField> |
---|
174 | </technicalFields> |
---|
175 | |
---|
176 | <!-- end added in 3.0 --> |
---|
177 | |
---|
178 | - The element 'facetfield' should be replaced with new values: |
---|
179 | |
---|
180 | <!-- begin changed in 3.0 --> |
---|
181 | |
---|
182 | <facetFields> |
---|
183 | <facetField>language</facetField> |
---|
184 | <facetField>resourceClass</facetField> |
---|
185 | <facetField>continent</facetField> |
---|
186 | <facetField>country</facetField> |
---|
187 | <facetField>modality</facetField> |
---|
188 | <facetField>genre</facetField> |
---|
189 | <facetField>subject</facetField> |
---|
190 | <facetField>format</facetField> |
---|
191 | <facetField>organisation</facetField> |
---|
192 | <facetField>nationalProject</facetField> |
---|
193 | <facetField>keywords</facetField> |
---|
194 | <facetField>dataProvider</facetField> |
---|
195 | </facetFields> |
---|
196 | |
---|
197 | <!-- end changed in 3.0 --> |
---|
198 | |
---|
199 | * The location of the Solr index data directory is now governed through a java system |
---|
200 | property 'solr.data.dir'. Add the following to ${catalina.home}/bin/setenv.sh: |
---|
201 | |
---|
202 | export JAVA_OPTS="$JAVA_OPTS -Dsolr.data.dir=/lat/webapps/vlo/solr/data-beta" |
---|
203 | |
---|
204 | Substitute the directory with the actual desired location of the index data. The |
---|
205 | parent directory has to exist and should be writable by the Tomcat user. |
---|
206 | |
---|
207 | --------------------------- |
---|
208 | Upgrading from 2.17 to 2.18 |
---|
209 | --------------------------- |
---|
210 | |
---|
211 | * In version 2.18 of the VLO, the URL mapping has been changed. To prevent |
---|
212 | existing references and bookmarks from breaking, add rewrite rules to the |
---|
213 | HTTP server to achieve the following mappings: |
---|
214 | |
---|
215 | [TODO: Define actual mod_rewrite rules and document here] |
---|
216 | |
---|
217 | - {vlobase}/?wicket:bookmarkablePage=:eu.clarin.cmdi.vlo.pages.ShowResultPage&docId={docId} |
---|
218 | -> {vlobase}/record?docId={docId} |
---|
219 | |
---|
220 | - {vlobase}/?wicket:bookmarkablePage=:eu.clarin.cmdi.vlo.pages.ShowAllFacetValuesPage&selectedFacet={facet} |
---|
221 | -> {vlobase}/values/{facet} |
---|
222 | |
---|
223 | In both case all additional GET parameters SHOULD be kept. |
---|
224 | |
---|
225 | Next to the URL mapping, the XML parameter file has undergone some changes: |
---|
226 | |
---|
227 | <!-- Sets the maximum number of page instances which will be stored in the application scoped second level cache for faster retrieval --> |
---|
228 | <pagesInApplicationCache>40</pagesInApplicationCache> |
---|
229 | |
---|
230 | <!-- Sets the maximum size (in KILOBYTES) of the File where page instances per session are stored. --> |
---|
231 | <sessionCacheSize>10000</sessionCacheSize> |
---|
232 | |
---|
233 | Has been added to tune the Wicket page cache. The first parameter allows you |
---|
234 | to set the size of the application wide cache holding pages. The second parameter |
---|
235 | denotes the size of the cache (in kilobytes) associated with a session. The values |
---|
236 | listed above are the Wicket defaults. |
---|
237 | |
---|
238 | Other changes in the parameter file: |
---|
239 | - maxFileSize and use MaxFileSize have been integrated into one parameter: |
---|
240 | |
---|
241 | maxFileSize |
---|
242 | |
---|
243 | If equal to 0, no upper limit to the size of metadata input files will be |
---|
244 | applied. |
---|
245 | |
---|
246 | - maxDaysToLife has been renamed into maxDaysInSolr |
---|
247 | |
---|
248 | - VloHomeLink has been renamed into homeUrl |
---|
249 | |
---|
250 | - helpUrl has been added; a link to a help page. |
---|
251 | |
---|
252 | - The facetConceptsFile parameter, referencing the facetConcepts.xml file, |
---|
253 | has been added also. This is part of the effort of making parameterised |
---|
254 | instantiation of the VLO possible. |
---|
255 | |
---|
256 | - Also, the facetOverviewLength parameter has been added. This parameter controls |
---|
257 | the listing of facets on the search page. |
---|
258 | |
---|
259 | - Similar to 'useMaxFileSize' the expectReverseProxy parameter has been removed |
---|
260 | |
---|
261 | Finally, |
---|
262 | |
---|
263 | <cqlEndpointFilter>http://cqlservlet.mpi.nl/</cqlEndpointFilter> |
---|
264 | |
---|
265 | <cqlEndpointAlternative>http://cqlservlet.mpi.nl/</cqlEndpointAlternative> |
---|
266 | |
---|
267 | add the possibility of creating a filter for endpoints. |
---|