hotel_chui_java_11.diff
| new/build.xml 2022-04-19 14:59:42 +0000 | ||
|---|---|---|
| 38 | 38 |
<!-- set global properties for this build --> |
| 39 | 39 |
|
| 40 | 40 |
<property name="build.home" value="${basedir}/build" />
|
| 41 |
<property name="cvt.home" value="${basedir}/cvt" />
|
|
| 41 | 42 |
<property name="dist.home" value="${basedir}/distribution" />
|
| 42 |
<property name="data.home" value="${basedir}/data" />
|
|
| 43 |
<property name="data.rel" value="data" /> <!-- relative path to data folder -->
|
|
| 43 | 44 |
<property name="src.home" value="${basedir}/src" />
|
| 44 | 45 |
<property name="srcnew.home" value="${basedir}/srcnew" />
|
| 45 | 46 |
<property name="lib.home" value="${basedir}/lib" />
|
| ... | ... | |
| 540 | 541 |
</copy> |
| 541 | 542 | |
| 542 | 543 |
<!-- Copy data/ from src to equivalent location in build --> |
| 543 |
<copy todir="${build.home}/classes/data">
|
|
| 544 |
<fileset dir="${data.home}" includes="**/*.dict" />
|
|
| 545 |
<fileset dir="${data.home}" includes="**/*.p2o" />
|
|
| 546 |
</copy> |
|
| 547 | ||
| 548 |
<!-- Copy data ASTs to equivalent location in build --> |
|
| 549 |
<copy todir="${build.home}/classes">
|
|
| 550 |
<fileset dir="${data.home}" includes="**/*.dict, **/*.schema, **/*.p2o" />
|
|
| 544 |
<copy todir="${build.home}/classes/${data.rel}">
|
|
| 545 |
<fileset dir="${cvt.home}/${data.rel}" includes="*.dict" />
|
|
| 546 |
<fileset dir="${cvt.home}/${data.rel}" includes="*.p2o" />
|
|
| 551 | 547 |
</copy> |
| 552 | 548 |
</target> |
| 553 | 549 |
|
| ... | ... | |
| 562 | 558 |
*.jasper |
| 563 | 559 |
**.xml |
| 564 | 560 |
cfg/** |
| 565 |
data/**
|
|
| 561 |
${data.rel}/**
|
|
| 566 | 562 |
**/*.png |
| 567 | 563 |
**/*.jpg |
| 568 | 564 |
**/*.bmp |
| ... | ... | |
| 613 | 609 |
<!-- create the deploy lib folder --> |
| 614 | 610 |
<mkdir dir="${deploy.home}/lib"/>
|
| 615 | 611 |
|
| 616 |
<!-- create and populate the extension lib folder --> |
|
| 617 |
<mkdir dir="${deploy.home}/lib/spi"/>
|
|
| 618 |
<copy file="${p2jlib.home}/fwdspi.jar" todir="${deploy.home}/lib/spi"/>
|
|
| 619 |
|
|
| 620 | 612 |
<!-- copy the required jars to the distribution directory --> |
| 621 | 613 |
<copy file="${build.home}/lib/${appname}.jar" todir="${deploy.home}/lib"/>
|
| 622 | 614 |
|
| 623 | 615 |
<!-- Copy external jars --> |
| 624 | 616 |
<copy todir="${deploy.home}/lib">
|
| 625 | 617 |
<!-- exclude the AspectJ tools --> |
| 626 |
<fileset dir="${p2jlib.home}" excludes="aspectjtools.jar,fwdspi.jar"/>
|
|
| 618 |
<fileset dir="${p2jlib.home}" excludes="aspectjtools.jar"/>
|
|
| 627 | 619 |
</copy> |
| 628 | 620 |
</target> |
| 629 | 621 |
|
| ... | ... | |
| 678 | 670 |
<delete includeemptydirs="true" failonerror="false"> |
| 679 | 671 |
<fileset dir="${src.home}" excludes="**/*" />
|
| 680 | 672 |
</delete> |
| 673 |
<delete dir="${cvt.home}"/>
|
|
| 681 | 674 |
<delete dir="${basedir}/ddl"/>
|
| 682 | 675 |
<delete dir="${basedir}/local"/>
|
| 683 | 676 |
<delete dir="${basedir}/com"/>
|
| new/build_db.xml 2022-04-19 14:59:42 +0000 | ||
|---|---|---|
| 32 | 32 |
failonerror="true" |
| 33 | 33 |
dir="${basedir}" >
|
| 34 | 34 |
<jvmarg value="-Xmx1g"/> |
| 35 |
<jvmarg value="-Djava.locale.providers=SPI,JRE"/> |
|
| 36 |
<jvmarg value="-Djava.ext.dirs=deploy/lib/spi"/> |
|
| 35 |
<jvmarg value="-Djava.locale.providers=SPI,CLDR,COMPAT"/> |
|
| 36 |
<jvmarg value="-Djava.system.class.loader=com.goldencode.asm.AsmClassLoader"/> |
|
| 37 |
<!-- |
|
| 38 |
<jvmarg value="-Djava.ext.dirs=deploy/lib/spi"/> |
|
| 39 |
--> |
|
| 37 | 40 |
<jvmarg value="-Dfile.encoding=UTF-8"/> |
| 38 |
<jvmarg value="-Djava.system.class.loader=com.goldencode.asm.AsmClassLoader"/> |
|
| 39 | 41 |
<arg value ="-url"/> |
| 40 | 42 |
<arg value ="${sql.url.h2}"/>
|
| 41 | 43 |
<arg value ="-user"/> |
| ... | ... | |
| 59 | 61 |
failonerror="true" |
| 60 | 62 |
dir="${basedir}" >
|
| 61 | 63 |
<jvmarg value="-Xmx1g"/> |
| 62 |
<jvmarg value="-Djava.locale.providers=SPI,JRE"/>
|
|
| 63 |
<jvmarg value="-Djava.ext.dirs=deploy/lib/spi"/>
|
|
| 64 |
<jvmarg value="-Djava.locale.providers=SPI,CLDR,COMPAT"/>
|
|
| 65 |
<jvmarg value="-Djava.system.class.loader=com.goldencode.asm.AsmClassLoader"/>
|
|
| 64 | 66 |
<jvmarg value="-Dfile.encoding=UTF-8"/> |
| 65 |
<jvmarg value="-Djava.system.class.loader=com.goldencode.asm.AsmClassLoader"/> |
|
| 66 | 67 |
<arg value ="-d"/> |
| 67 | 68 |
<arg value ="2"/> |
| 68 | 69 |
<arg value ="dbName=${escaped.quotes}${db.name}${escaped.quotes}"/>
|
| ... | ... | |
| 70 | 71 |
<arg value ="url=${escaped.quotes}${sql.url.h2}${escaped.quotes}"/>
|
| 71 | 72 |
<arg value ="uid=${escaped.quotes}${sql.user}${escaped.quotes}"/>
|
| 72 | 73 |
<arg value ="pw=${escaped.quotes}${sql.user.pass}${escaped.quotes}"/>
|
| 74 |
<arg value ="dataPath=${escaped.quotes}${data.rel}/dump/hotel${escaped.quotes}"/>
|
|
| 73 | 75 |
<arg value ="maxThreads=4"/> |
| 74 | 76 |
<arg value ="schema/import"/> |
| 75 |
<arg value ="data/namespace/"/>
|
|
| 77 |
<arg value ="${data.rel}"/>
|
|
| 76 | 78 |
<arg value ="${db.name}.p2o"/>
|
| 77 | 79 |
<classpath refid="app.classpath"/> |
| 78 | 80 |
</java> |
| ... | ... | |
| 83 | 85 |
failonerror="true" |
| 84 | 86 |
dir="${basedir}" >
|
| 85 | 87 |
<jvmarg value="-Xmx1g"/> |
| 86 |
<jvmarg value="-Djava.locale.providers=SPI,JRE"/> |
|
| 87 |
<jvmarg value="-Djava.ext.dirs=deploy/lib/spi"/> |
|
| 88 |
<jvmarg value="-Djava.locale.providers=SPI,CLDR,COMPAT"/> |
|
| 88 | 89 |
<jvmarg value="-Dfile.encoding=UTF-8"/> |
| 89 | 90 |
<arg value ="-url"/> |
| 90 | 91 |
<arg value ="${sql.url.h2}"/>
|
| ... | ... | |
| 240 | 241 |
<arg value ="url=${escaped.quotes}${sql.url.pg}${escaped.quotes}"/>
|
| 241 | 242 |
<arg value ="uid=${escaped.quotes}${sql.user}${escaped.quotes}"/>
|
| 242 | 243 |
<arg value ="pw=${escaped.quotes}${sql.user.pass}${escaped.quotes}"/>
|
| 244 |
<arg value ="dataPath=${escaped.quotes}data/dump/hotel${escaped.quotes}"/>
|
|
| 243 | 245 |
<arg value ="maxThreads=4"/> |
| 244 | 246 |
<arg value ="schema/import"/> |
| 245 | 247 |
<arg value ="data/namespace/"/> |
| new/deploy/server/server.sh 2022-04-19 14:59:42 +0000 | ||
|---|---|---|
| 73 | 73 |
sport=$(($portbase + $instance)) |
| 74 | 74 |
iport="net:server:insecure_port="$(($portbase + $instance + $portstep)) |
| 75 | 75 |
port="net:connection:secure=true net:server:secure_port=$sport $iport" |
| 76 |
spi="-Djava.locale.providers=SPI,JRE -Djava.ext.dirs=$(${prog} ${cpath} com.goldencode.util.PrintSystemProp java.ext.dirs):../lib/spi"
|
|
| 76 |
spi="-Djava.locale.providers=SPI,CLDR,COMPAT"
|
|
| 77 | 77 | |
| 78 | 78 |
if [ $debug -eq 1 ]; then |
| 79 | 79 |
dtxt="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,address=$dport,server=y,suspend=$suspend" |