Changeset 3f00be89


Ignore:
Timestamp:
Sep 23, 2016 9:01:29 PM (12 months ago)
Author:
www-data <www-data@…>
Branches:
master, feature_CIS, release_9.3, release_9.4, release_9.5
Children:
27239ef2
Parents:
c4a103d
git-author:
Dimitar Misev <misev@…> (09/22/16 22:15:35)
git-committer:
www-data <www-data@…> (09/23/16 21:01:29)
Message:

ticket:000 - release 9.3

Files:
1 added
1 deleted
3 edited

Legend:

Unmodified
Added
Removed
  • applications/petascope/Makefile.am

    rbc1661c r3f00be89  
    100100JAVAC     = javac
    101101
    102 JJARS_CP  = lib/gt9.jar:lib/ormlite-core-4.48.jar:lib/ormlite-jdbc-4.48.jar:lib/annotations-9.0.4.jar:lib/commons-lang3-3.1.jar:lib/antlr-4.1-complete.jar:lib/antlrworks-1.3.1.jar:lib/commons-fileupload-1.2.jar:lib/commons-io-1.3.2.jar:lib/commons-math-1.1.jar:lib/mockito-all-1.10.19.jar:lib/gml-v_3_1_1-schema-1.0-SNAPSHOT.jar:lib/jaxb-api.jar:lib/jaxb-impl.jar:lib/jaxb-xjc.jar:lib/joda-time-2.3.jar:lib/junit-4.5.jar:lib/log4j-1.2.15.jar:lib/ows-v_1_0_0-schema-1.0-SNAPSHOT.jar:lib/postgresql-9.3-1101.jdbc4.jar:../../java/dist/rasj.jar:lib/servlet-2_5-api.jar:lib/slf4j-api-1.7.7.jar:lib/slf4j-log4j12-1.7.7.jar:lib/sqlite-jdbc-3.7.15-M1.jar:lib/uuid-3.2.jar:lib/wcs-v_1_1_0-schema-1.0-SNAPSHOT.jar:lib/xercesImpl-2.7.1.jar:lib/xom-1.2.6.jar:lib/hsqldb.jar:lib/jts-1.11.jar:lib/jackson-annotations-2.7.4.jar:lib/jackson-core-2.7.4.jar:lib/jackson-databind-2.7.4.jar:lib/jackson-dataformat-xml-2.6.3.jar:lib/slf4j-log4j12-1.7.7.jar:lib/stax2-api-3.1.4.jar
    103 JJARS_PATHS = lib/gt9.jar lib/ormlite-core-4.48.jar lib/ormlite-jdbc-4.48.jar  lib/annotations-9.0.4.jar lib/commons-lang3-3.1.jar lib/antlr-4.1-complete.jar lib/antlrworks-1.3.1.jar lib/commons-fileupload-1.2.jar lib/commons-io-1.3.2.jar lib/commons-math-1.1.jar lib/mockito-all-1.10.19.jar lib/gml-v_3_1_1-schema-1.0-SNAPSHOT.jar lib/jaxb-api.jar lib/jaxb-impl.jar lib/jaxb-xjc.jar lib/joda-time-2.3.jar lib/junit-4.5.jar lib/log4j-1.2.15.jar lib/ows-v_1_0_0-schema-1.0-SNAPSHOT.jar lib/postgresql-9.3-1101.jdbc4.jar ../../java/dist/rasj.jar lib/servlet-2_5-api.jar lib/slf4j-api-1.7.7.jar lib/slf4j-log4j12-1.7.7.jar lib/sqlite-jdbc-3.7.15-M1.jar lib/uuid-3.2.jar lib/wcs-v_1_1_0-schema-1.0-SNAPSHOT.jar lib/xercesImpl-2.7.1.jar lib/xom-1.2.6.jar lib/hsqldb.jar lib/jts-1.11.jar lib/jackson-annotations-2.7.4.jar lib/jackson-core-2.7.4.jar lib/jackson-databind-2.7.4.jar lib/jackson-dataformat-xml-2.6.3.jar lib/slf4j-log4j12-1.7.7.jar lib/stax2-api-3.1.4.jar
     102JJARS_CP  = lib/gt9.jar:lib/ormlite-core-4.48.jar:lib/ormlite-jdbc-4.48.jar:lib/annotations-9.0.4.jar:lib/commons-lang3-3.1.jar:lib/antlr-4.1-complete.jar:lib/antlrworks-1.3.1.jar:lib/commons-fileupload-1.2.jar:lib/commons-io-1.3.2.jar:lib/commons-math-1.1.jar:lib/mockito-all-1.10.19.jar:lib/gml-v_3_1_1-schema-1.0-SNAPSHOT.jar:lib/jaxb-api.jar:lib/jaxb-impl.jar:lib/jaxb-xjc.jar:lib/joda-time-2.3.jar:lib/junit-4.5.jar:lib/log4j-1.2.15.jar:lib/ows-v_1_0_0-schema-1.0-SNAPSHOT.jar:lib/postgresql-9.3-1101.jdbc4.jar:../../java/dist/rasj.jar:lib/servlet-2_5-api.jar:lib/slf4j-api-1.7.7.jar:lib/slf4j-log4j12-1.7.7.jar:lib/sqlite-jdbc-3.7.15-M1.jar:lib/uuid-3.2.jar:lib/wcs-v_1_1_0-schema-1.0-SNAPSHOT.jar:lib/xercesImpl-2.7.1.jar:lib/xom-1.2.6.jar:lib/hsqldb.jar:lib/jts-1.11.jar:lib/jackson-annotations-2.8.1.jar:lib/jackson-core-2.8.1.jar:lib/jackson-databind-2.8.1.jar:lib/jackson-dataformat-xml-2.8.1.jar:lib/slf4j-log4j12-1.7.7.jar:lib/stax2-api-3.1.4.jar
     103JJARS_PATHS = lib/gt9.jar lib/ormlite-core-4.48.jar lib/ormlite-jdbc-4.48.jar  lib/annotations-9.0.4.jar lib/commons-lang3-3.1.jar lib/antlr-4.1-complete.jar lib/antlrworks-1.3.1.jar lib/commons-fileupload-1.2.jar lib/commons-io-1.3.2.jar lib/commons-math-1.1.jar lib/mockito-all-1.10.19.jar lib/gml-v_3_1_1-schema-1.0-SNAPSHOT.jar lib/jaxb-api.jar lib/jaxb-impl.jar lib/jaxb-xjc.jar lib/joda-time-2.3.jar lib/junit-4.5.jar lib/log4j-1.2.15.jar lib/ows-v_1_0_0-schema-1.0-SNAPSHOT.jar lib/postgresql-9.3-1101.jdbc4.jar ../../java/dist/rasj.jar lib/servlet-2_5-api.jar lib/slf4j-api-1.7.7.jar lib/slf4j-log4j12-1.7.7.jar lib/sqlite-jdbc-3.7.15-M1.jar lib/uuid-3.2.jar lib/wcs-v_1_1_0-schema-1.0-SNAPSHOT.jar lib/xercesImpl-2.7.1.jar lib/xom-1.2.6.jar lib/hsqldb.jar lib/jts-1.11.jar lib/jackson-annotations-2.8.1.jar lib/jackson-core-2.8.1.jar lib/jackson-databind-2.8.1.jar lib/jackson-dataformat-xml-2.8.1.jar lib/slf4j-log4j12-1.7.7.jar lib/stax2-api-3.1.4.jar
    104104
    105105JFLAGS    = -sourcepath $(SRC_MAIN) \
  • applications/secore/Makefile.am

    r57107c1 r3f00be89  
    4646
    4747install-exec-hook:
    48         mkdir -p ${WAR_DIR}/secoredb
    49         chmod -R 777 ${WAR_DIR}/secoredb
    50         cp ${SECORE_TARGET_DIR}/def.war ${WAR_DIR}/
     48        mkdir -p $(DESTDIR)${WAR_DIR}/secoredb
     49        chmod -R 777 $(DESTDIR)${WAR_DIR}/secoredb
     50        cp ${SECORE_TARGET_DIR}/def.war $(DESTDIR)${WAR_DIR}/
    5151
    5252clean-local:
  • qlparser/qtupdate.cc

    rbc1661c r3f00be89  
    200200
    201201    r_Minterval domain = (static_cast<QtMintervalData*>(operand))->getMintervalData();
    202     LINFO << "evaluate null values: " << domain;
    203202    targetObj->setUpdateNullValues(&domain);
    204203}
Note: See TracChangeset for help on using the changeset viewer.