Update project structure to org.onap.aaf 63/8563/1
authorsg481n <sg481n@att.com>
Thu, 24 Aug 2017 04:58:40 +0000 (00:58 -0400)
committersg481n <sg481n@att.com>
Thu, 24 Aug 2017 04:58:47 +0000 (00:58 -0400)
Update package structure from com.att to
org.onap.aaf and add distribution management
and repositories.

Issue-id: AAF-23
Change-Id: I1b2381a58b08d147a0dfffd086aabd37ecfc3090
Signed-off-by: sg481n <sg481n@att.com>
130 files changed:
env/pom.xml
env/src/main/java/org/onap/aaf/inno/env/APIException.java [moved from env/src/main/java/com/att/inno/env/APIException.java with 95% similarity]
env/src/main/java/org/onap/aaf/inno/env/BaseDataFactory.java [moved from env/src/main/java/com/att/inno/env/BaseDataFactory.java with 96% similarity]
env/src/main/java/org/onap/aaf/inno/env/Creatable.java [moved from env/src/main/java/com/att/inno/env/Creatable.java with 95% similarity]
env/src/main/java/org/onap/aaf/inno/env/Data.java [moved from env/src/main/java/com/att/inno/env/Data.java with 96% similarity]
env/src/main/java/org/onap/aaf/inno/env/DataFactory.java [moved from env/src/main/java/com/att/inno/env/DataFactory.java with 95% similarity]
env/src/main/java/org/onap/aaf/inno/env/Decryptor.java [moved from env/src/main/java/com/att/inno/env/Decryptor.java with 95% similarity]
env/src/main/java/org/onap/aaf/inno/env/Encryptor.java [moved from env/src/main/java/com/att/inno/env/Encryptor.java with 95% similarity]
env/src/main/java/org/onap/aaf/inno/env/Env.java [moved from env/src/main/java/com/att/inno/env/Env.java with 96% similarity]
env/src/main/java/org/onap/aaf/inno/env/EnvJAXB.java [moved from env/src/main/java/com/att/inno/env/EnvJAXB.java with 96% similarity]
env/src/main/java/org/onap/aaf/inno/env/EnvJAXBProps.java [moved from env/src/main/java/com/att/inno/env/EnvJAXBProps.java with 95% similarity]
env/src/main/java/org/onap/aaf/inno/env/EnvProps.java [moved from env/src/main/java/com/att/inno/env/EnvProps.java with 96% similarity]
env/src/main/java/org/onap/aaf/inno/env/EnvStore.java [moved from env/src/main/java/com/att/inno/env/EnvStore.java with 95% similarity]
env/src/main/java/org/onap/aaf/inno/env/IOObjectifier.java [moved from env/src/main/java/com/att/inno/env/IOObjectifier.java with 96% similarity]
env/src/main/java/org/onap/aaf/inno/env/IOStringifier.java [moved from env/src/main/java/com/att/inno/env/IOStringifier.java with 96% similarity]
env/src/main/java/org/onap/aaf/inno/env/LifeCycle.java [moved from env/src/main/java/com/att/inno/env/LifeCycle.java with 95% similarity]
env/src/main/java/org/onap/aaf/inno/env/LogTarget.java [moved from env/src/main/java/com/att/inno/env/LogTarget.java with 93% similarity]
env/src/main/java/org/onap/aaf/inno/env/Objectifier.java [moved from env/src/main/java/com/att/inno/env/Objectifier.java with 95% similarity]
env/src/main/java/org/onap/aaf/inno/env/Slot.java [moved from env/src/main/java/com/att/inno/env/Slot.java with 95% similarity]
env/src/main/java/org/onap/aaf/inno/env/StaticSlot.java [moved from env/src/main/java/com/att/inno/env/StaticSlot.java with 95% similarity]
env/src/main/java/org/onap/aaf/inno/env/Store.java [moved from env/src/main/java/com/att/inno/env/Store.java with 96% similarity]
env/src/main/java/org/onap/aaf/inno/env/StoreImpl.java [moved from env/src/main/java/com/att/inno/env/StoreImpl.java with 95% similarity]
env/src/main/java/org/onap/aaf/inno/env/Stringifier.java [moved from env/src/main/java/com/att/inno/env/Stringifier.java with 95% similarity]
env/src/main/java/org/onap/aaf/inno/env/TimeTaken.java [moved from env/src/main/java/com/att/inno/env/TimeTaken.java with 95% similarity]
env/src/main/java/org/onap/aaf/inno/env/Trans.java [moved from env/src/main/java/com/att/inno/env/Trans.java with 95% similarity]
env/src/main/java/org/onap/aaf/inno/env/TransCreate.java [moved from env/src/main/java/com/att/inno/env/TransCreate.java with 95% similarity]
env/src/main/java/org/onap/aaf/inno/env/TransJAXB.java [moved from env/src/main/java/com/att/inno/env/TransJAXB.java with 95% similarity]
env/src/main/java/org/onap/aaf/inno/env/TransStore.java [moved from env/src/main/java/com/att/inno/env/TransStore.java with 95% similarity]
env/src/main/java/org/onap/aaf/inno/env/impl/AbsTrans.java [moved from env/src/main/java/com/att/inno/env/impl/AbsTrans.java with 92% similarity]
env/src/main/java/org/onap/aaf/inno/env/impl/AbsTransJAXB.java [moved from env/src/main/java/com/att/inno/env/impl/AbsTransJAXB.java with 89% similarity]
env/src/main/java/org/onap/aaf/inno/env/impl/BasicEnv.java [moved from env/src/main/java/com/att/inno/env/impl/BasicEnv.java with 89% similarity]
env/src/main/java/org/onap/aaf/inno/env/impl/BasicTrans.java [moved from env/src/main/java/com/att/inno/env/impl/BasicTrans.java with 86% similarity]
env/src/main/java/org/onap/aaf/inno/env/impl/EnvFactory.java [moved from env/src/main/java/com/att/inno/env/impl/EnvFactory.java with 89% similarity]
env/src/main/java/org/onap/aaf/inno/env/impl/JavaUtilLogTarget.java [moved from env/src/main/java/com/att/inno/env/impl/JavaUtilLogTarget.java with 94% similarity]
env/src/main/java/org/onap/aaf/inno/env/impl/Log4JLogTarget.java [moved from env/src/main/java/com/att/inno/env/impl/Log4JLogTarget.java with 92% similarity]
env/src/main/java/org/onap/aaf/inno/env/impl/NullLifeCycle.java [moved from env/src/main/java/com/att/inno/env/impl/NullLifeCycle.java with 91% similarity]
env/src/main/java/org/onap/aaf/inno/env/jaxb/JAXBDF.java [moved from env/src/main/java/com/att/inno/env/jaxb/JAXBDF.java with 91% similarity]
env/src/main/java/org/onap/aaf/inno/env/jaxb/JAXBData.java [moved from env/src/main/java/com/att/inno/env/jaxb/JAXBData.java with 92% similarity]
env/src/main/java/org/onap/aaf/inno/env/jaxb/JAXBObjectifier.java [moved from env/src/main/java/com/att/inno/env/jaxb/JAXBObjectifier.java with 91% similarity]
env/src/main/java/org/onap/aaf/inno/env/jaxb/JAXBStringifier.java [moved from env/src/main/java/com/att/inno/env/jaxb/JAXBStringifier.java with 91% similarity]
env/src/main/java/org/onap/aaf/inno/env/jaxb/JAXBmar.java [moved from env/src/main/java/com/att/inno/env/jaxb/JAXBmar.java with 93% similarity]
env/src/main/java/org/onap/aaf/inno/env/jaxb/JAXBumar.java [moved from env/src/main/java/com/att/inno/env/jaxb/JAXBumar.java with 93% similarity]
env/src/main/java/org/onap/aaf/inno/env/old/IOObjectifier.java [moved from env/src/main/java/com/att/inno/env/old/IOObjectifier.java with 92% similarity]
env/src/main/java/org/onap/aaf/inno/env/old/IOStringifier.java [moved from env/src/main/java/com/att/inno/env/old/IOStringifier.java with 93% similarity]
env/src/main/java/org/onap/aaf/inno/env/old/Objectifier.java [moved from env/src/main/java/com/att/inno/env/old/Objectifier.java with 90% similarity]
env/src/main/java/org/onap/aaf/inno/env/old/OldDataFactory.java [moved from env/src/main/java/com/att/inno/env/old/OldDataFactory.java with 89% similarity]
env/src/main/java/org/onap/aaf/inno/env/old/Stringifier.java [moved from env/src/main/java/com/att/inno/env/old/Stringifier.java with 90% similarity]
env/src/main/java/org/onap/aaf/inno/env/util/Chrono.java [moved from env/src/main/java/com/att/inno/env/util/Chrono.java with 96% similarity]
env/src/main/java/org/onap/aaf/inno/env/util/DoubleOutputStream.java [moved from env/src/main/java/com/att/inno/env/util/DoubleOutputStream.java with 95% similarity]
env/src/main/java/org/onap/aaf/inno/env/util/IndentPrintWriter.java [moved from env/src/main/java/com/att/inno/env/util/IndentPrintWriter.java with 94% similarity]
env/src/main/java/org/onap/aaf/inno/env/util/Pool.java [moved from env/src/main/java/com/att/inno/env/util/Pool.java with 95% similarity]
env/src/main/java/org/onap/aaf/inno/env/util/RefreshableThreadObject.java [moved from env/src/main/java/com/att/inno/env/util/RefreshableThreadObject.java with 92% similarity]
env/src/main/java/org/onap/aaf/inno/env/util/Split.java [moved from env/src/main/java/com/att/inno/env/util/Split.java with 96% similarity]
env/src/main/java/org/onap/aaf/inno/env/util/StringBuilderOutputStream.java [moved from env/src/main/java/com/att/inno/env/util/StringBuilderOutputStream.java with 95% similarity]
env/src/main/java/org/onap/aaf/inno/env/util/StringBuilderWriter.java [moved from env/src/main/java/com/att/inno/env/util/StringBuilderWriter.java with 95% similarity]
log4j/pom.xml
log4j/src/main/java/org/onap/aaf/inno/env/log4j/LogFileNamer.java [moved from log4j/src/main/java/com/att/inno/env/log4j/LogFileNamer.java with 95% similarity]
log4j/src/main/java/org/onap/aaf/inno/env/log4j/PIDAccess.java [moved from log4j/src/main/java/com/att/inno/env/log4j/PIDAccess.java with 95% similarity]
log4j/src/test/java/org/onap/aaf/inno/env/log4j/LogTest.java [moved from log4j/src/test/java/com/att/inno/env/log4j/LogTest.java with 92% similarity]
pom.xml
rosetta/pom.xml
rosetta/src/main/java/org/onap/aaf/rosetta/InJson.java [moved from rosetta/src/main/java/com/att/rosetta/InJson.java with 93% similarity]
rosetta/src/main/java/org/onap/aaf/rosetta/InXML.java [moved from rosetta/src/main/java/com/att/rosetta/InXML.java with 95% similarity]
rosetta/src/main/java/org/onap/aaf/rosetta/JaxEval.java [moved from rosetta/src/main/java/com/att/rosetta/JaxEval.java with 95% similarity]
rosetta/src/main/java/org/onap/aaf/rosetta/JaxInfo.java [moved from rosetta/src/main/java/com/att/rosetta/JaxInfo.java with 96% similarity]
rosetta/src/main/java/org/onap/aaf/rosetta/JaxSet.java [moved from rosetta/src/main/java/com/att/rosetta/JaxSet.java with 96% similarity]
rosetta/src/main/java/org/onap/aaf/rosetta/Ladder.java [moved from rosetta/src/main/java/com/att/rosetta/Ladder.java with 95% similarity]
rosetta/src/main/java/org/onap/aaf/rosetta/Marshal.java [moved from rosetta/src/main/java/com/att/rosetta/Marshal.java with 93% similarity]
rosetta/src/main/java/org/onap/aaf/rosetta/Nulls.java [moved from rosetta/src/main/java/com/att/rosetta/Nulls.java with 92% similarity]
rosetta/src/main/java/org/onap/aaf/rosetta/Out.java [moved from rosetta/src/main/java/com/att/rosetta/Out.java with 96% similarity]
rosetta/src/main/java/org/onap/aaf/rosetta/OutJax.java [moved from rosetta/src/main/java/com/att/rosetta/OutJax.java with 95% similarity]
rosetta/src/main/java/org/onap/aaf/rosetta/OutJson.java [moved from rosetta/src/main/java/com/att/rosetta/OutJson.java with 94% similarity]
rosetta/src/main/java/org/onap/aaf/rosetta/OutRaw.java [moved from rosetta/src/main/java/com/att/rosetta/OutRaw.java with 95% similarity]
rosetta/src/main/java/org/onap/aaf/rosetta/OutXML.java [moved from rosetta/src/main/java/com/att/rosetta/OutXML.java with 94% similarity]
rosetta/src/main/java/org/onap/aaf/rosetta/Parse.java [moved from rosetta/src/main/java/com/att/rosetta/Parse.java with 92% similarity]
rosetta/src/main/java/org/onap/aaf/rosetta/ParseException.java [moved from rosetta/src/main/java/com/att/rosetta/ParseException.java with 95% similarity]
rosetta/src/main/java/org/onap/aaf/rosetta/Parsed.java [moved from rosetta/src/main/java/com/att/rosetta/Parsed.java with 95% similarity]
rosetta/src/main/java/org/onap/aaf/rosetta/Prop.java [moved from rosetta/src/main/java/com/att/rosetta/Prop.java with 95% similarity]
rosetta/src/main/java/org/onap/aaf/rosetta/Saved.java [moved from rosetta/src/main/java/com/att/rosetta/Saved.java with 93% similarity]
rosetta/src/main/java/org/onap/aaf/rosetta/XmlEscape.java [moved from rosetta/src/main/java/com/att/rosetta/XmlEscape.java with 96% similarity]
rosetta/src/main/java/org/onap/aaf/rosetta/env/RosettaDF.java [moved from rosetta/src/main/java/com/att/rosetta/env/RosettaDF.java with 84% similarity]
rosetta/src/main/java/org/onap/aaf/rosetta/env/RosettaData.java [moved from rosetta/src/main/java/com/att/rosetta/env/RosettaData.java with 93% similarity]
rosetta/src/main/java/org/onap/aaf/rosetta/env/RosettaEnv.java [moved from rosetta/src/main/java/com/att/rosetta/env/RosettaEnv.java with 92% similarity]
rosetta/src/main/java/org/onap/aaf/rosetta/marshal/DataWriter.java [moved from rosetta/src/main/java/com/att/rosetta/marshal/DataWriter.java with 94% similarity]
rosetta/src/main/java/org/onap/aaf/rosetta/marshal/DocMarshal.java [moved from rosetta/src/main/java/com/att/rosetta/marshal/DocMarshal.java with 90% similarity]
rosetta/src/main/java/org/onap/aaf/rosetta/marshal/FieldArray.java [moved from rosetta/src/main/java/com/att/rosetta/marshal/FieldArray.java with 90% similarity]
rosetta/src/main/java/org/onap/aaf/rosetta/marshal/FieldBlob.java [moved from rosetta/src/main/java/com/att/rosetta/marshal/FieldBlob.java with 95% similarity]
rosetta/src/main/java/org/onap/aaf/rosetta/marshal/FieldDate.java [moved from rosetta/src/main/java/com/att/rosetta/marshal/FieldDate.java with 95% similarity]
rosetta/src/main/java/org/onap/aaf/rosetta/marshal/FieldDateTime.java [moved from rosetta/src/main/java/com/att/rosetta/marshal/FieldDateTime.java with 95% similarity]
rosetta/src/main/java/org/onap/aaf/rosetta/marshal/FieldHexBinary.java [moved from rosetta/src/main/java/com/att/rosetta/marshal/FieldHexBinary.java with 95% similarity]
rosetta/src/main/java/org/onap/aaf/rosetta/marshal/FieldMarshal.java [moved from rosetta/src/main/java/com/att/rosetta/marshal/FieldMarshal.java with 90% similarity]
rosetta/src/main/java/org/onap/aaf/rosetta/marshal/FieldNumeric.java [moved from rosetta/src/main/java/com/att/rosetta/marshal/FieldNumeric.java with 95% similarity]
rosetta/src/main/java/org/onap/aaf/rosetta/marshal/FieldString.java [moved from rosetta/src/main/java/com/att/rosetta/marshal/FieldString.java with 95% similarity]
rosetta/src/main/java/org/onap/aaf/rosetta/marshal/ListIterator.java [moved from rosetta/src/main/java/com/att/rosetta/marshal/ListIterator.java with 94% similarity]
rosetta/src/main/java/org/onap/aaf/rosetta/marshal/ObjArray.java [moved from rosetta/src/main/java/com/att/rosetta/marshal/ObjArray.java with 90% similarity]
rosetta/src/main/java/org/onap/aaf/rosetta/marshal/ObjMarshal.java [moved from rosetta/src/main/java/com/att/rosetta/marshal/ObjMarshal.java with 91% similarity]
rosetta/src/test/java/com/data/test/JU_FromJSON.java
rosetta/src/test/java/com/data/test/JU_FromXML.java
rosetta/src/test/java/com/data/test/JU_JSON.java
rosetta/src/test/java/com/data/test/JU_Ladder.java
rosetta/src/test/java/com/data/test/JU_Nulls.java
rosetta/src/test/java/com/data/test/JU_RosettaDF.java
rosetta/src/test/java/com/data/test/JU_Saved.java
rosetta/src/test/java/com/data/test/JU_Stream2Obj.java
rosetta/src/test/java/com/data/test/JU_Struct.java
rosetta/src/test/java/com/data/test/JU_Types.java
rosetta/src/test/java/com/data/test/OutDump.java
rosetta/src/test/java/com/data/test/Report.java
rosetta/src/test/java/com/data/test/obj/MultiMarshal.java
rosetta/src/test/java/com/data/test/obj/SingleMarshal.java
xgen/pom.xml
xgen/src/main/java/org/onap/aaf/xgen/Back.java [moved from xgen/src/main/java/com/att/xgen/Back.java with 95% similarity]
xgen/src/main/java/org/onap/aaf/xgen/Cache.java [moved from xgen/src/main/java/com/att/xgen/Cache.java with 96% similarity]
xgen/src/main/java/org/onap/aaf/xgen/CacheGen.java [moved from xgen/src/main/java/com/att/xgen/CacheGen.java with 92% similarity]
xgen/src/main/java/org/onap/aaf/xgen/Code.java [moved from xgen/src/main/java/com/att/xgen/Code.java with 93% similarity]
xgen/src/main/java/org/onap/aaf/xgen/DynamicCode.java [moved from xgen/src/main/java/com/att/xgen/DynamicCode.java with 88% similarity]
xgen/src/main/java/org/onap/aaf/xgen/Mark.java [moved from xgen/src/main/java/com/att/xgen/Mark.java with 95% similarity]
xgen/src/main/java/org/onap/aaf/xgen/Section.java [moved from xgen/src/main/java/com/att/xgen/Section.java with 88% similarity]
xgen/src/main/java/org/onap/aaf/xgen/XGen.java [moved from xgen/src/main/java/com/att/xgen/XGen.java with 94% similarity]
xgen/src/main/java/org/onap/aaf/xgen/XGenBuff.java [moved from xgen/src/main/java/com/att/xgen/XGenBuff.java with 88% similarity]
xgen/src/main/java/org/onap/aaf/xgen/html/HTML4Gen.java [moved from xgen/src/main/java/com/att/xgen/html/HTML4Gen.java with 95% similarity]
xgen/src/main/java/org/onap/aaf/xgen/html/HTML5Gen.java [moved from xgen/src/main/java/com/att/xgen/html/HTML5Gen.java with 95% similarity]
xgen/src/main/java/org/onap/aaf/xgen/html/HTMLCacheGen.java [moved from xgen/src/main/java/com/att/xgen/html/HTMLCacheGen.java with 90% similarity]
xgen/src/main/java/org/onap/aaf/xgen/html/HTMLGen.java [moved from xgen/src/main/java/com/att/xgen/html/HTMLGen.java with 95% similarity]
xgen/src/main/java/org/onap/aaf/xgen/html/Imports.java [moved from xgen/src/main/java/com/att/xgen/html/Imports.java with 95% similarity]
xgen/src/main/java/org/onap/aaf/xgen/html/JSGen.java [moved from xgen/src/main/java/com/att/xgen/html/JSGen.java with 93% similarity]
xgen/src/main/java/org/onap/aaf/xgen/html/State.java [moved from xgen/src/main/java/com/att/xgen/html/State.java with 93% similarity]
xgen/src/main/java/org/onap/aaf/xgen/html/Thematic.java [moved from xgen/src/main/java/com/att/xgen/html/Thematic.java with 95% similarity]
xgen/src/main/java/org/onap/aaf/xgen/xml/XMLCacheGen.java [moved from xgen/src/main/java/com/att/xgen/xml/XMLCacheGen.java with 89% similarity]
xgen/src/main/java/org/onap/aaf/xgen/xml/XMLGen.java [moved from xgen/src/main/java/com/att/xgen/xml/XMLGen.java with 93% similarity]

