Align CI test test and JJB

Add vendor agnostic CI test to align
Add Tox and maven docker

Issue Id: VVP-15

Change-Id: Ia84ba49b8d3631c1529c1a8141ebf2c2cb1881c9
Signed-off-by: Edan Binshtok <eb578m@intl.att.com>

13 files changed, 301 insertions, 499 deletions

diff --git a/django/web/templates/admin/base.html b/django/web/templates/admin/base.html
index d9f927b..1a18977 100755..100644
--- a/django/web/templates/admin/base.html
+++ b/django/web/templates/admin/base.html
@@ -1,41 +1,40 @@
-<!--  
-============LICENSE_START========================================== 
- org.onap.vvp/engagementmgr
- ===================================================================
- Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- ===================================================================
-
- Unless otherwise specified, all software contained herein is licensed
- under the Apache License, Version 2.0 (the “License”);
- you may not use this software except in compliance with the License.
- You may obtain a copy of the License at
-
-             http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
-
-
- Unless otherwise specified, all documentation contained herein is licensed
- under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
- you may not use this documentation except in compliance with the License.
- You may obtain a copy of the License at
-
-             https://creativecommons.org/licenses/by/4.0/
-
- Unless required by applicable law or agreed to in writing, documentation
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- ============LICENSE_END============================================
-
- ECOMP is a trademark and service mark of AT&T Intellectual Property.-->
+{#============LICENSE_START========================================== #}
+{# org.onap.vvp/engagementmgr#}
+{# ===================================================================#}
+{# Copyright © 2017 AT&T Intellectual Property. All rights reserved.#}
+{# ===================================================================#}
+{##}
+{# Unless otherwise specified, all software contained herein is licensed#}
+{# under the Apache License, Version 2.0 (the “License”);#}
+{# you may not use this software except in compliance with the License.#}
+{# You may obtain a copy of the License at#}
+{##}
+{#             http://www.apache.org/licenses/LICENSE-2.0#}
+{##}
+{# Unless required by applicable law or agreed to in writing, software#}
+{# distributed under the License is distributed on an "AS IS" BASIS,#}
+{# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.#}
+{# See the License for the specific language governing permissions and#}
+{# limitations under the License.#}
+{##}
+{##}
+{##}
+{# Unless otherwise specified, all documentation contained herein is licensed#}
+{# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);#}
+{# you may not use this documentation except in compliance with the License.#}
+{# You may obtain a copy of the License at#}
+{##}
+{#             https://creativecommons.org/licenses/by/4.0/#}
+{##}
+{# Unless required by applicable law or agreed to in writing, documentation#}
+{# distributed under the License is distributed on an "AS IS" BASIS,#}
+{# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.#}
+{# See the License for the specific language governing permissions and#}
+{# limitations under the License.#}
+{##}
+{# ============LICENSE_END============================================#}
+{##}
+{# ECOMP is a trademark and service mark of AT&T Intellectual Property.#}
 {% load i18n static %}<!DOCTYPE html>
 {% get_current_language as LANGUAGE_CODE %}{% get_current_language_bidi as LANGUAGE_BIDI %}
 <html lang="{{ LANGUAGE_CODE|default:"en-us" }}" {% if LANGUAGE_BIDI %}dir="rtl"{% endif %}>
diff --git a/django/web/templates/admin/base_site.html b/django/web/templates/admin/base_site.html
index 1a2275d..e36b9a4 100755..100644
--- a/django/web/templates/admin/base_site.html
+++ b/django/web/templates/admin/base_site.html
@@ -1,41 +1,40 @@
-<!--  
-============LICENSE_START========================================== 
- org.onap.vvp/engagementmgr
- ===================================================================
- Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- ===================================================================
-
- Unless otherwise specified, all software contained herein is licensed
- under the Apache License, Version 2.0 (the “License”);
- you may not use this software except in compliance with the License.
- You may obtain a copy of the License at
-
-             http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
-
-
- Unless otherwise specified, all documentation contained herein is licensed
- under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
- you may not use this documentation except in compliance with the License.
- You may obtain a copy of the License at
-
-             https://creativecommons.org/licenses/by/4.0/
-
- Unless required by applicable law or agreed to in writing, documentation
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- ============LICENSE_END============================================
-
- ECOMP is a trademark and service mark of AT&T Intellectual Property.-->
+{#============LICENSE_START========================================== #}
+{# org.onap.vvp/engagementmgr#}
+{# ===================================================================#}
+{# Copyright © 2017 AT&T Intellectual Property. All rights reserved.#}
+{# ===================================================================#}
+{##}
+{# Unless otherwise specified, all software contained herein is licensed#}
+{# under the Apache License, Version 2.0 (the “License”);#}
+{# you may not use this software except in compliance with the License.#}
+{# You may obtain a copy of the License at#}
+{##}
+{#             http://www.apache.org/licenses/LICENSE-2.0#}
+{##}
+{# Unless required by applicable law or agreed to in writing, software#}
+{# distributed under the License is distributed on an "AS IS" BASIS,#}
+{# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.#}
+{# See the License for the specific language governing permissions and#}
+{# limitations under the License.#}
+{##}
+{##}
+{##}
+{# Unless otherwise specified, all documentation contained herein is licensed#}
+{# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);#}
+{# you may not use this documentation except in compliance with the License.#}
+{# You may obtain a copy of the License at#}
+{##}
+{#             https://creativecommons.org/licenses/by/4.0/#}
+{##}
+{# Unless required by applicable law or agreed to in writing, documentation#}
+{# distributed under the License is distributed on an "AS IS" BASIS,#}
+{# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.#}
+{# See the License for the specific language governing permissions and#}
+{# limitations under the License.#}
+{##}
+{# ============LICENSE_END============================================#}
+{##}
+{# ECOMP is a trademark and service mark of AT&T Intellectual Property.#}
 {% extends "admin/base.html" %}
 {% load vvptags %}
 
diff --git a/django/web/templates/admin/login.html b/django/web/templates/admin/login.html
index 5acf9b5..5e31bee 100755..100644
--- a/django/web/templates/admin/login.html
+++ b/django/web/templates/admin/login.html
@@ -1,41 +1,40 @@
-<!--  
-============LICENSE_START========================================== 
- org.onap.vvp/engagementmgr
- ===================================================================
- Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- ===================================================================
-
- Unless otherwise specified, all software contained herein is licensed
- under the Apache License, Version 2.0 (the “License”);
- you may not use this software except in compliance with the License.
- You may obtain a copy of the License at
-
-             http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
-
-
- Unless otherwise specified, all documentation contained herein is licensed
- under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
- you may not use this documentation except in compliance with the License.
- You may obtain a copy of the License at
-
-             https://creativecommons.org/licenses/by/4.0/
-
- Unless required by applicable law or agreed to in writing, documentation
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- ============LICENSE_END============================================
-
- ECOMP is a trademark and service mark of AT&T Intellectual Property.-->
+{#============LICENSE_START========================================== #}
+{# org.onap.vvp/engagementmgr#}
+{# ===================================================================#}
+{# Copyright © 2017 AT&T Intellectual Property. All rights reserved.#}
+{# ===================================================================#}
+{##}
+{# Unless otherwise specified, all software contained herein is licensed#}
+{# under the Apache License, Version 2.0 (the “License”);#}
+{# you may not use this software except in compliance with the License.#}
+{# You may obtain a copy of the License at#}
+{##}
+{#             http://www.apache.org/licenses/LICENSE-2.0#}
+{##}
+{# Unless required by applicable law or agreed to in writing, software#}
+{# distributed under the License is distributed on an "AS IS" BASIS,#}
+{# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.#}
+{# See the License for the specific language governing permissions and#}
+{# limitations under the License.#}
+{##}
+{##}
+{##}
+{# Unless otherwise specified, all documentation contained herein is licensed#}
+{# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);#}
+{# you may not use this documentation except in compliance with the License.#}
+{# You may obtain a copy of the License at#}
+{##}
+{#             https://creativecommons.org/licenses/by/4.0/#}
+{##}
+{# Unless required by applicable law or agreed to in writing, documentation#}
+{# distributed under the License is distributed on an "AS IS" BASIS,#}
+{# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.#}
+{# See the License for the specific language governing permissions and#}
+{# limitations under the License.#}
+{##}
+{# ============LICENSE_END============================================#}
+{##}
+{# ECOMP is a trademark and service mark of AT&T Intellectual Property.#}
 {% extends "admin/base_site.html" %}
 {% load i18n admin_static %}
 
diff --git a/django/web/templates/emails/activate/activate_mail_body.html b/django/web/templates/emails/activate/activate_mail_body.html
index 0751b00..3607a78 100755..100644
--- a/django/web/templates/emails/activate/activate_mail_body.html
+++ b/django/web/templates/emails/activate/activate_mail_body.html
@@ -1,41 +1,40 @@
-<!--  
-============LICENSE_START========================================== 
- org.onap.vvp/engagementmgr
- ===================================================================
- Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- ===================================================================
-
- Unless otherwise specified, all software contained herein is licensed
- under the Apache License, Version 2.0 (the “License”);
- you may not use this software except in compliance with the License.
- You may obtain a copy of the License at
-
-             http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
-
-
- Unless otherwise specified, all documentation contained herein is licensed
- under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
- you may not use this documentation except in compliance with the License.
- You may obtain a copy of the License at
-
-             https://creativecommons.org/licenses/by/4.0/
-
- Unless required by applicable law or agreed to in writing, documentation
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- ============LICENSE_END============================================
-
- ECOMP is a trademark and service mark of AT&T Intellectual Property.-->
+{#============LICENSE_START========================================== #}
+{# org.onap.vvp/engagementmgr#}
+{# ===================================================================#}
+{# Copyright ? 2017 AT&T Intellectual Property. All rights reserved.#}
+{# ===================================================================#}
+{##}
+{# Unless otherwise specified, all software contained herein is licensed#}
+{# under the Apache License, Version 2.0 (the ?License?);#}
+{# you may not use this software except in compliance with the License.#}
+{# You may obtain a copy of the License at#}
+{##}
+{#             http://www.apache.org/licenses/LICENSE-2.0#}
+{##}
+{# Unless required by applicable law or agreed to in writing, software#}
+{# distributed under the License is distributed on an "AS IS" BASIS,#}
+{# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.#}
+{# See the License for the specific language governing permissions and#}
+{# limitations under the License.#}
+{##}
+{##}
+{##}
+{# Unless otherwise specified, all documentation contained herein is licensed#}
+{# under the Creative Commons License, Attribution 4.0 Intl. (the ?License?);#}
+{# you may not use this documentation except in compliance with the License.#}
+{# You may obtain a copy of the License at#}
+{##}
+{#             https://creativecommons.org/licenses/by/4.0/#}
+{##}
+{# Unless required by applicable law or agreed to in writing, documentation#}
+{# distributed under the License is distributed on an "AS IS" BASIS,#}
+{# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.#}
+{# See the License for the specific language governing permissions and#}
+{# limitations under the License.#}
+{##}
+{# ============LICENSE_END============================================#}
+{##}
+{# ECOMP is a trademark and service mark of AT&T Intellectual Property.#}
 <!DOCTYPE html>
 <html>
     <head> <meta http-equiv="Content-Type" content="text/html; charset=us-ascii"></head>
diff --git a/django/web/templates/emails/activate/activate_mail_subject.html b/django/web/templates/emails/activate/activate_mail_subject.html
index 0adbc20..25ce1c6 100755..100644
--- a/django/web/templates/emails/activate/activate_mail_subject.html
+++ b/django/web/templates/emails/activate/activate_mail_subject.html
@@ -1,39 +1 @@
-<!--  
-============LICENSE_START========================================== 
- org.onap.vvp/engagementmgr
- ===================================================================
- Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- ===================================================================
-
- Unless otherwise specified, all software contained herein is licensed
- under the Apache License, Version 2.0 (the “License”);
- you may not use this software except in compliance with the License.
- You may obtain a copy of the License at
-
-             http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
-
-
- Unless otherwise specified, all documentation contained herein is licensed
- under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
- you may not use this documentation except in compliance with the License.
- You may obtain a copy of the License at
-
-             https://creativecommons.org/licenses/by/4.0/
-
- Unless required by applicable law or agreed to in writing, documentation
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- ============LICENSE_END============================================
-
- ECOMP is a trademark and service mark of AT&T Intellectual Property.-->
-{{program_name}}: Welcome - just one more step!
+{{program_name}}: Welcome - just one more step!
\ No newline at end of file
diff --git a/django/web/templates/emails/invite/invite_mail_body.html b/django/web/templates/emails/invite/invite_mail_body.html
index aede3e5..b223c39 100755..100644
--- a/django/web/templates/emails/invite/invite_mail_body.html
+++ b/django/web/templates/emails/invite/invite_mail_body.html
@@ -1,41 +1,40 @@
-<!--  
-============LICENSE_START========================================== 
- org.onap.vvp/engagementmgr
- ===================================================================
- Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- ===================================================================
-
- Unless otherwise specified, all software contained herein is licensed
- under the Apache License, Version 2.0 (the “License”);
- you may not use this software except in compliance with the License.
- You may obtain a copy of the License at
-
-             http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
-
-
- Unless otherwise specified, all documentation contained herein is licensed
- under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
- you may not use this documentation except in compliance with the License.
- You may obtain a copy of the License at
-
-             https://creativecommons.org/licenses/by/4.0/
-
- Unless required by applicable law or agreed to in writing, documentation
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- ============LICENSE_END============================================
-
- ECOMP is a trademark and service mark of AT&T Intellectual Property.-->
+{#============LICENSE_START========================================== #}
+{# org.onap.vvp/engagementmgr#}
+{# ===================================================================#}
+{# Copyright ? 2017 AT&T Intellectual Property. All rights reserved.#}
+{# ===================================================================#}
+{##}
+{# Unless otherwise specified, all software contained herein is licensed#}
+{# under the Apache License, Version 2.0 (the ?License?);#}
+{# you may not use this software except in compliance with the License.#}
+{# You may obtain a copy of the License at#}
+{##}
+{#             http://www.apache.org/licenses/LICENSE-2.0#}
+{##}
+{# Unless required by applicable law or agreed to in writing, software#}
+{# distributed under the License is distributed on an "AS IS" BASIS,#}
+{# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.#}
+{# See the License for the specific language governing permissions and#}
+{# limitations under the License.#}
+{##}
+{##}
+{##}
+{# Unless otherwise specified, all documentation contained herein is licensed#}
+{# under the Creative Commons License, Attribution 4.0 Intl. (the ?License?);#}
+{# you may not use this documentation except in compliance with the License.#}
+{# You may obtain a copy of the License at#}
+{##}
+{#             https://creativecommons.org/licenses/by/4.0/#}
+{##}
+{# Unless required by applicable law or agreed to in writing, documentation#}
+{# distributed under the License is distributed on an "AS IS" BASIS,#}
+{# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.#}
+{# See the License for the specific language governing permissions and#}
+{# limitations under the License.#}
+{##}
+{# ============LICENSE_END============================================#}
+{##}
+{# ECOMP is a trademark and service mark of AT&T Intellectual Property.#}
 <!DOCTYPE html>
 <html>
 	<head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii"></head>
diff --git a/django/web/templates/emails/invite/invite_mail_subject.html b/django/web/templates/emails/invite/invite_mail_subject.html
index d42fe48..3ba5699 100755..100644
--- a/django/web/templates/emails/invite/invite_mail_subject.html
+++ b/django/web/templates/emails/invite/invite_mail_subject.html
@@ -1,39 +1 @@
-<!--  
-============LICENSE_START========================================== 
- org.onap.vvp/engagementmgr
- ===================================================================
- Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- ===================================================================
-
- Unless otherwise specified, all software contained herein is licensed
- under the Apache License, Version 2.0 (the “License”);
- you may not use this software except in compliance with the License.
- You may obtain a copy of the License at
-
-             http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
-
-
- Unless otherwise specified, all documentation contained herein is licensed
- under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
- you may not use this documentation except in compliance with the License.
- You may obtain a copy of the License at
-
-             https://creativecommons.org/licenses/by/4.0/
-
- Unless required by applicable law or agreed to in writing, documentation
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- ============LICENSE_END============================================
-
- ECOMP is a trademark and service mark of AT&T Intellectual Property.-->
-{{program_name}}: You have been invited as a team member to {{ vf_name }}
+{{program_name}}: You have been invited as a team member to {{ vf_name }}
\ No newline at end of file
diff --git a/django/web/templates/emails/notification/notification_digest_mail_body.html b/django/web/templates/emails/notification/notification_digest_mail_body.html
index 14d9e82..594e84c 100755..100644
--- a/django/web/templates/emails/notification/notification_digest_mail_body.html
+++ b/django/web/templates/emails/notification/notification_digest_mail_body.html
@@ -1,41 +1,40 @@
-<!--  
-============LICENSE_START========================================== 
- org.onap.vvp/engagementmgr
- ===================================================================
- Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- ===================================================================
-
- Unless otherwise specified, all software contained herein is licensed
- under the Apache License, Version 2.0 (the “License”);
- you may not use this software except in compliance with the License.
- You may obtain a copy of the License at
-
-             http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
-
-
- Unless otherwise specified, all documentation contained herein is licensed
- under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
- you may not use this documentation except in compliance with the License.
- You may obtain a copy of the License at
-
-             https://creativecommons.org/licenses/by/4.0/
-
- Unless required by applicable law or agreed to in writing, documentation
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- ============LICENSE_END============================================
-
- ECOMP is a trademark and service mark of AT&T Intellectual Property.-->
+{#============LICENSE_START========================================== #}
+{# org.onap.vvp/engagementmgr#}
+{# ===================================================================#}
+{# Copyright ? 2017 AT&T Intellectual Property. All rights reserved.#}
+{# ===================================================================#}
+{##}
+{# Unless otherwise specified, all software contained herein is licensed#}
+{# under the Apache License, Version 2.0 (the ?License?);#}
+{# you may not use this software except in compliance with the License.#}
+{# You may obtain a copy of the License at#}
+{##}
+{#             http://www.apache.org/licenses/LICENSE-2.0#}
+{##}
+{# Unless required by applicable law or agreed to in writing, software#}
+{# distributed under the License is distributed on an "AS IS" BASIS,#}
+{# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.#}
+{# See the License for the specific language governing permissions and#}
+{# limitations under the License.#}
+{##}
+{##}
+{##}
+{# Unless otherwise specified, all documentation contained herein is licensed#}
+{# under the Creative Commons License, Attribution 4.0 Intl. (the ?License?);#}
+{# you may not use this documentation except in compliance with the License.#}
+{# You may obtain a copy of the License at#}
+{##}
+{#             https://creativecommons.org/licenses/by/4.0/#}
+{##}
+{# Unless required by applicable law or agreed to in writing, documentation#}
+{# distributed under the License is distributed on an "AS IS" BASIS,#}
+{# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.#}
+{# See the License for the specific language governing permissions and#}
+{# limitations under the License.#}
+{##}
+{# ============LICENSE_END============================================#}
+{##}
+{# ECOMP is a trademark and service mark of AT&T Intellectual Property.#}
 <!DOCTYPE html>
 <html>
     <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii"> </head>
diff --git a/django/web/templates/emails/notification/notification_digest_mail_subject.html b/django/web/templates/emails/notification/notification_digest_mail_subject.html
index 3172650..5ffca30 100755..100644
--- a/django/web/templates/emails/notification/notification_digest_mail_subject.html
+++ b/django/web/templates/emails/notification/notification_digest_mail_subject.html
@@ -1,39 +1 @@
-<!--  
-============LICENSE_START========================================== 
- org.onap.vvp/engagementmgr
- ===================================================================
- Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- ===================================================================
-
- Unless otherwise specified, all software contained herein is licensed
- under the Apache License, Version 2.0 (the “License”);
- you may not use this software except in compliance with the License.
- You may obtain a copy of the License at
-
-             http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
-
-
- Unless otherwise specified, all documentation contained herein is licensed
- under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
- you may not use this documentation except in compliance with the License.
- You may obtain a copy of the License at
-
-             https://creativecommons.org/licenses/by/4.0/
-
- Unless required by applicable law or agreed to in writing, documentation
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- ============LICENSE_END============================================
-
- ECOMP is a trademark and service mark of AT&T Intellectual Property.-->
-{{program_name}}: {{notification_subject}}
+{{program_name}}: {{notification_subject}}
\ No newline at end of file
diff --git a/django/web/templates/emails/notification/notification_mail_body.html b/django/web/templates/emails/notification/notification_mail_body.html
index 4a16fd1..1849e27 100755..100644
--- a/django/web/templates/emails/notification/notification_mail_body.html
+++ b/django/web/templates/emails/notification/notification_mail_body.html
@@ -1,41 +1,40 @@
-<!--  
-============LICENSE_START========================================== 
- org.onap.vvp/engagementmgr
- ===================================================================
- Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- ===================================================================
-
- Unless otherwise specified, all software contained herein is licensed
- under the Apache License, Version 2.0 (the “License”);
- you may not use this software except in compliance with the License.
- You may obtain a copy of the License at
-
-             http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
-
-
- Unless otherwise specified, all documentation contained herein is licensed
- under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
- you may not use this documentation except in compliance with the License.
- You may obtain a copy of the License at
-
-             https://creativecommons.org/licenses/by/4.0/
-
- Unless required by applicable law or agreed to in writing, documentation
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- ============LICENSE_END============================================
-
- ECOMP is a trademark and service mark of AT&T Intellectual Property.-->
+{#============LICENSE_START========================================== #}
+{# org.onap.vvp/engagementmgr#}
+{# ===================================================================#}
+{# Copyright ? 2017 AT&T Intellectual Property. All rights reserved.#}
+{# ===================================================================#}
+{##}
+{# Unless otherwise specified, all software contained herein is licensed#}
+{# under the Apache License, Version 2.0 (the ?License?);#}
+{# you may not use this software except in compliance with the License.#}
+{# You may obtain a copy of the License at#}
+{##}
+{#             http://www.apache.org/licenses/LICENSE-2.0#}
+{##}
+{# Unless required by applicable law or agreed to in writing, software#}
+{# distributed under the License is distributed on an "AS IS" BASIS,#}
+{# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.#}
+{# See the License for the specific language governing permissions and#}
+{# limitations under the License.#}
+{##}
+{##}
+{##}
+{# Unless otherwise specified, all documentation contained herein is licensed#}
+{# under the Creative Commons License, Attribution 4.0 Intl. (the ?License?);#}
+{# you may not use this documentation except in compliance with the License.#}
+{# You may obtain a copy of the License at#}
+{##}
+{#             https://creativecommons.org/licenses/by/4.0/#}
+{##}
+{# Unless required by applicable law or agreed to in writing, documentation#}
+{# distributed under the License is distributed on an "AS IS" BASIS,#}
+{# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.#}
+{# See the License for the specific language governing permissions and#}
+{# limitations under the License.#}
+{##}
+{# ============LICENSE_END============================================#}
+{##}
+{# ECOMP is a trademark and service mark of AT&T Intellectual Property.#}
 <!DOCTYPE html>
 <html>
     <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii"> </head>
diff --git a/django/web/templates/emails/notification/notification_mail_subject.html b/django/web/templates/emails/notification/notification_mail_subject.html
index 3172650..5ffca30 100755..100644
--- a/django/web/templates/emails/notification/notification_mail_subject.html
+++ b/django/web/templates/emails/notification/notification_mail_subject.html
@@ -1,39 +1 @@
-<!--  
-============LICENSE_START========================================== 
- org.onap.vvp/engagementmgr
- ===================================================================
- Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- ===================================================================
-
- Unless otherwise specified, all software contained herein is licensed
- under the Apache License, Version 2.0 (the “License”);
- you may not use this software except in compliance with the License.
- You may obtain a copy of the License at
-
-             http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
-
-
- Unless otherwise specified, all documentation contained herein is licensed
- under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
- you may not use this documentation except in compliance with the License.
- You may obtain a copy of the License at
-
-             https://creativecommons.org/licenses/by/4.0/
-
- Unless required by applicable law or agreed to in writing, documentation
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- ============LICENSE_END============================================
-
- ECOMP is a trademark and service mark of AT&T Intellectual Property.-->
-{{program_name}}: {{notification_subject}}
+{{program_name}}: {{notification_subject}}
\ No newline at end of file
diff --git a/django/web/templates/emails/reset_pwd/reset_pwd_instructions_mail_body.html b/django/web/templates/emails/reset_pwd/reset_pwd_instructions_mail_body.html
index 190eb47..2c744f1 100755..100644
--- a/django/web/templates/emails/reset_pwd/reset_pwd_instructions_mail_body.html
+++ b/django/web/templates/emails/reset_pwd/reset_pwd_instructions_mail_body.html
@@ -1,41 +1,40 @@
-<!--  
-============LICENSE_START========================================== 
- org.onap.vvp/engagementmgr
- ===================================================================
- Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- ===================================================================
-
- Unless otherwise specified, all software contained herein is licensed
- under the Apache License, Version 2.0 (the “License”);
- you may not use this software except in compliance with the License.
- You may obtain a copy of the License at
-
-             http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
-
-
- Unless otherwise specified, all documentation contained herein is licensed
- under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
- you may not use this documentation except in compliance with the License.
- You may obtain a copy of the License at
-
-             https://creativecommons.org/licenses/by/4.0/
-
- Unless required by applicable law or agreed to in writing, documentation
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- ============LICENSE_END============================================
-
- ECOMP is a trademark and service mark of AT&T Intellectual Property.-->
+{#============LICENSE_START========================================== #}
+{# org.onap.vvp/engagementmgr#}
+{# ===================================================================#}
+{# Copyright ? 2017 AT&T Intellectual Property. All rights reserved.#}
+{# ===================================================================#}
+{##}
+{# Unless otherwise specified, all software contained herein is licensed#}
+{# under the Apache License, Version 2.0 (the ?License?);#}
+{# you may not use this software except in compliance with the License.#}
+{# You may obtain a copy of the License at#}
+{##}
+{#             http://www.apache.org/licenses/LICENSE-2.0#}
+{##}
+{# Unless required by applicable law or agreed to in writing, software#}
+{# distributed under the License is distributed on an "AS IS" BASIS,#}
+{# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.#}
+{# See the License for the specific language governing permissions and#}
+{# limitations under the License.#}
+{##}
+{##}
+{##}
+{# Unless otherwise specified, all documentation contained herein is licensed#}
+{# under the Creative Commons License, Attribution 4.0 Intl. (the ?License?);#}
+{# you may not use this documentation except in compliance with the License.#}
+{# You may obtain a copy of the License at#}
+{##}
+{#             https://creativecommons.org/licenses/by/4.0/#}
+{##}
+{# Unless required by applicable law or agreed to in writing, documentation#}
+{# distributed under the License is distributed on an "AS IS" BASIS,#}
+{# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.#}
+{# See the License for the specific language governing permissions and#}
+{# limitations under the License.#}
+{##}
+{# ============LICENSE_END============================================#}
+{##}
+{# ECOMP is a trademark and service mark of AT&T Intellectual Property.#}
 <!DOCTYPE html>
 <html>
     <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii"> </head>
diff --git a/django/web/templates/emails/reset_pwd/reset_pwd_instructions_mail_subject.html b/django/web/templates/emails/reset_pwd/reset_pwd_instructions_mail_subject.html
index 7f22ef1..c29127a 100755..100644
--- a/django/web/templates/emails/reset_pwd/reset_pwd_instructions_mail_subject.html
+++ b/django/web/templates/emails/reset_pwd/reset_pwd_instructions_mail_subject.html
@@ -1,39 +1 @@
-<!--  
-============LICENSE_START========================================== 
- org.onap.vvp/engagementmgr
- ===================================================================
- Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- ===================================================================
-
- Unless otherwise specified, all software contained herein is licensed
- under the Apache License, Version 2.0 (the “License”);
- you may not use this software except in compliance with the License.
- You may obtain a copy of the License at
-
-             http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
-
-
- Unless otherwise specified, all documentation contained herein is licensed
- under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
- you may not use this documentation except in compliance with the License.
- You may obtain a copy of the License at
-
-             https://creativecommons.org/licenses/by/4.0/
-
- Unless required by applicable law or agreed to in writing, documentation
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- ============LICENSE_END============================================
-
- ECOMP is a trademark and service mark of AT&T Intellectual Property.-->
-{{program_name}}: Reset Password
+{{program_name}}: Reset Password
\ No newline at end of file