Remove OpenECOMP from license file

Change-Id: I76110503a4f74f24bd8ba66c633e1a3cb13fef6a
Issue-ID: AAI-86
Signed-off-by: Daniel Silverthorn <daniel.silverthorn@amdocs.com>

diff --git a/License.txt b/License.txt
index eee2e15..467cf6e 100644 (file)
--- a/License.txt
+++ b/License.txt
@@ -1,5 +1,5 @@
 ============LICENSE_START=======================================================
-Model Loader
+org.onap.aai
 ================================================================================
 Copyright © 2017 AT&T Intellectual Property.
 Copyright © 2017 Amdocs
@@ -8,7 +8,9 @@ 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
+
+    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.
@@ -16,5 +18,4 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ============LICENSE_END=========================================================
 
-ECOMP and OpenECOMP are trademarks
-and service marks of AT&T Intellectual Property.
\ No newline at end of file
+ECOMP is a trademark and service mark of AT&T Intellectual Property.

diff --git a/src/main/java/org/openecomp/modelloader/config/ModelLoaderConfig.java b/src/main/java/org/openecomp/modelloader/config/ModelLoaderConfig.java
index adc8f0b..cb4719e 100644 (file)
--- a/src/main/java/org/openecomp/modelloader/config/ModelLoaderConfig.java
+++ b/src/main/java/org/openecomp/modelloader/config/ModelLoaderConfig.java
@@ -1,6 +1,6 @@
 /**
  * ============LICENSE_START=======================================================
- * Model Loader
+ * org.onap.aai
  * ================================================================================
  * Copyright © 2017 AT&T Intellectual Property.
  * Copyright © 2017 Amdocs
@@ -9,7 +9,9 @@
  * 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
+ *
+ *     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.
@@ -17,8 +19,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  *
- * ECOMP and OpenECOMP are trademarks
- * and service marks of AT&T Intellectual Property.
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
 package org.openecomp.modelloader.config;
 

diff --git a/src/main/java/org/openecomp/modelloader/entity/Artifact.java b/src/main/java/org/openecomp/modelloader/entity/Artifact.java
index 88c75eb..1deb4f4 100644 (file)
--- a/src/main/java/org/openecomp/modelloader/entity/Artifact.java
+++ b/src/main/java/org/openecomp/modelloader/entity/Artifact.java
@@ -1,6 +1,6 @@
 /**
  * ============LICENSE_START=======================================================
- * Model Loader
+ * org.onap.aai
  * ================================================================================
  * Copyright © 2017 AT&T Intellectual Property.
  * Copyright © 2017 Amdocs
@@ -9,7 +9,9 @@
  * 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
+ *
+ *     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.
@@ -17,8 +19,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  *
- * ECOMP and OpenECOMP are trademarks
- * and service marks of AT&T Intellectual Property.
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
 package org.openecomp.modelloader.entity;
 

diff --git a/src/main/java/org/openecomp/modelloader/entity/ArtifactHandler.java b/src/main/java/org/openecomp/modelloader/entity/ArtifactHandler.java
index bd6a861..245a93c 100644 (file)
--- a/src/main/java/org/openecomp/modelloader/entity/ArtifactHandler.java
+++ b/src/main/java/org/openecomp/modelloader/entity/ArtifactHandler.java
@@ -1,6 +1,6 @@
 /**\r
  * ============LICENSE_START=======================================================\r
- * Model Loader\r
+ * org.onap.aai\r
  * ================================================================================\r
  * Copyright © 2017 AT&T Intellectual Property.\r
  * Copyright © 2017 Amdocs\r
@@ -9,7 +9,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");\r
  * you may not use this file except in compliance with the License.\r
  * You may obtain a copy of the License at\r
- * http://www.apache.org/licenses/LICENSE-2.0\r
+ *\r
+ *     http://www.apache.org/licenses/LICENSE-2.0\r
+ *\r
  * Unless required by applicable law or agreed to in writing, software\r
  * distributed under the License is distributed on an "AS IS" BASIS,\r
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
@@ -17,8 +19,7 @@
  * limitations under the License.\r
  * ============LICENSE_END=========================================================\r
  *\r
- * ECOMP and OpenECOMP are trademarks\r
- * and service marks of AT&T Intellectual Property.\r
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  */\r
 package org.openecomp.modelloader.entity;\r
 \r

