54 files changed, 152 insertions, 154 deletions
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;