Change license header

New license header includes the original MIT license and the Apache 2.0 license for teh updates

Change-Id: If5805ec0c7eb67300b908d7737b5a37f233b6f5e
Issue-Id: MODELING-35
Signed-off-by: Serban Jora <jora@research.att.com>

23 files changed, 441 insertions, 117 deletions

diff --git a/javatoscachecker/kwalify/src/main/java/kwalify/BaseException.java b/javatoscachecker/kwalify/src/main/java/kwalify/BaseException.java
index d26487b..4f959a3 100644
--- a/javatoscachecker/kwalify/src/main/java/kwalify/BaseException.java
+++ b/javatoscachecker/kwalify/src/main/java/kwalify/BaseException.java
@@ -1,4 +1,7 @@
 /*
+ * The original version of this file was provided under the MIT license,
+ * as follows:
+ *
  * @(#)BaseException.java	$Rev: 3 $ $Release: 0.5.1 $
  *
  * Copyright (c) <2005> <kuwata lab>
@@ -10,8 +13,8 @@
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
  * 
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
@@ -21,11 +24,22 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  *
- * Added in order to satisfy onap.org code check constraints:
+ * Modifications to this file are provided under the Apache 2.0 license,
+ * as follows:
+
+ * Copyright (c) 2017 <AT&T>.  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
  *
- * This license is deemed more permisive than if it were under the Apache License, Version 2.0,
- * found 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.
  */
 
 package kwalify;
diff --git a/javatoscachecker/kwalify/src/main/java/kwalify/CommandOptionException.java b/javatoscachecker/kwalify/src/main/java/kwalify/CommandOptionException.java
index 8250764..2e6e9a5 100644
--- a/javatoscachecker/kwalify/src/main/java/kwalify/CommandOptionException.java
+++ b/javatoscachecker/kwalify/src/main/java/kwalify/CommandOptionException.java
@@ -1,4 +1,7 @@
 /*
+ * The original version of this file was provided under the MIT license,
+ * as follows:
+ *
  * @(#)CommandOptionException.java	$Rev: 4 $ $Release: 0.5.1 $
  *
  * Copyright (c) <2005> <kuwata lab>
@@ -10,8 +13,8 @@
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
  * 
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
@@ -21,12 +24,22 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  *
- * Added in order to satisfy onap.org code check constraints:
+ * Modifications to this file are provided under the Apache 2.0 license,
+ * as follows:
+
+ * Copyright (c) 2017 <AT&T>.  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
  *
- * This license is deemed more permisive than if it were under the Apache License, Version 2.0,
- * found 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.
  */
 
 package kwalify;
diff --git a/javatoscachecker/kwalify/src/main/java/kwalify/Defaultable.java b/javatoscachecker/kwalify/src/main/java/kwalify/Defaultable.java
index 4a29609..c437294 100644
--- a/javatoscachecker/kwalify/src/main/java/kwalify/Defaultable.java
+++ b/javatoscachecker/kwalify/src/main/java/kwalify/Defaultable.java
@@ -1,4 +1,7 @@
 /*
+ * The original version of this file was provided under the MIT license,
+ * as follows:
+ *
  * @(#)Defaultable.java	$Rev: 3 $ $Release: 0.5.1 $
  *
  * Copyright (c) <2005> <kuwata lab>
@@ -10,8 +13,8 @@
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
  * 
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
@@ -21,11 +24,22 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  *
- * Added in order to satisfy onap.org code check constraints:
+ * Modifications to this file are provided under the Apache 2.0 license,
+ * as follows:
+
+ * Copyright (c) 2017 <AT&T>.  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
  *
- * This license is deemed more permisive than if it were under the Apache License, Version 2.0,
- * found 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.
  */
 
 package kwalify;
diff --git a/javatoscachecker/kwalify/src/main/java/kwalify/DefaultableHashMap.java b/javatoscachecker/kwalify/src/main/java/kwalify/DefaultableHashMap.java
index 6c07fe8..6bc4f42 100644
--- a/javatoscachecker/kwalify/src/main/java/kwalify/DefaultableHashMap.java
+++ b/javatoscachecker/kwalify/src/main/java/kwalify/DefaultableHashMap.java
@@ -1,4 +1,7 @@
 /*
+ * The original version of this file was provided under the MIT license,
+ * as follows:
+
  * @(#)DefaultableHashMap.java	$Rev: 4 $ $Release: 0.5.1 $
  *
  * Copyright (c) <2005> <kuwata lab>
@@ -10,8 +13,8 @@
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
  * 
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
@@ -21,11 +24,22 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  *
- * Added in order to satisfy onap.org code check constraints:
+ * Modifications to this file are provided under the Apache 2.0 license,
+ * as follows:
+
+ * Copyright (c) 2017 <AT&T>.  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
  *
- * This license is deemed more permisive than if it were under the Apache License, Version 2.0,
- * found 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.
  */
 
 package kwalify;