diff --git a/src/main/java/org/openecomp/modelloader/entity/ArtifactType.java b/src/main/java/org/openecomp/modelloader/entity/ArtifactType.java
index 381733b..4ab7bd1 100644 (file)
--- a/src/main/java/org/openecomp/modelloader/entity/ArtifactType.java
+++ b/src/main/java/org/openecomp/modelloader/entity/ArtifactType.java
@@ -1,6 +1,6 @@
 /**
  * ============LICENSE_START=======================================================
- * Model Loader
+ * org.onap.aai
  * ================================================================================
  * Copyright © 2017 AT&T Intellectual Property.
  * Copyright © 2017 Amdocs
@@ -9,7 +9,9 @@
  * 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
+ *
+ *     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.
@@ -17,8 +19,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  *
- * ECOMP and OpenECOMP are trademarks
- * and service marks of AT&T Intellectual Property.
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
 package org.openecomp.modelloader.entity;
 

diff --git a/src/main/java/org/openecomp/modelloader/entity/catalog/VnfCatalogArtifact.java b/src/main/java/org/openecomp/modelloader/entity/catalog/VnfCatalogArtifact.java
index 9b4c587..79cff98 100644 (file)
--- a/src/main/java/org/openecomp/modelloader/entity/catalog/VnfCatalogArtifact.java
+++ b/src/main/java/org/openecomp/modelloader/entity/catalog/VnfCatalogArtifact.java
@@ -1,6 +1,6 @@
 /**
  * ============LICENSE_START=======================================================
- * Model Loader
+ * org.onap.aai
  * ================================================================================
  * Copyright © 2017 AT&T Intellectual Property.
  * Copyright © 2017 Amdocs
@@ -9,7 +9,9 @@
  * 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
+ *
+ *     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.
@@ -17,8 +19,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  *
- * ECOMP and OpenECOMP are trademarks
- * and service marks of AT&T Intellectual Property.
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
 package org.openecomp.modelloader.entity.catalog;
 

diff --git a/src/main/java/org/openecomp/modelloader/entity/catalog/VnfCatalogArtifactHandler.java b/src/main/java/org/openecomp/modelloader/entity/catalog/VnfCatalogArtifactHandler.java
index 5c526a6..d96f25b 100644 (file)
--- a/src/main/java/org/openecomp/modelloader/entity/catalog/VnfCatalogArtifactHandler.java
+++ b/src/main/java/org/openecomp/modelloader/entity/catalog/VnfCatalogArtifactHandler.java
@@ -1,6 +1,6 @@
 /**\r
  * ============LICENSE_START=======================================================\r
- * Model Loader\r
+ * org.onap.aai\r
  * ================================================================================\r
  * Copyright © 2017 AT&T Intellectual Property.\r
  * Copyright © 2017 Amdocs\r
@@ -9,7 +9,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");\r
  * you may not use this file except in compliance with the License.\r
  * You may obtain a copy of the License at\r
- * http://www.apache.org/licenses/LICENSE-2.0\r
+ *\r
+ *     http://www.apache.org/licenses/LICENSE-2.0\r
+ *\r
  * Unless required by applicable law or agreed to in writing, software\r
  * distributed under the License is distributed on an "AS IS" BASIS,\r
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
@@ -17,8 +19,7 @@
  * limitations under the License.\r
  * ============LICENSE_END=========================================================\r
  *\r
- * ECOMP and OpenECOMP are trademarks\r
- * and service marks of AT&T Intellectual Property.\r
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  */\r
 package org.openecomp.modelloader.entity.catalog;\r
 \r

