EDIT

avoiding irritating log messages from c3p0

whitespace

support for both memory models java 7 and java 8

fixing problem with updating status messages. ev fixes #3511

#5049 avoiding NPE

java 8 compatibility

• removing permGenSpace monitoring

Updating develop poms back to pre merge state

Merge branch 'master' into develop

Updating develop poms to hotfix version to avoid merge conflicts

Merge branch 'hotfix/3.12.4'

updating poms for branch'hotfix/3.12.4' with non-snapshot versions

updating poms for 3.12.4 branch with snapshot versions

Updating develop poms back to pre merge state

Merge branch 'master' into develop

Updating develop poms to hotfix version to avoid merge conflicts

Merge branch 'hotfix/3.12.3'

updating poms for branch'hotfix/3.12.3' with non-snapshot versions

updating poms for 3.12.3 branch with snapshot versions

deprecating old script which no longer should be used

increasing limit of max open files for unix to 200000

avoiding deletion of temp folder which caused problems during parallel start up

updating ide launchers

updating other dependencies

fixing startup probelms by updating c3p0 to the same version as in cdmlib

starting cdmserver with remoting enabled by default

Merge branch 'hotfix/3.12.2'

Updating develop poms back to pre merge state

Merge branch 'master' into develop

Updating develop poms to hotfix version to avoid merge conflicts

updating poms for branch'hotfix/3.12.2' with non-snapshot versions

updating poms for 3.12.2 branch with snapshot versions

Merge branch 'hotfix/3.12.1'

Updating develop poms back to pre merge state

Merge branch 'master' into develop

Updating develop poms to hotfix version to avoid merge conflicts

updating poms for branch'hotfix/3.12.1' with non-snapshot versions

updating poms for 3.12.1 branch with snapshot versions

Merge branch 'release/3.12.0'

Updating develop poms back to pre merge state

Merge branch 'master' into develop

updating develop poms to master versions to avoid merge conflicts

updating poms for branch'release/3.12.0' with non-snapshot versions

updating poms for 3.13.0-SNAPSHOT development

#5302 Add new jsp to provide general server info

Merge branch 'hotfix/3.11.1'

Updating develop poms back to pre merge state

Merge branch 'master' into develop

Updating develop poms to hotfix version to avoid merge conflicts

updating poms for branch'hotfix/3.11.1' with non-snapshot versions

updating poms for 3.11.1 branch with snapshot versions

Merge branch 'release/3.11.0'

Updating develop poms back to pre merge state

Merge branch 'master' into develop

updating develop poms to master versions to avoid merge conflicts

updating poms for branch'release/3.11.0' with non-snapshot versions

updating poms for 3.12.0-SNAPSHOT development

Merge branch 'release/3.10.0'

Updating develop poms back to pre merge state

Merge branch 'master' into develop

updating develop poms to master versions to avoid merge conflicts

updating poms for branch'release/3.10.0' with non-snapshot versions

updating poms for 3.11.0-SNAPSHOT development

Merge branch 'release/3.9.0'

Updating develop poms back to pre merge state

Merge branch 'master' into develop

updating develop poms to master versions to avoid merge conflicts

updating poms for branch'release/3.9.0' with non-snapshot versions

updating poms for 3.10.0-SNAPSHOT development

Updating develop poms back to pre merge state

Merge branch 'master' into develop

Merge branch 'release/3.8.0'

updating develop poms to master versions to avoid merge conflicts

updating poms for branch'release/3.8.0' with non-snapshot versions

updating poms for 3.9.0-SNAPSHOT development

Revert "updating poms for 3.9.0-SNAPSHOT development"

This reverts commit 8645b5a1bcf647d6d1ea7eb649fc611a432b997c.

updating poms for 3.9.0-SNAPSHOT development

commenting unimplemented action

adding option to allow forcably updating the database schema version

minor change in text written to log

updating links to http://cybertaxonomy.eu/

running all cdm-webapp instances from unpackes webapplication

• the war file is unzipped by the bootloader before starting the instances

restoring StartupQueue which was removed before

#4958 - code refacoring preserverd after reverting change sets

new eclipse launcher

Revert "Revert "Revert "#4958 parallel starting of instances to speed up the initial start up"""

This reverts commit caccde4bf7f795adcce8e0967df6690f3ef9638e.

Revert "Revert "#4958 parallel starting of instances to speed up the initial start up""

This reverts commit eb676073dbb9cd9fad245a3fc91a7e3e604627cc.

Revert "#4958 parallel starting of instances to speed up the initial start up"

This reverts commit c5c2e735159c8bc1bec2fdee5a5cfb432caedb84.

#4958 parallel starting of instances to speed up the initial start up

Merge branch 'release/3.7.0'

Updating develop poms back to pre merge state

Merge branch 'master' into develop

updating develop poms to master versions to avoid merge conflicts

updating poms for branch'release/3.7.0' with non-snapshot versions

updating poms for 3.8.0-SNAPSHOT development

Merge branch 'develop' of edit-git:/var/git/cdm-server into develop

Conflicts:
pom.xml

resetting project version i order to redo the last release

updating poms for 3.9.0-SNAPSHOT development

fixing cdm-webapp dependency which was set to a fixed version

Updating develop poms back to pre merge state

Merge branch 'master' into develop