Rev 1324 | Rev 1327 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 1324 | Rev 1325 | ||
|---|---|---|---|
| Line 384... | Line 384... | ||
| 384 | </copy> |
384 | </copy> |
| 385 | <mkdir dir="${assignement.templates.dir.build}"/> |
385 | <mkdir dir="${assignement.templates.dir.build}"/> |
| 386 | <copy overwrite="true" todir="${assignement.templates.dir.build}"> |
386 | <copy overwrite="true" todir="${assignement.templates.dir.build}"> |
| 387 | <fileset dir="${assignement.templates.dir.conf}" includes="*.*"/> |
387 | <fileset dir="${assignement.templates.dir.conf}" includes="*.*"/> |
| 388 | </copy> |
388 | </copy> |
| - | 389 | <!--<copy overwrite="true" todir="${olap.cfg.xml.build}" file="${olap.cfg.xml}"/>--> |
|
| 389 | <copy overwrite="true" todir="${hibernate.cfg.xml.build}" file="${hibernate.cfg.xml}"/> |
390 | <copy overwrite="true" todir="${hibernate.cfg.xml.build}" file="${hibernate.cfg.xml}"/> |
| 390 | <copy overwrite="true" todir="${mime.types.build}" file="${mime.types}"/> |
391 | <copy overwrite="true" todir="${mime.types.build}" file="${mime.types}"/> |
| 391 | <copy overwrite="true" todir="${app.properties.build}" file="${app.properties}"/> |
392 | <copy overwrite="true" todir="${app.properties.build}" file="${app.properties}"/> |
| 392 | <copy overwrite="true" todir="${jdbc.properties.build}" file="${jdbc.properties}"/> |
393 | <copy overwrite="true" todir="${jdbc.properties.build}" file="${jdbc.properties}"/> |
| - | 394 | <copy overwrite="true" todir="${jdbc.olap.properties.build}" file="${jdbc.olap.properties}"/> |
|
| 393 | <copy overwrite="true" todir="${ldap.properties.build}" file="${ldap.properties}"/> |
395 | <copy overwrite="true" todir="${ldap.properties.build}" file="${ldap.properties}"/> |
| 394 | <copy overwrite="true" todir="${build.dir.classes}" file="${log4j.properties}"/> |
396 | <copy overwrite="true" todir="${build.dir.classes}" file="${log4j.properties}"/> |
| 395 | <mkdir dir="${build.dir.intranet.setup.folders.file}"/> |
397 | <mkdir dir="${build.dir.intranet.setup.folders.file}"/> |
| 396 | <copy overwrite="true" todir="${build.dir.intranet.setup.folders.file}" file="${intranet.setup.folders.file.src}"/> |
398 | <copy overwrite="true" todir="${build.dir.intranet.setup.folders.file}" file="${intranet.setup.folders.file.src}"/> |
| 397 | 399 | ||
| Line 426... | Line 428... | ||
| 426 | <replace file="${jdbc.properties.build}/${jdbc.properties.filename}"> |
428 | <replace file="${jdbc.properties.build}/${jdbc.properties.filename}"> |
| 427 | <replacefilter token="@database.username@" value="${database.username}"/> |
429 | <replacefilter token="@database.username@" value="${database.username}"/> |
| 428 | <replacefilter token="@database.password@" value="${database.password}"/> |
430 | <replacefilter token="@database.password@" value="${database.password}"/> |
| 429 | <replacefilter token="@database.connection.url@" value="${database.connection.url}"/> |
431 | <replacefilter token="@database.connection.url@" value="${database.connection.url}"/> |
| 430 | </replace> |
432 | </replace> |
| - | 433 | <replace file="${jdbc.olap.properties.build}/${jdbc.olap.properties.filename}"> |
|
| - | 434 | <replacefilter token="@database.username@" value="${database.username}"/> |
|
| - | 435 | <replacefilter token="@database.password@" value="${database.password}"/> |
|
| - | 436 | <replacefilter token="@database.connection.url@" value="${database.connection.url}"/> |
|
| - | 437 | </replace> |
|
| 431 | <replace file="${hibernate.cfg.xml.build}/${hibernate.cfg.xml.filename}"> |
438 | <replace file="${hibernate.cfg.xml.build}/${hibernate.cfg.xml.filename}"> |
| 432 | <replacefilter token="@database.username@" value="${database.username}"/> |
439 | <replacefilter token="@database.username@" value="${database.username}"/> |
| 433 | <replacefilter token="@database.password@" value="${database.password}"/> |
440 | <replacefilter token="@database.password@" value="${database.password}"/> |
| 434 | <replacefilter token="@database.connection.url@" value="${database.connection.url}"/> |
441 | <replacefilter token="@database.connection.url@" value="${database.connection.url}"/> |
| 435 | <replacefilter token="@hibernate.show.sql@" value="${hibernate.show.sql}"/> |
442 | <replacefilter token="@hibernate.show.sql@" value="${hibernate.show.sql}"/> |
| 436 | </replace> |
443 | </replace> |
| - | 444 | <!-- |
|
| - | 445 | <replace file="${olap.cfg.xml.build}/${olap.cfg.xml.filename}"> |
|
| - | 446 | <replacefilter token="@database.username@" value="${database.username}"/> |
|
| - | 447 | <replacefilter token="@database.password@" value="${database.password}"/> |
|
| - | 448 | <replacefilter token="@database.connection.url@" value="${database.connection.url}"/> |
|
| - | 449 | <replacefilter token="@hibernate.show.sql@" value="${hibernate.show.sql}"/> |
|
| - | 450 | </replace>--> |
|
| 437 | <replace file="${app.properties.build}/app.properties"> |
451 | <replace file="${app.properties.build}/app.properties"> |
| 438 | <replacefilter token="@tmp.dir@" value="${tmp.dir}"/> |
452 | <replacefilter token="@tmp.dir@" value="${tmp.dir}"/> |
| 439 | <replacefilter token="@data.dir@" value="${data.dir}"/> |
453 | <replacefilter token="@data.dir@" value="${data.dir}"/> |
| 440 | <replacefilter token="@out.dir@" value="${out.dir}"/> |
454 | <replacefilter token="@out.dir@" value="${out.dir}"/> |
| 441 | <replacefilter token="@email.templates.dir@" value="${email.templates.dir}"/> |
455 | <replacefilter token="@email.templates.dir@" value="${email.templates.dir}"/> |
| Line 474... | Line 488... | ||
| 474 | <replace file="${jdbc.properties.build}/${jdbc.properties.filename}"> |
488 | <replace file="${jdbc.properties.build}/${jdbc.properties.filename}"> |
| 475 | <replacefilter token="@database.username@" value="${database.username}"/> |
489 | <replacefilter token="@database.username@" value="${database.username}"/> |
| 476 | <replacefilter token="@database.password@" value="${database.password}"/> |
490 | <replacefilter token="@database.password@" value="${database.password}"/> |
| 477 | <replacefilter token="@database.connection.url@" value="${database.connection.url}"/> |
491 | <replacefilter token="@database.connection.url@" value="${database.connection.url}"/> |
| 478 | </replace> |
492 | </replace> |
| - | 493 | <replace file="${jdbc.olap.properties.build}/${jdbc.olap.properties.filename}"> |
|
| - | 494 | <replacefilter token="@database.username@" value="${database.username}"/> |
|
| - | 495 | <replacefilter token="@database.password@" value="${database.password}"/> |
|
| - | 496 | <replacefilter token="@database.connection.url@" value="${database.connection.url}"/> |
|
| - | 497 | </replace> |
|
| 479 | </target> |
498 | </target> |
| 480 | <target name="generateHibernateCfgXml" depends="compileToolFiles"> |
499 | <target name="generateHibernateCfgXml" depends="compileToolFiles"> |
| 481 | <!--<delete file="${build.dir.classes}/${hibernate.cfg.xml.filename}"/>--> |
500 | <!--<delete file="${build.dir.classes}/${hibernate.cfg.xml.filename}"/>--> |
| 482 | <java classname="${mapping.buider.class}" classpath="${build.dir.classes}"> |
501 | <java classname="${mapping.buider.class}" classpath="${build.dir.classes}"> |
| 483 | <arg value="${hibernate.cfg.xml.build}"/> |
502 | <arg value="${hibernate.cfg.xml.build}"/> |
| 484 | <arg value="${hibernate.cfg.xml}"/> |
503 | <arg value="${hibernate.cfg.xml}"/> |
| 485 | <arg value="${package.dir}"/> |
504 | <arg value="${package.dir}"/> |
| - | 505 | <!--<arg value="Olap"/> O Hibernate.cfg serve para tudo no entanto o schema update e feito |
|
| - | 506 | <arg value="false"/> com o jdbc.olap para que estas tabelas fiquem como MyISAM |
|
| - | 507 | --> |
|
| 486 | </java> |
508 | </java> |
| - | 509 | <!--<echo message="Starting OLAP"/> |
|
| - | 510 | <java classname="${mapping.buider.class}" classpath="${build.dir.classes}"> |
|
| - | 511 | <arg value="${olap.cfg.xml.build}"/> |
|
| - | 512 | <arg value="${olap.cfg.xml}"/> |
|
| - | 513 | <arg value="${package.dir}"/> |
|
| - | 514 | <arg value="Olap"/> |
|
| - | 515 | <arg value="true"/> |
|
| - | 516 | </java>--> |
|
| 487 | <antcall target="replaceFiltersConfigurationFiles"/> |
517 | <antcall target="replaceFiltersConfigurationFiles"/> |
| 488 | </target> |
518 | </target> |
| 489 | <target name="dbInit"> |
519 | <target name="dbInit"> |
| - | 520 | <!--<delete file="${build.dir.classes}/${olap.cfg.xml.filename}"/>--> |
|
| 490 | <!--<delete file="${build.dir.classes}/${hibernate.cfg.xml.filename}"/>--> |
521 | <!--<delete file="${build.dir.classes}/${hibernate.cfg.xml.filename}"/>--> |
| 491 | <java classname="pt.estgp.estgweb.examples.DBInit" classpath="${build.dir.classes}" classpathref="pathToToolsLib"/> |
522 | <java classname="pt.estgp.estgweb.examples.DBInit" classpath="${build.dir.classes}" classpathref="pathToToolsLib"/> |
| 492 | 523 | ||
| 493 | <antcall target="replaceFiltersConfigurationFiles"/> |
524 | <antcall target="replaceFiltersConfigurationFiles"/> |
| 494 | </target> |
525 | </target> |
| Line 521... | Line 552... | ||
| 521 | drop="no" |
552 | drop="no" |
| 522 | delimiter=";" |
553 | delimiter=";" |
| 523 | output="${build.dir.classes}/app-scripts.sql"> |
554 | output="${build.dir.classes}/app-scripts.sql"> |
| 524 | <fileset dir="${hbm.dir}"> |
555 | <fileset dir="${hbm.dir}"> |
| 525 | <include name="**/*.hbm.xml"/> |
556 | <include name="**/*.hbm.xml"/> |
| - | 557 | <exclude name="**/Olap*.hbm.xml"/> |
|
| - | 558 | </fileset> |
|
| - | 559 | </schemaexport> |
|
| - | 560 | <schemaexport |
|
| - | 561 | properties="${jdbc.olap.properties.build}/${jdbc.olap.properties.filename}" |
|
| - | 562 | quiet="no" |
|
| - | 563 | text="no" |
|
| - | 564 | drop="no" |
|
| - | 565 | delimiter=";" |
|
| - | 566 | output="${build.dir.classes}/app-scripts.sql"> |
|
| - | 567 | <fileset dir="${hbm.dir}"> |
|
| - | 568 | <include name="**/Olap*.hbm.xml"/> |
|
| 526 | </fileset> |
569 | </fileset> |
| 527 | </schemaexport> |
570 | </schemaexport> |
| 528 | </target>--> |
571 | </target>--> |
| 529 | 572 | ||
| 530 | <target name="generateUpdateHibernateSql" depends="build"> |
573 | <target name="generateUpdateHibernateSql" depends="build"> |
| Line 536... | Line 579... | ||
| 536 | properties="${jdbc.properties.build}/${jdbc.properties.filename}" |
579 | properties="${jdbc.properties.build}/${jdbc.properties.filename}" |
| 537 | quiet="no" |
580 | quiet="no" |
| 538 | text="no"> |
581 | text="no"> |
| 539 | <fileset dir="${hbm.dir}"> |
582 | <fileset dir="${hbm.dir}"> |
| 540 | <include name="**/*.hbm.xml"/> |
583 | <include name="**/*.hbm.xml"/> |
| - | 584 | <exclude name="**/Olap*.hbm.xml"/> |
|
| - | 585 | </fileset> |
|
| - | 586 | </schemaupdate> |
|
| - | 587 | ||
| - | 588 | <schemaupdate |
|
| - | 589 | properties="${jdbc.olap.properties.build}/${jdbc.olap.properties.filename}" |
|
| - | 590 | quiet="no" |
|
| - | 591 | text="no"> |
|
| - | 592 | <fileset dir="${hbm.dir}"> |
|
| - | 593 | <include name="**/Olap*.hbm.xml"/> |
|
| 541 | </fileset> |
594 | </fileset> |
| 542 | </schemaupdate> |
595 | </schemaupdate> |
| 543 | </target> |
596 | </target> |
| 544 | 597 | ||
| 545 | <target name="generateHibernateDomainObjects"> |
598 | <target name="generateHibernateDomainObjects"> |