diff --git a/src/main/java/org/openecomp/modelloader/entity/model/AbstractModelArtifact.java b/src/main/java/org/openecomp/modelloader/entity/model/AbstractModelArtifact.java
index 2add53e..2738457 100644 (file)
--- a/src/main/java/org/openecomp/modelloader/entity/model/AbstractModelArtifact.java
+++ b/src/main/java/org/openecomp/modelloader/entity/model/AbstractModelArtifact.java
@@ -1,6 +1,6 @@
 /**
  * ============LICENSE_START=======================================================
- * Model Loader
+ * org.onap.aai
  * ================================================================================
  * Copyright © 2017 AT&T Intellectual Property.
  * Copyright © 2017 Amdocs
@@ -9,7 +9,9 @@
  * 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
+ *
+ *     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.
@@ -17,8 +19,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  *
- * ECOMP and OpenECOMP are trademarks
- * and service marks of AT&T Intellectual Property.
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
 package org.openecomp.modelloader.entity.model;
 

diff --git a/src/main/java/org/openecomp/modelloader/entity/model/IModelParser.java b/src/main/java/org/openecomp/modelloader/entity/model/IModelParser.java
index 3a31756..ac97f34 100644 (file)
--- a/src/main/java/org/openecomp/modelloader/entity/model/IModelParser.java
+++ b/src/main/java/org/openecomp/modelloader/entity/model/IModelParser.java
@@ -1,6 +1,6 @@
 /**
  * ============LICENSE_START=======================================================
- * Model Loader
+ * org.onap.aai
  * ================================================================================
  * Copyright © 2017 AT&T Intellectual Property.
  * Copyright © 2017 Amdocs
@@ -9,7 +9,9 @@
  * 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
+ *
+ *     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.
@@ -17,8 +19,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  *
- * ECOMP and OpenECOMP are trademarks
- * and service marks of AT&T Intellectual Property.
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
 package org.openecomp.modelloader.entity.model;
 

diff --git a/src/main/java/org/openecomp/modelloader/entity/model/ModelArtifact.java b/src/main/java/org/openecomp/modelloader/entity/model/ModelArtifact.java
index f316e28..369b09e 100644 (file)
--- a/src/main/java/org/openecomp/modelloader/entity/model/ModelArtifact.java
+++ b/src/main/java/org/openecomp/modelloader/entity/model/ModelArtifact.java
@@ -1,6 +1,6 @@
 /**
  * ============LICENSE_START=======================================================
- * Model Loader
+ * org.onap.aai
  * ================================================================================
  * Copyright © 2017 AT&T Intellectual Property.
  * Copyright © 2017 Amdocs
@@ -9,7 +9,9 @@
  * 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
+ *
+ *     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.
@@ -17,8 +19,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  *
- * ECOMP and OpenECOMP are trademarks
- * and service marks of AT&T Intellectual Property.
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
 package org.openecomp.modelloader.entity.model;
 

diff --git a/src/main/java/org/openecomp/modelloader/entity/model/ModelArtifactHandler.java b/src/main/java/org/openecomp/modelloader/entity/model/ModelArtifactHandler.java
index 13ef1b1..e4e1dd0 100644 (file)
--- a/src/main/java/org/openecomp/modelloader/entity/model/ModelArtifactHandler.java
+++ b/src/main/java/org/openecomp/modelloader/entity/model/ModelArtifactHandler.java
@@ -1,6 +1,6 @@
 /**
  * ============LICENSE_START=======================================================
- * Model Loader
+ * org.onap.aai
  * ================================================================================
  * Copyright © 2017 AT&T Intellectual Property.
  * Copyright © 2017 Amdocs
@@ -9,7 +9,9 @@
  * 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
+ *
+ *     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.
@@ -17,8 +19,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  *
- * ECOMP and OpenECOMP are trademarks
- * and service marks of AT&T Intellectual Property.
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
 package org.openecomp.modelloader.entity.model;
 

diff --git a/src/main/java/org/openecomp/modelloader/entity/model/ModelArtifactParser.java b/src/main/java/org/openecomp/modelloader/entity/model/ModelArtifactParser.java
index d81539c..779b135 100644 (file)
--- a/src/main/java/org/openecomp/modelloader/entity/model/ModelArtifactParser.java
+++ b/src/main/java/org/openecomp/modelloader/entity/model/ModelArtifactParser.java
@@ -1,6 +1,6 @@
 /**
  * ============LICENSE_START=======================================================
- * Model Loader
+ * org.onap.aai
  * ================================================================================
  * Copyright © 2017 AT&T Intellectual Property.
  * Copyright © 2017 Amdocs
@@ -9,7 +9,9 @@
  * 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
+ *
+ *     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.
@@ -17,8 +19,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  *
- * ECOMP and OpenECOMP are trademarks
- * and service marks of AT&T Intellectual Property.
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
 package org.openecomp.modelloader.entity.model;
 

diff --git a/src/main/java/org/openecomp/modelloader/entity/model/ModelParserFactory.java b/src/main/java/org/openecomp/modelloader/entity/model/ModelParserFactory.java
index aa3283f..ab1ceab 100644 (file)
--- a/src/main/java/org/openecomp/modelloader/entity/model/ModelParserFactory.java
+++ b/src/main/java/org/openecomp/modelloader/entity/model/ModelParserFactory.java
@@ -1,6 +1,6 @@
 /**
  * ============LICENSE_START=======================================================
- * Model Loader
+ * org.onap.aai
  * ================================================================================
  * Copyright © 2017 AT&T Intellectual Property.
  * Copyright © 2017 Amdocs
@@ -9,7 +9,9 @@
  * 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
+ *
+ *     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.
@@ -17,8 +19,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  *
- * ECOMP and OpenECOMP are trademarks
- * and service marks of AT&T Intellectual Property.
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
 package org.openecomp.modelloader.entity.model;
 

diff --git a/src/main/java/org/openecomp/modelloader/entity/model/ModelSorter.java b/src/main/java/org/openecomp/modelloader/entity/model/ModelSorter.java
index 274b18f..0a1090e 100644 (file)
--- a/src/main/java/org/openecomp/modelloader/entity/model/ModelSorter.java
+++ b/src/main/java/org/openecomp/modelloader/entity/model/ModelSorter.java
@@ -1,6 +1,6 @@
 /**
  * ============LICENSE_START=======================================================
- * Model Loader
+ * org.onap.aai
  * ================================================================================
  * Copyright © 2017 AT&T Intellectual Property.
  * Copyright © 2017 Amdocs
@@ -9,7 +9,9 @@
  * 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
+ *
+ *     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.
@@ -17,8 +19,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  *
- * ECOMP and OpenECOMP are trademarks
- * and service marks of AT&T Intellectual Property.
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
 package org.openecomp.modelloader.entity.model;
 

diff --git a/src/main/java/org/openecomp/modelloader/entity/model/ModelV8Artifact.java b/src/main/java/org/openecomp/modelloader/entity/model/ModelV8Artifact.java
index 847f880..ba7e661 100644 (file)
--- a/src/main/java/org/openecomp/modelloader/entity/model/ModelV8Artifact.java
+++ b/src/main/java/org/openecomp/modelloader/entity/model/ModelV8Artifact.java
@@ -1,6 +1,6 @@
 /**
  * ============LICENSE_START=======================================================
- * Model Loader
+ * org.onap.aai
  * ================================================================================
  * Copyright © 2017 AT&T Intellectual Property.
  * Copyright © 2017 Amdocs
@@ -9,7 +9,9 @@
  * 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
+ *
+ *     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.
@@ -17,8 +19,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  *
- * ECOMP and OpenECOMP are trademarks
- * and service marks of AT&T Intellectual Property.
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
 package org.openecomp.modelloader.entity.model;
 

diff --git a/src/main/java/org/openecomp/modelloader/entity/model/ModelV8ArtifactParser.java b/src/main/java/org/openecomp/modelloader/entity/model/ModelV8ArtifactParser.java
index f5ecb2b..a6b3d23 100644 (file)
--- a/src/main/java/org/openecomp/modelloader/entity/model/ModelV8ArtifactParser.java
+++ b/src/main/java/org/openecomp/modelloader/entity/model/ModelV8ArtifactParser.java
@@ -1,6 +1,6 @@
 /**
  * ============LICENSE_START=======================================================
- * Model Loader
+ * org.onap.aai
  * ================================================================================
  * Copyright © 2017 AT&T Intellectual Property.
  * Copyright © 2017 Amdocs
@@ -9,7 +9,9 @@
  * 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
+ *
+ *     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.
@@ -17,8 +19,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  *
- * ECOMP and OpenECOMP are trademarks
- * and service marks of AT&T Intellectual Property.
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
 package org.openecomp.modelloader.entity.model;
 

diff --git a/src/main/java/org/openecomp/modelloader/entity/model/NamedQueryArtifact.java b/src/main/java/org/openecomp/modelloader/entity/model/NamedQueryArtifact.java
index 1a4ceaa..a5f4ef4 100644 (file)
--- a/src/main/java/org/openecomp/modelloader/entity/model/NamedQueryArtifact.java
+++ b/src/main/java/org/openecomp/modelloader/entity/model/NamedQueryArtifact.java
@@ -1,6 +1,6 @@
 /**
  * ============LICENSE_START=======================================================
- * Model Loader
+ * org.onap.aai
  * ================================================================================
  * Copyright © 2017 AT&T Intellectual Property.
  * Copyright © 2017 Amdocs
@@ -9,7 +9,9 @@
  * 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
+ *
+ *     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.
@@ -17,8 +19,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  *
- * ECOMP and OpenECOMP are trademarks
- * and service marks of AT&T Intellectual Property.
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
 package org.openecomp.modelloader.entity.model;
 

diff --git a/src/main/java/org/openecomp/modelloader/entity/model/NamedQueryArtifactParser.java b/src/main/java/org/openecomp/modelloader/entity/model/NamedQueryArtifactParser.java
index 3643f18..9e4507d 100644 (file)
--- a/src/main/java/org/openecomp/modelloader/entity/model/NamedQueryArtifactParser.java
+++ b/src/main/java/org/openecomp/modelloader/entity/model/NamedQueryArtifactParser.java
@@ -1,6 +1,6 @@
 /**
  * ============LICENSE_START=======================================================
- * Model Loader
+ * org.onap.aai
  * ================================================================================
  * Copyright © 2017 AT&T Intellectual Property.
  * Copyright © 2017 Amdocs
@@ -9,7 +9,9 @@
  * 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
+ *
+ *     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.
@@ -17,8 +19,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  *
- * ECOMP and OpenECOMP are trademarks
- * and service marks of AT&T Intellectual Property.
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
 package org.openecomp.modelloader.entity.model;
 

diff --git a/src/main/java/org/openecomp/modelloader/notification/DistributionStatusMsg.java b/src/main/java/org/openecomp/modelloader/notification/DistributionStatusMsg.java
index 0ef2a42..c0305c0 100644 (file)
--- a/src/main/java/org/openecomp/modelloader/notification/DistributionStatusMsg.java
+++ b/src/main/java/org/openecomp/modelloader/notification/DistributionStatusMsg.java
@@ -1,6 +1,6 @@
 /**\r
  * ============LICENSE_START=======================================================\r
- * Model Loader\r
+ * org.onap.aai\r
  * ================================================================================\r
  * Copyright © 2017 AT&T Intellectual Property.\r
  * Copyright © 2017 Amdocs\r
@@ -9,7 +9,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");\r
  * you may not use this file except in compliance with the License.\r
  * You may obtain a copy of the License at\r
- * http://www.apache.org/licenses/LICENSE-2.0\r
+ *\r
+ *     http://www.apache.org/licenses/LICENSE-2.0\r
+ *\r
  * Unless required by applicable law or agreed to in writing, software\r
  * distributed under the License is distributed on an "AS IS" BASIS,\r
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
@@ -17,8 +19,7 @@
  * limitations under the License.\r
  * ============LICENSE_END=========================================================\r
  *\r
- * ECOMP and OpenECOMP are trademarks\r
- * and service marks of AT&T Intellectual Property.\r
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  */\r
 package org.openecomp.modelloader.notification;\r
 \r

