Fixing typo in utilities module name

Change-Id: I7bae55aa9c9064fc4aea32bacba3baee196c10a0
Issue-ID: POLICY-855
Signed-off-by: waqas.ikram <waqas.ikram@ericsson.com>

diff --git a/LICENSE.txt b/LICENSE.txt
index 1f105e3..e92ae50 100644 (file)
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,4 +1,4 @@
-Copyright © 2018 AT&T Intellectual Property. All rights reserved.
+Copyright (C) 2016-2018 Ericsson. All rights reserved.
 
 Licensed under the Apache License, Version 2.0 (the "License"); you may
 not use this file except in compliance with the License.

diff --git a/README.md b/README.md
index 2ce6f6c..155fb9c 100644 (file)
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-Copyright 2018 AT&T Intellectual Property. All rights reserved.
+Copyright (C) 2016-2018 Ericsson. All rights reserved.
 This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
 Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
 

diff --git a/model/basic-model/pom.xml b/model/basic-model/pom.xml
index df25dcb..a536af5 100644 (file)
--- a/model/basic-model/pom.xml
+++ b/model/basic-model/pom.xml
@@ -35,7 +35,7 @@
     <dependencies>
         <dependency>
             <groupId>org.onap.policy.apex.apex-pdp.model</groupId>
-            <artifactId>utiliites</artifactId>
+            <artifactId>utilities</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>

diff --git a/model/pom.xml b/model/pom.xml
index 1345ca3..7afc8e5 100644 (file)
--- a/model/pom.xml
+++ b/model/pom.xml
@@ -34,7 +34,7 @@
     <description>The model for Apex, it comtains definitions of all Apex concepts and also has handling for Apex models.</description>
 
     <modules>
-        <module>utiliites</module>
+        <module>utilities</module>
         <module>basic-model</module>
     </modules>
 </project>
\ No newline at end of file

diff --git a/model/utiliites/pom.xml b/model/utilities/pom.xml
similarity index 97%
rename from model/utiliites/pom.xml
rename to model/utilities/pom.xml
index b956ebf..d23a7d9 100644 (file)
--- a/model/utiliites/pom.xml
+++ b/model/utilities/pom.xml
@@ -25,7 +25,7 @@
         <artifactId>model</artifactId>
         <version>2.0.0-SNAPSHOT</version>
     </parent>
-    <artifactId>utiliites</artifactId>
+    <artifactId>utilities</artifactId>
 
 
     <dependencies>

diff --git a/model/utiliites/src/main/antlr4/org/onap/policy/apex/model/utilities/typeutils/ParametrizedType.g4 b/model/utilities/src/main/antlr4/org/onap/policy/apex/model/utilities/typeutils/ParametrizedType.g4
similarity index 100%
rename from model/utiliites/src/main/antlr4/org/onap/policy/apex/model/utilities/typeutils/ParametrizedType.g4
rename to model/utilities/src/main/antlr4/org/onap/policy/apex/model/utilities/typeutils/ParametrizedType.g4

diff --git a/model/utiliites/src/main/java/org/onap/policy/apex/model/utilities/Assertions.java b/model/utilities/src/main/java/org/onap/policy/apex/model/utilities/Assertions.java
similarity index 100%
rename from model/utiliites/src/main/java/org/onap/policy/apex/model/utilities/Assertions.java
rename to model/utilities/src/main/java/org/onap/policy/apex/model/utilities/Assertions.java

diff --git a/model/utiliites/src/main/java/org/onap/policy/apex/model/utilities/CollectionUtils.java b/model/utilities/src/main/java/org/onap/policy/apex/model/utilities/CollectionUtils.java
similarity index 100%
rename from model/utiliites/src/main/java/org/onap/policy/apex/model/utilities/CollectionUtils.java
rename to model/utilities/src/main/java/org/onap/policy/apex/model/utilities/CollectionUtils.java