diff --git a/javatoscachecker/kwalify/src/main/java/kwalify/InvalidPathException.java b/javatoscachecker/kwalify/src/main/java/kwalify/InvalidPathException.java
index a7abe2a..f18c0d2 100644
--- a/javatoscachecker/kwalify/src/main/java/kwalify/InvalidPathException.java
+++ b/javatoscachecker/kwalify/src/main/java/kwalify/InvalidPathException.java
@@ -1,4 +1,7 @@
 /*
+ * The original version of this file was provided under the MIT license,
+ * as follows:
+ *
  * @(#)InvalidPathException.java	$Rev: 4 $ $Release: 0.5.1 $
  *
  * Copyright (c) <2005> <kuwata lab>
@@ -10,8 +13,8 @@
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
  * 
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
@@ -21,13 +24,23 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  *
- * Added in order to satisfy onap.org code check constraints:
+ * Modifications to this file are provided under the Apache 2.0 license,
+ * as follows:
+
+ * Copyright (c) 2017 <AT&T>.  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
  *
- * This license is deemed more permisive than if it were under the Apache License, Version 2.0,
- * found 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.
  */
-
 package kwalify;
 
 /**
diff --git a/javatoscachecker/kwalify/src/main/java/kwalify/InvalidTypeException.java b/javatoscachecker/kwalify/src/main/java/kwalify/InvalidTypeException.java
index 29fa3f7..7a7187b 100644
--- a/javatoscachecker/kwalify/src/main/java/kwalify/InvalidTypeException.java
+++ b/javatoscachecker/kwalify/src/main/java/kwalify/InvalidTypeException.java
@@ -1,5 +1,9 @@
 /*
+ * The original version of this file was provided under the MIT license,
+ * as follows:
+ *
  * @(#)InvalidTypeException.java	$Rev: 4 $ $Release: 0.5.1 $
+ *
  * Copyright (c) <2005> <kuwata lab>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -9,8 +13,8 @@
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
  * 
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
@@ -20,11 +24,22 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  *
- * Added in order to satisfy onap.org code check constraints:
+ * Modifications to this file are provided under the Apache 2.0 license,
+ * as follows:
+
+ * Copyright (c) 2017 <AT&T>.  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
  *
- * This license is deemed more permisive than it it were under the Apache License, Version 2.0,
- * found 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.
  */
 
 package kwalify;
diff --git a/javatoscachecker/kwalify/src/main/java/kwalify/KwalifyException.java b/javatoscachecker/kwalify/src/main/java/kwalify/KwalifyException.java
index 5dfacf0..3e915cb 100644
--- a/javatoscachecker/kwalify/src/main/java/kwalify/KwalifyException.java
+++ b/javatoscachecker/kwalify/src/main/java/kwalify/KwalifyException.java
@@ -1,4 +1,7 @@
 /*
+ * The original version of this file was provided under the MIT license,
+ * as follows:
+ *
  * @(#)KwalifyException.java	$Rev: 3 $ $Release: 0.5.1 $
  *
  * Copyright (c) <2005> <kuwata lab>
@@ -10,8 +13,8 @@
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
  * 
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
@@ -21,11 +24,22 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  *
- * Added in order to satisfy onap.org code check constraints:
+ * Modifications to this file are provided under the Apache 2.0 license,
+ * as follows:
+
+ * Copyright (c) 2017 <AT&T>.  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
  *
- * This license is deemed more permisive than if it were under the Apache License, Version 2.0,
- * found 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.
  */
 
 package kwalify;