diff --git a/src/main/java/org/openecomp/modelloader/notification/EventCallback.java b/src/main/java/org/openecomp/modelloader/notification/EventCallback.java
index 059964e..c75dc94 100644 (file)
--- a/src/main/java/org/openecomp/modelloader/notification/EventCallback.java
+++ b/src/main/java/org/openecomp/modelloader/notification/EventCallback.java
@@ -1,6 +1,6 @@
 /**
  * ============LICENSE_START=======================================================
- * Model Loader
+ * org.onap.aai
  * ================================================================================
  * Copyright © 2017 AT&T Intellectual Property.
  * Copyright © 2017 Amdocs
@@ -9,7 +9,9 @@
  * 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
+ *
+ *     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.
@@ -17,8 +19,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  *
- * ECOMP and OpenECOMP are trademarks
- * and service marks of AT&T Intellectual Property.
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
 package org.openecomp.modelloader.notification;
 

diff --git a/src/main/java/org/openecomp/modelloader/restclient/AaiRestClient.java b/src/main/java/org/openecomp/modelloader/restclient/AaiRestClient.java
index 4d5e487..a642ec6 100644 (file)
--- a/src/main/java/org/openecomp/modelloader/restclient/AaiRestClient.java
+++ b/src/main/java/org/openecomp/modelloader/restclient/AaiRestClient.java
@@ -1,6 +1,6 @@
 /**
  * ============LICENSE_START=======================================================
- * Model Loader
+ * org.onap.aai
  * ================================================================================
  * Copyright © 2017 AT&T Intellectual Property.
  * Copyright © 2017 Amdocs
@@ -9,7 +9,9 @@
  * 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
+ *
+ *     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.
@@ -17,8 +19,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  *
- * ECOMP and OpenECOMP are trademarks
- * and service marks of AT&T Intellectual Property.
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
 package org.openecomp.modelloader.restclient;
 

diff --git a/src/main/java/org/openecomp/modelloader/service/ModelLoaderInterface.java b/src/main/java/org/openecomp/modelloader/service/ModelLoaderInterface.java
index 99c5735..c5ead66 100644 (file)
--- a/src/main/java/org/openecomp/modelloader/service/ModelLoaderInterface.java
+++ b/src/main/java/org/openecomp/modelloader/service/ModelLoaderInterface.java
@@ -1,6 +1,6 @@
 /**\r
  * ============LICENSE_START=======================================================\r
- * Model Loader\r
+ * org.onap.aai\r
  * ================================================================================\r
  * Copyright © 2017 AT&T Intellectual Property.\r
  * Copyright © 2017 Amdocs\r
@@ -9,7 +9,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");\r
  * you may not use this file except in compliance with the License.\r
  * You may obtain a copy of the License at\r
- * http://www.apache.org/licenses/LICENSE-2.0\r
+ *\r
+ *     http://www.apache.org/licenses/LICENSE-2.0\r
+ *\r
  * Unless required by applicable law or agreed to in writing, software\r
  * distributed under the License is distributed on an "AS IS" BASIS,\r
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
@@ -17,8 +19,7 @@
  * limitations under the License.\r
  * ============LICENSE_END=========================================================\r
  *\r
- * ECOMP and OpenECOMP are trademarks\r
- * and service marks of AT&T Intellectual Property.\r
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  */\r
 package org.openecomp.modelloader.service;\r
 \r

