Build: #167 was successful Rebuilt by Kenton McHenry

Code commits

Showing 100 of 148 code changes

Git

  • Kenton McHenry

    Kenton McHenry c1534ede2743a8b6d595b872a28fcce020d75a3b

    Merge pull request #84 in POL/polyglot from develop to master
    * commit 'd97147eef3703584518a5bd6e1fec6507455baeb': (132 commits)
      Added script to get JSON from Clowder.
      Added path endpoint to list of endpoints.
      Added sf to polyglot image.  Added authentication for chaining from within docker.
      BD-1263: added option to email result.
      BD-1333: fixed /software endpoints when software servers are in docker containers.
      BD-697: at Siegfried output to polyglot logs.
      BD-1271, added ?chain=x flag to /inputs endpoint to list only x hop conversions.
      BD-1269: fixed access to .log files.
      Updated pom.xml to refer to local javacv libraries.
      Added code for local processing
      Added human readable timestamp.
      BD-1269: have polyglot ingore parameters on input URLs.
      start from openjdk image
      update docker.sh
      update from pecan team
      Added check if conversions == null when no path is found.
      BD-1178, added path endpoint to retrieve conversion path used for given output and input.
      Modified packaged script to take multiple params.
      remove .Rhistory
      roll back
      ...

  • Kenton McHenry

    Kenton McHenry d97147eef3703584518a5bd6e1fec6507455baeb m

    Added script to get JSON from Clowder.

    • scripts/py/.aliases.txt (version d97147eef3703584518a5bd6e1fec6507455baeb)
    • scripts/py/Clowder_convert.py (version d97147eef3703584518a5bd6e1fec6507455baeb)
    • scripts/py/DTS_convert.py (version d97147eef3703584518a5bd6e1fec6507455baeb)
    • scripts/py/auxiliary/__init__.py (version d97147eef3703584518a5bd6e1fec6507455baeb)
    • scripts/py/auxiliary/bd.py (version d97147eef3703584518a5bd6e1fec6507455baeb)
  • Kenton McHenry

    Kenton McHenry 80652d243b894c30206dda2805e918adeca8af96 m

    Merge branch 'develop' of https://opensource.ncsa.illinois.edu/bitbucket/scm/pol/polyglot into develop

  • Kenton McHenry

    Kenton McHenry 7c8de642b9ddc98826460e9fc5fe2ebf7c79c7e2 m

    Added path endpoint to list of endpoints.

    • src/main/java/edu/illinois/ncsa/isda/softwareserver/polyglot/PolyglotRestlet.java (version 7c8de642b9ddc98826460e9fc5fe2ebf7c79c7e2)
  • Kenton McHenry

    Kenton McHenry 5efe150f57a14640a3d81e5b620315e2a735899d m

    Merge pull request #81 in POL/polyglot from bugfix/POL-177-update-missing-dependencies-in-pom.xml to develop
    * commit '33ad978f34e69e2ba6536a7d1fec2e8543b8944d':
      Updated pom.xml to refer to local javacv libraries.

  • Kenton McHenry

    Kenton McHenry e8a54aec3fefd3f33107cac0f5a48a9f4ff91a61 m

    Added sf to polyglot image.  Added authentication for chaining from within docker.

    • docker.sh (version e8a54aec3fefd3f33107cac0f5a48a9f4ff91a61)
    • docker/polyglot/Dockerfile (version e8a54aec3fefd3f33107cac0f5a48a9f4ff91a61)
    • pom.xml (version e8a54aec3fefd3f33107cac0f5a48a9f4ff91a61)
    • src/main/assembly/conf/SoftwareServer.conf (version e8a54aec3fefd3f33107cac0f5a48a9f4ff91a61)
    • src/main/assembly/conf/SoftwareServerRestlet.conf (version e8a54aec3fefd3f33107cac0f5a48a9f4ff91a61)
    • src/main/java/edu/illinois/ncsa/isda/softwareserver/SoftwareServerRESTUtilities.java (version e8a54aec3fefd3f33107cac0f5a48a9f4ff91a61)
    • src/main/java/edu/illinois/ncsa/isda/softwareserver/TimedProcess.java (version e8a54aec3fefd3f33107cac0f5a48a9f4ff91a61)
    • src/main/java/edu/illinois/ncsa/isda/softwareserver/polyglot/PolyglotStewardAMQ.java (version e8a54aec3fefd3f33107cac0f5a48a9f4ff91a61)
  • Kenton McHenry

    Kenton McHenry 4ca62d19476bdd229ea34be33950b9656b49d1fe m

    BD-1263: added option to email result.

    • src/main/java/edu/illinois/ncsa/isda/softwareserver/polyglot/Polyglot.java (version 4ca62d19476bdd229ea34be33950b9656b49d1fe)
    • src/main/java/edu/illinois/ncsa/isda/softwareserver/polyglot/PolyglotRestlet.java (version 4ca62d19476bdd229ea34be33950b9656b49d1fe)
    • src/main/java/edu/illinois/ncsa/isda/softwareserver/polyglot/PolyglotStewardAMQ.java (version 4ca62d19476bdd229ea34be33950b9656b49d1fe)
  • Kenton McHenry

    Kenton McHenry b5941ebedf17c6035dd1c6a091fb8457d4d78ac2 m

    BD-1333: fixed /software endpoints when software servers are in docker containers.

    • src/main/assembly/conf/PolyglotRestlet.conf (version b5941ebedf17c6035dd1c6a091fb8457d4d78ac2)
    • src/main/java/edu/illinois/ncsa/isda/softwareserver/polyglot/IOGraph.java (version b5941ebedf17c6035dd1c6a091fb8457d4d78ac2)
    • src/main/java/edu/illinois/ncsa/isda/softwareserver/polyglot/Polyglot.java (version b5941ebedf17c6035dd1c6a091fb8457d4d78ac2)
    • src/main/java/edu/illinois/ncsa/isda/softwareserver/polyglot/PolyglotRestlet.java (version b5941ebedf17c6035dd1c6a091fb8457d4d78ac2)
    • src/main/java/edu/illinois/ncsa/isda/softwareserver/polyglot/PolyglotStewardAMQ.java (version b5941ebedf17c6035dd1c6a091fb8457d4d78ac2)
  • Kenton McHenry

    Kenton McHenry a2ac7f77c52bfc9626ca0da7f3c47364e1876932 m

    BD-697: at Siegfried output to polyglot logs.

    • src/main/java/edu/illinois/ncsa/isda/softwareserver/polyglot/PolyglotRestlet.java (version a2ac7f77c52bfc9626ca0da7f3c47364e1876932)
  • Kenton McHenry

    Kenton McHenry de7a1d95d543a4e378502456d162729cd7bed546 m

    BD-1271, added ?chain=x flag to /inputs endpoint to list only x hop conversions.

    • src/main/java/edu/illinois/ncsa/isda/softwareserver/polyglot/IOGraph.java (version de7a1d95d543a4e378502456d162729cd7bed546)
    • src/main/java/edu/illinois/ncsa/isda/softwareserver/polyglot/Polyglot.java (version de7a1d95d543a4e378502456d162729cd7bed546)
    • src/main/java/edu/illinois/ncsa/isda/softwareserver/polyglot/PolyglotRestlet.java (version de7a1d95d543a4e378502456d162729cd7bed546)
    • src/main/java/edu/illinois/ncsa/isda/softwareserver/polyglot/PolyglotStewardAMQ.java (version de7a1d95d543a4e378502456d162729cd7bed546)
  • Kenton McHenry

    Kenton McHenry 05558f44562057d2556c161e4af4d7841fb9eb71 m

    BD-1269: fixed access to .log files.

    • src/main/java/edu/illinois/ncsa/isda/softwareserver/polyglot/PolyglotRestlet.java (version 05558f44562057d2556c161e4af4d7841fb9eb71)
  • Sandeep Puthanveetil Satheesan

    Sandeep Puthanveetil Satheesan 33ad978f34e69e2ba6536a7d1fec2e8543b8944d m

    Updated pom.xml to refer to local javacv libraries.

    • pom.xml (version 33ad978f34e69e2ba6536a7d1fec2e8543b8944d)
  • Sandeep Puthanveetil Satheesan

    Sandeep Puthanveetil Satheesan 3ee244039a5b9ad170f3167a14afeaa80ceaf18d m

    Added code for local processing

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

    Kenton McHenry 580dfcecb29f722e336dec662d27bf8b1fb1f04c m

    Added human readable timestamp.

    • src/main/java/edu/illinois/ncsa/isda/softwareserver/polyglot/PolyglotRestlet.java (version 580dfcecb29f722e336dec662d27bf8b1fb1f04c)
  • Kenton McHenry

    Kenton McHenry 3b25d733bfdfc1f46535834f211485d9c7861e5a m

    BD-1269: have polyglot ingore parameters on input URLs.

    • src/main/java/edu/illinois/ncsa/isda/softwareserver/polyglot/PolyglotStewardAMQ.java (version 3b25d733bfdfc1f46535834f211485d9c7861e5a)
  • Rob Kooper

    Rob Kooper 3d167cdb066715e32391deb2352dc8335137ad4f m

    start from openjdk image

    • docker/polyglot/Dockerfile (version 3d167cdb066715e32391deb2352dc8335137ad4f)
  • Rob Kooper

    Rob Kooper 098bf6146e2c889c65b02b48bc980a9dc7a8a1a4 m

    update docker.sh
    - remove backup, just rerun
    - default project is ncsapolyglot
    - use DEBUG more

    • docker.sh (version 098bf6146e2c889c65b02b48bc980a9dc7a8a1a4)
  • Yan Zhao

    Yan Zhao d75c165a8e8049b49e442663acc849719fe25b33 m

    update from pecan team

    • scripts/R/PEcAn_convert.R (version d75c165a8e8049b49e442663acc849719fe25b33)
  • Kenton McHenry

    Kenton McHenry b81c911b70abc024f8c7d377ff8354052b6bfd62 m

    Added check if conversions == null when no path is found.

    • src/main/java/edu/illinois/ncsa/isda/softwareserver/polyglot/PolyglotRestlet.java (version b81c911b70abc024f8c7d377ff8354052b6bfd62)
  • Kenton McHenry

    Kenton McHenry b1118c5b30d1ab8b7feeb56ee66bb66a3567a18a m

    BD-1178, added path endpoint to retrieve conversion path used for given output and input.

    • src/main/java/edu/illinois/ncsa/isda/softwareserver/polyglot/PolyglotRestlet.java (version b1118c5b30d1ab8b7feeb56ee66bb66a3567a18a)
  • Kenton McHenry

    Kenton McHenry 92e56268b61f50331ec563975539904d28d9d764 m

    Merge branch 'develop' into kgm

  • Kenton McHenry

    Kenton McHenry aa1e5521a92f837a95388b663c709c0da14d8ba8 m

    Modified packaged script to take multiple params.

    • src/main/assembly/linux/SoftwareServer.sh (version aa1e5521a92f837a95388b663c709c0da14d8ba8)
  • Yan Zhao

    Yan Zhao 7ef2e0ba0ee72b53efe4872dafa3f33e053c876d m

    remove .Rhistory

    • scripts/R/.Rhistory (version 7ef2e0ba0ee72b53efe4872dafa3f33e053c876d)
  • Yan Zhao

    Yan Zhao be7e563dac8e3d8671c959f22fffa38871eab94d m

    roll back

    • scripts/R/.aliases.txt (version be7e563dac8e3d8671c959f22fffa38871eab94d)
    • scripts/R/PEcAn#AmerifluxSiteRaw_convert.R (version be7e563dac8e3d8671c959f22fffa38871eab94d)
    • scripts/R/PEcAn#AmerifluxSite_convert.R (version be7e563dac8e3d8671c959f22fffa38871eab94d)
    • scripts/R/PEcAn#Ameriflux_convert.R (version be7e563dac8e3d8671c959f22fffa38871eab94d)
    • scripts/R/PEcAn#DALEC_convert.R (version be7e563dac8e3d8671c959f22fffa38871eab94d)
    • scripts/R/PEcAn#ED2_convert.R (version be7e563dac8e3d8671c959f22fffa38871eab94d)
    • scripts/R/PEcAn#LINKAGES_convert.R (version be7e563dac8e3d8671c959f22fffa38871eab94d)
    • scripts/R/PEcAn#Sipnet_convert.R (version be7e563dac8e3d8671c959f22fffa38871eab94d)
    • scripts/R/PEcAn#Site_convert.R (version be7e563dac8e3d8671c959f22fffa38871eab94d)
  • Yan Zhao

    Yan Zhao a4f69c09b04b4001801ccbf167c7c7051e33f067 m

    wrapper-met.process

    • scripts/R/.Rhistory (version a4f69c09b04b4001801ccbf167c7c7051e33f067)
    • scripts/R/PEcAn#AmerifluxSiteRaw_convert.R (version a4f69c09b04b4001801ccbf167c7c7051e33f067)
    • scripts/R/PEcAn#AmerifluxSite_convert.R (version a4f69c09b04b4001801ccbf167c7c7051e33f067)
    • scripts/R/PEcAn#Ameriflux_convert.R (version a4f69c09b04b4001801ccbf167c7c7051e33f067)
    • scripts/R/PEcAn#DALEC_convert.R (version a4f69c09b04b4001801ccbf167c7c7051e33f067)
    • scripts/R/PEcAn#ED2_convert.R (version a4f69c09b04b4001801ccbf167c7c7051e33f067)
    • scripts/R/PEcAn#LINKAGES_convert.R (version a4f69c09b04b4001801ccbf167c7c7051e33f067)
    • scripts/R/PEcAn#Sipnet_convert.R (version a4f69c09b04b4001801ccbf167c7c7051e33f067)
    • scripts/R/PEcAn#Site_convert.R (version a4f69c09b04b4001801ccbf167c7c7051e33f067)
    • scripts/R/PEcAn_convert.R (version a4f69c09b04b4001801ccbf167c7c7051e33f067)
  • Kenton McHenry

    Kenton McHenry 8889382f5b06459dd97d7dd87bea5dad6e4aa7da m

    BD-1177: Added ability run a job on a Software Server from the command line.

    • bin/SoftwareServer.sh (version 8889382f5b06459dd97d7dd87bea5dad6e4aa7da)
    • src/main/java/edu/illinois/ncsa/isda/softwareserver/SoftwareServer.java (version 8889382f5b06459dd97d7dd87bea5dad6e4aa7da)
    • src/main/java/edu/illinois/ncsa/isda/softwareserver/SoftwareServerAuxiliary.java (version 8889382f5b06459dd97d7dd87bea5dad6e4aa7da)
  • Kenton McHenry

    Kenton McHenry 0dc3b51d2359474c4ec4a3088dc118b624914400 m

    BD-1210, Fixed support for archive files, e.g. zip, after supporting docker.

    • SoftwareServer.conf (version 0dc3b51d2359474c4ec4a3088dc118b624914400)
    • src/main/java/edu/illinois/ncsa/isda/softwareserver/SoftwareServerRESTUtilities.java (version 0dc3b51d2359474c4ec4a3088dc118b624914400)
    • src/main/java/edu/illinois/ncsa/isda/softwareserver/SoftwareServerUtility.java (version 0dc3b51d2359474c4ec4a3088dc118b624914400)
    • src/main/java/edu/illinois/ncsa/isda/softwareserver/polyglot/PolyglotRestlet.java (version 0dc3b51d2359474c4ec4a3088dc118b624914400)
  • Kenton McHenry

    Kenton McHenry f164a4ed7b8dd3f4dcd9b9185d6767b5ef49542d m

    Fixed BD-1164 and BD-1180.

    • src/main/java/edu/illinois/ncsa/isda/softwareserver/SoftwareServerRESTUtilities.java (version f164a4ed7b8dd3f4dcd9b9185d6767b5ef49542d)
    • src/main/java/edu/illinois/ncsa/isda/softwareserver/polyglot/PolyglotRestlet.java (version f164a4ed7b8dd3f4dcd9b9185d6767b5ef49542d)
  • Kenton McHenry

    Kenton McHenry ed4a7df27422fed2ceb914f2cefa25ef5e914255 m

    Fixed issue with software server logs being duplicated in polyglot logs when that server performs multiple parts.

    • docker.sh (version ed4a7df27422fed2ceb914f2cefa25ef5e914255)
    • src/main/java/edu/illinois/ncsa/isda/softwareserver/polyglot/PolyglotRestlet.java (version ed4a7df27422fed2ceb914f2cefa25ef5e914255)
    • src/main/java/edu/illinois/ncsa/isda/softwareserver/polyglot/PolyglotStewardAMQ.java (version ed4a7df27422fed2ceb914f2cefa25ef5e914255)
  • Kenton McHenry

    Kenton McHenry cbfc2a331828e882a4658980fe04e5e69328a061 m

    Added authentication to checkin that uses POST.

    • src/main/java/edu/illinois/ncsa/isda/softwareserver/SoftwareServerRESTUtilities.java (version cbfc2a331828e882a4658980fe04e5e69328a061)
    • src/main/java/edu/illinois/ncsa/isda/softwareserver/SoftwareServerRestlet.java (version cbfc2a331828e882a4658980fe04e5e69328a061)
    • src/main/java/edu/illinois/ncsa/isda/softwareserver/SoftwareServerUtility.java (version cbfc2a331828e882a4658980fe04e5e69328a061)
    • src/main/java/edu/illinois/ncsa/isda/softwareserver/polyglot/PolyglotRestlet.java (version cbfc2a331828e882a4658980fe04e5e69328a061)
  • Kenton McHenry

    Kenton McHenry 82bb386d92725775a83a532d3a868cbd34ad98ba m

    Updated docker readmes.

    • docker/converters-htmldoc/README (version 82bb386d92725775a83a532d3a868cbd34ad98ba)
    • docker/converters-imagemagick/README (version 82bb386d92725775a83a532d3a868cbd34ad98ba)
    • docker/polyglot/README (version 82bb386d92725775a83a532d3a868cbd34ad98ba)
  • Kenton McHenry

    Kenton McHenry fd7c93a9d3e2c404596f4f3d429d98646e61d249 m

    Renamed RABBITMQ_URI to be be consistent with Clowder.  Moved docker files to docker folder.  Renamed sample converters.

    • docker-compose.yml (version fd7c93a9d3e2c404596f4f3d429d98646e61d249)
    • docker.polyglot-server/Dockerfile (version fd7c93a9d3e2c404596f4f3d429d98646e61d249)
    • docker.polyglot-server/README (version fd7c93a9d3e2c404596f4f3d429d98646e61d249)
    • docker.polyglot-server/entrypoint.sh (version fd7c93a9d3e2c404596f4f3d429d98646e61d249)
    • docker.sh (version fd7c93a9d3e2c404596f4f3d429d98646e61d249)
    • docker.ss-htmldoc/Dockerfile (version fd7c93a9d3e2c404596f4f3d429d98646e61d249)
    • docker.ss-htmldoc/README (version fd7c93a9d3e2c404596f4f3d429d98646e61d249)
    • docker.ss-htmldoc/htmldoc_convert.sh (version fd7c93a9d3e2c404596f4f3d429d98646e61d249)
    • docker.ss-imagemagick/Dockerfile (version fd7c93a9d3e2c404596f4f3d429d98646e61d249)
    • docker.ss-imagemagick/ImageMagick_convert.sh (version fd7c93a9d3e2c404596f4f3d429d98646e61d249)
    • docker.ss-imagemagick/README (version fd7c93a9d3e2c404596f4f3d429d98646e61d249)
    • docker/converters-htmldoc/Dockerfile (version fd7c93a9d3e2c404596f4f3d429d98646e61d249)
    • docker/converters-htmldoc/README (version fd7c93a9d3e2c404596f4f3d429d98646e61d249)
    • docker/converters-htmldoc/htmldoc_convert.sh (version fd7c93a9d3e2c404596f4f3d429d98646e61d249)
    • docker/converters-imagemagick/Dockerfile (version fd7c93a9d3e2c404596f4f3d429d98646e61d249)
    • docker/converters-imagemagick/ImageMagick_convert.sh (version fd7c93a9d3e2c404596f4f3d429d98646e61d249)
    • docker/converters-imagemagick/README (version fd7c93a9d3e2c404596f4f3d429d98646e61d249)
    • docker/polyglot/Dockerfile (version fd7c93a9d3e2c404596f4f3d429d98646e61d249)
    • docker/polyglot/README (version fd7c93a9d3e2c404596f4f3d429d98646e61d249)
    • docker/polyglot/entrypoint.sh (version fd7c93a9d3e2c404596f4f3d429d98646e61d249)
  • Kenton McHenry

    Kenton McHenry bb739ec840f247fe78b925f0f48d32d2960b49cd m

    Added rabbigmq url message, fixed tabs.

    • src/main/java/edu/illinois/ncsa/isda/softwareserver/SoftwareServerRestlet.java (version bb739ec840f247fe78b925f0f48d32d2960b49cd)
    • src/main/java/edu/illinois/ncsa/isda/softwareserver/polyglot/PolyglotStewardAMQ.java (version bb739ec840f247fe78b925f0f48d32d2960b49cd)
  • Kenton McHenry

    Kenton McHenry 831f74c23974adc1f1078302f1fdb3f2c626033e m

    Added option to turn on/off the checking in of URLs or files.  Cleaned up spaces/tabs differences.

    • SoftwareServerRestlet.conf (version 831f74c23974adc1f1078302f1fdb3f2c626033e)
    • src/main/assembly/conf/SoftwareServerRestlet.conf (version 831f74c23974adc1f1078302f1fdb3f2c626033e)
    • src/main/java/edu/illinois/ncsa/isda/softwareserver/SoftwareServerRESTUtilities.java (version 831f74c23974adc1f1078302f1fdb3f2c626033e)
    • src/main/java/edu/illinois/ncsa/isda/softwareserver/SoftwareServerRestlet.java (version 831f74c23974adc1f1078302f1fdb3f2c626033e)
    • src/main/java/edu/illinois/ncsa/isda/softwareserver/polyglot/PolyglotRestlet.java (version 831f74c23974adc1f1078302f1fdb3f2c626033e)
  • Marcus Slavenas

    Marcus Slavenas 1998e09cf11e8453304c97f9455204135220a8f5 m

    Resolve conflict in merging feature/BD-1046-ss-uploads-the-file-in-the-checkin

  • Kenton McHenry

    Kenton McHenry fde0a96465f720daca7b957e96ff57e347062d96 m

    Merge pull request #71 in POL/polyglot from feature/BD-1048-handle-POL-server-app-endpoints to develop
    * commit 'd330f0eb055d1e9bd026b248c67ec44212333c9b':
      BD-1048 BD-1049 Handles /software/<sw1> redirection.
      BD-1048 BD-1049 Changed wait time when there are RabbitMQ conn errors such as it's down from 1 to 10 seconds, otherwise logs flood.
      BD-1048 Handles POL /servers/<server1> with new unique SS ID.

  • Kenton McHenry

    Kenton McHenry 82db9d516a6eace9275b3a269608f7cde086e1c8 m

    Merge pull request #73 in POL/polyglot from bugfix/BD-1078-polyglot-refactoring-handle-lost-rabbitmq-conn to develop
    * commit '13d9976afd4b5c53f38a2592723c8f38f261da72':
      BD-1078 Handles RabbitMQ reconn in SS registration in new push way.

  • Kenton McHenry

    Kenton McHenry a7ab4e7cc4bc154baef0348ca07a6ad769330e58 m

    Merge pull request #66 in POL/polyglot from feature/BD-1016-add-pol-ss-dockerfiles to develop
    * commit '9bf10ddc6215a1afd6fa695a2f2fb7498d276c5e':
      BD-1016 Fix for linux: changed double _ to single _. Removed "--pull" when building images. mvn pkg skip testing and javadoc.
      BD-1016 Updated the doc for building the polyglot-server image.
      BD-1016 Now use this build of polyglot-server image as the base for the SS converter images.
      BD-1016 Changed single quotes to double quotes for consistency -- both work.
      BD-1016 Now based on :latest instead of :bd-1009 and uses DOWNLOAD_SS_FILE.
      BD-1016 pol-server: added install of "wget" back (SS needs it); added handling of env var DOWNLOAD_SS_FILE; kept using 'root' instead of user 'polyglot'.
      BD-1016 Not based on the :bd-1009 image any more; user 'polyglot' has no permission to create public/ folder at run time, so keep using 'root'.
      BD-1016 Minor tweak, removed unused software installation, code cleanup.
      BD-1016 Changed from using bamboo build to using maven package to build and now build POL server and 2 SS converter images.
      BD-1016 Added the docker files and instructions to build POL and multi-SS docker images used in the demo.

  • Marcus Slavenas

    Marcus Slavenas deefd5efdb499f0157374b109bccd120ff252786 m

    Add org.apache.commons to pom, add check for last slash in public_path in SoftwareServerRestUtilities, add verify process id is numeric and underscore exists in filename in PolyglotRestlet

    • pom.xml (version deefd5efdb499f0157374b109bccd120ff252786)
    • src/main/java/edu/illinois/ncsa/isda/softwareserver/SoftwareServerRESTUtilities.java (version deefd5efdb499f0157374b109bccd120ff252786)
    • src/main/java/edu/illinois/ncsa/isda/softwareserver/polyglot/PolyglotRestlet.java (version deefd5efdb499f0157374b109bccd120ff252786)
  • Rui Liu

    Rui Liu 13d9976afd4b5c53f38a2592723c8f38f261da72 m

    BD-1078 Handles RabbitMQ reconn in SS registration in new push way.
    - Reduced duplicated code by adding and calling a common method.
    - Tested in 2 ways:
      = In normal op, stop RabbitMQ, then both SS and POL throw exceptions and
        try to reconnect. Wait for 1 minute, restart, test converstion.
      = In normal op, use RabbitMQ mgmt API to force close POL registration conn.
        Test conversion.

    • src/main/java/edu/illinois/ncsa/isda/softwareserver/polyglot/PolyglotStewardAMQ.java (version 13d9976afd4b5c53f38a2592723c8f38f261da72)
  • Rui Liu

    Rui Liu 79e5740f6554267e3722db98a82aaec44fd54320 m

    BD-1046 BD-1047 Finished the last part of checkin. Fixed 2 loose ends.

    • src/main/java/edu/illinois/ncsa/isda/softwareserver/SoftwareServerRESTUtilities.java (version 79e5740f6554267e3722db98a82aaec44fd54320)
    • src/main/java/edu/illinois/ncsa/isda/softwareserver/polyglot/PolyglotRestlet.java (version 79e5740f6554267e3722db98a82aaec44fd54320)
  • Rui Liu

    Rui Liu a059b3a8bc05dc188927219c8b1f2a6f1844fab7 m

    BD-1046 BD-1047 First impl of SS checkin in a push way.

    • src/main/java/edu/illinois/ncsa/isda/softwareserver/SoftwareServerRESTUtilities.java (version a059b3a8bc05dc188927219c8b1f2a6f1844fab7)
    • src/main/java/edu/illinois/ncsa/isda/softwareserver/SoftwareServerRestlet.java (version a059b3a8bc05dc188927219c8b1f2a6f1844fab7)
    • src/main/java/edu/illinois/ncsa/isda/softwareserver/polyglot/PolyglotRestlet.java (version a059b3a8bc05dc188927219c8b1f2a6f1844fab7)
  • Kenton McHenry

    Kenton McHenry 0728bad79a10a9baf92b66a44650c3700fc511c7 m

    Merge pull request #70 in POL/polyglot from Bugfix/POL-173-update-purge-script to develop
    * commit 'a5013622a740a36644c49bb88f2fba06a8c3e95f':
      POL-173 Portable purge.sh.
      POL-173 Updated purge.sh.

  • Rui Liu

    Rui Liu d330f0eb055d1e9bd026b248c67ec44212333c9b m

    Merge branch 'feature/BD-1048-SS-sends-registration-msgs-to-queue' of https://opensource.ncsa.illinois.edu/bitbucket/scm/pol/polyglot into feature/BD-1048-handle-POL-server-app-endpoints

  • Rui Liu

    Rui Liu 2ba7526cd0da12329d4c298f9327f728164dd496 m

    BD-1048 BD-1049 Added back the pulling version of discoveryAMQ() and heartbeat(), renamed them to ..._pull. Renamed the push vesion to ..._push.
    Thanks a lot to Kenton's review comments!

    • src/main/java/edu/illinois/ncsa/isda/softwareserver/polyglot/PolyglotStewardAMQ.java (version 2ba7526cd0da12329d4c298f9327f728164dd496)
  • Rui Liu

    Rui Liu c5b27e0abd5f85b76f6580ed5262a6244eecbc91 m

    BD-1048 BD-1049 Added javadoc for the registraton() method.
    Thanks Kenton for the review comment!

    • src/main/java/edu/illinois/ncsa/isda/softwareserver/SoftwareServerRESTUtilities.java (version c5b27e0abd5f85b76f6580ed5262a6244eecbc91)
  • Rui Liu

    Rui Liu 4ddb46eed6c748eed4d06910d824eb944508f08b m

    BD-1048 BD-1049 Added comments to explain uniq id str per Kenton's review comments. Thanks Kenton!

    • src/main/java/edu/illinois/ncsa/isda/softwareserver/SoftwareServerRestlet.java (version 4ddb46eed6c748eed4d06910d824eb944508f08b)
  • Rui Liu

    Rui Liu a5013622a740a36644c49bb88f2fba06a8c3e95f m

    POL-173 Portable purge.sh.
    A user only needs to modify one place: POL_ROOT_DIR. Tested against
    Ubuntu's plain dash and Mac's bash.

    • src/main/assembly/linux/system/purge.sh (version a5013622a740a36644c49bb88f2fba06a8c3e95f)
  • Rui Liu

    Rui Liu b098b48fedb988c900c9a9fa77265f5c135f287e m

    POL-173 Updated purge.sh.

    • src/main/assembly/linux/system/purge.sh (version b098b48fedb988c900c9a9fa77265f5c135f287e)
  • Rui Liu

    Rui Liu 7c59735a03019339468cc196cf0e2c0b8866d004 m

    BD-1048 BD-1049 Handles /software/<sw1> redirection.
    Handles it with small changes to not break existing functionalities.

    • src/main/java/edu/illinois/ncsa/isda/softwareserver/polyglot/PolyglotRestlet.java (version 7c59735a03019339468cc196cf0e2c0b8866d004)
    • src/main/java/edu/illinois/ncsa/isda/softwareserver/polyglot/PolyglotStewardAMQ.java (version 7c59735a03019339468cc196cf0e2c0b8866d004)
  • Rui Liu

    Rui Liu f8e19b8a02e9689010090e7c0f1e45a346cc16a1 m

    BD-1048 BD-1049 Changed wait time when there are RabbitMQ conn errors such as it's down from 1 to 10 seconds, otherwise logs flood.

    • src/main/java/edu/illinois/ncsa/isda/softwareserver/SoftwareServerRESTUtilities.java (version f8e19b8a02e9689010090e7c0f1e45a346cc16a1)
  • Rui Liu

    Rui Liu fd6d92ee47cdc8af1e57ba6b99d2fedd6b0593f5 m

    BD-1048 Handles POL /servers/<server1> with new unique SS ID.

    • src/main/java/edu/illinois/ncsa/isda/softwareserver/polyglot/PolyglotRestlet.java (version fd6d92ee47cdc8af1e57ba6b99d2fedd6b0593f5)
  • Rui Liu

    Rui Liu 67a622cd6b9fa4c922647d8448769db8e8b8fd27 m

    BD-1048 Fix to use the configured registration queue name.

    • src/main/java/edu/illinois/ncsa/isda/softwareserver/polyglot/PolyglotStewardAMQ.java (version 67a622cd6b9fa4c922647d8448769db8e8b8fd27)
  • Rui Liu

    Rui Liu 49aec3f79e4c7c8b71aa93092520a3e10f3367b2 m

    BD-1048 BD-1049 Small code/log cleanup.

    • src/main/java/edu/illinois/ncsa/isda/softwareserver/SoftwareServerRestlet.java (version 49aec3f79e4c7c8b71aa93092520a3e10f3367b2)
    • src/main/java/edu/illinois/ncsa/isda/softwareserver/polyglot/PolyglotStewardAMQ.java (version 49aec3f79e4c7c8b71aa93092520a3e10f3367b2)
  • Rui Liu

    Rui Liu 3d1076de9710ff2a44bf633288c1183e1492685b m

    BD-1048 BD-1049 Small changes: re-arranged code.

    • src/main/java/edu/illinois/ncsa/isda/softwareserver/polyglot/PolyglotStewardAMQ.java (version 3d1076de9710ff2a44bf633288c1183e1492685b)
  • Rui Liu

    Rui Liu 0433c5bfb2ef3cb85c5d1a7a0700ca2776efebf0 m

    BD-1048 BD-1049 Included UUID's substring in SS unique ID string.

    • src/main/java/edu/illinois/ncsa/isda/softwareserver/SoftwareServerRestlet.java (version 0433c5bfb2ef3cb85c5d1a7a0700ca2776efebf0)
    • src/main/java/edu/illinois/ncsa/isda/softwareserver/polyglot/PolyglotStewardAMQ.java (version 0433c5bfb2ef3cb85c5d1a7a0700ca2776efebf0)
  • Rui Liu

    Rui Liu c3652804f1b318387caa3fd6830a01e8d13aa1bf m

    BD-1048 BD-1049 Commented out the "updating timestamp" log.

    • src/main/java/edu/illinois/ncsa/isda/softwareserver/polyglot/PolyglotStewardAMQ.java (version c3652804f1b318387caa3fd6830a01e8d13aa1bf)
  • Rui Liu

    Rui Liu a426676498b2eeae37461bdd4b95555e14b730b9 m

    BD-1048 BD-1049 Only indentation/tab changes, no content change.

    • src/main/java/edu/illinois/ncsa/isda/softwareserver/SoftwareServerRestlet.java (version a426676498b2eeae37461bdd4b95555e14b730b9)
  • Rui Liu

    Rui Liu 9e193b4973203b20a0a79fa11c844ab9b33ecb08 m

    BD-1048 BD-1049 Only indentation/tab changes, no content change.

    • src/main/java/edu/illinois/ncsa/isda/softwareserver/SoftwareServerRestlet.java (version 9e193b4973203b20a0a79fa11c844ab9b33ecb08)
  • Rui Liu

    Rui Liu 61f37ddf0185530a23ffc0b4ca3d89e60b89c3f2 m

    BD-1048 BD-1049 Only indentation/tab changes, no content changes. for SSRESTUtilities.java.

    • src/main/java/edu/illinois/ncsa/isda/softwareserver/SoftwareServerRESTUtilities.java (version 61f37ddf0185530a23ffc0b4ca3d89e60b89c3f2)
  • Rui Liu

    Rui Liu eec771c71e808560808b200133e8843dd8f6d4b7 m

    BD-1048 BD-1049 Better error handling in SS when it loses RabbitMQ conns.

    • src/main/java/edu/illinois/ncsa/isda/softwareserver/SoftwareServerRESTUtilities.java (version eec771c71e808560808b200133e8843dd8f6d4b7)
  • Rui Liu

    Rui Liu 7f89147d83a86d52a1beca56ce8613620572f486 m

    BD-1048 BD-1049 Heartbeat drop msg: last time seen now a human-readable string.

    • src/main/java/edu/illinois/ncsa/isda/softwareserver/polyglot/PolyglotStewardAMQ.java (version 7f89147d83a86d52a1beca56ce8613620572f486)
  • Rui Liu

    Rui Liu e8d4c11af60299d5e5666512d3544913272c67d7 m

    BD-1048 BD-1049 Untabified the 2 new disc and heartbeat methods.

    • src/main/java/edu/illinois/ncsa/isda/softwareserver/polyglot/PolyglotStewardAMQ.java (version e8d4c11af60299d5e5666512d3544913272c67d7)
  • Rui Liu

    Rui Liu b36ae86b3ca66fa88f7b4ad359fef4f5e4a8ca05 m

    BD-1048 BD-1049 Fixed a typo.

    • src/main/java/edu/illinois/ncsa/isda/softwareserver/SoftwareServerRESTUtilities.java (version b36ae86b3ca66fa88f7b4ad359fef4f5e4a8ca05)
  • Rui Liu

    Rui Liu 2f3c90459cb36a7f544de91c83c22c8e97693776 m

    BD-1048 BD-1049 Removed old disc and heartbeat code.

    • src/main/java/edu/illinois/ncsa/isda/softwareserver/polyglot/PolyglotStewardAMQ.java (version 2f3c90459cb36a7f544de91c83c22c8e97693776)
  • Rui Liu

    Rui Liu 025559da1c886d2e0c507aa763712c85e88b1cc1 m

    BD-1048 Modified versions in bin/SS.sh, bin/pol.sh from 2.1.0 to 2.2.0 to match current setting in pom.xml.

    • bin/PolyglotRestlet.sh (version 025559da1c886d2e0c507aa763712c85e88b1cc1)
    • bin/SoftwareServerRestlet.sh (version 025559da1c886d2e0c507aa763712c85e88b1cc1)
  • Rui Liu

    Rui Liu 7ba85d1dcb53757ede44f7877462a8ae2122b07d m

    BD-1048 BD-1049 Made ss-regis queue name and msg TTL configurable.
    Also made SS stop if there are config errors, so it stops fast
    and can be fixed fast. Checked in new conf items in both dev
    and assembly folders.

    • PolyglotStewardAMQ.conf (version 7ba85d1dcb53757ede44f7877462a8ae2122b07d)
    • SoftwareServerRestlet.conf (version 7ba85d1dcb53757ede44f7877462a8ae2122b07d)
    • src/main/assembly/conf/PolyglotStewardAMQ.conf (version 7ba85d1dcb53757ede44f7877462a8ae2122b07d)
    • src/main/assembly/conf/SoftwareServerRestlet.conf (version 7ba85d1dcb53757ede44f7877462a8ae2122b07d)
    • src/main/java/edu/illinois/ncsa/isda/softwareserver/SoftwareServerRESTUtilities.java (version 7ba85d1dcb53757ede44f7877462a8ae2122b07d)
    • src/main/java/edu/illinois/ncsa/isda/softwareserver/SoftwareServerRestlet.java (version 7ba85d1dcb53757ede44f7877462a8ae2122b07d)
    • src/main/java/edu/illinois/ncsa/isda/softwareserver/polyglot/PolyglotStewardAMQ.java (version 7ba85d1dcb53757ede44f7877462a8ae2122b07d)
  • Rui Liu

    Rui Liu 46a4e577814da81cac36424fcb64df41975b1ad0 m

    BD-1048 BD-1049 First impl of polyglot handling SS registration and heartbeat.
    Used ip:pid as the unique ip string.

    • src/main/java/edu/illinois/ncsa/isda/softwareserver/SoftwareServerRESTUtilities.java (version 46a4e577814da81cac36424fcb64df41975b1ad0)
    • src/main/java/edu/illinois/ncsa/isda/softwareserver/SoftwareServerRestlet.java (version 46a4e577814da81cac36424fcb64df41975b1ad0)
    • src/main/java/edu/illinois/ncsa/isda/softwareserver/polyglot/PolyglotStewardAMQ.java (version 46a4e577814da81cac36424fcb64df41975b1ad0)
  • Rui Liu

    Rui Liu 1844da37943bbcc05ad1ed8cade757d227f97a23 m

    BD-1048 First impl of SS sending registration msgs with TTL to RabbitMQ.

    • src/main/java/edu/illinois/ncsa/isda/softwareserver/SoftwareServerRESTUtilities.java (version 1844da37943bbcc05ad1ed8cade757d227f97a23)
    • src/main/java/edu/illinois/ncsa/isda/softwareserver/SoftwareServerRestlet.java (version 1844da37943bbcc05ad1ed8cade757d227f97a23)
  • Rui Liu

    Rui Liu 9f5ee348326684208d20ac160ba2ad83c87dc03f m

    BD-966 Only indentation fixes.

    • src/main/java/edu/illinois/ncsa/isda/softwareserver/polyglot/PolyglotStewardAMQ.java (version 9f5ee348326684208d20ac160ba2ad83c87dc03f)
  • Rui Liu

    Rui Liu dc927005b99e628949953685ffda5429afecb247 m

    BD-966 Indentation fixes, no content change.

    • src/main/java/edu/illinois/ncsa/isda/softwareserver/polyglot/PolyglotStewardAMQ.java (version dc927005b99e628949953685ffda5429afecb247)
  • Rui Liu

    Rui Liu eae64ecce3dfd7517047e3331034f5a57a26db1d m

    BD-966 Added support to retry rabbitmq conn until it succeeds.
    - Added it in initialization. ALSO added similar code to make it more robust
      in previous code that reconnects to RabbitMQ when the connection was closed
      for some reason.
    - Added a config item RabbitMQReconnectPeriod in PolyglotStewardAMQ.conf
      in both the source tree and maven assembly folder.

    Tested:
    - waiting in initialization for RabbitMQ server to come up.
    - ran normally for a while, then the connection was closed:
      1. used RabbitMQ management web api's "Force Close" to close the connection,
         sent a conversion request to POL, saw POL immediately detected and
         reconnected to RabbitMQ.
      2. unplugged the machine that Polyglot was running on, sent a conversion
         request, saw lots of exceptions, waited a while, plugged it back in,
         saw it successfully reconnected.

    • PolyglotStewardAMQ.conf (version eae64ecce3dfd7517047e3331034f5a57a26db1d)
    • src/main/assembly/conf/PolyglotStewardAMQ.conf (version eae64ecce3dfd7517047e3331034f5a57a26db1d)
    • src/main/java/edu/illinois/ncsa/isda/softwareserver/polyglot/PolyglotStewardAMQ.java (version eae64ecce3dfd7517047e3331034f5a57a26db1d)
  • Rui Liu

    Rui Liu 9bf10ddc6215a1afd6fa695a2f2fb7498d276c5e m

    BD-1016 Fix for linux: changed double _ to single _. Removed "--pull" when building images. mvn pkg skip testing and javadoc.

    • docker.sh (version 9bf10ddc6215a1afd6fa695a2f2fb7498d276c5e)
  • Rui Liu

    Rui Liu 0af80f9c712d6a9f492dd11282baee41e7dcdc5b m

    BD-1016 Updated the doc for building the polyglot-server image.

    • docker.polyglot-server/README (version 0af80f9c712d6a9f492dd11282baee41e7dcdc5b)
  • Rui Liu

    Rui Liu d86198a16875369654567290b28003d9412bb38e m

    BD-1016 Now use this build of polyglot-server image as the base for the SS converter images.
    Back up and restore the original ncsa/polyglot-server:lastest image.

    • docker.sh (version d86198a16875369654567290b28003d9412bb38e)
  • Rui Liu

    Rui Liu 44037c75737d4ee712df9aa8cf7ccc7c1a1275a0 m

    BD-1016 Changed single quotes to double quotes for consistency -- both work.

    • docker-compose.yml (version 44037c75737d4ee712df9aa8cf7ccc7c1a1275a0)
  • Rui Liu

    Rui Liu aaf0b092ba767f05bbf0a7519a83f132ec903d84 m

    BD-1016 Now based on :latest instead of :bd-1009 and uses DOWNLOAD_SS_FILE.
    Maps to "8184:8184" instead of "8184".

    • docker-compose.yml (version aaf0b092ba767f05bbf0a7519a83f132ec903d84)
  • Rui Liu

    Rui Liu 4770455323d7dee949c443808ebe795797301106 m

    BD-1016 pol-server: added install of "wget" back (SS needs it); added handling of env var DOWNLOAD_SS_FILE; kept using 'root' instead of user 'polyglot'.
    POL server rewrites tmp/iograph.txt, and user 'polyglot' has no permission
    if the other files were copied as root. For simplicity keep using 'root'.

    • docker.polyglot-server/Dockerfile (version 4770455323d7dee949c443808ebe795797301106)
    • docker.polyglot-server/entrypoint.sh (version 4770455323d7dee949c443808ebe795797301106)
  • Rui Liu

    Rui Liu 9270c53cfcc5e619e8742e42a3987781a91e4638 m

    BD-1016 Not based on the :bd-1009 image any more; user 'polyglot' has no permission to create public/ folder at run time, so keep using 'root'.

    • docker.ss-htmldoc/Dockerfile (version 9270c53cfcc5e619e8742e42a3987781a91e4638)
    • docker.ss-imagemagick/Dockerfile (version 9270c53cfcc5e619e8742e42a3987781a91e4638)
  • Rui Liu

    Rui Liu 72321af4805e49e84a5b033442a0e7a21b55bfba m

    BD-1016 Minor tweak, removed unused software installation, code cleanup.

    • docker.polyglot-server/Dockerfile (version 72321af4805e49e84a5b033442a0e7a21b55bfba)
    • docker.sh (version 72321af4805e49e84a5b033442a0e7a21b55bfba)
  • Rui Liu

    Rui Liu 80a095bd799c894b717a61e8b77d63e19d91752c m

    BD-1016 Changed from using bamboo build to using maven package to build and now build POL server and 2 SS converter images.
    Also renamed the directories. Added docker.sh to build and push images.

    • docker.polyglot-server/Dockerfile (version 80a095bd799c894b717a61e8b77d63e19d91752c)
    • docker.polyglot-server/README (version 80a095bd799c894b717a61e8b77d63e19d91752c)
    • docker.polyglot-server/entrypoint.sh (version 80a095bd799c894b717a61e8b77d63e19d91752c)
    • docker.sh (version 80a095bd799c894b717a61e8b77d63e19d91752c)
    • docker.ss-htmldoc/Dockerfile (version 80a095bd799c894b717a61e8b77d63e19d91752c)
    • docker.ss-htmldoc/README (version 80a095bd799c894b717a61e8b77d63e19d91752c)
    • docker.ss-htmldoc/htmldoc_convert.sh (version 80a095bd799c894b717a61e8b77d63e19d91752c)
    • docker.ss-imagemagick/Dockerfile (version 80a095bd799c894b717a61e8b77d63e19d91752c)
    • docker.ss-imagemagick/ImageMagick_convert.sh (version 80a095bd799c894b717a61e8b77d63e19d91752c)
    • docker.ss-imagemagick/README (version 80a095bd799c894b717a61e8b77d63e19d91752c)
    • dockerfiles/polyglot/Dockerfile (version 80a095bd799c894b717a61e8b77d63e19d91752c)
    • dockerfiles/polyglot/README (version 80a095bd799c894b717a61e8b77d63e19d91752c)
    • dockerfiles/polyglot/entrypoint.sh (version 80a095bd799c894b717a61e8b77d63e19d91752c)
    • dockerfiles/ss/htmldoc/Dockerfile (version 80a095bd799c894b717a61e8b77d63e19d91752c)
    • dockerfiles/ss/htmldoc/README (version 80a095bd799c894b717a61e8b77d63e19d91752c)
    • dockerfiles/ss/htmldoc/htmldoc_convert.sh (version 80a095bd799c894b717a61e8b77d63e19d91752c)
    • dockerfiles/ss/imagemagick/Dockerfile (version 80a095bd799c894b717a61e8b77d63e19d91752c)
    • dockerfiles/ss/imagemagick/ImageMagick_convert.sh (version 80a095bd799c894b717a61e8b77d63e19d91752c)
    • dockerfiles/ss/imagemagick/README (version 80a095bd799c894b717a61e8b77d63e19d91752c)
  • Rui Liu

    Rui Liu 279230729405d4d206774c04f6efdd8e10584b99 m

    BD-1016 Added the docker files and instructions to build POL and multi-SS docker images used in the demo.

    • docker-compose.yml (version 279230729405d4d206774c04f6efdd8e10584b99)
    • docker.sh (version 279230729405d4d206774c04f6efdd8e10584b99)
    • dockerfiles/polyglot/Dockerfile (version 279230729405d4d206774c04f6efdd8e10584b99)
    • dockerfiles/polyglot/README (version 279230729405d4d206774c04f6efdd8e10584b99)
    • dockerfiles/polyglot/entrypoint.sh (version 279230729405d4d206774c04f6efdd8e10584b99)
    • dockerfiles/ss/htmldoc/Dockerfile (version 279230729405d4d206774c04f6efdd8e10584b99)
    • dockerfiles/ss/htmldoc/README (version 279230729405d4d206774c04f6efdd8e10584b99)
    • dockerfiles/ss/htmldoc/htmldoc_convert.sh (version 279230729405d4d206774c04f6efdd8e10584b99)
    • dockerfiles/ss/imagemagick/Dockerfile (version 279230729405d4d206774c04f6efdd8e10584b99)
    • dockerfiles/ss/imagemagick/ImageMagick_convert.sh (version 279230729405d4d206774c04f6efdd8e10584b99)
    • dockerfiles/ss/imagemagick/README (version 279230729405d4d206774c04f6efdd8e10584b99)
  • Rui Liu

    Rui Liu 8a64430be9ced01b986ac230c5c0a7761198db61 m

    BD-1009 Adding longer wait time for "Endpoint" check.

    • src/test/java/edu/illinois/ncsa/isda/softwareserver/polyglot/PolyglotTest.java (version 8a64430be9ced01b986ac230c5c0a7761198db61)
  • Rui Liu

    Rui Liu a62e81f237dbb9ff1a72fbf0ab3d48d1771ef737 m

    BD-1009 Removed "ls -l" and added waiting for 5 sec before checking conversion result in test2.

    • src/test/java/edu/illinois/ncsa/isda/softwareserver/polyglot/PolyglotTest.java (version a62e81f237dbb9ff1a72fbf0ab3d48d1771ef737)
  • Rui Liu

    Rui Liu ad6f746ff9c8f4493c9c80743e54ee9f0f74f0ab m

    BD-1009 Print data/tmp/ content to debug test failures on bamboo server.

    • src/test/java/edu/illinois/ncsa/isda/softwareserver/polyglot/PolyglotTest.java (version ad6f746ff9c8f4493c9c80743e54ee9f0f74f0ab)
  • Rui Liu

    Rui Liu 6dd3a927bb957b6258837bdb8d8343ee521c2625 m

    BD-1009 Changed DownloadSSFile's default values to false, so by default POL redirects but can be switched to download SS file and serve.

    • PolyglotRestlet.conf (version 6dd3a927bb957b6258837bdb8d8343ee521c2625)
    • src/main/assembly/conf/PolyglotRestlet.conf (version 6dd3a927bb957b6258837bdb8d8343ee521c2625)
  • Rui Liu

    Rui Liu 810516d357a609b38b62e022a94feb153b6cfe97 m

    BD-1009 Tab/space changes to conform to existing conventions.

    • src/main/java/edu/illinois/ncsa/isda/softwareserver/polyglot/PolyglotRestlet.java (version 810516d357a609b38b62e022a94feb153b6cfe97)
    • src/main/java/edu/illinois/ncsa/isda/softwareserver/polyglot/PolyglotStewardAMQ.java (version 810516d357a609b38b62e022a94feb153b6cfe97)
  • Rui Liu

    Rui Liu b450bdf44429573dac70a4259059a3c1f63b1eb9 m

    BD-1009 added DownloadSSFile to assembly conf and code cleanup.

    • src/main/assembly/conf/PolyglotRestlet.conf (version b450bdf44429573dac70a4259059a3c1f63b1eb9)
    • src/main/java/edu/illinois/ncsa/isda/softwareserver/polyglot/PolyglotRestlet.java (version b450bdf44429573dac70a4259059a3c1f63b1eb9)
  • Rui Liu

    Rui Liu 7e1c6e1ce3f4a93e839a6b2363bf98927ff7c19d m

    BD-1009 Changed DownloadSSFile back to true, added code to wait for the url file to be flushed.

    • PolyglotRestlet.conf (version 7e1c6e1ce3f4a93e839a6b2363bf98927ff7c19d)
    • src/main/java/edu/illinois/ncsa/isda/softwareserver/polyglot/PolyglotRestlet.java (version 7e1c6e1ce3f4a93e839a6b2363bf98927ff7c19d)
  • Rui Liu

    Rui Liu 370f5f087c818c3568165820636276814b417360 m

    BD-1009 Temporarily set DownloadSSFile to false for bamboo build.

    • PolyglotRestlet.conf (version 370f5f087c818c3568165820636276814b417360)
  • Rui Liu

    Rui Liu c45908079875495e45673a68c252d3519d8ea159 m

    BD-1009 The -Xdoclint:none option worked for java8, but broke java7 build at bamboo.
    This is a solution to make it work for both java7 and java8.
    Thanks to:
        http://stackoverflow.com/questions/15886209/maven-is-not-working-in-java-8-when-javadoc-tags-are-incomplete

    • pom.xml (version c45908079875495e45673a68c252d3519d8ea159)
  • Rui Liu

    Rui Liu 75917cf23bf7cf25d839eee78df0a5ec7aa616aa m

    BD-1009 Added support to download SS file and serve it to clients.
    This makes it possible that a client can get the converted file, even if
    the client can not access the SS's IP:port, as long as Polyglot can access it.

    - Added a boolean conf item "DownloadSSFile=false" in PolyglotRestlet.conf.
    - Added an optional conf item "POLYGLOT_IP" in PolyglotStewardAMQ.conf
      to set an IP in case the Polyglot host has multiple IPs.

    • PolyglotRestlet.conf (version 75917cf23bf7cf25d839eee78df0a5ec7aa616aa)
    • src/main/java/edu/illinois/ncsa/isda/softwareserver/polyglot/PolyglotRestlet.java (version 75917cf23bf7cf25d839eee78df0a5ec7aa616aa)
    • src/main/java/edu/illinois/ncsa/isda/softwareserver/polyglot/PolyglotStewardAMQ.java (version 75917cf23bf7cf25d839eee78df0a5ec7aa616aa)
  • Rui Liu

    Rui Liu 6c078b0b95d022585a3b2f7677dc4c17f66243a9 m

    BD-1009 Removed a warning in mvn package by changing the org name of a dependency lib.
    Changed org.apache.commons/commons-io/1.3.2 to commons-io/commons-io/1.3.2
    as suggested by the warning msg.

    • pom.xml (version 6c078b0b95d022585a3b2f7677dc4c17f66243a9)
  • Rui Liu

    Rui Liu 5c37497c08449b8fe43e15c1f8f8ec99cde3ec84 m

    BD-1009 Disabled the javadoc lint option so "maven package" works with the default java8 on Mac.
    Tested that it worked with java7 on Ubuntu too.  Thanks to:
    http://stackoverflow.com/questions/15886209/maven-is-not-working-in-java-8-when-javadoc-tags-are-incomplete .

    • pom.xml (version 5c37497c08449b8fe43e15c1f8f8ec99cde3ec84)
  • Kenton McHenry

    Kenton McHenry c11532d83889035e90f087b2994cbe40297b7fca m

    Merge pull request #64 in POL/polyglot from POL-29-logfile-to-workflow to develop
    * commit 'd1db2b69e8cc311a6327fb1efa127a48d8b5a303':
      Added documentation for workflow utility methods and removed debugging statements
      POL-29 Added .wf endpoint to parse log files and create a datawolf workflow representation

  • Christopher Navarro

    Christopher Navarro d1db2b69e8cc311a6327fb1efa127a48d8b5a303 m

    Added documentation for workflow utility methods and removed debugging statements

    • DataWolf.conf (version d1db2b69e8cc311a6327fb1efa127a48d8b5a303)
    • src/main/assembly/conf/DataWolf.conf (version d1db2b69e8cc311a6327fb1efa127a48d8b5a303)
    • src/main/java/edu/illinois/ncsa/isda/softwareserver/SoftwareServerRestlet.java (version d1db2b69e8cc311a6327fb1efa127a48d8b5a303)
    • src/main/java/edu/illinois/ncsa/isda/softwareserver/datawolf/WorkflowUtilities.java (version d1db2b69e8cc311a6327fb1efa127a48d8b5a303)
  • Rui Liu

    Rui Liu 26601efd8c0fcfb5b1d2f45685dc9a1848d2d10f m

    POL-166 Re-connect to RabbitMQ if the connection was closed/lost.
    Tested. To test: use
        sudo service polyglot status
    to find the pid, then
        sudo lsof -n -p <pid> | grep -i ipv | grep 141.142.227.65:amqp
    to find the src port. Go to Rabbitmq -> connections, use "force close"
    to close the connection. Then start a test. Without the fix, the
    test will fail, and polyglot.log will have the exception messages;
    with the fix, a line such as:
        [Mon Nov 16 10:32:47 2015] [steward]: RabbitMQ connection was closed,
    submitting job failed. Re-created the connection.

    will appear, RabbitMQ connection will be re-established, and the test
    will succeed.

    • src/main/java/edu/illinois/ncsa/isda/softwareserver/polyglot/PolyglotStewardAMQ.java (version 26601efd8c0fcfb5b1d2f45685dc9a1848d2d10f)
  • Kenton McHenry

    Kenton McHenry c435fcb1eab3e440060e7da5f056c9f6f1103fb2 m

    Added ppjson converter.

    • scripts/sh/.aliases.txt (version c435fcb1eab3e440060e7da5f056c9f6f1103fb2)
    • scripts/sh/ppjson_convert.sh (version c435fcb1eab3e440060e7da5f056c9f6f1103fb2)
  • Kenton McHenry

    Kenton McHenry 92840fb7c4baaaa2e825b83bf88a197005784896 m

    Added self link.

    • src/main/web/auth/crowd.php (version 92840fb7c4baaaa2e825b83bf88a197005784896)
    • src/main/web/dap/auth/crowd.php (version 92840fb7c4baaaa2e825b83bf88a197005784896)
    • src/main/web/dap/bookmarklet/dap_bookmarklet.js.php (version 92840fb7c4baaaa2e825b83bf88a197005784896)
  • Kenton McHenry

    Kenton McHenry 111e1ba4410caf1eb82d175c4efcb499e16e2ad3 m

    Changed verifier to return RESULT_INVALID as RESULT_UNSUPPORTED broke stuff when auth failed.

    • src/main/java/edu/illinois/ncsa/isda/softwareserver/SoftwareServerRestlet.java (version 111e1ba4410caf1eb82d175c4efcb499e16e2ad3)
    • src/main/java/edu/illinois/ncsa/isda/softwareserver/polyglot/PolyglotRestlet.java (version 111e1ba4410caf1eb82d175c4efcb499e16e2ad3)