incubator-connectors-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From shinich...@apache.org
Subject svn commit: r1293117 - in /incubator/lcf/trunk: CHANGES.txt framework/example-multiprocess-common/start-database.sh framework/example-multiprocess-common/start-webapps.sh framework/scripts/executecommand.sh
Date Fri, 24 Feb 2012 07:37:51 GMT
Author: shinichiro
Date: Fri Feb 24 07:37:51 2012
New Revision: 1293117

URL: http://svn.apache.org/viewvc?rev=1293117&view=rev
Log:
Fix for CONNECTORS-414

Modified:
    incubator/lcf/trunk/CHANGES.txt
    incubator/lcf/trunk/framework/example-multiprocess-common/start-database.sh
    incubator/lcf/trunk/framework/example-multiprocess-common/start-webapps.sh
    incubator/lcf/trunk/framework/scripts/executecommand.sh

Modified: incubator/lcf/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/CHANGES.txt?rev=1293117&r1=1293116&r2=1293117&view=diff
==============================================================================
--- incubator/lcf/trunk/CHANGES.txt (original)
+++ incubator/lcf/trunk/CHANGES.txt Fri Feb 24 07:37:51 2012
@@ -3,6 +3,10 @@ $Id$
 
 ======================= 0.5-dev =====================
 
+CONNECTORS-414: Fix incorrect path in executecommand.sh, start-webapps.sh
+and start-database.sh
+(Shinichiro Abe)
+
 CONNECTORS-413: Use the right variable variant in all places for the Open
 Search Server connector.
 (Karl Wright)

Modified: incubator/lcf/trunk/framework/example-multiprocess-common/start-database.sh
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/example-multiprocess-common/start-database.sh?rev=1293117&r1=1293116&r2=1293117&view=diff
==============================================================================
--- incubator/lcf/trunk/framework/example-multiprocess-common/start-database.sh (original)
+++ incubator/lcf/trunk/framework/example-multiprocess-common/start-database.sh Fri Feb 24
07:37:51 2012
@@ -17,7 +17,7 @@
 
 #Make sure environment variables are properly set
 if [ -e "$JAVA_HOME"/bin/java ] ; then
-    "%JAVA_HOME%"/bin/java -cp processes/lib/hsqldb.jar org.hsqldb.Server -database.0 file:extdb;hsqldb.tx=mvcc;hsqldb.cache_file_scale=512
-dbname.0 xdb
+    "$JAVA_HOME"/bin/java -cp processes/lib/hsqldb.jar org.hsqldb.Server -database.0 file:extdb;hsqldb.tx=mvcc;hsqldb.cache_file_scale=512
-dbname.0 xdb
     exit $?
         
 else

Modified: incubator/lcf/trunk/framework/example-multiprocess-common/start-webapps.sh
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/example-multiprocess-common/start-webapps.sh?rev=1293117&r1=1293116&r2=1293117&view=diff
==============================================================================
--- incubator/lcf/trunk/framework/example-multiprocess-common/start-webapps.sh (original)
+++ incubator/lcf/trunk/framework/example-multiprocess-common/start-webapps.sh Fri Feb 24
07:37:51 2012
@@ -33,7 +33,7 @@ if [ -e "$JAVA_HOME"/bin/java ] ; then
         fi
     done
 
-    "%JAVA_HOME%"/bin/java -cp "$CLASSPATH" org.apache.manifoldcf.jettyrunner.ManifoldCFJettyRunner
+    "$JAVA_HOME"/bin/java -cp "$CLASSPATH" org.apache.manifoldcf.jettyrunner.ManifoldCFJettyRunner
     exit $?
         
 else

Modified: incubator/lcf/trunk/framework/scripts/executecommand.sh
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/scripts/executecommand.sh?rev=1293117&r1=1293116&r2=1293117&view=diff
==============================================================================
--- incubator/lcf/trunk/framework/scripts/executecommand.sh (original)
+++ incubator/lcf/trunk/framework/scripts/executecommand.sh Fri Feb 24 07:37:51 2012
@@ -36,7 +36,7 @@ if [ -e "$JAVA_HOME"/bin/java ] ; then
         done
 
         # Build the options
-	OPTIONS=$(cat "$MCF_HOME"/processes/script/options.env)
+	OPTIONS=$(cat "$MCF_HOME"/processes/options.env)
         
         # Build the defines
         DEFINES="-Dorg.apache.manifoldcf.configfile=$MCF_HOME/properties.xml"



Mime
View raw message