Sync updates from NCIA

.travis.yml

@@ -1,29 +1,66 @@
+env:
+  global:
+    - secure: "RhX0c51DkTgr4ub347If+KsjWJU+zGt3dshGknnmgrCOCuDkuBN0vjD4gLNMVH1K8Z+tmC8ESyW4duBuRkY4B/t2PRmEddCo7+t6gfmylq659LhGa3KUEEQd9vOuI+cN5NEGSN6GP6ckU11tiCmiomzTApLnNxWgqDBI7CQkezZl1DpNQ7cShhmYjPSBtFfQcfepZvOM7pY7oYvijvPsBmy0GsYu6RixxkBS42LgSY7FtBL7N2sdG80e+E9A1GThMUHJMAMpprpxPtd7BV2mQ3PwRcyWp11pZt+wCUFNDSnYb/h+5MI45JKIzzwvnOHZr4/rUByi6Qiw0RSh5k0sGZtNw+NcOjrtlS1g1XVxYBD5bzNxn7BgIg3nqNGiHYti/uIIG/AdwzHCG964Yqlww2jZ1UoyxNSb6ms1gKM8Rwx/gDO46pM0l750hwAjR25yDSW+w5xyW0YC+WKyHAoweSY1wsfzqchwJ9bP8qk5cwPrqGgiXsKU5N9SKfqJM4TKDE2DCDAE1NEWwglqnZTuQNjloCdl6KmctdSAHvF6o/t8sIcpIWs0zfhBoRAj3yZh/W7gQbXstyT1NGAswIMl1Rf9SspIm0noOUOObDMLkUhJWvxA/7zMoe3DaXgTAiSh1Xdm0FxdhmRkZFvGm74s9mGpyUvH6ePjwRNTM4CdfvI="
+
 language: java
 
 jdk:
   - oraclejdk8
 
-sudo: required
+sudo: false
 
 services:
   - docker
 
