diff --git a/Makefile b/Makefile index 49e164d80c4e4b4ede13fe3d9265074cb7ecb067..0077a9008a62490efb12e4fba606c7cb8477d572 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ # This is a GNU Makefile for Artemis -# $Header: //tmp/pathsoft/artemis/Makefile,v 1.45 2009-07-24 09:59:32 tjc Exp $ +# $Header: //tmp/pathsoft/artemis/Makefile,v 1.46 2009-08-10 08:09:56 tjc Exp $ SHELL=/bin/sh @@ -8,7 +8,7 @@ SHELL=/bin/sh JAVAC := javac -source 1.5 -target 1.5 $(OPT_FLAGS) $(EXTRA_FLAGS) -REAL_CLASSPATH := CLASSPATH=lib/biojava.jar:lib/jemAlign.jar:lib/j2ssh/j2ssh-core.jar:lib/ibatis/ibatis-2.3.4.726.jar:lib/ibatis/log4j-1.2.14.jar:lib/chado-14-interface.jar:lib/postgresql-8.1-407.jdbc2ee.jar:. +REAL_CLASSPATH := CLASSPATH=lib/biojava.jar:lib/jemAlign.jar:lib/j2ssh/j2ssh-core.jar:lib/ibatis/ibatis-2.3.4.726.jar:lib/ibatis/log4j-1.2.14.jar:lib/chado-14-interface.jar:lib/postgresql-8.4-701.jdbc3.jar:. NAMES:= \ uk/ac/sanger/artemis/OptionChangeListener \ diff --git a/act b/act index 5369779884b157ce9257fad4179cb05a31a77f87..5309e6d24301793f0be274b83732f304cf0c6947 100755 --- a/act +++ b/act @@ -7,7 +7,7 @@ # /usr/local/bin/ or elsewhere. -# $Header: //tmp/pathsoft/artemis/act,v 1.14 2008-10-28 13:38:29 tjc Exp $ +# $Header: //tmp/pathsoft/artemis/act,v 1.15 2009-08-10 08:14:46 tjc Exp $ # resolve links - $0 may be a link PRG=$0 @@ -29,7 +29,7 @@ done ACT_HOME=`dirname "$PRG"`/. -CLASSPATH=$ACT_HOME:$ACT_HOME/lib/JacORB.jar:$ACT_HOME/lib/jemAlign.jar:$ACT_HOME/lib/jakarta-regexp-1.2.jar:$ACT_HOME/lib/macos.jar:$ACT_HOME/lib/chado-14-interface.jar:$ACT_HOME/lib/postgresql-8.1-407.jdbc2ee.jar:$CLASSPATH +CLASSPATH=$ACT_HOME:$ACT_HOME/lib/JacORB.jar:$ACT_HOME/lib/jemAlign.jar:$ACT_HOME/lib/jakarta-regexp-1.2.jar:$ACT_HOME/lib/macos.jar:$ACT_HOME/lib/chado-14-interface.jar:$ACT_HOME/lib/postgresql-8.4-701.jdbc3.jar:$CLASSPATH # j2ssh jars CLASSPATH=$CLASSPATH:$ACT_HOME/lib/j2ssh/commons-logging.jar:$ACT_HOME/lib/j2ssh/j2ssh-core.jar:$ACT_HOME/lib/j2ssh/ diff --git a/art b/art index b257dc82abe020919d36ea0afd89199ce9780e62..8109b847245797b926039c49ff4a5a9e46e362eb 100755 --- a/art +++ b/art @@ -6,7 +6,7 @@ # necessary a symbolic link can be made to this script from # /usr/local/bin/ or elsewhere. -# $Header: //tmp/pathsoft/artemis/art,v 1.23 2008-10-28 13:37:45 tjc Exp $ +# $Header: //tmp/pathsoft/artemis/art,v 1.24 2009-08-10 08:12:21 tjc Exp $ # resolve links - $0 may be a link PRG=$0 @@ -28,7 +28,7 @@ done ARTEMIS_HOME=`dirname "$PRG"`/. LIBDIR=/nfs/pathsoft/prod/javalibs -CLASSPATH=$ARTEMIS_HOME:$ARTEMIS_HOME/lib/biojava.jar:$ARTEMIS_HOME/lib/jemAlign.jar:$ARTEMIS_HOME/lib/jakarta-regexp-1.2.jar:$ARTEMIS_HOME/lib/macos.jar:$ARTEMIS_HOME/lib/postgresql-8.1-407.jdbc2ee.jar:$ARTEMIS_HOME/lib/chado-14-interface.jar:$CLASSPATH +CLASSPATH=$ARTEMIS_HOME:$ARTEMIS_HOME/lib/biojava.jar:$ARTEMIS_HOME/lib/jemAlign.jar:$ARTEMIS_HOME/lib/jakarta-regexp-1.2.jar:$ARTEMIS_HOME/lib/macos.jar:$ARTEMIS_HOME/lib/postgresql-8.4-701.jdbc3.jar:$ARTEMIS_HOME/lib/chado-14-interface.jar:$CLASSPATH # j2ssh jars CLASSPATH=$CLASSPATH:$ARTEMIS_HOME/lib/j2ssh/commons-logging.jar:$ARTEMIS_HOME/lib/j2ssh/j2ssh-core.jar:$ARTEMIS_HOME/lib/j2ssh/ diff --git a/dnaplotter b/dnaplotter index 4dd2f8e5968d0c3c8dbe63bf034adbefa3798f36..06dea21b1720f0771a8c65eb6fcc696357da78fa 100755 --- a/dnaplotter +++ b/dnaplotter @@ -8,7 +8,7 @@ progname=`basename $0` ARTEMIS_HOME=`dirname "$PRG"`/. -CLASSPATH=$ARTEMIS_HOME:$ARTEMIS_HOME/lib/biojava.jar:$ARTEMIS_HOME/lib/jemAlign.jar:$ARTEMIS_HOME/lib/jakarta-regexp-1.2.jar:$ARTEMIS_HOME/lib/macos.jar:$ARTEMIS_HOME/lib/postgresql-8.1-407.jdbc2ee.jar:$ARTEMIS_HOME/lib/chado-14-interface.jar:$CLASSPATH +CLASSPATH=$ARTEMIS_HOME:$ARTEMIS_HOME/lib/biojava.jar:$ARTEMIS_HOME/lib/jemAlign.jar:$ARTEMIS_HOME/lib/jakarta-regexp-1.2.jar:$ARTEMIS_HOME/lib/macos.jar:$ARTEMIS_HOME/lib/postgresql-8.4-701.jdbc3.jar:$ARTEMIS_HOME/lib/chado-14-interface.jar:$CLASSPATH # j2ssh jars CLASSPATH=$CLASSPATH:$ARTEMIS_HOME/lib/j2ssh/commons-logging.jar:$ARTEMIS_HOME/lib/j2ssh/j2ssh-core.jar:$ARTEMIS_HOME/lib/j2ssh/ diff --git a/lib/postgresql-8.4-701.jdbc3.jar b/lib/postgresql-8.4-701.jdbc3.jar new file mode 100644 index 0000000000000000000000000000000000000000..c64b709e1874abb059418253d00a1cfdc6616a30 Binary files /dev/null and b/lib/postgresql-8.4-701.jdbc3.jar differ