Versions Compared

Old Version 1

changes.mady.by.user Tim Donohue

Saved on

compared with

New Version 2

changes.mady.by.user Tim Donohue

Saved on

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.

...

This functionality is just a simple set of SQL UPDATE commands that are run via the ~/bin/reset-demo-passwords script.

Updating / Upgrading DSpace installation

To ensure we are consistently updating DSpace in the same manner, please perform the following steps when updating any configuration
or making any customization to DSpace.

(If you have updates/suggestions, please let us know – we can change these processes, but we just need to make sure we are all consistently following the same general steps)

Make all Configuration/File Changes in '~/dspace-src/' FIRST

The ~/dspace-src/ folder is a Git clone of the DSpace GitHub Repository: https://github.com/DSpace/DSpace/Image Added

In this local Git repository, we are running off of a local branch named "demo". You can see all the branches by running

Code Block
git branch

Changes that you wish to keep should be committed to this local "demo" branch.

At any one time, you can compare this 'demo' branch to any version of DSpace. For example, to compare 'demo' to DSpace 1.8.2 run:

Code Block

cd ~/dspace-src
git checkout demo
git diff dspace-1.8.2
Warning

WARNING: If you make direct config edits to ~/dspace/config/ you can expect that
they may be overwritten in future (unless you also copy them to ~/dspace-src/dspace/config/)
You have been warned! Again, if your changes don't make it to ~/dspace-src/
then THEY WILL BE LOST during the next update!

Upgrade DSpace Source

If you are upgrading to the next stable version of DSpace, you can use git merge to help you merge all changes.

WARNING THE FOLLOWING IS UNTESTED! PLEASE UPDATE WHEN WE UPGRADE TO 3.0-RC1!!

For Example:

Code Block

cd ~/dspace-src
git checkout demo
git merge dspace-3.0-rc1 (UNTESTED! NOT SURE IF THIS WILL WORK - Tim)

NOTE: You should make sure to pay close attention to whether any Conflicts occurred. If so, you will need to resolve them manually.

Rebuild DSpace

Code Block

cd ~/dspace-src
mvn clean package

Push out Updates

WARNING: this overwrites existing configs in ~/dspace/config/

Code Block

sudo service tomcat stop
cd ~/dspace-src/dspace/target/dspace-[version]-build/
ant -Doverwrite=true update
sudo service tomcat start

Double check everything still looks to be working.

Also make sure your changes made it to ~/dspace/ (and that you didn't remove previous settings, especially configs)

An easy way to double check config changes is to do a 'diff' of the latest dspace.cfg with the most recent '.old' one.

Recommended to commit your changes to "demo" local branch

Assuming your changes are already over in ~/dspace-src/ this is easy...

Code Block

$ cd ~/dspace-src/
$ git commit [file]

# OR, to commit all changed files
$ git commit -a