Menu
▾
▴
treebase-guts
|
From: <rv...@us...> - 2009-09-26 04:05:08
|
Revision: 186
http://treebase.svn.sourceforge.net/treebase/?rev=186&view=rev
Author: rvos
Date: 2009-09-26 04:04:53 +0000 (Sat, 26 Sep 2009)
Log Message:
-----------
Made publish scrip more portable w.r.t. source location, using TREEBASE_HOME env var
Modified Paths:
--------------
trunk/treebase-core/src/main/perl/misc/publish
Modified: trunk/treebase-core/src/main/perl/misc/publish
===================================================================
--- trunk/treebase-core/src/main/perl/misc/publish 2009-09-12 17:38:56 UTC (rev 185)
+++ trunk/treebase-core/src/main/perl/misc/publish 2009-09-26 04:04:53 UTC (rev 186)
@@ -26,11 +26,11 @@
fi
TOMCAT_URL=http://8ball.sdsc.edu:6666/treebase-web/
-VERSIONFILE=treebase-core/src/main/java/org/cipres/treebase/Version.java
+VERSIONFILE=${TREEBASE_HOME}/treebase-core/src/main/java/org/cipres/treebase/Version.java
# Rebuild the application WAR file, if requested
if $update_sources; then
- cd $HOME/treebase/trunk || die "cd treebase/trunk";
+ cd $TREEBASE_HOME || die "cd $TREEBASE_HOME";
rm -f $VERSIONFILE
svn update || die
# mvn clean || die
@@ -43,7 +43,7 @@
perl -i -lpe 'BEGIN { while ($ARGV[0] =~ /=/) {my($k,$v) = split /=/, shift(), 2; $prop{$k} = $v } } s/##(\w+)##/$prop{$1}/g' "VCSID=$svnrevision" "VCSDATESTRING=$svndatestring" $VERSIONFILE
- touch treebase-web/src/main/webapp/common/footer.jsp
+ touch ${TREEBASE_HOME}/treebase-web/src/main/webapp/common/footer.jsp
mvn install -Dmaven.test.skip=true
fi
@@ -58,7 +58,7 @@
# and move the new warfile into place
if $update_sources; then
cd $WEBAPPS && rm -rf $TARGET_DIR && rm -f treebase-web.war
- if cp -v warLocation/treebase-web.war . ; then
+ if cp -v ${TREEBASE_HOME}/treebase-web/target/treebase-web.war . ; then
:
else
die "Installation failed: no WAR file"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rv...@us...> - 2009-11-04 14:19:05
|
Revision: 238
http://treebase.svn.sourceforge.net/treebase/?rev=238&view=rev
Author: rvos
Date: 2009-11-04 14:18:58 +0000 (Wed, 04 Nov 2009)
Log Message:
-----------
Changed TOMCAT_URL to point to NESCent dev server in publish script
Modified Paths:
--------------
trunk/treebase-core/src/main/perl/misc/publish
Modified: trunk/treebase-core/src/main/perl/misc/publish
===================================================================
--- trunk/treebase-core/src/main/perl/misc/publish 2009-11-04 10:51:31 UTC (rev 237)
+++ trunk/treebase-core/src/main/perl/misc/publish 2009-11-04 14:18:58 UTC (rev 238)
@@ -25,7 +25,7 @@
update_sources=false
fi
-TOMCAT_URL=http://8ball.sdsc.edu:6666/treebase-web/
+TOMCAT_URL=http://treebasedb-dev.nescent.org:6666/treebase-web/
VERSIONFILE=${TREEBASE_HOME}/treebase-core/src/main/java/org/cipres/treebase/Version.java
# Rebuild the application WAR file, if requested
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rv...@us...> - 2009-11-17 16:08:22
|
Revision: 272
http://treebase.svn.sourceforge.net/treebase/?rev=272&view=rev
Author: rvos
Date: 2009-11-17 16:08:08 +0000 (Tue, 17 Nov 2009)
Log Message:
-----------
Script used to test whether tomcat was down by calling /usr/bin/GET, changed this to use curl (or a drop-in replacement if needed), which is more portable. For example, /usr/bin/GET was unavailable on treebasedb-dev.nescent.org, because LWP is not installed system-wide
Modified Paths:
--------------
trunk/treebase-core/src/main/perl/misc/publish
Modified: trunk/treebase-core/src/main/perl/misc/publish
===================================================================
--- trunk/treebase-core/src/main/perl/misc/publish 2009-11-17 04:28:48 UTC (rev 271)
+++ trunk/treebase-core/src/main/perl/misc/publish 2009-11-17 16:08:08 UTC (rev 272)
@@ -16,6 +16,12 @@
die '$CATALINA_HOME unset'
fi
+# This used to be hardcoded for /usr/bin/GET, but that requires
+# LWP to be installed system-wide, which is rarer than just
+# having curl somewhere. In any case, the required API for this
+# command is to return a non-zero exit code when attempting to
+# get a URL yields a 404 or other error.
+GETCMD="curl -s -o /dev/null"
WEBAPPS="$CATALINA_HOME/webapps"
TARGET_DIR="treebase-web"
@@ -50,7 +56,7 @@
# Stop the server, and make sure it's dead before proceeding
${CATALINA_HOME}/bin/catalina.sh stop
-if /usr/bin/GET -d $TOMCAT_URL ; then
+if $GETCMD $TOMCAT_URL ; then
die 'Failed to stop tomcat at $TOMCAT_URL'
fi
@@ -68,7 +74,7 @@
# Restart the server, and die if it doesn't start right away
${CATALINA_HOME}/bin/catalina.sh start
sleep 3
-if /usr/bin/GET -d $TOMCAT_URL ; then
+if $GETCMD $TOMCAT_URL ; then
: # okay
else
die 'Failed to restart tomcat at $TOMCAT_URL'
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rv...@us...> - 2009-11-18 12:25:54
|
Revision: 279
http://treebase.svn.sourceforge.net/treebase/?rev=279&view=rev
Author: rvos
Date: 2009-11-18 12:25:46 +0000 (Wed, 18 Nov 2009)
Log Message:
-----------
Abstracted away hardcoded tomcat url
Modified Paths:
--------------
trunk/treebase-core/src/main/perl/misc/publish
Modified: trunk/treebase-core/src/main/perl/misc/publish
===================================================================
--- trunk/treebase-core/src/main/perl/misc/publish 2009-11-18 11:01:58 UTC (rev 278)
+++ trunk/treebase-core/src/main/perl/misc/publish 2009-11-18 12:25:46 UTC (rev 279)
@@ -24,6 +24,7 @@
GETCMD="curl -s -o /dev/null"
WEBAPPS="$CATALINA_HOME/webapps"
TARGET_DIR="treebase-web"
+IP_ADDR=`curl -s checkip.dyndns.org | grep -Eo '[0-9\.]+'`
# Flag to suppress sourre update and rebuilding
update_sources=true
@@ -31,7 +32,7 @@
update_sources=false
fi
-TOMCAT_URL=http://treebasedb-dev.nescent.org:6666/treebase-web/
+TOMCAT_URL=http://$IP_ADDR:6666/treebase-web/
VERSIONFILE=${TREEBASE_HOME}/treebase-core/src/main/java/org/cipres/treebase/Version.java
# Rebuild the application WAR file, if requested
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rv...@us...> - 2009-12-10 13:53:54
|
Revision: 348
http://treebase.svn.sourceforge.net/treebase/?rev=348&view=rev
Author: rvos
Date: 2009-12-10 13:53:41 +0000 (Thu, 10 Dec 2009)
Log Message:
-----------
Working on mesquite issues
Modified Paths:
--------------
trunk/treebase-core/src/main/perl/misc/publish
Modified: trunk/treebase-core/src/main/perl/misc/publish
===================================================================
--- trunk/treebase-core/src/main/perl/misc/publish 2009-12-10 12:13:13 UTC (rev 347)
+++ trunk/treebase-core/src/main/perl/misc/publish 2009-12-10 13:53:41 UTC (rev 348)
@@ -26,10 +26,6 @@
TARGET_DIR="treebase-web"
IP_ADDR=`curl -s checkip.dyndns.org | grep -Eo '[0-9\.]+'`
-# Need to set this for mesquite, in case we're launching
-# on servers that don't have X11 configure
-export DISPLAY=:0.0
-
# Flag to suppress sourre update and rebuilding
update_sources=true
if [ "$1" == "-r" ]; then
@@ -56,7 +52,7 @@
touch ${TREEBASE_HOME}/treebase-web/src/main/webapp/common/footer.jsp
- mvn install -Dmaven.test.skip=true
+ mvn -e install -Dmaven.test.skip=true
fi
# Stop the server, and make sure it's dead before proceeding
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rv...@us...> - 2011-05-27 13:37:39
|
Revision: 891
http://treebase.svn.sourceforge.net/treebase/?rev=891&view=rev
Author: rvos
Date: 2011-05-27 13:37:32 +0000 (Fri, 27 May 2011)
Log Message:
-----------
Updated some of the default values for CLI tomcat deployment. I still like using this script, for some reason I can't get eclipse to be happy about my maven/tomcat/spring configuration, but this seems to work
Modified Paths:
--------------
trunk/treebase-core/src/main/perl/misc/publish
Modified: trunk/treebase-core/src/main/perl/misc/publish
===================================================================
--- trunk/treebase-core/src/main/perl/misc/publish 2011-05-26 19:38:18 UTC (rev 890)
+++ trunk/treebase-core/src/main/perl/misc/publish 2011-05-27 13:37:32 UTC (rev 891)
@@ -25,6 +25,8 @@
WEBAPPS="$CATALINA_HOME/webapps"
TARGET_DIR="treebase-web"
IP_ADDR=`curl -s checkip.dyndns.org | grep -Eo '[0-9\.]+'`
+PORT_NUMBER=8080
+PHYLOWIDGET=$HOME/PhyloWidget.jar
# Flag to suppress sourre update and rebuilding
update_sources=true
@@ -32,7 +34,7 @@
update_sources=false
fi
-TOMCAT_URL=http://$IP_ADDR:6666/treebase-web/
+TOMCAT_URL=http://${IP_ADDR}:${PORT_NUMBER}/treebase-web/
VERSIONFILE=${TREEBASE_HOME}/treebase-core/src/main/java/org/cipres/treebase/Version.java
# Rebuild the application WAR file, if requested
@@ -87,7 +89,7 @@
while [ '!' -d $phyloWidgetTarget ]; do
sleep 1;
done
-cp -pv $HOME/PhyloWidget.jar $phyloWidgetTarget || warn "Couldn't install phyloWidget"
+cp -pv $PHYLOWIDGET $phyloWidgetTarget || warn "Couldn't install phyloWidget"
echo "Publish operation complete"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X