Git

• 

  Marcus Slavenas 13 Jun 2016 1998e09cf11e8453304c97f9455204135220a8f5

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

  Kenton McHenry 11 Jun 2016 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 10 Jun 2016 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 10 Jun 2016 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.
• 

  Rui Liu 19 May 2016 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 12 May 2016 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 10 May 2016 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 10 May 2016 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 06 May 2016 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 31 Mar 2016 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 31 Mar 2016 0af80f9c712d6a9f492dd11282baee41e7dcdc5b m

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

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

  Rui Liu 31 Mar 2016 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 31 Mar 2016 44037c75737d4ee712df9aa8cf7ccc7c1a1275a0 m

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

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

  Rui Liu 31 Mar 2016 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 31 Mar 2016 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 31 Mar 2016 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 31 Mar 2016 72321af4805e49e84a5b033442a0e7a21b55bfba m

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

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

  Rui Liu 31 Mar 2016 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 19 Mar 2016 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)