Permalink
Browse files

version upgrade

  • Loading branch information...
nihavend committed Jan 31, 2018
1 parent 39946be commit 764a3d443cc9d83f72c475125dfdd143d64658e8
@@ -11,8 +11,8 @@
<classpathentry kind="lib" path="/tloslite-libs/libs/mailapi.jar"/>
<classpathentry kind="lib" path="/tloslite-libs/libs/tlostestjob.jar"/>
<classpathentry kind="lib" path="/tloslite-libs/libs/winp.jar"/>
<classpathentry kind="lib" path="/tlosliteutils/tloslite-utils-1.8.2.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/licenselib"/>
<classpathentry kind="lib" path="/tloslite-libs/libs/smtp.jar"/>
<classpathentry kind="lib" path="/tlosliteutils/tloslite-utils.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
@@ -21,3 +21,5 @@
/libs/
/logUx01.log
/logUx02.log
/tloslite-1.8.30.jar
/tloslite-src-1.8.30.jar
@@ -1,5 +1,7 @@
<project name="tloslite" default="build-all" basedir=".">

<property file="version.info" />

<property name="appname" value="tloslite" />

<property name="lib.dir" value="${basedir}/../../tloslitegroup/tloslite-libs/libs" />
@@ -18,7 +20,6 @@
<property name="webapp.dir" value="." />
<property name="build.classes.dir" value="${build.dir}"/>
<property name="app.deploy.dir" value="${basedir}" />
<property name="version.num" value="1.8.2"/>

<target name="init2" if="minor.number">
<property name="buildchar" value="_b" />
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<project default="create_run_jar" name="Create Runnable Jar for Project TlosLite with libraries in sub-folder">

<property name="version" value="1.8.2" />
<property file="version.info" />

<property name="lib.dir" value="${basedir}/../../tloslitegroup/tloslite-libs/libs" />
<property name="img.dir" value="${basedir}/../../tloslitegroup/tloslite-libs/imgs" />
<property name="export.dir" value="${basedir}/../../../releases/tloslite_export-${version}" />
<property name="export.dir" value="${basedir}/../../../releases/tloslite_export-${version.num}" />
<property name="dist.dir" value="${basedir}/../../../releases/tlosliteDist" />
<property name="src.dir" value="${basedir}" />
<property name="export.lib.dir" value="${export.dir}/libs" />
@@ -26,9 +26,9 @@
</copy>

<mkdir dir="${export.lib.dir}"/>
<copy file="${basedir}/tloslite-${version}.jar" todir="${export.dir}/"/>
<copy file="${basedir}/../tloslitemodel/tloslite-model-${version}.jar" todir="${export.lib.dir}"/>
<copy file="${basedir}/../tlosliteutils/tloslite-utils-${version}.jar" todir="${export.lib.dir}"/>
<copy file="${basedir}/tloslite-${version.num}.jar" todir="${export.dir}/"/>
<copy file="${basedir}/../tloslitemodel/tloslite-model-${version.num}.jar" todir="${export.lib.dir}"/>
<copy file="${basedir}/../tlosliteutils/tloslite-utils-${version.num}.jar" todir="${export.lib.dir}"/>

<copy file="${lib.dir}/commons-codec-1.4.jar" todir="${export.lib.dir}"/>
<copy file="${lib.dir}/commons-lang-2.6.jar" todir="${export.lib.dir}"/>
@@ -42,7 +42,7 @@
<copy file="${lib.dir}/winp.dll" todir="${export.lib.dir}"/>
<copy file="${lib.dir}/winp.x64.dll" todir="${export.lib.dir}"/>

<copy file="${img.dir}/1.8.2.gif" todir="${export.dir}"/>
<copy file="${img.dir}/${version.num}.gif" todir="${export.dir}"/>
<copy file="${img.dir}/bk.jpg" todir="${export.dir}"/>

<copy file="${src.dir}/start-notr.bat" todir="${export.dir}"/>
@@ -82,9 +82,9 @@
<delete dir="${dist.dir}" />
<mkdir dir="${dist.dir}"/>