diff --git a/model/utiliites/src/main/java/org/onap/policy/apex/model/utilities/DirectoryUtils.java b/model/utilities/src/main/java/org/onap/policy/apex/model/utilities/DirectoryUtils.java
similarity index 100%
rename from model/utiliites/src/main/java/org/onap/policy/apex/model/utilities/DirectoryUtils.java
rename to model/utilities/src/main/java/org/onap/policy/apex/model/utilities/DirectoryUtils.java

diff --git a/model/utiliites/src/main/java/org/onap/policy/apex/model/utilities/PropertyUtils.java b/model/utilities/src/main/java/org/onap/policy/apex/model/utilities/PropertyUtils.java
similarity index 100%
rename from model/utiliites/src/main/java/org/onap/policy/apex/model/utilities/PropertyUtils.java
rename to model/utilities/src/main/java/org/onap/policy/apex/model/utilities/PropertyUtils.java

diff --git a/model/utiliites/src/main/java/org/onap/policy/apex/model/utilities/ResourceUtils.java b/model/utilities/src/main/java/org/onap/policy/apex/model/utilities/ResourceUtils.java
similarity index 100%
rename from model/utiliites/src/main/java/org/onap/policy/apex/model/utilities/ResourceUtils.java
rename to model/utilities/src/main/java/org/onap/policy/apex/model/utilities/ResourceUtils.java

diff --git a/model/utiliites/src/main/java/org/onap/policy/apex/model/utilities/TextFileUtils.java b/model/utilities/src/main/java/org/onap/policy/apex/model/utilities/TextFileUtils.java
similarity index 100%
rename from model/utiliites/src/main/java/org/onap/policy/apex/model/utilities/TextFileUtils.java
rename to model/utilities/src/main/java/org/onap/policy/apex/model/utilities/TextFileUtils.java

diff --git a/model/utiliites/src/main/java/org/onap/policy/apex/model/utilities/TreeMapUtils.java b/model/utilities/src/main/java/org/onap/policy/apex/model/utilities/TreeMapUtils.java
similarity index 100%
rename from model/utiliites/src/main/java/org/onap/policy/apex/model/utilities/TreeMapUtils.java
rename to model/utilities/src/main/java/org/onap/policy/apex/model/utilities/TreeMapUtils.java

diff --git a/model/utiliites/src/main/java/org/onap/policy/apex/model/utilities/comparison/KeyComparer.java b/model/utilities/src/main/java/org/onap/policy/apex/model/utilities/comparison/KeyComparer.java
similarity index 100%
rename from model/utiliites/src/main/java/org/onap/policy/apex/model/utilities/comparison/KeyComparer.java
rename to model/utilities/src/main/java/org/onap/policy/apex/model/utilities/comparison/KeyComparer.java

diff --git a/model/utiliites/src/main/java/org/onap/policy/apex/model/utilities/comparison/KeyDifference.java b/model/utilities/src/main/java/org/onap/policy/apex/model/utilities/comparison/KeyDifference.java
similarity index 100%
rename from model/utiliites/src/main/java/org/onap/policy/apex/model/utilities/comparison/KeyDifference.java
rename to model/utilities/src/main/java/org/onap/policy/apex/model/utilities/comparison/KeyDifference.java

diff --git a/model/utiliites/src/main/java/org/onap/policy/apex/model/utilities/comparison/KeyedMapComparer.java b/model/utilities/src/main/java/org/onap/policy/apex/model/utilities/comparison/KeyedMapComparer.java
similarity index 100%
rename from model/utiliites/src/main/java/org/onap/policy/apex/model/utilities/comparison/KeyedMapComparer.java
rename to model/utilities/src/main/java/org/onap/policy/apex/model/utilities/comparison/KeyedMapComparer.java