diff --git a/src/main/java/org/openecomp/modelloader/service/ModelLoaderMsgs.java b/src/main/java/org/openecomp/modelloader/service/ModelLoaderMsgs.java
index 2d3137b..b66e5eb 100644 (file)
--- a/src/main/java/org/openecomp/modelloader/service/ModelLoaderMsgs.java
+++ b/src/main/java/org/openecomp/modelloader/service/ModelLoaderMsgs.java
@@ -1,6 +1,6 @@
 /**\r
  * ============LICENSE_START=======================================================\r
- * Model Loader\r
+ * org.onap.aai\r
  * ================================================================================\r
  * Copyright © 2017 AT&T Intellectual Property.\r
  * Copyright © 2017 Amdocs\r
@@ -9,7 +9,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");\r
  * you may not use this file except in compliance with the License.\r
  * You may obtain a copy of the License at\r
- * http://www.apache.org/licenses/LICENSE-2.0\r
+ *\r
+ *     http://www.apache.org/licenses/LICENSE-2.0\r
+ *\r
  * Unless required by applicable law or agreed to in writing, software\r
  * distributed under the License is distributed on an "AS IS" BASIS,\r
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
@@ -17,8 +19,7 @@
  * limitations under the License.\r
  * ============LICENSE_END=========================================================\r
  *\r
- * ECOMP and OpenECOMP are trademarks\r
- * and service marks of AT&T Intellectual Property.\r
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  */\r
 package org.openecomp.modelloader.service;\r
 \r