<tar destfile="${dist.dir}/tloslite-${version}.tar" basedir="${export.dir}"/>
<gzip destfile="${dist.dir}/tloslite-${version}.tar.gz" src="${dist.dir}/tloslite-${version}.tar"/>
<delete file="${dist.dir}/tloslite-${version}.tar"/>
<tar destfile="${dist.dir}/tloslite-${version.num}.tar" basedir="${export.dir}"/>
<gzip destfile="${dist.dir}/tloslite-${version.num}.tar.gz" src="${dist.dir}/tloslite-${version.num}.tar"/>
<delete file="${dist.dir}/tloslite-${version.num}.tar"/>

</target>
</project>
@@ -2,8 +2,8 @@

<project default="create" name="Create config files and the startup scripts">

<property name="version" value="1.8.2" />

<property file="version.info" />
<!-- condition property="isWindows">
<os family="windows" />
</condition>
@@ -26,37 +26,37 @@

<target name="create" depends="">
<echo file="start.sh">cat README.txt
java -jar tloslite-1.8.2.jar -cfg tlos-config-ux.xml 2> error.log
java -jar tloslite-${version.num}.jar -cfg tlos-config-ux.xml 2> error.log
</echo>

<echo file="start-notr.sh">cat README.txt
java -Duser.country=ENTR -Duser.language=entr -jar tloslite-${version}.jar -cfg tlos-config-ux.xml 2> error.log
java -Duser.country=ENTR -Duser.language=entr -jar tloslite-${version.num}.jar -cfg tlos-config-ux.xml 2> error.log
</echo>

<echo file="start.bat">type README.txt
@echo off
Chcp 1254
java -jar tloslite-${version}.jar -cfg tlos-config-win.xml 2> error.log
java -jar tloslite-${version.num}.jar -cfg tlos-config-win.xml 2> error.log
</echo>

<echo file="start-notr.bat">type README.txt
@echo off
Chcp 1254
java -Duser.country=ENTR -Duser.language=entr -jar tloslite-${version}.jar -cfg tlos-config-win.xml 2> error.log
java -Duser.country=ENTR -Duser.language=entr -jar tloslite-${version.num}.jar -cfg tlos-config-win.xml 2> error.log
</echo>

<echo file="stop.sh">java -cp tloslite-${version}.jar com.likya.tlos.TlosRemoteManager -port 3001 -host localhost -terminate</echo>
<echo file="stop.sh">java -cp tloslite-${version.num}.jar com.likya.tlos.TlosRemoteManager -port 3001 -host localhost -terminate</echo>

<echo file="stopf.sh">java -cp tloslite-${version}.jar com.likya.tlos.TlosRemoteManager -port 3001 -host localhost -fterminate</echo>
<echo file="stopf.sh">java -cp tloslite-${version.num}.jar com.likya.tlos.TlosRemoteManager -port 3001 -host localhost -fterminate</echo>

<echo file="stop.bat">@echo off
Chcp 1254
java -cp tloslite-${version}.jar com.likya.tlos.TlosRemoteManager -port 3001 -host localhost -terminate
java -cp tloslite-${version.num}.jar com.likya.tlos.TlosRemoteManager -port 3001 -host localhost -terminate
</echo>

<echo file="stopf.bat">@echo off
Chcp 1254
java -cp tloslite-${version}.jar com.likya.tlos.TlosRemoteManager -port 3001 -host localhost -fterminate
java -cp tloslite-${version.num}.jar com.likya.tlos.TlosRemoteManager -port 3001 -host localhost -fterminate
</echo>