diff --git a/model/utiliites/src/main/java/org/onap/policy/apex/model/utilities/comparison/KeyedMapDifference.java b/model/utilities/src/main/java/org/onap/policy/apex/model/utilities/comparison/KeyedMapDifference.java
similarity index 100%
rename from model/utiliites/src/main/java/org/onap/policy/apex/model/utilities/comparison/KeyedMapDifference.java
rename to model/utilities/src/main/java/org/onap/policy/apex/model/utilities/comparison/KeyedMapDifference.java

diff --git a/model/utiliites/src/main/java/org/onap/policy/apex/model/utilities/comparison/package-info.java b/model/utilities/src/main/java/org/onap/policy/apex/model/utilities/comparison/package-info.java
similarity index 100%
rename from model/utiliites/src/main/java/org/onap/policy/apex/model/utilities/comparison/package-info.java
rename to model/utilities/src/main/java/org/onap/policy/apex/model/utilities/comparison/package-info.java

diff --git a/model/utiliites/src/main/java/org/onap/policy/apex/model/utilities/package-info.java b/model/utilities/src/main/java/org/onap/policy/apex/model/utilities/package-info.java
similarity index 100%
rename from model/utiliites/src/main/java/org/onap/policy/apex/model/utilities/package-info.java
rename to model/utilities/src/main/java/org/onap/policy/apex/model/utilities/package-info.java

diff --git a/model/utiliites/src/main/java/org/onap/policy/apex/model/utilities/typeutils/ClassBuilder.java b/model/utilities/src/main/java/org/onap/policy/apex/model/utilities/typeutils/ClassBuilder.java
similarity index 100%
rename from model/utiliites/src/main/java/org/onap/policy/apex/model/utilities/typeutils/ClassBuilder.java
rename to model/utilities/src/main/java/org/onap/policy/apex/model/utilities/typeutils/ClassBuilder.java

diff --git a/model/utiliites/src/main/java/org/onap/policy/apex/model/utilities/typeutils/TypeBuilder.java b/model/utilities/src/main/java/org/onap/policy/apex/model/utilities/typeutils/TypeBuilder.java
similarity index 100%
rename from model/utiliites/src/main/java/org/onap/policy/apex/model/utilities/typeutils/TypeBuilder.java
rename to model/utilities/src/main/java/org/onap/policy/apex/model/utilities/typeutils/TypeBuilder.java

diff --git a/model/utiliites/src/main/java/org/onap/policy/apex/model/utilities/typeutils/package-info.java b/model/utilities/src/main/java/org/onap/policy/apex/model/utilities/typeutils/package-info.java
similarity index 100%
rename from model/utiliites/src/main/java/org/onap/policy/apex/model/utilities/typeutils/package-info.java
rename to model/utilities/src/main/java/org/onap/policy/apex/model/utilities/typeutils/package-info.java

diff --git a/model/utiliites/src/test/java/org/onap/policy/apex/model/utilities/AssertionsTest.java b/model/utilities/src/test/java/org/onap/policy/apex/model/utilities/AssertionsTest.java
similarity index 100%
rename from model/utiliites/src/test/java/org/onap/policy/apex/model/utilities/AssertionsTest.java
rename to model/utilities/src/test/java/org/onap/policy/apex/model/utilities/AssertionsTest.java

diff --git a/model/utiliites/src/test/java/org/onap/policy/apex/model/utilities/CollectionUtilitiesTest.java b/model/utilities/src/test/java/org/onap/policy/apex/model/utilities/CollectionUtilitiesTest.java
similarity index 100%
rename from model/utiliites/src/test/java/org/onap/policy/apex/model/utilities/CollectionUtilitiesTest.java
rename to model/utilities/src/test/java/org/onap/policy/apex/model/utilities/CollectionUtilitiesTest.java

diff --git a/model/utiliites/src/test/java/org/onap/policy/apex/model/utilities/DirectoryUtilsTest.java b/model/utilities/src/test/java/org/onap/policy/apex/model/utilities/DirectoryUtilsTest.java
similarity index 100%
rename from model/utiliites/src/test/java/org/onap/policy/apex/model/utilities/DirectoryUtilsTest.java
rename to model/utilities/src/test/java/org/onap/policy/apex/model/utilities/DirectoryUtilsTest.java

