Changeset 5589


Ignore:
Timestamp:
Mar 16, 2011, 8:50:05 AM (11 years ago)
Author:
Nicklas Nordborg
Message:

Fixes #1595: Change name of BASE jar files

Location:
trunk
Files:
19 edited

Legend:

Unmodified
Added
Removed
  • trunk/bin/dbinfo.bat

    r4508 r5589  
    2424call set_classpath.bat
    2525
    26 REM Add installation specific classes to CP
    27 SET CP=%CP%;jar\BASE2Install.jar
    28 
    2926REM Execute install class
    3027java -server -cp %CP% net.sf.basedb.install.InitDB info %1 %2 %3 %4 %5 %6 %7 %8 %9
  • trunk/bin/dbinfo.sh

    r4508 r5589  
    2424. ./set_classpath.sh
    2525
    26 # Add installation specific classes to CP
    27 CP=$CP:jar/BASE2Install.jar
    28 
    2926# Execute install class
    3027java -server -cp $CP net.sf.basedb.install.InitDB info $*
  • trunk/bin/dropindexes.bat

    r4508 r5589  
    2424call set_classpath.bat
    2525
    26 REM Add installation specific classes to CP
    27 SET CP=%CP%;jar\BASE2Install.jar
    28 
    2926REM Execute install class
    3027java -server -cp %CP% net.sf.basedb.install.InitDB dropindexes %1 %2 %3 %4 %5 %6 %7 %8 %9
  • trunk/bin/dropindexes.sh

    r4508 r5589  
    2424. ./set_classpath.sh
    2525
    26 # Add installation specific classes to CP
    27 CP=$CP:jar/BASE2Install.jar
    28 
    2926# Execute install class
    3027java -server -cp $CP net.sf.basedb.install.InitDB dropindexes $*
  • trunk/bin/dynamicdb.bat

    r4508 r5589  
    2424call set_classpath.bat
    2525
    26 REM Add installation specific classes to CP
    27 SET CP=%CP%;jar\BASE2Install.jar
    28 
    2926REM Execute install class
    3027java -server -cp %CP% net.sf.basedb.install.InitDB dynamicdb %1 %2 %3 %4 %5 %6 %7 %8 %9
  • trunk/bin/dynamicdb.sh

    r4508 r5589  
    2424. ./set_classpath.sh
    2525
    26 # Add installation specific classes to CP
    27 CP=$CP:jar/BASE2Install.jar
    28 
    2926# Execute install class
    3027java -server -cp $CP net.sf.basedb.install.InitDB dynamicdb $*
  • trunk/bin/initdb.bat

    r4889 r5589  
    2727REM Add installation specific classes to CP
    2828SET CP=%CP%;..\data
    29 SET CP=%CP%;jar\BASE2Install.jar
    3029
    3130REM Execute install class
  • trunk/bin/initdb.sh

    r4889 r5589  
    2828# Add installation specific classes to CP
    2929CP=$CP:../data
    30 CP=$CP:jar/BASE2Install.jar
    3130
    3231# Execute install class
  • trunk/bin/jobagent.bat

    r4508 r5589  
    2424call set_classpath.bat
    2525
    26 REM Add jobagent specific classes to the CP
    27 SET CP=%CP%;jar\JobAgent.jar
    28 
    2926REM Execute install class
    3027java -server -Xmx50M -Xms50M -cp %CP% net.sf.basedb.clients.jobagent.AgentController %1 %2 %3 %4 %5 %6 %7 %8 %9
  • trunk/bin/jobagent.sh

    r4508 r5589  
    2424. ./set_classpath.sh
    2525
    26 # Add jobagent specific classes to the CP
    27 CP=$CP:jar/JobAgent.jar
    28 
    2926# Execute JobAgent
    3027java -server -Xmx50M -Xms50M -cp $CP net.sf.basedb.clients.jobagent.AgentController $*
  • trunk/bin/onetimefix.bat

    r4508 r5589  
    2424call set_classpath.bat
    2525
    26 REM Add installation specific classes to CP
    27 SET CP=%CP%;jar\BASE2Install.jar
    28 
    2926REM Execute OneTimeFix class
    3027java -server -cp %CP% net.sf.basedb.install.OneTimeFix %1 %2 %3 %4 %5 %6 %7 %8 %9
  • trunk/bin/onetimefix.sh

    r4508 r5589  
    2424. ./set_classpath.sh
    2525
    26 # Add installation specific classes to CP
    27 CP=$CP:jar/BASE2Install.jar
    28 
    2926# Execute OneTimeFix class
    3027java -server -cp $CP net.sf.basedb.install.OneTimeFix $*
  • trunk/bin/set_classpath.bat

    r4508 r5589  
    2626SET CP=%WEBINF%\classes
    2727
    28 REM All WEB-INF/lib files
     28REM All WEB-INF/lib/*.jar files
    2929FOR %%i IN (%WEBINF%\lib\*.jar) DO (CALL :addtocp %%i)
     30
     31REM All jar/*.jar files
     32FOR %%i IN (jar\*.jar) DO (CALL :addtocp %%i)
    3033
    3134GOTO :eof
  • trunk/bin/set_classpath.sh

    r4508 r5589  
    2626CP=$WEBINF/classes
    2727
    28 # All WEB-INF/lib files
     28# All WEB-INF/lib/*.jar files
    2929for i in `ls $WEBINF/lib/*.jar`
    3030do
    3131  CP=${CP}:${i}
    3232done
     33
     34# All bin/jar/*.jar files
     35for i in `ls jar/*.jar`
     36do
     37  CP=${CP}:${i}
     38done
  • trunk/bin/updatedb.bat

    r4508 r5589  
    2626REM Add installation specific classes to CP
    2727SET CP=%CP%;..\data
    28 SET CP=%CP%;jar\BASE2Install.jar
    2928
    3029REM Execute install class
  • trunk/bin/updatedb.sh

    r4889 r5589  
    2727# Add installation specific classes to CP
    2828CP=$CP:../data
    29 CP=$CP:jar/BASE2Install.jar
    3029
    3130# Execute install class
  • trunk/bin/updateindexes.bat

    r4508 r5589  
    2424call set_classpath.bat
    2525
    26 REM Add installation specific classes to CP
    27 SET CP=%CP%;jar\BASE2Install.jar
    28 
    2926REM Execute install class
    3027java -server -cp %CP% net.sf.basedb.install.InitDB updateindexes %1 %2 %3 %4 %5 %6 %7 %8 %9
  • trunk/bin/updateindexes.sh

    r4508 r5589  
    2424. ./set_classpath.sh
    2525
    26 # Add installation specific classes to CP
    27 CP=$CP:jar/BASE2Install.jar
    28 
    2926# Execute install class
    3027java -server -cp $CP net.sf.basedb.install.InitDB updateindexes $*
  • trunk/build.xml

    r5577 r5589  
    6565    2.1.2pre, 2.2.2, 2.2.0pre, 2.2.0, 2.2.1pre, 2.2.1
    6666  -->
    67   <property name="base.majorversion" value="2" />
    68   <property name="base.minorversion" value="18" />
     67  <property name="base.majorversion" value="3" />
     68  <property name="base.minorversion" value="0" />
    6969  <property name="base.maintenanceversion" value="0pre" />
    7070  <property name="base.version"
     
    614614    name="core.jar"
    615615    depends="core.init,core.compile,core.hibernate"
    616     description="Create the core jar file: BASE2Core.jar"
     616    description="Create the core jar file: base-core-a.b.c.jar"
    617617    >
    618618    <jar
    619619      basedir="${core.build}"
    620       jarfile="${jar}/BASE2Core.jar"
     620      jarfile="${jar}/base-core-${base.version}.jar"
    621621    />
    622622  </target>
     
    661661    name="coreplugins.jar"
    662662    depends="coreplugins.compile"
    663     description="Create the plugin jar file: BASE2CorePlugins.jar"
     663    description="Create the plugin jar file: base-coreplugins-a.b.c.jar"
    664664    >
    665665    <jar
    666666      basedir="${coreplugins.build}"
    667       jarfile="${jar}/BASE2CorePlugins.jar"
     667      jarfile="${jar}/base-coreplugins-${base.version}.jar"
    668668    />
    669669  </target>
     
    788788    name="web.jar"
    789789    depends="web.compile"
    790     description="Create the web client jar file: BASE2Webclient.jar"
     790    description="Create the web client jar file: base-webclient-a.b.c.jar"
    791791    >
    792792    <jar
    793793      basedir="${web.build}"
    794       jarfile="${jar}/BASE2Webclient.jar"
     794      jarfile="${jar}/base-webclient-${base.version}.jar"
    795795    />
    796796  </target>
     
    875875    <jar
    876876      basedir="${build}/misc/compiler"
    877       jarfile="${bin}/jar/base2-xjsp-compiler.jar"
     877      jarfile="${bin}/jar/base-xjsp-compiler-${base.version}.jar"
    878878    />
    879879  </target>
     
    10331033      jarfile="${config}/../services/core.aar"
    10341034    />
    1035     <!-- client side: BASE2WSClient.jar -->
     1035    <!-- client side: base-webservices-client-a.b.c.jar -->
    10361036    <jar
    1037       jarfile="${jar}/BASE2WSClient.jar"
     1037      jarfile="${jar}/base-webservices-client-${base.version}.jar"
    10381038      >
    10391039      <fileset dir="${webservices.build}/client" />
     
    10821082    name="installprg.jar"
    10831083    depends="installprg.compile"
    1084     description="Create the installation jar file: BASE2Install.jar"
     1084    description="Create the installation jar file: base-install-a.b.c.jar"
    10851085    >
    10861086    <jar
    10871087      basedir="${installprg.build}"
    1088       jarfile="${bin}/jar/BASE2Install.jar"
     1088      jarfile="${bin}/jar/base-install-${base.version}.jar"
    10891089    />
    10901090  </target>
     
    11281128    name="jobagent.jar"
    11291129    depends="jobagent.compile"
    1130     description="Create the job agent jar file: JobAgent.jar"
     1130    description="Create the job agent jar file: base-jobagent-a.b.c.jar"
    11311131    >
    11321132    <jar
    11331133      basedir="${jobagent.build}"
    1134       jarfile="${bin}/jar/JobAgent.jar"
     1134      jarfile="${bin}/jar/base-jobagent-${base.version}.jar"
    11351135    />
    11361136  </target>
Note: See TracChangeset for help on using the changeset viewer.