diff --git a/javatoscachecker/kwalify/src/main/java/kwalify/KwalifyRuntimeException.java b/javatoscachecker/kwalify/src/main/java/kwalify/KwalifyRuntimeException.java
index 7057764..447c0e9 100644
--- a/javatoscachecker/kwalify/src/main/java/kwalify/KwalifyRuntimeException.java
+++ b/javatoscachecker/kwalify/src/main/java/kwalify/KwalifyRuntimeException.java
@@ -1,4 +1,7 @@
 /*
+ * The original version of this file was provided under the MIT license,
+ * as follows:
+ *
  * @(#)KwalifyRuntimeException.java	$Rev: 3 $ $Release: 0.5.1 $
  *
  * Copyright (c) <2005> <kuwata lab>
@@ -10,8 +13,8 @@
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
  * 
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
@@ -21,13 +24,25 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  *
- * Added in order to satisfy onap.org code check constraints:
+ * Modifications to this file are provided under the Apache 2.0 license,
+ * as follows:
+
+ * Copyright (c) 2017 <AT&T>.  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
  *
- * This license is deemed more permisive than if it were under the Apache License, Version 2.0,
- * found 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.
  */
 
+
 package kwalify;
 
 /**
diff --git a/javatoscachecker/kwalify/src/main/java/kwalify/Main.java b/javatoscachecker/kwalify/src/main/java/kwalify/Main.java
index 836a116..26a890f 100644
--- a/javatoscachecker/kwalify/src/main/java/kwalify/Main.java
+++ b/javatoscachecker/kwalify/src/main/java/kwalify/Main.java
@@ -1,4 +1,7 @@
 /*
+ * The original version of this file was provided under the MIT license,
+ * as follows:
+a*
  * @(#)Main.java	$Rev: 4 $ $Release: 0.5.1 $
  *
  * Copyright (c) <2005> <kuwata lab>
@@ -10,8 +13,8 @@
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
  * 
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
@@ -21,13 +24,25 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  *
- * Added in order to satisfy onap.org code check constraints:
+ * Modifications to this file are provided under the Apache 2.0 license,
+ * as follows:
+
+ * Copyright (c) 2017 <AT&T>.  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
  *
- * This license is deemed more permisive than if it were under the Apache License, Version 2.0,
- * found 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.
  */
 
+
 package kwalify;
 
 import java.util.List;
diff --git a/javatoscachecker/kwalify/src/main/java/kwalify/Messages.java b/javatoscachecker/kwalify/src/main/java/kwalify/Messages.java
index b33be5c..ef5e8d4 100644
--- a/javatoscachecker/kwalify/src/main/java/kwalify/Messages.java
+++ b/javatoscachecker/kwalify/src/main/java/kwalify/Messages.java
@@ -1,4 +1,7 @@
 /*
+ * The original version of this file was provided under the MIT license,
+ * as follows:
+ *
  * @(#)Messages.java	$Rev: 4 $ $Release: 0.5.1 $
  *
  * Copyright (c) <2005> <kuwata lab>
@@ -10,8 +13,8 @@
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
  * 
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
@@ -21,11 +24,22 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  *
- * Added in order to satisfy onap.org code check constraints:
+ * Modifications to this file are provided under the Apache 2.0 license,
+ * as follows:
+
+ * Copyright (c) 2017 <AT&T>.  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
  *
- * This license is deemed more permisive than if it were under the Apache License, Version 2.0,
- * found 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.
  */
 
 package kwalify;
diff --git a/javatoscachecker/kwalify/src/main/java/kwalify/MetaValidator.java b/javatoscachecker/kwalify/src/main/java/kwalify/MetaValidator.java
index a3c07b9..f40266f 100644
--- a/javatoscachecker/kwalify/src/main/java/kwalify/MetaValidator.java
+++ b/javatoscachecker/kwalify/src/main/java/kwalify/MetaValidator.java
@@ -1,4 +1,7 @@
 /*
+ * The original version of this file was provided under the MIT license,
+ * as follows:
+ *
  * @(#)MetaValidator.java	$Rev: 4 $ $Release: 0.5.1 $
  *
  * Copyright (c) <2005> <kuwata lab>
@@ -10,8 +13,8 @@
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
  * 
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
@@ -21,11 +24,22 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  *
- * Added in order to satisfy onap.org code check constraints:
+ * Modifications to this file are provided under the Apache 2.0 license,
+ * as follows:
+
+ * Copyright (c) 2017 <AT&T>.  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
  *
- * This license is deemed more permisive than if it were under the Apache License, Version 2.0,
- * found 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.
  */
 
 package kwalify;