<echo file="jobs/job01.sh">java -jar libs/tlostestjob.jar 10000 0 logUx01.log</echo>
@@ -56,7 +56,7 @@ Senaryo bilgilerini bulunduran dosya
hata kelimesi (\null, HATA)
-->
</comment>
<entry key="version">V1.8.2</entry>
<entry key="version">V1.8.30</entry>
<!-- >entry key="job1">A,jobs/job01.sh,system,logUx01.log,yok,S,00:00:00-23:59:59,300,false,0,1,\null</entry>
<entry key="job2">A,jobs/job02.sh,system,logUx02.log,job1,S,00:00:00-23:59:59,300,false,0,1,\null</entry-->
<entry key="job3">A,jobs/job01.sh,system,logUx01.log,yok,M,00:00:00-23:59:59,-1,false,0,1,\null</entry>
@@ -56,7 +56,7 @@ Senaryo bilgilerini bulunduran dosya
hata kelimesi : verilmek istenmezse (\null) seklinde, bir veya daha fazla hata kelimesi ise (HATA1|Hata2|hata3) seklinde girilebilir.
-->
</comment>
<entry key="version">V1.8.2</entry>
<entry key="version">V1.8.30</entry>
<entry key="job1">A,jobs/job01.sh,system,logUx01.log,yok,S,00:00:00-23:59:59,300,false,0,1,\null</entry>
<entry key="job2">A,jobs/job02.sh,system,logUx02.log,job1,S,00:00:00-23:59:59,300,false,0,1,\null</entry>
</properties>
@@ -56,7 +56,7 @@ Senaryo bilgilerini bulunduran dosya
hata kelimesi : verilmek istenmezse (\null) seklinde, bir veya daha fazla hata kelimesi ise (HATA1|Hata2|hata3) seklinde girilebilir.
-->
</comment>
<entry key="version">V1.8.2</entry>
<entry key="version">V1.8.30</entry>
<entry key="job1">A,jobs/job01.bat,system,logWin01.log,yok,S,00:00:00-23:59:59,300,false,0,1,\null</entry>
<entry key="job2">A,jobs/job02.bat,system,logWin02.log,job1,S,00:00:00-23:59:59,300,false,0,1,\null</entry>
</properties>
@@ -33,7 +33,7 @@

