Hello, Jolien,
When I tried to check the patch compatibility in step 2, I received error messages indicating that I was in the wrong directory. So rather than running the check in the dspace directory as shown in step 1, I changed to the [dspace-src] directory. The check ran from this location with the following response:
[glenn@rctest dspace-6.3-release]$ git apply --check ./dspace_6x…stable_6x.diff
error: cannot apply binary patch to 'dspace/modules/xmlui-mirage2/src/main/webapp/themes/Mirage2/images/orcid_icon.png' without full index line
error: dspace/modules/xmlui-mirage2/src/main/webapp/themes/Mirage2/images/orcid_icon.png: patch does not apply
error: dspace/modules/xmlui-mirage2/src/main/webapp/themes/Mirage2/xsl/theme.xsl: already exists in working directory
error: cannot apply binary patch to 'dspace/modules/xmlui/src/main/webapp/themes/Mirage/images/orcid_icon.png' without full index line
error: dspace/modules/xmlui/src/main/webapp/themes/Mirage/images/orcid_icon.png: patch does not apply
I wasn't sure the errors were fatal, so I proceeded to apply the patch. I received this response:
[glenn@rctest dspace-6.3-release]$ git apply --whitespace=nowarn --reject ./dspace_6x…stable_6x.diff
Checking patch dspace/config/dspace.cfg...
Checking patch dspace/config/spring/api/core-services.xml...
Checking patch dspace/config/spring/api/discovery.xml...
Checking patch dspace/config/spring/api/orcid-authority-services.xml...
Checking patch dspace/modules/additions/src/main/java/com/atmire/dspace/authority/OrcidAuthorityValueServiceImpl.java...
Checking patch dspace/modules/additions/src/main/java/com/atmire/dspace/discovery/ORCIDIdIndexingPlugin.java...
Checking patch dspace/modules/additions/src/main/java/org/dspace/authority/AuthorityUtil.java...
Checking patch dspace/modules/additions/src/main/java/org/dspace/authority/AuthorityValueFinder.java...
Checking patch dspace/modules/additions/src/main/java/org/dspace/authority/PersonAuthorityValue.java...
Checking patch dspace/modules/additions/src/main/java/org/dspace/authority/orcid/Orcidv2AuthorityValue.java...
Checking patch dspace/modules/rest/src/main/java/org/dspace/rest/AuthoritiesResource.java...
Checking patch dspace/modules/rest/src/main/java/org/dspace/rest/CollectionsResource.java...
Checking patch dspace/modules/rest/src/main/java/org/dspace/rest/ItemsResource.java...
Checking patch dspace/modules/rest/src/main/java/org/dspace/rest/RestIndex.java...
Checking patch dspace/modules/rest/src/main/java/org/dspace/rest/common/Item.java...
Checking patch dspace/modules/rest/src/main/webapp/WEB-INF/web.xml...
Checking patch dspace/modules/xmlui-mirage2/src/main/webapp/themes/Mirage2/images/orcid_icon.png...
error: cannot apply binary patch to 'dspace/modules/xmlui-mirage2/src/main/webapp/themes/Mirage2/images/orcid_icon.png' without full index line
error: dspace/modules/xmlui-mirage2/src/main/webapp/themes/Mirage2/images/orcid_icon.png: patch does not apply
Checking patch dspace/modules/xmlui-mirage2/src/main/webapp/themes/Mirage2/styles/_style.scss...
Checking patch dspace/modules/xmlui-mirage2/src/main/webapp/themes/Mirage2/xsl/additions.xsl...
Checking patch dspace/modules/xmlui-mirage2/src/main/webapp/themes/Mirage2/xsl/theme.xsl...
error: dspace/modules/xmlui-mirage2/src/main/webapp/themes/Mirage2/xsl/theme.xsl: already exists in working directory
Checking patch dspace/modules/xmlui/src/main/java/org/dspace/app/xmlui/cocoon/DSpaceMETSGenerator.java...
Checking patch dspace/modules/xmlui/src/main/java/org/dspace/app/xmlui/objectmanager/AbstractAdapter.java...
Checking patch dspace/modules/xmlui/src/main/java/org/dspace/app/xmlui/objectmanager/ItemAdapter.java...
Checking patch dspace/modules/xmlui/src/main/resources/aspects/Discovery/i18n/messages.xml...
Checking patch dspace/modules/xmlui/src/main/webapp/themes/Mirage/Mirage.xsl...
Checking patch dspace/modules/xmlui/src/main/webapp/themes/Mirage/images/orcid_icon.png...
error: cannot apply binary patch to 'dspace/modules/xmlui/src/main/webapp/themes/Mirage/images/orcid_icon.png' without full index line
error: dspace/modules/xmlui/src/main/webapp/themes/Mirage/images/orcid_icon.png: patch does not apply
Checking patch dspace/modules/xmlui/src/main/webapp/themes/Mirage/lib/css/style.css...
Checking patch dspace/modules/xmlui/src/main/webapp/themes/Mirage/lib/xsl/additions.xsl...
Checking patch dspace/pom.xml...
Checking patch dspace/solr/search/conf/schema.xml...
Applied patch dspace/config/dspace.cfg cleanly.
Applied patch dspace/config/spring/api/core-services.xml cleanly.
Applied patch dspace/config/spring/api/discovery.xml cleanly.
Applied patch dspace/config/spring/api/orcid-authority-services.xml cleanly.
Applied patch dspace/modules/additions/src/main/java/com/atmire/dspace/authority/OrcidAuthorityValueServiceImpl.java cleanly.
Applied patch dspace/modules/additions/src/main/java/com/atmire/dspace/discovery/ORCIDIdIndexingPlugin.java cleanly.
Applied patch dspace/modules/additions/src/main/java/org/dspace/authority/AuthorityUtil.java cleanly.
Applied patch dspace/modules/additions/src/main/java/org/dspace/authority/AuthorityValueFinder.java cleanly.
Applied patch dspace/modules/additions/src/main/java/org/dspace/authority/PersonAuthorityValue.java cleanly.
Applied patch dspace/modules/additions/src/main/java/org/dspace/authority/orcid/Orcidv2AuthorityValue.java cleanly.
Applied patch dspace/modules/rest/src/main/java/org/dspace/rest/AuthoritiesResource.java cleanly.
Applied patch dspace/modules/rest/src/main/java/org/dspace/rest/CollectionsResource.java cleanly.
Applied patch dspace/modules/rest/src/main/java/org/dspace/rest/ItemsResource.java cleanly.
Applied patch dspace/modules/rest/src/main/java/org/dspace/rest/RestIndex.java cleanly.
Applied patch dspace/modules/rest/src/main/java/org/dspace/rest/common/Item.java cleanly.
Applied patch dspace/modules/rest/src/main/webapp/WEB-INF/web.xml cleanly.
Applied patch dspace/modules/xmlui-mirage2/src/main/webapp/themes/Mirage2/styles/_style.scss cleanly.
Applied patch dspace/modules/xmlui-mirage2/src/main/webapp/themes/Mirage2/xsl/additions.xsl cleanly.
Applied patch dspace/modules/xmlui/src/main/java/org/dspace/app/xmlui/cocoon/DSpaceMETSGenerator.java cleanly.
Applied patch dspace/modules/xmlui/src/main/java/org/dspace/app/xmlui/objectmanager/AbstractAdapter.java cleanly.
Applied patch dspace/modules/xmlui/src/main/java/org/dspace/app/xmlui/objectmanager/ItemAdapter.java cleanly.
Applied patch dspace/modules/xmlui/src/main/resources/aspects/Discovery/i18n/messages.xml cleanly.
Applied patch dspace/modules/xmlui/src/main/webapp/themes/Mirage/Mirage.xsl cleanly.
Applied patch dspace/modules/xmlui/src/main/webapp/themes/Mirage/lib/css/style.css cleanly.
Applied patch dspace/modules/xmlui/src/main/webapp/themes/Mirage/lib/xsl/additions.xsl cleanly.
Applied patch dspace/pom.xml cleanly.
Applied patch dspace/solr/search/conf/schema.xml cleanly.
After applying the patch, I removed existing files in the installer directory and ran Maven:
[glenn@rctest dspace-6.3-release]$ mvn -U clean package -Dmirage2.on=true
...
[INFO] Copying files to /ebs/dspace-source/dspace-6.3-release/dspace/target/dspace-installer
[INFO] ------------------------------------------------------------------------
[INFO] Reactor Summary:
[INFO]
[INFO] DSpace Addon Modules ............................... SUCCESS [ 1.105 s]
[INFO] DSpace Kernel :: Additions and Local Customizations SUCCESS [ 12.330 s]
[INFO] DSpace XML-UI Mirage2 Theme :: Local Customisations SUCCESS [02:04 min]
[INFO] DSpace XML-UI (Manakin) :: Local Customizations .... SUCCESS [ 25.179 s]
[INFO] DSpace JSP-UI :: Local Customizations .............. SUCCESS [ 6.990 s]
[INFO] DSpace RDF :: Local Customizations ................. SUCCESS [ 7.367 s]
[INFO] DSpace REST :: Local Customizations ................ SUCCESS [ 13.744 s]
[INFO] DSpace SWORD :: Local Customizations ............... SUCCESS [ 5.532 s]
[INFO] DSpace SWORD v2 :: Local Customizations ............ SUCCESS [ 5.744 s]
[INFO] DSpace SOLR :: Local Customizations ................ SUCCESS [ 8.435 s]
[INFO] DSpace OAI-PMH :: Local Customizations ............. SUCCESS [ 8.241 s]
[INFO] DSpace Assembly and Configuration 6.3 .............. SUCCESS [01:03 min]
[INFO] ------------------------------------------------------------------------
[INFO] BUILD SUCCESS
I added
orcid.connector.url = https://orcid.org/ to local.cfg in [dspace-source]/dspace-6.3-release/dspace/target/dspace-installer/config/local.cfg.
Then I ran "ant update" and restarted Tomcat.
Hope you can tell me where I went wrong.
Thanks,
Glenn