Merged master into feature/SHIBUI-1730

.gitignore

@@ -400,3 +400,9 @@ rdurable
 build-no-tests
 
 beacon/spring/out
+
+# Eclipse junk
+*.classpath
+*.settings
+*.project
+*bin

backend/src/main/resources/i18n/messages.properties

@@ -453,6 +453,7 @@ message.protocol-support-required=Protocol Support Enumeration is required if an
 message.conflict=Conflict
 message.data-version-contention=Data Version Contention
 message.contention-new-version=A newer version of this metadata source has been saved. Below are a list of changes. You can use your changes or their changes.
+message.contention-error=There was a problem saving due to a mismatched version.
 message.organization-feedback=These three fields must all be entered if any single field has a value.
 message.valid-email=Must be a valid Email Address
 message.valid-url=Must be a valid URL

backend/src/main/resources/metadata-sources-ui-schema.json

@@ -446,6 +446,12 @@
                                 "urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
                             ],
                             "description": "urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                        },
+                        {
+                            "enum": [
+                                "urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact"
+                            ],
+                            "description": "urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact"
                         }
                     ]
                 }

docker-build/Dockerfile

@@ -0,0 +1,15 @@
+FROM ubuntu:18.04
+MAINTAINER docker@unicon.net
+
+RUN  apt-get clean \
+     && apt-get -y update \
+     && apt-get install -y curl nano vim java-common python-minimal
+
+RUN curl -L0 https://corretto.aws/downloads/latest/amazon-corretto-11-x64-linux-jdk.deb --output corretto11.deb
+
+RUN dpkg --install corretto11.deb \
+    && rm -f corretto11.deb
+
+COPY includes/ /
+
+CMD ["/bin/bash", "/runProject.sh"]

docker-build/docker-compose.yml

@@ -0,0 +1,14 @@
+version: "3"
+
+services:
+  builder:
+    image: unicon/shibuibuilder:1.0
+# If you want a container to docker exec into for manual operations, comment out the environment RUN_COMMAND    
+    environment:
+      RUN_COMMAND: 'sh gradlew build'
+    volumes:
+      - ../:/shib-idp-ui
+
+volumes:
+  shib-idp-ui:
+

docker-build/includes/runProject.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+if [ "$RUN_COMMAND" != "" ] ; 
+    then 
+        cd shib-idp-ui
+        exec $RUN_COMMAND;
+    else
+        tail -f /dev/null         
+fi
+

docker-build/readme.txt

@@ -0,0 +1,18 @@
+BUILD IMAGE: docker build --tag unicon/shibuibuilder:1.0 .
+
+USE:
+If you want to simple use the existing version, you should be able to pull the image from the unicon docker hub site.
+Otherwise, build the image first using the above command.
+
+After building, if you wish to simply execute the build command using the docker-compose file in this folder do:
+> docker-compose up
+
+(or add the -d flag to the end if you don't wish to view the build output)
+
+The container will stop once the gradle build command has completed.
+
+If you wish to keep the docker container running for use as a build env, comment out the environment section of the 
+docker-compose file and then start the container and docker exec into the running container to perform whatever build
+tasks you desire.
+
+You can also alter the default "build" target in the docker-compose file as needed.