diff --git a/src/main/java/org/openecomp/modelloader/service/ModelLoaderService.java b/src/main/java/org/openecomp/modelloader/service/ModelLoaderService.java
index 786f1a2..d500f26 100644 (file)
--- a/src/main/java/org/openecomp/modelloader/service/ModelLoaderService.java
+++ b/src/main/java/org/openecomp/modelloader/service/ModelLoaderService.java
@@ -1,6 +1,6 @@
 /**
  * ============LICENSE_START=======================================================
- * Model Loader
+ * org.onap.aai
  * ================================================================================
  * Copyright © 2017 AT&T Intellectual Property.
  * Copyright © 2017 Amdocs
@@ -9,7 +9,9 @@
  * 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
+ *
+ *     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.
@@ -17,8 +19,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  *
- * ECOMP and OpenECOMP are trademarks
- * and service marks of AT&T Intellectual Property.
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
 package org.openecomp.modelloader.service;
 

diff --git a/src/main/java/org/openecomp/modelloader/service/SdcConnectionJob.java b/src/main/java/org/openecomp/modelloader/service/SdcConnectionJob.java
index bb3741c..ffc1352 100644 (file)
--- a/src/main/java/org/openecomp/modelloader/service/SdcConnectionJob.java
+++ b/src/main/java/org/openecomp/modelloader/service/SdcConnectionJob.java
@@ -1,6 +1,6 @@
 /**
  * ============LICENSE_START=======================================================
- * Model Loader
+ * org.onap.aai
  * ================================================================================
  * Copyright © 2017 AT&T Intellectual Property.
  * Copyright © 2017 Amdocs
@@ -9,7 +9,9 @@
  * 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
+ *
+ *     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.
@@ -17,8 +19,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  *
- * ECOMP and OpenECOMP are trademarks
- * and service marks of AT&T Intellectual Property.
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
 package org.openecomp.modelloader.service;
 

diff --git a/src/main/java/org/openecomp/modelloader/util/JsonXmlConverter.java b/src/main/java/org/openecomp/modelloader/util/JsonXmlConverter.java
index 621f704..25a19c2 100644 (file)
--- a/src/main/java/org/openecomp/modelloader/util/JsonXmlConverter.java
+++ b/src/main/java/org/openecomp/modelloader/util/JsonXmlConverter.java
@@ -1,6 +1,6 @@
 /**\r
  * ============LICENSE_START=======================================================\r
- * Model Loader\r
+ * org.onap.aai\r
  * ================================================================================\r
  * Copyright © 2017 AT&T Intellectual Property.\r
  * Copyright © 2017 Amdocs\r
@@ -9,7 +9,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");\r
  * you may not use this file except in compliance with the License.\r
  * You may obtain a copy of the License at\r
- * http://www.apache.org/licenses/LICENSE-2.0\r
+ *\r
+ *     http://www.apache.org/licenses/LICENSE-2.0\r
+ *\r
  * Unless required by applicable law or agreed to in writing, software\r
  * distributed under the License is distributed on an "AS IS" BASIS,\r
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
@@ -17,8 +19,7 @@
  * limitations under the License.\r
  * ============LICENSE_END=========================================================\r
  *\r
- * ECOMP and OpenECOMP are trademarks\r
- * and service marks of AT&T Intellectual Property.\r
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  */\r
 package org.openecomp.modelloader.util;\r
 \r