diff --git a/model/utiliites/src/test/java/org/onap/policy/apex/model/utilities/PropertyUtilsTest.java b/model/utilities/src/test/java/org/onap/policy/apex/model/utilities/PropertyUtilsTest.java
similarity index 100%
rename from model/utiliites/src/test/java/org/onap/policy/apex/model/utilities/PropertyUtilsTest.java
rename to model/utilities/src/test/java/org/onap/policy/apex/model/utilities/PropertyUtilsTest.java

diff --git a/model/utiliites/src/test/java/org/onap/policy/apex/model/utilities/ResourceUtilsTest.java b/model/utilities/src/test/java/org/onap/policy/apex/model/utilities/ResourceUtilsTest.java
similarity index 100%
rename from model/utiliites/src/test/java/org/onap/policy/apex/model/utilities/ResourceUtilsTest.java
rename to model/utilities/src/test/java/org/onap/policy/apex/model/utilities/ResourceUtilsTest.java

diff --git a/model/utiliites/src/test/java/org/onap/policy/apex/model/utilities/TextFileUtilsTest.java b/model/utilities/src/test/java/org/onap/policy/apex/model/utilities/TextFileUtilsTest.java
similarity index 100%
rename from model/utiliites/src/test/java/org/onap/policy/apex/model/utilities/TextFileUtilsTest.java
rename to model/utilities/src/test/java/org/onap/policy/apex/model/utilities/TextFileUtilsTest.java

diff --git a/model/utiliites/src/test/java/org/onap/policy/apex/model/utilities/TreeMapUtilsTest.java b/model/utilities/src/test/java/org/onap/policy/apex/model/utilities/TreeMapUtilsTest.java
similarity index 100%
rename from model/utiliites/src/test/java/org/onap/policy/apex/model/utilities/TreeMapUtilsTest.java
rename to model/utilities/src/test/java/org/onap/policy/apex/model/utilities/TreeMapUtilsTest.java

diff --git a/model/utiliites/src/test/java/org/onap/policy/apex/model/utilities/typeutils/ParserTest.java b/model/utilities/src/test/java/org/onap/policy/apex/model/utilities/typeutils/ParserTest.java
similarity index 100%
rename from model/utiliites/src/test/java/org/onap/policy/apex/model/utilities/typeutils/ParserTest.java
rename to model/utilities/src/test/java/org/onap/policy/apex/model/utilities/typeutils/ParserTest.java

diff --git a/model/utiliites/src/test/java/org/onap/policy/apex/model/utilities/typeutils/TestKeyComparer.java b/model/utilities/src/test/java/org/onap/policy/apex/model/utilities/typeutils/TestKeyComparer.java
similarity index 100%
rename from model/utiliites/src/test/java/org/onap/policy/apex/model/utilities/typeutils/TestKeyComparer.java
rename to model/utilities/src/test/java/org/onap/policy/apex/model/utilities/typeutils/TestKeyComparer.java

diff --git a/model/utiliites/src/test/java/org/onap/policy/apex/model/utilities/typeutils/TestKeyedMapComparer.java b/model/utilities/src/test/java/org/onap/policy/apex/model/utilities/typeutils/TestKeyedMapComparer.java
similarity index 100%
rename from model/utiliites/src/test/java/org/onap/policy/apex/model/utilities/typeutils/TestKeyedMapComparer.java
rename to model/utilities/src/test/java/org/onap/policy/apex/model/utilities/typeutils/TestKeyedMapComparer.java

diff --git a/model/utiliites/src/test/resources/testdir/testfile.xml b/model/utilities/src/test/resources/testdir/testfile.xml
similarity index 100%
rename from model/utiliites/src/test/resources/testdir/testfile.xml
rename to model/utilities/src/test/resources/testdir/testfile.xml