public abstract class TlosServerBase implements Runnable {

private static final String version = "V1.8.2"; //$NON-NLS-1$
private static final String version = "V1.8.30"; //$NON-NLS-1$

private static int executionState = TlosInfo.STATE_WORKING;

@@ -71,7 +71,7 @@ public String getAboutPopupJs() {
str += " ModalPopups.Alert('tlosLiteAboutBox',"; //$NON-NLS-1$
str += " '<div style=\\'float:left;\\'><img src=\\'images/icon2.gif\\'></div><div style=\\'float:left; padding-left:5px;\\'>" + LocaleMessages.getString("HtmlFileReaderV2.12") + "</div>',"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
str += " '<div style=\\'\\'>' +"; //$NON-NLS-1$
str += " '<div style=\\'float:left; padding-left:10px;\\'><img src=\\'images/1.8.2.gif\\'></div>' +"; //$NON-NLS-1$
str += " '<div style=\\'float:left; padding-left:10px;\\'><img src=\\'images/1.8.30.gif\\'></div>' +"; //$NON-NLS-1$
str += " '<div style=\\'float:left; padding-left:10px;\\'><br/>Likya Bilgi Teknolojileri ve İletişim Hizmetleri Ltd. Şti.' +"; //$NON-NLS-1$
str += " '<br/><br/>&#169; "; //$NON-NLS-1$
str += " 2008-' + curr_year + "; //$NON-NLS-1$
@@ -1,5 +1,5 @@
type README.txt
@echo off
Chcp 1254
java -Duser.country=ENTR -Duser.language=entr -jar tloslite-1.8.2.jar -cfg tlos-config-win.xml 2> error.log
java -Duser.country=ENTR -Duser.language=entr -jar tloslite-1.8.30.jar -cfg tlos-config-win.xml 2> error.log

@@ -1,3 +1,3 @@
cat README.txt
java -Duser.country=ENTR -Duser.language=entr -jar tloslite-1.8.2.jar -cfg tlos-config-ux.xml 2> error.log
java -Duser.country=ENTR -Duser.language=entr -jar tloslite-1.8.30.jar -cfg tlos-config-ux.xml 2> error.log

@@ -1,5 +1,5 @@
type README.txt
@echo off
Chcp 1254
java -jar tloslite-1.8.2.jar -cfg tlos-config-win.xml 2> error.log
java -jar tloslite-1.8.30.jar -cfg tlos-config-win.xml 2> error.log

@@ -1,3 +1,3 @@
cat README.txt
java -jar tloslite-1.8.2.jar -cfg tlos-config-ux.xml 2> error.log
java -jar tloslite-1.8.30.jar -cfg tlos-config-ux.xml 2> error.log

@@ -1,4 +1,4 @@
@echo off
Chcp 1254
java -cp tloslite-1.8.2.jar com.likya.tlos.TlosRemoteManager -port 3001 -host localhost -terminate
java -cp tloslite-1.8.30.jar com.likya.tlos.TlosRemoteManager -port 3001 -host localhost -terminate

@@ -1 +1 @@
java -cp tloslite-1.8.2.jar com.likya.tlos.TlosRemoteManager -port 3001 -host localhost -terminate
java -cp tloslite-1.8.30.jar com.likya.tlos.TlosRemoteManager -port 3001 -host localhost -terminate
@@ -1,4 +1,4 @@
@echo off
Chcp 1254
java -cp tloslite-1.8.2.jar com.likya.tlos.TlosRemoteManager -port 3001 -host localhost -fterminate
java -cp tloslite-1.8.30.jar com.likya.tlos.TlosRemoteManager -port 3001 -host localhost -fterminate

@@ -1 +1 @@
java -cp tloslite-1.8.2.jar com.likya.tlos.TlosRemoteManager -port 3001 -host localhost -fterminate
java -cp tloslite-1.8.30.jar com.likya.tlos.TlosRemoteManager -port 3001 -host localhost -fterminate
@@ -43,7 +43,7 @@ scheduledDays(opsiyonel, varsayılan : 1,2,3,4,5,6,7) : Çalışma günleri, Tlo
(Pazar[1]-Cumartesi[7])

</comment>
<entry key="version">V1.8.2</entry>
<entry key="version">V1.8.30</entry>

<entry key="scenarioName">Test</entry>
<entry key="scenarioFile">senaryo-ux.xml</entry>
@@ -43,7 +43,7 @@ scheduledDays(opsiyonel, varsayılan : 1,2,3,4,5,6,7) : Çalışma günleri, Tlo
(Pazar[1]-Cumartesi[7])

</comment>
<entry key="version">V1.8.2</entry>
<entry key="version">V1.8.30</entry>

<entry key="scenarioName">Test</entry>
<entry key="scenarioFile">senaryo-win.xml</entry>
@@ -43,7 +43,7 @@ scheduledDays(opsiyonel, varsayılan : 1,2,3,4,5,6,7) : Çalışma günleri, Tlo
(Pazar[1]-Cumartesi[7])

</comment>
<entry key="version">V1.8.2</entry>
<entry key="version">V1.8.30</entry>

<entry key="scenarioName">Test</entry>
<entry key="scenarioFile">senaryo-local.xml</entry>
@@ -0,0 +1 @@
version.num=1.8.30
@@ -1,13 +1,14 @@
<project name="TlosLiteModel" default="jar" basedir=".">

<property file="../tloslite/version.info" />

<property name="appname" value="tloslite-model" />

<property name="src.dir" value="src" />
<property name="build.dir" value="build/classes" />
<property name="webapp.dir" value="." />
<property name="build.classes.dir" value="${build.dir}"/>
<property name="app.deploy.dir" value="${basedir}" />
<property name="version.num" value="1.8.2"/>

<path id="build.path">
<pathelement location="${build.classes.dir}"/>
@@ -2,3 +2,5 @@
/tloslite-utils-1.8.2.jar
/tloslite-utils-src-1.8.2.jar
/tloslite-utils.jar
/tloslite-utils-1.8.30.jar
/tloslite-utils-src-1.8.30.jar
@@ -1,14 +1,17 @@
<project name="tlosliteutils" default="build-all" basedir=".">

<property file="../tloslite/version.info" />

<property name="appname" value="tloslite-utils" />

<property file="build.properties" />
<echo>"${version.num}"</echo>
<echo>"${tlosLiteModel.dir}"</echo>

<property name="src.dir" value="src" />
<property name="build.dir" value="bin" />
<property name="build.classes.dir" value="${build.dir}"/>
<property name="app.deploy.dir" value="${basedir}" />
<property name="version.num" value="1.8.2"/>

<target name="init" depends="init2" unless="minor.number">
<property name="minor.number" value="" />

0 comments on commit 764a3d4

Please sign in to comment.