Changeset 4396


Ignore:
Timestamp:
Aug 18, 2008, 12:52:20 PM (14 years ago)
Author:
Nicklas Nordborg
Message:

References #1086:initdb.sh and other scripts should include all *.jar files on class path automatically

This should be fixed, but need to test this on my windows box at home also.

Location:
trunk
Files:
19 edited

Legend:

Unmodified
Added
Removed
  • trunk/bin/dbinfo.bat

    r3675 r4396  
    2626call set_classpath.bat
    2727
     28REM Add installation specific classes to CP
     29SET CP=%CP%;jar\BASE2Install.jar
     30
    2831REM Execute install class
    2932java -server -cp %CP% net.sf.basedb.install.InitDB info %1 %2 %3 %4 %5 %6 %7 %8 %9
  • trunk/bin/dbinfo.sh

    r2959 r4396  
    2626. ./set_classpath.sh
    2727
     28# Add installation specific classes to CP
     29CP=$CP:jar/BASE2Install.jar
     30
    2831# Execute install class
    2932java -server -cp $CP net.sf.basedb.install.InitDB info $*
  • trunk/bin/dropindexes.bat

    r3675 r4396  
    2626call set_classpath.bat
    2727
     28REM Add installation specific classes to CP
     29SET CP=%CP%;jar\BASE2Install.jar
     30
    2831REM Execute install class
    2932java -server -cp %CP% net.sf.basedb.install.InitDB dropindexes %1 %2 %3 %4 %5 %6 %7 %8 %9
  • trunk/bin/dropindexes.sh

    r2959 r4396  
    2626. ./set_classpath.sh
    2727
     28# Add installation specific classes to CP
     29CP=$CP:jar/BASE2Install.jar
     30
    2831# Execute install class
    2932java -server -cp $CP net.sf.basedb.install.InitDB dropindexes $*
  • trunk/bin/dynamicdb.bat

    r3857 r4396  
    2626call set_classpath.bat
    2727
     28REM Add installation specific classes to CP
     29SET CP=%CP%;jar\BASE2Install.jar
     30
    2831REM Execute install class
    2932java -server -cp %CP% net.sf.basedb.install.InitDB dynamicdb %1 %2 %3 %4 %5 %6 %7 %8 %9
  • trunk/bin/dynamicdb.sh

    r3857 r4396  
    2626. ./set_classpath.sh
    2727
     28# Add installation specific classes to CP
     29CP=$CP:jar/BASE2Install.jar
     30
    2831# Execute install class
    2932java -server -cp $CP net.sf.basedb.install.InitDB dynamicdb $*
  • trunk/bin/initdb.bat

    r3679 r4396  
    2727call set_classpath.bat
    2828
     29REM Add installation specific classes to CP
     30SET CP=%CP%;..\data
     31SET CP=%CP%;jar\BASE2Install.jar
     32
    2933REM Execute install class
    30 java -server -cp %CP% net.sf.basedb.install.InitDB install %1 %2 %3 %4 %5 %6 %7 %8 %9
     34java -cp %CP% net.sf.basedb.install.InitDB install %1 %2 %3 %4 %5 %6 %7 %8 %9
  • trunk/bin/initdb.sh

    r3679 r4396  
    2828. ./set_classpath.sh
    2929
     30# Add installation specific classes to CP
     31CP=$CP:../data
     32CP=$CP:jar/BASE2Install.jar
     33
    3034# Execute install class
    3135java -server -cp $CP net.sf.basedb.install.InitDB install $*
  • trunk/bin/jobagent.bat

    r3675 r4396  
    2727
    2828REM Add jobagent specific classes to the CP
    29 SET CP=%CP%;jar/JobAgent.jar
     29SET CP=%CP%;jar\JobAgent.jar
    3030
    3131REM Execute install class
  • trunk/bin/onetimefix.bat

    r4371 r4396  
    2626call set_classpath.bat
    2727
     28REM Add installation specific classes to CP
     29SET CP=%CP%;jar\BASE2Install.jar
     30
    2831REM Execute OneTimeFix class
    2932java -server -cp %CP% net.sf.basedb.install.OneTimeFix %1 %2 %3 %4 %5 %6 %7 %8 %9
  • trunk/bin/onetimefix.sh

    r4371 r4396  
    2626. ./set_classpath.sh
    2727
     28# Add installation specific classes to CP
     29CP=$CP:jar/BASE2Install.jar
     30
    2831# Execute OneTimeFix class
    2932java -server -cp $CP net.sf.basedb.install.OneTimeFix $*
  • trunk/bin/set_classpath.bat

    r4248 r4396  
    2323REM ----------------------------------------
    2424
     25SET WEBINF=..\www\WEB-INF
    2526
    26 REM Set up the classpath
    27 SET WEBINF=../www/WEB-INF
     27REM Base2 configuration files and non-packaged class files
     28SET CP=%WEBINF%\classes
    2829
    29 REM Current directory
    30 SET CP=.
     30REM All WEB-INF/lib files
     31FOR %%i IN (%WEBINF%\lib\*.jar) DO (CALL :addtocp %%i)
    3132
    32 REM Base2 configuration files
    33 SET CP=%CP%;%WEBINF%/classes
     33GOTO :eof
     34REM End main program
    3435
    35 REM Additional data files
    36 SET CP=%CP%;../data
    37 
    38 REM Base2 core & installation
    39 SET CP=%CP%;jar/BASE2Install.jar
    40 SET CP=%CP%;%WEBINF%/lib/BASE2Core.jar
    41 SET CP=%CP%;%WEBINF%/lib/BASE2CorePlugins.jar
    42 SET CP=%CP%;%WEBINF%/lib/BASE2Webclient.jar
    43 SET CP=%CP%;%WEBINF%/lib/BASE2WSClient.jar
    44 
    45 REM Hibernate
    46 SET CP=%CP%;%WEBINF%/lib/hibernate3.jar
    47 SET CP=%CP%;%WEBINF%/lib/cglib-2.1.3.jar
    48 SET CP=%CP%;%WEBINF%/lib/asm.jar
    49 SET CP=%CP%;%WEBINF%/lib/commons-collections-2.1.1.jar
    50 SET CP=%CP%;%WEBINF%/lib/commons-logging-1.1.jar
    51 SET CP=%CP%;%WEBINF%/lib/dom4j-1.6.1.jar
    52 SET CP=%CP%;%WEBINF%/lib/ehcache-1.2.3.jar
    53 SET CP=%CP%;%WEBINF%/lib/jta.jar
    54 SET CP=%CP%;%WEBINF%/lib/antlr-2.7.6.jar
    55 
    56 REM Log4j (also used by Hibernate)
    57 SET CP=%CP%;%WEBINF%/lib/log4j-1.2.14.jar
    58 
    59 REM C3P0 Connection pool manager
    60 SET CP=%CP%;%WEBINF%/lib/c3p0-0.9.1.jar
    61 
    62 REM MySQL JDBC driver
    63 SET CP=%CP%;%WEBINF%/lib/mysql-connector-java-5.1.6-bin.jar
    64 
    65 REM Postgres JDBC driver
    66 SET CP=%CP%;%WEBINF%/lib/postgresql-8.3-603.jdbc4.jar
    67 
    68 REM JDOM and Xerces XML parser
    69 SET CP=%CP%;%WEBINF%/lib/jdom.jar
    70 SET CP=%CP%;%WEBINF%/lib/jaxen-1.1-beta-7.jar
    71 SET CP=%CP%;%WEBINF%/lib/saxpath.jar
    72 SET CP=%CP%;%WEBINF%/lib/xerces-2.9.0.jar
    73 SET CP=%CP%;%WEBINF%/lib/xml-apis.jar
    74 
    75 REM Java Advanced Imaging
    76 SET CP=%CP%;%WEBINF%/lib/jai_codec.jar
    77 SET CP=%CP%;%WEBINF%/lib/jai_core.jar
    78 SET CP=%CP%;%WEBINF%/lib/mlibwrapper_jai.jar
    79 
    80 REM Java Math Expression Parser
    81 SET CP=%CP%;%WEBINF%/lib/jep-2.4.0.jar
    82 
    83 REM JFreeChart
    84 SET CP=%CP%;%WEBINF%/lib/jfreechart-1.0.3.jar
    85 SET CP=%CP%;%WEBINF%/lib/jcommon-1.0.6.jar
    86 
    87 REM Affymetrix Fusion SDK
    88 SET CP=%CP%;%WEBINF%/lib/AffxFusion.jar
    89 
    90 REM TAR and BZIP
    91 SET CP=%CP%;%WEBINF%/lib/tar.jar
    92 SET CP=%CP%;%WEBINF%/lib/bzip2.jar
     36REM Subroutine for adding an entry to CP
     37:addtocp
     38SET CP=%CP%;%1
     39GOTO :eof
  • trunk/bin/set_classpath.sh

    r4248 r4396  
    2525WEBINF=../www/WEB-INF
    2626
    27 # Current directory
    28 CP=.
     27# Base2 configuration files and non-packaged class files
     28CP=$WEBINF/classes
    2929
    30 # Base2 configuration files
    31 CP=$CP:$WEBINF/classes
    32 
    33 # Additional data files
    34 CP=$CP:../data
    35 
    36 # Base2 core & installation
    37 CP=$CP:jar/BASE2Install.jar
    38 CP=$CP:$WEBINF/lib/BASE2Core.jar
    39 CP=$CP:$WEBINF/lib/BASE2CorePlugins.jar
    40 CP=$CP:$WEBINF/lib/BASE2Webclient.jar
    41 CP=$CP:$WEBINF/lib/BASE2WSClient.jar
    42 
    43 # Hibernate
    44 CP=$CP:$WEBINF/lib/hibernate3.jar
    45 CP=$CP:$WEBINF/lib/cglib-2.1.3.jar
    46 CP=$CP:$WEBINF/lib/asm.jar
    47 CP=$CP:$WEBINF/lib/asm-attrs.jar
    48 CP=$CP:$WEBINF/lib/commons-collections-2.1.1.jar
    49 CP=$CP:$WEBINF/lib/commons-logging-1.1.jar
    50 CP=$CP:$WEBINF/lib/dom4j-1.6.1.jar
    51 CP=$CP:$WEBINF/lib/ehcache-1.2.3.jar
    52 CP=$CP:$WEBINF/lib/jta.jar
    53 CP=$CP:$WEBINF/lib/antlr-2.7.6.jar
    54 
    55 # Log4j logging system (also used by Hibernate)
    56 CP=$CP:$WEBINF/lib/log4j-1.2.14.jar
    57 
    58 # C3P0 Connection pool manager
    59 CP=$CP:$WEBINF/lib/c3p0-0.9.1.jar
    60 
    61 # MySQL JDBC driver
    62 CP=$CP:$WEBINF/lib/mysql-connector-java-5.1.6-bin.jar
    63 
    64 # Postgres JDBC driver
    65 CP=$CP:$WEBINF/lib/postgresql-8.3-603.jdbc4.jar
    66 
    67 # JDOM and Xerces XML parser
    68 CP=$CP:$WEBINF/lib/jdom.jar
    69 CP=$CP:$WEBINF/lib/jaxen-1.1-beta-7.jar
    70 CP=$CP:$WEBINF/lib/saxpath.jar
    71 CP=$CP:$WEBINF/lib/xerces-2.9.0.jar
    72 CP=$CP:$WEBINF/lib/xml-apis.jar
    73 
    74 # Java Advanced Imaging
    75 CP=$CP:$WEBINF/lib/jai_codec.jar
    76 CP=$CP:$WEBINF/lib/jai_core.jar
    77 CP=$CP:$WEBINF/lib/mlibwrapper_jai.jar
    78 
    79 # Java Math Expression Parser
    80 CP=$CP:$WEBINF/lib/jep-2.4.0.jar
    81 
    82 # JFreeChart
    83 CP=$CP:$WEBINF/lib/jfreechart-1.0.3.jar
    84 CP=$CP:$WEBINF/lib/jcommon-1.0.6.jar
    85 
    86 # Affymetrix Fusion SDK
    87 CP=$CP:$WEBINF/lib/AffxFusion.jar
    88 
    89 # TAR and BZIP
    90 CP=$CP:$WEBINF/lib/tar.jar
    91 CP=$CP:$WEBINF/lib/bzip2.jar
     30# All WEB-INF/lib files
     31for i in `ls $WEBINF/lib/*.jar`
     32do
     33  CP=${CP}:${i}
     34done
  • trunk/bin/updatedb.bat

    r3675 r4396  
    2626call set_classpath.bat
    2727
     28REM Add installation specific classes to CP
     29SET CP=%CP%;..\data
     30SET CP=%CP%;jar\BASE2Install.jar
     31
    2832REM Execute install class
    2933java -server -cp %CP% net.sf.basedb.install.InitDB update %1 %2 %3 %4 %5 %6 %7 %8 %9
  • trunk/bin/updatedb.sh

    r3679 r4396  
    2727. ./set_classpath.sh
    2828
     29# Add installation specific classes to CP
     30CP=$CP:../data
     31CP=$CP:jar/BASE2Install.jar
     32
    2933# Execute install class
    3034java -server -cp $CP net.sf.basedb.install.InitDB update $*
  • trunk/bin/updateindexes.bat

    r3675 r4396  
    2626call set_classpath.bat
    2727
     28REM Add installation specific classes to CP
     29SET CP=%CP%;jar\BASE2Install.jar
     30
    2831REM Execute install class
    2932java -server -cp %CP% net.sf.basedb.install.InitDB updateindexes %1 %2 %3 %4 %5 %6 %7 %8 %9
  • trunk/bin/updateindexes.sh

    r2959 r4396  
    2626. ./set_classpath.sh
    2727
     28# Add installation specific classes to CP
     29CP=$CP:jar/BASE2Install.jar
     30
    2831# Execute install class
    2932java -server -cp $CP net.sf.basedb.install.InitDB updateindexes $*
  • trunk/src/test/set_classpath.bat

    r4248 r4396  
    2525REM Set up the classpath
    2626SET CP=.
    27 SET CP=%CP%;../../config/local
    28 SET CP=%CP%;../../config/dist
    29 SET CP=%CP%;../../config/test
     27SET CP=%CP%;..\..\config\local
     28SET CP=%CP%;..\..\config\dist
     29SET CP=%CP%;..\..\config\test
    3030
    3131REM Testdata
    3232SET CP=%CP%;data
    33 SET CP=%CP%;../../data
    34 SET CP=%CP%;../../testdata
     33SET CP=%CP%;..\..\data
     34SET CP=%CP%;..\..\testdata
    3535
    3636REM Base2 core
    37 SET CP=%CP%;../info
    38 SET CP=%CP%;../core
    39 SET CP=%CP%;../plugins/core
    40 SET CP=%CP%;../clients/jobagent
    41 SET CP=%CP%;../webservices/client
    42 SET CP=%CP%;../webservices/server
     37SET CP=%CP%;..\info
     38SET CP=%CP%;..\core
     39SET CP=%CP%;..\plugins\core
     40SET CP=%CP%;..\clients\jobagent
     41SET CP=%CP%;..\webservices\client
     42SET CP=%CP%;..\webservices\server
    4343
    44 REM Hibernate
    45 SET CP=%CP%;../../lib/dist/hibernate3.jar
    46 SET CP=%CP%;../../lib/dist/cglib-2.1.3.jar
    47 SET CP=%CP%;../../lib/dist/asm.jar
    48 SET CP=%CP%;../../lib/dist/asm-attrs.jar
    49 SET CP=%CP%;../../lib/dist/commons-collections-2.1.1.jar
    50 SET CP=%CP%;../../lib/dist/commons-logging-1.1.jar
    51 SET CP=%CP%;../../lib/dist/dom4j-1.6.1.jar
    52 SET CP=%CP%;../../lib/dist/ehcache-1.2.3.jar
    53 SET CP=%CP%;../../lib/dist/jta.jar
    54 SET CP=%CP%;../../lib/dist/antlr-2.7.6.jar
     44REM All JAR file in lib/dist
     45SET LIB=..\..\lib
     46FOR %%i IN (%LIB%\dist\*.jar) DO (CALL :addtocp %%i)
    5547
    56 REM Log4j (also used by Hibernate)
    57 SET CP=%CP%;../../lib/dist/log4j-1.2.14.jar
     48REM All JAR file in lib/webservices
     49FOR %%i IN (%LIB%\webservices\*.jar) DO (CALL :addtocp %%i)
    5850
    59 REM C3P0 Connection pool manager
    60 SET CP=%CP%;../../lib/dist/c3p0-0.9.1.jar
     51GOTO :eof
     52REM End main program
    6153
    62 REM MySQL JDBC driver
    63 SET CP=%CP%;../../lib/dist/mysql-connector-java-5.1.6-bin.jar
     54REM Subroutine for adding an entry to CP
     55:addtocp
     56SET CP=%CP%;%1
     57GOTO :eof
    6458
    65 REM Postgres JDBC driver
    66 SET CP=%CP%;../../lib/dist/postgresql-8.3-603.jdbc4.jar
    67 
    68 REM JDOM and Xerces XML parser
    69 SET CP=%CP%;../../lib/dist/jdom.jar
    70 SET CP=%CP%;../../lib/dist/jaxen-1.1-beta-7.jar
    71 SET CP=%CP%;../../lib/dist/saxpath.jar
    72 SET CP=%CP%;../../lib/dist/xerces-2.9.0.jar
    73 SET CP=%CP%;../../lib/dist/xml-apis.jar
    74 
    75 REM Java Advanced Imaging
    76 SET CP=%CP%;../../lib/dist/jai_codec.jar
    77 SET CP=%CP%;../../lib/dist/jai_core.jar
    78 SET CP=%CP%;../../lib/dist/mlibwrapper_jai.jar
    79 
    80 REM Java Math Expression Parser
    81 SET CP=%CP%;../../lib/dist/jep-2.4.0.jar
    82 
    83 REM JFreeChart
    84 SET CP=%CP%;../../lib/dist/jfreechart-1.0.3.jar
    85 SET CP=%CP%;../../lib/dist/jcommon-1.0.6.jar
    86 
    87 REM Axis
    88 SET CP=%CP%;../../lib/webservices/activation-1.1.jar
    89 SET CP=%CP%;../../lib/webservices/annogen-0.1.0.jar
    90 SET CP=%CP%;../../lib/webservices/axiom-api-1.2.5.jar
    91 SET CP=%CP%;../../lib/webservices/axiom-dom-1.2.5.jar
    92 SET CP=%CP%;../../lib/webservices/axiom-impl-1.2.5.jar
    93 SET CP=%CP%;../../lib/webservices/axis2-adb-1.3.jar
    94 SET CP=%CP%;../../lib/webservices/axis2-java2wsdl-1.3.jar
    95 SET CP=%CP%;../../lib/webservices/axis2-kernel-1.3.jar
    96 SET CP=%CP%;../../lib/webservices/backport-util-concurrent-2.2.jar
    97 SET CP=%CP%;../../lib/webservices/commons-codec-1.3.jar
    98 SET CP=%CP%;../../lib/webservices/commons-httpclient-3.0.1.jar
    99 SET CP=%CP%;../../lib/webservices/commons-io-1.3.2.jar
    100 SET CP=%CP%;../../lib/webservices/mail-1.4.jar
    101 SET CP=%CP%;../../lib/webservices/neethi-2.0.2.jar
    102 SET CP=%CP%;../../lib/webservices/stax-api-1.0.1.jar
    103 SET CP=%CP%;../../lib/webservices/wsdl4j-1.6.2.jar
    104 SET CP=%CP%;../../lib/webservices/wstx-asl-3.2.1.jar
    105 SET CP=%CP%;../../lib/webservices/XmlSchema-1.3.2.jar
    106 
    107 REM Affymetrix Fusion SDK
    108 SET CP=%CP%;../../lib/dist/AffxFusion.jar
    109 
    110 REM TAR and BZIP
    111 SET CP=%CP%;../../lib/dist/tar.jar
    112 SET CP=%CP%;../../lib/dist/bzip2.jar
    113 
  • trunk/src/test/set_classpath.sh

    r4248 r4396  
    2121# 02111-1307, USA.
    2222
    23 LIB=../../lib/dist
    24 WS_LIB=../../lib/webservices
    25 
    2623# Set up the classpath
    2724CP=.
     
    4340CP=$CP:../webservices/server
    4441
    45 # Hibernate
    46 CP=$CP:$LIB/hibernate3.jar
    47 CP=$CP:$LIB/cglib-2.1.3.jar
    48 CP=$CP:$LIB/asm.jar
    49 CP=$CP:$LIB/asm-attrs.jar
    50 CP=$CP:$LIB/commons-collections-2.1.1.jar
    51 CP=$CP:$LIB/commons-logging-1.1.jar
    52 CP=$CP:$LIB/dom4j-1.6.1.jar
    53 CP=$CP:$LIB/ehcache-1.2.3.jar
    54 CP=$CP:$LIB/jta.jar
    55 CP=$CP:$LIB/antlr-2.7.6.jar
     42# All JAR file in lib/dist
     43LIB=../../lib
     44for i in `ls $LIB/dist/*.jar`
     45do
     46  CP=${CP}:${i}
     47done
    5648
    57 # Log4j logging system (also used by Hibernate)
    58 CP=$CP:$LIB/log4j-1.2.14.jar
    59 
    60 # C3P0 Connection pool manager
    61 CP=$CP:$LIB/c3p0-0.9.1.jar
    62 
    63 # MySQL JDBC driver
    64 CP=$CP:$LIB/mysql-connector-java-5.1.6-bin.jar
    65 
    66 # Postgres JDBC driver
    67 CP=$CP:$LIB/postgresql-8.3-603.jdbc4.jar
    68 
    69 # JDOM and Xerces XML parser
    70 CP=$CP:$LIB/jdom.jar
    71 CP=$CP:$LIB/jaxen-1.1-beta-7.jar
    72 CP=$CP:$LIB/saxpath.jar
    73 CP=$CP:$LIB/xerces-2.9.0.jar
    74 CP=$CP:$LIB/xml-apis.jar
    75 
    76 # Java Advanced Imaging
    77 CP=$CP:$LIB/jai_codec.jar
    78 CP=$CP:$LIB/jai_core.jar
    79 CP=$CP:$LIB/mlibwrapper_jai.jar
    80 
    81 # Java Math Expression Parser
    82 CP=$CP:$LIB/jep-2.4.0.jar
    83 
    84 # JFreeChart
    85 CP=$CP:$LIB/jfreechart-1.0.3.jar
    86 CP=$CP:$LIB/jcommon-1.0.6.jar
    87 
    88 # Axis
    89 CP=$CP:$WS_LIB/axis2-kernel-1.3.jar
    90 CP=$CP:$WS_LIB/axis2-adb-1.3.jar
    91 CP=$CP:$WS_LIB/axiom-api-1.2.5.jar
    92 CP=$CP:$WS_LIB/axiom-dom-1.2.5.jar
    93 CP=$CP:$WS_LIB/axiom-impl-1.2.5.jar
    94 CP=$CP:$WS_LIB/stax-api-1.0.1.jar
    95 CP=$CP:$WS_LIB/wstx-asl-3.2.1.jar
    96 CP=$CP:$WS_LIB/wsdl4j-1.6.2.jar
    97 CP=$CP:$WS_LIB/XmlSchema-1.3.2.jar
    98 CP=$CP:$WS_LIB/mail-1.4.jar
    99 CP=$CP:$WS_LIB/commons-httpclient-3.0.1.jar
    100 CP=$CP:$WS_LIB/commons-codec-1.3.jar
    101 CP=$CP:$WS_LIB/commons-io-1.3.2.jar
    102 CP=$CP:$WS_LIB/activation-1.1.jar
    103 CP=$CP:$WS_LIB/backport-util-concurrent-2.2.jar
    104 CP=$CP:$WS_LIB/annogen-0.1.0.jar
    105 CP=$CP:$WS_LIB/axis2-java2wsdl-1.3.jar
    106 CP=$CP:$WS_LIB/neethi-2.0.2.jar
    107 
    108 # Affymetrix Fusion SDK
    109 CP=$CP:$LIB/AffxFusion.jar
    110 
    111 # TAR and BZIP
    112 CP=$CP:$LIB/tar.jar
    113 CP=$CP:$LIB/bzip2.jar
     49# All JAR file in lib/webservices
     50for i in `ls $LIB/webservices/*.jar`
     51do
     52  CP=${CP}:${i}
     53done
Note: See TracChangeset for help on using the changeset viewer.