diff --git a/javatoscachecker/kwalify/src/main/java/kwalify/Parser.java b/javatoscachecker/kwalify/src/main/java/kwalify/Parser.java
index 4756c91..0faad67 100644
--- a/javatoscachecker/kwalify/src/main/java/kwalify/Parser.java
+++ b/javatoscachecker/kwalify/src/main/java/kwalify/Parser.java
@@ -1,4 +1,7 @@
 /*
+ * The original version of this file was provided under the MIT license,
+ * as follows:
+ *
  * @(#)Parser.java	$Rev: 3 $ $Release: 0.5.1 $
  *
  * Copyright (c) <2005> <kuwata lab>
@@ -10,8 +13,8 @@
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
  * 
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
@@ -21,11 +24,22 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  *
- * Added in order to satisfy onap.org code check constraints:
+ * Modifications to this file are provided under the Apache 2.0 license,
+ * as follows:
+
+ * Copyright (c) 2017 <AT&T>.  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
  *
- * This license is deemed more permisive than if it were under the Apache License, Version 2.0,
- * found 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.
  */
 
 package kwalify;
diff --git a/javatoscachecker/kwalify/src/main/java/kwalify/PlainYamlParser.java b/javatoscachecker/kwalify/src/main/java/kwalify/PlainYamlParser.java
index b9b49e2..e982bf1 100644
--- a/javatoscachecker/kwalify/src/main/java/kwalify/PlainYamlParser.java
+++ b/javatoscachecker/kwalify/src/main/java/kwalify/PlainYamlParser.java
@@ -1,4 +1,7 @@
 /*
+ * The original version of this file was provided under the MIT license,
+ * as follows:
+ *
  * @(#)PlainYamlParser.java	$Rev: 4 $ $Release: 0.5.1 $
  *
  * Copyright (c) <2005> <kuwata lab>
@@ -10,8 +13,8 @@
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
  * 
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
@@ -21,11 +24,22 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  *
- * Added in order to satisfy onap.org code check constraints:
+ * Modifications to this file are provided under the Apache 2.0 license,
+ * as follows:
+
+ * Copyright (c) 2017 <AT&T>.  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
  *
- * This license is deemed more permisive than if it were under the Apache License, Version 2.0,
- * found 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.
  */
 
 package kwalify;
diff --git a/javatoscachecker/kwalify/src/main/java/kwalify/Rule.java b/javatoscachecker/kwalify/src/main/java/kwalify/Rule.java
index c3f9176..5590f65 100644
--- a/javatoscachecker/kwalify/src/main/java/kwalify/Rule.java
+++ b/javatoscachecker/kwalify/src/main/java/kwalify/Rule.java
@@ -1,4 +1,7 @@
 /*
+ * The original version of this file was provided under the MIT license,
+ * as follows:
+ *
  * @(#)Rule.java	$Rev: 4 $ $Release: 0.5.1 $
  *
  * Copyright (c) <2005> <kuwata lab>
@@ -10,8 +13,8 @@
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
  * 
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
@@ -21,11 +24,22 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  *
- * Added in order to satisfy onap.org code check constraints:
+ * Modifications to this file are provided under the Apache 2.0 license,
+ * as follows:
+
+ * Copyright (c) 2017 <AT&T>.  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
  *
- * This license is deemed more permisive than if it were under the Apache License, Version 2.0,
- * found 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.
  */
 
 package kwalify;
diff --git a/javatoscachecker/kwalify/src/main/java/kwalify/SchemaException.java b/javatoscachecker/kwalify/src/main/java/kwalify/SchemaException.java
index cacf24c..0658b6f 100644
--- a/javatoscachecker/kwalify/src/main/java/kwalify/SchemaException.java
+++ b/javatoscachecker/kwalify/src/main/java/kwalify/SchemaException.java
@@ -1,4 +1,7 @@
 /*
+ * The original version of this file was provided under the MIT license,
+ * as follows:
+ *
  * @(#)SchemaException.java	$Rev: 4 $ $Release: 0.5.1 $
  *
  * Copyright (c) <2005> <kuwata lab>
@@ -10,8 +13,8 @@
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
  * 
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
@@ -21,11 +24,22 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  *
- * Added in order to satisfy onap.org code check constraints:
+ * Modifications to this file are provided under the Apache 2.0 license,
+ * as follows:
+
+ * Copyright (c) 2017 <AT&T>.  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
  *
- * This license is deemed more permisive than if it were under the Apache License, Version 2.0,
- * found 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.
  */
 
 package kwalify;
