Permalink
Browse files

Fixed runtime classpath, and bumped Tomcat version.

  • Loading branch information...
1 parent 9088c4d commit 127505717a0b40b7f66206af8e81be601669dc68 @kzalewski kzalewski committed Oct 14, 2014
Showing with 4 additions and 3 deletions.
  1. +3 −2 bin/run.sh
  2. +1 −1 pom.xml
View
@@ -3,6 +3,7 @@
prog=`basename $0`
script_dir=`dirname $0`
root_dir=`cd "$script_dir"/..; echo $PWD`
+tomcat_home=/usr/share/tomcat
pom_file="$root_dir/pom.xml"
if [ ! -r "$pom_file" ]; then
@@ -11,7 +12,7 @@ if [ ! -r "$pom_file" ]; then
fi
app_ver=`php -r '$x=simplexml_load_file($argv[1]); echo $x->version;' $pom_file`
-base_dir="$root_dir/target/BillBuzz##$app_ver/WEB-INF"
+base_dir="$root_dir/target/billbuzz##$app_ver/WEB-INF"
SCRIPT=$1
shift
@@ -21,5 +22,5 @@ if [ ! "$SCRIPT" ]; then
exit 1
fi
-java -Xmx1024m -Xms16m -cp "$base_dir/classes/:$base_dir/lib/*" gov.nysenate.billbuzz.scripts.$SCRIPT -e $base_dir/classes/app.properties $@
+java -Xmx1024m -Xms16m -cp "$base_dir/classes/:$base_dir/lib/*:$tomcat_home/lib/*" gov.nysenate.billbuzz.scripts.$SCRIPT -e $base_dir/classes/app.properties $@
View
@@ -35,7 +35,7 @@
<log4j.version>1.2.17</log4j.version>
<mysql-connector.version>5.1.31</mysql-connector.version>
<nysenate-java-utils.version>1.0.2</nysenate-java-utils.version>
- <tomcat.version>7.0.54</tomcat.version>
+ <tomcat.version>7.0.56</tomcat.version>
<velocity.version>1.7</velocity.version>
</properties>

0 comments on commit 1275057

Please sign in to comment.