Merge "Apache2 License addition"

5 files changed, 85 insertions, 55 deletions

diff --git a/kubernetes/aai/charts/aai-search-data/resources/config/analysis-config.json b/kubernetes/aai/charts/aai-search-data/resources/config/analysis-config.json
index f98ea3799b..5fc135df5a 100644
--- a/kubernetes/aai/charts/aai-search-data/resources/config/analysis-config.json
+++ b/kubernetes/aai/charts/aai-search-data/resources/config/analysis-config.json
@@ -1,32 +1,32 @@
-[
-	{
-		"name": "whitespace_analyzer", 
-	 	"description": "A standard whitespace analyzer.",
-	 	"behaviours": [
-	 		"Tokenize the text using white space characters as delimeters.",
-	 		"Convert all characters to lower case.",
-	 		"Convert all alphanumeric and symbolic Unicode characters above the first 127 ASCII characters into their ASCII equivalents."
-	 	],
-	 	"tokenizer": "whitespace",
-	 	"filters": [
-	 		"lowercase",
-	 		"asciifolding"
-	 	]
-	},
-	{
-		"name": "ngram_analyzer", 
-	 	"description": "An analyzer which performs ngram filtering on the data stream.",
-	 	"behaviours": [
-	 		"Tokenize the text using white space characters as delimeters.",
-	 		"Convert all characters to lower case.",
-	 		"Convert all alphanumeric and symbolic Unicode characters above the first 127 ASCII characters into their ASCII equivalents.",
-	 		"Apply ngram filtering using the following values for minimum and maximum size in codepoints of a single n-gram: minimum = 1, maximum = 2."
-	 	],
-	 	"tokenizer": "whitespace",
-	 	"filters": [
-	 		"lowercase",
-	 		"asciifolding",
-	 		"ngram_filter"
-	 	]
-	}
+[

+	{

+		"name": "whitespace_analyzer", 

+	 	"description": "A standard whitespace analyzer.",

+	 	"behaviours": [

+	 		"Tokenize the text using white space characters as delimeters.",

+	 		"Convert all characters to lower case.",

+	 		"Convert all alphanumeric and symbolic Unicode characters above the first 127 ASCII characters into their ASCII equivalents."

+	 	],

+	 	"tokenizer": "whitespace",

+	 	"filters": [

+	 		"lowercase",

+	 		"asciifolding"

+	 	]

+	},

+	{

+		"name": "ngram_analyzer", 

+	 	"description": "An analyzer which performs ngram filtering on the data stream.",

+	 	"behaviours": [

+	 		"Tokenize the text using white space characters as delimeters.",

+	 		"Convert all characters to lower case.",

+	 		"Convert all alphanumeric and symbolic Unicode characters above the first 127 ASCII characters into their ASCII equivalents.",

+	 		"Apply ngram filtering using the following values for minimum and maximum size in codepoints of a single n-gram: minimum = 1, maximum = 2."

+	 	],

+	 	"tokenizer": "whitespace",

+	 	"filters": [

+	 		"lowercase",

+	 		"asciifolding",

+	 		"ngram_filter"

+	 	]

+	}

 ]
\ No newline at end of file
diff --git a/kubernetes/aai/charts/aai-search-data/resources/config/auth/search_policy.json b/kubernetes/aai/charts/aai-search-data/resources/config/auth/search_policy.json
index 72d8902fbe..bbbe52f5b5 100644
--- a/kubernetes/aai/charts/aai-search-data/resources/config/auth/search_policy.json
+++ b/kubernetes/aai/charts/aai-search-data/resources/config/auth/search_policy.json
@@ -1,18 +1,18 @@
-{
-	"roles": [
-		{
-			"name": "admin",
-			"functions": [
-				{
-					"name": "search", "methods": [ { "name": "GET" },{ "name": "DELETE" }, { "name": "PUT" }, { "name": "POST" } ]
-				}
-			],
-
-			"users": [
-				{
-					"username": "CN=ONAP, OU=ONAP, O=ONAP, L=Ottawa, ST=Ontario, C=CA"
-				}
-			]
-		}		
-	]
-}
+{

+	"roles": [

+		{

+			"name": "admin",

+			"functions": [

+				{

+					"name": "search", "methods": [ { "name": "GET" },{ "name": "DELETE" }, { "name": "PUT" }, { "name": "POST" } ]

+				}

+			],

+

+			"users": [

+				{

+					"username": "CN=ONAP, OU=ONAP, O=ONAP, L=Ottawa, ST=Ontario, C=CA"

+				}

+			]

+		}		

+	]

+}

diff --git a/kubernetes/aai/charts/aai-search-data/resources/config/elastic-search.properties b/kubernetes/aai/charts/aai-search-data/resources/config/elastic-search.properties
index 532a9fb2f0..809b22b074 100644
--- a/kubernetes/aai/charts/aai-search-data/resources/config/elastic-search.properties
+++ b/kubernetes/aai/charts/aai-search-data/resources/config/elastic-search.properties
@@ -1,3 +1,17 @@
+# Copyright © 2018 Amdocs, Bell Canada, AT&T
+#
+# 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.
+
 # ElasticSearch Configuration
 
 es.cluster-name=ES_AAI
diff --git a/kubernetes/aai/charts/aai-search-data/resources/config/filter-config.json b/kubernetes/aai/charts/aai-search-data/resources/config/filter-config.json
index e2d5285824..a27f75b000 100644
--- a/kubernetes/aai/charts/aai-search-data/resources/config/filter-config.json
+++ b/kubernetes/aai/charts/aai-search-data/resources/config/filter-config.json
@@ -1,7 +1,7 @@
-[
-	{
-		"name": "ngram_filter",
-		"description": "Custom NGram Filter.",
-		"configuration": " \"type\": \"nGram\", \"min_gram\": 1, \"max_gram\": 50, \"token_chars\": [ \"letter\", \"digit\", \"punctuation\", \"symbol\" ]"
-	}
+[

+	{

+		"name": "ngram_filter",

+		"description": "Custom NGram Filter.",

+		"configuration": " \"type\": \"nGram\", \"min_gram\": 1, \"max_gram\": 50, \"token_chars\": [ \"letter\", \"digit\", \"punctuation\", \"symbol\" ]"

+	}

 ]
\ No newline at end of file
diff --git a/kubernetes/aai/charts/aai-search-data/resources/config/log/logback.xml b/kubernetes/aai/charts/aai-search-data/resources/config/log/logback.xml
index 3fbbbab864..adfed4aa60 100644
--- a/kubernetes/aai/charts/aai-search-data/resources/config/log/logback.xml
+++ b/kubernetes/aai/charts/aai-search-data/resources/config/log/logback.xml
@@ -1,3 +1,19 @@
+<!--
+# Copyright © 2018 Amdocs, Bell Canada, AT&T
+#
+# 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.
+-->
+
 <configuration scan="true" scanPeriod="3 seconds" debug="false">
         <!--<jmxConfigurator /> -->
         <!-- directory path for all other type logs -->