index 5f501a8..24bdaff 100644 (file)
@@ -23,7 +23,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">\r
        <parent>\r
-               <groupId>com.att.inno</groupId>\r
+               <groupId>org.onap.aaf.inno</groupId>\r
                <artifactId>parent</artifactId>\r
                <version>1.0.0-SNAPSHOT</version>\r
                <relativePath>..</relativePath>\r
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.inno.env;\r
+package org.onap.aaf.inno.env;\r
 \r
 \r
 /**\r
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.inno.env;\r
+package org.onap.aaf.inno.env;\r
 \r
 import java.io.File;\r
 import java.io.FileInputStream;\r
@@ -36,10 +36,9 @@ import javax.xml.transform.stream.StreamSource;
 import javax.xml.validation.Schema;\r
 import javax.xml.validation.SchemaFactory;\r
 \r
+import org.onap.aaf.inno.env.impl.EnvFactory;\r
 import org.xml.sax.SAXException;\r
 \r
-import com.att.inno.env.impl.EnvFactory;\r
-\r
 \r
 \r
 /**\r
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.inno.env;\r
+package org.onap.aaf.inno.env;\r
 \r
 \r
 /**\r
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.inno.env;\r
+package org.onap.aaf.inno.env;\r
 \r
 import java.io.IOException;\r
 import java.io.InputStream;\r
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.inno.env;\r
+package org.onap.aaf.inno.env;\r
 \r
 \r
 public interface DataFactory<T> {\r
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.inno.env;\r
+package org.onap.aaf.inno.env;\r
 \r
 \r
 public interface Decryptor {\r
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.inno.env;\r
+package org.onap.aaf.inno.env;\r
 \r
 \r
 public interface Encryptor {\r
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.inno.env;\r
+package org.onap.aaf.inno.env;\r
 \r
 \r
 /**\r
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.inno.env;\r
+package org.onap.aaf.inno.env;\r
 \r
 import javax.xml.namespace.QName;\r
 import javax.xml.validation.Schema;\r
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.inno.env;\r
+package org.onap.aaf.inno.env;\r
 \r
 /**\r
  * An interface to express both JAXB and Property elements of Env\r
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.inno.env;\r
+package org.onap.aaf.inno.env;\r
 \r
 import java.util.Map;\r
 \r
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.inno.env;\r
+package org.onap.aaf.inno.env;\r
 \r
 \r
 public interface EnvStore<TRANS extends Trans> extends Env, Store, TransCreate<TRANS>{\r
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.inno.env;\r
+package org.onap.aaf.inno.env;\r
 \r
 import java.io.InputStream;\r
 import java.io.Reader;\r
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.inno.env;\r
+package org.onap.aaf.inno.env;\r
 \r
 import java.io.OutputStream;\r
 import java.io.Writer;\r
@@ -34,9 +34,9 @@
  * companies. \r
  *******************************************************************\r
  */\r