+notifications:
+    slack: nci-agency:TvRV22whtaRGflaCPPfv2G1v
+
+before_cache:
+  - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
+  - rm -fr $HOME/.gradle/caches/*/plugin-resolution/
+
+cache:
+  directories:
+    - $HOME/.gradle/caches/
+    - $HOME/.gradle/wrapper/
+    - $HOME/.sonar/cache
+    - client/node_modules
+
 before_install:
-  - docker run --name mssql-server -v ${PWD}:/hostdata -e 'ACCEPT_EULA=Y' -e 'SA_PASSWORD=P@ssw0rd' -p 1433:1433 -d microsoft/mssql-server-linux bin/sh -c "export DEBIAN_FRONTEND=noninteractive && apt-get update && apt-get install -y curl && curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add - && curl https://packages.microsoft.com/config/ubuntu/16.04/mssql-server.list | tee /etc/apt/sources.list.d/mssql-server.list && apt-get update && apt-get install -y mssql-server-fts && /opt/mssql/bin/sqlservr"
-  - nvm install node
-  - nvm use node
-  - cd client
-  - npm install
-  - npm run build
-  - cd ..
-  - docker exec -ti mssql-server /opt/mssql-tools/bin/sqlcmd -S localhost -U SA -P P@ssw0rd -Q "CREATE DATABASE testanet"
-  - touch localSettings.gradle
-  - echo "run.environment(\"DB_DRIVER\",\"sqlserver\")" >> localSettings.gradle
-  - echo "run.environment(\"ANET_DB_SERVER\",\"localhost\")"  >> localSettings.gradle
-  - echo "run.environment(\"ANET_DB_NAME\",\"testanet\")" >> localSettings.gradle
-  - echo "run.environment(\"ANET_DB_USERNAME\",\"SA\")" >> localSettings.gradle
-  - echo "run.environment(\"ANET_DB_PASSWORD\",\"P@ssw0rd\")" >> localSettings.gradle
-  - ./gradlew dbMigrate
-  - docker exec -ti mssql-server /opt/mssql-tools/bin/sqlcmd -S localhost -U SA -P P@ssw0rd -d testanet -i /hostdata/insertBaseData.sql
+  - echo -n | openssl s_client -connect scan.coverity.com:443 | sed -ne '/-BEGIN CERTIFICATE-/,/-END CERTIFICATE-/p' | sudo tee -a /etc/ssl/certs/ca-  
+  - echo "run.environment(\"DB_DRIVER\", \"sqlserver\")" > localSettings.gradle
+  - echo "run.environment(\"ANET_SA_PASSWORD\", \"SA-P@ssw0rd\")" >> localSettings.gradle
+  - echo "run.environment(\"ANET_DB_SERVER\", \"localhost\")"  >> localSettings.gradle
+  - echo "run.environment(\"ANET_DB_NAME\", \"testAnet\")" >> localSettings.gradle
+  - echo "run.environment(\"ANET_DB_USERNAME\", \"anetUser\")" >> localSettings.gradle
+  - echo "run.environment(\"ANET_DB_PASSWORD\", \"Test-P@ssw0rd\")" >> localSettings.gradle
+  - echo "run.environment(\"ANET_DB_PORT\", 1433)" >> localSettings.gradle
+  - ./gradlew dockerCreateDB dockerStartDB
+
+#By default travis runs gradle assemble in install. This is too early as we don't want to build yet
+install:
+  - ./gradlew npmInstall
+
+script:
+  - docker exec -ti -e "DB_NAME=testAnet" -e "DB_USER=anetUser" -e "DB_USER_PASSWORD=Test-P@ssw0rd" anet-mssql-server /opt/waitTillServiceStarted.sh
+  - ./gradlew dbMigrate dockerLoadDB
+  - ./gradlew check sonarqube
 
+after_script:
+  - docker logs anet-mssql-server
 
+addons:
+  coverity_scan:
+    project:
+      name: "NCI-Agency/anet"
+    notification_email: vassil.iordanov@gmail.com
+    build_command_prepend: "COV_BUILD_OPTIONS='--fs-capture-search src --fs-capture-search client' && ./gradlew clean"
+    build_command:   "./gradlew build -x test"
+    branch_pattern: candidate_scan
+  sonarcloud:
+    organization: "nci-agency-github"
+    token:
+      secure: "ICZTls70jFc6JIZV6cicKUpAKr2sDt9LKWnFzgGm92uDq/2J1Od7oewUAAEjykKa2qw42BZYaG1z3LX5UFtLhp9b/NFibf392U0V4I7jmeb4HDjOv855hTPosm5N7K9YQ3MUsSDLxVe+5DhrmwYQ3PSkG0lXKj0NRdAu7dpaBqMntBpTtdO5nQDKyxQ9UCrVSRjdU0YqHT8q4EWpii/MqWH6SRVUslvvKXTan2d6JnT+QaWuW8bTR0zhgpyxl5y8kOe0JBQ45M5vKO6yTcVj4UdolB0y+CZlblk/59iZK1bn/Is0qijWmHKh1Z3OORdlesXumUAveCX3VCMvvuPUz95a3nc+6S4I6iNIOcA8tzJ2AFP5oBuPIrl8o3S0BKxHTBssBzomo1e7tzDqXJF141tJOm0yUIB5Lmb9LV9KcWa1gAB2pk9ToX8e0NH4OLIqUUlLrNAkHX1sKHXO4AM3odHf1bTlOp7dOUszD2/E1umPjEWT3NH94LQStPubg+d2Kai2rQppxHlVKwAIVcBkP/d2nVtIwJsuRKmPbUIgAds7fYrxZpdDoM7AxjNLrCk3OPR1tYWwlUyProrAIJXDy7LlP14a4oM8dtaXGAnQar6nXtuqxiS4KMojPhW4rWXvRbCiBhYmLvuMMjW+kN1ITOy/h6x4Q7ZBLf+pU5C3Va0="
+    branches:
+      - master
+      - candidate

Contributors.md

@@ -6,10 +6,17 @@
 **Signed-off-by:**
 
 Copyright 2016-2017 U.S. Federal Government (in countries where recognized) contact@dds.mil \
-Copyright 2017 Vassil Iordanov vassil.iordanov@ncia.nato.int \
-Copyright 2017 NATO Communications and Information Agency (including direct NATO hires and West IT Solutions employees) anet.support@ncia.nato.int 
+Copyright 2017 NATO Communications and Information Agency anet.support@ncia.nato.int \
 Copyright 2017 Brad Hards bradh@frogmouth.net
 
 **Note for U.S. Federal Employees**
 
 If you're a U.S. Federal government employee and use a *.mil or *.gov email address to agree to the DCO, we interpret your signed DCO to mean that the contribution was created in whole or in part by you as part of your job with the U.S. Federal government and that your contribution is not subject to copyright protections.
+
+**Note for NATO Communications and Information Agency people**
+
+If you are one of the following, we interpret that your contribution is partly or fully funded by the NCI Agency and as such your contribution's copyright is attributed to the NCI Agency:
+  - direct NCIA hire, identified by username@ncia.nato.int
+  - Airbus employee or subcontractors contributing to NCIA projects, identified by dspcarlson@gmail.com
+  - West IT Solutions employee or subcontractor contributing to NCIA projects, typically identified by username@west.nl or edwin@vdhoudt.nl
+

README.md

@@ -1,6 +1,11 @@
+[![Build Status](https://travis-ci.org/NCI-Agency/anet.svg?branch=candidate)](https://travis-ci.org/NCI-Agency/anet)
+[![BrowserStack Status](https://www.browserstack.com/automate/badge.svg?badge_key=SHc2WTI5cFg2Z2h2NFVzMWlYbXVkM2xCYTdZMzVPV2FzRUhEVUpEL3NTUT0tLTdFVy9CWmlRa04yMGlCZldialMxc3c9PQ==--097d5f51f524d9e66cffde76b48cc2116bbe3372)](https://www.browserstack.com/automate/public-build/SHc2WTI5cFg2Z2h2NFVzMWlYbXVkM2xCYTdZMzVPV2FzRUhEVUpEL3NTUT0tLTdFVy9CWmlRa04yMGlCZldialMxc3c9PQ==--097d5f51f524d9e66cffde76b48cc2116bbe3372)
+[![Coverity Scan Build Status](https://scan.coverity.com/projects/14060/badge.svg)](https://scan.coverity.com/projects/nci-agency-anet)
+[![Quality Gate](https://sonarcloud.io/api/badges/gate?key=ncia%3Aanet%3Acandidate)](https://sonarcloud.io/dashboard?id=ncia%3Aanet%3Acandidate)
+
 ## What is ANET?
 
-The Advisor Network ("ANET") is a tool to track relationships between advisors and advisees. ANET was built by the Defense Digital Service in support of the the USFOR-A and Resolute Support mission to train, advise, and assist the Afghan government. 
+The Advisor Network ("ANET") is a tool to track relationships between advisors and advisees. ANET was initially built by the [Defense Digital Service](https://www.dds.mil/) in support of the USFOR-A and Resolute Support mission to train, advise, and assist the Afghan government. ANET is currently further developed by the [NATO Communication and Information Agency](https://www.ncia.nato.int/) and published over [here](https://github.com/NCI-Agency/anet). 
 
 Although this tool was built in a very specific context, ANET has many potential applications. At its core, ANET is a way of tracking  reports and tying them to authors, organizations, and goals. It also simplifies relationships between members of an organization, and members of different organizations -- like NATO and the Afghan government. 
 

anet.yml

@@ -30,6 +30,7 @@ smtp:
   username: ${ANET_SMTP_USERNAME}
   password: ${ANET_SMTP_PASSWORD}
   startTls: true
+  disabled: true
 
 # The email address that all automated emails should come from. 
 # ex: "ANET <anet@example.com>"
@@ -140,3 +141,106 @@ logging:
       currentLogFilename: ./logs/anet.log
       archivedLogFilenamePattern: ./logs/anet-%d.log.zip
       archivedFileCount: 2
+
+dictionary:
+  PRINCIPAL_PERSON_TITLE: Afghan Partner
+  ADVISOR_PERSON_TITLE: NATO Member
+  PRINCIPAL_POSITION_NAME: Afghan Tashkil
+  ADVISOR_POSITION_NAME: NATO Billet
+  ADVISOR_POSITION_TYPE_TITLE: NATO Advisor
+  SUPER_USER_POSITION_TYPE_TITLE: ANET Super User
+  ADMINISTRATOR_POSITION_TYPE_TITLE: ANET Administrator
+  PRINCIPAL_ORG_NAME: Afghan Government Organization
+  ADVISOR_ORG_NAME: Advisor Organization
+  POAM_LONG_NAME: Plan of Action and Milestones / Pillars
+  POAM_SHORT_NAME: PoAM
+  NAV_BAR_ALL_ADVISOR_ORGS: All EFs / AOs
+  PRINCIPAL_ORG_LABEL_LONGNAME: Official Organization Name
+  PRINCIPAL_ORG_PLACEHOLDER_LONGNAME: e.g. Afghan Ministry of Defense
+  ADVISOR_ORG_LABEL_LONGNAME: Description
+  ADVISOR_ORG_PLACEHOLDER_LONGNAME: e.g. Force Sustainment
+  PRINCIPAL_ORG_LABEL_IDENTIFICATIONCODE: Identification Code
+  PRINCIPAL_ORG_PLACEHOLDER_IDENTIFICATIONCODE: optional
+  ADVISOR_ORG_LABEL_IDENTIFICATIONCODE: UIC
+  ADVISOR_ORG_PLACEHOLDER_IDENTIFICATIONCODE: the six character code
+  SUPPORT_EMAIL_ADDR: support@example.com
+  pinned_ORGs:
+    - Key Leader Engagement
+  non_reporting_ORGs:
+    - ANET Administrators
+  countries:
+    - Afghanistan
+    - Albania
+    - Armenia
+    - Australia
+    - Austria
+    - Azerbaijan
+    - Belgium
+    - Bosnia-Herzegovina
+    - Bulgaria
+    - Croatia
+    - Czech Republic
+    - Denmark
+    - Estonia
+    - Finland
+    - Georgia
+    - Germany
+    - Greece
+    - Hungary
+    - Iceland
+    - Italy
+    - Latvia
+    - Lithuania
+    - Luxembourg
+    - Macedonia
+    - Mongolia
+    - Montenegro
+    - Netherlands
+    - New Zealand
+    - Norway
+    - Poland
+    - Portugal
+    - Romania
+    - Slovakia
+    - Slovenia
+    - Spain
+    - Sweden
+    - Turkey
+    - Ukraine
+    - United Kingdom
+    - United States of America
+  principal_countries:
+    - Afghanistan
+  ranks:
+    - CIV
+    - CTR
+    - OR-1
+    - OR-2
+    - OR-3
+    - OR-4
+    - OR-5
+    - OR-6
+    - OR-7
+    - OR-8
+    - OR-9
+    - WO-1
+    - WO-2
+    - WO-3
+    - WO-4
+    - WO-5
+    - OF-1
+    - OF-2
+    - OF-3
+    - OF-4
+    - OF-5
+    - OF-6
+    - OF-7
+    - OF-8
+    - OF-9
+    - OF-10
+  domainNames:
+    - cmil.mil
+    - mission.ita
+    - nato.int
+    - dds.mil
+    - "*.isaf.nato.int"