diff --git a/src/test/java/org/openecomp/modelloader/config/ModelLoaderConfigTest.java b/src/test/java/org/openecomp/modelloader/config/ModelLoaderConfigTest.java
index 2c895b8..54ce0d5 100644 (file)
--- a/src/test/java/org/openecomp/modelloader/config/ModelLoaderConfigTest.java
+++ b/src/test/java/org/openecomp/modelloader/config/ModelLoaderConfigTest.java
@@ -1,6 +1,6 @@
 /**
  * ============LICENSE_START=======================================================
- * Model Loader
+ * org.onap.aai
  * ================================================================================
  * Copyright © 2017 AT&T Intellectual Property.
  * Copyright © 2017 Amdocs
@@ -9,7 +9,9 @@
  * 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
+ *
+ *     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.
@@ -17,8 +19,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  *
- * ECOMP and OpenECOMP are trademarks
- * and service marks of AT&T Intellectual Property.
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
 package org.openecomp.modelloader.config;
 

diff --git a/src/test/java/org/openecomp/modelloader/entity/catalog/VnfCatalogArtifactHandlerTest.java b/src/test/java/org/openecomp/modelloader/entity/catalog/VnfCatalogArtifactHandlerTest.java
index c81b51d..a6e1b96 100644 (file)
--- a/src/test/java/org/openecomp/modelloader/entity/catalog/VnfCatalogArtifactHandlerTest.java
+++ b/src/test/java/org/openecomp/modelloader/entity/catalog/VnfCatalogArtifactHandlerTest.java
@@ -1,6 +1,6 @@
 /**\r
  * ============LICENSE_START=======================================================\r
- * Model Loader\r
+ * org.onap.aai\r
  * ================================================================================\r
  * Copyright © 2017 AT&T Intellectual Property.\r
  * Copyright © 2017 Amdocs\r
@@ -9,7 +9,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");\r
  * you may not use this file except in compliance with the License.\r
  * You may obtain a copy of the License at\r
- * http://www.apache.org/licenses/LICENSE-2.0\r
+ *\r
+ *     http://www.apache.org/licenses/LICENSE-2.0\r
+ *\r
  * Unless required by applicable law or agreed to in writing, software\r
  * distributed under the License is distributed on an "AS IS" BASIS,\r
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
@@ -17,8 +19,7 @@
  * limitations under the License.\r
  * ============LICENSE_END=========================================================\r
  *\r
- * ECOMP and OpenECOMP are trademarks\r
- * and service marks of AT&T Intellectual Property.\r
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  */\r
 package org.openecomp.modelloader.entity.catalog;\r
 \r

