diff options
| -rw-r--r-- | env/pom.xml | 2 | ||||
| -rw-r--r-- | env/src/main/java/org/onap/aaf/inno/env/APIException.java (renamed from env/src/main/java/com/att/inno/env/APIException.java) | 2 | ||||
| -rw-r--r-- | env/src/main/java/org/onap/aaf/inno/env/BaseDataFactory.java (renamed from env/src/main/java/com/att/inno/env/BaseDataFactory.java) | 5 | ||||
| -rw-r--r-- | env/src/main/java/org/onap/aaf/inno/env/Creatable.java (renamed from env/src/main/java/com/att/inno/env/Creatable.java) | 2 | ||||
| -rw-r--r-- | env/src/main/java/org/onap/aaf/inno/env/Data.java (renamed from env/src/main/java/com/att/inno/env/Data.java) | 2 | ||||
| -rw-r--r-- | env/src/main/java/org/onap/aaf/inno/env/DataFactory.java (renamed from env/src/main/java/com/att/inno/env/DataFactory.java) | 2 | ||||
| -rw-r--r-- | env/src/main/java/org/onap/aaf/inno/env/Decryptor.java (renamed from env/src/main/java/com/att/inno/env/Decryptor.java) | 2 | ||||
| -rw-r--r-- | env/src/main/java/org/onap/aaf/inno/env/Encryptor.java (renamed from env/src/main/java/com/att/inno/env/Encryptor.java) | 2 | ||||
| -rw-r--r-- | env/src/main/java/org/onap/aaf/inno/env/Env.java (renamed from env/src/main/java/com/att/inno/env/Env.java) | 2 | ||||
| -rw-r--r-- | env/src/main/java/org/onap/aaf/inno/env/EnvJAXB.java (renamed from env/src/main/java/com/att/inno/env/EnvJAXB.java) | 2 | ||||
| -rw-r--r-- | env/src/main/java/org/onap/aaf/inno/env/EnvJAXBProps.java (renamed from env/src/main/java/com/att/inno/env/EnvJAXBProps.java) | 2 | ||||
| -rw-r--r-- | env/src/main/java/org/onap/aaf/inno/env/EnvProps.java (renamed from env/src/main/java/com/att/inno/env/EnvProps.java) | 2 | ||||
| -rw-r--r-- | env/src/main/java/org/onap/aaf/inno/env/EnvStore.java (renamed from env/src/main/java/com/att/inno/env/EnvStore.java) | 2 | ||||
| -rw-r--r-- | env/src/main/java/org/onap/aaf/inno/env/IOObjectifier.java (renamed from env/src/main/java/com/att/inno/env/IOObjectifier.java) | 2 | ||||
| -rw-r--r-- | env/src/main/java/org/onap/aaf/inno/env/IOStringifier.java (renamed from env/src/main/java/com/att/inno/env/IOStringifier.java) | 2 | ||||
| -rw-r--r-- | env/src/main/java/org/onap/aaf/inno/env/LifeCycle.java (renamed from env/src/main/java/com/att/inno/env/LifeCycle.java) | 4 | ||||
| -rw-r--r-- | env/src/main/java/org/onap/aaf/inno/env/LogTarget.java (renamed from env/src/main/java/com/att/inno/env/LogTarget.java) | 6 | ||||
| -rw-r--r-- | env/src/main/java/org/onap/aaf/inno/env/Objectifier.java (renamed from env/src/main/java/com/att/inno/env/Objectifier.java) | 2 | ||||
| -rw-r--r-- | env/src/main/java/org/onap/aaf/inno/env/Slot.java (renamed from env/src/main/java/com/att/inno/env/Slot.java) | 2 | ||||
| -rw-r--r-- | env/src/main/java/org/onap/aaf/inno/env/StaticSlot.java (renamed from env/src/main/java/com/att/inno/env/StaticSlot.java) | 2 | ||||
| -rw-r--r-- | env/src/main/java/org/onap/aaf/inno/env/Store.java (renamed from env/src/main/java/com/att/inno/env/Store.java) | 2 | ||||
| -rw-r--r-- | env/src/main/java/org/onap/aaf/inno/env/StoreImpl.java (renamed from env/src/main/java/com/att/inno/env/StoreImpl.java) | 7 | ||||
| -rw-r--r-- | env/src/main/java/org/onap/aaf/inno/env/Stringifier.java (renamed from env/src/main/java/com/att/inno/env/Stringifier.java) | 2 | ||||
| -rw-r--r-- | env/src/main/java/org/onap/aaf/inno/env/TimeTaken.java (renamed from env/src/main/java/com/att/inno/env/TimeTaken.java) | 2 | ||||
| -rw-r--r-- | env/src/main/java/org/onap/aaf/inno/env/Trans.java (renamed from env/src/main/java/com/att/inno/env/Trans.java) | 2 | ||||
| -rw-r--r-- | env/src/main/java/org/onap/aaf/inno/env/TransCreate.java (renamed from env/src/main/java/com/att/inno/env/TransCreate.java) | 2 | ||||
| -rw-r--r-- | env/src/main/java/org/onap/aaf/inno/env/TransJAXB.java (renamed from env/src/main/java/com/att/inno/env/TransJAXB.java) | 2 | ||||
| -rw-r--r-- | env/src/main/java/org/onap/aaf/inno/env/TransStore.java (renamed from env/src/main/java/com/att/inno/env/TransStore.java) | 2 | ||||
| -rw-r--r-- | env/src/main/java/org/onap/aaf/inno/env/impl/AbsTrans.java (renamed from env/src/main/java/com/att/inno/env/impl/AbsTrans.java) | 14 | ||||
| -rw-r--r-- | env/src/main/java/org/onap/aaf/inno/env/impl/AbsTransJAXB.java (renamed from env/src/main/java/com/att/inno/env/impl/AbsTransJAXB.java) | 10 | ||||
| -rw-r--r-- | env/src/main/java/org/onap/aaf/inno/env/impl/BasicEnv.java (renamed from env/src/main/java/com/att/inno/env/impl/BasicEnv.java) | 28 | ||||
| -rw-r--r-- | env/src/main/java/org/onap/aaf/inno/env/impl/BasicTrans.java (renamed from env/src/main/java/com/att/inno/env/impl/BasicTrans.java) | 14 | ||||
| -rw-r--r-- | env/src/main/java/org/onap/aaf/inno/env/impl/EnvFactory.java (renamed from env/src/main/java/com/att/inno/env/impl/EnvFactory.java) | 8 | ||||
| -rw-r--r-- | env/src/main/java/org/onap/aaf/inno/env/impl/JavaUtilLogTarget.java (renamed from env/src/main/java/com/att/inno/env/impl/JavaUtilLogTarget.java) | 4 | ||||
| -rw-r--r-- | env/src/main/java/org/onap/aaf/inno/env/impl/Log4JLogTarget.java (renamed from env/src/main/java/com/att/inno/env/impl/Log4JLogTarget.java) | 9 | ||||
| -rw-r--r-- | env/src/main/java/org/onap/aaf/inno/env/impl/NullLifeCycle.java (renamed from env/src/main/java/com/att/inno/env/impl/NullLifeCycle.java) | 8 | ||||
| -rw-r--r-- | env/src/main/java/org/onap/aaf/inno/env/jaxb/JAXBDF.java (renamed from env/src/main/java/com/att/inno/env/jaxb/JAXBDF.java) | 20 | ||||
| -rw-r--r-- | env/src/main/java/org/onap/aaf/inno/env/jaxb/JAXBData.java (renamed from env/src/main/java/com/att/inno/env/jaxb/JAXBData.java) | 16 | ||||
| -rw-r--r-- | env/src/main/java/org/onap/aaf/inno/env/jaxb/JAXBObjectifier.java (renamed from env/src/main/java/com/att/inno/env/jaxb/JAXBObjectifier.java) | 10 | ||||
| -rw-r--r-- | env/src/main/java/org/onap/aaf/inno/env/jaxb/JAXBStringifier.java (renamed from env/src/main/java/com/att/inno/env/jaxb/JAXBStringifier.java) | 10 | ||||
| -rw-r--r-- | env/src/main/java/org/onap/aaf/inno/env/jaxb/JAXBmar.java (renamed from env/src/main/java/com/att/inno/env/jaxb/JAXBmar.java) | 10 | ||||
| -rw-r--r-- | env/src/main/java/org/onap/aaf/inno/env/jaxb/JAXBumar.java (renamed from env/src/main/java/com/att/inno/env/jaxb/JAXBumar.java) | 11 | ||||
| -rw-r--r-- | env/src/main/java/org/onap/aaf/inno/env/old/IOObjectifier.java (renamed from env/src/main/java/com/att/inno/env/old/IOObjectifier.java) | 6 | ||||
| -rw-r--r-- | env/src/main/java/org/onap/aaf/inno/env/old/IOStringifier.java (renamed from env/src/main/java/com/att/inno/env/old/IOStringifier.java) | 6 | ||||
| -rw-r--r-- | env/src/main/java/org/onap/aaf/inno/env/old/Objectifier.java (renamed from env/src/main/java/com/att/inno/env/old/Objectifier.java) | 8 | ||||
| -rw-r--r-- | env/src/main/java/org/onap/aaf/inno/env/old/OldDataFactory.java (renamed from env/src/main/java/com/att/inno/env/old/OldDataFactory.java) | 10 | ||||
| -rw-r--r-- | env/src/main/java/org/onap/aaf/inno/env/old/Stringifier.java (renamed from env/src/main/java/com/att/inno/env/old/Stringifier.java) | 8 | ||||
| -rw-r--r-- | env/src/main/java/org/onap/aaf/inno/env/util/Chrono.java (renamed from env/src/main/java/com/att/inno/env/util/Chrono.java) | 2 | ||||
| -rw-r--r-- | env/src/main/java/org/onap/aaf/inno/env/util/DoubleOutputStream.java (renamed from env/src/main/java/com/att/inno/env/util/DoubleOutputStream.java) | 2 | ||||
| -rw-r--r-- | env/src/main/java/org/onap/aaf/inno/env/util/IndentPrintWriter.java (renamed from env/src/main/java/com/att/inno/env/util/IndentPrintWriter.java) | 2 | ||||
| -rw-r--r-- | env/src/main/java/org/onap/aaf/inno/env/util/Pool.java (renamed from env/src/main/java/com/att/inno/env/util/Pool.java) | 6 | ||||
| -rw-r--r-- | env/src/main/java/org/onap/aaf/inno/env/util/RefreshableThreadObject.java (renamed from env/src/main/java/com/att/inno/env/util/RefreshableThreadObject.java) | 10 | ||||
| -rw-r--r-- | env/src/main/java/org/onap/aaf/inno/env/util/Split.java (renamed from env/src/main/java/com/att/inno/env/util/Split.java) | 2 | ||||
| -rw-r--r-- | env/src/main/java/org/onap/aaf/inno/env/util/StringBuilderOutputStream.java (renamed from env/src/main/java/com/att/inno/env/util/StringBuilderOutputStream.java) | 2 | ||||
| -rw-r--r-- | env/src/main/java/org/onap/aaf/inno/env/util/StringBuilderWriter.java (renamed from env/src/main/java/com/att/inno/env/util/StringBuilderWriter.java) | 2 | ||||
| -rw-r--r-- | log4j/pom.xml | 4 | ||||
| -rw-r--r-- | log4j/src/main/java/org/onap/aaf/inno/env/log4j/LogFileNamer.java (renamed from log4j/src/main/java/com/att/inno/env/log4j/LogFileNamer.java) | 2 | ||||
| -rw-r--r-- | log4j/src/main/java/org/onap/aaf/inno/env/log4j/PIDAccess.java (renamed from log4j/src/main/java/com/att/inno/env/log4j/PIDAccess.java) | 2 | ||||
| -rw-r--r-- | log4j/src/test/java/org/onap/aaf/inno/env/log4j/LogTest.java (renamed from log4j/src/test/java/com/att/inno/env/log4j/LogTest.java) | 4 | ||||
| -rw-r--r-- | pom.xml | 49 | ||||
| -rw-r--r-- | rosetta/pom.xml | 25 | ||||
| -rw-r--r-- | rosetta/src/main/java/org/onap/aaf/rosetta/InJson.java (renamed from rosetta/src/main/java/com/att/rosetta/InJson.java) | 8 | ||||
| -rw-r--r-- | rosetta/src/main/java/org/onap/aaf/rosetta/InXML.java (renamed from rosetta/src/main/java/com/att/rosetta/InXML.java) | 8 | ||||
| -rw-r--r-- | rosetta/src/main/java/org/onap/aaf/rosetta/JaxEval.java (renamed from rosetta/src/main/java/com/att/rosetta/JaxEval.java) | 2 | ||||
| -rw-r--r-- | rosetta/src/main/java/org/onap/aaf/rosetta/JaxInfo.java (renamed from rosetta/src/main/java/com/att/rosetta/JaxInfo.java) | 2 | ||||
| -rw-r--r-- | rosetta/src/main/java/org/onap/aaf/rosetta/JaxSet.java (renamed from rosetta/src/main/java/com/att/rosetta/JaxSet.java) | 2 | ||||
| -rw-r--r-- | rosetta/src/main/java/org/onap/aaf/rosetta/Ladder.java (renamed from rosetta/src/main/java/com/att/rosetta/Ladder.java) | 2 | ||||
| -rw-r--r-- | rosetta/src/main/java/org/onap/aaf/rosetta/Marshal.java (renamed from rosetta/src/main/java/com/att/rosetta/Marshal.java) | 6 | ||||
| -rw-r--r-- | rosetta/src/main/java/org/onap/aaf/rosetta/Nulls.java (renamed from rosetta/src/main/java/com/att/rosetta/Nulls.java) | 6 | ||||
| -rw-r--r-- | rosetta/src/main/java/org/onap/aaf/rosetta/Out.java (renamed from rosetta/src/main/java/com/att/rosetta/Out.java) | 2 | ||||
| -rw-r--r-- | rosetta/src/main/java/org/onap/aaf/rosetta/OutJax.java (renamed from rosetta/src/main/java/com/att/rosetta/OutJax.java) | 2 | ||||
| -rw-r--r-- | rosetta/src/main/java/org/onap/aaf/rosetta/OutJson.java (renamed from rosetta/src/main/java/com/att/rosetta/OutJson.java) | 4 | ||||
| -rw-r--r-- | rosetta/src/main/java/org/onap/aaf/rosetta/OutRaw.java (renamed from rosetta/src/main/java/com/att/rosetta/OutRaw.java) | 2 | ||||
| -rw-r--r-- | rosetta/src/main/java/org/onap/aaf/rosetta/OutXML.java (renamed from rosetta/src/main/java/com/att/rosetta/OutXML.java) | 6 | ||||
| -rw-r--r-- | rosetta/src/main/java/org/onap/aaf/rosetta/Parse.java (renamed from rosetta/src/main/java/com/att/rosetta/Parse.java) | 6 | ||||
| -rw-r--r-- | rosetta/src/main/java/org/onap/aaf/rosetta/ParseException.java (renamed from rosetta/src/main/java/com/att/rosetta/ParseException.java) | 2 | ||||
| -rw-r--r-- | rosetta/src/main/java/org/onap/aaf/rosetta/Parsed.java (renamed from rosetta/src/main/java/com/att/rosetta/Parsed.java) | 2 | ||||
| -rw-r--r-- | rosetta/src/main/java/org/onap/aaf/rosetta/Prop.java (renamed from rosetta/src/main/java/com/att/rosetta/Prop.java) | 2 | ||||
| -rw-r--r-- | rosetta/src/main/java/org/onap/aaf/rosetta/Saved.java (renamed from rosetta/src/main/java/com/att/rosetta/Saved.java) | 8 | ||||
| -rw-r--r-- | rosetta/src/main/java/org/onap/aaf/rosetta/XmlEscape.java (renamed from rosetta/src/main/java/com/att/rosetta/XmlEscape.java) | 2 | ||||
| -rw-r--r-- | rosetta/src/main/java/org/onap/aaf/rosetta/env/RosettaDF.java (renamed from rosetta/src/main/java/com/att/rosetta/env/RosettaDF.java) | 46 | ||||
| -rw-r--r-- | rosetta/src/main/java/org/onap/aaf/rosetta/env/RosettaData.java (renamed from rosetta/src/main/java/com/att/rosetta/env/RosettaData.java) | 16 | ||||
| -rw-r--r-- | rosetta/src/main/java/org/onap/aaf/rosetta/env/RosettaEnv.java (renamed from rosetta/src/main/java/com/att/rosetta/env/RosettaEnv.java) | 6 | ||||
| -rw-r--r-- | rosetta/src/main/java/org/onap/aaf/rosetta/marshal/DataWriter.java (renamed from rosetta/src/main/java/com/att/rosetta/marshal/DataWriter.java) | 4 | ||||
| -rw-r--r-- | rosetta/src/main/java/org/onap/aaf/rosetta/marshal/DocMarshal.java (renamed from rosetta/src/main/java/com/att/rosetta/marshal/DocMarshal.java) | 10 | ||||
| -rw-r--r-- | rosetta/src/main/java/org/onap/aaf/rosetta/marshal/FieldArray.java (renamed from rosetta/src/main/java/com/att/rosetta/marshal/FieldArray.java) | 10 | ||||
| -rw-r--r-- | rosetta/src/main/java/org/onap/aaf/rosetta/marshal/FieldBlob.java (renamed from rosetta/src/main/java/com/att/rosetta/marshal/FieldBlob.java) | 2 | ||||
| -rw-r--r-- | rosetta/src/main/java/org/onap/aaf/rosetta/marshal/FieldDate.java (renamed from rosetta/src/main/java/com/att/rosetta/marshal/FieldDate.java) | 2 | ||||
| -rw-r--r-- | rosetta/src/main/java/org/onap/aaf/rosetta/marshal/FieldDateTime.java (renamed from rosetta/src/main/java/com/att/rosetta/marshal/FieldDateTime.java) | 2 | ||||
| -rw-r--r-- | rosetta/src/main/java/org/onap/aaf/rosetta/marshal/FieldHexBinary.java (renamed from rosetta/src/main/java/com/att/rosetta/marshal/FieldHexBinary.java) | 2 | ||||
| -rw-r--r-- | rosetta/src/main/java/org/onap/aaf/rosetta/marshal/FieldMarshal.java (renamed from rosetta/src/main/java/com/att/rosetta/marshal/FieldMarshal.java) | 8 | ||||
| -rw-r--r-- | rosetta/src/main/java/org/onap/aaf/rosetta/marshal/FieldNumeric.java (renamed from rosetta/src/main/java/com/att/rosetta/marshal/FieldNumeric.java) | 2 | ||||
| -rw-r--r-- | rosetta/src/main/java/org/onap/aaf/rosetta/marshal/FieldString.java (renamed from rosetta/src/main/java/com/att/rosetta/marshal/FieldString.java) | 2 | ||||
| -rw-r--r-- | rosetta/src/main/java/org/onap/aaf/rosetta/marshal/ListIterator.java (renamed from rosetta/src/main/java/com/att/rosetta/marshal/ListIterator.java) | 2 | ||||
| -rw-r--r-- | rosetta/src/main/java/org/onap/aaf/rosetta/marshal/ObjArray.java (renamed from rosetta/src/main/java/com/att/rosetta/marshal/ObjArray.java) | 10 | ||||
| -rw-r--r-- | rosetta/src/main/java/org/onap/aaf/rosetta/marshal/ObjMarshal.java (renamed from rosetta/src/main/java/com/att/rosetta/marshal/ObjMarshal.java) | 10 | ||||
| -rw-r--r-- | rosetta/src/test/java/com/data/test/JU_FromJSON.java | 27 | ||||
| -rw-r--r-- | rosetta/src/test/java/com/data/test/JU_FromXML.java | 29 | ||||
| -rw-r--r-- | rosetta/src/test/java/com/data/test/JU_JSON.java | 13 | ||||
| -rw-r--r-- | rosetta/src/test/java/com/data/test/JU_Ladder.java | 4 | ||||
| -rw-r--r-- | rosetta/src/test/java/com/data/test/JU_Nulls.java | 9 | ||||
| -rw-r--r-- | rosetta/src/test/java/com/data/test/JU_RosettaDF.java | 21 | ||||
| -rw-r--r-- | rosetta/src/test/java/com/data/test/JU_Saved.java | 19 | ||||
| -rw-r--r-- | rosetta/src/test/java/com/data/test/JU_Stream2Obj.java | 27 | ||||
| -rw-r--r-- | rosetta/src/test/java/com/data/test/JU_Struct.java | 3 | ||||
| -rw-r--r-- | rosetta/src/test/java/com/data/test/JU_Types.java | 32 | ||||
| -rw-r--r-- | rosetta/src/test/java/com/data/test/OutDump.java | 10 | ||||
| -rw-r--r-- | rosetta/src/test/java/com/data/test/Report.java | 4 | ||||
| -rw-r--r-- | rosetta/src/test/java/com/data/test/obj/MultiMarshal.java | 4 | ||||
| -rw-r--r-- | rosetta/src/test/java/com/data/test/obj/SingleMarshal.java | 16 | ||||
| -rw-r--r-- | xgen/pom.xml | 4 | ||||
| -rw-r--r-- | xgen/src/main/java/org/onap/aaf/xgen/Back.java (renamed from xgen/src/main/java/com/att/xgen/Back.java) | 2 | ||||
| -rw-r--r-- | xgen/src/main/java/org/onap/aaf/xgen/Cache.java (renamed from xgen/src/main/java/com/att/xgen/Cache.java) | 2 | ||||
| -rw-r--r-- | xgen/src/main/java/org/onap/aaf/xgen/CacheGen.java (renamed from xgen/src/main/java/com/att/xgen/CacheGen.java) | 12 | ||||
| -rw-r--r-- | xgen/src/main/java/org/onap/aaf/xgen/Code.java (renamed from xgen/src/main/java/com/att/xgen/Code.java) | 4 | ||||
| -rw-r--r-- | xgen/src/main/java/org/onap/aaf/xgen/DynamicCode.java (renamed from xgen/src/main/java/com/att/xgen/DynamicCode.java) | 10 | ||||
| -rw-r--r-- | xgen/src/main/java/org/onap/aaf/xgen/Mark.java (renamed from xgen/src/main/java/com/att/xgen/Mark.java) | 2 | ||||
| -rw-r--r-- | xgen/src/main/java/org/onap/aaf/xgen/Section.java (renamed from xgen/src/main/java/com/att/xgen/Section.java) | 10 | ||||
| -rw-r--r-- | xgen/src/main/java/org/onap/aaf/xgen/XGen.java (renamed from xgen/src/main/java/com/att/xgen/XGen.java) | 6 | ||||
| -rw-r--r-- | xgen/src/main/java/org/onap/aaf/xgen/XGenBuff.java (renamed from xgen/src/main/java/com/att/xgen/XGenBuff.java) | 12 | ||||
| -rw-r--r-- | xgen/src/main/java/org/onap/aaf/xgen/html/HTML4Gen.java (renamed from xgen/src/main/java/com/att/xgen/html/HTML4Gen.java) | 4 | ||||
| -rw-r--r-- | xgen/src/main/java/org/onap/aaf/xgen/html/HTML5Gen.java (renamed from xgen/src/main/java/com/att/xgen/html/HTML5Gen.java) | 4 | ||||
| -rw-r--r-- | xgen/src/main/java/org/onap/aaf/xgen/html/HTMLCacheGen.java (renamed from xgen/src/main/java/com/att/xgen/html/HTMLCacheGen.java) | 8 | ||||
| -rw-r--r-- | xgen/src/main/java/org/onap/aaf/xgen/html/HTMLGen.java (renamed from xgen/src/main/java/com/att/xgen/html/HTMLGen.java) | 6 | ||||
| -rw-r--r-- | xgen/src/main/java/org/onap/aaf/xgen/html/Imports.java (renamed from xgen/src/main/java/com/att/xgen/html/Imports.java) | 2 | ||||
| -rw-r--r-- | xgen/src/main/java/org/onap/aaf/xgen/html/JSGen.java (renamed from xgen/src/main/java/com/att/xgen/html/JSGen.java) | 8 | ||||
| -rw-r--r-- | xgen/src/main/java/org/onap/aaf/xgen/html/State.java (renamed from xgen/src/main/java/com/att/xgen/html/State.java) | 4 | ||||
| -rw-r--r-- | xgen/src/main/java/org/onap/aaf/xgen/html/Thematic.java (renamed from xgen/src/main/java/com/att/xgen/html/Thematic.java) | 2 | ||||
| -rw-r--r-- | xgen/src/main/java/org/onap/aaf/xgen/xml/XMLCacheGen.java (renamed from xgen/src/main/java/com/att/xgen/xml/XMLCacheGen.java) | 8 | ||||
| -rw-r--r-- | xgen/src/main/java/org/onap/aaf/xgen/xml/XMLGen.java (renamed from xgen/src/main/java/com/att/xgen/xml/XMLGen.java) | 4 |
130 files changed, 455 insertions, 479 deletions
diff --git a/env/pom.xml b/env/pom.xml index 5f501a8..24bdaff 100644 --- a/env/pom.xml +++ b/env/pom.xml @@ -23,7 +23,7 @@ <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">
<parent>
- <groupId>com.att.inno</groupId>
+ <groupId>org.onap.aaf.inno</groupId>
<artifactId>parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>..</relativePath>
diff --git a/env/src/main/java/com/att/inno/env/APIException.java b/env/src/main/java/org/onap/aaf/inno/env/APIException.java index 677513b..016eea7 100644 --- a/env/src/main/java/com/att/inno/env/APIException.java +++ b/env/src/main/java/org/onap/aaf/inno/env/APIException.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.inno.env;
+package org.onap.aaf.inno.env;
/**
diff --git a/env/src/main/java/com/att/inno/env/BaseDataFactory.java b/env/src/main/java/org/onap/aaf/inno/env/BaseDataFactory.java index b04f115..b65ba56 100644 --- a/env/src/main/java/com/att/inno/env/BaseDataFactory.java +++ b/env/src/main/java/org/onap/aaf/inno/env/BaseDataFactory.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.inno.env;
+package org.onap.aaf.inno.env;
import java.io.File;
import java.io.FileInputStream;
@@ -36,10 +36,9 @@ import javax.xml.transform.stream.StreamSource; import javax.xml.validation.Schema;
import javax.xml.validation.SchemaFactory;
+import org.onap.aaf.inno.env.impl.EnvFactory;
import org.xml.sax.SAXException;
-import com.att.inno.env.impl.EnvFactory;
-
/**
diff --git a/env/src/main/java/com/att/inno/env/Creatable.java b/env/src/main/java/org/onap/aaf/inno/env/Creatable.java index e7d7907..4863808 100644 --- a/env/src/main/java/com/att/inno/env/Creatable.java +++ b/env/src/main/java/org/onap/aaf/inno/env/Creatable.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.inno.env;
+package org.onap.aaf.inno.env;
/**
diff --git a/env/src/main/java/com/att/inno/env/Data.java b/env/src/main/java/org/onap/aaf/inno/env/Data.java index f52eec3..754770c 100644 --- a/env/src/main/java/com/att/inno/env/Data.java +++ b/env/src/main/java/org/onap/aaf/inno/env/Data.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.inno.env;
+package org.onap.aaf.inno.env;
import java.io.IOException;
import java.io.InputStream;
diff --git a/env/src/main/java/com/att/inno/env/DataFactory.java b/env/src/main/java/org/onap/aaf/inno/env/DataFactory.java index 5243ec9..f724681 100644 --- a/env/src/main/java/com/att/inno/env/DataFactory.java +++ b/env/src/main/java/org/onap/aaf/inno/env/DataFactory.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.inno.env;
+package org.onap.aaf.inno.env;
public interface DataFactory<T> {
diff --git a/env/src/main/java/com/att/inno/env/Decryptor.java b/env/src/main/java/org/onap/aaf/inno/env/Decryptor.java index 13e0270..0042ecc 100644 --- a/env/src/main/java/com/att/inno/env/Decryptor.java +++ b/env/src/main/java/org/onap/aaf/inno/env/Decryptor.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.inno.env;
+package org.onap.aaf.inno.env;
public interface Decryptor {
diff --git a/env/src/main/java/com/att/inno/env/Encryptor.java b/env/src/main/java/org/onap/aaf/inno/env/Encryptor.java index 8f3877b..d1e5e15 100644 --- a/env/src/main/java/com/att/inno/env/Encryptor.java +++ b/env/src/main/java/org/onap/aaf/inno/env/Encryptor.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.inno.env;
+package org.onap.aaf.inno.env;
public interface Encryptor {
diff --git a/env/src/main/java/com/att/inno/env/Env.java b/env/src/main/java/org/onap/aaf/inno/env/Env.java index aa71709..046fd8f 100644 --- a/env/src/main/java/com/att/inno/env/Env.java +++ b/env/src/main/java/org/onap/aaf/inno/env/Env.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.inno.env;
+package org.onap.aaf.inno.env;
/**
diff --git a/env/src/main/java/com/att/inno/env/EnvJAXB.java b/env/src/main/java/org/onap/aaf/inno/env/EnvJAXB.java index f75203c..82f5fe1 100644 --- a/env/src/main/java/com/att/inno/env/EnvJAXB.java +++ b/env/src/main/java/org/onap/aaf/inno/env/EnvJAXB.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.inno.env;
+package org.onap.aaf.inno.env;
import javax.xml.namespace.QName;
import javax.xml.validation.Schema;
diff --git a/env/src/main/java/com/att/inno/env/EnvJAXBProps.java b/env/src/main/java/org/onap/aaf/inno/env/EnvJAXBProps.java index 2e0f977..797d7ad 100644 --- a/env/src/main/java/com/att/inno/env/EnvJAXBProps.java +++ b/env/src/main/java/org/onap/aaf/inno/env/EnvJAXBProps.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.inno.env;
+package org.onap.aaf.inno.env;
/**
* An interface to express both JAXB and Property elements of Env
diff --git a/env/src/main/java/com/att/inno/env/EnvProps.java b/env/src/main/java/org/onap/aaf/inno/env/EnvProps.java index e18787a..6349875 100644 --- a/env/src/main/java/com/att/inno/env/EnvProps.java +++ b/env/src/main/java/org/onap/aaf/inno/env/EnvProps.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.inno.env;
+package org.onap.aaf.inno.env;
import java.util.Map;
diff --git a/env/src/main/java/com/att/inno/env/EnvStore.java b/env/src/main/java/org/onap/aaf/inno/env/EnvStore.java index 5872a3e..90dbd36 100644 --- a/env/src/main/java/com/att/inno/env/EnvStore.java +++ b/env/src/main/java/org/onap/aaf/inno/env/EnvStore.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.inno.env;
+package org.onap.aaf.inno.env;
public interface EnvStore<TRANS extends Trans> extends Env, Store, TransCreate<TRANS>{
diff --git a/env/src/main/java/com/att/inno/env/IOObjectifier.java b/env/src/main/java/org/onap/aaf/inno/env/IOObjectifier.java index 35358aa..d963329 100644 --- a/env/src/main/java/com/att/inno/env/IOObjectifier.java +++ b/env/src/main/java/org/onap/aaf/inno/env/IOObjectifier.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.inno.env;
+package org.onap.aaf.inno.env;
import java.io.InputStream;
import java.io.Reader;
diff --git a/env/src/main/java/com/att/inno/env/IOStringifier.java b/env/src/main/java/org/onap/aaf/inno/env/IOStringifier.java index c1dccce..0a9686d 100644 --- a/env/src/main/java/com/att/inno/env/IOStringifier.java +++ b/env/src/main/java/org/onap/aaf/inno/env/IOStringifier.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.inno.env;
+package org.onap.aaf.inno.env;
import java.io.OutputStream;
import java.io.Writer;
diff --git a/env/src/main/java/com/att/inno/env/LifeCycle.java b/env/src/main/java/org/onap/aaf/inno/env/LifeCycle.java index 7a359bd..b2c454a 100644 --- a/env/src/main/java/com/att/inno/env/LifeCycle.java +++ b/env/src/main/java/org/onap/aaf/inno/env/LifeCycle.java @@ -34,9 +34,9 @@ * companies.
*******************************************************************
*/
-package com.att.inno.env;
+package org.onap.aaf.inno.env;
-import com.att.inno.env.util.RefreshableThreadObject;
+import org.onap.aaf.inno.env.util.RefreshableThreadObject;
/**
diff --git a/env/src/main/java/com/att/inno/env/LogTarget.java b/env/src/main/java/org/onap/aaf/inno/env/LogTarget.java index ca4f8b3..65868ed 100644 --- a/env/src/main/java/com/att/inno/env/LogTarget.java +++ b/env/src/main/java/org/onap/aaf/inno/env/LogTarget.java @@ -20,12 +20,12 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.inno.env;
+package org.onap.aaf.inno.env;
import java.io.PrintStream;
import java.util.Date;
-import com.att.inno.env.util.Chrono;
+import org.onap.aaf.inno.env.util.Chrono;
/**
* LogTarget is the interface with which to assign any kind of Logging Implementations.
@@ -66,7 +66,7 @@ public interface LogTarget { public static final LogTarget SYSOUT = new LogTarget() {
public void log(Object ... msgs) {
PrintStream out = System.out;
- out.print(com.att.inno.env.util.Chrono.dateFmt.format(new Date()));
+ out.print(org.onap.aaf.inno.env.util.Chrono.dateFmt.format(new Date()));
out.print(": ");
for(Object str : msgs) {
if(str!=null) {
diff --git a/env/src/main/java/com/att/inno/env/Objectifier.java b/env/src/main/java/org/onap/aaf/inno/env/Objectifier.java index ed3c38e..7123e62 100644 --- a/env/src/main/java/com/att/inno/env/Objectifier.java +++ b/env/src/main/java/org/onap/aaf/inno/env/Objectifier.java @@ -23,7 +23,7 @@ /**
*
*/
-package com.att.inno.env;
+package org.onap.aaf.inno.env;
diff --git a/env/src/main/java/com/att/inno/env/Slot.java b/env/src/main/java/org/onap/aaf/inno/env/Slot.java index 8f976d8..0d7bb15 100644 --- a/env/src/main/java/com/att/inno/env/Slot.java +++ b/env/src/main/java/org/onap/aaf/inno/env/Slot.java @@ -35,7 +35,7 @@ * companies.
*******************************************************************
*/
-package com.att.inno.env;
+package org.onap.aaf.inno.env;
/**
* Slot's are used to store and retrieve data in the transaction's State object.
diff --git a/env/src/main/java/com/att/inno/env/StaticSlot.java b/env/src/main/java/org/onap/aaf/inno/env/StaticSlot.java index 0fe8f36..9a60be0 100644 --- a/env/src/main/java/com/att/inno/env/StaticSlot.java +++ b/env/src/main/java/org/onap/aaf/inno/env/StaticSlot.java @@ -35,7 +35,7 @@ * companies.
*******************************************************************
*/
-package com.att.inno.env;
+package org.onap.aaf.inno.env;
/**
* StaticSlot's are used to store and retrieve data from the Organizer that does not change.
diff --git a/env/src/main/java/com/att/inno/env/Store.java b/env/src/main/java/org/onap/aaf/inno/env/Store.java index fa7e339..362520c 100644 --- a/env/src/main/java/com/att/inno/env/Store.java +++ b/env/src/main/java/org/onap/aaf/inno/env/Store.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.inno.env;
+package org.onap.aaf.inno.env;
import java.util.List;
diff --git a/env/src/main/java/com/att/inno/env/StoreImpl.java b/env/src/main/java/org/onap/aaf/inno/env/StoreImpl.java index 482d0d6..63e39f4 100644 --- a/env/src/main/java/com/att/inno/env/StoreImpl.java +++ b/env/src/main/java/org/onap/aaf/inno/env/StoreImpl.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.inno.env;
+package org.onap.aaf.inno.env;
import java.io.File;
import java.io.FileInputStream;
@@ -29,9 +29,10 @@ import java.util.ArrayList; import java.util.HashMap;
import java.util.List;
import java.util.Map.Entry;
-import java.util.Properties;
-import com.att.inno.env.util.Split;
+import org.onap.aaf.inno.env.util.Split;
+
+import java.util.Properties;
public class StoreImpl implements Store {
diff --git a/env/src/main/java/com/att/inno/env/Stringifier.java b/env/src/main/java/org/onap/aaf/inno/env/Stringifier.java index 3d3f43c..fb6c152 100644 --- a/env/src/main/java/com/att/inno/env/Stringifier.java +++ b/env/src/main/java/org/onap/aaf/inno/env/Stringifier.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.inno.env;
+package org.onap.aaf.inno.env;
diff --git a/env/src/main/java/com/att/inno/env/TimeTaken.java b/env/src/main/java/org/onap/aaf/inno/env/TimeTaken.java index 5bdaa1b..c092eb6 100644 --- a/env/src/main/java/com/att/inno/env/TimeTaken.java +++ b/env/src/main/java/org/onap/aaf/inno/env/TimeTaken.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.inno.env;
+package org.onap.aaf.inno.env;
/**
* <h1>TimeTaken</h1>
diff --git a/env/src/main/java/com/att/inno/env/Trans.java b/env/src/main/java/org/onap/aaf/inno/env/Trans.java index 2e584c1..6ffeacb 100644 --- a/env/src/main/java/com/att/inno/env/Trans.java +++ b/env/src/main/java/org/onap/aaf/inno/env/Trans.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.inno.env;
+package org.onap.aaf.inno.env;
diff --git a/env/src/main/java/com/att/inno/env/TransCreate.java b/env/src/main/java/org/onap/aaf/inno/env/TransCreate.java index b6db5b4..a64bacf 100644 --- a/env/src/main/java/com/att/inno/env/TransCreate.java +++ b/env/src/main/java/org/onap/aaf/inno/env/TransCreate.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.inno.env;
+package org.onap.aaf.inno.env;
public interface TransCreate<TRANS> {
public TRANS newTrans();
diff --git a/env/src/main/java/com/att/inno/env/TransJAXB.java b/env/src/main/java/org/onap/aaf/inno/env/TransJAXB.java index ffd25d7..36372a6 100644 --- a/env/src/main/java/com/att/inno/env/TransJAXB.java +++ b/env/src/main/java/org/onap/aaf/inno/env/TransJAXB.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.inno.env;
+package org.onap.aaf.inno.env;
public interface TransJAXB extends Trans, TransStore {
diff --git a/env/src/main/java/com/att/inno/env/TransStore.java b/env/src/main/java/org/onap/aaf/inno/env/TransStore.java index acfcf47..1dcf69b 100644 --- a/env/src/main/java/com/att/inno/env/TransStore.java +++ b/env/src/main/java/org/onap/aaf/inno/env/TransStore.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.inno.env;
+package org.onap.aaf.inno.env;
public interface TransStore extends Trans {
/**
diff --git a/env/src/main/java/com/att/inno/env/impl/AbsTrans.java b/env/src/main/java/org/onap/aaf/inno/env/impl/AbsTrans.java index 4f370c7..c3dea8a 100644 --- a/env/src/main/java/com/att/inno/env/impl/AbsTrans.java +++ b/env/src/main/java/org/onap/aaf/inno/env/impl/AbsTrans.java @@ -20,18 +20,18 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.inno.env.impl;
+package org.onap.aaf.inno.env.impl;
import java.util.ArrayList;
import java.util.List;
import java.util.Stack;
-import com.att.inno.env.Env;
-import com.att.inno.env.LogTarget;
-import com.att.inno.env.Slot;
-import com.att.inno.env.StoreImpl;
-import com.att.inno.env.TimeTaken;
-import com.att.inno.env.TransStore;
+import org.onap.aaf.inno.env.Env;
+import org.onap.aaf.inno.env.LogTarget;
+import org.onap.aaf.inno.env.Slot;
+import org.onap.aaf.inno.env.StoreImpl;
+import org.onap.aaf.inno.env.TimeTaken;
+import org.onap.aaf.inno.env.TransStore;
public abstract class AbsTrans<ENV extends Env> implements TransStore {
private static final float[] EMPTYF = new float[0];
diff --git a/env/src/main/java/com/att/inno/env/impl/AbsTransJAXB.java b/env/src/main/java/org/onap/aaf/inno/env/impl/AbsTransJAXB.java index 186d0af..b0e08a3 100644 --- a/env/src/main/java/com/att/inno/env/impl/AbsTransJAXB.java +++ b/env/src/main/java/org/onap/aaf/inno/env/impl/AbsTransJAXB.java @@ -20,15 +20,15 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.inno.env.impl;
+package org.onap.aaf.inno.env.impl;
import javax.xml.namespace.QName;
import javax.xml.validation.Schema;
-import com.att.inno.env.APIException;
-import com.att.inno.env.DataFactory;
-import com.att.inno.env.EnvJAXB;
-import com.att.inno.env.TransJAXB;
+import org.onap.aaf.inno.env.APIException;
+import org.onap.aaf.inno.env.DataFactory;
+import org.onap.aaf.inno.env.EnvJAXB;
+import org.onap.aaf.inno.env.TransJAXB;
public abstract class AbsTransJAXB extends AbsTrans<EnvJAXB> implements TransJAXB {
public AbsTransJAXB(EnvJAXB env) {
diff --git a/env/src/main/java/com/att/inno/env/impl/BasicEnv.java b/env/src/main/java/org/onap/aaf/inno/env/impl/BasicEnv.java index af2f103..eab5494 100644 --- a/env/src/main/java/com/att/inno/env/impl/BasicEnv.java +++ b/env/src/main/java/org/onap/aaf/inno/env/impl/BasicEnv.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.inno.env.impl;
+package org.onap.aaf.inno.env.impl;
import java.applet.Applet;
import java.io.BufferedReader;
@@ -34,19 +34,19 @@ import java.util.Properties; import javax.xml.namespace.QName;
import javax.xml.validation.Schema;
-import com.att.inno.env.APIException;
-import com.att.inno.env.DataFactory;
-import com.att.inno.env.Decryptor;
-import com.att.inno.env.Encryptor;
-import com.att.inno.env.Env;
-import com.att.inno.env.EnvJAXB;
-import com.att.inno.env.LogTarget;
-import com.att.inno.env.StoreImpl;
-import com.att.inno.env.TimeTaken;
-import com.att.inno.env.TransCreate;
-import com.att.inno.env.TransJAXB;
-import com.att.inno.env.jaxb.JAXBDF;
-import com.att.inno.env.util.Split;
+import org.onap.aaf.inno.env.APIException;
+import org.onap.aaf.inno.env.DataFactory;
+import org.onap.aaf.inno.env.Decryptor;
+import org.onap.aaf.inno.env.Encryptor;
+import org.onap.aaf.inno.env.Env;
+import org.onap.aaf.inno.env.EnvJAXB;
+import org.onap.aaf.inno.env.LogTarget;
+import org.onap.aaf.inno.env.StoreImpl;
+import org.onap.aaf.inno.env.TimeTaken;
+import org.onap.aaf.inno.env.TransCreate;
+import org.onap.aaf.inno.env.TransJAXB;
+import org.onap.aaf.inno.env.jaxb.JAXBDF;
+import org.onap.aaf.inno.env.util.Split;
/**
* An essential Implementation of Env, which will fully function, without any sort
diff --git a/env/src/main/java/com/att/inno/env/impl/BasicTrans.java b/env/src/main/java/org/onap/aaf/inno/env/impl/BasicTrans.java index ec36b57..55f89fa 100644 --- a/env/src/main/java/com/att/inno/env/impl/BasicTrans.java +++ b/env/src/main/java/org/onap/aaf/inno/env/impl/BasicTrans.java @@ -20,14 +20,14 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.inno.env.impl;
+package org.onap.aaf.inno.env.impl;
-import com.att.inno.env.Decryptor;
-import com.att.inno.env.Encryptor;
-import com.att.inno.env.EnvJAXB;
-import com.att.inno.env.Slot;
-import com.att.inno.env.StaticSlot;
-import com.att.inno.env.TimeTaken;
+import org.onap.aaf.inno.env.Decryptor;
+import org.onap.aaf.inno.env.Encryptor;
+import org.onap.aaf.inno.env.EnvJAXB;
+import org.onap.aaf.inno.env.Slot;
+import org.onap.aaf.inno.env.StaticSlot;
+import org.onap.aaf.inno.env.TimeTaken;
public class BasicTrans extends AbsTransJAXB {
diff --git a/env/src/main/java/com/att/inno/env/impl/EnvFactory.java b/env/src/main/java/org/onap/aaf/inno/env/impl/EnvFactory.java index 1826265..5216cf6 100644 --- a/env/src/main/java/com/att/inno/env/impl/EnvFactory.java +++ b/env/src/main/java/org/onap/aaf/inno/env/impl/EnvFactory.java @@ -20,11 +20,11 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.inno.env.impl;
+package org.onap.aaf.inno.env.impl;
-import com.att.inno.env.EnvJAXB;
-import com.att.inno.env.TransCreate;
-import com.att.inno.env.TransJAXB;
+import org.onap.aaf.inno.env.EnvJAXB;
+import org.onap.aaf.inno.env.TransCreate;
+import org.onap.aaf.inno.env.TransJAXB;
/**
* EnvFactory
diff --git a/env/src/main/java/com/att/inno/env/impl/JavaUtilLogTarget.java b/env/src/main/java/org/onap/aaf/inno/env/impl/JavaUtilLogTarget.java index 87a1b64..8c6e566 100644 --- a/env/src/main/java/com/att/inno/env/impl/JavaUtilLogTarget.java +++ b/env/src/main/java/org/onap/aaf/inno/env/impl/JavaUtilLogTarget.java @@ -20,12 +20,12 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.inno.env.impl;
+package org.onap.aaf.inno.env.impl;
import java.util.logging.Level;
import java.util.logging.Logger;
-import com.att.inno.env.LogTarget;
+import org.onap.aaf.inno.env.LogTarget;
/**
* This LogTarget Implementation is included mostly because the JavaUtil based logging is included in the
diff --git a/env/src/main/java/com/att/inno/env/impl/Log4JLogTarget.java b/env/src/main/java/org/onap/aaf/inno/env/impl/Log4JLogTarget.java index d176cd6..6abf7c9 100644 --- a/env/src/main/java/com/att/inno/env/impl/Log4JLogTarget.java +++ b/env/src/main/java/org/onap/aaf/inno/env/impl/Log4JLogTarget.java @@ -20,16 +20,15 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.inno.env.impl;
+package org.onap.aaf.inno.env.impl;
import java.io.PrintWriter;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
-
-import com.att.inno.env.APIException;
-import com.att.inno.env.LogTarget;
-import com.att.inno.env.util.StringBuilderWriter;
+import org.onap.aaf.inno.env.APIException;
+import org.onap.aaf.inno.env.LogTarget;
+import org.onap.aaf.inno.env.util.StringBuilderWriter;
/**
* Many services have chosen to use Log4J for their lower level Logging Implementation. This LogTarget will allow
diff --git a/env/src/main/java/com/att/inno/env/impl/NullLifeCycle.java b/env/src/main/java/org/onap/aaf/inno/env/impl/NullLifeCycle.java index 1897195..75ce6c9 100644 --- a/env/src/main/java/com/att/inno/env/impl/NullLifeCycle.java +++ b/env/src/main/java/org/onap/aaf/inno/env/impl/NullLifeCycle.java @@ -23,11 +23,11 @@ /**
*
*/
-package com.att.inno.env.impl;
+package org.onap.aaf.inno.env.impl;
-import com.att.inno.env.APIException;
-import com.att.inno.env.Env;
-import com.att.inno.env.LifeCycle;
+import org.onap.aaf.inno.env.APIException;
+import org.onap.aaf.inno.env.Env;
+import org.onap.aaf.inno.env.LifeCycle;
diff --git a/env/src/main/java/com/att/inno/env/jaxb/JAXBDF.java b/env/src/main/java/org/onap/aaf/inno/env/jaxb/JAXBDF.java index d2ef3c6..dec3efa 100644 --- a/env/src/main/java/com/att/inno/env/jaxb/JAXBDF.java +++ b/env/src/main/java/org/onap/aaf/inno/env/jaxb/JAXBDF.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.inno.env.jaxb;
+package org.onap.aaf.inno.env.jaxb;
import java.io.InputStream;
import java.io.OutputStream;
@@ -32,15 +32,15 @@ import javax.xml.bind.JAXBException; import javax.xml.namespace.QName;
import javax.xml.validation.Schema;
-import com.att.inno.env.APIException;
-import com.att.inno.env.BaseDataFactory;
-import com.att.inno.env.Data;
-import com.att.inno.env.Env;
-import com.att.inno.env.EnvJAXB;
-import com.att.inno.env.TimeTaken;
-import com.att.inno.env.old.IOObjectifier;
-import com.att.inno.env.old.IOStringifier;
-import com.att.inno.env.old.OldDataFactory;
+import org.onap.aaf.inno.env.APIException;
+import org.onap.aaf.inno.env.BaseDataFactory;
+import org.onap.aaf.inno.env.Data;
+import org.onap.aaf.inno.env.Env;
+import org.onap.aaf.inno.env.EnvJAXB;
+import org.onap.aaf.inno.env.TimeTaken;
+import org.onap.aaf.inno.env.old.IOObjectifier;
+import org.onap.aaf.inno.env.old.IOStringifier;
+import org.onap.aaf.inno.env.old.OldDataFactory;
public class JAXBDF<T> extends BaseDataFactory implements OldDataFactory<T>,IOObjectifier<T>, IOStringifier<T> {
// Package on purpose
diff --git a/env/src/main/java/com/att/inno/env/jaxb/JAXBData.java b/env/src/main/java/org/onap/aaf/inno/env/jaxb/JAXBData.java index 9f51edb..3b51256 100644 --- a/env/src/main/java/com/att/inno/env/jaxb/JAXBData.java +++ b/env/src/main/java/org/onap/aaf/inno/env/jaxb/JAXBData.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.inno.env.jaxb;
+package org.onap.aaf.inno.env.jaxb;
import java.io.ByteArrayInputStream;
import java.io.IOException;
@@ -31,13 +31,13 @@ import java.io.Writer; import javax.xml.bind.JAXBException;
-import com.att.inno.env.APIException;
-import com.att.inno.env.Data;
-import com.att.inno.env.Env;
-import com.att.inno.env.EnvJAXB;
-import com.att.inno.env.old.IOStringifier;
-import com.att.inno.env.old.Objectifier;
-import com.att.inno.env.old.Stringifier;
+import org.onap.aaf.inno.env.APIException;
+import org.onap.aaf.inno.env.Data;
+import org.onap.aaf.inno.env.Env;
+import org.onap.aaf.inno.env.EnvJAXB;
+import org.onap.aaf.inno.env.old.IOStringifier;
+import org.onap.aaf.inno.env.old.Objectifier;
+import org.onap.aaf.inno.env.old.Stringifier;
/**
* <H1>Data</H1>
* <i>Data</i> facilitates lazy marshaling of data with a pre-determined
diff --git a/env/src/main/java/com/att/inno/env/jaxb/JAXBObjectifier.java b/env/src/main/java/org/onap/aaf/inno/env/jaxb/JAXBObjectifier.java index c311c9f..880aa21 100644 --- a/env/src/main/java/com/att/inno/env/jaxb/JAXBObjectifier.java +++ b/env/src/main/java/org/onap/aaf/inno/env/jaxb/JAXBObjectifier.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.inno.env.jaxb;
+package org.onap.aaf.inno.env.jaxb;
import java.io.InputStream;
import java.io.Reader;
@@ -28,10 +28,10 @@ import java.io.Reader; import javax.xml.bind.JAXBException;
import javax.xml.validation.Schema;
-import com.att.inno.env.APIException;
-import com.att.inno.env.Env;
-import com.att.inno.env.TimeTaken;
-import com.att.inno.env.old.IOObjectifier;
+import org.onap.aaf.inno.env.APIException;
+import org.onap.aaf.inno.env.Env;
+import org.onap.aaf.inno.env.TimeTaken;
+import org.onap.aaf.inno.env.old.IOObjectifier;
/**
* Allow Extended IO interface usage without muddying up the Stringifier Interface
diff --git a/env/src/main/java/com/att/inno/env/jaxb/JAXBStringifier.java b/env/src/main/java/org/onap/aaf/inno/env/jaxb/JAXBStringifier.java index c98214b..3fcfaa8 100644 --- a/env/src/main/java/com/att/inno/env/jaxb/JAXBStringifier.java +++ b/env/src/main/java/org/onap/aaf/inno/env/jaxb/JAXBStringifier.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.inno.env.jaxb;
+package org.onap.aaf.inno.env.jaxb;
import java.io.OutputStream;
import java.io.StringWriter;
@@ -29,10 +29,10 @@ import java.io.Writer; import javax.xml.bind.JAXBException;
import javax.xml.namespace.QName;
-import com.att.inno.env.APIException;
-import com.att.inno.env.Env;
-import com.att.inno.env.TimeTaken;
-import com.att.inno.env.old.IOStringifier;
+import org.onap.aaf.inno.env.APIException;
+import org.onap.aaf.inno.env.Env;
+import org.onap.aaf.inno.env.TimeTaken;
+import org.onap.aaf.inno.env.old.IOStringifier;
public class JAXBStringifier<T> implements IOStringifier<T> {
private JAXBmar jmar;
diff --git a/env/src/main/java/com/att/inno/env/jaxb/JAXBmar.java b/env/src/main/java/org/onap/aaf/inno/env/jaxb/JAXBmar.java index dbdf092..d07c246 100644 --- a/env/src/main/java/com/att/inno/env/jaxb/JAXBmar.java +++ b/env/src/main/java/org/onap/aaf/inno/env/jaxb/JAXBmar.java @@ -37,7 +37,7 @@ * companies.
*******************************************************************
*/
-package com.att.inno.env.jaxb;
+package org.onap.aaf.inno.env.jaxb;
import java.io.OutputStream;
import java.io.StringWriter;
@@ -51,10 +51,10 @@ import javax.xml.bind.JAXBException; import javax.xml.bind.Marshaller;
import javax.xml.namespace.QName;
-import com.att.inno.env.APIException;
-import com.att.inno.env.LogTarget;
-import com.att.inno.env.util.Pool;
-import com.att.inno.env.util.Pool.Pooled;
+import org.onap.aaf.inno.env.APIException;
+import org.onap.aaf.inno.env.LogTarget;
+import org.onap.aaf.inno.env.util.Pool;
+import org.onap.aaf.inno.env.util.Pool.Pooled;
/**
* JAXBmar classes are inexpensive for going in and out of scope
diff --git a/env/src/main/java/com/att/inno/env/jaxb/JAXBumar.java b/env/src/main/java/org/onap/aaf/inno/env/jaxb/JAXBumar.java index eab30e6..cd31301 100644 --- a/env/src/main/java/com/att/inno/env/jaxb/JAXBumar.java +++ b/env/src/main/java/org/onap/aaf/inno/env/jaxb/JAXBumar.java @@ -37,7 +37,7 @@ * companies.
*******************************************************************
*/
-package com.att.inno.env.jaxb;
+package org.onap.aaf.inno.env.jaxb;
import java.io.File;
import java.io.InputStream;
@@ -54,13 +54,12 @@ import javax.xml.stream.XMLStreamReader; import javax.xml.transform.stream.StreamSource;
import javax.xml.validation.Schema;
+import org.onap.aaf.inno.env.APIException;
+import org.onap.aaf.inno.env.LogTarget;
+import org.onap.aaf.inno.env.util.Pool;
+import org.onap.aaf.inno.env.util.Pool.Pooled;
import org.w3c.dom.Node;
-import com.att.inno.env.APIException;
-import com.att.inno.env.LogTarget;
-import com.att.inno.env.util.Pool;
-import com.att.inno.env.util.Pool.Pooled;
-
/**
* JAXBumar classes are inexpensive for going in and out of scope
* and have been made thread safe via Pooling
diff --git a/env/src/main/java/com/att/inno/env/old/IOObjectifier.java b/env/src/main/java/org/onap/aaf/inno/env/old/IOObjectifier.java index 9932e20..ca79afd 100644 --- a/env/src/main/java/com/att/inno/env/old/IOObjectifier.java +++ b/env/src/main/java/org/onap/aaf/inno/env/old/IOObjectifier.java @@ -20,13 +20,13 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.inno.env.old;
+package org.onap.aaf.inno.env.old;
import java.io.InputStream;
import java.io.Reader;
-import com.att.inno.env.APIException;
-import com.att.inno.env.Env;
+import org.onap.aaf.inno.env.APIException;
+import org.onap.aaf.inno.env.Env;
public interface IOObjectifier<T> extends Objectifier<T> {
/**
diff --git a/env/src/main/java/com/att/inno/env/old/IOStringifier.java b/env/src/main/java/org/onap/aaf/inno/env/old/IOStringifier.java index 18ef170..f2b60fd 100644 --- a/env/src/main/java/com/att/inno/env/old/IOStringifier.java +++ b/env/src/main/java/org/onap/aaf/inno/env/old/IOStringifier.java @@ -20,13 +20,13 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.inno.env.old;
+package org.onap.aaf.inno.env.old;
import java.io.OutputStream;
import java.io.Writer;
-import com.att.inno.env.APIException;
-import com.att.inno.env.Env;
+import org.onap.aaf.inno.env.APIException;
+import org.onap.aaf.inno.env.Env;
/**
* Allow Extended IO interface usage without muddying up the Stringifier Interface
diff --git a/env/src/main/java/com/att/inno/env/old/Objectifier.java b/env/src/main/java/org/onap/aaf/inno/env/old/Objectifier.java index 55e9685..15536ad 100644 --- a/env/src/main/java/com/att/inno/env/old/Objectifier.java +++ b/env/src/main/java/org/onap/aaf/inno/env/old/Objectifier.java @@ -23,11 +23,11 @@ /**
*
*/
-package com.att.inno.env.old;
+package org.onap.aaf.inno.env.old;
-import com.att.inno.env.APIException;
-import com.att.inno.env.Env;
-import com.att.inno.env.LifeCycle;
+import org.onap.aaf.inno.env.APIException;
+import org.onap.aaf.inno.env.Env;
+import org.onap.aaf.inno.env.LifeCycle;
/**
diff --git a/env/src/main/java/com/att/inno/env/old/OldDataFactory.java b/env/src/main/java/org/onap/aaf/inno/env/old/OldDataFactory.java index 6bf0995..92126ef 100644 --- a/env/src/main/java/com/att/inno/env/old/OldDataFactory.java +++ b/env/src/main/java/org/onap/aaf/inno/env/old/OldDataFactory.java @@ -20,17 +20,17 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.inno.env.old;
+package org.onap.aaf.inno.env.old;
import java.io.InputStream;
import java.io.OutputStream;
import java.io.Reader;
import java.io.Writer;
-import com.att.inno.env.APIException;
-import com.att.inno.env.Data;
-import com.att.inno.env.DataFactory;
-import com.att.inno.env.Env;
+import org.onap.aaf.inno.env.APIException;
+import org.onap.aaf.inno.env.Data;
+import org.onap.aaf.inno.env.DataFactory;
+import org.onap.aaf.inno.env.Env;
public interface OldDataFactory<T> extends DataFactory<T> {
public abstract String stringify(T type) throws APIException;
diff --git a/env/src/main/java/com/att/inno/env/old/Stringifier.java b/env/src/main/java/org/onap/aaf/inno/env/old/Stringifier.java index db9401f..42869c7 100644 --- a/env/src/main/java/com/att/inno/env/old/Stringifier.java +++ b/env/src/main/java/org/onap/aaf/inno/env/old/Stringifier.java @@ -20,11 +20,11 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.inno.env.old;
+package org.onap.aaf.inno.env.old;
-import com.att.inno.env.APIException;
-import com.att.inno.env.Env;
-import com.att.inno.env.LifeCycle;
+import org.onap.aaf.inno.env.APIException;
+import org.onap.aaf.inno.env.Env;
+import org.onap.aaf.inno.env.LifeCycle;
/**
diff --git a/env/src/main/java/com/att/inno/env/util/Chrono.java b/env/src/main/java/org/onap/aaf/inno/env/util/Chrono.java index 8b840d0..8d32590 100644 --- a/env/src/main/java/com/att/inno/env/util/Chrono.java +++ b/env/src/main/java/org/onap/aaf/inno/env/util/Chrono.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.inno.env.util;
+package org.onap.aaf.inno.env.util;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
diff --git a/env/src/main/java/com/att/inno/env/util/DoubleOutputStream.java b/env/src/main/java/org/onap/aaf/inno/env/util/DoubleOutputStream.java index eab33b1..074b221 100644 --- a/env/src/main/java/com/att/inno/env/util/DoubleOutputStream.java +++ b/env/src/main/java/org/onap/aaf/inno/env/util/DoubleOutputStream.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.inno.env.util;
+package org.onap.aaf.inno.env.util;
import java.io.IOException;
import java.io.OutputStream;
diff --git a/env/src/main/java/com/att/inno/env/util/IndentPrintWriter.java b/env/src/main/java/org/onap/aaf/inno/env/util/IndentPrintWriter.java index a312dfa..4f0d0c0 100644 --- a/env/src/main/java/com/att/inno/env/util/IndentPrintWriter.java +++ b/env/src/main/java/org/onap/aaf/inno/env/util/IndentPrintWriter.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.inno.env.util;
+package org.onap.aaf.inno.env.util;
import java.io.OutputStream;
import java.io.PrintWriter;
diff --git a/env/src/main/java/com/att/inno/env/util/Pool.java b/env/src/main/java/org/onap/aaf/inno/env/util/Pool.java index e8ba8ce..204d51a 100644 --- a/env/src/main/java/com/att/inno/env/util/Pool.java +++ b/env/src/main/java/org/onap/aaf/inno/env/util/Pool.java @@ -25,12 +25,12 @@ *
* 5/27/2011
*/
-package com.att.inno.env.util;
+package org.onap.aaf.inno.env.util;
import java.util.LinkedList;
-import com.att.inno.env.APIException;
-import com.att.inno.env.LogTarget;
+import org.onap.aaf.inno.env.APIException;
+import org.onap.aaf.inno.env.LogTarget;
/**
* This Class pools on an As-Needed-Basis any particular kind of class, which is
diff --git a/env/src/main/java/com/att/inno/env/util/RefreshableThreadObject.java b/env/src/main/java/org/onap/aaf/inno/env/util/RefreshableThreadObject.java index 10bb8aa..af2cc2f 100644 --- a/env/src/main/java/com/att/inno/env/util/RefreshableThreadObject.java +++ b/env/src/main/java/org/onap/aaf/inno/env/util/RefreshableThreadObject.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.inno.env.util;
+package org.onap.aaf.inno.env.util;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
@@ -28,10 +28,10 @@ import java.util.Collections; import java.util.HashMap;
import java.util.Map;
-import com.att.inno.env.APIException;
-import com.att.inno.env.Creatable;
-import com.att.inno.env.Env;
-import com.att.inno.env.LifeCycle;
+import org.onap.aaf.inno.env.APIException;
+import org.onap.aaf.inno.env.Creatable;
+import org.onap.aaf.inno.env.Env;
+import org.onap.aaf.inno.env.LifeCycle;
/**
diff --git a/env/src/main/java/com/att/inno/env/util/Split.java b/env/src/main/java/org/onap/aaf/inno/env/util/Split.java index b813ac0..1ccfc46 100644 --- a/env/src/main/java/com/att/inno/env/util/Split.java +++ b/env/src/main/java/org/onap/aaf/inno/env/util/Split.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.inno.env.util;
+package org.onap.aaf.inno.env.util;
/**
* Split by Char, optional Trim
diff --git a/env/src/main/java/com/att/inno/env/util/StringBuilderOutputStream.java b/env/src/main/java/org/onap/aaf/inno/env/util/StringBuilderOutputStream.java index 0151448..ccb51d5 100644 --- a/env/src/main/java/com/att/inno/env/util/StringBuilderOutputStream.java +++ b/env/src/main/java/org/onap/aaf/inno/env/util/StringBuilderOutputStream.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.inno.env.util;
+package org.onap.aaf.inno.env.util;
import java.io.IOException;
import java.io.OutputStream;
diff --git a/env/src/main/java/com/att/inno/env/util/StringBuilderWriter.java b/env/src/main/java/org/onap/aaf/inno/env/util/StringBuilderWriter.java index 632ff60..48fa808 100644 --- a/env/src/main/java/com/att/inno/env/util/StringBuilderWriter.java +++ b/env/src/main/java/org/onap/aaf/inno/env/util/StringBuilderWriter.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.inno.env.util;
+package org.onap.aaf.inno.env.util;
import java.io.IOException;
import java.io.Writer;
diff --git a/log4j/pom.xml b/log4j/pom.xml index 0c07f0a..8053a2a 100644 --- a/log4j/pom.xml +++ b/log4j/pom.xml @@ -23,7 +23,7 @@ <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">
<parent>
- <groupId>com.att.inno</groupId>
+ <groupId>org.onap.aaf.inno</groupId>
<artifactId>parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>..</relativePath>
@@ -61,7 +61,7 @@ </properties>
<dependencies>
<dependency>
- <groupId>com.att.inno</groupId>
+ <groupId>org.onap.aaf.inno</groupId>
<artifactId>env</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/log4j/src/main/java/com/att/inno/env/log4j/LogFileNamer.java b/log4j/src/main/java/org/onap/aaf/inno/env/log4j/LogFileNamer.java index 335fbcd..e1abe10 100644 --- a/log4j/src/main/java/com/att/inno/env/log4j/LogFileNamer.java +++ b/log4j/src/main/java/org/onap/aaf/inno/env/log4j/LogFileNamer.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.inno.env.log4j;
+package org.onap.aaf.inno.env.log4j;
import java.io.File;
import java.net.URL;
diff --git a/log4j/src/main/java/com/att/inno/env/log4j/PIDAccess.java b/log4j/src/main/java/org/onap/aaf/inno/env/log4j/PIDAccess.java index a4f1d98..1a949a7 100644 --- a/log4j/src/main/java/com/att/inno/env/log4j/PIDAccess.java +++ b/log4j/src/main/java/org/onap/aaf/inno/env/log4j/PIDAccess.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.inno.env.log4j;
+package org.onap.aaf.inno.env.log4j;
import com.sun.jna.Library;
import com.sun.jna.Native;
diff --git a/log4j/src/test/java/com/att/inno/env/log4j/LogTest.java b/log4j/src/test/java/org/onap/aaf/inno/env/log4j/LogTest.java index f3594f5..d34ed19 100644 --- a/log4j/src/test/java/com/att/inno/env/log4j/LogTest.java +++ b/log4j/src/test/java/org/onap/aaf/inno/env/log4j/LogTest.java @@ -20,10 +20,12 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.inno.env.log4j;
+package org.onap.aaf.inno.env.log4j;
import java.util.logging.Logger;
+import org.onap.aaf.inno.env.log4j.LogFileNamer;
+
public class LogTest
{
@@ -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> @@ -205,12 +206,12 @@ <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> diff --git a/rosetta/pom.xml b/rosetta/pom.xml index 644c21b..0c9238b 100644 --- a/rosetta/pom.xml +++ b/rosetta/pom.xml @@ -23,7 +23,7 @@ <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">
<parent>
- <groupId>com.att.inno</groupId>
+ <groupId>org.onap.aaf.inno</groupId>
<artifactId>parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>..</relativePath>
@@ -61,18 +61,18 @@ </properties>
<dependencies>
<dependency>
- <groupId>com.att.inno</groupId>
+ <groupId>org.onap.aaf.inno</groupId>
<artifactId>env</artifactId>
<version>${project.version}</version>
</dependency>
<!-- dependency>
- <groupId>com.att.cadi</groupId>
+ <groupId>org.onap.aaf.cadi</groupId>
<artifactId>cadi-core</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>com.att.aft</groupId>
+ <groupId>org.onap.aaf.aft</groupId>
<artifactId>dme2</artifactId>
<scope>provided</scope>
</dependency-->
@@ -109,23 +109,6 @@ </includes>
</configuration>
</plugin>
- <!-- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <version>2.4</version>
- <configuration>
- <outputDirectory>target</outputDirectory>
- <skipSource>false</skipSource>
- <attach>false</attach>
- <forceCreation>true</forceCreation>
- <useDefaultManifestFile>true</useDefaultManifestFile>
- </configuration>
- </plugin> -->
-
- <!-- plugin> <artifactId>maven-assembly-plugin</artifactId> <configuration>
- <archive> <manifest> <mainClass>com.att.rest.Main</mainClass> </manifest>
- </archive> <descriptorRefs> <discriptorRef>jar-with-dependencies</discriptorRef>
- <filters> </filters> </descriptorRefs> </configuration> </plugin -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
diff --git a/rosetta/src/main/java/com/att/rosetta/InJson.java b/rosetta/src/main/java/org/onap/aaf/rosetta/InJson.java index ba14c4a..22e72a5 100644 --- a/rosetta/src/main/java/com/att/rosetta/InJson.java +++ b/rosetta/src/main/java/org/onap/aaf/rosetta/InJson.java @@ -20,14 +20,14 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.rosetta;
+package org.onap.aaf.rosetta;
import java.io.IOException;
import java.io.Reader;
-import com.att.inno.env.Env;
-import com.att.inno.env.TimeTaken;
-import com.att.rosetta.InJson.State;
+import org.onap.aaf.inno.env.Env;
+import org.onap.aaf.inno.env.TimeTaken;
+import org.onap.aaf.rosetta.InJson.State;
public class InJson implements Parse<Reader, State> {
public Parsed<State> parse(Reader r, Parsed<State> parsed) throws ParseException {
diff --git a/rosetta/src/main/java/com/att/rosetta/InXML.java b/rosetta/src/main/java/org/onap/aaf/rosetta/InXML.java index 945fb75..25e91db 100644 --- a/rosetta/src/main/java/com/att/rosetta/InXML.java +++ b/rosetta/src/main/java/org/onap/aaf/rosetta/InXML.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.rosetta;
+package org.onap.aaf.rosetta;
import java.io.IOException;
import java.io.Reader;
@@ -30,9 +30,9 @@ import java.util.List; import java.util.Map;
import java.util.Stack;
-import com.att.inno.env.Env;
-import com.att.inno.env.TimeTaken;
-import com.att.rosetta.InXML.State;
+import org.onap.aaf.inno.env.Env;
+import org.onap.aaf.inno.env.TimeTaken;
+import org.onap.aaf.rosetta.InXML.State;
public class InXML implements Parse<Reader, State> {
// package on purpose
diff --git a/rosetta/src/main/java/com/att/rosetta/JaxEval.java b/rosetta/src/main/java/org/onap/aaf/rosetta/JaxEval.java index 22bdde2..62e57b8 100644 --- a/rosetta/src/main/java/com/att/rosetta/JaxEval.java +++ b/rosetta/src/main/java/org/onap/aaf/rosetta/JaxEval.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.rosetta;
+package org.onap.aaf.rosetta;
public interface JaxEval{
public abstract JaxEval eval(Parsed<?> p) throws ParseException;
diff --git a/rosetta/src/main/java/com/att/rosetta/JaxInfo.java b/rosetta/src/main/java/org/onap/aaf/rosetta/JaxInfo.java index c7c0430..8d3d87b 100644 --- a/rosetta/src/main/java/com/att/rosetta/JaxInfo.java +++ b/rosetta/src/main/java/org/onap/aaf/rosetta/JaxInfo.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.rosetta;
+package org.onap.aaf.rosetta;
import java.lang.reflect.Field;
import java.lang.reflect.Type;
diff --git a/rosetta/src/main/java/com/att/rosetta/JaxSet.java b/rosetta/src/main/java/org/onap/aaf/rosetta/JaxSet.java index ff9d696..ddc2259 100644 --- a/rosetta/src/main/java/com/att/rosetta/JaxSet.java +++ b/rosetta/src/main/java/org/onap/aaf/rosetta/JaxSet.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.rosetta;
+package org.onap.aaf.rosetta;
import java.lang.reflect.Method;
import java.util.HashMap;
diff --git a/rosetta/src/main/java/com/att/rosetta/Ladder.java b/rosetta/src/main/java/org/onap/aaf/rosetta/Ladder.java index 46377db..2a08723 100644 --- a/rosetta/src/main/java/com/att/rosetta/Ladder.java +++ b/rosetta/src/main/java/org/onap/aaf/rosetta/Ladder.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.rosetta;
+package org.onap.aaf.rosetta;
/**
diff --git a/rosetta/src/main/java/com/att/rosetta/Marshal.java b/rosetta/src/main/java/org/onap/aaf/rosetta/Marshal.java index 07480b3..80e3490 100644 --- a/rosetta/src/main/java/com/att/rosetta/Marshal.java +++ b/rosetta/src/main/java/org/onap/aaf/rosetta/Marshal.java @@ -20,12 +20,12 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.rosetta;
+package org.onap.aaf.rosetta;
import java.util.Iterator;
-import com.att.inno.env.Env;
-import com.att.inno.env.TimeTaken;
+import org.onap.aaf.inno.env.Env;
+import org.onap.aaf.inno.env.TimeTaken;
public abstract class Marshal<T> implements Parse<T, Marshal.State> {
diff --git a/rosetta/src/main/java/com/att/rosetta/Nulls.java b/rosetta/src/main/java/org/onap/aaf/rosetta/Nulls.java index a261888..1b76130 100644 --- a/rosetta/src/main/java/com/att/rosetta/Nulls.java +++ b/rosetta/src/main/java/org/onap/aaf/rosetta/Nulls.java @@ -20,14 +20,14 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.rosetta;
+package org.onap.aaf.rosetta;
import java.io.IOException;
import java.io.Reader;
import java.io.Writer;
-import com.att.inno.env.Env;
-import com.att.inno.env.TimeTaken;
+import org.onap.aaf.inno.env.Env;
+import org.onap.aaf.inno.env.TimeTaken;
public class Nulls {
public static final Parse<Reader, ?> IN = new Parse<Reader, Void>() {
diff --git a/rosetta/src/main/java/com/att/rosetta/Out.java b/rosetta/src/main/java/org/onap/aaf/rosetta/Out.java index e870eb5..6ef8f21 100644 --- a/rosetta/src/main/java/com/att/rosetta/Out.java +++ b/rosetta/src/main/java/org/onap/aaf/rosetta/Out.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.rosetta;
+package org.onap.aaf.rosetta;
import java.io.IOException;
import java.io.OutputStream;
diff --git a/rosetta/src/main/java/com/att/rosetta/OutJax.java b/rosetta/src/main/java/org/onap/aaf/rosetta/OutJax.java index 7f0e1f4..ebd2390 100644 --- a/rosetta/src/main/java/com/att/rosetta/OutJax.java +++ b/rosetta/src/main/java/org/onap/aaf/rosetta/OutJax.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.rosetta;
+package org.onap.aaf.rosetta;
import java.io.IOException;
import java.io.Writer;
diff --git a/rosetta/src/main/java/com/att/rosetta/OutJson.java b/rosetta/src/main/java/org/onap/aaf/rosetta/OutJson.java index 69994d4..3b5b2f8 100644 --- a/rosetta/src/main/java/com/att/rosetta/OutJson.java +++ b/rosetta/src/main/java/org/onap/aaf/rosetta/OutJson.java @@ -20,13 +20,13 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.rosetta;
+package org.onap.aaf.rosetta;
import java.io.IOException;
import java.io.Writer;
import java.util.Stack;
-import com.att.inno.env.util.IndentPrintWriter;
+import org.onap.aaf.inno.env.util.IndentPrintWriter;
public class OutJson extends Out {
diff --git a/rosetta/src/main/java/com/att/rosetta/OutRaw.java b/rosetta/src/main/java/org/onap/aaf/rosetta/OutRaw.java index 105d676..641f802 100644 --- a/rosetta/src/main/java/com/att/rosetta/OutRaw.java +++ b/rosetta/src/main/java/org/onap/aaf/rosetta/OutRaw.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.rosetta;
+package org.onap.aaf.rosetta;
import java.io.IOException;
import java.io.Writer;
diff --git a/rosetta/src/main/java/com/att/rosetta/OutXML.java b/rosetta/src/main/java/org/onap/aaf/rosetta/OutXML.java index b062d3c..328b8f7 100644 --- a/rosetta/src/main/java/com/att/rosetta/OutXML.java +++ b/rosetta/src/main/java/org/onap/aaf/rosetta/OutXML.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.rosetta;
+package org.onap.aaf.rosetta;
import java.io.IOException;
import java.io.Writer;
@@ -30,8 +30,8 @@ import java.util.List; import java.util.Map;
import java.util.Stack;
-import com.att.inno.env.util.IndentPrintWriter;
-import com.att.inno.env.util.StringBuilderWriter;
+import org.onap.aaf.inno.env.util.IndentPrintWriter;
+import org.onap.aaf.inno.env.util.StringBuilderWriter;
public class OutXML extends Out{
private static final String XMLNS_XSI = "xmlns:xsi";
diff --git a/rosetta/src/main/java/com/att/rosetta/Parse.java b/rosetta/src/main/java/org/onap/aaf/rosetta/Parse.java index e66f798..175c162 100644 --- a/rosetta/src/main/java/com/att/rosetta/Parse.java +++ b/rosetta/src/main/java/org/onap/aaf/rosetta/Parse.java @@ -20,10 +20,10 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.rosetta;
+package org.onap.aaf.rosetta;
-import com.att.inno.env.Env;
-import com.att.inno.env.TimeTaken;
+import org.onap.aaf.inno.env.Env;
+import org.onap.aaf.inno.env.TimeTaken;
public interface Parse<IN, S> {
public Parsed<S> parse(IN in, Parsed<S> parsed) throws ParseException;
diff --git a/rosetta/src/main/java/com/att/rosetta/ParseException.java b/rosetta/src/main/java/org/onap/aaf/rosetta/ParseException.java index ac51dbd..61f96c4 100644 --- a/rosetta/src/main/java/com/att/rosetta/ParseException.java +++ b/rosetta/src/main/java/org/onap/aaf/rosetta/ParseException.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.rosetta;
+package org.onap.aaf.rosetta;
public class ParseException extends Exception {
private static final long serialVersionUID = 7808836939102997012L;
diff --git a/rosetta/src/main/java/com/att/rosetta/Parsed.java b/rosetta/src/main/java/org/onap/aaf/rosetta/Parsed.java index 705dd8e..ef748a3 100644 --- a/rosetta/src/main/java/com/att/rosetta/Parsed.java +++ b/rosetta/src/main/java/org/onap/aaf/rosetta/Parsed.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.rosetta;
+package org.onap.aaf.rosetta;
public class Parsed<S> {
diff --git a/rosetta/src/main/java/com/att/rosetta/Prop.java b/rosetta/src/main/java/org/onap/aaf/rosetta/Prop.java index aa728fe..dda725a 100644 --- a/rosetta/src/main/java/com/att/rosetta/Prop.java +++ b/rosetta/src/main/java/org/onap/aaf/rosetta/Prop.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.rosetta;
+package org.onap.aaf.rosetta;
class Prop {
public String tag;
diff --git a/rosetta/src/main/java/com/att/rosetta/Saved.java b/rosetta/src/main/java/org/onap/aaf/rosetta/Saved.java index 7e27a58..ae2797e 100644 --- a/rosetta/src/main/java/com/att/rosetta/Saved.java +++ b/rosetta/src/main/java/org/onap/aaf/rosetta/Saved.java @@ -20,16 +20,16 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.rosetta;
+package org.onap.aaf.rosetta;
import java.io.IOException;
import java.io.Reader;
import java.io.Writer;
import java.util.List;
-import com.att.inno.env.Env;
-import com.att.inno.env.TimeTaken;
-import com.att.rosetta.Saved.State;
+import org.onap.aaf.inno.env.Env;
+import org.onap.aaf.inno.env.TimeTaken;
+import org.onap.aaf.rosetta.Saved.State;
/**
* An Out Object that will save off produced Parsed Stream and
diff --git a/rosetta/src/main/java/com/att/rosetta/XmlEscape.java b/rosetta/src/main/java/org/onap/aaf/rosetta/XmlEscape.java index a98cf56..8ada632 100644 --- a/rosetta/src/main/java/com/att/rosetta/XmlEscape.java +++ b/rosetta/src/main/java/org/onap/aaf/rosetta/XmlEscape.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.rosetta;
+package org.onap.aaf.rosetta;
import java.io.IOException;
import java.io.Reader;
diff --git a/rosetta/src/main/java/com/att/rosetta/env/RosettaDF.java b/rosetta/src/main/java/org/onap/aaf/rosetta/env/RosettaDF.java index 6dac5fd..4005e81 100644 --- a/rosetta/src/main/java/com/att/rosetta/env/RosettaDF.java +++ b/rosetta/src/main/java/org/onap/aaf/rosetta/env/RosettaDF.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.rosetta.env;
+package org.onap.aaf.rosetta.env;
import java.io.IOException;
import java.io.OutputStream;
@@ -34,27 +34,27 @@ import javax.xml.bind.JAXBException; import javax.xml.namespace.QName;
import javax.xml.validation.Schema;
-import com.att.inno.env.APIException;
-import com.att.inno.env.BaseDataFactory;
-import com.att.inno.env.Data;
-import com.att.inno.env.Data.TYPE;
-import com.att.inno.env.DataFactory;
-import com.att.inno.env.Env;
-import com.att.inno.env.TimeTaken;
-import com.att.inno.env.Trans;
-import com.att.inno.env.jaxb.JAXBmar;
-import com.att.inno.env.jaxb.JAXBumar;
-import com.att.rosetta.InJson;
-import com.att.rosetta.InXML;
-import com.att.rosetta.JaxInfo;
-import com.att.rosetta.Marshal;
-import com.att.rosetta.Out;
-import com.att.rosetta.OutJson;
-import com.att.rosetta.OutRaw;
-import com.att.rosetta.OutXML;
-import com.att.rosetta.Parse;
-import com.att.rosetta.ParseException;
-import com.att.rosetta.marshal.DocMarshal;
+import org.onap.aaf.inno.env.APIException;
+import org.onap.aaf.inno.env.BaseDataFactory;
+import org.onap.aaf.inno.env.Data;
+import org.onap.aaf.inno.env.DataFactory;
+import org.onap.aaf.inno.env.Env;
+import org.onap.aaf.inno.env.TimeTaken;
+import org.onap.aaf.inno.env.Trans;
+import org.onap.aaf.inno.env.Data.TYPE;
+import org.onap.aaf.inno.env.jaxb.JAXBmar;
+import org.onap.aaf.inno.env.jaxb.JAXBumar;
+import org.onap.aaf.rosetta.InJson;
+import org.onap.aaf.rosetta.InXML;
+import org.onap.aaf.rosetta.JaxInfo;
+import org.onap.aaf.rosetta.Marshal;
+import org.onap.aaf.rosetta.Out;
+import org.onap.aaf.rosetta.OutJson;
+import org.onap.aaf.rosetta.OutRaw;
+import org.onap.aaf.rosetta.OutXML;
+import org.onap.aaf.rosetta.Parse;
+import org.onap.aaf.rosetta.ParseException;
+import org.onap.aaf.rosetta.marshal.DocMarshal;
public class RosettaDF<T> extends BaseDataFactory implements DataFactory<T> {
@@ -180,7 +180,7 @@ public class RosettaDF<T> extends BaseDataFactory implements DataFactory<T> { }
}
- public int logType(com.att.inno.env.Data.TYPE ot) {
+ public int logType(org.onap.aaf.inno.env.Data.TYPE ot) {
switch(ot) {
case JSON:
return Env.JSON;
diff --git a/rosetta/src/main/java/com/att/rosetta/env/RosettaData.java b/rosetta/src/main/java/org/onap/aaf/rosetta/env/RosettaData.java index 9b2b508..55c4b29 100644 --- a/rosetta/src/main/java/com/att/rosetta/env/RosettaData.java +++ b/rosetta/src/main/java/org/onap/aaf/rosetta/env/RosettaData.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.rosetta.env;
+package org.onap.aaf.rosetta.env;
import java.io.IOException;
import java.io.InputStream;
@@ -32,13 +32,13 @@ import java.io.StringReader; import java.io.StringWriter;
import java.io.Writer;
-import com.att.inno.env.APIException;
-import com.att.inno.env.Data;
-import com.att.inno.env.Env;
-import com.att.inno.env.TimeTaken;
-import com.att.rosetta.Out;
-import com.att.rosetta.Parse;
-import com.att.rosetta.Saved;
+import org.onap.aaf.inno.env.APIException;
+import org.onap.aaf.inno.env.Data;
+import org.onap.aaf.inno.env.Env;
+import org.onap.aaf.inno.env.TimeTaken;
+import org.onap.aaf.rosetta.Out;
+import org.onap.aaf.rosetta.Parse;
+import org.onap.aaf.rosetta.Saved;
public class RosettaData<T> implements Data<T>{
private Env trans;
diff --git a/rosetta/src/main/java/com/att/rosetta/env/RosettaEnv.java b/rosetta/src/main/java/org/onap/aaf/rosetta/env/RosettaEnv.java index 42877af..8138d47 100644 --- a/rosetta/src/main/java/com/att/rosetta/env/RosettaEnv.java +++ b/rosetta/src/main/java/org/onap/aaf/rosetta/env/RosettaEnv.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.rosetta.env;
+package org.onap.aaf.rosetta.env;
import java.applet.Applet;
import java.util.Properties;
@@ -28,7 +28,7 @@ import java.util.Properties; import javax.xml.namespace.QName;
import javax.xml.validation.Schema;
-import com.att.inno.env.APIException;
+import org.onap.aaf.inno.env.APIException;
/**
* An essential Implementation of Env, which will fully function, without any sort
@@ -37,7 +37,7 @@ import com.att.inno.env.APIException; * Use as a basis for Group level Env, just overriding where needed.
*
*/
-public class RosettaEnv extends com.att.inno.env.impl.BasicEnv {
+public class RosettaEnv extends org.onap.aaf.inno.env.impl.BasicEnv {
public RosettaEnv() {
super();
diff --git a/rosetta/src/main/java/com/att/rosetta/marshal/DataWriter.java b/rosetta/src/main/java/org/onap/aaf/rosetta/marshal/DataWriter.java index f5b13d8..14a1e24 100644 --- a/rosetta/src/main/java/com/att/rosetta/marshal/DataWriter.java +++ b/rosetta/src/main/java/org/onap/aaf/rosetta/marshal/DataWriter.java @@ -20,11 +20,11 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.rosetta.marshal;
+package org.onap.aaf.rosetta.marshal;
import javax.xml.datatype.XMLGregorianCalendar;
-import com.att.inno.env.util.Chrono;
+import org.onap.aaf.inno.env.util.Chrono;
/**
* We make these objects instead of static functions so they can be passed into
diff --git a/rosetta/src/main/java/com/att/rosetta/marshal/DocMarshal.java b/rosetta/src/main/java/org/onap/aaf/rosetta/marshal/DocMarshal.java index 555f419..47ee596 100644 --- a/rosetta/src/main/java/com/att/rosetta/marshal/DocMarshal.java +++ b/rosetta/src/main/java/org/onap/aaf/rosetta/marshal/DocMarshal.java @@ -20,14 +20,14 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.rosetta.marshal;
+package org.onap.aaf.rosetta.marshal;
import java.util.Iterator;
-import com.att.rosetta.Ladder;
-import com.att.rosetta.Marshal;
-import com.att.rosetta.ParseException;
-import com.att.rosetta.Parsed;
+import org.onap.aaf.rosetta.Ladder;
+import org.onap.aaf.rosetta.Marshal;
+import org.onap.aaf.rosetta.ParseException;
+import org.onap.aaf.rosetta.Parsed;
public class DocMarshal<T> extends Marshal<T> {
private Marshal<T> root;
diff --git a/rosetta/src/main/java/com/att/rosetta/marshal/FieldArray.java b/rosetta/src/main/java/org/onap/aaf/rosetta/marshal/FieldArray.java index 6a300dd..5683367 100644 --- a/rosetta/src/main/java/com/att/rosetta/marshal/FieldArray.java +++ b/rosetta/src/main/java/org/onap/aaf/rosetta/marshal/FieldArray.java @@ -20,15 +20,15 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.rosetta.marshal;
+package org.onap.aaf.rosetta.marshal;
import java.util.Iterator;
import java.util.List;
-import com.att.rosetta.Ladder;
-import com.att.rosetta.Marshal;
-import com.att.rosetta.ParseException;
-import com.att.rosetta.Parsed;
+import org.onap.aaf.rosetta.Ladder;
+import org.onap.aaf.rosetta.Marshal;
+import org.onap.aaf.rosetta.ParseException;
+import org.onap.aaf.rosetta.Parsed;
public abstract class FieldArray<T,S> extends Marshal<T> {
diff --git a/rosetta/src/main/java/com/att/rosetta/marshal/FieldBlob.java b/rosetta/src/main/java/org/onap/aaf/rosetta/marshal/FieldBlob.java index 5c569e6..f8275c9 100644 --- a/rosetta/src/main/java/com/att/rosetta/marshal/FieldBlob.java +++ b/rosetta/src/main/java/org/onap/aaf/rosetta/marshal/FieldBlob.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.rosetta.marshal;
+package org.onap.aaf.rosetta.marshal;
public abstract class FieldBlob<T> extends FieldMarshal<T>{
public FieldBlob(String name) {
diff --git a/rosetta/src/main/java/com/att/rosetta/marshal/FieldDate.java b/rosetta/src/main/java/org/onap/aaf/rosetta/marshal/FieldDate.java index b23232c..799cdb0 100644 --- a/rosetta/src/main/java/com/att/rosetta/marshal/FieldDate.java +++ b/rosetta/src/main/java/org/onap/aaf/rosetta/marshal/FieldDate.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.rosetta.marshal;
+package org.onap.aaf.rosetta.marshal;
import javax.xml.datatype.XMLGregorianCalendar;
diff --git a/rosetta/src/main/java/com/att/rosetta/marshal/FieldDateTime.java b/rosetta/src/main/java/org/onap/aaf/rosetta/marshal/FieldDateTime.java index 4caf247..bd64748 100644 --- a/rosetta/src/main/java/com/att/rosetta/marshal/FieldDateTime.java +++ b/rosetta/src/main/java/org/onap/aaf/rosetta/marshal/FieldDateTime.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.rosetta.marshal;
+package org.onap.aaf.rosetta.marshal;
import javax.xml.datatype.XMLGregorianCalendar;
diff --git a/rosetta/src/main/java/com/att/rosetta/marshal/FieldHexBinary.java b/rosetta/src/main/java/org/onap/aaf/rosetta/marshal/FieldHexBinary.java index 199e52f..c765625 100644 --- a/rosetta/src/main/java/com/att/rosetta/marshal/FieldHexBinary.java +++ b/rosetta/src/main/java/org/onap/aaf/rosetta/marshal/FieldHexBinary.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.rosetta.marshal;
+package org.onap.aaf.rosetta.marshal;
public abstract class FieldHexBinary<T> extends FieldMarshal<T>{
public FieldHexBinary(String name) {
diff --git a/rosetta/src/main/java/com/att/rosetta/marshal/FieldMarshal.java b/rosetta/src/main/java/org/onap/aaf/rosetta/marshal/FieldMarshal.java index f0916be..44d5aff 100644 --- a/rosetta/src/main/java/com/att/rosetta/marshal/FieldMarshal.java +++ b/rosetta/src/main/java/org/onap/aaf/rosetta/marshal/FieldMarshal.java @@ -20,12 +20,12 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.rosetta.marshal;
+package org.onap.aaf.rosetta.marshal;
-import com.att.rosetta.Marshal;
-import com.att.rosetta.Parse;
-import com.att.rosetta.Parsed;
+import org.onap.aaf.rosetta.Marshal;
+import org.onap.aaf.rosetta.Parse;
+import org.onap.aaf.rosetta.Parsed;
public abstract class FieldMarshal<T> extends Marshal<T> {
private String name;
diff --git a/rosetta/src/main/java/com/att/rosetta/marshal/FieldNumeric.java b/rosetta/src/main/java/org/onap/aaf/rosetta/marshal/FieldNumeric.java index 595ce63..493cb8b 100644 --- a/rosetta/src/main/java/com/att/rosetta/marshal/FieldNumeric.java +++ b/rosetta/src/main/java/org/onap/aaf/rosetta/marshal/FieldNumeric.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.rosetta.marshal;
+package org.onap.aaf.rosetta.marshal;
public abstract class FieldNumeric<N,T> extends FieldMarshal<T> {
public FieldNumeric(String name) {
diff --git a/rosetta/src/main/java/com/att/rosetta/marshal/FieldString.java b/rosetta/src/main/java/org/onap/aaf/rosetta/marshal/FieldString.java index 482c211..662e5da 100644 --- a/rosetta/src/main/java/com/att/rosetta/marshal/FieldString.java +++ b/rosetta/src/main/java/org/onap/aaf/rosetta/marshal/FieldString.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.rosetta.marshal;
+package org.onap.aaf.rosetta.marshal;
public abstract class FieldString<T> extends FieldMarshal<T> {
public FieldString(String name) {
diff --git a/rosetta/src/main/java/com/att/rosetta/marshal/ListIterator.java b/rosetta/src/main/java/org/onap/aaf/rosetta/marshal/ListIterator.java index 9aa75b5..204437c 100644 --- a/rosetta/src/main/java/com/att/rosetta/marshal/ListIterator.java +++ b/rosetta/src/main/java/org/onap/aaf/rosetta/marshal/ListIterator.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.rosetta.marshal;
+package org.onap.aaf.rosetta.marshal;
import java.util.Iterator;
import java.util.List;
diff --git a/rosetta/src/main/java/com/att/rosetta/marshal/ObjArray.java b/rosetta/src/main/java/org/onap/aaf/rosetta/marshal/ObjArray.java index abfb483..e935887 100644 --- a/rosetta/src/main/java/com/att/rosetta/marshal/ObjArray.java +++ b/rosetta/src/main/java/org/onap/aaf/rosetta/marshal/ObjArray.java @@ -20,15 +20,15 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.rosetta.marshal;
+package org.onap.aaf.rosetta.marshal;
import java.util.Iterator;
import java.util.List;
-import com.att.rosetta.Ladder;
-import com.att.rosetta.Marshal;
-import com.att.rosetta.ParseException;
-import com.att.rosetta.Parsed;
+import org.onap.aaf.rosetta.Ladder;
+import org.onap.aaf.rosetta.Marshal;
+import org.onap.aaf.rosetta.ParseException;
+import org.onap.aaf.rosetta.Parsed;
public abstract class ObjArray<T,S> extends Marshal<T> {
diff --git a/rosetta/src/main/java/com/att/rosetta/marshal/ObjMarshal.java b/rosetta/src/main/java/org/onap/aaf/rosetta/marshal/ObjMarshal.java index bef128b..0205eaa 100644 --- a/rosetta/src/main/java/com/att/rosetta/marshal/ObjMarshal.java +++ b/rosetta/src/main/java/org/onap/aaf/rosetta/marshal/ObjMarshal.java @@ -20,14 +20,14 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.rosetta.marshal;
+package org.onap.aaf.rosetta.marshal;
import java.util.Iterator;
-import com.att.rosetta.Ladder;
-import com.att.rosetta.Marshal;
-import com.att.rosetta.ParseException;
-import com.att.rosetta.Parsed;
+import org.onap.aaf.rosetta.Ladder;
+import org.onap.aaf.rosetta.Marshal;
+import org.onap.aaf.rosetta.ParseException;
+import org.onap.aaf.rosetta.Parsed;
/**
* Object Marshal
diff --git a/rosetta/src/test/java/com/data/test/JU_FromJSON.java b/rosetta/src/test/java/com/data/test/JU_FromJSON.java index 5ad6546..fd13f78 100644 --- a/rosetta/src/test/java/com/data/test/JU_FromJSON.java +++ b/rosetta/src/test/java/com/data/test/JU_FromJSON.java @@ -26,20 +26,19 @@ import java.io.Reader; import java.io.StringReader;
import org.junit.Test;
-
-import com.att.inno.env.Env;
-import com.att.inno.env.LogTarget;
-import com.att.inno.env.TimeTaken;
-import com.att.inno.env.Trans;
-import com.att.inno.env.impl.EnvFactory;
-import com.att.inno.env.jaxb.JAXBmar;
-import com.att.inno.env.util.IndentPrintWriter;
-import com.att.inno.env.util.StringBuilderWriter;
-import com.att.rosetta.InJson;
-import com.att.rosetta.Out;
-import com.att.rosetta.OutJson;
-import com.att.rosetta.OutRaw;
-import com.att.rosetta.OutXML;
+import org.onap.aaf.inno.env.Env;
+import org.onap.aaf.inno.env.LogTarget;
+import org.onap.aaf.inno.env.TimeTaken;
+import org.onap.aaf.inno.env.Trans;
+import org.onap.aaf.inno.env.impl.EnvFactory;
+import org.onap.aaf.inno.env.jaxb.JAXBmar;
+import org.onap.aaf.inno.env.util.IndentPrintWriter;
+import org.onap.aaf.inno.env.util.StringBuilderWriter;
+import org.onap.aaf.rosetta.InJson;
+import org.onap.aaf.rosetta.Out;
+import org.onap.aaf.rosetta.OutJson;
+import org.onap.aaf.rosetta.OutRaw;
+import org.onap.aaf.rosetta.OutXML;
import junit.framework.Assert;
import s.xsd.LargerData;
diff --git a/rosetta/src/test/java/com/data/test/JU_FromXML.java b/rosetta/src/test/java/com/data/test/JU_FromXML.java index 62db4f9..97209ff 100644 --- a/rosetta/src/test/java/com/data/test/JU_FromXML.java +++ b/rosetta/src/test/java/com/data/test/JU_FromXML.java @@ -26,21 +26,20 @@ import java.io.Reader; import java.io.StringReader;
import org.junit.Test;
-
-import com.att.inno.env.Env;
-import com.att.inno.env.LogTarget;
-import com.att.inno.env.TimeTaken;
-import com.att.inno.env.Trans;
-import com.att.inno.env.Trans.Metric;
-import com.att.inno.env.impl.EnvFactory;
-import com.att.inno.env.jaxb.JAXBmar;
-import com.att.inno.env.jaxb.JAXBumar;
-import com.att.inno.env.util.StringBuilderWriter;
-import com.att.rosetta.InXML;
-import com.att.rosetta.Out;
-import com.att.rosetta.OutJson;
-import com.att.rosetta.OutRaw;
-import com.att.rosetta.OutXML;
+import org.onap.aaf.inno.env.Env;
+import org.onap.aaf.inno.env.LogTarget;
+import org.onap.aaf.inno.env.TimeTaken;
+import org.onap.aaf.inno.env.Trans;
+import org.onap.aaf.inno.env.Trans.Metric;
+import org.onap.aaf.inno.env.impl.EnvFactory;
+import org.onap.aaf.inno.env.jaxb.JAXBmar;
+import org.onap.aaf.inno.env.jaxb.JAXBumar;
+import org.onap.aaf.inno.env.util.StringBuilderWriter;
+import org.onap.aaf.rosetta.InXML;
+import org.onap.aaf.rosetta.Out;
+import org.onap.aaf.rosetta.OutJson;
+import org.onap.aaf.rosetta.OutRaw;
+import org.onap.aaf.rosetta.OutXML;
import s.xsd.LargerData;
diff --git a/rosetta/src/test/java/com/data/test/JU_JSON.java b/rosetta/src/test/java/com/data/test/JU_JSON.java index 7840573..ffaf429 100644 --- a/rosetta/src/test/java/com/data/test/JU_JSON.java +++ b/rosetta/src/test/java/com/data/test/JU_JSON.java @@ -28,13 +28,12 @@ import java.io.StringReader; import java.io.StringWriter;
import org.junit.Test;
-
-import com.att.rosetta.InJson;
-import com.att.rosetta.Out;
-import com.att.rosetta.OutJson;
-import com.att.rosetta.OutRaw;
-import com.att.rosetta.Parse;
-import com.att.rosetta.ParseException;
+import org.onap.aaf.rosetta.InJson;
+import org.onap.aaf.rosetta.Out;
+import org.onap.aaf.rosetta.OutJson;
+import org.onap.aaf.rosetta.OutRaw;
+import org.onap.aaf.rosetta.Parse;
+import org.onap.aaf.rosetta.ParseException;
import junit.framework.Assert;
diff --git a/rosetta/src/test/java/com/data/test/JU_Ladder.java b/rosetta/src/test/java/com/data/test/JU_Ladder.java index 5f19ed8..77165b8 100644 --- a/rosetta/src/test/java/com/data/test/JU_Ladder.java +++ b/rosetta/src/test/java/com/data/test/JU_Ladder.java @@ -25,9 +25,9 @@ package com.data.test; import static org.junit.Assert.assertEquals;
import org.junit.Test;
-import static org.junit.Assert.*;
+import org.onap.aaf.rosetta.Ladder;
-import com.att.rosetta.Ladder;
+import static org.junit.Assert.*;
public class JU_Ladder {
diff --git a/rosetta/src/test/java/com/data/test/JU_Nulls.java b/rosetta/src/test/java/com/data/test/JU_Nulls.java index af18a2f..c70725d 100644 --- a/rosetta/src/test/java/com/data/test/JU_Nulls.java +++ b/rosetta/src/test/java/com/data/test/JU_Nulls.java @@ -24,11 +24,10 @@ package com.data.test; import org.junit.AfterClass;
import org.junit.Test;
-
-import com.att.inno.env.Data;
-import com.att.rosetta.env.RosettaDF;
-import com.att.rosetta.env.RosettaData;
-import com.att.rosetta.env.RosettaEnv;
+import org.onap.aaf.inno.env.Data;
+import org.onap.aaf.rosetta.env.RosettaDF;
+import org.onap.aaf.rosetta.env.RosettaData;
+import org.onap.aaf.rosetta.env.RosettaEnv;
import junit.framework.Assert;
import s.xsd.LargerData;
diff --git a/rosetta/src/test/java/com/data/test/JU_RosettaDF.java b/rosetta/src/test/java/com/data/test/JU_RosettaDF.java index 7915a60..5c26afe 100644 --- a/rosetta/src/test/java/com/data/test/JU_RosettaDF.java +++ b/rosetta/src/test/java/com/data/test/JU_RosettaDF.java @@ -26,17 +26,16 @@ import java.io.StringReader; import org.junit.Assert;
import org.junit.Test;
-
-import com.att.inno.env.Data;
-import com.att.inno.env.Data.TYPE;
-import com.att.inno.env.TimeTaken;
-import com.att.inno.env.Trans;
-import com.att.inno.env.impl.EnvFactory;
-import com.att.inno.env.jaxb.JAXBmar;
-import com.att.inno.env.util.StringBuilderWriter;
-import com.att.rosetta.env.RosettaDF;
-import com.att.rosetta.env.RosettaData;
-import com.att.rosetta.env.RosettaEnv;
+import org.onap.aaf.inno.env.Data;
+import org.onap.aaf.inno.env.TimeTaken;
+import org.onap.aaf.inno.env.Trans;
+import org.onap.aaf.inno.env.Data.TYPE;
+import org.onap.aaf.inno.env.impl.EnvFactory;
+import org.onap.aaf.inno.env.jaxb.JAXBmar;
+import org.onap.aaf.inno.env.util.StringBuilderWriter;
+import org.onap.aaf.rosetta.env.RosettaDF;
+import org.onap.aaf.rosetta.env.RosettaData;
+import org.onap.aaf.rosetta.env.RosettaEnv;
import s.xsd.LargerData;
import s.xsd.Multi;
diff --git a/rosetta/src/test/java/com/data/test/JU_Saved.java b/rosetta/src/test/java/com/data/test/JU_Saved.java index 6314b72..1d43f88 100644 --- a/rosetta/src/test/java/com/data/test/JU_Saved.java +++ b/rosetta/src/test/java/com/data/test/JU_Saved.java @@ -26,16 +26,15 @@ import java.io.Reader; import java.io.StringReader;
import org.junit.Test;
-
-import com.att.inno.env.TimeTaken;
-import com.att.inno.env.Trans;
-import com.att.inno.env.impl.EnvFactory;
-import com.att.inno.env.util.StringBuilderWriter;
-import com.att.rosetta.InJson;
-import com.att.rosetta.JaxInfo;
-import com.att.rosetta.OutJson;
-import com.att.rosetta.OutXML;
-import com.att.rosetta.Saved;
+import org.onap.aaf.inno.env.TimeTaken;
+import org.onap.aaf.inno.env.Trans;
+import org.onap.aaf.inno.env.impl.EnvFactory;
+import org.onap.aaf.inno.env.util.StringBuilderWriter;
+import org.onap.aaf.rosetta.InJson;
+import org.onap.aaf.rosetta.JaxInfo;
+import org.onap.aaf.rosetta.OutJson;
+import org.onap.aaf.rosetta.OutXML;
+import org.onap.aaf.rosetta.Saved;
import s.xsd.LargerData;
diff --git a/rosetta/src/test/java/com/data/test/JU_Stream2Obj.java b/rosetta/src/test/java/com/data/test/JU_Stream2Obj.java index b5a6c9d..4ca3328 100644 --- a/rosetta/src/test/java/com/data/test/JU_Stream2Obj.java +++ b/rosetta/src/test/java/com/data/test/JU_Stream2Obj.java @@ -28,20 +28,19 @@ import java.io.StringReader; import java.io.StringWriter;
import org.junit.Test;
-
-import com.att.inno.env.APIException;
-import com.att.inno.env.Data;
-import com.att.inno.env.DataFactory;
-import com.att.inno.env.EnvJAXB;
-import com.att.inno.env.impl.BasicEnv;
-import com.att.rosetta.InJson;
-import com.att.rosetta.InXML;
-import com.att.rosetta.Out;
-import com.att.rosetta.OutJson;
-import com.att.rosetta.OutRaw;
-import com.att.rosetta.OutXML;
-import com.att.rosetta.Parse;
-import com.att.rosetta.ParseException;
+import org.onap.aaf.inno.env.APIException;
+import org.onap.aaf.inno.env.Data;
+import org.onap.aaf.inno.env.DataFactory;
+import org.onap.aaf.inno.env.EnvJAXB;
+import org.onap.aaf.inno.env.impl.BasicEnv;
+import org.onap.aaf.rosetta.InJson;
+import org.onap.aaf.rosetta.InXML;
+import org.onap.aaf.rosetta.Out;
+import org.onap.aaf.rosetta.OutJson;
+import org.onap.aaf.rosetta.OutRaw;
+import org.onap.aaf.rosetta.OutXML;
+import org.onap.aaf.rosetta.Parse;
+import org.onap.aaf.rosetta.ParseException;
import inherit.DerivedA;
import inherit.Root;
diff --git a/rosetta/src/test/java/com/data/test/JU_Struct.java b/rosetta/src/test/java/com/data/test/JU_Struct.java index 66c83c0..cb65f24 100644 --- a/rosetta/src/test/java/com/data/test/JU_Struct.java +++ b/rosetta/src/test/java/com/data/test/JU_Struct.java @@ -23,8 +23,7 @@ package com.data.test;
import org.junit.Test;
-
-import com.att.rosetta.JaxInfo;
+import org.onap.aaf.rosetta.JaxInfo;
import s.xsd.LargerData;
diff --git a/rosetta/src/test/java/com/data/test/JU_Types.java b/rosetta/src/test/java/com/data/test/JU_Types.java index d34815f..3fef743 100644 --- a/rosetta/src/test/java/com/data/test/JU_Types.java +++ b/rosetta/src/test/java/com/data/test/JU_Types.java @@ -28,23 +28,23 @@ import javax.xml.datatype.XMLGregorianCalendar; import javax.xml.namespace.QName;
import org.junit.Test;
+import org.onap.aaf.inno.env.Data;
+import org.onap.aaf.inno.env.Env;
+import org.onap.aaf.inno.env.Trans;
+import org.onap.aaf.inno.env.Data.TYPE;
+import org.onap.aaf.inno.env.Trans.Metric;
+import org.onap.aaf.inno.env.jaxb.JAXBmar;
+import org.onap.aaf.inno.env.jaxb.JAXBumar;
+import org.onap.aaf.inno.env.util.Chrono;
+import org.onap.aaf.inno.env.util.StringBuilderWriter;
+import org.onap.aaf.rosetta.OutJson;
+import org.onap.aaf.rosetta.OutRaw;
+import org.onap.aaf.rosetta.OutXML;
+import org.onap.aaf.rosetta.env.RosettaDF;
+import org.onap.aaf.rosetta.env.RosettaData;
+import org.onap.aaf.rosetta.env.RosettaEnv;
+import org.onap.aaf.rosetta.marshal.DocMarshal;
-import com.att.inno.env.Data;
-import com.att.inno.env.Data.TYPE;
-import com.att.inno.env.Env;
-import com.att.inno.env.Trans;
-import com.att.inno.env.Trans.Metric;
-import com.att.inno.env.jaxb.JAXBmar;
-import com.att.inno.env.jaxb.JAXBumar;
-import com.att.inno.env.util.Chrono;
-import com.att.inno.env.util.StringBuilderWriter;
-import com.att.rosetta.OutJson;
-import com.att.rosetta.OutRaw;
-import com.att.rosetta.OutXML;
-import com.att.rosetta.env.RosettaDF;
-import com.att.rosetta.env.RosettaData;
-import com.att.rosetta.env.RosettaEnv;
-import com.att.rosetta.marshal.DocMarshal;
import com.data.test.obj.MultiMarshal;
import com.data.test.obj.SingleMarshal;
diff --git a/rosetta/src/test/java/com/data/test/OutDump.java b/rosetta/src/test/java/com/data/test/OutDump.java index 6e9d0fb..b4f477f 100644 --- a/rosetta/src/test/java/com/data/test/OutDump.java +++ b/rosetta/src/test/java/com/data/test/OutDump.java @@ -25,11 +25,11 @@ package com.data.test; import java.io.IOException;
import java.io.Writer;
-import com.att.inno.env.util.IndentPrintWriter;
-import com.att.rosetta.Out;
-import com.att.rosetta.Parse;
-import com.att.rosetta.ParseException;
-import com.att.rosetta.Parsed;
+import org.onap.aaf.inno.env.util.IndentPrintWriter;
+import org.onap.aaf.rosetta.Out;
+import org.onap.aaf.rosetta.Parse;
+import org.onap.aaf.rosetta.ParseException;
+import org.onap.aaf.rosetta.Parsed;
public class OutDump extends Out{
diff --git a/rosetta/src/test/java/com/data/test/Report.java b/rosetta/src/test/java/com/data/test/Report.java index 9a970dc..7179245 100644 --- a/rosetta/src/test/java/com/data/test/Report.java +++ b/rosetta/src/test/java/com/data/test/Report.java @@ -25,8 +25,8 @@ package com.data.test; import java.io.IOException;
import java.io.Writer;
-import com.att.inno.env.Trans;
-import com.att.inno.env.Trans.Metric;
+import org.onap.aaf.inno.env.Trans;
+import org.onap.aaf.inno.env.Trans.Metric;
public class Report {
float total;
diff --git a/rosetta/src/test/java/com/data/test/obj/MultiMarshal.java b/rosetta/src/test/java/com/data/test/obj/MultiMarshal.java index ca105b3..31e4f43 100644 --- a/rosetta/src/test/java/com/data/test/obj/MultiMarshal.java +++ b/rosetta/src/test/java/com/data/test/obj/MultiMarshal.java @@ -24,8 +24,8 @@ package com.data.test.obj; import java.util.List;
-import com.att.rosetta.marshal.ObjArray;
-import com.att.rosetta.marshal.ObjMarshal;
+import org.onap.aaf.rosetta.marshal.ObjArray;
+import org.onap.aaf.rosetta.marshal.ObjMarshal;
import types.xsd.Multi;
import types.xsd.Multi.Single;
diff --git a/rosetta/src/test/java/com/data/test/obj/SingleMarshal.java b/rosetta/src/test/java/com/data/test/obj/SingleMarshal.java index b1ac110..d524516 100644 --- a/rosetta/src/test/java/com/data/test/obj/SingleMarshal.java +++ b/rosetta/src/test/java/com/data/test/obj/SingleMarshal.java @@ -26,14 +26,14 @@ import java.util.List; import javax.xml.datatype.XMLGregorianCalendar;
-import com.att.rosetta.marshal.DataWriter;
-import com.att.rosetta.marshal.FieldArray;
-import com.att.rosetta.marshal.FieldDate;
-import com.att.rosetta.marshal.FieldDateTime;
-import com.att.rosetta.marshal.FieldHexBinary;
-import com.att.rosetta.marshal.FieldNumeric;
-import com.att.rosetta.marshal.FieldString;
-import com.att.rosetta.marshal.ObjMarshal;
+import org.onap.aaf.rosetta.marshal.DataWriter;
+import org.onap.aaf.rosetta.marshal.FieldArray;
+import org.onap.aaf.rosetta.marshal.FieldDate;
+import org.onap.aaf.rosetta.marshal.FieldDateTime;
+import org.onap.aaf.rosetta.marshal.FieldHexBinary;
+import org.onap.aaf.rosetta.marshal.FieldNumeric;
+import org.onap.aaf.rosetta.marshal.FieldString;
+import org.onap.aaf.rosetta.marshal.ObjMarshal;
import types.xsd.Multi.Single;
diff --git a/xgen/pom.xml b/xgen/pom.xml index 1ead38c..ce495d2 100644 --- a/xgen/pom.xml +++ b/xgen/pom.xml @@ -23,7 +23,7 @@ <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">
<parent>
- <groupId>com.att.inno</groupId>
+ <groupId>org.onap.aaf.inno</groupId>
<artifactId>parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>..</relativePath>
@@ -63,7 +63,7 @@ </properties>
<dependencies>
<dependency>
- <groupId>com.att.inno</groupId>
+ <groupId>org.onap.aaf.inno</groupId>
<artifactId>env</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/xgen/src/main/java/com/att/xgen/Back.java b/xgen/src/main/java/org/onap/aaf/xgen/Back.java index 154ba88..0c9f592 100644 --- a/xgen/src/main/java/com/att/xgen/Back.java +++ b/xgen/src/main/java/org/onap/aaf/xgen/Back.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.xgen;
+package org.onap.aaf.xgen;
public class Back {
public String str;
diff --git a/xgen/src/main/java/com/att/xgen/Cache.java b/xgen/src/main/java/org/onap/aaf/xgen/Cache.java index 6c887cc..7f75703 100644 --- a/xgen/src/main/java/com/att/xgen/Cache.java +++ b/xgen/src/main/java/org/onap/aaf/xgen/Cache.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.xgen;
+package org.onap.aaf.xgen;
public interface Cache<G extends XGen<G>> {
diff --git a/xgen/src/main/java/com/att/xgen/CacheGen.java b/xgen/src/main/java/org/onap/aaf/xgen/CacheGen.java index 371cf87..3a8957a 100644 --- a/xgen/src/main/java/com/att/xgen/CacheGen.java +++ b/xgen/src/main/java/org/onap/aaf/xgen/CacheGen.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.xgen;
+package org.onap.aaf.xgen;
import java.io.IOException;
import java.io.OutputStream;
@@ -28,11 +28,11 @@ import java.io.OutputStreamWriter; import java.io.Writer;
import java.util.ArrayList;
-import com.att.inno.env.APIException;
-import com.att.inno.env.Env;
-import com.att.inno.env.Trans;
-import com.att.xgen.html.State;
-import com.att.xgen.html.Thematic;
+import org.onap.aaf.inno.env.APIException;
+import org.onap.aaf.inno.env.Env;
+import org.onap.aaf.inno.env.Trans;
+import org.onap.aaf.xgen.html.State;
+import org.onap.aaf.xgen.html.Thematic;
public abstract class CacheGen<G extends XGen<G>> {
diff --git a/xgen/src/main/java/com/att/xgen/Code.java b/xgen/src/main/java/org/onap/aaf/xgen/Code.java index 70d0c74..163a9dd 100644 --- a/xgen/src/main/java/com/att/xgen/Code.java +++ b/xgen/src/main/java/org/onap/aaf/xgen/Code.java @@ -20,11 +20,11 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.xgen;
+package org.onap.aaf.xgen;
import java.io.IOException;
-import com.att.inno.env.APIException;
+import org.onap.aaf.inno.env.APIException;
public interface Code<G extends XGen<G>> {
public void code(Cache<G> cache, G xgen) throws APIException, IOException;
diff --git a/xgen/src/main/java/com/att/xgen/DynamicCode.java b/xgen/src/main/java/org/onap/aaf/xgen/DynamicCode.java index f1cc4c4..4e44032 100644 --- a/xgen/src/main/java/com/att/xgen/DynamicCode.java +++ b/xgen/src/main/java/org/onap/aaf/xgen/DynamicCode.java @@ -20,14 +20,14 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.xgen;
+package org.onap.aaf.xgen;
import java.io.IOException;
-import com.att.inno.env.APIException;
-import com.att.inno.env.Env;
-import com.att.inno.env.Trans;
-import com.att.xgen.html.State;
+import org.onap.aaf.inno.env.APIException;
+import org.onap.aaf.inno.env.Env;
+import org.onap.aaf.inno.env.Trans;
+import org.onap.aaf.xgen.html.State;
/**
* Special Code Interface to gain access to Transaction
diff --git a/xgen/src/main/java/com/att/xgen/Mark.java b/xgen/src/main/java/org/onap/aaf/xgen/Mark.java index 4b148d2..4872139 100644 --- a/xgen/src/main/java/com/att/xgen/Mark.java +++ b/xgen/src/main/java/org/onap/aaf/xgen/Mark.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.xgen;
+package org.onap.aaf.xgen;
public class Mark {
// package on purpose
diff --git a/xgen/src/main/java/com/att/xgen/Section.java b/xgen/src/main/java/org/onap/aaf/xgen/Section.java index 1b16986..3851090 100644 --- a/xgen/src/main/java/com/att/xgen/Section.java +++ b/xgen/src/main/java/org/onap/aaf/xgen/Section.java @@ -20,15 +20,15 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.xgen;
+package org.onap.aaf.xgen;
import java.io.IOException;
import java.io.Writer;
-import com.att.inno.env.APIException;
-import com.att.inno.env.Env;
-import com.att.inno.env.Trans;
-import com.att.xgen.html.State;
+import org.onap.aaf.inno.env.APIException;
+import org.onap.aaf.inno.env.Env;
+import org.onap.aaf.inno.env.Trans;
+import org.onap.aaf.xgen.html.State;
public class Section<G extends XGen<G>> {
protected int indent;
diff --git a/xgen/src/main/java/com/att/xgen/XGen.java b/xgen/src/main/java/org/onap/aaf/xgen/XGen.java index fe6acba..089c62a 100644 --- a/xgen/src/main/java/com/att/xgen/XGen.java +++ b/xgen/src/main/java/org/onap/aaf/xgen/XGen.java @@ -20,14 +20,14 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.xgen;
+package org.onap.aaf.xgen;
import java.io.PrintWriter;
import java.io.Writer;
import java.util.Stack;
-import com.att.inno.env.util.IndentPrintWriter;
-import com.att.inno.env.util.StringBuilderWriter;
+import org.onap.aaf.inno.env.util.IndentPrintWriter;
+import org.onap.aaf.inno.env.util.StringBuilderWriter;
public class XGen<RT extends XGen<RT>> {
diff --git a/xgen/src/main/java/com/att/xgen/XGenBuff.java b/xgen/src/main/java/org/onap/aaf/xgen/XGenBuff.java index bf63e19..5da2ab3 100644 --- a/xgen/src/main/java/com/att/xgen/XGenBuff.java +++ b/xgen/src/main/java/org/onap/aaf/xgen/XGenBuff.java @@ -20,15 +20,15 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.xgen;
+package org.onap.aaf.xgen;
import java.io.IOException;
-import com.att.inno.env.APIException;
-import com.att.inno.env.Env;
-import com.att.inno.env.Trans;
-import com.att.inno.env.util.StringBuilderWriter;
-import com.att.xgen.html.State;
+import org.onap.aaf.inno.env.APIException;
+import org.onap.aaf.inno.env.Env;
+import org.onap.aaf.inno.env.Trans;
+import org.onap.aaf.inno.env.util.StringBuilderWriter;
+import org.onap.aaf.xgen.html.State;
public class XGenBuff<G extends XGen<G>> {
private G xgen;
diff --git a/xgen/src/main/java/com/att/xgen/html/HTML4Gen.java b/xgen/src/main/java/org/onap/aaf/xgen/html/HTML4Gen.java index 88cae0a..d858148 100644 --- a/xgen/src/main/java/com/att/xgen/html/HTML4Gen.java +++ b/xgen/src/main/java/org/onap/aaf/xgen/html/HTML4Gen.java @@ -20,11 +20,11 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.xgen.html;
+package org.onap.aaf.xgen.html;
import java.io.Writer;
-import com.att.xgen.Mark;
+import org.onap.aaf.xgen.Mark;
public class HTML4Gen extends HTMLGen {
private final static String DOCTYPE =
diff --git a/xgen/src/main/java/com/att/xgen/html/HTML5Gen.java b/xgen/src/main/java/org/onap/aaf/xgen/html/HTML5Gen.java index 217a764..9fec999 100644 --- a/xgen/src/main/java/com/att/xgen/html/HTML5Gen.java +++ b/xgen/src/main/java/org/onap/aaf/xgen/html/HTML5Gen.java @@ -20,11 +20,11 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.xgen.html;
+package org.onap.aaf.xgen.html;
import java.io.Writer;
-import com.att.xgen.Mark;
+import org.onap.aaf.xgen.Mark;
public class HTML5Gen extends HTMLGen {
public HTML5Gen(Writer w) {
diff --git a/xgen/src/main/java/com/att/xgen/html/HTMLCacheGen.java b/xgen/src/main/java/org/onap/aaf/xgen/html/HTMLCacheGen.java index a53370a..e541a16 100644 --- a/xgen/src/main/java/com/att/xgen/html/HTMLCacheGen.java +++ b/xgen/src/main/java/org/onap/aaf/xgen/html/HTMLCacheGen.java @@ -20,14 +20,14 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.xgen.html;
+package org.onap.aaf.xgen.html;
import java.io.IOException;
import java.io.Writer;
-import com.att.inno.env.APIException;
-import com.att.xgen.CacheGen;
-import com.att.xgen.Code;
+import org.onap.aaf.inno.env.APIException;
+import org.onap.aaf.xgen.CacheGen;
+import org.onap.aaf.xgen.Code;
public class HTMLCacheGen extends CacheGen<HTMLGen> {
protected int flags;
diff --git a/xgen/src/main/java/com/att/xgen/html/HTMLGen.java b/xgen/src/main/java/org/onap/aaf/xgen/html/HTMLGen.java index 3827884..1f4bffd 100644 --- a/xgen/src/main/java/com/att/xgen/html/HTMLGen.java +++ b/xgen/src/main/java/org/onap/aaf/xgen/html/HTMLGen.java @@ -20,12 +20,12 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.xgen.html;
+package org.onap.aaf.xgen.html;
import java.io.Writer;
-import com.att.xgen.Mark;
-import com.att.xgen.XGen;
+import org.onap.aaf.xgen.Mark;
+import org.onap.aaf.xgen.XGen;
public abstract class HTMLGen extends XGen<HTMLGen> {
public static final String A = "a";
diff --git a/xgen/src/main/java/com/att/xgen/html/Imports.java b/xgen/src/main/java/org/onap/aaf/xgen/html/Imports.java index 941fe5f..65aa2c8 100644 --- a/xgen/src/main/java/com/att/xgen/html/Imports.java +++ b/xgen/src/main/java/org/onap/aaf/xgen/html/Imports.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.xgen.html;
+package org.onap.aaf.xgen.html;
import java.util.ArrayList;
import java.util.List;
diff --git a/xgen/src/main/java/com/att/xgen/html/JSGen.java b/xgen/src/main/java/org/onap/aaf/xgen/html/JSGen.java index 02662ab..1b90660 100644 --- a/xgen/src/main/java/com/att/xgen/html/JSGen.java +++ b/xgen/src/main/java/org/onap/aaf/xgen/html/JSGen.java @@ -20,15 +20,15 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.xgen.html;
+package org.onap.aaf.xgen.html;
import java.io.BufferedReader;
import java.io.FileReader;
import java.io.IOException;
-import com.att.inno.env.util.IndentPrintWriter;
-import com.att.xgen.Back;
-import com.att.xgen.Mark;
+import org.onap.aaf.inno.env.util.IndentPrintWriter;
+import org.onap.aaf.xgen.Back;
+import org.onap.aaf.xgen.Mark;
public class JSGen {
diff --git a/xgen/src/main/java/com/att/xgen/html/State.java b/xgen/src/main/java/org/onap/aaf/xgen/html/State.java index 6a73ad6..cada45d 100644 --- a/xgen/src/main/java/com/att/xgen/html/State.java +++ b/xgen/src/main/java/org/onap/aaf/xgen/html/State.java @@ -20,9 +20,9 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.xgen.html;
+package org.onap.aaf.xgen.html;
-import com.att.inno.env.Env;
+import org.onap.aaf.inno.env.Env;
public interface State<ENV extends Env> {
}
diff --git a/xgen/src/main/java/com/att/xgen/html/Thematic.java b/xgen/src/main/java/org/onap/aaf/xgen/html/Thematic.java index 865be9b..01281cb 100644 --- a/xgen/src/main/java/com/att/xgen/html/Thematic.java +++ b/xgen/src/main/java/org/onap/aaf/xgen/html/Thematic.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.xgen.html;
+package org.onap.aaf.xgen.html;
public interface Thematic {
String themePath(String theTheme);
diff --git a/xgen/src/main/java/com/att/xgen/xml/XMLCacheGen.java b/xgen/src/main/java/org/onap/aaf/xgen/xml/XMLCacheGen.java index 0e00a41..066e67a 100644 --- a/xgen/src/main/java/com/att/xgen/xml/XMLCacheGen.java +++ b/xgen/src/main/java/org/onap/aaf/xgen/xml/XMLCacheGen.java @@ -20,14 +20,14 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.xgen.xml;
+package org.onap.aaf.xgen.xml;
import java.io.IOException;
import java.io.Writer;
-import com.att.inno.env.APIException;
-import com.att.xgen.CacheGen;
-import com.att.xgen.Code;
+import org.onap.aaf.inno.env.APIException;
+import org.onap.aaf.xgen.CacheGen;
+import org.onap.aaf.xgen.Code;
public class XMLCacheGen extends CacheGen<XMLGen> {
diff --git a/xgen/src/main/java/com/att/xgen/xml/XMLGen.java b/xgen/src/main/java/org/onap/aaf/xgen/xml/XMLGen.java index ac9d689..0707e89 100644 --- a/xgen/src/main/java/com/att/xgen/xml/XMLGen.java +++ b/xgen/src/main/java/org/onap/aaf/xgen/xml/XMLGen.java @@ -20,11 +20,11 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.xgen.xml;
+package org.onap.aaf.xgen.xml;
import java.io.Writer;
-import com.att.xgen.XGen;;
+import org.onap.aaf.xgen.XGen;;
public class XMLGen extends XGen<XMLGen> {
private final String XML_TAG;
|