-package com.att.inno.env;\r
+package org.onap.aaf.inno.env;\r
 \r
-import com.att.inno.env.util.RefreshableThreadObject;\r
+import org.onap.aaf.inno.env.util.RefreshableThreadObject;\r
 \r
 \r
 /**\r
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.inno.env;\r
+package org.onap.aaf.inno.env;\r
 \r
 import java.io.PrintStream;\r
 import java.util.Date;\r
 \r
-import com.att.inno.env.util.Chrono;\r
+import org.onap.aaf.inno.env.util.Chrono;\r
 \r
 /**\r
  * LogTarget is the interface with which to assign any kind of Logging Implementations.\r
@@ -66,7 +66,7 @@ public interface LogTarget {
        public static final LogTarget SYSOUT = new LogTarget() {\r
                public void log(Object ... msgs) {\r
                        PrintStream out = System.out;\r
-                       out.print(com.att.inno.env.util.Chrono.dateFmt.format(new Date()));\r
+                       out.print(org.onap.aaf.inno.env.util.Chrono.dateFmt.format(new Date()));\r
                        out.print(": ");\r
                        for(Object str : msgs) {\r
                                if(str!=null) {\r
@@ -35,7 +35,7 @@
  * companies. \r
  *******************************************************************\r
  */\r
-package com.att.inno.env;\r
+package org.onap.aaf.inno.env;\r
 \r
 /**\r
  * Slot's are used to store and retrieve data in the transaction's State object.\r
@@ -35,7 +35,7 @@
  * companies. \r
  *******************************************************************\r
  */\r
-package com.att.inno.env;\r
+package org.onap.aaf.inno.env;\r
 \r
 /**\r
  * StaticSlot's are used to store and retrieve data from the Organizer that does not change.\r
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.inno.env;\r
+package org.onap.aaf.inno.env;\r
 \r
 import java.util.List;\r
 \r
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.inno.env;\r
+package org.onap.aaf.inno.env;\r
 \r
 import java.io.File;\r
 import java.io.FileInputStream;\r
@@ -29,9 +29,10 @@ import java.util.ArrayList;
 import java.util.HashMap;\r
 import java.util.List;\r
 import java.util.Map.Entry;\r
-import java.util.Properties;\r
 \r
-import com.att.inno.env.util.Split;\r
+import org.onap.aaf.inno.env.util.Split;\r
+\r
+import java.util.Properties;\r
 \r
 \r
 public class StoreImpl implements Store {\r
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.inno.env;\r
+package org.onap.aaf.inno.env;\r
 \r
 \r
 \r
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.inno.env;\r
+package org.onap.aaf.inno.env;\r
 \r
 /**\r
  * <h1>TimeTaken</h1>\r
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.inno.env;\r
+package org.onap.aaf.inno.env;\r
 \r
 \r
 \r
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.inno.env;\r
+package org.onap.aaf.inno.env;\r
 \r
 public interface TransCreate<TRANS> {\r
        public TRANS newTrans();\r
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.inno.env;\r
+package org.onap.aaf.inno.env;\r
 \r
 public interface TransJAXB extends Trans, TransStore {\r
 \r
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.inno.env;\r
+package org.onap.aaf.inno.env;\r
 \r
 public interface TransStore extends Trans {\r
        /**\r
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.inno.env.impl;\r
+package org.onap.aaf.inno.env.impl;\r
 \r
 import java.util.ArrayList;\r
 import java.util.List;\r
 import java.util.Stack;\r
 \r
-import com.att.inno.env.Env;\r
-import com.att.inno.env.LogTarget;\r
-import com.att.inno.env.Slot;\r
-import com.att.inno.env.StoreImpl;\r
-import com.att.inno.env.TimeTaken;\r
-import com.att.inno.env.TransStore;\r
+import org.onap.aaf.inno.env.Env;\r
+import org.onap.aaf.inno.env.LogTarget;\r
+import org.onap.aaf.inno.env.Slot;\r
+import org.onap.aaf.inno.env.StoreImpl;\r
+import org.onap.aaf.inno.env.TimeTaken;\r
+import org.onap.aaf.inno.env.TransStore;\r
 \r
 public abstract class AbsTrans<ENV extends Env> implements TransStore {\r
        private static final float[] EMPTYF = new float[0];\r
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.inno.env.impl;\r
+package org.onap.aaf.inno.env.impl;\r
 \r
 import javax.xml.namespace.QName;\r
 import javax.xml.validation.Schema;\r
 \r
-import com.att.inno.env.APIException;\r
-import com.att.inno.env.DataFactory;\r
-import com.att.inno.env.EnvJAXB;\r
-import com.att.inno.env.TransJAXB;\r
+import org.onap.aaf.inno.env.APIException;\r
+import org.onap.aaf.inno.env.DataFactory;\r
+import org.onap.aaf.inno.env.EnvJAXB;\r
+import org.onap.aaf.inno.env.TransJAXB;\r
 \r
 public abstract class AbsTransJAXB extends AbsTrans<EnvJAXB> implements TransJAXB {\r
        public AbsTransJAXB(EnvJAXB env) {\r
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.inno.env.impl;\r
+package org.onap.aaf.inno.env.impl;\r
 \r
 import java.applet.Applet;\r
 import java.io.BufferedReader;\r
@@ -34,19 +34,19 @@ import java.util.Properties;
 import javax.xml.namespace.QName;\r
 import javax.xml.validation.Schema;\r
 \r
-import com.att.inno.env.APIException;\r
-import com.att.inno.env.DataFactory;\r
-import com.att.inno.env.Decryptor;\r
-import com.att.inno.env.Encryptor;\r
-import com.att.inno.env.Env;\r
-import com.att.inno.env.EnvJAXB;\r
-import com.att.inno.env.LogTarget;\r
-import com.att.inno.env.StoreImpl;\r
-import com.att.inno.env.TimeTaken;\r
-import com.att.inno.env.TransCreate;\r
-import com.att.inno.env.TransJAXB;\r
-import com.att.inno.env.jaxb.JAXBDF;\r
-import com.att.inno.env.util.Split;\r
+import org.onap.aaf.inno.env.APIException;\r
+import org.onap.aaf.inno.env.DataFactory;\r
+import org.onap.aaf.inno.env.Decryptor;\r
+import org.onap.aaf.inno.env.Encryptor;\r
+import org.onap.aaf.inno.env.Env;\r
+import org.onap.aaf.inno.env.EnvJAXB;\r
+import org.onap.aaf.inno.env.LogTarget;\r
+import org.onap.aaf.inno.env.StoreImpl;\r
+import org.onap.aaf.inno.env.TimeTaken;\r
+import org.onap.aaf.inno.env.TransCreate;\r
+import org.onap.aaf.inno.env.TransJAXB;\r
+import org.onap.aaf.inno.env.jaxb.JAXBDF;\r
+import org.onap.aaf.inno.env.util.Split;\r
 \r
 /**\r
  * An essential Implementation of Env, which will fully function, without any sort\r
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.inno.env.impl;\r
+package org.onap.aaf.inno.env.impl;\r
 \r
-import com.att.inno.env.Decryptor;\r
-import com.att.inno.env.Encryptor;\r
-import com.att.inno.env.EnvJAXB;\r
-import com.att.inno.env.Slot;\r
-import com.att.inno.env.StaticSlot;\r
-import com.att.inno.env.TimeTaken;\r
+import org.onap.aaf.inno.env.Decryptor;\r
+import org.onap.aaf.inno.env.Encryptor;\r
+import org.onap.aaf.inno.env.EnvJAXB;\r
+import org.onap.aaf.inno.env.Slot;\r
+import org.onap.aaf.inno.env.StaticSlot;\r
+import org.onap.aaf.inno.env.TimeTaken;\r
 \r
 \r
 public class BasicTrans extends AbsTransJAXB {\r
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.inno.env.impl;\r
+package org.onap.aaf.inno.env.impl;\r
 \r
-import com.att.inno.env.EnvJAXB;\r
-import com.att.inno.env.TransCreate;\r
-import com.att.inno.env.TransJAXB;\r
+import org.onap.aaf.inno.env.EnvJAXB;\r
+import org.onap.aaf.inno.env.TransCreate;\r
+import org.onap.aaf.inno.env.TransJAXB;\r
 \r
 /**\r
  * EnvFactory\r
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.inno.env.impl;\r
+package org.onap.aaf.inno.env.impl;\r
 \r
 import java.util.logging.Level;\r
 import java.util.logging.Logger;\r
 \r
-import com.att.inno.env.LogTarget;\r
+import org.onap.aaf.inno.env.LogTarget;\r
 \r
 /**\r
  * This LogTarget Implementation is included mostly because the JavaUtil based logging is included in the\r
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.inno.env.impl;\r
+package org.onap.aaf.inno.env.impl;\r
 \r
 import java.io.PrintWriter;\r
 \r
 import org.apache.log4j.Level;\r
 import org.apache.log4j.Logger;\r
-\r
-import com.att.inno.env.APIException;\r
-import com.att.inno.env.LogTarget;\r
-import com.att.inno.env.util.StringBuilderWriter;\r
+import org.onap.aaf.inno.env.APIException;\r
+import org.onap.aaf.inno.env.LogTarget;\r
+import org.onap.aaf.inno.env.util.StringBuilderWriter;\r
 \r
 /**\r
  * Many services have chosen to use Log4J for their lower level Logging Implementation.  This LogTarget will allow\r
 /**\r
  * \r
  */\r
-package com.att.inno.env.impl;\r
+package org.onap.aaf.inno.env.impl;\r
 \r
-import com.att.inno.env.APIException;\r
-import com.att.inno.env.Env;\r
-import com.att.inno.env.LifeCycle;\r
+import org.onap.aaf.inno.env.APIException;\r
+import org.onap.aaf.inno.env.Env;\r
+import org.onap.aaf.inno.env.LifeCycle;\r
 \r
 \r
 \r
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.inno.env.jaxb;\r
+package org.onap.aaf.inno.env.jaxb;\r
 \r
 import java.io.InputStream;\r
 import java.io.OutputStream;\r
@@ -32,15 +32,15 @@ import javax.xml.bind.JAXBException;
 import javax.xml.namespace.QName;\r
 import javax.xml.validation.Schema;\r
 \r