diff --git a/src/test/java/org/openecomp/modelloader/entity/model/ModelArtifactParserTest.java b/src/test/java/org/openecomp/modelloader/entity/model/ModelArtifactParserTest.java
index ac32f58..040d5a0 100644 (file)
--- a/src/test/java/org/openecomp/modelloader/entity/model/ModelArtifactParserTest.java
+++ b/src/test/java/org/openecomp/modelloader/entity/model/ModelArtifactParserTest.java
@@ -1,6 +1,6 @@
 /**
  * ============LICENSE_START=======================================================
- * Model Loader
+ * org.onap.aai
  * ================================================================================
  * Copyright © 2017 AT&T Intellectual Property.
  * Copyright © 2017 Amdocs
@@ -9,7 +9,9 @@
  * 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
+ *
+ *     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.
@@ -17,8 +19,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  *
- * ECOMP and OpenECOMP are trademarks
- * and service marks of AT&T Intellectual Property.
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
 package org.openecomp.modelloader.entity.model;
 

diff --git a/src/test/java/org/openecomp/modelloader/entity/model/ModelParserFactoryTest.java b/src/test/java/org/openecomp/modelloader/entity/model/ModelParserFactoryTest.java
index 46db11a..2b4faff 100644 (file)
--- a/src/test/java/org/openecomp/modelloader/entity/model/ModelParserFactoryTest.java
+++ b/src/test/java/org/openecomp/modelloader/entity/model/ModelParserFactoryTest.java
@@ -1,6 +1,6 @@
 /**
  * ============LICENSE_START=======================================================
- * Model Loader
+ * org.onap.aai
  * ================================================================================
  * Copyright © 2017 AT&T Intellectual Property.
  * Copyright © 2017 Amdocs
@@ -9,7 +9,9 @@
  * 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
+ *
+ *     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.
@@ -17,8 +19,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  *
- * ECOMP and OpenECOMP are trademarks
- * and service marks of AT&T Intellectual Property.
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
 package org.openecomp.modelloader.entity.model;
 

diff --git a/src/test/java/org/openecomp/modelloader/entity/model/ModelSorterTest.java b/src/test/java/org/openecomp/modelloader/entity/model/ModelSorterTest.java
index fdc81da..27cdfc9 100644 (file)
--- a/src/test/java/org/openecomp/modelloader/entity/model/ModelSorterTest.java
+++ b/src/test/java/org/openecomp/modelloader/entity/model/ModelSorterTest.java
@@ -1,6 +1,6 @@
 /**
  * ============LICENSE_START=======================================================
- * Model Loader
+ * org.onap.aai
  * ================================================================================
  * Copyright © 2017 AT&T Intellectual Property.
  * Copyright © 2017 Amdocs
@@ -9,7 +9,9 @@
  * 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
+ *
+ *     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.
@@ -17,8 +19,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  *
- * ECOMP and OpenECOMP are trademarks
- * and service marks of AT&T Intellectual Property.
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
 package org.openecomp.modelloader.entity.model;
 

diff --git a/src/test/java/org/openecomp/modelloader/entity/model/ModelV8ArtifactParserTest.java b/src/test/java/org/openecomp/modelloader/entity/model/ModelV8ArtifactParserTest.java
index 098bc8c..17772a7 100644 (file)
--- a/src/test/java/org/openecomp/modelloader/entity/model/ModelV8ArtifactParserTest.java
+++ b/src/test/java/org/openecomp/modelloader/entity/model/ModelV8ArtifactParserTest.java
@@ -1,6 +1,6 @@
 /**
  * ============LICENSE_START=======================================================
- * Model Loader
+ * org.onap.aai
  * ================================================================================
  * Copyright © 2017 AT&T Intellectual Property.
  * Copyright © 2017 Amdocs
@@ -9,7 +9,9 @@
  * 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
+ *
+ *     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.
@@ -17,8 +19,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  *
- * ECOMP and OpenECOMP are trademarks
- * and service marks of AT&T Intellectual Property.
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
 package org.openecomp.modelloader.entity.model;
 

diff --git a/src/test/java/org/openecomp/modelloader/entity/model/NamedQueryArtifactParserTest.java b/src/test/java/org/openecomp/modelloader/entity/model/NamedQueryArtifactParserTest.java
index cc9d615..69ac855 100644 (file)
--- a/src/test/java/org/openecomp/modelloader/entity/model/NamedQueryArtifactParserTest.java
+++ b/src/test/java/org/openecomp/modelloader/entity/model/NamedQueryArtifactParserTest.java
@@ -1,6 +1,6 @@
 /**
  * ============LICENSE_START=======================================================
- * Model Loader
+ * org.onap.aai
  * ================================================================================
  * Copyright © 2017 AT&T Intellectual Property.
  * Copyright © 2017 Amdocs
@@ -9,7 +9,9 @@
  * 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
+ *
+ *     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.
@@ -17,8 +19,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  *
- * ECOMP and OpenECOMP are trademarks
- * and service marks of AT&T Intellectual Property.
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
 package org.openecomp.modelloader.entity.model;
 

diff --git a/src/test/java/org/openecomp/modelloader/restclient/AaiRestClientTest.java b/src/test/java/org/openecomp/modelloader/restclient/AaiRestClientTest.java
index 08a429a..8f9931c 100644 (file)
--- a/src/test/java/org/openecomp/modelloader/restclient/AaiRestClientTest.java
+++ b/src/test/java/org/openecomp/modelloader/restclient/AaiRestClientTest.java
@@ -1,6 +1,6 @@
 /**
  * ============LICENSE_START=======================================================
- * Model Loader
+ * org.onap.aai
  * ================================================================================
  * Copyright © 2017 AT&T Intellectual Property.
  * Copyright © 2017 Amdocs
@@ -9,7 +9,9 @@
  * 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
+ *
+ *     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.
@@ -17,8 +19,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  *
- * ECOMP and OpenECOMP are trademarks
- * and service marks of AT&T Intellectual Property.
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
 package org.openecomp.modelloader.restclient;
 

diff --git a/src/test/java/org/openecomp/modelloader/util/JsonXmlConverterTest.java b/src/test/java/org/openecomp/modelloader/util/JsonXmlConverterTest.java
index da89c78..fc8a80a 100644 (file)
--- a/src/test/java/org/openecomp/modelloader/util/JsonXmlConverterTest.java
+++ b/src/test/java/org/openecomp/modelloader/util/JsonXmlConverterTest.java
@@ -1,6 +1,6 @@
 /**\r
  * ============LICENSE_START=======================================================\r
- * Model Loader\r
+ * org.onap.aai\r
  * ================================================================================\r
  * Copyright © 2017 AT&T Intellectual Property.\r
  * Copyright © 2017 Amdocs\r
@@ -9,7 +9,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");\r
  * you may not use this file except in compliance with the License.\r
  * You may obtain a copy of the License at\r
- * http://www.apache.org/licenses/LICENSE-2.0\r
+ *\r
+ *     http://www.apache.org/licenses/LICENSE-2.0\r
+ *\r
  * Unless required by applicable law or agreed to in writing, software\r
  * distributed under the License is distributed on an "AS IS" BASIS,\r
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
@@ -17,8 +19,7 @@
  * limitations under the License.\r
  * ============LICENSE_END=========================================================\r
  *\r
- * ECOMP and OpenECOMP are trademarks\r
- * and service marks of AT&T Intellectual Property.\r
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  */\r
 package org.openecomp.modelloader.util;\r
 \r