You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by cw...@apache.org on 2009/09/04 15:54:16 UTC
svn commit: r811412 - in
/incubator/uima/uima-as/trunk/uima-as-distr/src/main/scripts:
startBroker.bat startBroker.sh
Author: cwiklik
Date: Fri Sep 4 13:54:16 2009
New Revision: 811412
URL: http://svn.apache.org/viewvc?rev=811412&view=rev
Log:
UIMA-1328 modified to copy activemq-nojournal.xml and log4j.properties from as_config instead of config directory. The config directory is added to the classpath by setUimaClasspath script which causes runtime problems when there is a component dependent on log4j
Modified:
incubator/uima/uima-as/trunk/uima-as-distr/src/main/scripts/startBroker.bat
incubator/uima/uima-as/trunk/uima-as-distr/src/main/scripts/startBroker.sh
Modified: incubator/uima/uima-as/trunk/uima-as-distr/src/main/scripts/startBroker.bat
URL: http://svn.apache.org/viewvc/incubator/uima/uima-as/trunk/uima-as-distr/src/main/scripts/startBroker.bat?rev=811412&r1=811411&r2=811412&view=diff
==============================================================================
--- incubator/uima/uima-as/trunk/uima-as-distr/src/main/scripts/startBroker.bat (original)
+++ incubator/uima/uima-as/trunk/uima-as-distr/src/main/scripts/startBroker.bat Fri Sep 4 13:54:16 2009
@@ -48,8 +48,8 @@
@REM If config file not there, copy it
@if not exist "%ACTIVEMQ_BASE%\conf\activemq-nojournal.xml" (
- copy "%UIMA_HOME%\config\log4j.properties" "%ACTIVEMQ_BASE%\conf"
- copy "%UIMA_HOME%\config\activemq-nojournal.xml" "%ACTIVEMQ_BASE%\conf"
+ copy "%UIMA_HOME%\as_config\log4j.properties" "%ACTIVEMQ_BASE%\conf"
+ copy "%UIMA_HOME%\as_config\activemq-nojournal.xml" "%ACTIVEMQ_BASE%\conf"
)
call "%ACTIVEMQ_HOME%\bin\activemq.bat" "xbean:file:%ACTIVEMQ_BASE%/conf/activemq-nojournal.xml"
Modified: incubator/uima/uima-as/trunk/uima-as-distr/src/main/scripts/startBroker.sh
URL: http://svn.apache.org/viewvc/incubator/uima/uima-as/trunk/uima-as-distr/src/main/scripts/startBroker.sh?rev=811412&r1=811411&r2=811412&view=diff
==============================================================================
--- incubator/uima/uima-as/trunk/uima-as-distr/src/main/scripts/startBroker.sh (original)
+++ incubator/uima/uima-as/trunk/uima-as-distr/src/main/scripts/startBroker.sh Fri Sep 4 13:54:16 2009
@@ -40,8 +40,8 @@
# If the config file isn't there, copy it
if [ ! -f "$ACTIVEMQ_BASE/conf/activemq-nojournal.xml" ] ; then
- cp "$UIMA_HOME/config/activemq-nojournal.xml" "$ACTIVEMQ_BASE/conf/"
- cp "$UIMA_HOME/config/log4j.properties" "$ACTIVEMQ_BASE/conf/"
+ cp "$UIMA_HOME/as_config/activemq-nojournal.xml" "$ACTIVEMQ_BASE/conf/"
+ cp "$UIMA_HOME/as_config/log4j.properties" "$ACTIVEMQ_BASE/conf/"
fi
if [ ! -x "$ACTIVEMQ_HOME/bin/activemq" ]; then