-import com.att.inno.env.APIException;\r
-import com.att.inno.env.BaseDataFactory;\r
-import com.att.inno.env.Data;\r
-import com.att.inno.env.Env;\r
-import com.att.inno.env.EnvJAXB;\r
-import com.att.inno.env.TimeTaken;\r
-import com.att.inno.env.old.IOObjectifier;\r
-import com.att.inno.env.old.IOStringifier;\r
-import com.att.inno.env.old.OldDataFactory;\r
+import org.onap.aaf.inno.env.APIException;\r
+import org.onap.aaf.inno.env.BaseDataFactory;\r
+import org.onap.aaf.inno.env.Data;\r
+import org.onap.aaf.inno.env.Env;\r
+import org.onap.aaf.inno.env.EnvJAXB;\r
+import org.onap.aaf.inno.env.TimeTaken;\r
+import org.onap.aaf.inno.env.old.IOObjectifier;\r
+import org.onap.aaf.inno.env.old.IOStringifier;\r
+import org.onap.aaf.inno.env.old.OldDataFactory;\r
 \r
 public class JAXBDF<T> extends BaseDataFactory implements OldDataFactory<T>,IOObjectifier<T>, IOStringifier<T> {\r
        // Package on purpose\r
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.inno.env.jaxb;\r
+package org.onap.aaf.inno.env.jaxb;\r
 \r
 import java.io.ByteArrayInputStream;\r
 import java.io.IOException;\r
@@ -31,13 +31,13 @@ import java.io.Writer;
 \r
 import javax.xml.bind.JAXBException;\r
 \r
-import com.att.inno.env.APIException;\r
-import com.att.inno.env.Data;\r
-import com.att.inno.env.Env;\r
-import com.att.inno.env.EnvJAXB;\r
-import com.att.inno.env.old.IOStringifier;\r
-import com.att.inno.env.old.Objectifier;\r
-import com.att.inno.env.old.Stringifier;\r
+import org.onap.aaf.inno.env.APIException;\r
+import org.onap.aaf.inno.env.Data;\r
+import org.onap.aaf.inno.env.Env;\r
+import org.onap.aaf.inno.env.EnvJAXB;\r
+import org.onap.aaf.inno.env.old.IOStringifier;\r
+import org.onap.aaf.inno.env.old.Objectifier;\r
+import org.onap.aaf.inno.env.old.Stringifier;\r
 /**\r
  * <H1>Data</H1>\r
  * <i>Data</i> facilitates lazy marshaling of data with a pre-determined\r
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.inno.env.jaxb;\r
+package org.onap.aaf.inno.env.jaxb;\r
 \r
 import java.io.InputStream;\r
 import java.io.Reader;\r
@@ -28,10 +28,10 @@ import java.io.Reader;
 import javax.xml.bind.JAXBException;\r
 import javax.xml.validation.Schema;\r
 \r
-import com.att.inno.env.APIException;\r
-import com.att.inno.env.Env;\r
-import com.att.inno.env.TimeTaken;\r
-import com.att.inno.env.old.IOObjectifier;\r
+import org.onap.aaf.inno.env.APIException;\r
+import org.onap.aaf.inno.env.Env;\r
+import org.onap.aaf.inno.env.TimeTaken;\r
+import org.onap.aaf.inno.env.old.IOObjectifier;\r
 \r
 /**\r
  * Allow Extended IO interface usage without muddying up the Stringifier Interface\r
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.inno.env.jaxb;\r
+package org.onap.aaf.inno.env.jaxb;\r
 \r
 import java.io.OutputStream;\r
 import java.io.StringWriter;\r
@@ -29,10 +29,10 @@ import java.io.Writer;
 import javax.xml.bind.JAXBException;\r
 import javax.xml.namespace.QName;\r
 \r
-import com.att.inno.env.APIException;\r
-import com.att.inno.env.Env;\r
-import com.att.inno.env.TimeTaken;\r
-import com.att.inno.env.old.IOStringifier;\r
+import org.onap.aaf.inno.env.APIException;\r
+import org.onap.aaf.inno.env.Env;\r
+import org.onap.aaf.inno.env.TimeTaken;\r
+import org.onap.aaf.inno.env.old.IOStringifier;\r
 \r
 public class JAXBStringifier<T> implements IOStringifier<T> {\r
        private JAXBmar jmar;\r
@@ -37,7 +37,7 @@
  * companies. \r
  *******************************************************************\r
  */\r
-package com.att.inno.env.jaxb;\r
+package org.onap.aaf.inno.env.jaxb;\r
 \r
 import java.io.OutputStream;\r
 import java.io.StringWriter;\r
@@ -51,10 +51,10 @@ import javax.xml.bind.JAXBException;
 import javax.xml.bind.Marshaller;\r
 import javax.xml.namespace.QName;\r
 \r
-import com.att.inno.env.APIException;\r
-import com.att.inno.env.LogTarget;\r
-import com.att.inno.env.util.Pool;\r
-import com.att.inno.env.util.Pool.Pooled;\r
+import org.onap.aaf.inno.env.APIException;\r
+import org.onap.aaf.inno.env.LogTarget;\r
+import org.onap.aaf.inno.env.util.Pool;\r
+import org.onap.aaf.inno.env.util.Pool.Pooled;\r
 \r
 /**\r
  * JAXBmar classes are inexpensive for going in and out of scope\r
@@ -37,7 +37,7 @@
  * companies. \r
  *******************************************************************\r
  */\r
-package com.att.inno.env.jaxb;\r
+package org.onap.aaf.inno.env.jaxb;\r
 \r
 import java.io.File;\r
 import java.io.InputStream;\r
@@ -54,13 +54,12 @@ import javax.xml.stream.XMLStreamReader;
 import javax.xml.transform.stream.StreamSource;\r
 import javax.xml.validation.Schema;\r
 \r
+import org.onap.aaf.inno.env.APIException;\r
+import org.onap.aaf.inno.env.LogTarget;\r
+import org.onap.aaf.inno.env.util.Pool;\r
+import org.onap.aaf.inno.env.util.Pool.Pooled;\r
 import org.w3c.dom.Node;\r
 \r
-import com.att.inno.env.APIException;\r
-import com.att.inno.env.LogTarget;\r
-import com.att.inno.env.util.Pool;\r
-import com.att.inno.env.util.Pool.Pooled;\r
-\r
 /**\r
  * JAXBumar classes are inexpensive for going in and out of scope\r
  * and have been made thread safe via Pooling\r
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.inno.env.old;\r
+package org.onap.aaf.inno.env.old;\r
 \r
 import java.io.InputStream;\r
 import java.io.Reader;\r
 \r
-import com.att.inno.env.APIException;\r
-import com.att.inno.env.Env;\r
+import org.onap.aaf.inno.env.APIException;\r
+import org.onap.aaf.inno.env.Env;\r
 \r
 public interface IOObjectifier<T> extends Objectifier<T> {\r
        /**\r
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.inno.env.old;\r
+package org.onap.aaf.inno.env.old;\r
 \r
 import java.io.OutputStream;\r
 import java.io.Writer;\r
 \r
-import com.att.inno.env.APIException;\r
-import com.att.inno.env.Env;\r
+import org.onap.aaf.inno.env.APIException;\r
+import org.onap.aaf.inno.env.Env;\r
 \r
 /**\r
  * Allow Extended IO interface usage without muddying up the Stringifier Interface\r
 /**\r
  * \r
  */\r
-package com.att.inno.env.old;\r
+package org.onap.aaf.inno.env.old;\r
 \r
-import com.att.inno.env.APIException;\r
-import com.att.inno.env.Env;\r
-import com.att.inno.env.LifeCycle;\r
+import org.onap.aaf.inno.env.APIException;\r
+import org.onap.aaf.inno.env.Env;\r
+import org.onap.aaf.inno.env.LifeCycle;\r
 \r
 \r
 /**\r
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.inno.env.old;\r
+package org.onap.aaf.inno.env.old;\r
 \r
 import java.io.InputStream;\r
 import java.io.OutputStream;\r
 import java.io.Reader;\r
 import java.io.Writer;\r
 \r
-import com.att.inno.env.APIException;\r
-import com.att.inno.env.Data;\r
-import com.att.inno.env.DataFactory;\r
-import com.att.inno.env.Env;\r
+import org.onap.aaf.inno.env.APIException;\r
+import org.onap.aaf.inno.env.Data;\r
+import org.onap.aaf.inno.env.DataFactory;\r
+import org.onap.aaf.inno.env.Env;\r
 \r
 public interface OldDataFactory<T> extends DataFactory<T> {\r
        public abstract String stringify(T type) throws APIException;\r
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.inno.env.old;\r
+package org.onap.aaf.inno.env.old;\r
 \r
-import com.att.inno.env.APIException;\r
-import com.att.inno.env.Env;\r
-import com.att.inno.env.LifeCycle;\r
+import org.onap.aaf.inno.env.APIException;\r
+import org.onap.aaf.inno.env.Env;\r
+import org.onap.aaf.inno.env.LifeCycle;\r
 \r
 \r
 /**\r
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.inno.env.util;\r
+package org.onap.aaf.inno.env.util;\r
 \r
 import java.text.DateFormat;\r
 import java.text.SimpleDateFormat;\r
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.inno.env.util;\r
+package org.onap.aaf.inno.env.util;\r
 \r
 import java.io.IOException;\r
 import java.io.OutputStream;\r
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.inno.env.util;\r
+package org.onap.aaf.inno.env.util;\r
 \r
 import java.io.OutputStream;\r
 import java.io.PrintWriter;\r
  * \r
  * 5/27/2011\r
  */\r
-package com.att.inno.env.util;\r
+package org.onap.aaf.inno.env.util;\r
 \r
 import java.util.LinkedList;\r
 \r
-import com.att.inno.env.APIException;\r
-import com.att.inno.env.LogTarget;\r
+import org.onap.aaf.inno.env.APIException;\r
+import org.onap.aaf.inno.env.LogTarget;\r
 \r
 /**\r
  * This Class pools on an As-Needed-Basis any particular kind of class, which is\r
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.inno.env.util;\r
+package org.onap.aaf.inno.env.util;\r
 \r
 import java.lang.reflect.Constructor;\r
 import java.lang.reflect.InvocationTargetException;\r
@@ -28,10 +28,10 @@ import java.util.Collections;
 import java.util.HashMap;\r
 import java.util.Map;\r
 \r
-import com.att.inno.env.APIException;\r
-import com.att.inno.env.Creatable;\r
-import com.att.inno.env.Env;\r
-import com.att.inno.env.LifeCycle;\r
+import org.onap.aaf.inno.env.APIException;\r
+import org.onap.aaf.inno.env.Creatable;\r
+import org.onap.aaf.inno.env.Env;\r
+import org.onap.aaf.inno.env.LifeCycle;\r
 \r
 \r
 /**\r
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.inno.env.util;\r
+package org.onap.aaf.inno.env.util;\r
 \r
 /**\r
  * Split by Char, optional Trim\r
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.inno.env.util;\r
+package org.onap.aaf.inno.env.util;\r
 \r
 import java.io.IOException;\r
 import java.io.OutputStream;\r
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.inno.env.util;\r
+package org.onap.aaf.inno.env.util;\r
 \r
 import java.io.IOException;\r
 import java.io.Writer;\r
index 0c07f0a..8053a2a 100644 (file)
@@ -23,7 +23,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">\r
 <parent>\r
-               <groupId>com.att.inno</groupId>\r
+               <groupId>org.onap.aaf.inno</groupId>\r
                <artifactId>parent</artifactId>\r
                <version>1.0.0-SNAPSHOT</version>\r
                <relativePath>..</relativePath>\r
@@ -61,7 +61,7 @@
        </properties>\r
        <dependencies>\r
                <dependency>\r
-                       <groupId>com.att.inno</groupId>\r
+                       <groupId>org.onap.aaf.inno</groupId>\r
                        <artifactId>env</artifactId>\r
                        <version>${project.version}</version>\r
                </dependency>\r
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.inno.env.log4j;\r
+package org.onap.aaf.inno.env.log4j;\r
 \r
 import java.io.File;\r
 import java.net.URL;\r
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.inno.env.log4j;\r
+package org.onap.aaf.inno.env.log4j;\r
 \r
 import com.sun.jna.Library;\r
 import com.sun.jna.Native;\r
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.inno.env.log4j;\r
+package org.onap.aaf.inno.env.log4j;\r
 \r
 import java.util.logging.Logger;\r
 \r
+import org.onap.aaf.inno.env.log4j.LogFileNamer;\r
+\r
 \r
 public class LogTest\r
 {\r
diff --git a/pom.xml b/pom.xml
index a79a537..9bec264 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -1,30 +1,31 @@
 <!--
-  ============LICENSE_START====================================================
-  * org.onap.aai
-  * ===========================================================================
-  * Copyright Â© 2017 AT&T Intellectual Property. All rights reserved.
-  * Copyright Â© 2017 Amdocs
-  * ===========================================================================
-  * Licensed under the Apache License, Version 2.0 (the "License");
-  * you may not use this file except in compliance with the License.
-  * You may obtain a copy of the License at
-  * 
-   *      http://www.apache.org/licenses/LICENSE-2.0
-  * 
-   * Unless required by applicable law or agreed to in writing, software
-  * distributed under the License is distributed on an "AS IS" BASIS,
-  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  * See the License for the specific language governing permissions and
-  * limitations under the License.
-  * ============LICENSE_END====================================================
-  *
-  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
-  *
+ /*******************************************************************************
+ * ============LICENSE_START====================================================
+ * * org.onap.aaf
+ * * ===========================================================================
+ * * Copyright Â© 2017 AT&T Intellectual Property. All rights reserved.
+ * * ===========================================================================
+ * * Licensed under the Apache License, Version 2.0 (the "License");
+ * * you may not use this file except in compliance with the License.
+ * * You may obtain a copy of the License at
+ * * 
+ *  *      http://www.apache.org/licenses/LICENSE-2.0
+ * * 
+ *  * Unless required by applicable law or agreed to in writing, software
+ * * distributed under the License is distributed on an "AS IS" BASIS,
+ * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * * See the License for the specific language governing permissions and
+ * * limitations under the License.
+ * * ============LICENSE_END====================================================
+ * *
+ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ * *
+ ******************************************************************************/
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
        <modelVersion>4.0.0</modelVersion>
-       <groupId>com.att.inno</groupId>
+       <groupId>org.onap.aaf.inno</groupId>
        <artifactId>parent</artifactId>
        <name>inno</name>
        <version>1.0.0-SNAPSHOT</version>
        <dependencyManagement>
                <dependencies>
                        <dependency>
-                               <groupId>com.att.cadi</groupId>
+                               <groupId>org.onap.aaf.cadi</groupId>
                                <artifactId>cadi-core</artifactId>
                                <version>${project.cadiVersion}</version>
                        </dependency>
                        <dependency>
-                               <groupId>com.att.cadi</groupId>
+                               <groupId>org.onap.aaf.cadi</groupId>
                                <artifactId>cadi-aaf</artifactId>
                                <version>${project.cadiVersion}</version>
                        </dependency>
index 644c21b..0c9238b 100644 (file)
@@ -23,7 +23,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">\r
 <parent>\r
-               <groupId>com.att.inno</groupId>\r
+               <groupId>org.onap.aaf.inno</groupId>\r
                <artifactId>parent</artifactId>\r
                <version>1.0.0-SNAPSHOT</version>\r
                <relativePath>..</relativePath>\r
        </properties>\r
        <dependencies>\r
                <dependency>\r
-                       <groupId>com.att.inno</groupId>\r
+                       <groupId>org.onap.aaf.inno</groupId>\r
                        <artifactId>env</artifactId>\r
                        <version>${project.version}</version>\r
                </dependency>\r
                \r
                <!-- dependency>\r
-                       <groupId>com.att.cadi</groupId>\r
+                       <groupId>org.onap.aaf.cadi</groupId>\r
                        <artifactId>cadi-core</artifactId>\r
                        <scope>compile</scope>\r
                </dependency>\r
                <dependency>\r
-                       <groupId>com.att.aft</groupId>\r
+                       <groupId>org.onap.aaf.aft</groupId>\r
                        <artifactId>dme2</artifactId>\r
                        <scope>provided</scope>\r
                </dependency-->\r
                                        </includes>\r
                                </configuration>\r
                        </plugin>\r
-               <!--    <plugin>\r
-                               <groupId>org.apache.maven.plugins</groupId>\r
-                               <artifactId>maven-source-plugin</artifactId>\r
-                               <version>2.4</version>\r
-                               <configuration>\r
-                                       <outputDirectory>target</outputDirectory>\r
-                                       <skipSource>false</skipSource>\r
-                                       <attach>false</attach>\r
-                                       <forceCreation>true</forceCreation>\r
-                                       <useDefaultManifestFile>true</useDefaultManifestFile>\r
-                               </configuration>\r
-                       </plugin>  -->\r
-\r
-                       <!-- plugin> <artifactId>maven-assembly-plugin</artifactId> <configuration> \r
-                               <archive> <manifest> <mainClass>com.att.rest.Main</mainClass> </manifest> \r
-                               </archive> <descriptorRefs> <discriptorRef>jar-with-dependencies</discriptorRef> \r
-                               <filters> </filters> </descriptorRefs> </configuration> </plugin -->\r
                        <plugin>\r
                                <groupId>org.apache.maven.plugins</groupId>\r
                                <artifactId>maven-deploy-plugin</artifactId>\r
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.rosetta;\r
+package org.onap.aaf.rosetta;\r
 \r
 import java.io.IOException;\r
 import java.io.Reader;\r
 \r
-import com.att.inno.env.Env;\r
-import com.att.inno.env.TimeTaken;\r
-import com.att.rosetta.InJson.State;\r
+import org.onap.aaf.inno.env.Env;\r
+import org.onap.aaf.inno.env.TimeTaken;\r
+import org.onap.aaf.rosetta.InJson.State;\r
 \r
 public class InJson implements Parse<Reader, State> {\r
        public Parsed<State> parse(Reader r, Parsed<State> parsed) throws ParseException {\r
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.rosetta;\r
+package org.onap.aaf.rosetta;\r
 \r
 import java.io.IOException;\r
 import java.io.Reader;\r
@@ -30,9 +30,9 @@ import java.util.List;
 import java.util.Map;\r
 import java.util.Stack;\r
 \r
-import com.att.inno.env.Env;\r
-import com.att.inno.env.TimeTaken;\r
-import com.att.rosetta.InXML.State;\r
+import org.onap.aaf.inno.env.Env;\r
+import org.onap.aaf.inno.env.TimeTaken;\r
+import org.onap.aaf.rosetta.InXML.State;\r
 \r
 public class InXML implements Parse<Reader, State> {\r
        // package on purpose\r
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.rosetta;\r
+package org.onap.aaf.rosetta;\r
 \r
 public interface JaxEval{\r
        public abstract JaxEval eval(Parsed<?> p) throws ParseException;\r
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.rosetta;\r
+package org.onap.aaf.rosetta;\r
 \r
 import java.lang.reflect.Field;\r
 import java.lang.reflect.Type;\r
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.rosetta;\r
+package org.onap.aaf.rosetta;\r
 \r
 import java.lang.reflect.Method;\r
 import java.util.HashMap;\r
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.rosetta;\r
+package org.onap.aaf.rosetta;\r
 \r
 \r
 /**\r
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.rosetta;\r
+package org.onap.aaf.rosetta;\r
 \r
 import java.util.Iterator;\r
 \r
-import com.att.inno.env.Env;\r
-import com.att.inno.env.TimeTaken;\r
+import org.onap.aaf.inno.env.Env;\r
+import org.onap.aaf.inno.env.TimeTaken;\r
 \r
 public abstract class Marshal<T> implements Parse<T, Marshal.State> {\r
 \r
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.rosetta;\r
+package org.onap.aaf.rosetta;\r
 \r
 import java.io.IOException;\r
 import java.io.Reader;\r
 import java.io.Writer;\r
 \r
-import com.att.inno.env.Env;\r
-import com.att.inno.env.TimeTaken;\r
+import org.onap.aaf.inno.env.Env;\r
+import org.onap.aaf.inno.env.TimeTaken;\r
 \r
 public class Nulls {\r
        public static final Parse<Reader, ?> IN = new Parse<Reader, Void>() {\r
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.rosetta;\r
+package org.onap.aaf.rosetta;\r
 \r
 import java.io.IOException;\r
 import java.io.OutputStream;\r
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.rosetta;\r
+package org.onap.aaf.rosetta;\r
 \r
 import java.io.IOException;\r
 import java.io.Writer;\r
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.rosetta;\r
+package org.onap.aaf.rosetta;\r
 \r
 import java.io.IOException;\r
 import java.io.Writer;\r
 import java.util.Stack;\r
 \r
-import com.att.inno.env.util.IndentPrintWriter;\r
+import org.onap.aaf.inno.env.util.IndentPrintWriter;\r
 \r
 public class OutJson extends Out {\r
 \r
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.rosetta;\r
+package org.onap.aaf.rosetta;\r
 \r
 import java.io.IOException;\r
 import java.io.Writer;\r
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.rosetta;\r
+package org.onap.aaf.rosetta;\r
 \r
 import java.io.IOException;\r
 import java.io.Writer;\r
@@ -30,8 +30,8 @@ import java.util.List;
 import java.util.Map;\r
 import java.util.Stack;\r
 \r
-import com.att.inno.env.util.IndentPrintWriter;\r
-import com.att.inno.env.util.StringBuilderWriter;\r
+import org.onap.aaf.inno.env.util.IndentPrintWriter;\r
+import org.onap.aaf.inno.env.util.StringBuilderWriter;\r
 \r
 public class OutXML extends Out{\r
        private static final String XMLNS_XSI = "xmlns:xsi";\r
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.rosetta;\r
+package org.onap.aaf.rosetta;\r
 \r
-import com.att.inno.env.Env;\r
-import com.att.inno.env.TimeTaken;\r
+import org.onap.aaf.inno.env.Env;\r
+import org.onap.aaf.inno.env.TimeTaken;\r
 \r
 public interface Parse<IN, S> {\r
        public Parsed<S> parse(IN in, Parsed<S> parsed) throws ParseException;\r
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.rosetta;\r
+package org.onap.aaf.rosetta;\r
 \r
 public class ParseException extends Exception {\r
        private static final long serialVersionUID = 7808836939102997012L;\r
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.rosetta;\r
+package org.onap.aaf.rosetta;\r
 \r
 \r
 public class Parsed<S> {\r
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.rosetta;\r
+package org.onap.aaf.rosetta;\r
 \r
 class Prop {\r
        public String tag;\r
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.rosetta;\r
+package org.onap.aaf.rosetta;\r
 \r
 import java.io.IOException;\r
 import java.io.Reader;\r
 import java.io.Writer;\r
 import java.util.List;\r
 \r
-import com.att.inno.env.Env;\r
-import com.att.inno.env.TimeTaken;\r
-import com.att.rosetta.Saved.State;\r
+import org.onap.aaf.inno.env.Env;\r
+import org.onap.aaf.inno.env.TimeTaken;\r
+import org.onap.aaf.rosetta.Saved.State;\r
 \r
 /**\r
  * An Out Object that will save off produced Parsed Stream and \r
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.rosetta;\r
+package org.onap.aaf.rosetta;\r
 \r
 import java.io.IOException;\r
 import java.io.Reader;\r
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.rosetta.env;\r
+package org.onap.aaf.rosetta.env;\r
 \r
 import java.io.IOException;\r
 import java.io.OutputStream;\r
@@ -34,27 +34,27 @@ import javax.xml.bind.JAXBException;
 import javax.xml.namespace.QName;\r
 import javax.xml.validation.Schema;\r
 \r
-import com.att.inno.env.APIException;\r
-import com.att.inno.env.BaseDataFactory;\r
-import com.att.inno.env.Data;\r
-import com.att.inno.env.Data.TYPE;\r
-import com.att.inno.env.DataFactory;\r
-import com.att.inno.env.Env;\r
-import com.att.inno.env.TimeTaken;\r
-import com.att.inno.env.Trans;\r
-import com.att.inno.env.jaxb.JAXBmar;\r
-import com.att.inno.env.jaxb.JAXBumar;\r
-import com.att.rosetta.InJson;\r
-import com.att.rosetta.InXML;\r
-import com.att.rosetta.JaxInfo;\r
-import com.att.rosetta.Marshal;\r
-import com.att.rosetta.Out;\r
-import com.att.rosetta.OutJson;\r
-import com.att.rosetta.OutRaw;\r
-import com.att.rosetta.OutXML;\r
-import com.att.rosetta.Parse;\r
-import com.att.rosetta.ParseException;\r
-import com.att.rosetta.marshal.DocMarshal;\r
+import org.onap.aaf.inno.env.APIException;\r
+import org.onap.aaf.inno.env.BaseDataFactory;\r
+import org.onap.aaf.inno.env.Data;\r
+import org.onap.aaf.inno.env.DataFactory;\r
+import org.onap.aaf.inno.env.Env;\r
+import org.onap.aaf.inno.env.TimeTaken;\r
+import org.onap.aaf.inno.env.Trans;\r
+import org.onap.aaf.inno.env.Data.TYPE;\r
+import org.onap.aaf.inno.env.jaxb.JAXBmar;\r
+import org.onap.aaf.inno.env.jaxb.JAXBumar;\r
+import org.onap.aaf.rosetta.InJson;\r
+import org.onap.aaf.rosetta.InXML;\r
+import org.onap.aaf.rosetta.JaxInfo;\r
+import org.onap.aaf.rosetta.Marshal;\r
+import org.onap.aaf.rosetta.Out;\r
+import org.onap.aaf.rosetta.OutJson;\r
+import org.onap.aaf.rosetta.OutRaw;\r
+import org.onap.aaf.rosetta.OutXML;\r
+import org.onap.aaf.rosetta.Parse;\r
+import org.onap.aaf.rosetta.ParseException;\r
+import org.onap.aaf.rosetta.marshal.DocMarshal;\r
 \r
 public class RosettaDF<T> extends BaseDataFactory implements DataFactory<T>  {\r
        \r
@@ -180,7 +180,7 @@ public class RosettaDF<T> extends BaseDataFactory implements DataFactory<T>  {
                }\r
        }\r
        \r
-       public int logType(com.att.inno.env.Data.TYPE ot) {\r
+       public int logType(org.onap.aaf.inno.env.Data.TYPE ot) {\r
                switch(ot) {\r
                        case JSON:\r
                                return Env.JSON;\r
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.rosetta.env;\r
+package org.onap.aaf.rosetta.env;\r
 \r
 import java.io.IOException;\r
 import java.io.InputStream;\r
@@ -32,13 +32,13 @@ import java.io.StringReader;
 import java.io.StringWriter;\r
 import java.io.Writer;\r
 \r
-import com.att.inno.env.APIException;\r
-import com.att.inno.env.Data;\r
-import com.att.inno.env.Env;\r
-import com.att.inno.env.TimeTaken;\r
-import com.att.rosetta.Out;\r
-import com.att.rosetta.Parse;\r
-import com.att.rosetta.Saved;\r
+import org.onap.aaf.inno.env.APIException;\r
+import org.onap.aaf.inno.env.Data;\r
+import org.onap.aaf.inno.env.Env;\r
+import org.onap.aaf.inno.env.TimeTaken;\r
+import org.onap.aaf.rosetta.Out;\r
+import org.onap.aaf.rosetta.Parse;\r
+import org.onap.aaf.rosetta.Saved;\r
 \r
 public class RosettaData<T> implements Data<T>{\r
        private Env trans;\r
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.rosetta.env;\r
+package org.onap.aaf.rosetta.env;\r
 \r
 import java.applet.Applet;\r
 import java.util.Properties;\r
@@ -28,7 +28,7 @@ import java.util.Properties;
 import javax.xml.namespace.QName;\r
 import javax.xml.validation.Schema;\r
 \r
-import com.att.inno.env.APIException;\r
+import org.onap.aaf.inno.env.APIException;\r
 \r
 /**\r
  * An essential Implementation of Env, which will fully function, without any sort\r
@@ -37,7 +37,7 @@ import com.att.inno.env.APIException;
  * Use as a basis for Group level Env, just overriding where needed.\r
  *\r
  */\r
-public class RosettaEnv extends com.att.inno.env.impl.BasicEnv {\r
+public class RosettaEnv extends org.onap.aaf.inno.env.impl.BasicEnv {\r
 \r
        public RosettaEnv() {\r
                super();\r
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.rosetta.marshal;\r
+package org.onap.aaf.rosetta.marshal;\r
 \r
 import javax.xml.datatype.XMLGregorianCalendar;\r
 \r
-import com.att.inno.env.util.Chrono;\r
+import org.onap.aaf.inno.env.util.Chrono;\r
 \r
 /**\r
  * We make these objects instead of static functions so they can be passed into \r
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.rosetta.marshal;\r
+package org.onap.aaf.rosetta.marshal;\r
 \r
 import java.util.Iterator;\r
 \r
-import com.att.rosetta.Ladder;\r
-import com.att.rosetta.Marshal;\r
-import com.att.rosetta.ParseException;\r
-import com.att.rosetta.Parsed;\r
+import org.onap.aaf.rosetta.Ladder;\r
+import org.onap.aaf.rosetta.Marshal;\r
+import org.onap.aaf.rosetta.ParseException;\r
+import org.onap.aaf.rosetta.Parsed;\r
 \r
 public class DocMarshal<T> extends Marshal<T> {\r
        private Marshal<T> root;\r
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.rosetta.marshal;\r
+package org.onap.aaf.rosetta.marshal;\r
 \r
 import java.util.Iterator;\r
 import java.util.List;\r
 \r
-import com.att.rosetta.Ladder;\r
-import com.att.rosetta.Marshal;\r
-import com.att.rosetta.ParseException;\r
-import com.att.rosetta.Parsed;\r
+import org.onap.aaf.rosetta.Ladder;\r
+import org.onap.aaf.rosetta.Marshal;\r
+import org.onap.aaf.rosetta.ParseException;\r
+import org.onap.aaf.rosetta.Parsed;\r
 \r
 \r
 public abstract class FieldArray<T,S> extends Marshal<T> {\r
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.rosetta.marshal;\r
+package org.onap.aaf.rosetta.marshal;\r
 \r
 public abstract class FieldBlob<T> extends FieldMarshal<T>{\r
        public FieldBlob(String name) {\r
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.rosetta.marshal;\r
+package org.onap.aaf.rosetta.marshal;\r
 \r
 import javax.xml.datatype.XMLGregorianCalendar;\r
 \r
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.rosetta.marshal;\r
+package org.onap.aaf.rosetta.marshal;\r
 \r
 import javax.xml.datatype.XMLGregorianCalendar;\r
 \r
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.rosetta.marshal;\r
+package org.onap.aaf.rosetta.marshal;\r
 \r
 public abstract class FieldHexBinary<T> extends FieldMarshal<T>{\r
        public FieldHexBinary(String name) {\r
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.rosetta.marshal;\r
+package org.onap.aaf.rosetta.marshal;\r
 \r
 \r
-import com.att.rosetta.Marshal;\r
-import com.att.rosetta.Parse;\r
-import com.att.rosetta.Parsed;\r
+import org.onap.aaf.rosetta.Marshal;\r
+import org.onap.aaf.rosetta.Parse;\r
+import org.onap.aaf.rosetta.Parsed;\r
 \r
 public abstract class FieldMarshal<T> extends Marshal<T> {\r
        private String name;\r
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.rosetta.marshal;\r
+package org.onap.aaf.rosetta.marshal;\r
 \r
 public abstract class FieldNumeric<N,T> extends FieldMarshal<T> {\r
        public FieldNumeric(String name) {\r
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.rosetta.marshal;\r
+package org.onap.aaf.rosetta.marshal;\r
 \r
 public abstract class FieldString<T> extends FieldMarshal<T> {\r
        public FieldString(String name) {\r
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.rosetta.marshal;\r
+package org.onap.aaf.rosetta.marshal;\r
 \r
 import java.util.Iterator;\r
 import java.util.List;\r
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.rosetta.marshal;\r
+package org.onap.aaf.rosetta.marshal;\r
 \r
 import java.util.Iterator;\r
 import java.util.List;\r
 \r
-import com.att.rosetta.Ladder;\r
-import com.att.rosetta.Marshal;\r
-import com.att.rosetta.ParseException;\r
-import com.att.rosetta.Parsed;\r
+import org.onap.aaf.rosetta.Ladder;\r
+import org.onap.aaf.rosetta.Marshal;\r
+import org.onap.aaf.rosetta.ParseException;\r
+import org.onap.aaf.rosetta.Parsed;\r
 \r
 \r
 public abstract class ObjArray<T,S> extends Marshal<T> {\r
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.rosetta.marshal;\r
+package org.onap.aaf.rosetta.marshal;\r
 \r
 import java.util.Iterator;\r
 \r
-import com.att.rosetta.Ladder;\r
-import com.att.rosetta.Marshal;\r
-import com.att.rosetta.ParseException;\r
-import com.att.rosetta.Parsed;\r
+import org.onap.aaf.rosetta.Ladder;\r
+import org.onap.aaf.rosetta.Marshal;\r
+import org.onap.aaf.rosetta.ParseException;\r
+import org.onap.aaf.rosetta.Parsed;\r
 \r
 /**\r
  * Object Marshal\r
index 5ad6546..fd13f78 100644 (file)
@@ -26,20 +26,19 @@ import java.io.Reader;
 import java.io.StringReader;\r
 \r
 import org.junit.Test;\r
-\r
-import com.att.inno.env.Env;\r
-import com.att.inno.env.LogTarget;\r
-import com.att.inno.env.TimeTaken;\r
-import com.att.inno.env.Trans;\r
-import com.att.inno.env.impl.EnvFactory;\r
-import com.att.inno.env.jaxb.JAXBmar;\r
-import com.att.inno.env.util.IndentPrintWriter;\r
-import com.att.inno.env.util.StringBuilderWriter;\r
-import com.att.rosetta.InJson;\r
-import com.att.rosetta.Out;\r
-import com.att.rosetta.OutJson;\r
-import com.att.rosetta.OutRaw;\r
-import com.att.rosetta.OutXML;\r
+import org.onap.aaf.inno.env.Env;\r
+import org.onap.aaf.inno.env.LogTarget;\r
+import org.onap.aaf.inno.env.TimeTaken;\r
+import org.onap.aaf.inno.env.Trans;\r
+import org.onap.aaf.inno.env.impl.EnvFactory;\r
+import org.onap.aaf.inno.env.jaxb.JAXBmar;\r
+import org.onap.aaf.inno.env.util.IndentPrintWriter;\r
+import org.onap.aaf.inno.env.util.StringBuilderWriter;\r
+import org.onap.aaf.rosetta.InJson;\r
+import org.onap.aaf.rosetta.Out;\r
+import org.onap.aaf.rosetta.OutJson;\r
+import org.onap.aaf.rosetta.OutRaw;\r
+import org.onap.aaf.rosetta.OutXML;\r
 \r
 import junit.framework.Assert;\r
 import s.xsd.LargerData;\r
index 62db4f9..97209ff 100644 (file)
@@ -26,21 +26,20 @@ import java.io.Reader;
 import java.io.StringReader;\r
 \r
 import org.junit.Test;\r
-\r
-import com.att.inno.env.Env;\r
-import com.att.inno.env.LogTarget;\r
-import com.att.inno.env.TimeTaken;\r
-import com.att.inno.env.Trans;\r
-import com.att.inno.env.Trans.Metric;\r
-import com.att.inno.env.impl.EnvFactory;\r
-import com.att.inno.env.jaxb.JAXBmar;\r
-import com.att.inno.env.jaxb.JAXBumar;\r
-import com.att.inno.env.util.StringBuilderWriter;\r
-import com.att.rosetta.InXML;\r
-import com.att.rosetta.Out;\r
-import com.att.rosetta.OutJson;\r
-import com.att.rosetta.OutRaw;\r
-import com.att.rosetta.OutXML;\r
+import org.onap.aaf.inno.env.Env;\r
+import org.onap.aaf.inno.env.LogTarget;\r
+import org.onap.aaf.inno.env.TimeTaken;\r
+import org.onap.aaf.inno.env.Trans;\r
+import org.onap.aaf.inno.env.Trans.Metric;\r
+import org.onap.aaf.inno.env.impl.EnvFactory;\r
+import org.onap.aaf.inno.env.jaxb.JAXBmar;\r
+import org.onap.aaf.inno.env.jaxb.JAXBumar;\r
+import org.onap.aaf.inno.env.util.StringBuilderWriter;\r
+import org.onap.aaf.rosetta.InXML;\r
+import org.onap.aaf.rosetta.Out;\r
+import org.onap.aaf.rosetta.OutJson;\r
+import org.onap.aaf.rosetta.OutRaw;\r
+import org.onap.aaf.rosetta.OutXML;\r
 \r
 import s.xsd.LargerData;\r
 \r
index 7840573..ffaf429 100644 (file)
@@ -28,13 +28,12 @@ import java.io.StringReader;
 import java.io.StringWriter;\r
 \r
 import org.junit.Test;\r
-\r
-import com.att.rosetta.InJson;\r
-import com.att.rosetta.Out;\r
-import com.att.rosetta.OutJson;\r
-import com.att.rosetta.OutRaw;\r
-import com.att.rosetta.Parse;\r
-import com.att.rosetta.ParseException;\r
+import org.onap.aaf.rosetta.InJson;\r
+import org.onap.aaf.rosetta.Out;\r
+import org.onap.aaf.rosetta.OutJson;\r
+import org.onap.aaf.rosetta.OutRaw;\r
+import org.onap.aaf.rosetta.Parse;\r
+import org.onap.aaf.rosetta.ParseException;\r
 \r
 import junit.framework.Assert;\r
 \r
index 5f19ed8..77165b8 100644 (file)
@@ -25,9 +25,9 @@ package com.data.test;
 import static org.junit.Assert.assertEquals;\r
 \r
 import org.junit.Test;\r
-import static org.junit.Assert.*;\r
+import org.onap.aaf.rosetta.Ladder;\r
 \r
-import com.att.rosetta.Ladder;\r
+import static org.junit.Assert.*;\r
 \r
 public class JU_Ladder {\r
 \r
index af18a2f..c70725d 100644 (file)
@@ -24,11 +24,10 @@ package com.data.test;
 \r
 import org.junit.AfterClass;\r
 import org.junit.Test;\r
-\r
-import com.att.inno.env.Data;\r
-import com.att.rosetta.env.RosettaDF;\r
-import com.att.rosetta.env.RosettaData;\r
-import com.att.rosetta.env.RosettaEnv;\r
+import org.onap.aaf.inno.env.Data;\r
+import org.onap.aaf.rosetta.env.RosettaDF;\r
+import org.onap.aaf.rosetta.env.RosettaData;\r
+import org.onap.aaf.rosetta.env.RosettaEnv;\r
 \r
 import junit.framework.Assert;\r
 import s.xsd.LargerData;\r
index 7915a60..5c26afe 100644 (file)
@@ -26,17 +26,16 @@ import java.io.StringReader;
 \r
 import org.junit.Assert;\r
 import org.junit.Test;\r
-\r
-import com.att.inno.env.Data;\r
-import com.att.inno.env.Data.TYPE;\r
-import com.att.inno.env.TimeTaken;\r
-import com.att.inno.env.Trans;\r
-import com.att.inno.env.impl.EnvFactory;\r
-import com.att.inno.env.jaxb.JAXBmar;\r
-import com.att.inno.env.util.StringBuilderWriter;\r
-import com.att.rosetta.env.RosettaDF;\r
-import com.att.rosetta.env.RosettaData;\r
-import com.att.rosetta.env.RosettaEnv;\r
+import org.onap.aaf.inno.env.Data;\r
+import org.onap.aaf.inno.env.TimeTaken;\r
+import org.onap.aaf.inno.env.Trans;\r
+import org.onap.aaf.inno.env.Data.TYPE;\r
+import org.onap.aaf.inno.env.impl.EnvFactory;\r
+import org.onap.aaf.inno.env.jaxb.JAXBmar;\r
+import org.onap.aaf.inno.env.util.StringBuilderWriter;\r
+import org.onap.aaf.rosetta.env.RosettaDF;\r
+import org.onap.aaf.rosetta.env.RosettaData;\r
+import org.onap.aaf.rosetta.env.RosettaEnv;\r
 \r
 import s.xsd.LargerData;\r
 import s.xsd.Multi;\r
index 6314b72..1d43f88 100644 (file)
@@ -26,16 +26,15 @@ import java.io.Reader;
 import java.io.StringReader;\r
 \r
 import org.junit.Test;\r
-\r
-import com.att.inno.env.TimeTaken;\r
-import com.att.inno.env.Trans;\r
-import com.att.inno.env.impl.EnvFactory;\r
-import com.att.inno.env.util.StringBuilderWriter;\r
-import com.att.rosetta.InJson;\r
-import com.att.rosetta.JaxInfo;\r
-import com.att.rosetta.OutJson;\r
-import com.att.rosetta.OutXML;\r
-import com.att.rosetta.Saved;\r
+import org.onap.aaf.inno.env.TimeTaken;\r
+import org.onap.aaf.inno.env.Trans;\r
+import org.onap.aaf.inno.env.impl.EnvFactory;\r
+import org.onap.aaf.inno.env.util.StringBuilderWriter;\r
+import org.onap.aaf.rosetta.InJson;\r
+import org.onap.aaf.rosetta.JaxInfo;\r
+import org.onap.aaf.rosetta.OutJson;\r
+import org.onap.aaf.rosetta.OutXML;\r
+import org.onap.aaf.rosetta.Saved;\r
 \r
 import s.xsd.LargerData;\r
 \r
index b5a6c9d..4ca3328 100644 (file)
@@ -28,20 +28,19 @@ import java.io.StringReader;
 import java.io.StringWriter;\r
 \r
 import org.junit.Test;\r
-\r
-import com.att.inno.env.APIException;\r
-import com.att.inno.env.Data;\r
-import com.att.inno.env.DataFactory;\r
-import com.att.inno.env.EnvJAXB;\r
-import com.att.inno.env.impl.BasicEnv;\r
-import com.att.rosetta.InJson;\r
-import com.att.rosetta.InXML;\r
-import com.att.rosetta.Out;\r
-import com.att.rosetta.OutJson;\r
-import com.att.rosetta.OutRaw;\r
-import com.att.rosetta.OutXML;\r
-import com.att.rosetta.Parse;\r
-import com.att.rosetta.ParseException;\r
+import org.onap.aaf.inno.env.APIException;\r
+import org.onap.aaf.inno.env.Data;\r
+import org.onap.aaf.inno.env.DataFactory;\r
+import org.onap.aaf.inno.env.EnvJAXB;\r
+import org.onap.aaf.inno.env.impl.BasicEnv;\r
+import org.onap.aaf.rosetta.InJson;\r
+import org.onap.aaf.rosetta.InXML;\r
+import org.onap.aaf.rosetta.Out;\r
+import org.onap.aaf.rosetta.OutJson;\r
+import org.onap.aaf.rosetta.OutRaw;\r
+import org.onap.aaf.rosetta.OutXML;\r
+import org.onap.aaf.rosetta.Parse;\r
+import org.onap.aaf.rosetta.ParseException;\r
 \r
 import inherit.DerivedA;\r
 import inherit.Root;\r
index 66c83c0..cb65f24 100644 (file)
@@ -23,8 +23,7 @@
 package com.data.test;\r
 \r
 import org.junit.Test;\r
-\r
-import com.att.rosetta.JaxInfo;\r
+import org.onap.aaf.rosetta.JaxInfo;\r
 \r
 import s.xsd.LargerData;\r
 \r
index d34815f..3fef743 100644 (file)
@@ -28,23 +28,23 @@ import javax.xml.datatype.XMLGregorianCalendar;
 import javax.xml.namespace.QName;\r
 \r
 import org.junit.Test;\r
+import org.onap.aaf.inno.env.Data;\r
+import org.onap.aaf.inno.env.Env;\r
+import org.onap.aaf.inno.env.Trans;\r
+import org.onap.aaf.inno.env.Data.TYPE;\r
+import org.onap.aaf.inno.env.Trans.Metric;\r
+import org.onap.aaf.inno.env.jaxb.JAXBmar;\r
+import org.onap.aaf.inno.env.jaxb.JAXBumar;\r
+import org.onap.aaf.inno.env.util.Chrono;\r
+import org.onap.aaf.inno.env.util.StringBuilderWriter;\r
+import org.onap.aaf.rosetta.OutJson;\r
+import org.onap.aaf.rosetta.OutRaw;\r
+import org.onap.aaf.rosetta.OutXML;\r
+import org.onap.aaf.rosetta.env.RosettaDF;\r
+import org.onap.aaf.rosetta.env.RosettaData;\r
+import org.onap.aaf.rosetta.env.RosettaEnv;\r
+import org.onap.aaf.rosetta.marshal.DocMarshal;\r
 \r
-import com.att.inno.env.Data;\r
-import com.att.inno.env.Data.TYPE;\r
-import com.att.inno.env.Env;\r
-import com.att.inno.env.Trans;\r
-import com.att.inno.env.Trans.Metric;\r
-import com.att.inno.env.jaxb.JAXBmar;\r
-import com.att.inno.env.jaxb.JAXBumar;\r
-import com.att.inno.env.util.Chrono;\r
-import com.att.inno.env.util.StringBuilderWriter;\r
-import com.att.rosetta.OutJson;\r
-import com.att.rosetta.OutRaw;\r
-import com.att.rosetta.OutXML;\r
-import com.att.rosetta.env.RosettaDF;\r
-import com.att.rosetta.env.RosettaData;\r
-import com.att.rosetta.env.RosettaEnv;\r
-import com.att.rosetta.marshal.DocMarshal;\r
 import com.data.test.obj.MultiMarshal;\r
 import com.data.test.obj.SingleMarshal;\r
 \r
index 6e9d0fb..b4f477f 100644 (file)
@@ -25,11 +25,11 @@ package com.data.test;
 import java.io.IOException;\r
 import java.io.Writer;\r
 \r
-import com.att.inno.env.util.IndentPrintWriter;\r
-import com.att.rosetta.Out;\r
-import com.att.rosetta.Parse;\r
-import com.att.rosetta.ParseException;\r
-import com.att.rosetta.Parsed;\r
+import org.onap.aaf.inno.env.util.IndentPrintWriter;\r
+import org.onap.aaf.rosetta.Out;\r
+import org.onap.aaf.rosetta.Parse;\r
+import org.onap.aaf.rosetta.ParseException;\r
+import org.onap.aaf.rosetta.Parsed;\r
 \r
 public class OutDump extends Out{\r
 \r
index 9a970dc..7179245 100644 (file)
@@ -25,8 +25,8 @@ package com.data.test;
 import java.io.IOException;\r
 import java.io.Writer;\r
 \r
-import com.att.inno.env.Trans;\r
-import com.att.inno.env.Trans.Metric;\r
+import org.onap.aaf.inno.env.Trans;\r
+import org.onap.aaf.inno.env.Trans.Metric;\r
 \r
 public class Report {\r
        float total;\r
index ca105b3..31e4f43 100644 (file)
@@ -24,8 +24,8 @@ package com.data.test.obj;
 \r
 import java.util.List;\r
 \r
-import com.att.rosetta.marshal.ObjArray;\r
-import com.att.rosetta.marshal.ObjMarshal;\r
+import org.onap.aaf.rosetta.marshal.ObjArray;\r
+import org.onap.aaf.rosetta.marshal.ObjMarshal;\r
 \r
 import types.xsd.Multi;\r
 import types.xsd.Multi.Single;\r
index b1ac110..d524516 100644 (file)
@@ -26,14 +26,14 @@ import java.util.List;
 \r
 import javax.xml.datatype.XMLGregorianCalendar;\r
 \r
-import com.att.rosetta.marshal.DataWriter;\r
-import com.att.rosetta.marshal.FieldArray;\r
-import com.att.rosetta.marshal.FieldDate;\r
-import com.att.rosetta.marshal.FieldDateTime;\r
-import com.att.rosetta.marshal.FieldHexBinary;\r
-import com.att.rosetta.marshal.FieldNumeric;\r
-import com.att.rosetta.marshal.FieldString;\r
-import com.att.rosetta.marshal.ObjMarshal;\r
+import org.onap.aaf.rosetta.marshal.DataWriter;\r
+import org.onap.aaf.rosetta.marshal.FieldArray;\r
+import org.onap.aaf.rosetta.marshal.FieldDate;\r
+import org.onap.aaf.rosetta.marshal.FieldDateTime;\r
+import org.onap.aaf.rosetta.marshal.FieldHexBinary;\r
+import org.onap.aaf.rosetta.marshal.FieldNumeric;\r
+import org.onap.aaf.rosetta.marshal.FieldString;\r
+import org.onap.aaf.rosetta.marshal.ObjMarshal;\r
 \r
 import types.xsd.Multi.Single;\r
 \r
index 1ead38c..ce495d2 100644 (file)
@@ -23,7 +23,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">\r
        <parent>\r
-               <groupId>com.att.inno</groupId>\r
+               <groupId>org.onap.aaf.inno</groupId>\r
                <artifactId>parent</artifactId>\r
                <version>1.0.0-SNAPSHOT</version>\r
                <relativePath>..</relativePath>\r
@@ -63,7 +63,7 @@
        </properties>\r
        <dependencies>\r
                <dependency>\r
-                       <groupId>com.att.inno</groupId>\r
+                       <groupId>org.onap.aaf.inno</groupId>\r
                        <artifactId>env</artifactId>\r
                        <version>${project.version}</version>\r
                </dependency>\r
similarity index 95%
rename from xgen/src/main/java/com/att/xgen/Back.java
rename to xgen/src/main/java/org/onap/aaf/xgen/Back.java
index 154ba88..0c9f592 100644 (file)
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.xgen;\r
+package org.onap.aaf.xgen;\r
 \r
 public class Back {\r
        public String str;\r
similarity index 96%
rename from xgen/src/main/java/com/att/xgen/Cache.java
rename to xgen/src/main/java/org/onap/aaf/xgen/Cache.java
index 6c887cc..7f75703 100644 (file)
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.xgen;\r
+package org.onap.aaf.xgen;\r
 \r
 \r
 public interface Cache<G extends XGen<G>> {\r
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.xgen;\r
+package org.onap.aaf.xgen;\r
 \r
 import java.io.IOException;\r
 import java.io.OutputStream;\r
@@ -28,11 +28,11 @@ import java.io.OutputStreamWriter;
 import java.io.Writer;\r
 import java.util.ArrayList;\r
 \r
-import com.att.inno.env.APIException;\r
-import com.att.inno.env.Env;\r
-import com.att.inno.env.Trans;\r
-import com.att.xgen.html.State;\r
-import com.att.xgen.html.Thematic;\r
+import org.onap.aaf.inno.env.APIException;\r
+import org.onap.aaf.inno.env.Env;\r
+import org.onap.aaf.inno.env.Trans;\r
+import org.onap.aaf.xgen.html.State;\r
+import org.onap.aaf.xgen.html.Thematic;\r
 \r
 \r
 public abstract class CacheGen<G extends XGen<G>> {\r
similarity index 93%
rename from xgen/src/main/java/com/att/xgen/Code.java
rename to xgen/src/main/java/org/onap/aaf/xgen/Code.java
index 70d0c74..163a9dd 100644 (file)
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.xgen;\r
+package org.onap.aaf.xgen;\r
 \r
 import java.io.IOException;\r
 \r
-import com.att.inno.env.APIException;\r
+import org.onap.aaf.inno.env.APIException;\r
 \r
 public interface Code<G extends XGen<G>> {\r
        public void code(Cache<G> cache, G xgen) throws APIException, IOException;\r
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.xgen;\r
+package org.onap.aaf.xgen;\r
 \r
 import java.io.IOException;\r
 \r
-import com.att.inno.env.APIException;\r
-import com.att.inno.env.Env;\r
-import com.att.inno.env.Trans;\r
-import com.att.xgen.html.State;\r
+import org.onap.aaf.inno.env.APIException;\r
+import org.onap.aaf.inno.env.Env;\r
+import org.onap.aaf.inno.env.Trans;\r
+import org.onap.aaf.xgen.html.State;\r
 \r
 /**\r
  * Special Code Interface to gain access to Transaction\r
similarity index 95%
rename from xgen/src/main/java/com/att/xgen/Mark.java
rename to xgen/src/main/java/org/onap/aaf/xgen/Mark.java
index 4b148d2..4872139 100644 (file)
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.xgen;\r
+package org.onap.aaf.xgen;\r
 \r
 public class Mark {\r
        // package on purpose\r
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.xgen;\r
+package org.onap.aaf.xgen;\r
 \r
 import java.io.IOException;\r
 import java.io.Writer;\r
 \r
-import com.att.inno.env.APIException;\r
-import com.att.inno.env.Env;\r
-import com.att.inno.env.Trans;\r
-import com.att.xgen.html.State;\r
+import org.onap.aaf.inno.env.APIException;\r
+import org.onap.aaf.inno.env.Env;\r
+import org.onap.aaf.inno.env.Trans;\r
+import org.onap.aaf.xgen.html.State;\r
 \r
 public class Section<G extends XGen<G>> {\r
        protected int indent;\r
similarity index 94%
rename from xgen/src/main/java/com/att/xgen/XGen.java
rename to xgen/src/main/java/org/onap/aaf/xgen/XGen.java
index fe6acba..089c62a 100644 (file)
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.xgen;\r
+package org.onap.aaf.xgen;\r
 \r
 import java.io.PrintWriter;\r
 import java.io.Writer;\r
 import java.util.Stack;\r
 \r
-import com.att.inno.env.util.IndentPrintWriter;\r
-import com.att.inno.env.util.StringBuilderWriter;\r
+import org.onap.aaf.inno.env.util.IndentPrintWriter;\r
+import org.onap.aaf.inno.env.util.StringBuilderWriter;\r
 \r
 public class XGen<RT extends XGen<RT>> {\r
 \r
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.xgen;\r
+package org.onap.aaf.xgen;\r
 \r
 import java.io.IOException;\r
 \r
-import com.att.inno.env.APIException;\r
-import com.att.inno.env.Env;\r
-import com.att.inno.env.Trans;\r
-import com.att.inno.env.util.StringBuilderWriter;\r
-import com.att.xgen.html.State;\r
+import org.onap.aaf.inno.env.APIException;\r
+import org.onap.aaf.inno.env.Env;\r
+import org.onap.aaf.inno.env.Trans;\r
+import org.onap.aaf.inno.env.util.StringBuilderWriter;\r
+import org.onap.aaf.xgen.html.State;\r
 \r
 public class XGenBuff<G extends XGen<G>> {\r
        private G xgen;\r
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.xgen.html;\r
+package org.onap.aaf.xgen.html;\r
 \r
 import java.io.Writer;\r
 \r
-import com.att.xgen.Mark;\r
+import org.onap.aaf.xgen.Mark;\r
 \r
 public class HTML4Gen extends HTMLGen {\r
        private final static String DOCTYPE = \r
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.xgen.html;\r
+package org.onap.aaf.xgen.html;\r
 \r
 import java.io.Writer;\r
 \r
-import com.att.xgen.Mark;\r
+import org.onap.aaf.xgen.Mark;\r
 \r
 public class HTML5Gen extends HTMLGen {\r
        public HTML5Gen(Writer w) {\r
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.xgen.html;\r
+package org.onap.aaf.xgen.html;\r
 \r
 import java.io.IOException;\r
 import java.io.Writer;\r
 \r
-import com.att.inno.env.APIException;\r
-import com.att.xgen.CacheGen;\r
-import com.att.xgen.Code;\r
+import org.onap.aaf.inno.env.APIException;\r
+import org.onap.aaf.xgen.CacheGen;\r
+import org.onap.aaf.xgen.Code;\r
 \r
 public class HTMLCacheGen extends CacheGen<HTMLGen> {\r
        protected int flags;\r
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.xgen.html;\r
+package org.onap.aaf.xgen.html;\r
 \r
 import java.io.Writer;\r
 \r
-import com.att.xgen.Mark;\r
-import com.att.xgen.XGen;\r
+import org.onap.aaf.xgen.Mark;\r
+import org.onap.aaf.xgen.XGen;\r
 \r
 public abstract class HTMLGen extends XGen<HTMLGen> {\r
        public static final String A = "a";\r
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.xgen.html;\r
+package org.onap.aaf.xgen.html;\r
 \r
 import java.util.ArrayList;\r
 import java.util.List;\r
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.xgen.html;\r
+package org.onap.aaf.xgen.html;\r
 \r
 import java.io.BufferedReader;\r
 import java.io.FileReader;\r
 import java.io.IOException;\r
 \r
-import com.att.inno.env.util.IndentPrintWriter;\r
-import com.att.xgen.Back;\r
-import com.att.xgen.Mark;\r
+import org.onap.aaf.inno.env.util.IndentPrintWriter;\r
+import org.onap.aaf.xgen.Back;\r
+import org.onap.aaf.xgen.Mark;\r
 \r
 \r
 public class JSGen {\r
@@ -20,9 +20,9 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.xgen.html;\r
+package org.onap.aaf.xgen.html;\r
 \r
-import com.att.inno.env.Env;\r
+import org.onap.aaf.inno.env.Env;\r
 \r
 public interface State<ENV extends Env> {\r
 }\r
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.xgen.html;\r
+package org.onap.aaf.xgen.html;\r
 \r
 public interface Thematic {\r
        String themePath(String theTheme);\r
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.xgen.xml;\r
+package org.onap.aaf.xgen.xml;\r
 \r
 import java.io.IOException;\r
 import java.io.Writer;\r
 \r
-import com.att.inno.env.APIException;\r
-import com.att.xgen.CacheGen;\r
-import com.att.xgen.Code;\r
+import org.onap.aaf.inno.env.APIException;\r
+import org.onap.aaf.xgen.CacheGen;\r
+import org.onap.aaf.xgen.Code;\r
 \r
 public class XMLCacheGen extends CacheGen<XMLGen> {\r
 \r
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.xgen.xml;\r
+package org.onap.aaf.xgen.xml;\r
 \r
 import java.io.Writer;\r
 \r
-import com.att.xgen.XGen;;\r
+import org.onap.aaf.xgen.XGen;;\r
 \r
 public class XMLGen extends XGen<XMLGen> {\r
        private final String XML_TAG; \r