diff --git a/javatoscachecker/kwalify/src/main/java/kwalify/SyntaxException.java b/javatoscachecker/kwalify/src/main/java/kwalify/SyntaxException.java
index e51846b..9290a3d 100644
--- a/javatoscachecker/kwalify/src/main/java/kwalify/SyntaxException.java
+++ b/javatoscachecker/kwalify/src/main/java/kwalify/SyntaxException.java
@@ -1,4 +1,7 @@
 /*
+ * The original version of this file was provided under the MIT license,
+ * as follows:
+ *
  * @(#)SyntaxException.java	$Rev: 4 $ $Release: 0.5.1 $
  *
  * Copyright (c) <2005> <kuwata lab>
@@ -10,8 +13,8 @@
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
  * 
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
@@ -21,11 +24,22 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  *
- * Added in order to satisfy onap.org code check constraints:
+ * Modifications to this file are provided under the Apache 2.0 license,
+ * as follows:
+
+ * Copyright (c) 2017 <AT&T>.  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
  *
- * This license is deemed more permisive than if it were under the Apache License, Version 2.0,
- * found 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.
  */
 
 package kwalify;
diff --git a/javatoscachecker/kwalify/src/main/java/kwalify/Types.java b/javatoscachecker/kwalify/src/main/java/kwalify/Types.java
index 0f3fd3c..33acf7b 100644
--- a/javatoscachecker/kwalify/src/main/java/kwalify/Types.java
+++ b/javatoscachecker/kwalify/src/main/java/kwalify/Types.java
@@ -1,4 +1,7 @@
 /*
+ * The original version of this file was provided under the MIT license,
+ * as follows:
+ *
  * @(#)Types.java	$Rev: 4 $ $Release: 0.5.1 $
  *
  * Copyright (c) <2005> <kuwata lab>
@@ -10,8 +13,8 @@
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
  * 
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
@@ -21,11 +24,22 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  *
- * Added in order to satisfy onap.org code check constraints:
+ * Modifications to this file are provided under the Apache 2.0 license,
+ * as follows:
+
+ * Copyright (c) 2017 <AT&T>.  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
  *
- * This license is deemed more permisive than if it were under the Apache License, Version 2.0,
- * found 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.
  */
 
 package kwalify;
diff --git a/javatoscachecker/kwalify/src/main/java/kwalify/Util.java b/javatoscachecker/kwalify/src/main/java/kwalify/Util.java
index d6e50b6..61fe4ec 100644
--- a/javatoscachecker/kwalify/src/main/java/kwalify/Util.java
+++ b/javatoscachecker/kwalify/src/main/java/kwalify/Util.java
@@ -1,4 +1,7 @@
 /*
+ * The original version of this file was provided under the MIT license,
+ * as follows:
+ *
  * @(#)Util.java	$Rev: 4 $ $Release: 0.5.1 $
  *
  * Copyright (c) <2005> <kuwata lab>
@@ -10,8 +13,8 @@
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
  * 
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
@@ -21,11 +24,22 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  *
- * Added in order to satisfy onap.org code check constraints:
+ * Modifications to this file are provided under the Apache 2.0 license,
+ * as follows:
+
+ * Copyright (c) 2017 <AT&T>.  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
  *
- * This license is deemed more permisive than if it were under the Apache License, Version 2.0,
- * found 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.
  */
 
 package kwalify;
diff --git a/javatoscachecker/kwalify/src/main/java/kwalify/ValidationException.java b/javatoscachecker/kwalify/src/main/java/kwalify/ValidationException.java
index 62294fa..5f76238 100644
--- a/javatoscachecker/kwalify/src/main/java/kwalify/ValidationException.java
+++ b/javatoscachecker/kwalify/src/main/java/kwalify/ValidationException.java
@@ -1,4 +1,7 @@
 /*
+ * The original version of this file was provided under the MIT license,
+ * as follows:
+ *
  * @(#)ValidationException.java	$Rev: 4 $ $Release: 0.5.1 $
  *
  * Copyright (c) <2005> <kuwata lab>
@@ -10,8 +13,8 @@
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
  * 
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
@@ -21,11 +24,22 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  *
- * Added in order to satisfy onap.org code check constraints:
+ * Modifications to this file are provided under the Apache 2.0 license,
+ * as follows:
+
+ * Copyright (c) 2017 <AT&T>.  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
  *
- * This license is deemed more permisive than if it were under the Apache License, Version 2.0,
- * found 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.
  */
 
 package kwalify;
