Update project structure to org.onap.aaf

Update package structure from com.att to
org.onap.aaf and add distribution management
and repositories.

Issue-id: AAF-23
Change-Id: I1b2381a58b08d147a0dfffd086aabd37ecfc3090
Signed-off-by: sg481n <sg481n@att.com>

50 files changed, 213 insertions, 238 deletions

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;