From bfc9888bc95e567d7c1a02306254099283827988 Mon Sep 17 00:00:00 2001 From: sg481n Date: Thu, 24 Aug 2017 00:58:40 -0400 Subject: 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 --- .../src/test/java/com/data/test/JU_FromJSON.java | 27 +++++++++--------- .../src/test/java/com/data/test/JU_FromXML.java | 29 ++++++++++---------- rosetta/src/test/java/com/data/test/JU_JSON.java | 13 ++++----- rosetta/src/test/java/com/data/test/JU_Ladder.java | 4 +-- rosetta/src/test/java/com/data/test/JU_Nulls.java | 9 +++--- .../src/test/java/com/data/test/JU_RosettaDF.java | 21 +++++++------- rosetta/src/test/java/com/data/test/JU_Saved.java | 19 ++++++------- .../src/test/java/com/data/test/JU_Stream2Obj.java | 27 +++++++++--------- rosetta/src/test/java/com/data/test/JU_Struct.java | 3 +- rosetta/src/test/java/com/data/test/JU_Types.java | 32 +++++++++++----------- rosetta/src/test/java/com/data/test/OutDump.java | 10 +++---- rosetta/src/test/java/com/data/test/Report.java | 4 +-- .../test/java/com/data/test/obj/MultiMarshal.java | 4 +-- .../test/java/com/data/test/obj/SingleMarshal.java | 16 +++++------ 14 files changed, 105 insertions(+), 113 deletions(-) (limited to 'rosetta/src/test/java/com') 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; -- cgit 1.2.3-korg