diff --git a/javatoscachecker/kwalify/src/main/java/kwalify/Validator.java b/javatoscachecker/kwalify/src/main/java/kwalify/Validator.java
index caf08fd..d5afa82 100644
--- a/javatoscachecker/kwalify/src/main/java/kwalify/Validator.java
+++ b/javatoscachecker/kwalify/src/main/java/kwalify/Validator.java
@@ -1,4 +1,7 @@
 /*
+ * The original version of this file was provided under the MIT license,
+ * as follows:
+ *
  * @(#)Validator.java	$Rev: 3 $ $Release: 0.5.1 $
  *
  * Copyright (c) <2005> <kuwata lab>
@@ -10,8 +13,8 @@
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
  * 
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
@@ -21,11 +24,22 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  *
- * Added in order to satisfy onap.org code check constraints:
+ * Modifications to this file are provided under the Apache 2.0 license,
+ * as follows:
+
+ * Copyright (c) 2017 <AT&T>.  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
  *
- * This license is deemed more permisive than if it were under the Apache License, Version 2.0,
- * found 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.
  */
 
 package kwalify;
diff --git a/javatoscachecker/kwalify/src/main/java/kwalify/YamlParser.java b/javatoscachecker/kwalify/src/main/java/kwalify/YamlParser.java
index 285ffaf..8b16622 100644
--- a/javatoscachecker/kwalify/src/main/java/kwalify/YamlParser.java
+++ b/javatoscachecker/kwalify/src/main/java/kwalify/YamlParser.java
@@ -1,4 +1,7 @@
 /*
+ * The original version of this file was provided under the MIT license,
+ * as follows:
+ *
  * @(#)YamlParser.java	$Rev: 3 $ $Release: 0.5.1 $
  *
  * Copyright (c) <2005> <kuwata lab>
@@ -10,8 +13,8 @@
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
  * 
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
@@ -21,12 +24,24 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  *
- * Added in order to satisfy onap.org code check constraints:
+ * Modifications to this file are provided under the Apache 2.0 license,
+ * as follows:
+
+ * Copyright (c) 2017 <AT&T>.  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
  *
- * This license is deemed more permisive than if it were under the Apache License, Version 2.0,
- * found 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.
  */
+
 package kwalify;
 
 import java.util.Map;
diff --git a/javatoscachecker/kwalify/src/main/java/kwalify/YamlSyntaxException.java b/javatoscachecker/kwalify/src/main/java/kwalify/YamlSyntaxException.java
index 262ec8e..6ab108e 100644
--- a/javatoscachecker/kwalify/src/main/java/kwalify/YamlSyntaxException.java
+++ b/javatoscachecker/kwalify/src/main/java/kwalify/YamlSyntaxException.java
@@ -1,4 +1,7 @@
 /*
+ * The original version of this file was provided under the MIT license,
+ * as follows:
+ *
  * @(#)YamlSyntaxException.java	$Rev: 4 $ $Release: 0.5.1 $
  *
  * Copyright (c) <2005> <kuwata lab>
@@ -10,8 +13,8 @@
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
  * 
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
@@ -21,11 +24,22 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  *
- * Added in order to satisfy onap.org code check constraints:
+ * Modifications to this file are provided under the Apache 2.0 license,
+ * as follows:
+
+ * Copyright (c) 2017 <AT&T>.  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
  *
- * This license is deemed more permisive than if it were under the Apache License, Version 2.0,
- * found 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.
  */
 
 package kwalify;
diff --git a/javatoscachecker/kwalify/src/main/java/kwalify/YamlUtil.java b/javatoscachecker/kwalify/src/main/java/kwalify/YamlUtil.java
index 0c99236..de27ad2 100644
--- a/javatoscachecker/kwalify/src/main/java/kwalify/YamlUtil.java
+++ b/javatoscachecker/kwalify/src/main/java/kwalify/YamlUtil.java
@@ -1,4 +1,7 @@
 /*
+ * The original version of this file was provided under the MIT license,
+ * as follows:
+ *
  * @(#)YamlUtil.java	$Rev: 3 $ $Release: 0.5.1 $
  *
  * Copyright (c) <2005> <kuwata lab>
@@ -10,8 +13,8 @@
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
  * 
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
@@ -21,11 +24,22 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  *
- * Added in order to satisfy onap.org code check constraints:
+ * Modifications to this file are provided under the Apache 2.0 license,
+ * as follows:
+
+ * Copyright (c) 2017 <AT&T>.  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
  *
- * This license is deemed more permisive than if it were under the Apache License, Version 2.0,
- * found 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.
  */
 
 package kwalify;