[DS-584] start-handle-server script broken - Error in launcher.xml: Invalid class name

git-svn-id: http://scm.dspace.org/svn/repo/dspace/trunk@5080 9c30dcfa-912a-0410-8fc2-9e0234be79fd
This commit is contained in:
Stuart Lewis
2010-06-09 22:20:26 +00:00
parent 44f47bcbc3
commit eb6f7988d0
2 changed files with 25 additions and 4 deletions

View File

@@ -1,13 +1,18 @@
1.7.0 1.7.0
===== =====
1.6.2
=====
(Tim Donohue, Kim Shepherd, Keith Gilbertson, Stuart Lewis)
- [DS-584] start-handle-server script broken - Error in launcher.xml: Invalid class name
1.6.1 1.6.1
===== =====
(Mark Diggory) (Mark Diggory)
- [DS-571] Upgrade DSpace Services to next release 2.0.1 - [DS-571] Upgrade DSpace Services to next release 2.0.1
(Dale Poulter) (Dale Poulter)
- [DS-557] LC Authority Names - Lookup Feature - names w/o dates - [DS-557] LC Authority Names - Lookup Feature - names w/o dates

View File

@@ -8,7 +8,7 @@
# #
# Date: $Date$ # Date: $Date$
# #
# Copyright (c) 2002-2009, The DSpace Foundation. All rights reserved. # Copyright (c) 2002-2010, Duraspace. All rights reserved.
# #
# Redistribution and use in source and binary forms, with or without # Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are # modification, are permitted provided that the following conditions are
@@ -21,7 +21,7 @@
# notice, this list of conditions and the following disclaimer in the # notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution. # documentation and/or other materials provided with the distribution.
# #
# - Neither the name of the DSpace Foundation nor the names of its # - Neither the name of Duraspacen nor the names of its
# contributors may be used to endorse or promote products derived from # contributors may be used to endorse or promote products derived from
# this software without specific prior written permission. # this software without specific prior written permission.
# #
@@ -45,6 +45,22 @@
# Assume we're in the bin subdirectory of the DSpace installation directory # Assume we're in the bin subdirectory of the DSpace installation directory
BINDIR=`dirname $0` BINDIR=`dirname $0`
DSPACEDIR=`cd "$BINDIR/.." ; pwd`
# Get the JARs in $DSPACEDIR/jsp/WEB-INF/lib, separated by ':'
JARS=`echo $DSPACEDIR/lib/*.jar | sed 's/ /\:/g'`
# Class path for DSpace will be:
# Any existing classpath
# The JARs (WEB-INF/lib/*.jar)
# The WEB-INF/classes directory
FULLPATH=$CLASSPATH:$JARS:$DSPACEDIR/config
#Allow user to specify java options through JAVA_OPTS variable
if [ "$JAVA_OPTS" = "" ]; then
#Default Java to use 256MB of memory
JAVA_OPTS=-Xmx256m
fi
# Read parameters from DSpace config # Read parameters from DSpace config
handledir=`$BINDIR/dsrun org.dspace.core.ConfigurationManager -property handle.dir` handledir=`$BINDIR/dsrun org.dspace.core.ConfigurationManager -property handle.dir`
@@ -56,4 +72,4 @@ rm -f $handledir/txns/lock
# Start the Handle server, with a special log4j properties file. # Start the Handle server, with a special log4j properties file.
# We cannot simply write to the same logs, since log4j # We cannot simply write to the same logs, since log4j
# does not support more than one JVM writing to the same rolling log. # does not support more than one JVM writing to the same rolling log.
nohup $BINDIR/dsrun -Ddspace.log.init.disable=true -Dlog4j.configuration=log4j-handle-plugin.properties net.handle.server.Main $handledir </dev/null >> $logdir/handle-server.log 2>&1 & nohup java $JAVA_OPTS -classpath $FULLPATH -Ddspace.log.init.disable=true -Dlog4j.configuration=log4j-handle-plugin.properties net.handle.server.Main $handledir </dev/null >> $logdir/handle-server.log 2>&1 &