Build: #170 was successful Changes by Rob Kooper

Code commits

Git

  • Rob Kooper

    Rob Kooper 3899772b44267f3b6668eb1e8f5283748c50ffa6

    Merge pull request #109 in POL/polyglot from release/0.3.0 to master
    * commit '8deebf8f92410a22187737d55055cbb449ca7836': (23 commits)
      Update CHANGELOG.md
      update CHANGELOG.md
      update CHANGELOG.md
      update release date in CHANGELOG.md
      add CHANGELOG.md
      Fixed shell option in entrypoint.
      Added entrypoint option to just load env vars.
      add back old format to model
      add back the old output format
      Update src/main/java/edu/illinois/ncsa/isda/softwareserver/SoftwareServerUtility.java
      move variable declaration into try-catch block; alignment
      add downloadfile function in SoftwareServerUtility
      Split on .met.
      thrown runtime exception if incrementAndGetJobID() not overridden
      get polyglot-version-SNAPSHOT.jar, instead of hard coding.
      Update src/main/java/edu/illinois/ncsa/isda/softwareserver/polyglot/PolyglotStewardAMQ.java
      better print
      print jobid and docid when exceptino in process_job
      remove debug code
      rename posted file to Public or Temp folder
      ...

  • Yan Zhao

    Yan Zhao 8deebf8f92410a22187737d55055cbb449ca7836 m

    Update CHANGELOG.md

    • CHANGELOG.md (version 8deebf8f92410a22187737d55055cbb449ca7836)
  • Bing Zhang

    Bing Zhang 5f5cc7134c5cd17ddfd11137cbbce992dbff8acb m

    update CHANGELOG.md

    • CHANGELOG.md (version 5f5cc7134c5cd17ddfd11137cbbce992dbff8acb)
  • Bing Zhang

    Bing Zhang d314c6319f7bb7a3d70b1e32ff89911c3ce3e16a m

    update CHANGELOG.md

    • CHANGELOG.md (version d314c6319f7bb7a3d70b1e32ff89911c3ce3e16a)
  • Bing Zhang

    Bing Zhang cbe2f286edecce465461e1ac70d32548e9cded2b m

    update release date in CHANGELOG.md

    • CHANGELOG.md (version cbe2f286edecce465461e1ac70d32548e9cded2b)
  • Bing Zhang

    Bing Zhang 974563f4d9ebdf37986bd6cecb203db5e74a556c m

    add CHANGELOG.md

    • CHANGELOG.md (version 974563f4d9ebdf37986bd6cecb203db5e74a556c)
  • Kenton McHenry

    Kenton McHenry c9d11c3e8bf461ff8a2578f5a34e9d896005c57d m

    Fixed shell option in entrypoint.

    • docker/polyglot/entrypoint.sh (version c9d11c3e8bf461ff8a2578f5a34e9d896005c57d)
  • Kenton McHenry

    Kenton McHenry c550706e343ab867a7920b775e68a5507617a99d m

    Added entrypoint option to just load env vars.

    • docker/polyglot/entrypoint.sh (version c550706e343ab867a7920b775e68a5507617a99d)
  • Yan Zhao

    Yan Zhao a03eea44a9b849782b980ccb283162c378ddea9f m

    add back old format to model

    • scripts/R/PEcAn_convert.R (version a03eea44a9b849782b980ccb283162c378ddea9f)
  • Yan Zhao

    Yan Zhao fa8fcd8caf870bb4a93a344de51f86addf367d79 m

    add back the old output format

    • scripts/R/PEcAn_convert.R (version fa8fcd8caf870bb4a93a344de51f86addf367d79)
  • Bing Zhang

    Bing Zhang e13d62b2a603c73afa92826bba21ff661f553b07 m

    Update src/main/java/edu/illinois/ncsa/isda/softwareserver/SoftwareServerUtility.java

    • src/main/java/edu/illinois/ncsa/isda/softwareserver/SoftwareServerUtility.java (version e13d62b2a603c73afa92826bba21ff661f553b07)
  • Bing Zhang

    Bing Zhang 83537bfdbcb091592c7a96008af46fe844427517 m

    move variable declaration into try-catch block; alignment

    • src/main/java/edu/illinois/ncsa/isda/softwareserver/SoftwareServerUtility.java (version 83537bfdbcb091592c7a96008af46fe844427517)
  • Bing Zhang

    Bing Zhang e00429b8009041acea0952b85c28faae74d2bba5 m

    Merge branch 'feature/BD-1721-time-measure-of-polyglot-conversion' of https://opensource.ncsa.illinois.edu/bitbucket/scm/pol/polyglot into bugfix/BD-1704-software-server-should-download-file

  • Bing Zhang

    Bing Zhang 65be1ba825b7f3f00b7131578b693bffc9f436b8 m

    add downloadfile function in SoftwareServerUtility

    • src/main/java/edu/illinois/ncsa/isda/softwareserver/SoftwareServerRestlet.java (version 65be1ba825b7f3f00b7131578b693bffc9f436b8)
    • src/main/java/edu/illinois/ncsa/isda/softwareserver/SoftwareServerUtility.java (version 65be1ba825b7f3f00b7131578b693bffc9f436b8)
  • Kenton McHenry

    Kenton McHenry e59fc6c85c33850dcc4d167f8d54656ca44c13ec m

    Merge pull request #103 in POL/polyglot from bugfix/BD-1705-updates-polyglotrestlet.sh-to-use to develop
    * commit 'b0cf925b725e5719d7b27ed6915136f123af0076':
      get polyglot-version-SNAPSHOT.jar, instead of hard coding.

  • Kenton McHenry

    Kenton McHenry d50b3c4820ca9b20bc3123c495429386b9ec2b6a m

    Merge pull request #96 in POL/polyglot from bugfix/POL-194-potential-duplicate-file-overwritten to develop
    * commit 'afe86e7035145b6ec6cc56fcce0ad4b17ec29479':
      thrown runtime exception if incrementAndGetJobID() not overridden
      remove debug code
      rename posted file to Public or Temp folder
      write raw input url in .url file. create empty .log in advance. remove extra jobid_ prefix of posted filename
      remove jobid for url get
      overide converandemail func with jobid in PolyglotRestle and PolyglotStewardAMQ
      Updated pom.
      2.1.0 release.

  • Rob Kooper

    Rob Kooper b7f07755e5c75a219c2c8f9ca2f969e351ea2bba m

    Split on .met.

    • scripts/R/PEcAn_convert.R (version b7f07755e5c75a219c2c8f9ca2f969e351ea2bba)
  • Bing Zhang

    Bing Zhang afe86e7035145b6ec6cc56fcce0ad4b17ec29479 m

    thrown runtime exception if incrementAndGetJobID() not overridden

    • src/main/java/edu/illinois/ncsa/isda/softwareserver/polyglot/Polyglot.java (version afe86e7035145b6ec6cc56fcce0ad4b17ec29479)
  • Bing Zhang

    Bing Zhang b0cf925b725e5719d7b27ed6915136f123af0076 m

    get polyglot-version-SNAPSHOT.jar, instead of hard coding.

    • bin/PolyglotRestlet.sh (version b0cf925b725e5719d7b27ed6915136f123af0076)
  • Kenton McHenry

    Kenton McHenry 8a61b0fd0304549a497b21b3c6104d1caef4798f m

    Update src/main/java/edu/illinois/ncsa/isda/softwareserver/polyglot/PolyglotStewardAMQ.java

    • src/main/java/edu/illinois/ncsa/isda/softwareserver/polyglot/PolyglotStewardAMQ.java (version 8a61b0fd0304549a497b21b3c6104d1caef4798f)
  • Bing Zhang

    Bing Zhang 5f7b05b52d87572056756ed02da4c9358724a4f0 m

    better print

    • src/main/java/edu/illinois/ncsa/isda/softwareserver/polyglot/PolyglotStewardAMQ.java (version 5f7b05b52d87572056756ed02da4c9358724a4f0)
  • Bing Zhang

    Bing Zhang 4bd8c55b402a8e6d6aef18ef4e15e31839ef637a m

    print jobid and docid when exceptino in process_job

    • src/main/java/edu/illinois/ncsa/isda/softwareserver/polyglot/PolyglotStewardAMQ.java (version 4bd8c55b402a8e6d6aef18ef4e15e31839ef637a)
  • Bing Zhang

    Bing Zhang 9f54388fd0ce02ad06f2e9dc2b16fcc75ac938db m

    resolve conflicts

  • Bing Zhang

    Bing Zhang 2951733e21c2db22ea284362dc338159591683ce m

    remove debug code

    • src/main/java/edu/illinois/ncsa/isda/softwareserver/polyglot/PolyglotRestlet.java (version 2951733e21c2db22ea284362dc338159591683ce)
  • Bing Zhang

    Bing Zhang b2d093801f07541365afba387e12661c69d5ebce m

    rename posted file to Public or Temp folder

    • src/main/java/edu/illinois/ncsa/isda/softwareserver/polyglot/PolyglotRestlet.java (version b2d093801f07541365afba387e12661c69d5ebce)
  • Bing Zhang

    Bing Zhang b54e0a37220cbf52ffb37b6af1e3d6c86f5a3306 m

    write raw input url in .url file. create empty .log in advance. remove extra jobid_ prefix of posted filename

    • src/main/java/edu/illinois/ncsa/isda/softwareserver/polyglot/PolyglotRestlet.java (version b54e0a37220cbf52ffb37b6af1e3d6c86f5a3306)
    • src/main/java/edu/illinois/ncsa/isda/softwareserver/polyglot/PolyglotStewardAMQ.java (version b54e0a37220cbf52ffb37b6af1e3d6c86f5a3306)
  • Bing Zhang

    Bing Zhang c3177fc9188279b73ee250a3e4dd7af33de07bc2 m

    merge to resolve conflicts

  • Bing Zhang

    Bing Zhang 522555956010ea59dd24b86d4e8d83800c3c0541 m

    Merge remote-tracking branch 'origin/master' into bugfix/POL-194-potential-duplicate-file-overwritten

  • Bing Zhang

    Bing Zhang 3dae54303a93bb3521841b60a263c1bc18fd22ba m

    remove jobid for url get

    • src/main/java/edu/illinois/ncsa/isda/softwareserver/polyglot/PolyglotRestlet.java (version 3dae54303a93bb3521841b60a263c1bc18fd22ba)
  • Bing Zhang

    Bing Zhang b655b1bb0cdb223e59f96ab70c9b80501a24358c m

    overide converandemail func with jobid in PolyglotRestle and PolyglotStewardAMQ

    • src/main/java/edu/illinois/ncsa/isda/softwareserver/polyglot/Polyglot.java (version b655b1bb0cdb223e59f96ab70c9b80501a24358c)
    • src/main/java/edu/illinois/ncsa/isda/softwareserver/polyglot/PolyglotRestlet.java (version b655b1bb0cdb223e59f96ab70c9b80501a24358c)
    • src/main/java/edu/illinois/ncsa/isda/softwareserver/polyglot/PolyglotStewardAMQ.java (version b655b1bb0cdb223e59f96ab70c9b80501a24358c)