aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLusheng Ji <lji@research.att.com>2018-02-12 11:04:30 -0500
committerLusheng Ji <lji@research.att.com>2018-02-12 11:04:30 -0500
commit8accefe3dfc0d07ff7a8609ef681bab44aa9e986 (patch)
treede1f3013acaf3ea520aca6c7cafce852936b19cb
parent245ed5b0cd8a4d2ddf1cf94976ee55ed3d04fa1a (diff)
Update license text
Change-Id: Idff7ac3c209823d0f96d4b942363d41b9e39325a Signed-off-by: Lusheng Ji <lji@research.att.com> Issue-ID: DCAEGEN2-325
-rw-r--r--LICENSE.txt6
-rw-r--r--deployment-handler-API.yaml17
-rw-r--r--lib/auth.js2
-rw-r--r--lib/consul.js2
-rw-r--r--pom.xml2
-rwxr-xr-xset_version.sh17
-rw-r--r--tests/mock_deployment_handler.js2
-rw-r--r--version.js20
8 files changed, 61 insertions, 7 deletions
diff --git a/LICENSE.txt b/LICENSE.txt
index d8a9be7..14cb17c 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,11 +1,11 @@
/*
* ============LICENSE_START==========================================
* ===================================================================
-* Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
+* Copyright (c) 2017-2018 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”);
+* 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
*
@@ -20,7 +20,7 @@
*
*
* Unless otherwise specified, all documentation contained herein is licensed
-* under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+* 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
*
diff --git a/deployment-handler-API.yaml b/deployment-handler-API.yaml
index c4e9213..887e336 100644
--- a/deployment-handler-API.yaml
+++ b/deployment-handler-API.yaml
@@ -1,3 +1,20 @@
+# ================================================================================
+# Copyright (c) 2017-2018 AT&T Intellectual Property. All rights reserved.
+# ================================================================================
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file 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.
+# ============LICENSE_END=========================================================
+#
+# ECOMP is a trademark and service mark of AT&T Intellectual Property.
---
swagger: '2.0'
diff --git a/lib/auth.js b/lib/auth.js
index 9ddd7b3..901f318 100644
--- a/lib/auth.js
+++ b/lib/auth.js
@@ -62,4 +62,4 @@ exports.checkAuth = function(req, res, next) {
else {
next(); // Nothing to do, no authentication required
}
-}; \ No newline at end of file
+};
diff --git a/lib/consul.js b/lib/consul.js
index 32f38c6..40de84b 100644
--- a/lib/consul.js
+++ b/lib/consul.js
@@ -59,4 +59,4 @@ module.exports = {
});
});
}
-}; \ No newline at end of file
+};
diff --git a/pom.xml b/pom.xml
index 945f4c5..0da2313 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!--
================================================================================
-Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
+Copyright (c) 2017-2018 AT&T Intellectual Property. All rights reserved.
================================================================================
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
diff --git a/set_version.sh b/set_version.sh
index 1169c15..d112615 100755
--- a/set_version.sh
+++ b/set_version.sh
@@ -1,3 +1,20 @@
+# ================================================================================
+# Copyright (c) 2017-2018 AT&T Intellectual Property. All rights reserved.
+# ================================================================================
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file 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.
+# ============LICENSE_END=========================================================
+#
+# ECOMP is a trademark and service mark of AT&T Intellectual Property.
#!/bin/bash
echo "exports.branch=\"$(git branch | grep \* | cut -d ' ' -f2)\";" > version.js
diff --git a/tests/mock_deployment_handler.js b/tests/mock_deployment_handler.js
index ed0468f..ee42511 100644
--- a/tests/mock_deployment_handler.js
+++ b/tests/mock_deployment_handler.js
@@ -99,4 +99,4 @@ const run_dh = function() {
module.exports.INVENTORY_URL = INVENTORY_URL;
module.exports.CLOUDIFY_URL = CLOUDIFY_URL;
module.exports.add_tests = function(new_tests) {Array.prototype.push.apply(tests, new_tests);};
-module.exports.run_dh = run_dh; \ No newline at end of file
+module.exports.run_dh = run_dh;
diff --git a/version.js b/version.js
index 39ee8a5..e03ee1e 100644
--- a/version.js
+++ b/version.js
@@ -1 +1,21 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * PROJECT
+ * ================================================================================
+ * Copyright (C) 2018 AT&T Intellectual Property. All rights
+ * reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file 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.
+ * ============LICENSE_END=========================================================
+ */
exports.commit="unspecified";