You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@daffodil.apache.org by sl...@apache.org on 2018/02/08 12:46:14 UTC
[incubator-daffodil] 02/05: Replace instances of ncsa.illinois.edu
with apache.org
This is an automated email from the ASF dual-hosted git repository.
slawrence pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-daffodil.git
commit bf35b44093a8dc9c1aa7582e78b4c29ecd81abbb
Author: Steve Lawrence <sl...@apache.org>
AuthorDate: Fri Jan 5 11:07:42 2018 -0500
Replace instances of ncsa.illinois.edu with apache.org
- Update package names to be org.apache.daffodil. This breaks API
backwards compatibility, but only requires a small change to update
imports and our user base is relatively small right now, so this
should not affect too many people.
- Add new xml 'daf' namespace for daffodil.apache.org. Backwards
compatibility is maintained with the previous namespace, and provides
a pattern for adding new namespace versions for when that may be
needed. All tests are updated to use the new namespace.
- Some external schema files might reference built-in-formats.xsd in an
xs:include tag, using the old edu/illinos/ncsa/ directory structure.
Backwards compatability is maintained by automatically replacing and
schemaLocations to edu/illinois/ncsa/daffodil/ with
org/apache/daffodil. A warning id displaying saying the path is
deprecated.
DAFFODIL-1859
---
build.sbt | 6 +-
.../src/main/scala/org/apache/daffodil/Main.scala | 92 ++++----
.../daffodil/debugger/CLIDebuggerRunner.scala | 2 +-
daffodil-cli/src/templates/bash-template | 2 +-
daffodil-cli/src/templates/bat-template | 2 +-
daffodil-cli/src/test/resources/clitests.tdml | 4 +-
.../apache/daffodil/CLI/charClassEntities.dfdl.xsd | 2 +-
.../org/apache/daffodil/CLI/cli_schema.dfdl.xsd | 2 +-
.../org/apache/daffodil/CLI/cli_schema_02.dfdl.xsd | 2 +-
.../org/apache/daffodil/CLI/cli_schema_03.dfdl.xsd | 2 +-
.../org/apache/daffodil/CLI/complex_types.dfdl.xsd | 2 +-
.../apache/daffodil/CLI/global_element.dfdl.xsd | 2 +-
.../apache/daffodil/CLI/suppressWarnTest.dfdl.xsd | 4 +-
.../daffodil/CLI/unqualified_path_step.dfdl.xsd | 2 +-
.../test/resources/test/cli/fixedLength.dfdl.xsd | 2 +-
.../test/scala/org/apache/daffodil/CLI/Util.scala | 10 +-
.../apache/daffodil/debugger/TestCLIDebugger.scala | 128 +++++------
.../daffodil/executing/TestCLIexecuting.scala | 20 +-
.../apache/daffodil/listing/TestCLIListing.scala | 16 +-
.../apache/daffodil/parsing/TestCLIParsing.scala | 120 +++++-----
.../daffodil/performance/TestCLIPerformance.scala | 38 +--
.../apache/daffodil/saving/TestCLISaveParser.scala | 60 ++---
.../apache/daffodil/tunables/TestCLITunables.scala | 28 +--
.../daffodil/tunables/TestCLITunables2.scala | 8 +-
.../daffodil/unparsing/TestCLIUnparsing.scala | 58 ++---
.../org/apache/daffodil/compiler/Compiler.scala | 58 ++---
.../org/apache/daffodil/compiler/RootSpec.scala | 4 +-
.../configuration/ConfigurationLoader.scala | 8 +-
.../daffodil/dpath/DFDLExpressionParser.scala | 10 +-
.../org/apache/daffodil/dpath/Expression.scala | 35 +--
.../org/apache/daffodil/dpath/NodeInfoUtils.scala | 4 +-
.../daffodil/dsom/AnnotatedSchemaComponent.scala | 20 +-
.../scala/org/apache/daffodil/dsom/ChoOrd.scala | 4 +-
.../org/apache/daffodil/dsom/ChoiceGroup.scala | 26 +--
.../apache/daffodil/dsom/CompiledExpression.scala | 10 +-
.../org/apache/daffodil/dsom/ComplexTypes.scala | 8 +-
.../org/apache/daffodil/dsom/DFDLAnnotation.scala | 8 +-
.../org/apache/daffodil/dsom/DFDLAssertion.scala | 14 +-
.../apache/daffodil/dsom/DFDLDefineFormat.scala | 4 +-
.../apache/daffodil/dsom/DFDLDefineVariable.scala | 26 +--
.../daffodil/dsom/DFDLDefiningAnnotation.scala | 2 +-
.../apache/daffodil/dsom/DFDLEscapeScheme.scala | 34 +--
.../org/apache/daffodil/dsom/DFDLFormat.scala | 2 +-
.../daffodil/dsom/DFDLFormatAnnotation.scala | 14 +-
.../org/apache/daffodil/dsom/DFDLProperty.scala | 8 +-
.../org/apache/daffodil/dsom/DFDLSchemaFile.scala | 20 +-
.../org/apache/daffodil/dsom/DFDLStatement.scala | 4 +-
.../apache/daffodil/dsom/DFDLStatementMixin.scala | 8 +-
.../org/apache/daffodil/dsom/ElementBase.scala | 48 ++--
.../apache/daffodil/dsom/ElementDeclMixin.scala | 10 +-
.../org/apache/daffodil/dsom/ElementRef.scala | 10 +-
.../daffodil/dsom/EscapeSchemeRefMixin.scala | 8 +-
.../scala/org/apache/daffodil/dsom/Facets.scala | 8 +-
.../apache/daffodil/dsom/GlobalElementDecl.scala | 2 +-
.../daffodil/dsom/GlobalElementDeclFactory.scala | 2 +-
.../scala/org/apache/daffodil/dsom/GroupDef.scala | 4 +-
.../scala/org/apache/daffodil/dsom/GroupRef.scala | 6 +-
.../scala/org/apache/daffodil/dsom/IIBase.scala | 28 ++-
.../scala/org/apache/daffodil/dsom/Import.scala | 12 +-
.../scala/org/apache/daffodil/dsom/Include.scala | 6 +-
.../daffodil/dsom/InitiatedTerminatedMixin.scala | 14 +-
.../apache/daffodil/dsom/LocalElementDecl.scala | 2 +-
.../apache/daffodil/dsom/LocalElementMixin.scala | 14 +-
.../org/apache/daffodil/dsom/ModelGroup.scala | 22 +-
.../org/apache/daffodil/dsom/NamedMixin.scala | 12 +-
.../scala/org/apache/daffodil/dsom/Nesting.scala | 4 +-
.../org/apache/daffodil/dsom/ParticleMixin.scala | 6 +-
.../org/apache/daffodil/dsom/PropProviders.scala | 16 +-
.../RawCommonRuntimeValuedPropertiesMixin.scala | 4 +-
.../org/apache/daffodil/dsom/RealTermMixin.scala | 4 +-
.../apache/daffodil/dsom/RestrictionUnion.scala | 16 +-
.../main/scala/org/apache/daffodil/dsom/Root.scala | 8 +-
.../daffodil/dsom/RuntimePropertyMixins.scala | 96 ++++----
.../org/apache/daffodil/dsom/SchemaComponent.scala | 34 +--
.../daffodil/dsom/SchemaComponentFactory.scala | 12 +-
.../SchemaComponentIncludesAndImportsMixin.scala | 2 +-
.../dsom/SchemaDocIncludesAndImportsMixin.scala | 10 +-
.../org/apache/daffodil/dsom/SchemaDocument.scala | 10 +-
.../scala/org/apache/daffodil/dsom/SchemaSet.scala | 38 +--
.../dsom/SchemaSetIncludesAndImportsMixins.scala | 8 +-
.../org/apache/daffodil/dsom/SequenceGroup.scala | 24 +-
.../scala/org/apache/daffodil/dsom/Siblings.scala | 2 +-
.../org/apache/daffodil/dsom/SimpleTypes.scala | 12 +-
.../main/scala/org/apache/daffodil/dsom/Term.scala | 16 +-
.../apache/daffodil/dsom/TermEncodingMixin.scala | 10 +-
.../scala/org/apache/daffodil/dsom/package.scala | 6 +-
.../org/apache/daffodil/grammar/AlignedMixin.scala | 20 +-
.../apache/daffodil/grammar/BitOrderMixin.scala | 16 +-
.../apache/daffodil/grammar/ByteOrderMixin.scala | 10 +-
.../daffodil/grammar/ChoiceGrammarMixin.scala | 6 +-
.../daffodil/grammar/ElementBaseGrammarMixin.scala | 254 ++++++++++-----------
.../daffodil/grammar/ElementDeclGrammarMixin.scala | 6 +-
.../grammar/ElementReferenceGrammarMixin.scala | 4 +-
.../org/apache/daffodil/grammar/Grammar.scala | 28 +--
.../org/apache/daffodil/grammar/GrammarMixin.scala | 6 +-
.../apache/daffodil/grammar/GrammarMixins.scala | 8 +-
.../org/apache/daffodil/grammar/GrammarTerm.scala | 22 +-
.../grammar/HasStatementsGrammarMixin.scala | 4 +-
.../grammar/LocalElementGrammarMixin.scala | 32 +--
.../daffodil/grammar/ModelGroupGrammarMixin.scala | 22 +-
.../org/apache/daffodil/grammar/Production.scala | 16 +-
.../daffodil/grammar/SequenceGrammarMixin.scala | 8 +-
.../apache/daffodil/grammar/TermGrammarMixin.scala | 18 +-
.../org/apache/daffodil/grammar/package.scala | 8 +-
.../grammar/primitives/ElementCombinator.scala | 82 +++----
.../apache/daffodil/grammar/primitives/Nada.scala | 10 +-
.../grammar/primitives/NilEmptyCombinators.scala | 28 +--
.../daffodil/grammar/primitives/Padded.scala | 32 +--
.../grammar/primitives/PatternChecker.scala | 6 +-
.../daffodil/grammar/primitives/Primitives.scala | 8 +-
.../grammar/primitives/PrimitivesBCD.scala | 26 +--
.../primitives/PrimitivesBinaryBoolean.scala | 12 +-
.../primitives/PrimitivesBinaryNumber.scala | 34 +--
.../grammar/primitives/PrimitivesDateTime.scala | 22 +-
.../grammar/primitives/PrimitivesDelimiters.scala | 30 +--
.../primitives/PrimitivesElementKinds.scala | 58 ++---
.../grammar/primitives/PrimitivesExpressions.scala | 60 ++---
.../grammar/primitives/PrimitivesFraming.scala | 28 +--
.../primitives/PrimitivesIBM4690Packed.scala | 26 +--
.../grammar/primitives/PrimitivesLengthKind.scala | 90 ++++----
.../grammar/primitives/PrimitivesNil.scala | 16 +-
.../grammar/primitives/PrimitivesPacked.scala | 28 +--
.../grammar/primitives/PrimitivesTextBoolean.scala | 10 +-
.../grammar/primitives/PrimitivesTextNumber.scala | 66 +++---
.../primitives/PrimitivesUnorderedSequence.scala | 20 +-
.../grammar/primitives/PrimitivesZoned.scala | 4 +-
.../daffodil/grammar/primitives/RepPrims.scala | 38 +--
.../grammar/primitives/SpecifiedLength.scala | 24 +-
.../daffodil/grammar/primitives/VariableMap.scala | 10 +-
.../apache/daffodil/util/CheckJavaVersion.scala | 6 +-
.../test/example-of-most-dfdl-constructs.dfdl.xml | 4 +-
.../src/test/resources/test/external_vars_1.xml | 2 +-
.../org/apache/daffodil/api/TestForMemLeak.scala | 8 +-
.../apache/daffodil/dsom/TestDsomCompiler2.scala | 8 +-
.../apache/daffodil/dsom/TestDsomCompilerNew.scala | 8 +-
.../infoset/TestInfosetDefaultingInUnparser.scala | 16 +-
.../scala/org/apache/daffodil/api/TestAPI.scala | 8 +-
.../scala/org/apache/daffodil/api/TestAPI1.scala | 6 +-
.../apache/daffodil/api/TestDsomCompiler3.scala | 14 +-
.../dpath/TestDFDLExpressionEvaluation.scala | 24 +-
.../daffodil/dpath/TestDFDLExpressionTree.scala | 16 +-
.../org/apache/daffodil/dpath/TestDPath.scala | 8 +-
.../apache/daffodil/dsom/TestBinaryInput_01.scala | 28 +--
.../daffodil/dsom/TestCouldBeNextElement.scala | 10 +-
.../apache/daffodil/dsom/TestDsomCompiler.scala | 20 +-
.../daffodil/dsom/TestDsomCompilerUnparse1.scala | 8 +-
.../daffodil/dsom/TestExternalVariablesNew.scala | 24 +-
.../apache/daffodil/dsom/TestInputValueCalc.scala | 4 +-
.../org/apache/daffodil/dsom/TestIsScannable.scala | 10 +-
.../daffodil/dsom/TestMiddleEndAttributes.scala | 6 +-
.../daffodil/dsom/TestMiddleEndAttributes2.scala | 6 +-
.../daffodil/dsom/TestMiddleEndAttributes3.scala | 4 +-
.../apache/daffodil/dsom/TestPropertyScoping.scala | 6 +-
.../daffodil/dsom/TestSimpleTypeUnions.scala | 14 +-
.../dsom/TextCompileExpressionExecution.scala | 4 +-
.../externalvars/TestExternalVariablesLoader.scala | 18 +-
.../TestExternalVariablesLoaderNew.scala | 12 +-
.../externalvars/TestExternalVariablesNew.scala | 8 +-
.../apache/daffodil/general/TestDFDLReaders.scala | 2 +-
.../apache/daffodil/general/TestPrimitives.scala | 8 +-
.../apache/daffodil/general/TestPrimitives2.scala | 8 +-
.../org/apache/daffodil/general/TestTunables.scala | 16 +-
.../org/apache/daffodil/grammar/TestGrammar.scala | 12 +-
.../org/apache/daffodil/infoset/TestInfoset.scala | 16 +-
.../org/apache/daffodil/infoset/TestInfoset2.scala | 8 +-
.../daffodil/infoset/TestInfosetCursor.scala | 14 +-
.../daffodil/infoset/TestInfosetCursor1.scala | 14 +-
.../infoset/TestInfosetCursorFromReader.scala | 18 +-
.../infoset/TestInfosetCursorFromReader2.scala | 14 +-
.../TestOutputValueCalcAndAlignment.scala | 14 +-
.../TestOutputValueCalcForwardReference.scala | 12 +-
.../annotation/props/TestPropertyRuntime.scala | 10 +-
.../scala/org/apache/daffodil/util/TestUtils.scala | 34 +--
.../daffodil/xml/TestXMLLoaderWithLocation.scala | 6 +-
.../daffodil/io/ByteBufferDataInputStream.scala | 32 +--
.../apache/daffodil/io/CopyrightAdditions.scala | 4 +-
.../org/apache/daffodil/io/DataInputStream.scala | 10 +-
.../daffodil/io/DataInputStreamImplMixin.scala | 10 +-
.../org/apache/daffodil/io/DataOutputStream.scala | 6 +-
.../daffodil/io/DataOutputStreamImplMixin.scala | 24 +-
.../org/apache/daffodil/io/DataStreamCommon.scala | 6 +-
.../daffodil/io/DataStreamCommonImplMixin.scala | 16 +-
.../io/DirectOrBufferedDataOutputStream.scala | 26 +--
.../main/scala/org/apache/daffodil/io/Dump.scala | 8 +-
.../daffodil/io/FastAsciiToUnicodeConverter.scala | 2 +-
.../scala/org/apache/daffodil/io/FormatInfo.scala | 22 +-
.../scala/org/apache/daffodil/io/LocalBuffer.scala | 10 +-
.../io/StringDataInputStreamForUnparse.scala | 10 +-
.../org/apache/daffodil/io/ThreadCheckMixin.scala | 4 +-
.../main/scala/org/apache/daffodil/io/Utils.scala | 2 +-
.../daffodil/processors/charset/BitsCharset.scala | 10 +-
.../daffodil/processors/charset/CharsetUtils.scala | 8 +-
.../processors/charset/DFDL5BitPackedDecoder.scala | 6 +-
.../charset/DaffodilCharsetProvider.scala | 4 +-
.../processors/charset/HexLSBF4BitDecoder.scala | 4 +-
.../processors/charset/NBitsWidthCharsetBase.scala | 20 +-
.../processors/charset/OctalLSBF3BitDecoder.scala | 4 +-
.../charset/USASCII6BitPackedDecoder.scala | 4 +-
.../charset/USASCII7BitPackedDecoder.scala | 4 +-
.../charset/X_DFDL_6_BIT_DFI_264_DUI_001.scala | 6 +-
.../daffodil/processors/charset/X_DFDL_BITS.scala | 4 +-
.../apache/daffodil/io/FormatInfoForUnitTest.scala | 26 +--
.../io/TestByteBufferDataInputStream.scala | 18 +-
.../io/TestByteBufferDataInputStream2.scala | 8 +-
.../io/TestByteBufferDataInputStream3.scala | 2 +-
.../io/TestByteBufferDataInputStream3Bit.scala | 12 +-
.../io/TestByteBufferDataInputStream4.scala | 4 +-
.../io/TestByteBufferDataInputStream5.scala | 6 +-
.../io/TestByteBufferDataInputStream6.scala | 8 +-
.../io/TestByteBufferDataInputStream7.scala | 12 +-
.../apache/daffodil/io/TestDataOutputStream.scala | 4 +-
.../apache/daffodil/io/TestDataOutputStream2.scala | 2 +-
.../apache/daffodil/io/TestDataOutputStream3.scala | 6 +-
.../apache/daffodil/io/TestDataOutputStream4.scala | 4 +-
.../scala/org/apache/daffodil/io/TestDecoder.scala | 2 +-
.../io/TestDirectOrBufferedDataOutputStream.scala | 4 +-
.../scala/org/apache/daffodil/io/TestDump.scala | 6 +-
.../org/apache/daffodil/io/TestDumpDisplay.scala | 6 +-
.../apache/daffodil/io/TestFastAsciiConvert.scala | 2 +-
.../org/apache/daffodil/io/TestISO8859_1.scala | 2 +-
.../io/TestNonByteSizedCharsetDecoders1Bit.scala | 10 +-
.../io/TestNonByteSizedCharsetDecoders3Bit.scala | 8 +-
.../io/TestNonByteSizedCharsetEncoders1Bit.scala | 6 +-
.../io/TestNonByteSizedCharsetEncoders3Bit.scala | 6 +-
.../io/processors/charset/TestBitsCharset.scala | 2 +-
.../org/apache/daffodil/japi/ValidationMode.java | 2 +-
.../daffodil/japi/debugger/package-info.java | 8 +-
.../apache/daffodil/japi/infoset/package-info.java | 8 +-
.../org/apache/daffodil/japi/logger/LogLevel.java | 2 +-
.../apache/daffodil/japi/logger/package-info.java | 12 +-
.../org/apache/daffodil/japi/package-info.java | 38 +--
.../scala/org/apache/daffodil/japi/Daffodil.scala | 66 +++---
.../apache/daffodil/japi/debugger/Debugger.scala | 2 +-
.../org/apache/daffodil/japi/infoset/Infoset.scala | 42 ++--
.../org/apache/daffodil/japi/logger/Logger.scala | 2 +-
.../daffodil/japi/packageprivate/Utils.scala | 18 +-
.../example/DebuggerRunnerForJAPITest.java | 4 +-
.../daffodil/example/LogWriterForJAPITest.java | 4 +-
.../daffodil/example/LogWriterForJAPITest2.java | 4 +-
.../org/apache/daffodil/example/TestJavaAPI.java | 74 +++---
.../test/resources/test/japi/external_vars_1.xml | 2 +-
.../test/resources/test/japi/mySchema1.dfdl.xsd | 2 +-
.../test/resources/test/japi/mySchema2.dfdl.xsd | 2 +-
.../test/resources/test/japi/mySchema3.dfdl.xsd | 2 +-
.../test/resources/test/japi/mySchema4.dfdl.xsd | 2 +-
.../test/resources/test/japi/mySchema5.dfdl.xsd | 2 +-
.../resources/test/japi/mySchemaWithVars.dfdl.xsd | 2 +-
.../main/resources/daffodil-built-in-catalog.xml | 22 +-
.../src/main/resources/eclipse-xml-catalog.xml | 4 +-
.../org/apache/daffodil/xsd/XMLSchema_for_DFDL.xsd | 8 +-
.../resources/org/apache/daffodil/xsd/dafint.xsd | 8 +-
.../org/apache/daffodil/xsd/dfdl-config-format.xsd | 4 +-
.../resources/org/apache/daffodil/xsd/tdml.xsd | 10 +-
.../scala/org/apache/daffodil/ExecutionMode.scala | 4 +-
.../main/scala/org/apache/daffodil/Implicits.scala | 6 +-
.../scala/org/apache/daffodil/TypedEquality.scala | 4 +-
.../apache/daffodil/api/DaffodilSchemaSource.scala | 8 +-
.../org/apache/daffodil/api/DaffodilTunables.scala | 10 +-
.../org/apache/daffodil/api/DataStreamLimits.scala | 2 +-
.../scala/org/apache/daffodil/api/Diagnostic.scala | 12 +-
.../daffodil/api/TunableLimitExceededError.scala | 6 +-
.../daffodil/api/UnqualifiedPathStepPolicy.scala | 4 +-
.../org/apache/daffodil/api/ValidationMode.scala | 4 +-
.../scala/org/apache/daffodil/api/WarnID.scala | 8 +-
.../org/apache/daffodil/cookers/Converter.scala | 4 +-
.../org/apache/daffodil/cookers/Cookers.scala | 2 +-
.../apache/daffodil/cookers/EntityReplacer.scala | 14 +-
.../org/apache/daffodil/exceptions/Assert.scala | 2 +-
.../daffodil/exceptions/SchemaFileLocatable.scala | 8 +-
.../org/apache/daffodil/exceptions/ThrowsSDE.scala | 8 +-
.../org/apache/daffodil/externalvars/Binding.scala | 6 +-
.../ExternalVariablesXMLValidator.scala | 2 +-
.../scala/org/apache/daffodil/oolag/OOLAG.scala | 22 +-
.../schema/annotation/props/ByHandMixins.scala | 36 +--
.../schema/annotation/props/Properties.scala | 12 +-
.../schema/annotation/props/PropertyScoping.scala | 8 +-
.../scala/org/apache/daffodil/util/BitOrder.scala | 6 +-
.../scala/org/apache/daffodil/util/BitsUtils.scala | 2 +-
.../apache/daffodil/util/CopyrightNotices.scala | 2 +-
.../scala/org/apache/daffodil/util/Cursor.scala | 4 +-
.../org/apache/daffodil/util/DecimalUtils.scala | 6 +-
.../scala/org/apache/daffodil/util/Delay.scala | 2 +-
.../main/scala/org/apache/daffodil/util/Enum.scala | 2 +-
.../org/apache/daffodil/util/IBMCopyright.scala | 2 +-
.../org/apache/daffodil/util/Indentable.scala | 4 +-
.../daffodil/util/IteratorWithPeekImpl.scala | 2 +-
.../scala/org/apache/daffodil/util/ListUtils.scala | 2 +-
.../scala/org/apache/daffodil/util/Logger.scala | 10 +-
.../scala/org/apache/daffodil/util/MStack.scala | 6 +-
.../main/scala/org/apache/daffodil/util/Math.scala | 2 +-
.../scala/org/apache/daffodil/util/Maybe.scala | 4 +-
.../org/apache/daffodil/util/MaybeFloat.scala | 2 +-
.../scala/org/apache/daffodil/util/MaybeInt.scala | 2 +-
.../org/apache/daffodil/util/MaybeULong.scala | 4 +-
.../scala/org/apache/daffodil/util/Memoize1.scala | 2 +-
.../main/scala/org/apache/daffodil/util/Misc.scala | 4 +-
.../scala/org/apache/daffodil/util/Named.scala | 2 +-
.../apache/daffodil/util/NonAllocatingMap.scala | 4 +-
.../scala/org/apache/daffodil/util/Numbers.scala | 4 +-
.../scala/org/apache/daffodil/util/OKOrError.scala | 4 +-
.../scala/org/apache/daffodil/util/OnStack.scala | 2 +-
.../main/scala/org/apache/daffodil/util/Pool.scala | 6 +-
.../apache/daffodil/util/ScalaAnnotations.scala | 2 +-
.../daffodil/util/ScalaLibariesCopyright.scala | 2 +-
.../org/apache/daffodil/util/SchemaUtils.scala | 8 +-
.../scala/org/apache/daffodil/util/Serialize.scala | 4 +-
.../scala/org/apache/daffodil/util/Timer.scala | 2 +-
.../org/apache/daffodil/util/TresysCopyright.scala | 2 +-
.../org/apache/daffodil/util/UniquenessCache.scala | 2 +-
.../scala/org/apache/daffodil/util/Validator.scala | 4 +-
.../daffodil/xml/DaffodilConstructingLoader.scala | 4 +-
.../apache/daffodil/xml/DaffodilXMLLoader.scala | 12 +-
.../scala/org/apache/daffodil/xml/JDOMUtils.scala | 4 +-
.../scala/org/apache/daffodil/xml/Namespaces.scala | 10 +-
.../scala/org/apache/daffodil/xml/QNameBase.scala | 10 +-
.../scala/org/apache/daffodil/xml/QNames.scala | 8 +-
.../scala/org/apache/daffodil/xml/XMLUtils.scala | 48 ++--
.../daffodil/xml/scalaLib/PrettyPrinter.scala | 4 +-
.../org/apache/daffodil/xml/scalaLib/Utility.scala | 2 +-
.../org/apache/daffodil/api/TestForMemLeak.scala | 2 +-
.../scala/org/apache/daffodil/HowToUseJUnit.scala | 4 +-
.../apache/daffodil/TestBitOrderByteOrder.scala | 6 +-
.../scala/org/apache/daffodil/TestImplicits.scala | 6 +-
.../daffodil/exceptions/TestExceptions.scala | 4 +-
.../functionality/icu/TestBigInteger.scala | 2 +-
.../apache/daffodil/macros/TestAssertMacros.scala | 6 +-
.../org/apache/daffodil/oolag/TestOOLAG.scala | 16 +-
.../annotation/props/TestGeneratedProperties.scala | 12 +-
.../testEquality/TestEqualityOperators.scala | 4 +-
.../apache/daffodil/util/IteratorFromCursor.scala | 2 +-
.../scala/org/apache/daffodil/util/TestBits.scala | 2 +-
.../scala/org/apache/daffodil/util/TestBits2.scala | 4 +-
.../apache/daffodil/util/TestDecimalUtils.scala | 6 +-
.../org/apache/daffodil/util/TestListMap.scala | 2 +-
.../org/apache/daffodil/util/TestListUtils.scala | 2 +-
.../org/apache/daffodil/util/TestLogger.scala | 4 +-
.../org/apache/daffodil/util/TestMStack.scala | 2 +-
.../scala/org/apache/daffodil/util/TestMaybe.scala | 2 +-
.../daffodil/util/TestMaybeInlineForeach.scala | 2 +-
.../org/apache/daffodil/util/TestMemoize1.scala | 2 +-
.../scala/org/apache/daffodil/util/TestMisc.scala | 2 +-
.../org/apache/daffodil/util/TestNumberStuff.scala | 4 +-
.../org/apache/daffodil/util/TestNumbers.scala | 4 +-
.../org/apache/daffodil/util/TestSchemaUtils.scala | 2 +-
.../daffodil/util/TestSerializationAndLazy.scala | 2 +-
.../scala/org/apache/daffodil/util/TestUtil.scala | 10 +-
.../daffodil/util/TestXMLCatalogAndValidate.scala | 8 +-
.../daffodil/xml/test/unit/TestNamespaces.scala | 2 +-
.../apache/daffodil/xml/test/unit/TestQName.scala | 14 +-
.../test/unit/TestUTF8AndUTF16Conversions.scala | 2 +-
.../xml/test/unit/TestUnicodeXMLI18N.scala | 8 +-
.../daffodil/xml/test/unit/TestXMLLiterals.scala | 2 +-
.../daffodil/xml/test/unit/TestXMLLoader.scala | 2 +-
.../xml/test/unit/TestXMLPrettyPrinter.scala | 16 +-
.../daffodil/xml/test/unit/TestXMLUtils.scala | 10 +-
.../apache/daffodil/exceptions/AssertMacros.scala | 2 +-
.../org/apache/daffodil/exceptions/SDEMacros.scala | 2 +-
.../scala/org/apache/daffodil/io/IOMacros.scala | 8 +-
.../org/apache/daffodil/util/LoggerMacros.scala | 2 +-
.../apache/daffodil/xsd/DFDL_part2_attributes.xsd | 4 +-
.../org/apache/daffodil/xsd/DFDL_part3_model.xsd | 12 +-
.../resources/org/apache/daffodil/xsd/dafext.xsd | 10 +-
.../daffodil/propGen/PropertyGenerator.scala | 18 +-
.../daffodil/propGen/TestPropertyGenerator.scala | 2 +-
.../processors/unparsers/BCDUnparsers.scala | 16 +-
.../unparsers/BinaryBooleanUnparsers.scala | 24 +-
.../unparsers/BinaryNumberUnparsers.scala | 26 +--
.../unparsers/ConvertTextBooleanUnparser.scala | 6 +-
.../unparsers/ConvertTextCalendarUnparser.scala | 16 +-
.../unparsers/ConvertTextNumberUnparser.scala | 18 +-
.../processors/unparsers/DelimitedUnparsers.scala | 26 +--
.../processors/unparsers/DelimiterUnparsers.scala | 14 +-
.../unparsers/ElementKindUnparsers.scala | 22 +-
.../processors/unparsers/ElementUnparser.scala | 24 +-
.../unparsers/ExpressionEvaluatingUnparsers.scala | 16 +-
.../processors/unparsers/FramingUnparsers.scala | 10 +-
.../daffodil/processors/unparsers/HasPadding.scala | 4 +-
.../unparsers/HexBinaryLengthUnparser.scala | 12 +-
.../unparsers/IBM4690PackedDecimalUnparsers.scala | 16 +-
.../processors/unparsers/NadaUnparser.scala | 4 +-
.../unparsers/NilEmptyCombinatorUnparsers.scala | 8 +-
.../processors/unparsers/NilUnparsers.scala | 6 +-
.../unparsers/OptionalInfixSepUnparser.scala | 4 +-
.../unparsers/PackedBinaryUnparserTraits.scala | 16 +-
.../unparsers/PackedDecimalUnparsers.scala | 16 +-
.../processors/unparsers/SpecifiedLength2.scala | 42 ++--
.../unparsers/SpecifiedLengthUnparsers.scala | 30 +--
.../unparsers/StringLengthUnparsers.scala | 18 +-
.../unparsers/StringLiteralForUnparser.scala | 20 +-
.../apache/daffodil/api/DFDLParserUnparser.scala | 16 +-
.../apache/daffodil/calendar/DFDLCalendar.scala | 6 +-
.../org/apache/daffodil/debugger/Debugger.scala | 4 +-
.../daffodil/debugger/InteractiveDebugger.scala | 60 ++---
.../daffodil/debugger/TraceDebuggerRunner.scala | 2 +-
.../org/apache/daffodil/dpath/ArrayRelated.scala | 8 +-
.../org/apache/daffodil/dpath/ComparisonOps.scala | 10 +-
.../org/apache/daffodil/dpath/Conversions.scala | 10 +-
.../org/apache/daffodil/dpath/ConverterOps.scala | 10 +-
.../org/apache/daffodil/dpath/ConverterOps2.scala | 10 +-
.../org/apache/daffodil/dpath/ConverterOps3.scala | 6 +-
.../org/apache/daffodil/dpath/DAFFunctions.scala | 14 +-
.../dpath/DFDLCheckConstraintsFunction.scala | 8 +-
.../apache/daffodil/dpath/DFDLConstructors.scala | 4 +-
.../org/apache/daffodil/dpath/DFDLFunctions.scala | 12 +-
.../org/apache/daffodil/dpath/DFDLFunctions2.scala | 8 +-
.../scala/org/apache/daffodil/dpath/DPath.scala | 36 +--
.../org/apache/daffodil/dpath/DPathRuntime.scala | 28 +--
.../org/apache/daffodil/dpath/DPathUtil.scala | 2 +-
.../scala/org/apache/daffodil/dpath/DState.scala | 20 +-
.../daffodil/dpath/DateTimeConversions.scala | 2 +-
.../scala/org/apache/daffodil/dpath/FNBases.scala | 4 +-
.../org/apache/daffodil/dpath/FNFunctions.scala | 24 +-
.../daffodil/dpath/HexBinaryConversions.scala | 2 +-
.../org/apache/daffodil/dpath/MATHFunctions.scala | 4 +-
.../scala/org/apache/daffodil/dpath/NodeInfo.scala | 20 +-
.../org/apache/daffodil/dpath/NumericOps.scala | 4 +-
.../daffodil/dpath/SuspendableExpression.scala | 16 +-
.../org/apache/daffodil/dpath/UpDownMoves.scala | 12 +-
.../org/apache/daffodil/dpath/XSConstructors.scala | 8 +-
.../org/apache/daffodil/dpath/XSHexBinary.scala | 2 +-
.../apache/daffodil/dsom/CompiledExpression1.scala | 38 +--
.../org/apache/daffodil/dsom/EncodingLattice.scala | 2 +-
.../apache/daffodil/dsom/ExpressionCompiler.scala | 8 +-
.../scala/org/apache/daffodil/dsom/Facets1.scala | 4 +-
.../main/scala/org/apache/daffodil/dsom/SDE.scala | 28 +--
.../apache/daffodil/events/ParseEventHandler.scala | 10 +-
.../externalvars/ExternalVariablesLoader.scala | 14 +-
.../daffodil/infoset/ChoiceBranchEvent.scala | 10 +-
.../org/apache/daffodil/infoset/Infoset.scala | 12 +-
.../org/apache/daffodil/infoset/InfosetImpl.scala | 58 ++---
.../apache/daffodil/infoset/InfosetInputter.scala | 30 +--
.../apache/daffodil/infoset/InfosetOutputter.scala | 2 +-
.../apache/daffodil/infoset/InvalidInfoset.scala | 2 +-
.../daffodil/infoset/JDOMInfosetInputter.scala | 10 +-
.../daffodil/infoset/JDOMInfosetOutputter.scala | 12 +-
.../daffodil/infoset/JsonInfosetInputter.scala | 10 +-
.../daffodil/infoset/JsonInfosetOutputter.scala | 8 +-
.../daffodil/infoset/NextElementResolver.scala | 24 +-
.../daffodil/infoset/NullInfosetOutputter.scala | 2 +-
.../daffodil/infoset/ScalaXMLInfosetInputter.scala | 10 +-
.../infoset/ScalaXMLInfosetOutputter.scala | 12 +-
.../daffodil/infoset/W3CDOMInfosetInputter.scala | 10 +-
.../daffodil/infoset/W3CDOMInfosetOutputter.scala | 12 +-
.../daffodil/infoset/XMLInfosetOutputter.scala | 8 +-
.../daffodil/infoset/XMLTextInfosetInputter.scala | 12 +-
.../daffodil/infoset/XMLTextInfosetOutputter.scala | 6 +-
.../apache/daffodil/processors/BCDParsers.scala | 10 +-
.../apache/daffodil/processors/DFDLDelimiter.scala | 10 +-
.../processors/DFDLRegularExpressions.scala | 4 +-
.../org/apache/daffodil/processors/DataLoc.scala | 34 +--
.../daffodil/processors/DelimiterIterator.scala | 8 +-
.../processors/DelimiterStackUnparseNode.scala | 8 +-
.../org/apache/daffodil/processors/Dynamic.scala | 6 +-
.../daffodil/processors/EncodingRuntimeData.scala | 30 +--
.../apache/daffodil/processors/EscapeScheme.scala | 18 +-
.../apache/daffodil/processors/EvBinaryFloat.scala | 6 +-
.../apache/daffodil/processors/EvByteOrder.scala | 8 +-
.../daffodil/processors/EvCalendarLanguage.scala | 8 +-
.../apache/daffodil/processors/EvDelimiters.scala | 28 +--
.../org/apache/daffodil/processors/EvElement.scala | 22 +-
.../apache/daffodil/processors/EvEncoding.scala | 22 +-
.../daffodil/processors/EvEscapeSchemes.scala | 28 +--
.../apache/daffodil/processors/EvFieldDFA.scala | 8 +-
.../apache/daffodil/processors/EvTextNumber.scala | 14 +-
.../apache/daffodil/processors/Evaluatable.scala | 46 ++--
.../processors/IBM4690PackedDecimalParsers.scala | 10 +-
.../daffodil/processors/PackedBinaryTraits.scala | 24 +-
.../daffodil/processors/PackedDecimalParsers.scala | 10 +-
.../daffodil/processors/ProcessingError.scala | 14 +-
.../daffodil/processors/ProcessorBases.scala | 4 +-
.../daffodil/processors/ProcessorResult.scala | 6 +-
.../daffodil/processors/ProcessorStateBases.scala | 84 +++----
.../org/apache/daffodil/processors/Runtime.scala | 68 +++---
.../apache/daffodil/processors/RuntimeData.scala | 72 +++---
.../daffodil/processors/SchemaSetRuntimeData.scala | 12 +-
.../daffodil/processors/SuspendableOperation.scala | 18 +-
.../apache/daffodil/processors/Suspension.scala | 28 +--
.../daffodil/processors/TextJustification.scala | 4 +-
.../apache/daffodil/processors/VariableMap1.scala | 24 +-
.../processors/dfa/CreateDelimiterDFA.scala | 20 +-
.../daffodil/processors/dfa/CreateFieldDFA.scala | 4 +-
.../daffodil/processors/dfa/CreatePaddingDFA.scala | 8 +-
.../apache/daffodil/processors/dfa/Parser.scala | 6 +-
.../apache/daffodil/processors/dfa/Registers.scala | 16 +-
.../org/apache/daffodil/processors/dfa/Rules.scala | 12 +-
.../apache/daffodil/processors/dfa/Runtime.scala | 8 +-
.../processors/dfa/TextDelimitedParser.scala | 28 +--
.../processors/dfa/TextDelimitedUnparser.scala | 20 +-
.../processors/dfa/TextPaddingParser.scala | 14 +-
.../daffodil/processors/dfa/TextParser.scala | 14 +-
.../apache/daffodil/processors/dfa/Unparser.scala | 8 +-
.../processors/parsers/AssertPatternParsers.scala | 8 +-
.../processors/parsers/BinaryBooleanParsers.scala | 18 +-
.../processors/parsers/BinaryNumberParsers.scala | 12 +-
.../processors/parsers/BinaryNumberTraits.scala | 12 +-
.../processors/parsers/DelimitedParsers.scala | 34 +--
.../processors/parsers/DelimiterParsers.scala | 26 +--
.../processors/parsers/ElementCombinator1.scala | 28 +--
.../processors/parsers/ElementKindParsers.scala | 22 +-
.../parsers/ExpressionEvaluatingParsers.scala | 26 +--
.../processors/parsers/FramingParsers.scala | 6 +-
.../processors/parsers/HasVariableLength.scala | 6 +-
.../parsers/HexBinaryLengthParsers.scala | 6 +-
.../parsers/NilEmptyCombinatorParsers.scala | 4 +-
.../processors/parsers/NilMatcherMixin.scala | 6 +-
.../daffodil/processors/parsers/NilParsers.scala | 8 +-
.../parsers/OptionalInfixSepParser.scala | 4 +-
.../daffodil/processors/parsers/PState.scala | 80 +++----
.../processors/parsers/PaddingRuntimeMixin.scala | 6 +-
.../daffodil/processors/parsers/ParseErrors.scala | 28 +--
.../daffodil/processors/parsers/Parser.scala | 38 +--
.../processors/parsers/PrimitivesDateTime1.scala | 18 +-
.../processors/parsers/PrimitivesTextNumber1.scala | 42 ++--
.../daffodil/processors/parsers/RepParsers.scala | 26 +--
.../parsers/SpecifiedLengthParsers.scala | 18 +-
.../processors/parsers/StringLengthParsers.scala | 12 +-
.../processors/parsers/TextBooleanParser.scala | 10 +-
.../parsers/UnorderedSequenceParser.scala | 4 +-
.../processors/parsers/ZonedTextParsers.scala | 4 +-
.../processors/unparsers/RepUnparsers.scala | 10 +-
.../daffodil/processors/unparsers/UState.scala | 86 +++----
.../processors/unparsers/UnparseError.scala | 16 +-
.../daffodil/processors/unparsers/Unparser.scala | 20 +-
.../apache/daffodil/reflection/FieldFinder.scala | 6 +-
.../org/apache/daffodil/dpath/TestRounding.scala | 4 +-
.../apache/daffodil/dsom/TestEntityReplacer.scala | 6 +-
.../daffodil/parser/TestCharsetBehavior.scala | 8 +-
.../daffodil/parser/TestCharsetDecoder2.scala | 4 +-
.../input/TestDFDLRegularExpressions.scala | 6 +-
.../apache/daffodil/processors/input/TestICU.scala | 4 +-
.../daffodil/processors/input/TestRegex.scala | 4 +-
.../daffodil/reflection/TestFieldFinder.scala | 6 +-
daffodil-sapi/root-doc.txt | 6 +-
.../scala/org/apache/daffodil/sapi/Daffodil.scala | 70 +++---
.../apache/daffodil/sapi/debugger/Debugger.scala | 2 +-
.../apache/daffodil/sapi/debugger/package.scala | 2 +-
.../org/apache/daffodil/sapi/infoset/Infoset.scala | 44 ++--
.../org/apache/daffodil/sapi/infoset/package.scala | 4 +-
.../org/apache/daffodil/sapi/logger/Logger.scala | 2 +-
.../org/apache/daffodil/sapi/logger/package.scala | 2 +-
.../scala/org/apache/daffodil/sapi/package.scala | 6 +-
.../daffodil/sapi/packageprivate/Utils.scala | 18 +-
.../test/resources/test/sapi/external_vars_1.xml | 2 +-
.../test/resources/test/sapi/mySchema1.dfdl.xsd | 2 +-
.../test/resources/test/sapi/mySchema2.dfdl.xsd | 2 +-
.../test/resources/test/sapi/mySchema3.dfdl.xsd | 2 +-
.../test/resources/test/sapi/mySchema4.dfdl.xsd | 2 +-
.../test/resources/test/sapi/mySchema5.dfdl.xsd | 2 +-
.../resources/test/sapi/mySchemaWithVars.dfdl.xsd | 2 +-
.../example/DebuggerRunnerForSAPITest.scala | 4 +-
.../daffodil/example/LogWriterForSAPITest.scala | 4 +-
.../daffodil/example/LogWriterForSAPITest2.scala | 4 +-
.../org/apache/daffodil/example/TestScalaAPI.scala | 16 +-
.../src/main/scala/org/apache/daffodil/Tak.scala | 4 +-
.../org/apache/daffodil/tdml/RunnerFactory.scala | 6 +-
.../org/apache/daffodil/tdml/SchemaCache.scala | 14 +-
.../org/apache/daffodil/tdml/TDMLException.scala | 2 +-
.../org/apache/daffodil/tdml/TDMLRunner.scala | 86 +++----
.../tdml-with-embedded-schema-errors.tdml | 2 +-
.../src/test/resources/testConfigFile.xml | 4 +-
.../charset/TestLSBFirstAndUSASCII7BitPacked.scala | 6 +-
.../apache/daffodil/tdml/TestMoreEncodings.scala | 2 +-
.../org/apache/daffodil/tdml/TestSchemaCache.scala | 6 +-
.../org/apache/daffodil/tdml/TestTDMLRunner.scala | 10 +-
.../org/apache/daffodil/tdml/TestTDMLRunner2.scala | 8 +-
.../tdml/TestTDMLRunnerCommentSyntax.scala | 6 +-
.../daffodil/tdml/TestTDMLRunnerConfig.scala | 8 +-
.../apache/daffodil/tdml/TestTDMLRunnerNew.scala | 10 +-
.../daffodil/tdml/TestTDMLRunnerTutorial.scala | 8 +-
.../daffodil/tdml/TestTDMLUnparseCases.scala | 8 +-
.../tdml/tdml/TestTDMLRunnerWarnings.scala | 4 +-
.../ibm-contributed/dpaflsenc101_04_01.dfdl.xsd | 2 +-
.../ibm-contributed/dpaflsmbyfrm41.dfdl.xsd | 2 +-
.../ibm-contributed/dpaspc7133_01.dfdl.xsd | 2 +-
.../ibm-contributed/length_explicit_12.dfdl.xsd | 2 +-
.../test-suite/tresys-contributed/AB.dfdl.xsd | 2 +-
.../test-suite/tresys-contributed/AF.dfdl.xsd | 2 +-
.../test-suite/tresys-contributed/AG.dfdl.xsd | 4 +-
.../test-suite/tresys-contributed/AH.dfdl.xsd | 2 +-
.../test-suite/tresys-contributed/AM.dfdl.xsd | 4 +-
.../test-suite/tresys-contributed/AT.dfdl.xsd | 2 +-
.../test-suite/tresys-contributed/AU.dfdl.xsd | 2 +-
.../test-suite/tresys-contributed/AV.dfdl.xsd | 4 +-
.../test-suite/tresys-contributed/AW.dfdl.xsd | 2 +-
.../test-suite/tresys-contributed/AY.dfdl.xsd | 2 +-
.../test-suite/tresys-contributed/AZ.dfdl.xsd | 2 +-
.../test-suite/tresys-contributed/BA.dfdl.xsd | 2 +-
.../test-suite/tresys-contributed/BC.dfdl.xsd | 2 +-
.../test-suite/tresys-contributed/BD.dfdl.xsd | 2 +-
.../test-suite/tresys-contributed/BE.dfdl.xsd | 2 +-
.../test-suite/tresys-contributed/BF.dfdl.xsd | 2 +-
.../tresys-contributed/bitFlagExpression.tdml | 2 +-
.../tresys-contributed/dpaextdeltxt101.dfdl.xsd | 2 +-
.../org/apache/daffodil/IBMTests2.scala | 6 +-
.../org/apache/daffodil/TresysTests.scala | 6 +-
.../org/apache/daffodil/TresysTests2.scala | 6 +-
.../test/scala/org/apache/daffodil/IBMTests.scala | 6 +-
.../test/scala/org/apache/daffodil/IBMTests3.scala | 6 +-
.../scala/org/apache/daffodil/TresysTests.scala | 8 +-
.../scala/org/apache/daffodil/TresysTests3.scala | 4 +-
.../anotherChildDir/include01_01_03.dfdl.xsd | 2 +-
.../daffodil/ibm-tests/delimiter_12.dfdl.xsd | 2 +-
.../apache/daffodil/ibm-tests/dpadelmulcho_01.xsd | 2 +-
.../daffodil/ibm-tests/dpadelone107_05.dfdl.xsd | 2 +-
.../apache/daffodil/ibm-tests/dpadelonearr_12.xsd | 2 +-
.../daffodil/ibm-tests/dpadeloneini_01.dfdl.xsd | 2 +-
.../daffodil/ibm-tests/dpaextdeltxt101.dfdl.xsd | 2 +-
.../daffodil/ibm-tests/dpaflsenc101_04_01.dfdl.xsd | 2 +-
.../org/apache/daffodil/ibm-tests/dpanum.dfdl.xsd | 2 +-
.../daffodil/ibm-tests/dpaspc121_02.dfdl.xsd | 2 +-
.../apache/daffodil/ibm-tests/dpaspc7131.dfdl.xsd | 2 +-
.../apache/daffodil/ibm-tests/dpaspc7132.dfdl.xsd | 2 +-
.../daffodil/ibm-tests/dpaspc7132_2.dfdl.xsd | 2 +-
.../daffodil/ibm-tests/length_explicit_12.dfdl.xsd | 2 +-
.../daffodil/ibm-tests/syntax_entities_6.dfdl.xsd | 2 +-
.../general/elementFormDefaultQualified.dfdl.xsd | 2 +-
.../general/elementFormDefaultUnqualified.dfdl.xsd | 2 +-
.../apache/daffodil/section00/general/general.tdml | 2 +-
.../section00/general/generalSchema.dfdl.xsd | 2 +-
.../section00/general/parseUnparsePolicy.tdml | 2 +-
.../section00/general/testElementFormDefault.tdml | 2 +-
.../section00/general/testUnparserBitOrderOVC.tdml | 4 +-
.../section00/general/testUnparserGeneral.tdml | 8 +-
.../daffodil/section00/general/tunables.tdml | 4 +-
.../apache/daffodil/section00/general/tunables.xml | 2 +-
.../schema_definition_errors/lineNumber.dfdl.xsd | 2 +-
.../daffodil/section05/facets/testBinary.dfdl.xsd | 2 +-
.../daffodil/section05/simple_types/AK.dfdl.xsd | 2 +-
.../daffodil/section05/simple_types/AL.dfdl.xsd | 2 +-
.../section06/entities/DefaultProperties.xsd | 2 +-
.../section06/entities/charClassEntities.dfdl.xsd | 2 +-
.../section06/entities/utf16schema.dfdl.xsd | 2 +-
.../namespaces/address_namespace.dfdl.xsd | 2 +-
.../namespaces/address_no_namespace.dfdl.xsd | 2 +-
.../namespaces/charClassEntities.dfdl.xsd | 2 +-
.../namespaces/customer_namespace.dfdl.xsd | 4 +-
.../namespaces/customer_no_namespace.dfdl.xsd | 4 +-
.../section06/namespaces/cycle_base.dfdl.xsd | 4 +-
.../section06/namespaces/cycle_step.dfdl.xsd | 4 +-
.../section06/namespaces/multi_A_01.dfdl.xsd | 4 +-
.../section06/namespaces/multi_A_02.dfdl.xsd | 4 +-
.../section06/namespaces/multi_A_03.dfdl.xsd | 4 +-
.../section06/namespaces/multi_A_11_nons.dfdl.xsd | 4 +-
.../namespaces/multi_A_11_nons_valid.dfdl.xsd | 4 +-
.../section06/namespaces/multi_A_12.dfdl.xsd | 2 +-
.../section06/namespaces/multi_A_13.dfdl.xsd | 2 +-
.../section06/namespaces/multi_A_14.dfdl.xsd | 2 +-
.../section06/namespaces/multi_A_15.dfdl.xsd | 2 +-
.../section06/namespaces/multi_A_16.dfdl.xsd | 2 +-
.../section06/namespaces/multi_A_20.dfdl.xsd | 2 +-
.../section06/namespaces/multi_A_21.dfdl.xsd | 2 +-
.../section06/namespaces/multi_B_01.dfdl.xsd | 2 +-
.../section06/namespaces/multi_B_02.dfdl.xsd | 4 +-
.../section06/namespaces/multi_B_03.dfdl.xsd | 2 +-
.../section06/namespaces/multi_B_04.dfdl.xsd | 4 +-
.../namespaces/multi_B_04_invalid.dfdl.xsd | 2 +-
.../section06/namespaces/multi_B_05_nons.dfdl.xsd | 4 +-
.../section06/namespaces/multi_B_06.dfdl.xsd | 2 +-
.../section06/namespaces/multi_B_06_valid.dfdl.xsd | 2 +-
.../section06/namespaces/multi_B_08.dfdl.xsd | 4 +-
.../namespaces/multi_B_08_classpath.dfdl.xsd | 2 +-
.../section06/namespaces/multi_B_11.dfdl.xsd | 2 +-
.../section06/namespaces/multi_B_13.dfdl.xsd | 2 +-
.../section06/namespaces/multi_C_02.dfdl.xsd | 2 +-
.../section06/namespaces/multi_C_03.dfdl.xsd | 2 +-
.../section06/namespaces/multi_C_08.dfdl.xsd | 2 +-
.../section06/namespaces/multi_D_03.dfdl.xsd | 2 +-
.../section06/namespaces/multi_E_03.dfdl.xsd | 2 +-
.../section06/namespaces/multi_base_01.dfdl.xsd | 6 +-
.../section06/namespaces/multi_base_02.dfdl.xsd | 6 +-
.../section06/namespaces/multi_base_03.dfdl.xsd | 2 +-
.../section06/namespaces/multi_base_04.dfdl.xsd | 6 +-
.../namespaces/multi_base_04_invalid.dfdl.xsd | 4 +-
.../namespaces/multi_base_04_invalid2.dfdl.xsd | 4 +-
.../namespaces/multi_base_05_nons.dfdl.xsd | 6 +-
.../section06/namespaces/multi_base_06.dfdl.xsd | 8 +-
.../namespaces/multi_base_06_valid.dfdl.xsd | 8 +-
.../namespaces/multi_base_07_failure.dfdl.xsd | 2 +-
.../section06/namespaces/multi_base_08.dfdl.xsd | 2 +-
.../section06/namespaces/multi_base_09.dfdl.xsd | Bin 6636 -> 6608 bytes
.../section06/namespaces/multi_base_10.dfdl.xsd | 8 +-
.../section06/namespaces/multi_base_11.dfdl.xsd | 6 +-
.../namespaces/multi_base_11_valid.dfdl.xsd | 6 +-
.../section06/namespaces/multi_base_12.dfdl.xsd | 2 +-
.../section06/namespaces/multi_base_13.dfdl.xsd | 2 +-
.../section06/namespaces/multi_base_14.dfdl.xsd | 2 +-
.../section06/namespaces/multi_base_15.dfdl.xsd | 2 +-
.../section06/namespaces/multi_base_16.dfdl.xsd | 2 +-
.../section06/namespaces/multi_base_17.dfdl.xsd | 4 +-
.../section06/namespaces/multi_base_18.dfdl.xsd | 2 +-
.../section06/namespaces/multi_base_19.dfdl.xsd | 2 +-
.../section06/namespaces/multi_base_20.dfdl.xsd | 4 +-
.../section06/namespaces/multi_base_21.dfdl.xsd | 4 +-
.../section06/namespaces/multi_base_shi.dfdl.xsd | 6 +-
.../section06/namespaces/multi_base_shi2.dfdl.xsd | 6 +-
.../section06/namespaces/multi_temp.dfdl.xsd | 2 +-
.../section06/namespaces/namespaceCharLim.dfdl.xsd | 2 +-
.../section06/namespaces/namespaceRules.dfdl.xsd | 2 +-
.../namespaces/namespaceSpecialChar.dfdl.xsd | 2 +-
.../daffodil/section06/namespaces/namespaces.tdml | 6 +-
.../namespaces/predefined_format.dfdl.xsd | 2 +-
.../namespaces/primTypesPrefixes.dfdl.xsd | 2 +-
.../daffodil/section06/namespaces/qname1.dfdl.xsd | 4 +-
.../daffodil/section06/namespaces/qname2.dfdl.xsd | 4 +-
.../daffodil/section06/namespaces/qname3.dfdl.xsd | 2 +-
.../org/apache/daffodil/section06/namespaces/shi | 2 +-
.../namespaces/subfolder/multi_A_06_nons.dfdl.xsd | 4 +-
.../subfolder/multi_A_06_nons_valid.dfdl.xsd | 4 +-
.../namespaces/subfolder/multi_C_06_nons.dfdl.xsd | 2 +-
.../subfolder/multi_C_06_nons_valid.dfdl.xsd | 2 +-
.../section06/namespaces/test01sch1.dfdl.xsd | 2 +-
.../section06/namespaces/test01sch2.dfdl.xsd | 2 +-
.../section06/namespaces/test02sch1.dfdl.xsd | 2 +-
.../section06/namespaces/test02sch2.dfdl.xsd | 2 +-
.../section06/namespaces/test03sch1.dfdl.xsd | 2 +-
.../section06/namespaces/test03sch2.dfdl.xsd | 2 +-
.../section06/namespaces/test04sch2.dfdl.xsd | 2 +-
.../section07/defineFormat/defineFormat.dfdl.xsd | 2 +-
.../defineFormat/defineFormat_withComment.dfdl.xsd | 2 +-
.../external_variables/daffodil_config.xml | 2 +-
.../daffodil_config_cli_test.xml | 2 +-
.../external_variables/external_variables.dfdl.xsd | 2 +-
.../external_variables/external_variables.tdml | 6 +-
.../external_variables/external_variables.xml | 2 +-
.../section07/property_syntax/PropertySyntax.tdml | 2 +-
.../property_syntax/property_syntax.dfdl.xsd | 2 +-
.../section07/variables/variables_01.dfdl.xsd | 4 +-
.../property_scoping/defaultForm.dfdl.xsd | 2 +-
.../property_scoping/defaultForm_02.dfdl.xsd | 2 +-
.../property_scoping/defaultForm_03.dfdl.xsd | 2 +-
.../property_scoping/defaultForm_04.dfdl.xsd | 2 +-
.../DelimiterPropertiesUnparse.tdml | 2 +-
.../delimiter_properties/testDFACreation.dfdl.xsd | 2 +-
.../testOptionalInfix.dfdl.xsd | 2 +-
.../daffodil/section12/lengthKind/AB.dfdl.xsd | 2 +-
.../section14/sequence_groups/SequenceGroup.tdml | 2 +-
.../sequence_groups/SequenceGroupUnparse.tdml | 2 +-
.../sequenceWithComplexType.dfdl.xsd | 2 +-
.../section15/choice_groups/choice.dfdl.xsd | 2 +-
.../section15/choice_groups/noBranches.dfdl.xsd | 2 +-
.../array_optional_elem/ArrayOptionalElem.tdml | 2 +-
.../UnparseArrayDelimitedOptionalElem.tdml | 2 +-
.../UnparseArrayExpressionConstant.tdml | 2 +-
.../UnparseArrayFixedOptionalElem.tdml | 2 +-
.../UnparseArrayImplicitOptionalElem.tdml | 2 +-
.../UnparseArrayParsedOptionalElem.tdml | 2 +-
.../arrays_optional_elements.dfdl.xsd | 4 +-
.../array_optional_elem/backtracking.tdml | 2 +-
.../calc_value_properties/outputValueCalc2.tdml | 2 +-
.../section23/dfdl_expressions/expressions.tdml | 2 +-
.../section23/dfdl_expressions/expressions2.tdml | 2 +-
.../section23/dfdl_expressions/valueLength.tdml | 2 +-
.../section23/dfdl_functions/first_schema.dfdl.xsd | 4 +-
.../section23/dfdl_functions/home_schema.dfdl.xsd | 4 +-
.../dfdl_functions/second_schema.dfdl.xsd | 2 +-
.../runtime_properties/runtime-properties.tdml | 2 +-
.../daffodil/unparser/parseUnparseMode.dfdl.xsd | 4 +-
.../unparser/parseUnparseModeTest.dfdl.xsd | 2 +-
.../org/apache/daffodil/usertests/json5.dfdl.xsd | 2 +-
.../apache/daffodil/usertests/testWSPStar.dfdl.xsd | 2 +-
.../src/test/resources/test space/A B.dfdl.xsd | 2 +-
.../test space/test 1/multi_base_05_nons.dfdl.xsd | 2 +-
.../resources/test space/test 1/namespaces.tdml | 4 +-
.../test space/test 3/multi_B_05_nons.dfdl.xsd | 2 +-
.../general/TestUnparserGeneralDebug.scala | 6 +-
.../processing_errors/TestProcessingErrors.scala | 10 +-
.../validation_errors/TestValidationErrDebug.scala | 8 +-
.../simple_types/TestSimpleTypesDebug.scala | 10 +-
.../simple_types/TestSimpleTypesUnparseDebug.scala | 6 +-
.../section06/entities/TestEntitiesDebug.scala | 8 +-
.../section06/namespaces/TestNamespacesDebug.scala | 6 +-
.../section07/assertions/TestAssertionsDebug.scala | 6 +-
.../defineFormat/defineFormatTestsDebug.scala | 6 +-
.../escapeScheme/TestEscapeSchemeDebug.scala | 10 +-
.../section07/variables/TestVariablesDebug.scala | 6 +-
.../TestPropertyScopingDebug.scala | 10 +-
.../TestContentFramingPropertiesDebug.scala | 8 +-
.../aligned_data/TestAlignedDataDebug.scala | 6 +-
.../TestDelimiterPropertiesUnparseDebug.scala | 8 +-
.../lengthKind/TestLengthKindDelimitedDebug.scala | 8 +-
.../lengthKind/TestLengthKindExplicitDebug.scala | 6 +-
.../lengthKind/TestLengthKindPatternDebug.scala | 6 +-
.../TestLengthPropertiesDebug.scala | 8 +-
.../TestTextNumberPropsDebug.scala | 6 +-
.../occursCountKind/TestOCKImplicitDebug.scala | 6 +-
.../sequence_groups/TestSequenceGroupsDebug.scala | 8 +-
.../TestUnorderedSequences.scala | 6 +-
.../section15/choice_groups/TestChoiceDebug.scala | 8 +-
.../TestArrayOptionalElemDebug.scala | 10 +-
.../TestUnparseArrayOptionalElemDebug.scala | 6 +-
.../TestInputValueCalcDebug.scala | 6 +-
.../TestOutputValueCalcDebug.scala | 6 +-
.../TestDFDLExpressionsDebug.scala | 12 +-
.../TestRegularExpressionsDebug.scala | 6 +-
.../org/apache/daffodil/usertests/TestLeaks.scala | 8 +-
.../usertests/TestUserSubmittedTestsDebug.scala | 14 +-
.../daffodil/functionality/TestFunctionality.scala | 2 +-
.../general/TestElementFormDefaultGeneral.scala | 6 +-
.../daffodil/section00/general/TestGeneral.scala | 8 +-
.../section00/general/TestGeneralNew.scala | 8 +-
.../section00/general/TestParseUnparsePolicy.scala | 6 +-
.../section00/general/TestUnparserGeneral.scala | 6 +-
.../section00/general/TestUnparserGeneral2.scala | 6 +-
.../processing_errors/ProcessingErrors.scala | 10 +-
.../ProcessingErrorsUnparse.scala | 6 +-
.../schema_definition_errors/TestSDE.scala | 6 +-
.../schema_definition_errors/TestSDENew.scala | 8 +-
.../validation_errors/TestValidationErr.scala | 6 +-
.../validation_errors/TestValidationErrNew.scala | 8 +-
.../dfdl_xsdl_subset/TestDFDLSubset.scala | 6 +-
.../daffodil/section05/facets/TestFacets.scala | 6 +-
.../daffodil/section05/facets/TestFacetsNew.scala | 8 +-
.../section05/simple_types/TestBoolean2.scala | 6 +-
.../simple_types/TestRuntimeCalendarLanguage.scala | 6 +-
.../TestRuntimeCalendarLanguageNew.scala | 6 +-
.../section05/simple_types/TestSimpleTypes.scala | 8 +-
.../section05/simple_types/TestSimpleTypes2.scala | 8 +-
.../simple_types/TestSimpleTypesNew.scala | 6 +-
.../simple_types/TestSimpleTypesUnparse.scala | 6 +-
.../section05/simple_types/TestUnions.scala | 6 +-
.../daffodil/section06/entities/TestEntities.scala | 8 +-
.../section06/entities/TestEntitiesNew.scala | 8 +-
.../section06/namespaces/TestNamespaces.scala | 10 +-
.../section06/namespaces/TestNamespacesNew.scala | 8 +-
.../section07/assertions/TestAssertions.scala | 6 +-
.../section07/defineFormat/defineFormatTests.scala | 6 +-
.../discriminators/TestDiscriminators.scala | 6 +-
.../discriminators/TestDiscriminators2.scala | 6 +-
.../section07/escapeScheme/TestEscapeScheme.scala | 6 +-
.../escapeScheme/TestEscapeSchemeUnparse.scala | 6 +-
.../escapeScheme/TestEscapeSchemeUnparseNew.scala | 6 +-
.../external_variables/TestExternalVariables.scala | 6 +-
.../TestExternalVariablesNew.scala | 8 +-
.../property_syntax/TestPropertySyntax.scala | 8 +-
.../property_syntax/TestPropertySyntaxNew.scala | 6 +-
.../section07/variables/TestVariables.scala | 16 +-
.../section07/variables/TestVariables2.scala | 8 +-
.../property_scoping/TestPropertyScoping.scala | 6 +-
.../property_scoping/TestPropertyScopingNew.scala | 8 +-
.../representation_properties/TestRepProps.scala | 6 +-
.../representation_properties/TestRepProps2.scala | 6 +-
.../TestContentFramingProperties.scala | 8 +-
.../section12/aligned_data/TestAlignedData.scala | 6 +-
.../TestDelimiterProperties.scala | 8 +-
.../TestDelimiterPropertiesUnparse.scala | 6 +-
.../lengthKind/TestLengthKindDelimited.scala | 8 +-
.../lengthKind/TestLengthKindEndOfParent2.scala | 6 +-
.../lengthKind/TestLengthKindExplicit.scala | 6 +-
.../lengthKind/TestLengthKindExplicit2.scala | 6 +-
.../lengthKind/TestLengthKindImplicit.scala | 6 +-
.../lengthKind/TestLengthKindPattern.scala | 6 +-
.../lengthKind/TestLengthKindPattern2.scala | 8 +-
.../length_properties/TestLengthProperties.scala | 10 +-
.../TestLengthPropertiesNew.scala | 6 +-
.../daffodil/section13/nillable/TestNillable.scala | 8 +-
.../section13/nillable/TestNillableUnparse.scala | 6 +-
.../daffodil/section13/packed/TestPacked.scala | 6 +-
.../TestTextNumberPropertiesNew.scala | 8 +-
.../text_number_props/TestTextNumberProps.scala | 6 +-
.../TestTextNumberPropsUnparse.scala | 6 +-
.../occursCountKind/TestOCKImplicit.scala | 6 +-
.../occursCountKind/TestOCKImplicitNew.scala | 8 +-
.../TestSequenceGroupInitiatedContent.scala | 6 +-
.../sequence_groups/TestSequenceGroupUnparse.scala | 8 +-
.../sequence_groups/TestSequenceGroups.scala | 8 +-
.../sequence_groups/TestSequenceGroups3.scala | 6 +-
.../TestUnorderedSequencesNew.scala | 8 +-
.../section15/choice_groups/TestChoice.scala | 8 +-
.../section15/choice_groups/TestChoice2.scala | 6 +-
.../TestChoiceGroupInitiatedContent.scala | 6 +-
.../choice_groups/TestUnparseChoice.scala | 6 +-
.../choice_groups/TestUnparseChoiceNew.scala | 8 +-
.../TestArrayOptionalElem.scala | 10 +-
.../TestArrayOptionalElemNew.scala | 8 +-
.../TestUnparseArrayFixedOptionalElemNew.scala | 6 +-
.../TestUnparseArrayImplicitOptionalElemNew.scala | 8 +-
.../TestUnparseArrayOptionalElem.scala | 6 +-
.../TestUnparseArrayParsedOptionalElemNew.scala | 8 +-
.../calc_value_properties/TestInputValueCalc.scala | 6 +-
.../TestOutputValueCalc.scala | 6 +-
.../dfdl_expressions/TestDFDLExpressions.scala | 10 +-
.../dfdl_expressions/TestDFDLExpressions2.scala | 12 +-
.../dfdl_expressions/TestDFDLExpressionsNew.scala | 8 +-
.../TestRegularExpressions.scala | 6 +-
.../TestRegularExpressionsNew.scala | 8 +-
.../section31/escape_characters/TestEscapes.scala | 6 +-
.../daffodil/unparser/TestEnvelopePayload.scala | 6 +-
.../daffodil/unparser/TestOVCAndLength.scala | 8 +-
.../daffodil/unparser/TestParseUnparseMode.scala | 6 +-
.../daffodil/unparser/TestUnparseNegInfoset.scala | 8 +-
.../org/apache/daffodil/usertests/TestJSON5.scala | 6 +-
.../usertests/TestUserSubmittedTests.scala | 6 +-
.../usertests/TestUserSubmittedTestsNew.scala | 8 +-
.../xml/test/unit/TestDaffodilXMLLoader.scala | 12 +-
.../src/main/resources/org2/xsd/formats.dfdl.xsd | 2 +-
test-stdLayout/src/test/scala/org1/TestOrg1.scala | 2 +-
test-stdLayout/src/test/scala/org2/TestOrg2.scala | 2 +-
.../src/test/scala/org2/TestPayloadAndTypes.scala | 2 +-
.../src/main/resources/bugReportTemplate.tdml | 2 +-
tutorials/src/main/resources/tdmlTutorial.tdml.xml | 2 +-
.../src/main/resources/test1.tutorial.tdml.xml | 2 +-
.../testTDMLTutorialFile2.tutorial.tdml.xml | 2 +-
.../apache/daffodil/tutorials/TestTutorials.scala | 4 +-
903 files changed, 4655 insertions(+), 4626 deletions(-)
diff --git a/build.sbt b/build.sbt
index b34aee1..66df1c4 100644
--- a/build.sbt
+++ b/build.sbt
@@ -72,7 +72,7 @@ lazy val testStdLayout = Project("daffodil-test-stdLayout", file("test-stdLay
lazy val commonSettings = Seq(
- organization := "edu.illinois.ncsa",
+ organization := "org.apache.daffodil",
version := "2.1.0-SNAPSHOT",
scalaVersion := "2.11.8",
scalacOptions ++= Seq(
@@ -152,7 +152,7 @@ lazy val libManagedSettings = Seq(
val outdir = (sourceManaged in Compile).value
val filesToWatch = (inSrc ++ inRSrc).toSet
val cachedFun = FileFunction.cached(stream.cacheDirectory / "propgen") { (in: Set[File]) =>
- val mainClass = "edu.illinois.ncsa.daffodil.propGen.PropertyGenerator"
+ val mainClass = "org.apache.daffodil.propGen.PropertyGenerator"
val out = new java.io.ByteArrayOutputStream()
val forkOpts = ForkOptions()
.withOutputStrategy(Some(CustomOutput(out)))
@@ -180,7 +180,7 @@ lazy val libManagedSettings = Seq(
val filesToWatch = inRSrc.filter{_.isFile}.toSet
val cachedFun = FileFunction.cached(stream.cacheDirectory / "schemasgen") { (schemas: Set[File]) =>
schemas.map { schema =>
- val out = outdir / "edu" / "illinois" / "ncsa" / "daffodil" / "xsd" / schema.getName
+ val out = outdir / "org" / "apache" / "daffodil" / "xsd" / schema.getName
IO.copyFile(schema, out)
stream.log.info("Generated %s".format(out))
out
diff --git a/daffodil-cli/src/main/scala/org/apache/daffodil/Main.scala b/daffodil-cli/src/main/scala/org/apache/daffodil/Main.scala
index 0511a51..035b952 100644
--- a/daffodil-cli/src/main/scala/org/apache/daffodil/Main.scala
+++ b/daffodil-cli/src/main/scala/org/apache/daffodil/Main.scala
@@ -30,7 +30,7 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil
+package org.apache.daffodil
import java.io.FileOutputStream
import java.io.BufferedWriter
@@ -46,26 +46,26 @@ import java.nio.channels.Channels
import java.net.URI
import scala.xml.SAXParseException
import org.rogach.scallop
-import edu.illinois.ncsa.daffodil.debugger.{ InteractiveDebugger, TraceDebuggerRunner, CLIDebuggerRunner }
-import edu.illinois.ncsa.daffodil.util.Misc
-import edu.illinois.ncsa.daffodil.util.Timer
-import edu.illinois.ncsa.daffodil.xml._
-import edu.illinois.ncsa.daffodil.exceptions.Assert
-import edu.illinois.ncsa.daffodil.compiler.Compiler
-import edu.illinois.ncsa.daffodil.api.WithDiagnostics
-import edu.illinois.ncsa.daffodil.util.Logging
-import edu.illinois.ncsa.daffodil.util.LogLevel
-import edu.illinois.ncsa.daffodil.util.LogWriter
-import edu.illinois.ncsa.daffodil.util.LoggingDefaults
-import edu.illinois.ncsa.daffodil.exceptions.NotYetImplementedException
+import org.apache.daffodil.debugger.{ InteractiveDebugger, TraceDebuggerRunner, CLIDebuggerRunner }
+import org.apache.daffodil.util.Misc
+import org.apache.daffodil.util.Timer
+import org.apache.daffodil.xml._
+import org.apache.daffodil.exceptions.Assert
+import org.apache.daffodil.compiler.Compiler
+import org.apache.daffodil.api.WithDiagnostics
+import org.apache.daffodil.util.Logging
+import org.apache.daffodil.util.LogLevel
+import org.apache.daffodil.util.LogWriter
+import org.apache.daffodil.util.LoggingDefaults
+import org.apache.daffodil.exceptions.NotYetImplementedException
import java.io.File
-import edu.illinois.ncsa.daffodil.tdml.DFDLTestSuite
-import edu.illinois.ncsa.daffodil.api.ValidationMode
+import org.apache.daffodil.tdml.DFDLTestSuite
+import org.apache.daffodil.api.ValidationMode
import scala.xml.Node
-import edu.illinois.ncsa.daffodil.externalvars.Binding
-import edu.illinois.ncsa.daffodil.externalvars.ExternalVariablesLoader
-import edu.illinois.ncsa.daffodil.configuration.ConfigurationLoader
-import edu.illinois.ncsa.daffodil.api.ValidationMode
+import org.apache.daffodil.externalvars.Binding
+import org.apache.daffodil.externalvars.ExternalVariablesLoader
+import org.apache.daffodil.configuration.ConfigurationLoader
+import org.apache.daffodil.api.ValidationMode
import scala.language.reflectiveCalls
import scala.concurrent.Future
import java.util.concurrent.Executors
@@ -74,41 +74,41 @@ import scala.reflect.runtime.universe._
import org.rogach.scallop.ScallopOption
import scala.concurrent.duration.Duration
import scala.concurrent.Await
-import edu.illinois.ncsa.daffodil.xml.QName
-import edu.illinois.ncsa.daffodil.compiler._
-import edu.illinois.ncsa.daffodil.dsom.ExpressionCompilers
-import edu.illinois.ncsa.daffodil.compiler.InvalidParserException
+import org.apache.daffodil.xml.QName
+import org.apache.daffodil.compiler._
+import org.apache.daffodil.dsom.ExpressionCompilers
+import org.apache.daffodil.compiler.InvalidParserException
import java.net.URI
-import edu.illinois.ncsa.daffodil.api.URISchemaSource
-import edu.illinois.ncsa.daffodil.tdml.TDMLException
-import edu.illinois.ncsa.daffodil.xml.RefQName
+import org.apache.daffodil.api.URISchemaSource
+import org.apache.daffodil.tdml.TDMLException
+import org.apache.daffodil.xml.RefQName
import org.rogach.scallop.ArgType
import org.rogach.scallop.ValueConverter
-import edu.illinois.ncsa.daffodil.processors.DataProcessor
-import edu.illinois.ncsa.daffodil.processors.HasSetDebugger
-import edu.illinois.ncsa.daffodil.processors.parsers.PState
-import edu.illinois.ncsa.daffodil.exceptions.UnsuppressableException
-import edu.illinois.ncsa.daffodil.util.InvalidJavaVersionException
-import edu.illinois.ncsa.daffodil.infoset.XMLTextInfosetOutputter
-import edu.illinois.ncsa.daffodil.infoset.NullInfosetOutputter
-import edu.illinois.ncsa.daffodil.infoset.ScalaXMLInfosetOutputter
-import edu.illinois.ncsa.daffodil.infoset.JsonInfosetOutputter
-import edu.illinois.ncsa.daffodil.infoset.InfosetOutputter
-import edu.illinois.ncsa.daffodil.infoset.JDOMInfosetOutputter
-import edu.illinois.ncsa.daffodil.infoset.W3CDOMInfosetOutputter
-import edu.illinois.ncsa.daffodil.infoset.XMLTextInfosetInputter
-import edu.illinois.ncsa.daffodil.infoset.JsonInfosetInputter
-import edu.illinois.ncsa.daffodil.infoset.ScalaXMLInfosetInputter
-import edu.illinois.ncsa.daffodil.infoset.JDOMInfosetInputter
-import edu.illinois.ncsa.daffodil.infoset.W3CDOMInfosetInputter
-import edu.illinois.ncsa.daffodil.infoset.InfosetInputter
+import org.apache.daffodil.processors.DataProcessor
+import org.apache.daffodil.processors.HasSetDebugger
+import org.apache.daffodil.processors.parsers.PState
+import org.apache.daffodil.exceptions.UnsuppressableException
+import org.apache.daffodil.util.InvalidJavaVersionException
+import org.apache.daffodil.infoset.XMLTextInfosetOutputter
+import org.apache.daffodil.infoset.NullInfosetOutputter
+import org.apache.daffodil.infoset.ScalaXMLInfosetOutputter
+import org.apache.daffodil.infoset.JsonInfosetOutputter
+import org.apache.daffodil.infoset.InfosetOutputter
+import org.apache.daffodil.infoset.JDOMInfosetOutputter
+import org.apache.daffodil.infoset.W3CDOMInfosetOutputter
+import org.apache.daffodil.infoset.XMLTextInfosetInputter
+import org.apache.daffodil.infoset.JsonInfosetInputter
+import org.apache.daffodil.infoset.ScalaXMLInfosetInputter
+import org.apache.daffodil.infoset.JDOMInfosetInputter
+import org.apache.daffodil.infoset.W3CDOMInfosetInputter
+import org.apache.daffodil.infoset.InfosetInputter
import javax.xml.transform.TransformerFactory
import javax.xml.transform.dom.DOMSource
import javax.xml.transform.stream.StreamResult
import javax.xml.parsers.DocumentBuilderFactory
import org.apache.commons.io.IOUtils
-import edu.illinois.ncsa.daffodil.api.TunableLimitExceededError
-import edu.illinois.ncsa.daffodil.api.DaffodilTunables
+import org.apache.daffodil.api.TunableLimitExceededError
+import org.apache.daffodil.api.DaffodilTunables
class NullOutputStream extends OutputStream {
override def close() {}
diff --git a/daffodil-cli/src/main/scala/org/apache/daffodil/debugger/CLIDebuggerRunner.scala b/daffodil-cli/src/main/scala/org/apache/daffodil/debugger/CLIDebuggerRunner.scala
index 78ba9c7..dc0d4fb 100644
--- a/daffodil-cli/src/main/scala/org/apache/daffodil/debugger/CLIDebuggerRunner.scala
+++ b/daffodil-cli/src/main/scala/org/apache/daffodil/debugger/CLIDebuggerRunner.scala
@@ -30,7 +30,7 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.debugger
+package org.apache.daffodil.debugger
import java.io.File
import scala.io.Source
diff --git a/daffodil-cli/src/templates/bash-template b/daffodil-cli/src/templates/bash-template
index a1ba6d8..9e2d078 100755
--- a/daffodil-cli/src/templates/bash-template
+++ b/daffodil-cli/src/templates/bash-template
@@ -33,7 +33,7 @@ realpath() {
echo "$REALPATH"
}
-MAINCLASS=edu.illinois.ncsa.daffodil.Main
+MAINCLASS=org.apache.daffodil.Main
SCRIPT=$(realpath "$0") # Full path to script, needed for symlinks
BINDIR=`dirname ${SCRIPT}` # Directory script is run in
LIBDIR="$BINDIR/../lib"
diff --git a/daffodil-cli/src/templates/bat-template b/daffodil-cli/src/templates/bat-template
index d021caf..190c463 100755
--- a/daffodil-cli/src/templates/bat-template
+++ b/daffodil-cli/src/templates/bat-template
@@ -20,7 +20,7 @@ REM environment variable will be used. If that is not specified, reasonable
REM defaults for Daffodil will be defined.
-set MAINCLASS=edu.illinois.ncsa.daffodil.Main
+set MAINCLASS=org.apache.daffodil.Main
set BINDIR=%~dp0
set LIBDIR=%BINDIR%..\lib
set CLASSPATH=%LIBDIR%\*
diff --git a/daffodil-cli/src/test/resources/clitests.tdml b/daffodil-cli/src/test/resources/clitests.tdml
index 6bb10e5..8821341 100644
--- a/daffodil-cli/src/test/resources/clitests.tdml
+++ b/daffodil-cli/src/test/resources/clitests.tdml
@@ -39,9 +39,9 @@ problems that a CLI-test is getting. -->
xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/" xmlns:tdml="http://www.ibm.com/xmlns/dfdl/testData">
- <tdml:parserTestCase name="test_3395_CLI_Performance_5_Threads_50_Times" root="Item2" model="edu/illinois/ncsa/daffodil/CLI/cli_schema.dfdl.xsd">
+ <tdml:parserTestCase name="test_3395_CLI_Performance_5_Threads_50_Times" root="Item2" model="org/apache/daffodil/CLI/cli_schema.dfdl.xsd">
<tdml:document>
- <tdml:documentPart type="file">edu/illinois/ncsa/daffodil/CLI/input/input5.txt</tdml:documentPart>
+ <tdml:documentPart type="file">org/apache/daffodil/CLI/input/input5.txt</tdml:documentPart>
</tdml:document>
<tdml:infoset>
<tdml:dfdlInfoset>
diff --git a/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/charClassEntities.dfdl.xsd b/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/charClassEntities.dfdl.xsd
index 6b2c424..f6a6efc 100644
--- a/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/charClassEntities.dfdl.xsd
+++ b/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/charClassEntities.dfdl.xsd
@@ -4,7 +4,7 @@
xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <include schemaLocation="edu/illinois/ncsa/daffodil/xsd/built-in-formats.xsd"/>
+ <include schemaLocation="org/apache/daffodil/xsd/built-in-formats.xsd"/>
<annotation>
<appinfo source="http://www.ogf.org/dfdl/">
diff --git a/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/cli_schema.dfdl.xsd b/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/cli_schema.dfdl.xsd
index aa9e910..3288466 100644
--- a/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/cli_schema.dfdl.xsd
+++ b/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/cli_schema.dfdl.xsd
@@ -2,7 +2,7 @@
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/" targetNamespace="http://example.com"
xmlns:ex="http://example.com">
- <xs:include schemaLocation="edu/illinois/ncsa/daffodil/xsd/built-in-formats.xsd"/>
+ <xs:include schemaLocation="org/apache/daffodil/xsd/built-in-formats.xsd"/>
<xs:annotation>
<xs:appinfo source="http://www.ogf.org/dfdl/" >
diff --git a/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/cli_schema_02.dfdl.xsd b/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/cli_schema_02.dfdl.xsd
index a0ef15e..53a372a 100644
--- a/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/cli_schema_02.dfdl.xsd
+++ b/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/cli_schema_02.dfdl.xsd
@@ -2,7 +2,7 @@
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/" targetNamespace="http://example.com"
xmlns:ex="http://example.com">
- <xs:include schemaLocation="edu/illinois/ncsa/daffodil/xsd/built-in-formats.xsd"/>
+ <xs:include schemaLocation="org/apache/daffodil/xsd/built-in-formats.xsd"/>
<xs:annotation>
<xs:appinfo source="http://www.ogf.org/dfdl/" >
diff --git a/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/cli_schema_03.dfdl.xsd b/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/cli_schema_03.dfdl.xsd
index c00ec33..aa2e2af 100644
--- a/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/cli_schema_03.dfdl.xsd
+++ b/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/cli_schema_03.dfdl.xsd
@@ -2,7 +2,7 @@
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/" targetNamespace="http://example.com"
xmlns:ex="http://example.com">
- <xs:include schemaLocation="edu/illinois/ncsa/daffodil/xsd/built-in-formats.xsd"/>
+ <xs:include schemaLocation="org/apache/daffodil/xsd/built-in-formats.xsd"/>
<xs:annotation>
<xs:appinfo source="http://www.ogf.org/dfdl/" >
diff --git a/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/complex_types.dfdl.xsd b/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/complex_types.dfdl.xsd
index 925ed02..149c711 100644
--- a/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/complex_types.dfdl.xsd
+++ b/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/complex_types.dfdl.xsd
@@ -3,7 +3,7 @@
xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/" xmlns:tns="http://complexSchema.com"
targetNamespace="http://complexSchema.com">
- <xs:include schemaLocation="edu/illinois/ncsa/daffodil/xsd/built-in-formats.xsd" />
+ <xs:include schemaLocation="org/apache/daffodil/xsd/built-in-formats.xsd" />
<xs:annotation>
<xs:appinfo source="http://www.ogf.org/dfdl/">
<dfdl:format ref="tns:daffodilTest1" separator=""
diff --git a/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/global_element.dfdl.xsd b/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/global_element.dfdl.xsd
index abc6fcc..be25591 100644
--- a/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/global_element.dfdl.xsd
+++ b/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/global_element.dfdl.xsd
@@ -3,7 +3,7 @@
xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/" xmlns:tns="http://baseSchema.com"
targetNamespace="http://baseSchema.com">
- <xs:include schemaLocation="edu/illinois/ncsa/daffodil/xsd/built-in-formats.xsd"/>
+ <xs:include schemaLocation="org/apache/daffodil/xsd/built-in-formats.xsd"/>
<xs:annotation>
<xs:appinfo source="http://www.ogf.org/dfdl/">
diff --git a/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/suppressWarnTest.dfdl.xsd b/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/suppressWarnTest.dfdl.xsd
index 21d0a25..2cb85c4 100644
--- a/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/suppressWarnTest.dfdl.xsd
+++ b/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/suppressWarnTest.dfdl.xsd
@@ -6,7 +6,7 @@
xmlns:ex="http://example.com"
elementFormDefault="unqualified">
- <xs:include schemaLocation="edu/illinois/ncsa/daffodil/xsd/built-in-formats.xsd"/>
+ <xs:include schemaLocation="org/apache/daffodil/xsd/built-in-formats.xsd"/>
<xs:annotation>
<xs:appinfo source="http://www.ogf.org/dfdl/" >
@@ -15,7 +15,7 @@
</xs:appinfo>
</xs:annotation>
- <xs:include schemaLocation="edu/illinois/ncsa/daffodil/xsd/built-in-formats.xsd" />
+ <xs:include schemaLocation="org/apache/daffodil/xsd/built-in-formats.xsd" />
<!-- Generates a warning unless it is suppressed by way of the tunable -->
<xs:element name="e1" dfdl:lengthKind="implicit">
diff --git a/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/unqualified_path_step.dfdl.xsd b/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/unqualified_path_step.dfdl.xsd
index 5d2f62d..d84e585 100644
--- a/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/unqualified_path_step.dfdl.xsd
+++ b/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/unqualified_path_step.dfdl.xsd
@@ -8,7 +8,7 @@
xmlns="http://example.com"
elementFormDefault="unqualified">
- <xs:include schemaLocation="edu/illinois/ncsa/daffodil/xsd/built-in-formats.xsd"/>
+ <xs:include schemaLocation="org/apache/daffodil/xsd/built-in-formats.xsd"/>
<xs:annotation>
<xs:appinfo source="http://www.ogf.org/dfdl/" >
diff --git a/daffodil-cli/src/test/resources/test/cli/fixedLength.dfdl.xsd b/daffodil-cli/src/test/resources/test/cli/fixedLength.dfdl.xsd
index 0dad88c..5f03084 100644
--- a/daffodil-cli/src/test/resources/test/cli/fixedLength.dfdl.xsd
+++ b/daffodil-cli/src/test/resources/test/cli/fixedLength.dfdl.xsd
@@ -8,7 +8,7 @@
xmlns:tns="http://www.example.org/example1/"
targetNamespace="http://www.example.org/example1/">
- <xs:include schemaLocation="edu/illinois/ncsa/daffodil/xsd/built-in-formats.xsd"/>
+ <xs:include schemaLocation="org/apache/daffodil/xsd/built-in-formats.xsd"/>
<xs:annotation>
<xs:appinfo source="http://www.ogf.org/dfdl/">
diff --git a/daffodil-cli/src/test/scala/org/apache/daffodil/CLI/Util.scala b/daffodil-cli/src/test/scala/org/apache/daffodil/CLI/Util.scala
index 07665c8..c79ecc5 100644
--- a/daffodil-cli/src/test/scala/org/apache/daffodil/CLI/Util.scala
+++ b/daffodil-cli/src/test/scala/org/apache/daffodil/CLI/Util.scala
@@ -30,21 +30,21 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.CLI
+package org.apache.daffodil.CLI
-import edu.illinois.ncsa.daffodil.util._
+import org.apache.daffodil.util._
import net.sf.expectit.ExpectBuilder
import net.sf.expectit.Expect
import net.sf.expectit.filter.Filters.replaceInString
import java.nio.file.Paths
import scala.collection.JavaConverters._
import java.util.concurrent.TimeUnit
-import edu.illinois.ncsa.daffodil.xml.XMLUtils
+import org.apache.daffodil.xml.XMLUtils
object Util {
- //val testDir = "daffodil-cli/src/test/resources/edu/illinois/ncsa/daffodil/CLI/"
- val testDir = "/edu/illinois/ncsa/daffodil/CLI/"
+ //val testDir = "daffodil-cli/src/test/resources/org/apache/daffodil/CLI/"
+ val testDir = "/org/apache/daffodil/CLI/"
val outputDir = testDir + "output/"
val isWindows = System.getProperty("os.name").toLowerCase().startsWith("windows")
diff --git a/daffodil-cli/src/test/scala/org/apache/daffodil/debugger/TestCLIDebugger.scala b/daffodil-cli/src/test/scala/org/apache/daffodil/debugger/TestCLIDebugger.scala
index b469927..3b086af 100644
--- a/daffodil-cli/src/test/scala/org/apache/daffodil/debugger/TestCLIDebugger.scala
+++ b/daffodil-cli/src/test/scala/org/apache/daffodil/debugger/TestCLIDebugger.scala
@@ -30,10 +30,10 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.debugger
+package org.apache.daffodil.debugger
import org.junit.Test
-import edu.illinois.ncsa.daffodil.CLI.Util
+import org.apache.daffodil.CLI.Util
import net.sf.expectit.matcher.Matchers.contains
import net.sf.expectit.matcher.Matchers.allOf
import net.sf.expectit.matcher.Matchers.times
@@ -48,8 +48,8 @@ class TestCLIdebugger {
// Also added a Java option to specify the character encoding: -Dfile.encoding=UTF-8
@Test def test_3385_CLI_Debugger_invalidExpressions() {
- val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section06/entities/charClassEntities.dfdl.xsd")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/edu/illinois/ncsa/daffodil/CLI/input/input1.txt")
+ val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input1.txt")
val (testSchemaFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(inputFile)) else (schemaFile, inputFile)
val shell = if (Util.isWindows) Util.start("", envp = DAFFODIL_JAVA_OPTS) else Util.start("")
@@ -87,8 +87,8 @@ class TestCLIdebugger {
}
@Test def test_3263_CLI_Debugger_occursBounds() {
- val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section06/entities/charClassEntities.dfdl.xsd")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/edu/illinois/ncsa/daffodil/CLI/input/input8.txt")
+ val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input8.txt")
val (testSchemaFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(inputFile)) else (schemaFile, inputFile)
val shell = if (Util.isWindows) Util.start("", envp = DAFFODIL_JAVA_OPTS) else Util.start("")
@@ -112,8 +112,8 @@ class TestCLIdebugger {
}
@Test def test_3266_CLI_Debugger_occursBounds_shortForm() {
- val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section06/entities/charClassEntities.dfdl.xsd")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/edu/illinois/ncsa/daffodil/CLI/input/input8.txt")
+ val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input8.txt")
val (testSchemaFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(inputFile)) else (schemaFile, inputFile)
val shell = if (Util.isWindows) Util.start("", envp = DAFFODIL_JAVA_OPTS) else Util.start("")
@@ -139,8 +139,8 @@ class TestCLIdebugger {
}
@Test def test_1591_CLI_Debugger_invalidCommandError() {
- val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section06/entities/charClassEntities.dfdl.xsd")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/edu/illinois/ncsa/daffodil/CLI/input/input1.txt")
+ val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input1.txt")
val (testSchemaFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(inputFile)) else (schemaFile, inputFile)
val shell = if (Util.isWindows) Util.start("", envp = DAFFODIL_JAVA_OPTS) else Util.start("")
@@ -158,8 +158,8 @@ class TestCLIdebugger {
}
@Test def test_1336_CLI_Debugger_occursBounds() {
- val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section06/entities/charClassEntities.dfdl.xsd")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/edu/illinois/ncsa/daffodil/CLI/input/input8.txt")
+ val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input8.txt")
val (testSchemaFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(inputFile)) else (schemaFile, inputFile)
val shell = if (Util.isWindows) Util.start("", envp = DAFFODIL_JAVA_OPTS) else Util.start("")
@@ -189,8 +189,8 @@ class TestCLIdebugger {
}
@Test def test_3398_CLI_Debugger_occursBounds_2() {
- val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section06/entities/charClassEntities.dfdl.xsd")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/edu/illinois/ncsa/daffodil/CLI/input/input11.txt")
+ val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input11.txt")
val (testSchemaFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(inputFile)) else (schemaFile, inputFile)
val shell = if (Util.isWindows) Util.start("", envp = DAFFODIL_JAVA_OPTS) else Util.start("")
@@ -225,8 +225,8 @@ class TestCLIdebugger {
}
@Test def test_1335_CLI_Debugger_dataAndWrapLength() {
- val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section06/entities/charClassEntities.dfdl.xsd")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/edu/illinois/ncsa/daffodil/CLI/input/input2.txt")
+ val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input2.txt")
val (testSchemaFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(inputFile)) else (schemaFile, inputFile)
val shell = if (Util.isWindows) Util.start("", envp = DAFFODIL_JAVA_OPTS) else Util.start("")
@@ -259,8 +259,8 @@ class TestCLIdebugger {
}
@Test def test_982_CLI_Debugger_simpleDebugger() {
- val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section06/entities/charClassEntities.dfdl.xsd")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/edu/illinois/ncsa/daffodil/CLI/input/input1.txt")
+ val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input1.txt")
val (testSchemaFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(inputFile)) else (schemaFile, inputFile)
val shell = if (Util.isWindows) Util.start("", envp = DAFFODIL_JAVA_OPTS) else Util.start("")
@@ -277,8 +277,8 @@ class TestCLIdebugger {
}
@Test def test_1326_CLI_Debugger_displaysTesting() {
- val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section06/entities/charClassEntities.dfdl.xsd")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/edu/illinois/ncsa/daffodil/CLI/input/input1.txt")
+ val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input1.txt")
val (testSchemaFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(inputFile)) else (schemaFile, inputFile)
val shell = if (Util.isWindows) Util.start("", envp = DAFFODIL_JAVA_OPTS) else Util.start("")
@@ -320,8 +320,8 @@ class TestCLIdebugger {
}
@Test def test_1339_CLI_Debugger_removeHidden() {
- val schemaFile = Util.daffodilPath("daffodil-cli/src/test/resources/edu/illinois/ncsa/daffodil/CLI/cli_schema.dfdl.xsd")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/edu/illinois/ncsa/daffodil/CLI/input/input6.txt")
+ val schemaFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/cli_schema.dfdl.xsd")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input6.txt")
val (testSchemaFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(inputFile)) else (schemaFile, inputFile)
val shell = if (Util.isWindows) Util.start("", envp = DAFFODIL_JAVA_OPTS) else Util.start("")
@@ -343,8 +343,8 @@ class TestCLIdebugger {
}
@Test def test_3268_CLI_Debugger_removeHidden2() {
- val schemaFile = Util.daffodilPath("daffodil-cli/src/test/resources/edu/illinois/ncsa/daffodil/CLI/cli_schema.dfdl.xsd")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/edu/illinois/ncsa/daffodil/CLI/input/input6.txt")
+ val schemaFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/cli_schema.dfdl.xsd")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input6.txt")
val (testSchemaFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(inputFile)) else (schemaFile, inputFile)
val shell = if (Util.isWindows) Util.start("", envp = DAFFODIL_JAVA_OPTS) else Util.start("")
@@ -369,8 +369,8 @@ class TestCLIdebugger {
}
@Test def test_1331_CLI_Debugger_breakpointTesting4() {
- val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section06/entities/charClassEntities.dfdl.xsd")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/edu/illinois/ncsa/daffodil/CLI/input/input3.txt")
+ val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input3.txt")
val (testSchemaFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(inputFile)) else (schemaFile, inputFile)
val shell = if (Util.isWindows) Util.start("", envp = DAFFODIL_JAVA_OPTS) else Util.start("")
@@ -425,8 +425,8 @@ class TestCLIdebugger {
}
@Test def test_1463_CLI_Debugger_breakOnValueOfElement() {
- val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section06/entities/charClassEntities.dfdl.xsd")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/edu/illinois/ncsa/daffodil/CLI/input/input3.txt")
+ val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input3.txt")
val (testSchemaFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(inputFile)) else (schemaFile, inputFile)
val shell = if (Util.isWindows) Util.start("", envp = DAFFODIL_JAVA_OPTS) else Util.start("")
@@ -471,8 +471,8 @@ class TestCLIdebugger {
}
@Test def test_1338_CLI_Debugger_discriminatorInfo() {
- val schemaFile = Util.daffodilPath("daffodil-cli/src/test/resources/edu/illinois/ncsa/daffodil/CLI/cli_schema.dfdl.xsd")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/edu/illinois/ncsa/daffodil/CLI/input/input5.txt")
+ val schemaFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/cli_schema.dfdl.xsd")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input5.txt")
val (testSchemaFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(inputFile)) else (schemaFile, inputFile)
val shell = if (Util.isWindows) Util.start("", envp = DAFFODIL_JAVA_OPTS) else Util.start("")
@@ -501,8 +501,8 @@ class TestCLIdebugger {
}
@Test def test_1328_CLI_Debugger_breakpointTesting() {
- val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section06/entities/charClassEntities.dfdl.xsd")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/edu/illinois/ncsa/daffodil/CLI/input/input1.txt")
+ val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input1.txt")
val (testSchemaFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(inputFile)) else (schemaFile, inputFile)
val shell = if (Util.isWindows) Util.start("", envp = DAFFODIL_JAVA_OPTS) else Util.start("")
@@ -542,8 +542,8 @@ class TestCLIdebugger {
}
@Test def test_1329_CLI_Debugger_breakpointTesting2() {
- val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section06/entities/charClassEntities.dfdl.xsd")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/edu/illinois/ncsa/daffodil/CLI/input/input2.txt")
+ val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input2.txt")
val (testSchemaFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(inputFile)) else (schemaFile, inputFile)
val shell = if (Util.isWindows) Util.start("", envp = DAFFODIL_JAVA_OPTS) else Util.start("")
@@ -578,8 +578,8 @@ class TestCLIdebugger {
}
@Test def test_CLI_Debugger_SDE_message() {
- val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section06/entities/charClassEntities.dfdl.xsd")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/edu/illinois/ncsa/daffodil/CLI/input/input2.txt")
+ val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input2.txt")
val (testSchemaFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(inputFile)) else (schemaFile, inputFile)
val shell = if (Util.isWindows) Util.start("", envp = DAFFODIL_JAVA_OPTS) else Util.start("")
@@ -603,8 +603,8 @@ class TestCLIdebugger {
}
@Test def test_1330_CLI_Debugger_breakpointTesting3() {
- val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section06/entities/charClassEntities.dfdl.xsd")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/edu/illinois/ncsa/daffodil/CLI/input/input2.txt")
+ val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input2.txt")
val (testSchemaFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(inputFile)) else (schemaFile, inputFile)
val shell = if (Util.isWindows) Util.start("", envp = DAFFODIL_JAVA_OPTS) else Util.start("")
@@ -645,8 +645,8 @@ class TestCLIdebugger {
}
@Test def test_1333_CLI_Debugger_settingInfosetLines() {
- val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section06/entities/charClassEntities.dfdl.xsd")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/edu/illinois/ncsa/daffodil/CLI/input/input3.txt")
+ val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input3.txt")
val (testSchemaFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(inputFile)) else (schemaFile, inputFile)
val shell = if (Util.isWindows) Util.start("", envp = DAFFODIL_JAVA_OPTS) else Util.start("")
@@ -688,8 +688,8 @@ class TestCLIdebugger {
}
@Test def test_1334_CLI_Debugger_infoBitPosition() {
- val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section06/entities/charClassEntities.dfdl.xsd")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/edu/illinois/ncsa/daffodil/CLI/input/input1.txt")
+ val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input1.txt")
val (testSchemaFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(inputFile)) else (schemaFile, inputFile)
val shell = if (Util.isWindows) Util.start("", envp = DAFFODIL_JAVA_OPTS) else Util.start("")
@@ -720,8 +720,8 @@ class TestCLIdebugger {
}
@Test def test_1337_CLI_Debugger_childIndex() {
- val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section06/entities/charClassEntities.dfdl.xsd")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/edu/illinois/ncsa/daffodil/CLI/input/input4.txt")
+ val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input4.txt")
val (testSchemaFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(inputFile)) else (schemaFile, inputFile)
val shell = if (Util.isWindows) Util.start("", envp = DAFFODIL_JAVA_OPTS) else Util.start("")
@@ -753,8 +753,8 @@ class TestCLIdebugger {
}
@Test def test_1340_CLI_Debugger_infoPath() {
- val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section06/entities/charClassEntities.dfdl.xsd")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/edu/illinois/ncsa/daffodil/CLI/input/input1.txt")
+ val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input1.txt")
val (testSchemaFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(inputFile)) else (schemaFile, inputFile)
val output1 = Util.getExpectedString("output1.txt")
@@ -782,8 +782,8 @@ class TestCLIdebugger {
}
@Test def test_1382_CLI_Debugger_dataAndWrapLength2() {
- val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section06/entities/charClassEntities.dfdl.xsd")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/edu/illinois/ncsa/daffodil/CLI/input/input2.txt")
+ val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input2.txt")
val (testSchemaFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(inputFile)) else (schemaFile, inputFile)
val shell = if (Util.isWindows) Util.start("", envp = DAFFODIL_JAVA_OPTS) else Util.start("")
@@ -825,8 +825,8 @@ class TestCLIdebugger {
}
@Test def test_1863_CLI_Debugger_groupIndex01() {
- val schemaFile = Util.daffodilPath("daffodil-cli/src/test/resources/edu/illinois/ncsa/daffodil/CLI/cli_schema_03.dfdl.xsd")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/edu/illinois/ncsa/daffodil/CLI/input/input9.txt")
+ val schemaFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/cli_schema_03.dfdl.xsd")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input9.txt")
val (testSchemaFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(inputFile)) else (schemaFile, inputFile)
val shell = if (Util.isWindows) Util.start("", envp = DAFFODIL_JAVA_OPTS) else Util.start("")
@@ -858,8 +858,8 @@ class TestCLIdebugger {
}
@Test def test_1029_CLI_Debugger_validation1() {
- val schemaFile = Util.daffodilPath("daffodil-cli/src/test/resources/edu/illinois/ncsa/daffodil/CLI/cli_schema_03.dfdl.xsd")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/edu/illinois/ncsa/daffodil/CLI/input/input9.txt")
+ val schemaFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/cli_schema_03.dfdl.xsd")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input9.txt")
val (testSchemaFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(inputFile)) else (schemaFile, inputFile)
val shell = if (Util.isWindows) Util.start("", envp = DAFFODIL_JAVA_OPTS) else Util.start("")
@@ -882,8 +882,8 @@ class TestCLIdebugger {
}
@Test def test_3258_CLI_Debugger_infodata() {
- val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section06/entities/charClassEntities.dfdl.xsd")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/edu/illinois/ncsa/daffodil/CLI/input/input2.txt")
+ val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input2.txt")
val (testSchemaFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(inputFile)) else (schemaFile, inputFile)
val shell = if (Util.isWindows) Util.start("", envp = DAFFODIL_JAVA_OPTS) else Util.start("")
@@ -914,8 +914,8 @@ class TestCLIdebugger {
}
@Test def test_3264_CLI_Debugger_undefined_command() {
- val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section06/entities/charClassEntities.dfdl.xsd")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/edu/illinois/ncsa/daffodil/CLI/input/input2.txt")
+ val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input2.txt")
val (testSchemaFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(inputFile)) else (schemaFile, inputFile)
val shell = if (Util.isWindows) Util.start("", envp = DAFFODIL_JAVA_OPTS) else Util.start("")
@@ -939,8 +939,8 @@ class TestCLIdebugger {
}
@Test def test_CLI_Debugger_delimiterStack() {
- val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section06/entities/charClassEntities.dfdl.xsd")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/edu/illinois/ncsa/daffodil/CLI/input/input2.txt")
+ val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input2.txt")
val (testSchemaFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(inputFile)) else (schemaFile, inputFile)
val shell = if (Util.isWindows) Util.start("", envp = DAFFODIL_JAVA_OPTS) else Util.start("")
@@ -978,8 +978,8 @@ class TestCLIdebugger {
}
@Test def test_CLI_Debugger_utf16_encoding() {
- val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section06/entities/utf16schema.dfdl.xsd")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/edu/illinois/ncsa/daffodil/CLI/input/hextest.txt")
+ val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/utf16schema.dfdl.xsd")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/hextest.txt")
val (testSchemaFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(inputFile)) else (schemaFile, inputFile)
val shell = if (Util.isWindows) Util.start("", envp = DAFFODIL_JAVA_OPTS) else Util.start("")
@@ -999,8 +999,8 @@ class TestCLIdebugger {
}
@Test def test_1337_CLI_Debugger_info_infoset() {
- val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section06/entities/charClassEntities.dfdl.xsd")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/edu/illinois/ncsa/daffodil/CLI/input/input1.txt")
+ val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input1.txt")
val (testSchemaFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(inputFile)) else (schemaFile, inputFile)
val shell = if (Util.isWindows) Util.start("", envp = DAFFODIL_JAVA_OPTS) else Util.start("")
@@ -1025,8 +1025,8 @@ class TestCLIdebugger {
/* See DFDL-1264
@Test def test_3585_CLI_Debugger_simpleDebugger_unparse() {
- val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section00/general/generalSchema.dfdl.xsd")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/edu/illinois/ncsa/daffodil/CLI/input/input12.txt")
+ val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section00/general/generalSchema.dfdl.xsd")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input12.txt")
val (testSchemaFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(inputFile)) else (schemaFile, inputFile)
val shell = if (Util.isWindows) Util.start("", envp = DAFFODIL_JAVA_OPTS) else Util.start("")
diff --git a/daffodil-cli/src/test/scala/org/apache/daffodil/executing/TestCLIexecuting.scala b/daffodil-cli/src/test/scala/org/apache/daffodil/executing/TestCLIexecuting.scala
index 0d5181e..f70876a 100644
--- a/daffodil-cli/src/test/scala/org/apache/daffodil/executing/TestCLIexecuting.scala
+++ b/daffodil-cli/src/test/scala/org/apache/daffodil/executing/TestCLIexecuting.scala
@@ -30,13 +30,13 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.executing
+package org.apache.daffodil.executing
import junit.framework.Assert._
import org.junit.Test
import scala.language.postfixOps
import scala.sys.process._
-import edu.illinois.ncsa.daffodil.CLI.Util
+import org.apache.daffodil.CLI.Util
import net.sf.expectit.matcher.Matchers.contains
import net.sf.expectit.matcher.Matchers.matches
import net.sf.expectit.ExpectIOException
@@ -50,7 +50,7 @@ class TestCLIexecuting {
val output16 = Util.getExpectedString("output16.txt", true)
@Test def test_995_CLI_Executing_Listing_negativeTest01() {
- val tdmlFile = Util.daffodilPath("daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section31/escape_characters/Escapes.tdml")
+ val tdmlFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section31/escape_characters/Escapes.tdml")
val testTdmlFile = if (Util.isWindows) Util.cmdConvert(tdmlFile) else tdmlFile
val shell = Util.start("")
@@ -66,7 +66,7 @@ class TestCLIexecuting {
}
@Test def test_1001_CLI_Executing_Listing_execRegex01() {
- val tdmlFile = Util.daffodilPath("daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section31/escape_characters/Escapes.tdml")
+ val tdmlFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section31/escape_characters/Escapes.tdml")
val testTdmlFile = if (Util.isWindows) Util.cmdConvert(tdmlFile) else tdmlFile
val shell = Util.start("")
@@ -82,7 +82,7 @@ class TestCLIexecuting {
}
@Test def test_1000_CLI_Executing_Listing_listRegex02() {
- val tdmlFile = Util.daffodilPath("daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section31/escape_characters/Escapes.tdml")
+ val tdmlFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section31/escape_characters/Escapes.tdml")
val testTdmlFile = if (Util.isWindows) Util.cmdConvert(tdmlFile) else tdmlFile
val shell = Util.start("", timeout = 5)
@@ -101,7 +101,7 @@ class TestCLIexecuting {
}
@Test def test_999_CLI_Executing_Listing_listRegex01() {
- val tdmlFile = Util.daffodilPath("daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section31/escape_characters/Escapes.tdml")
+ val tdmlFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section31/escape_characters/Escapes.tdml")
val testTdmlFile = if (Util.isWindows) Util.cmdConvert(tdmlFile) else tdmlFile
val shell = Util.start("")
@@ -123,7 +123,7 @@ class TestCLIexecuting {
// JIRA DFDL-1240
//
// @Test def test_994_CLI_Executing_Listing_execAll() {
- // val tdmlFile = Util.daffodilPath("daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section31/escape_characters/Escapes.tdml")
+ // val tdmlFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section31/escape_characters/Escapes.tdml")
// val testTdmlFile = if (Util.isWindows) Util.cmdConvert(tdmlFile) else tdmlFile
//
// val shell = Util.start("")
@@ -139,7 +139,7 @@ class TestCLIexecuting {
// }
@Test def test_993_CLI_Executing_Listing_listAll() {
- val tdmlFile = Util.daffodilPath("daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section06/entities/Entities.tdml")
+ val tdmlFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/Entities.tdml")
val testTdmlFile = if (Util.isWindows) Util.cmdConvert(tdmlFile) else tdmlFile
val shell = Util.start("")
@@ -161,7 +161,7 @@ class TestCLIexecuting {
}
@Test def test_992_CLI_Executing_Listing_singleTestList() {
- val tdmlFile = Util.daffodilPath("daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section06/entities/Entities.tdml")
+ val tdmlFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/Entities.tdml")
val testTdmlFile = if (Util.isWindows) Util.cmdConvert(tdmlFile) else tdmlFile
val shell = Util.start("")
@@ -177,7 +177,7 @@ class TestCLIexecuting {
}
@Test def test_990_CLI_Executing_Listing_singleTest() {
- val tdmlFile = Util.daffodilPath("daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section06/entities/Entities.tdml")
+ val tdmlFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/Entities.tdml")
val testTdmlFile = if (Util.isWindows) Util.cmdConvert(tdmlFile) else tdmlFile
val shell = Util.start("")
diff --git a/daffodil-cli/src/test/scala/org/apache/daffodil/listing/TestCLIListing.scala b/daffodil-cli/src/test/scala/org/apache/daffodil/listing/TestCLIListing.scala
index df583ed..db759c0 100644
--- a/daffodil-cli/src/test/scala/org/apache/daffodil/listing/TestCLIListing.scala
+++ b/daffodil-cli/src/test/scala/org/apache/daffodil/listing/TestCLIListing.scala
@@ -30,17 +30,17 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.listing
+package org.apache.daffodil.listing
import org.junit.Test
-import edu.illinois.ncsa.daffodil.CLI.Util
+import org.apache.daffodil.CLI.Util
import net.sf.expectit.matcher.Matchers.contains
import net.sf.expectit.matcher.Matchers.eof
class TestCLIlisting {
@Test def test_992_CLI_Executing_Listing_singleTestList() {
- val tdmlFile = Util.daffodilPath("daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section06/entities/Entities.tdml")
+ val tdmlFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/Entities.tdml")
val testTdmlFile = if (Util.isWindows) Util.cmdConvert(tdmlFile) else tdmlFile
val shell = Util.start("")
@@ -57,16 +57,16 @@ class TestCLIlisting {
/*
@Test def test_993_CLI_Executing_Listing_listAll() {
val shell = ex.spawn("/bin/bash")
- shell.send("/bin/grep -c 'parserTestCase>' daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section06/entities/Entities.tdml\n")
+ shell.send("/bin/grep -c 'parserTestCase>' daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/Entities.tdml\n")
val num = shell.getCurrentStandardOutContents()
- shell.send(Util.binPath + " test -l daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section06/entities/Entities.tdml | tee /dev/tty | wc -l\n")
+ shell.send(Util.binPath + " test -l daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/Entities.tdml | tee /dev/tty | wc -l\n")
shell.expect(num)
shell.send("exit\n")
shell.expectClose()
}
@Test def test_999_CLI_Executing_Listing_listRegex01() {
- val cmd = ""Util.binPath + " test -l --regex daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section31/escape_characters/Escapes.tdml "escape_entry4-\\d+"\n"""
+ val cmd = ""Util.binPath + " test -l --regex daffodil-test/src/test/resources/org/apache/daffodil/section31/escape_characters/Escapes.tdml "escape_entry4-\\d+"\n"""
val shell = Util.start(cmd)
shell.expect("escape_entry4-20")
shell.expect("escape_entry4-21")
@@ -75,7 +75,7 @@ class TestCLIlisting {
}
@Test def test_1000_CLI_Executing_Listing_listRegex02() {
- val cmd = Util.binPath + " test -l --regex daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section31/escape_characters/Escapes.tdml 'escape_entryb-\\d+'\n"
+ val cmd = Util.binPath + " test -l --regex daffodil-test/src/test/resources/org/apache/daffodil/section31/escape_characters/Escapes.tdml 'escape_entryb-\\d+'\n"
val shell = Util.start(cmd)
val output = shell.getCurrentStandardOutContents()
if (output != ""){
@@ -87,7 +87,7 @@ class TestCLIlisting {
*/
@Test def test_1016_CLI_Executing_Listing_listVerbose() {
- val tdmlFile = Util.daffodilPath("daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section07/assertions/assert.tdml")
+ val tdmlFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section07/assertions/assert.tdml")
val testTdmlFile = if (Util.isWindows) Util.cmdConvert(tdmlFile) else tdmlFile
val shell = Util.start("")
diff --git a/daffodil-cli/src/test/scala/org/apache/daffodil/parsing/TestCLIParsing.scala b/daffodil-cli/src/test/scala/org/apache/daffodil/parsing/TestCLIParsing.scala
index a975297..4a6d551 100644
--- a/daffodil-cli/src/test/scala/org/apache/daffodil/parsing/TestCLIParsing.scala
+++ b/daffodil-cli/src/test/scala/org/apache/daffodil/parsing/TestCLIParsing.scala
@@ -30,12 +30,12 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.parsing
+package org.apache.daffodil.parsing
import junit.framework.Assert._
import org.junit.Test
import java.io.File
-import edu.illinois.ncsa.daffodil.CLI.Util
+import org.apache.daffodil.CLI.Util
import net.sf.expectit.matcher.Matchers.contains
import net.sf.expectit.matcher.Matchers.eof
@@ -53,7 +53,7 @@ class TestCLIparsing {
@Test def test_3677_CLI_Parsing_elementFormDefault_qualified() {
- val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section00/general/elementFormDefaultQualified.dfdl.xsd")
+ val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section00/general/elementFormDefaultQualified.dfdl.xsd")
val (testSchemaFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile)) else (schemaFile)
val shell = Util.start("")
@@ -73,7 +73,7 @@ class TestCLIparsing {
@Test def test_3678_CLI_Parsing_elementFormDefault_unqualified() {
- val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section00/general/elementFormDefaultUnqualified.dfdl.xsd")
+ val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section00/general/elementFormDefaultUnqualified.dfdl.xsd")
val (testSchemaFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile)) else (schemaFile)
val shell = Util.start("")
@@ -93,8 +93,8 @@ class TestCLIparsing {
@Test def test_2358_CLI_Parsing_SimpleParse_stdOut_extVars() {
- val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section07/external_variables/external_variables.dfdl.xsd")
- val configFile = Util.daffodilPath("daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section07/external_variables/daffodil_config_cli_test.xml")
+ val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section07/external_variables/external_variables.dfdl.xsd")
+ val configFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section07/external_variables/daffodil_config_cli_test.xml")
val (testSchemaFile, testConfigFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(configFile)) else (schemaFile, configFile)
val shell = Util.start("")
@@ -115,8 +115,8 @@ class TestCLIparsing {
@Test def test_3507_CLI_Parsing_SimpleParse_SaveParser_extVars() {
- val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section07/external_variables/external_variables.dfdl.xsd")
- val configFile = Util.daffodilPath("daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section07/external_variables/daffodil_config_cli_test.xml")
+ val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section07/external_variables/external_variables.dfdl.xsd")
+ val configFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section07/external_variables/daffodil_config_cli_test.xml")
val (testSchemaFile, testConfigFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(configFile)) else (schemaFile, configFile)
val savedParser = "test_3507.xsd.bin"
@@ -151,8 +151,8 @@ class TestCLIparsing {
@Test def test_2360_CLI_Parsing_SimpleParse_stdOut_extVars2() {
- val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section07/external_variables/external_variables.dfdl.xsd")
- val configFile = Util.daffodilPath("daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section07/external_variables/daffodil_config_cli_test.xml")
+ val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section07/external_variables/external_variables.dfdl.xsd")
+ val configFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section07/external_variables/daffodil_config_cli_test.xml")
val (testSchemaFile, testConfigFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(configFile)) else (schemaFile, configFile)
val shell = Util.start("")
@@ -171,7 +171,7 @@ class TestCLIparsing {
@Test def test_3506_CLI_Parsing_SimpleParse_extVars2() {
- val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section07/external_variables/external_variables.dfdl.xsd")
+ val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section07/external_variables/external_variables.dfdl.xsd")
val testSchemaFile = if (Util.isWindows) Util.cmdConvert(schemaFile) else schemaFile
val savedParser = "test_3506.xsd.bin"
@@ -204,7 +204,7 @@ class TestCLIparsing {
}
@Test def test_3227_CLI_Parsing_SimpleParse_DFDL1197_fix() {
- val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section12/delimiter_properties/testOptionalInfix.dfdl.xsd")
+ val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section12/delimiter_properties/testOptionalInfix.dfdl.xsd")
val testSchemaFile = if (Util.isWindows) Util.cmdConvert(schemaFile) else schemaFile
val shell = Util.start("", true)
@@ -223,8 +223,8 @@ class TestCLIparsing {
@Test def test_1593_CLI_Parsing_MultifileSchema_noGlobalElem() {
val tmp_filename: String = (System.currentTimeMillis / 1000).toString()
val file = new File(tmp_filename)
- val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section06/entities/TopLevel.xsd")
- val inputFile = Util.daffodilPath("daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section06/entities/02nine_headers.txt")
+ val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/TopLevel.xsd")
+ val inputFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/02nine_headers.txt")
val (testSchemaFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(inputFile)) else (schemaFile, inputFile)
val shell = Util.start("")
@@ -247,7 +247,7 @@ class TestCLIparsing {
// See comment in DFDL-952
@Test def test_1585_CLI_Parsing_MultifileSchema_methodImportSameDir() {
- val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section06/namespaces/multi_base_14.dfdl.xsd")
+ val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_14.dfdl.xsd")
val testSchemaFile = if (Util.isWindows) Util.cmdConvert(schemaFile) else schemaFile
val shell = Util.start("")
@@ -263,7 +263,7 @@ class TestCLIparsing {
}
@Test def test_1586_CLI_Parsing_MultifileSchema_methodIncludeSameDir() {
- val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section06/namespaces/multi_base_15.dfdl.xsd")
+ val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_15.dfdl.xsd")
val testSchemaFile = if (Util.isWindows) Util.cmdConvert(schemaFile) else schemaFile
val shell = Util.start("")
@@ -280,7 +280,7 @@ class TestCLIparsing {
}
@Test def test_1587_CLI_Parsing_MultifileSchema_methodImportSameDir2() {
- val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section06/namespaces/multi_base_16.dfdl.xsd")
+ val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_16.dfdl.xsd")
val testSchemaFile = if (Util.isWindows) Util.cmdConvert(schemaFile) else schemaFile
val shell = Util.start("")
@@ -297,7 +297,7 @@ class TestCLIparsing {
}
@Test def test_1317_IBMCompatibility_ABC_test_ibm_abc_cli() {
- val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section06/namespaces/ABC_IBM.xsd")
+ val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/ABC_IBM.xsd")
val testSchemaFile = if (Util.isWindows) Util.cmdConvert(schemaFile) else schemaFile
val shell = Util.start("")
@@ -314,7 +314,7 @@ class TestCLIparsing {
}
@Test def test_977_CLI_Parsing_SimpleParse_stdOut() {
- val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section06/entities/charClassEntities.dfdl.xsd")
+ val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd")
val testSchemaFile = if (Util.isWindows) Util.cmdConvert(schemaFile) else schemaFile
val shell = Util.start("")
@@ -333,7 +333,7 @@ class TestCLIparsing {
@Test def test_978_CLI_Parsing_SimpleParse_outFile() {
val tmp_filename: String = (System.currentTimeMillis / 1000).toString()
val file = new File(tmp_filename)
- val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section06/entities/charClassEntities.dfdl.xsd")
+ val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd")
val testSchemaFile = if (Util.isWindows) Util.cmdConvert(schemaFile) else schemaFile
val shell = Util.start("")
@@ -356,8 +356,8 @@ class TestCLIparsing {
}
@Test def test_979_CLI_Parsing_SimpleParse_inFile() {
- val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section06/entities/charClassEntities.dfdl.xsd")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/edu/illinois/ncsa/daffodil/CLI/input/input1.txt")
+ val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input1.txt")
val (testSchemaFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(inputFile)) else (schemaFile, inputFile)
val shell = Util.start("")
@@ -374,8 +374,8 @@ class TestCLIparsing {
}
@Test def test_980_CLI_Parsing_SimpleParse_stOutDash() {
- val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section06/entities/charClassEntities.dfdl.xsd")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/edu/illinois/ncsa/daffodil/CLI/input/input1.txt")
+ val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input1.txt")
val (testSchemaFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(inputFile)) else (schemaFile, inputFile)
val shell = Util.start("")
@@ -392,7 +392,7 @@ class TestCLIparsing {
}
@Test def test_981_CLI_Parsing_SimpleParse_stdInDash() {
- val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section06/entities/charClassEntities.dfdl.xsd")
+ val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd")
val testSchemaFile = if (Util.isWindows) Util.cmdConvert(schemaFile) else schemaFile
val shell = Util.start("")
@@ -409,7 +409,7 @@ class TestCLIparsing {
}
@Test def test_983_CLI_Parsing_SimpleParse_verboseMode() {
- val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section06/entities/charClassEntities.dfdl.xsd")
+ val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd")
val testSchemaFile = if (Util.isWindows) Util.cmdConvert(schemaFile) else schemaFile
val shell = Util.start("", true)
@@ -449,7 +449,7 @@ class TestCLIparsing {
}
@Test def test_985_CLI_Parsing_SimpleParse_defaultRoot() {
- val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section06/entities/charClassEntities.dfdl.xsd")
+ val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd")
val testSchemaFile = if (Util.isWindows) Util.cmdConvert(schemaFile) else schemaFile
val shell = Util.start("")
@@ -466,7 +466,7 @@ class TestCLIparsing {
}
@Test def test_988_CLI_Parsing_SimpleParse_specifiedRoot() {
- val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section06/entities/charClassEntities.dfdl.xsd")
+ val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd")
val testSchemaFile = if (Util.isWindows) Util.cmdConvert(schemaFile) else schemaFile
val shell = Util.start("")
@@ -486,7 +486,7 @@ class TestCLIparsing {
}
// @Test def test_989_CLI_Parsing_negativeTest02() {
- // val cmd = "echo 12| " + Util.binPath + " parse -s daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section06/entities/charClassEntities.dfdl.xsd -n 'http://www.example.org/example1/'\n"
+ // val cmd = "echo 12| " + Util.binPath + " parse -s daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd -n 'http://www.example.org/example1/'\n"
// val shell = Util.start(cmd)
// shell.expect(contains("--root must be defined if --namespace is defined"))
//
@@ -496,7 +496,7 @@ class TestCLIparsing {
// }
@Test def test_996_CLI_Parsing_negativeTest04() {
- val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section06/entities/charClassEntities.dfdl.xsd")
+ val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd")
val testSchemaFile = if (Util.isWindows) Util.cmdConvert(schemaFile) else schemaFile
val shell = Util.start("", true)
@@ -513,8 +513,8 @@ class TestCLIparsing {
}
@Test def test_997_CLI_Parsing_multSchemas() {
- val schemaFile1 = Util.daffodilPath("daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section06/entities/charClassEntities.dfdl.xsd")
- val schemaFile2 = Util.daffodilPath("daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section07/defineFormat/defineFormat.dfdl.xsd")
+ val schemaFile1 = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd")
+ val schemaFile2 = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section07/defineFormat/defineFormat.dfdl.xsd")
val (testSchemaFile1, testSchemaFile2) = if (Util.isWindows) (Util.cmdConvert(schemaFile1), Util.cmdConvert(schemaFile2)) else (schemaFile1, schemaFile2)
val shell = Util.start("", true)
@@ -531,7 +531,7 @@ class TestCLIparsing {
}
@Test def test_3661_CLI_Parsing_badSchemaPath() {
- val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section06/entities/doesnotexist.dfdl.xsd")
+ val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/doesnotexist.dfdl.xsd")
val testSchemaFile = if (Util.isWindows) Util.cmdConvert(schemaFile) else schemaFile
val shell = Util.start("", true)
@@ -549,7 +549,7 @@ class TestCLIparsing {
}
@Test def test_1002_CLI_Parsing_negativeTest03() {
- val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section06/entities/charClassEntities.dfdl.xsd")
+ val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd")
val testSchemaFile = if (Util.isWindows) Util.cmdConvert(schemaFile) else schemaFile
val shell = Util.start("", true)
@@ -566,8 +566,8 @@ class TestCLIparsing {
}
@Test def test_1003_CLI_Parsing_SimpleParse_emptyNamespace() {
- val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section07/defineFormat/defineFormat.dfdl.xsd")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/edu/illinois/ncsa/daffodil/CLI/input/input7.txt")
+ val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section07/defineFormat/defineFormat.dfdl.xsd")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input7.txt")
val (testSchemaFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(inputFile)) else (schemaFile, inputFile)
val shell = Util.start("")
@@ -584,8 +584,8 @@ class TestCLIparsing {
}
@Test def test_1004_CLI_Parsing_SimpleParse_namespaceUsed() {
- val schemaFile = Util.daffodilPath("daffodil-cli/src/test/resources/edu/illinois/ncsa/daffodil/CLI/charClassEntities.dfdl.xsd")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/edu/illinois/ncsa/daffodil/CLI/input/input8.txt")
+ val schemaFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/charClassEntities.dfdl.xsd")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input8.txt")
val (testSchemaFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(inputFile)) else (schemaFile, inputFile)
val shell = Util.start("")
@@ -602,8 +602,8 @@ class TestCLIparsing {
}
@Test def test_2615_CLI_Parsing_SimpleParse_namespaceUsedLongOpt() {
- val schemaFile = Util.daffodilPath("daffodil-cli/src/test/resources/edu/illinois/ncsa/daffodil/CLI/charClassEntities.dfdl.xsd")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/edu/illinois/ncsa/daffodil/CLI/input/input8.txt")
+ val schemaFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/charClassEntities.dfdl.xsd")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input8.txt")
val (testSchemaFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(inputFile)) else (schemaFile, inputFile)
val shell = Util.start("")
@@ -620,7 +620,7 @@ class TestCLIparsing {
}
@Test def test_1005_CLI_Parsing_SimpleParse_rootPath() {
- val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section06/entities/charClassEntities.dfdl.xsd")
+ val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd")
val testSchemaFile = if (Util.isWindows) Util.cmdConvert(schemaFile) else schemaFile
val shell = Util.startNoConvert("")
@@ -643,8 +643,8 @@ class TestCLIparsing {
}
@Test def test_1015_CLI_Parsing_SimpleParse_defaultRootMultSchema() {
- val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section07/defineFormat/defineFormat.dfdl.xsd")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/edu/illinois/ncsa/daffodil/CLI/input/input7.txt")
+ val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section07/defineFormat/defineFormat.dfdl.xsd")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input7.txt")
val (testSchemaFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(inputFile)) else (schemaFile, inputFile)
val shell = Util.start("")
@@ -661,7 +661,7 @@ class TestCLIparsing {
}
@Test def test_XXX_CLI_Parsing_SimpleSchema_basicTest_validationOn() {
- val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section06/entities/charClassEntities.dfdl.xsd")
+ val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd")
val testSchemaFile = if (Util.isWindows) Util.cmdConvert(schemaFile) else schemaFile
val shell = Util.start("")
@@ -678,7 +678,7 @@ class TestCLIparsing {
}
@Test def test_XXX_CLI_Parsing_SimpleSchema_basicTest_validation() {
- val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section06/entities/charClassEntities.dfdl.xsd")
+ val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd")
val testSchemaFile = if (Util.isWindows) Util.cmdConvert(schemaFile) else schemaFile
val shell = Util.start("")
@@ -695,7 +695,7 @@ class TestCLIparsing {
}
@Test def test_XXX_CLI_Parsing_SimpleSchema_basicTest_validationLimited() {
- val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section06/entities/charClassEntities.dfdl.xsd")
+ val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd")
val testSchemaFile = if (Util.isWindows) Util.cmdConvert(schemaFile) else schemaFile
val shell = Util.start("")
@@ -712,7 +712,7 @@ class TestCLIparsing {
}
@Test def test_XXX_CLI_Parsing_SimpleSchema_basicTest_validationOff() {
- val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section06/entities/charClassEntities.dfdl.xsd")
+ val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd")
val testSchemaFile = if (Util.isWindows) Util.cmdConvert(schemaFile) else schemaFile
val shell = Util.start("")
@@ -729,7 +729,7 @@ class TestCLIparsing {
}
@Test def test_XXX_CLI_Parsing_SimpleSchema_basicTest_validationFooBar() {
- val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section06/entities/charClassEntities.dfdl.xsd")
+ val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd")
val testSchemaFile = if (Util.isWindows) Util.cmdConvert(schemaFile) else schemaFile
val shell = Util.start("", true)
@@ -748,7 +748,7 @@ class TestCLIparsing {
/*
//On hold until I implement a way to set the classpath before executing
@Test def test_1313_CLI_Parsing_assertionFailure() {
- val cmd = "echo unacceptable| " + Util.binPath + " parse -s daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section06/namespaces/multi_B_08.dfdl.xsd -s daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section06/namespaces/multi_C_08.dfdl.xsd --root bElem2\n"
+ val cmd = "echo unacceptable| " + Util.binPath + " parse -s daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_B_08.dfdl.xsd -s daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_C_08.dfdl.xsd --root bElem2\n"
val shell = Util.start(cmd)
shell.expect(contains("Parse Error: Assertion failed. Assertion failed for dfdl:checkConstraints(.)"))
@@ -759,7 +759,7 @@ class TestCLIparsing {
*/
@Test def test_1319_CLI_Parsing_invalidElementSDE() {
- val schemaFile = Util.daffodilPath("daffodil-cli/src/test/resources/edu/illinois/ncsa/daffodil/CLI/ABC_IBM_invalid.xsd")
+ val schemaFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/ABC_IBM_invalid.xsd")
val testSchemaFile = if (Util.isWindows) Util.cmdConvert(schemaFile) else schemaFile
val shell = Util.start("", true)
@@ -775,8 +775,8 @@ class TestCLIparsing {
}
@Test def test_1346_CLI_Parsing_SimpleParse_defaultRootMultSchemaMultiple() {
- val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section07/defineFormat/defineFormat.dfdl.xsd")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/edu/illinois/ncsa/daffodil/CLI/input/input7.txt")
+ val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section07/defineFormat/defineFormat.dfdl.xsd")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input7.txt")
val (testSchemaFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(inputFile)) else (schemaFile, inputFile)
val cmd = String.format("%s parse -s %s %s", Util.binPath, testSchemaFile, testInputFile)
@@ -811,7 +811,7 @@ class TestCLIparsing {
}
@Test def test_1971_CLI_Parsing_traceMode01() {
- val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section06/namespaces/multi_base_15.dfdl.xsd")
+ val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_15.dfdl.xsd")
val testSchemaFile = if (Util.isWindows) Util.cmdConvert(schemaFile) else schemaFile
val shell = Util.start("")
@@ -827,7 +827,7 @@ class TestCLIparsing {
}
@Test def test_1973_CLI_Parsing_traceMode03() {
- val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section06/entities/charClassEntities.dfdl.xsd")
+ val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd")
val testSchemaFile = if (Util.isWindows) Util.cmdConvert(schemaFile) else schemaFile
val shell = Util.startIncludeErrors("")
@@ -844,7 +844,7 @@ class TestCLIparsing {
}
@Test def test_1941_CLI_Parsing_SimpleParse_leftOverData() {
- val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section06/entities/charClassEntities.dfdl.xsd")
+ val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd")
val testSchemaFile = if (Util.isWindows) Util.cmdConvert(schemaFile) else schemaFile
val shell = Util.start("", true)
@@ -860,8 +860,8 @@ class TestCLIparsing {
}
@Test def test_DFDL_714() {
- val schemaFile = Util.daffodilPath("daffodil-cli/src/test/resources/edu/illinois/ncsa/daffodil/CLI/global_element.dfdl.xsd")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/edu/illinois/ncsa/daffodil/CLI/input/test_DFDL-714.txt")
+ val schemaFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/global_element.dfdl.xsd")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/test_DFDL-714.txt")
val (testSchemaFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(inputFile)) else (schemaFile, inputFile)
val shell = Util.start("")
@@ -881,8 +881,8 @@ class TestCLIparsing {
}
@Test def test_DFDL_1203_schema_from_jar() {
- val schemaFile = Util.daffodilPath("daffodil-cli/src/test/resources/edu/illinois/ncsa/daffodil/CLI/global_element.dfdl.xsd")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/edu/illinois/ncsa/daffodil/CLI/input/test_DFDL-714.txt")
+ val schemaFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/global_element.dfdl.xsd")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/test_DFDL-714.txt")
val (testSchemaFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(inputFile)) else (schemaFile, inputFile)
val shell = Util.start("", envp = Map("DAFFODIL_CLASSPATH" -> Util.daffodilPath("daffodil-cli/target/scala-2.10/*")))
@@ -902,7 +902,7 @@ class TestCLIparsing {
}
@Test def test_3606_CLI_Parsing_SimpleParse_largeInfoset() {
- val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section06/entities/charClassEntities.dfdl.xsd")
+ val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd")
val testSchemaFile = if (Util.isWindows) Util.cmdConvert(schemaFile) else schemaFile
val shell = Util.start("")
diff --git a/daffodil-cli/src/test/scala/org/apache/daffodil/performance/TestCLIPerformance.scala b/daffodil-cli/src/test/scala/org/apache/daffodil/performance/TestCLIPerformance.scala
index 9156a86..4fdc55c 100644
--- a/daffodil-cli/src/test/scala/org/apache/daffodil/performance/TestCLIPerformance.scala
+++ b/daffodil-cli/src/test/scala/org/apache/daffodil/performance/TestCLIPerformance.scala
@@ -30,22 +30,22 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.performance
+package org.apache.daffodil.performance
import junit.framework.Assert._
import org.junit.Test
-import edu.illinois.ncsa.daffodil.CLI.Util
+import org.apache.daffodil.CLI.Util
import net.sf.expectit.ExpectIOException
import net.sf.expectit.matcher.Matchers.contains
import net.sf.expectit.matcher.Matchers.eof
import net.sf.expectit.matcher.Matchers.anyString
-import edu.illinois.ncsa.daffodil.tdml.Runner
+import org.apache.daffodil.tdml.Runner
class TestCLIPerformance {
@Test def test_3393_CLI_Performance_2_Threads_2_Times() {
- val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section06/entities/charClassEntities.dfdl.xsd")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/edu/illinois/ncsa/daffodil/CLI/input/input1.txt")
+ val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input1.txt")
val (testSchemaFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(inputFile)) else (schemaFile, inputFile)
val shell = Util.startIncludeErrors("")
@@ -83,8 +83,8 @@ class TestCLIPerformance {
}
@Test def test_3394_CLI_Performance_3_Threads_20_Times() {
- val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section06/entities/charClassEntities.dfdl.xsd")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/edu/illinois/ncsa/daffodil/CLI/input/input1.txt")
+ val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input1.txt")
val (testSchemaFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(inputFile)) else (schemaFile, inputFile)
val shell = Util.startIncludeErrors("")
@@ -126,8 +126,8 @@ class TestCLIPerformance {
@Test def test_3395_CLI_Performance_5_Threads_50_Times_tdml() { runner.runOneTest("test_3395_CLI_Performance_5_Threads_50_Times") }
@Test def test_3395_CLI_Performance_5_Threads_50_Times() {
- val schemaFile = Util.daffodilPath("daffodil-cli/src/test/resources/edu/illinois/ncsa/daffodil/CLI/cli_schema.dfdl.xsd")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/edu/illinois/ncsa/daffodil/CLI/input/input5.txt")
+ val schemaFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/cli_schema.dfdl.xsd")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input5.txt")
val (testSchemaFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(inputFile)) else (schemaFile, inputFile)
val shell = Util.startIncludeErrors("")
@@ -166,8 +166,8 @@ class TestCLIPerformance {
}
@Test def test_3396_CLI_Performance_2_Threads_2_Times_Negative() {
- val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section06/entities/charClassEntities.dfdl.xsd")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/edu/illinois/ncsa/daffodil/CLI/input/input5.txt")
+ val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input5.txt")
val (testSchemaFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(inputFile)) else (schemaFile, inputFile)
val shell = Util.startIncludeErrors("")
@@ -198,8 +198,8 @@ class TestCLIPerformance {
}
@Test def test_3641_CLI_Performance_Unparse_2_Threads_2_Times() {
- val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section00/general/generalSchema.dfdl.xsd")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/edu/illinois/ncsa/daffodil/CLI/input/input14.txt")
+ val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section00/general/generalSchema.dfdl.xsd")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input14.txt")
val (testSchemaFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(inputFile)) else (schemaFile, inputFile)
val shell = Util.startIncludeErrors("")
@@ -237,8 +237,8 @@ class TestCLIPerformance {
}
@Test def test_3643_CLI_Performance_Unparse_3_Threads_20_Times() {
- val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section00/general/generalSchema.dfdl.xsd")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/edu/illinois/ncsa/daffodil/CLI/input/input14.txt")
+ val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section00/general/generalSchema.dfdl.xsd")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input14.txt")
val (testSchemaFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(inputFile)) else (schemaFile, inputFile)
val shell = Util.startIncludeErrors("")
@@ -276,8 +276,8 @@ class TestCLIPerformance {
}
@Test def test_3644_CLI_Performance_Unparse_5_Threads_50_Times() {
- val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section00/general/generalSchema.dfdl.xsd")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/edu/illinois/ncsa/daffodil/CLI/input/input14.txt")
+ val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section00/general/generalSchema.dfdl.xsd")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input14.txt")
val (testSchemaFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(inputFile)) else (schemaFile, inputFile)
val shell = Util.startIncludeErrors("")
@@ -315,8 +315,8 @@ class TestCLIPerformance {
}
@Test def test_3642_CLI_Performance_Unparse_2_Threads_2_Times_Negative() {
- val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section00/general/generalSchema.dfdl.xsd")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/edu/illinois/ncsa/daffodil/CLI/input/input16.txt")
+ val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section00/general/generalSchema.dfdl.xsd")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input16.txt")
val (testSchemaFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(inputFile)) else (schemaFile, inputFile)
val shell = Util.startIncludeErrors("")
diff --git a/daffodil-cli/src/test/scala/org/apache/daffodil/saving/TestCLISaveParser.scala b/daffodil-cli/src/test/scala/org/apache/daffodil/saving/TestCLISaveParser.scala
index 6dabd0e..c86e571 100644
--- a/daffodil-cli/src/test/scala/org/apache/daffodil/saving/TestCLISaveParser.scala
+++ b/daffodil-cli/src/test/scala/org/apache/daffodil/saving/TestCLISaveParser.scala
@@ -30,14 +30,14 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.saving
+package org.apache.daffodil.saving
import junit.framework.Assert._
import org.junit.Test
import org.junit.Before
import org.junit.After
import scala.sys.process._
-import edu.illinois.ncsa.daffodil.CLI.Util
+import org.apache.daffodil.CLI.Util
import java.io.File
import net.sf.expectit.matcher.Matchers.contains
import net.sf.expectit.matcher.Matchers.eof
@@ -60,7 +60,7 @@ class TestCLISaveParser {
}
@Test def test_3017_CLI_Saving_SaveParser_simple() {
- val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section06/entities/charClassEntities.dfdl.xsd")
+ val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd")
val testSchemaFile = if (Util.isWindows) Util.cmdConvert(schemaFile) else schemaFile
val shell = Util.start("")
@@ -82,7 +82,7 @@ class TestCLISaveParser {
val shell = Util.startIncludeErrors("")
val savedParser = "external_variables.dfdl.xsd.bin"
val parserFile = new File(savedParser)
- val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section07/external_variables/external_variables.dfdl.xsd")
+ val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section07/external_variables/external_variables.dfdl.xsd")
val saveCmd = String.format("%s -v save-parser -s %s > %s\n",
Util.binPath,
(if (Util.isWindows) Util.cmdConvert(schemaFile) else schemaFile),
@@ -109,8 +109,8 @@ class TestCLISaveParser {
@Test def test_3019_CLI_Saving_SaveParser_withConfig() {
- val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section07/external_variables/external_variables.dfdl.xsd")
- val configFile = Util.daffodilPath("daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section07/external_variables/daffodil_config_cli_test.xml")
+ val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section07/external_variables/external_variables.dfdl.xsd")
+ val configFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section07/external_variables/daffodil_config_cli_test.xml")
val (testSchemaFile, testConfigFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(configFile)) else (schemaFile, configFile)
val shell = Util.start("")
@@ -130,8 +130,8 @@ class TestCLISaveParser {
@Test def test_3020_CLI_Saving_SaveParser_namespaceUsed() {
- val schemaFile = Util.daffodilPath("daffodil-cli/src/test/resources/edu/illinois/ncsa/daffodil/CLI/charClassEntities.dfdl.xsd")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/edu/illinois/ncsa/daffodil/CLI/input/input8.txt")
+ val schemaFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/charClassEntities.dfdl.xsd")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input8.txt")
val (testSchemaFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(inputFile)) else (schemaFile, inputFile)
val shell = Util.start("")
@@ -152,7 +152,7 @@ class TestCLISaveParser {
@Test def test_3021_CLI_Saving_SaveParser_path() {
- val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section06/entities/charClassEntities.dfdl.xsd")
+ val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd")
val testSchemaFile = if (Util.isWindows) Util.cmdConvert(schemaFile) else schemaFile
val shell = Util.start("")
@@ -171,8 +171,8 @@ class TestCLISaveParser {
@Test def test_3022_CLI_Saving_SaveParser_MultSchema() {
- val schemaFile1 = Util.daffodilPath("daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section07/defineFormat/defineFormat.dfdl.xsd")
- val schemaFile2 = Util.daffodilPath("daffodil-cli/src/test/resources/edu/illinois/ncsa/daffodil/CLI/charClassEntities.dfdl.xsd")
+ val schemaFile1 = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section07/defineFormat/defineFormat.dfdl.xsd")
+ val schemaFile2 = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/charClassEntities.dfdl.xsd")
val (testSchemaFile1, testSchemaFile2) = if (Util.isWindows) (Util.cmdConvert(schemaFile1), Util.cmdConvert(schemaFile2)) else (schemaFile1, schemaFile2)
val shell = Util.start("", true)
@@ -191,7 +191,7 @@ class TestCLISaveParser {
@Test def test_3023_CLI_Saving_SaveParser_verboseMode() {
- val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section06/entities/charClassEntities.dfdl.xsd")
+ val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd")
val testSchemaFile = if (Util.isWindows) Util.cmdConvert(schemaFile) else schemaFile
val shell = Util.start("", true)
@@ -218,7 +218,7 @@ class TestCLISaveParser {
// See DFDL-1016
/*@Test def test_3038_CLI_Saving_SaveParser_namespaceNoRoot() {
- val cmd = Util.binPath + " save-parser -s daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section06/entities/charClassEntities.dfdl.xsd -r {http://www.example.org/example1/} savedParser.xml\n"
+ val cmd = Util.binPath + " save-parser -s daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd -r {http://www.example.org/example1/} savedParser.xml\n"
val shell = Util.start(cmd, true)
// Error message needs to be updated with actual message
@@ -231,7 +231,7 @@ class TestCLISaveParser {
@Test def test_3039_CLI_Saving_SaveParser_emptyNamespace() {
- val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section06/entities/charClassEntities.dfdl.xsd")
+ val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd")
val testSchemaFile = if (Util.isWindows) Util.cmdConvert(schemaFile) else schemaFile
val shell = Util.startNoConvert("")
@@ -252,8 +252,8 @@ class TestCLISaveParser {
@Test def test_DFDL_1205_CLI_FullValidation_SavedParser_Incompatible() {
- val schemaFile = Util.daffodilPath("daffodil-cli/src/test/resources/edu/illinois/ncsa/daffodil/CLI/charClassEntities.dfdl.xsd")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/edu/illinois/ncsa/daffodil/CLI/input/input8.txt")
+ val schemaFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/charClassEntities.dfdl.xsd")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input8.txt")
val (testSchemaFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(inputFile)) else (schemaFile, inputFile)
val shell = Util.start("", true)
@@ -281,7 +281,7 @@ class TestCLISaveParser {
@Test def test_3508_CLI_Saving_SaveParser_extVars() {
- val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section07/external_variables/external_variables.dfdl.xsd")
+ val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section07/external_variables/external_variables.dfdl.xsd")
val testSchemaFile = if (Util.isWindows) (Util.cmdConvert(schemaFile)) else (schemaFile)
val savedParser = "test_3508.xsd.bin"
@@ -313,7 +313,7 @@ class TestCLISaveParser {
// See DFDL-1147
/*@Test def test_3063_CLI_Saving_SaveParser_validate() {
- val cmd = Util.binPath + " save-parser --validate on -s daffodil-cli/src/test/resources/edu/illinois/ncsa/daffodil/CLI/cli_schema.dfdl.xsd -r validation_check savedParser.xml\n"
+ val cmd = Util.binPath + " save-parser --validate on -s daffodil-cli/src/test/resources/org/apache/daffodil/CLI/cli_schema.dfdl.xsd -r validation_check savedParser.xml\n"
shell.send(cmd)
var cmd2 = "echo -ne 'test'| " + Util.binPath + " parse --parser savedParser.xml \n"
@@ -321,7 +321,7 @@ class TestCLISaveParser {
shell.expect(contains("[warning] Validation Error: validation_check: cvc-pattern-valid"))
shell.expect(contains("[warning] Validation Error: validation_check failed"))
- cmd = Util.binPath + " save-parser --validate -s daffodil-cli/src/test/resources/edu/illinois/ncsa/daffodil/CLI/cli_schema.dfdl.xsd -r validation_check savedParser.xml\n"
+ cmd = Util.binPath + " save-parser --validate -s daffodil-cli/src/test/resources/org/apache/daffodil/CLI/cli_schema.dfdl.xsd -r validation_check savedParser.xml\n"
shell.send(cmd)
cmd2 = "echo -ne 'test'| " + Util.binPath + " parse --parser savedParser.xml \n"
@@ -329,14 +329,14 @@ class TestCLISaveParser {
shell.expect(contains("[warning] Validation Error: validation_check: cvc-pattern-valid"))
shell.expect(contains("[warning] Validation Error: validation_check failed"))
- cmd = Util.binPath + " save-parser --validate limited -s daffodil-cli/src/test/resources/edu/illinois/ncsa/daffodil/CLI/cli_schema.dfdl.xsd -r validation_check savedParser.xml\n"
+ cmd = Util.binPath + " save-parser --validate limited -s daffodil-cli/src/test/resources/org/apache/daffodil/CLI/cli_schema.dfdl.xsd -r validation_check savedParser.xml\n"
shell.send(cmd)
cmd2 = "echo -ne 'test'| " + Util.binPath + " parse --parser savedParser.xml \n"
shell.send(cmd2)
shell.expect(contains("[warning] Validation Error: validation_check failed"))
- cmd = Util.binPath + " save-parser --validate off -s daffodil-cli/src/test/resources/edu/illinois/ncsa/daffodil/CLI/cli_schema.dfdl.xsd -r validation_check savedParser.xml\n"
+ cmd = Util.binPath + " save-parser --validate off -s daffodil-cli/src/test/resources/org/apache/daffodil/CLI/cli_schema.dfdl.xsd -r validation_check savedParser.xml\n"
shell.send(cmd)
cmd2 = "echo -ne 'test'| " + Util.binPath + " parse --parser savedParser.xml \n"
@@ -350,10 +350,10 @@ class TestCLISaveParser {
// See DFDL-1141
/*@Test def test_3036_CLI_Saving_SaveParser_debug() {
- val cmd = Util.binPath + " -d save-parser -s daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section06/entities/charClassEntities.dfdl.xsd -r matrix savedParser.xml\n"
+ val cmd = Util.binPath + " -d save-parser -s daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd -r matrix savedParser.xml\n"
val shell = Util.start(cmd)
- val cmd2 = Util.binPath + " parse --parser savedParser.xml daffodil-cli/src/test/resources/edu/illinois/ncsa/daffodil/CLI/input/input1.txt\n"
+ val cmd2 = Util.binPath + " parse --parser savedParser.xml daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input1.txt\n"
shell.send(cmd2)
shell.expect(contains("(debug)"))
shell.send("continue\n")
@@ -366,7 +366,7 @@ class TestCLISaveParser {
@Test def test_3037_CLI_Saving_SaveParser_trace() {
- val cmd = Util.binPath + " -t save-parser -s daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section06/namespaces/multi_base_15.dfdl.xsd savedParser.xml\n"
+ val cmd = Util.binPath + " -t save-parser -s daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_15.dfdl.xsd savedParser.xml\n"
val shell = Util.start(cmd)
val cmd2 = "echo test| " + Util.binPath + " parse --parser savedParser.xml\n"
@@ -380,8 +380,8 @@ class TestCLISaveParser {
/* // See DFDL-1342
@Test def test_3572_CLI_Saving_SaveParser_unparse() {
- val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section06/entities/charClassEntities.dfdl.xsd")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/edu/illinois/ncsa/daffodil/CLI/output/output1.txt")
+ val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/output/output1.txt")
val (testSchemaFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(inputFile)) else (schemaFile, inputFile)
val shell = Util.start("")
@@ -401,8 +401,8 @@ class TestCLISaveParser {
@Test def test_3573_CLI_Saving_SaveParser_unparse2() {
- val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section00/general/generalSchema.dfdl.xsd")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/edu/illinois/ncsa/daffodil/CLI/input/input12.txt")
+ val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section00/general/generalSchema.dfdl.xsd")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input12.txt")
val (testSchemaFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(inputFile)) else (schemaFile, inputFile)
val shell = Util.start("")
@@ -423,8 +423,8 @@ class TestCLISaveParser {
}
@Test def test_3941_CLI_Saving_SaveParser_tunables() {
- val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section00/general/generalSchema.dfdl.xsd")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/edu/illinois/ncsa/daffodil/CLI/input/input12.txt")
+ val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section00/general/generalSchema.dfdl.xsd")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input12.txt")
val (testSchemaFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(inputFile)) else (schemaFile, inputFile)
val shell = Util.start("", true)
diff --git a/daffodil-cli/src/test/scala/org/apache/daffodil/tunables/TestCLITunables.scala b/daffodil-cli/src/test/scala/org/apache/daffodil/tunables/TestCLITunables.scala
index 78a9080..a7e26e1 100644
--- a/daffodil-cli/src/test/scala/org/apache/daffodil/tunables/TestCLITunables.scala
+++ b/daffodil-cli/src/test/scala/org/apache/daffodil/tunables/TestCLITunables.scala
@@ -30,10 +30,10 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.tunables
+package org.apache.daffodil.tunables
import org.junit.Test
-import edu.illinois.ncsa.daffodil.CLI.Util
+import org.apache.daffodil.CLI.Util
import net.sf.expectit.matcher.Matchers.contains
import net.sf.expectit.matcher.Matchers.eof
@@ -45,7 +45,7 @@ class TestCLITunables {
val unqualifiedPathStep04 = Util.getExpectedString("unqualified_path_step_04.txt")
@Test def test_CLI_Parsing_unqualifiedPathStepPolicy_noNamespace_test_01() {
- val schemaFile = Util.daffodilPath("daffodil-cli/src/test/resources/edu/illinois/ncsa/daffodil/CLI/unqualified_path_step.dfdl.xsd")
+ val schemaFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/unqualified_path_step.dfdl.xsd")
val testSchemaFile = if (Util.isWindows) Util.cmdConvert(schemaFile) else schemaFile
val shell = Util.start("")
@@ -61,7 +61,7 @@ class TestCLITunables {
}
@Test def test_CLI_Parsing_unqualifiedPathStepPolicy_noNamespace_test_02() {
- val schemaFile = Util.daffodilPath("daffodil-cli/src/test/resources/edu/illinois/ncsa/daffodil/CLI/unqualified_path_step.dfdl.xsd")
+ val schemaFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/unqualified_path_step.dfdl.xsd")
val testSchemaFile = if (Util.isWindows) Util.cmdConvert(schemaFile) else schemaFile
val shell = Util.start("", true)
@@ -78,7 +78,7 @@ class TestCLITunables {
}
@Test def test_CLI_Parsing_unqualifiedPathStepPolicy_noNamespace_test_03() {
- val schemaFile = Util.daffodilPath("daffodil-cli/src/test/resources/edu/illinois/ncsa/daffodil/CLI/unqualified_path_step.dfdl.xsd")
+ val schemaFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/unqualified_path_step.dfdl.xsd")
val testSchemaFile = if (Util.isWindows) Util.cmdConvert(schemaFile) else schemaFile
val shell = Util.start("", true)
@@ -95,7 +95,7 @@ class TestCLITunables {
}
@Test def test_CLI_Parsing_unqualifiedPathStepPolicy_noNamespace_test_04() {
- val schemaFile = Util.daffodilPath("daffodil-cli/src/test/resources/edu/illinois/ncsa/daffodil/CLI/unqualified_path_step.dfdl.xsd")
+ val schemaFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/unqualified_path_step.dfdl.xsd")
val testSchemaFile = if (Util.isWindows) Util.cmdConvert(schemaFile) else schemaFile
val shell = Util.start("")
@@ -113,7 +113,7 @@ class TestCLITunables {
@Test def test_CLI_Parsing_unqualifiedPathStepPolicy_defaultNamespace_test_01() {
- val schemaFile = Util.daffodilPath("daffodil-cli/src/test/resources/edu/illinois/ncsa/daffodil/CLI/unqualified_path_step.dfdl.xsd")
+ val schemaFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/unqualified_path_step.dfdl.xsd")
val testSchemaFile = if (Util.isWindows) Util.cmdConvert(schemaFile) else schemaFile
val shell = Util.start("")
@@ -129,7 +129,7 @@ class TestCLITunables {
}
@Test def test_CLI_Parsing_unqualifiedPathStepPolicy_defaultNamespace_test_02() {
- val schemaFile = Util.daffodilPath("daffodil-cli/src/test/resources/edu/illinois/ncsa/daffodil/CLI/unqualified_path_step.dfdl.xsd")
+ val schemaFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/unqualified_path_step.dfdl.xsd")
val testSchemaFile = if (Util.isWindows) Util.cmdConvert(schemaFile) else schemaFile
val shell = Util.start("")
@@ -145,7 +145,7 @@ class TestCLITunables {
}
@Test def test_CLI_Parsing_unqualifiedPathStepPolicy_defaultNamespace_test_03() {
- val schemaFile = Util.daffodilPath("daffodil-cli/src/test/resources/edu/illinois/ncsa/daffodil/CLI/unqualified_path_step.dfdl.xsd")
+ val schemaFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/unqualified_path_step.dfdl.xsd")
val testSchemaFile = if (Util.isWindows) Util.cmdConvert(schemaFile) else schemaFile
val shell = Util.start("", true)
@@ -162,7 +162,7 @@ class TestCLITunables {
}
@Test def test_CLI_Parsing_unqualifiedPathStepPolicy_defaultNamespace_test_04() {
- val schemaFile = Util.daffodilPath("daffodil-cli/src/test/resources/edu/illinois/ncsa/daffodil/CLI/unqualified_path_step.dfdl.xsd")
+ val schemaFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/unqualified_path_step.dfdl.xsd")
val testSchemaFile = if (Util.isWindows) Util.cmdConvert(schemaFile) else schemaFile
val shell = Util.start("", true)
@@ -181,7 +181,7 @@ class TestCLITunables {
@Test def test_CLI_Parsing_unqualifiedPathStepPolicy_preferDefaultNamespace_test_01() {
- val schemaFile = Util.daffodilPath("daffodil-cli/src/test/resources/edu/illinois/ncsa/daffodil/CLI/unqualified_path_step.dfdl.xsd")
+ val schemaFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/unqualified_path_step.dfdl.xsd")
val testSchemaFile = if (Util.isWindows) Util.cmdConvert(schemaFile) else schemaFile
val shell = Util.start("")
@@ -197,7 +197,7 @@ class TestCLITunables {
}
@Test def test_CLI_Parsing_unqualifiedPathStepPolicy_preferDefaultNamespace_test_02() {
- val schemaFile = Util.daffodilPath("daffodil-cli/src/test/resources/edu/illinois/ncsa/daffodil/CLI/unqualified_path_step.dfdl.xsd")
+ val schemaFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/unqualified_path_step.dfdl.xsd")
val testSchemaFile = if (Util.isWindows) Util.cmdConvert(schemaFile) else schemaFile
val shell = Util.start("")
@@ -213,7 +213,7 @@ class TestCLITunables {
}
@Test def test_CLI_Parsing_unqualifiedPathStepPolicy_preferDefaultNamespace_test_03() {
- val schemaFile = Util.daffodilPath("daffodil-cli/src/test/resources/edu/illinois/ncsa/daffodil/CLI/unqualified_path_step.dfdl.xsd")
+ val schemaFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/unqualified_path_step.dfdl.xsd")
val testSchemaFile = if (Util.isWindows) Util.cmdConvert(schemaFile) else schemaFile
val shell = Util.start("", true)
@@ -230,7 +230,7 @@ class TestCLITunables {
}
@Test def test_CLI_Parsing_unqualifiedPathStepPolicy_preferDefaultNamespace_test_04() {
- val schemaFile = Util.daffodilPath("daffodil-cli/src/test/resources/edu/illinois/ncsa/daffodil/CLI/unqualified_path_step.dfdl.xsd")
+ val schemaFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/unqualified_path_step.dfdl.xsd")
val testSchemaFile = if (Util.isWindows) Util.cmdConvert(schemaFile) else schemaFile
val shell = Util.start("")
diff --git a/daffodil-cli/src/test/scala/org/apache/daffodil/tunables/TestCLITunables2.scala b/daffodil-cli/src/test/scala/org/apache/daffodil/tunables/TestCLITunables2.scala
index d1ab6c8..d853cd7 100644
--- a/daffodil-cli/src/test/scala/org/apache/daffodil/tunables/TestCLITunables2.scala
+++ b/daffodil-cli/src/test/scala/org/apache/daffodil/tunables/TestCLITunables2.scala
@@ -30,10 +30,10 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.tunables
+package org.apache.daffodil.tunables
import org.junit.Test
-import edu.illinois.ncsa.daffodil.CLI.Util
+import org.apache.daffodil.CLI.Util
import net.sf.expectit.matcher.Matchers.contains
import net.sf.expectit.matcher.Matchers.eof
@@ -43,7 +43,7 @@ class TestCLITunables2 {
* Suppresses SDW messages.
*/
@Test def test_CLI_Parsing_SuppressSDEWarnings1() {
- val schemaFile = Util.daffodilPath("daffodil-cli/src/test/resources/edu/illinois/ncsa/daffodil/CLI/suppressWarnTest.dfdl.xsd")
+ val schemaFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/suppressWarnTest.dfdl.xsd")
val testSchemaFile = if (Util.isWindows) Util.cmdConvert(schemaFile) else schemaFile
val shell = Util.start("")
@@ -67,7 +67,7 @@ class TestCLITunables2 {
* Will display SDW warnings. Does not set the tunable that suppresses them.
*/
@Test def test_CLI_Parsing_SuppressSDEWarnings2() {
- val schemaFile = Util.daffodilPath("daffodil-cli/src/test/resources/edu/illinois/ncsa/daffodil/CLI/suppressWarnTest.dfdl.xsd")
+ val schemaFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/suppressWarnTest.dfdl.xsd")
val testSchemaFile = if (Util.isWindows) Util.cmdConvert(schemaFile) else schemaFile
val shell = Util.start("")
diff --git a/daffodil-cli/src/test/scala/org/apache/daffodil/unparsing/TestCLIUnparsing.scala b/daffodil-cli/src/test/scala/org/apache/daffodil/unparsing/TestCLIUnparsing.scala
index 63d427a..390b026 100644
--- a/daffodil-cli/src/test/scala/org/apache/daffodil/unparsing/TestCLIUnparsing.scala
+++ b/daffodil-cli/src/test/scala/org/apache/daffodil/unparsing/TestCLIUnparsing.scala
@@ -30,12 +30,12 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.unparsing
+package org.apache.daffodil.unparsing
import junit.framework.Assert._
import org.junit.Test
import java.io.File
-import edu.illinois.ncsa.daffodil.CLI.Util
+import org.apache.daffodil.CLI.Util
import net.sf.expectit.matcher.Matchers.contains
import net.sf.expectit.matcher.Matchers.eof
@@ -43,8 +43,8 @@ class TestCLIunparsing {
@Test def test_3525_CLI_Unparsing_SimpleUnparse_inFile() {
- val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section00/general/generalSchema.dfdl.xsd")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/edu/illinois/ncsa/daffodil/CLI/input/input12.txt")
+ val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section00/general/generalSchema.dfdl.xsd")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input12.txt")
val (testSchemaFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(inputFile)) else (schemaFile, inputFile)
val shell = Util.start("")
@@ -64,8 +64,8 @@ class TestCLIunparsing {
@Test def test_3526_CLI_Unparsing_SimpleUnparse_inFile2() {
- val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section00/general/generalSchema.dfdl.xsd")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/edu/illinois/ncsa/daffodil/CLI/input/input13.txt")
+ val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section00/general/generalSchema.dfdl.xsd")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input13.txt")
val (testSchemaFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(inputFile)) else (schemaFile, inputFile)
val shell = Util.start("")
@@ -85,8 +85,8 @@ class TestCLIunparsing {
@Test def test_3527_CLI_Unparsing_SimpleUnparse_stdin() {
- val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section00/general/generalSchema.dfdl.xsd")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/edu/illinois/ncsa/daffodil/CLI/input/input14.txt")
+ val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section00/general/generalSchema.dfdl.xsd")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input14.txt")
val (testSchemaFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(inputFile)) else (schemaFile, inputFile)
val shell = Util.start("")
@@ -106,7 +106,7 @@ class TestCLIunparsing {
@Test def test_3528_CLI_Unparsing_SimpleUnparse_stdin2() {
- val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section00/general/generalSchema.dfdl.xsd")
+ val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section00/general/generalSchema.dfdl.xsd")
val (testSchemaFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile)) else (schemaFile)
val shell = Util.start("")
@@ -126,7 +126,7 @@ class TestCLIunparsing {
@Test def test_3529_CLI_Unparsing_SimpleUnparse_stdin3() {
- val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section00/general/generalSchema.dfdl.xsd")
+ val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section00/general/generalSchema.dfdl.xsd")
val (testSchemaFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile)) else (schemaFile)
val shell = Util.start("")
@@ -146,7 +146,7 @@ class TestCLIunparsing {
@Test def test_3584_CLI_Unparsing_SimpleUnparse_stdin4() {
- val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section06/entities/charClassEntities.dfdl.xsd")
+ val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd")
val (testSchemaFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile)) else (schemaFile)
val shell = Util.start("")
@@ -168,9 +168,9 @@ class TestCLIunparsing {
@Test def test_3574_CLI_Unparsing_SimpleUnparse_extVars() {
- val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section07/external_variables/external_variables.dfdl.xsd")
- val configFile = Util.daffodilPath("daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section07/external_variables/daffodil_config_cli_test.xml")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/edu/illinois/ncsa/daffodil/CLI/input/input15.txt")
+ val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section07/external_variables/external_variables.dfdl.xsd")
+ val configFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section07/external_variables/daffodil_config_cli_test.xml")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input15.txt")
val (testSchemaFile, testConfigFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(configFile), Util.cmdConvert(inputFile)) else (schemaFile, configFile, inputFile)
val shell = Util.start("")
@@ -190,9 +190,9 @@ class TestCLIunparsing {
@Test def test_3575_CLI_Unparsing_SimpleUnparse_extVars2() {
- val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section07/external_variables/external_variables.dfdl.xsd")
- val configFile = Util.daffodilPath("daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section07/external_variables/daffodil_config_cli_test.xml")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/edu/illinois/ncsa/daffodil/CLI/input/input16.txt")
+ val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section07/external_variables/external_variables.dfdl.xsd")
+ val configFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section07/external_variables/daffodil_config_cli_test.xml")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input16.txt")
val (testSchemaFile, testConfigFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(configFile), Util.cmdConvert(inputFile)) else (schemaFile, configFile, inputFile)
val shell = Util.start("")
@@ -213,8 +213,8 @@ class TestCLIunparsing {
@Test def test_3582_CLI_Unparsing_SimpleUnparse_outFile() {
val tmp_filename: String = (System.currentTimeMillis / 1000).toString()
val file = new File(tmp_filename)
- val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section00/general/generalSchema.dfdl.xsd")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/edu/illinois/ncsa/daffodil/CLI/input/input13.txt")
+ val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section00/general/generalSchema.dfdl.xsd")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input13.txt")
val (testSchemaFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(inputFile)) else (schemaFile, inputFile)
val shell = Util.start("")
@@ -237,8 +237,8 @@ class TestCLIunparsing {
}
@Test def test_3581_CLI_Unparsing_SimpleUnparse_stOutDash() {
- val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section00/general/generalSchema.dfdl.xsd")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/edu/illinois/ncsa/daffodil/CLI/input/input13.txt")
+ val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section00/general/generalSchema.dfdl.xsd")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input13.txt")
val (testSchemaFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(inputFile)) else (schemaFile, inputFile)
val shell = Util.start("")
@@ -256,7 +256,7 @@ class TestCLIunparsing {
}
@Test def test_3580_CLI_Unparsing_SimpleUnparse_verboseMode() {
- val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section00/general/generalSchema.dfdl.xsd")
+ val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section00/general/generalSchema.dfdl.xsd")
val (testSchemaFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile)) else (schemaFile)
val shell = Util.start("", true)
@@ -297,7 +297,7 @@ class TestCLIunparsing {
@Test def test_3578_CLI_Unparsing_SimpleUnparse_defaultRoot() {
- val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section00/general/generalSchema.dfdl.xsd")
+ val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section00/general/generalSchema.dfdl.xsd")
val (testSchemaFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile)) else (schemaFile)
val shell = Util.start("")
@@ -316,7 +316,7 @@ class TestCLIunparsing {
}
@Test def test_3583_CLI_Unparsing_SimpleUnparse_rootPath() {
- val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section06/entities/charClassEntities.dfdl.xsd")
+ val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd")
val testSchemaFile = if (Util.isWindows) Util.cmdConvert(schemaFile) else schemaFile
val shell = Util.start("")
@@ -337,7 +337,7 @@ class TestCLIunparsing {
// See DFDL-1346
@Test def test_3576_CLI_Unparsing_validate() {
- val schemaFile = Util.daffodilPath("daffodil-cli/src/test/resources/edu/illinois/ncsa/daffodil/CLI/cli_schema.dfdl.xsd")
+ val schemaFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/cli_schema.dfdl.xsd")
val testSchemaFile = if (Util.isWindows) Util.cmdConvert(schemaFile) else schemaFile
val shell = Util.start("", true)
@@ -369,7 +369,7 @@ class TestCLIunparsing {
*/
@Test def test_3577_CLI_Unparsing_traceMode() {
- val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section06/namespaces/multi_base_15.dfdl.xsd")
+ val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_15.dfdl.xsd")
val testSchemaFile = if (Util.isWindows) Util.cmdConvert(schemaFile) else schemaFile
val shell = Util.start("")
@@ -387,7 +387,7 @@ class TestCLIunparsing {
}
@Test def test_3662_CLI_Unparsing_badSchemaPath() {
- val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section06/entities/doesnotexist.dfdl.xsd")
+ val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/doesnotexist.dfdl.xsd")
val testSchemaFile = if (Util.isWindows) Util.cmdConvert(schemaFile) else schemaFile
val shell = Util.start("", true)
@@ -406,8 +406,8 @@ class TestCLIunparsing {
@Test def test_xxxx_CLI_Unparsing_SimpleUnparse_w3cdom() {
- val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section00/general/generalSchema.dfdl.xsd")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/edu/illinois/ncsa/daffodil/CLI/input/input18.txt")
+ val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section00/general/generalSchema.dfdl.xsd")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input18.txt")
val (testSchemaFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(inputFile)) else (schemaFile, inputFile)
val shell = Util.start("")
diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/compiler/Compiler.scala b/daffodil-core/src/main/scala/org/apache/daffodil/compiler/Compiler.scala
index 708e6e3..4145d82 100644
--- a/daffodil-core/src/main/scala/org/apache/daffodil/compiler/Compiler.scala
+++ b/daffodil-core/src/main/scala/org/apache/daffodil/compiler/Compiler.scala
@@ -30,45 +30,45 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.compiler
+package org.apache.daffodil.compiler
import java.io.File
import java.io.FileInputStream
import java.io.ObjectInputStream
import java.nio.channels.Channels
import scala.xml.Node
-import edu.illinois.ncsa.daffodil.ExecutionMode
-import edu.illinois.ncsa.daffodil.api.DFDL
-import edu.illinois.ncsa.daffodil.dsom.SchemaSet
-import edu.illinois.ncsa.daffodil.oolag.OOLAG
-import edu.illinois.ncsa.daffodil.exceptions.Assert
-import edu.illinois.ncsa.daffodil.processors.DataProcessor
-import edu.illinois.ncsa.daffodil.util.LogLevel
-import edu.illinois.ncsa.daffodil.util.Logging
-import edu.illinois.ncsa.daffodil.xml._
-import edu.illinois.ncsa.daffodil.api.DFDL
-import edu.illinois.ncsa.daffodil.api.DaffodilSchemaSource
-import edu.illinois.ncsa.daffodil.api.UnitTestSchemaSource
-import edu.illinois.ncsa.daffodil.externalvars.Binding
+import org.apache.daffodil.ExecutionMode
+import org.apache.daffodil.api.DFDL
+import org.apache.daffodil.dsom.SchemaSet
+import org.apache.daffodil.oolag.OOLAG
+import org.apache.daffodil.exceptions.Assert
+import org.apache.daffodil.processors.DataProcessor
+import org.apache.daffodil.util.LogLevel
+import org.apache.daffodil.util.Logging
+import org.apache.daffodil.xml._
+import org.apache.daffodil.api.DFDL
+import org.apache.daffodil.api.DaffodilSchemaSource
+import org.apache.daffodil.api.UnitTestSchemaSource
+import org.apache.daffodil.externalvars.Binding
import scala.collection.mutable.Queue
-import edu.illinois.ncsa.daffodil.externalvars.ExternalVariablesLoader
-import edu.illinois.ncsa.daffodil.processors.SchemaSetRuntimeData
-import edu.illinois.ncsa.daffodil.util.CheckJavaVersion
-import edu.illinois.ncsa.daffodil.api.ValidationMode
-import edu.illinois.ncsa.daffodil.processors.VariableMap
+import org.apache.daffodil.externalvars.ExternalVariablesLoader
+import org.apache.daffodil.processors.SchemaSetRuntimeData
+import org.apache.daffodil.util.CheckJavaVersion
+import org.apache.daffodil.api.ValidationMode
+import org.apache.daffodil.processors.VariableMap
import java.util.zip.GZIPInputStream
import java.util.zip.ZipException
import java.io.StreamCorruptedException
-import edu.illinois.ncsa.daffodil.dsom.ElementBase
-import edu.illinois.ncsa.daffodil.api.URISchemaSource
-import edu.illinois.ncsa.daffodil.processors.SerializableDataProcessor
-import edu.illinois.ncsa.daffodil.processors.Processor
-import edu.illinois.ncsa.daffodil.processors.parsers.NotParsableParser
-import edu.illinois.ncsa.daffodil.processors.unparsers.NotUnparsableUnparser
-import edu.illinois.ncsa.daffodil.schema.annotation.props.gen.ParseUnparsePolicy
-import edu.illinois.ncsa.daffodil.dsom.SchemaComponent
-import edu.illinois.ncsa.daffodil.dsom.SchemaComponentImpl
-import edu.illinois.ncsa.daffodil.api.DaffodilTunables
+import org.apache.daffodil.dsom.ElementBase
+import org.apache.daffodil.api.URISchemaSource
+import org.apache.daffodil.processors.SerializableDataProcessor
+import org.apache.daffodil.processors.Processor
+import org.apache.daffodil.processors.parsers.NotParsableParser
+import org.apache.daffodil.processors.unparsers.NotUnparsableUnparser
+import org.apache.daffodil.schema.annotation.props.gen.ParseUnparsePolicy
+import org.apache.daffodil.dsom.SchemaComponent
+import org.apache.daffodil.dsom.SchemaComponentImpl
+import org.apache.daffodil.api.DaffodilTunables
/**
* Some grammar rules need to be conditional based on whether we're trying
diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/compiler/RootSpec.scala b/daffodil-core/src/main/scala/org/apache/daffodil/compiler/RootSpec.scala
index 377398d..14fae00 100644
--- a/daffodil-core/src/main/scala/org/apache/daffodil/compiler/RootSpec.scala
+++ b/daffodil-core/src/main/scala/org/apache/daffodil/compiler/RootSpec.scala
@@ -30,9 +30,9 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.compiler
+package org.apache.daffodil.compiler
-import edu.illinois.ncsa.daffodil.xml.NS
+import org.apache.daffodil.xml.NS
/**
* Contains a specification of the root element to be used.
diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/configuration/ConfigurationLoader.scala b/daffodil-core/src/main/scala/org/apache/daffodil/configuration/ConfigurationLoader.scala
index ff470b8..0bf3d49 100644
--- a/daffodil-core/src/main/scala/org/apache/daffodil/configuration/ConfigurationLoader.scala
+++ b/daffodil-core/src/main/scala/org/apache/daffodil/configuration/ConfigurationLoader.scala
@@ -30,14 +30,14 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.configuration
+package org.apache.daffodil.configuration
import java.io.File
import java.net.URI
import scala.xml.Node
-import edu.illinois.ncsa.daffodil.exceptions.Assert
-import edu.illinois.ncsa.daffodil.xml.DaffodilXMLLoader
-import edu.illinois.ncsa.daffodil.api.URISchemaSource
+import org.apache.daffodil.exceptions.Assert
+import org.apache.daffodil.xml.DaffodilXMLLoader
+import org.apache.daffodil.api.URISchemaSource
/**
* TODO: This is all overkill. ConfigurationLoader doesn't need its own validator,
diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/dpath/DFDLExpressionParser.scala b/daffodil-core/src/main/scala/org/apache/daffodil/dpath/DFDLExpressionParser.scala
index 241340d..5595b6c 100644
--- a/daffodil-core/src/main/scala/org/apache/daffodil/dpath/DFDLExpressionParser.scala
+++ b/daffodil-core/src/main/scala/org/apache/daffodil/dpath/DFDLExpressionParser.scala
@@ -30,16 +30,16 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.dpath
+package org.apache.daffodil.dpath
-import edu.illinois.ncsa.daffodil.exceptions._
-import edu.illinois.ncsa.daffodil.dsom._
+import org.apache.daffodil.exceptions._
+import org.apache.daffodil.dsom._
import scala.xml.NamespaceBinding
-import edu.illinois.ncsa.daffodil.xml._
+import org.apache.daffodil.xml._
import scala.util.parsing.input.CharSequenceReader
import scala.util.parsing.combinator.RegexParsers
import java.math.{ BigDecimal => JBigDecimal, BigInteger => JBigInt }
-import edu.illinois.ncsa.daffodil.oolag.OOLAG._
+import org.apache.daffodil.oolag.OOLAG._
/**
* Parses DPath expressions. Most real analysis is done later. This is
diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/dpath/Expression.scala b/daffodil-core/src/main/scala/org/apache/daffodil/dpath/Expression.scala
index 2d0cb6b..019b3b3 100644
--- a/daffodil-core/src/main/scala/org/apache/daffodil/dpath/Expression.scala
+++ b/daffodil-core/src/main/scala/org/apache/daffodil/dpath/Expression.scala
@@ -30,20 +30,20 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.dpath
+package org.apache.daffodil.dpath
-import edu.illinois.ncsa.daffodil.oolag.OOLAG._
-import edu.illinois.ncsa.daffodil.exceptions._
-import edu.illinois.ncsa.daffodil.dsom._
+import org.apache.daffodil.oolag.OOLAG._
+import org.apache.daffodil.exceptions._
+import org.apache.daffodil.dsom._
import scala.xml.NamespaceBinding
-import edu.illinois.ncsa.daffodil.xml._
-import edu.illinois.ncsa.daffodil.processors._
-import edu.illinois.ncsa.daffodil.xml.RefQName
+import org.apache.daffodil.xml._
+import org.apache.daffodil.processors._
+import org.apache.daffodil.xml.RefQName
import scala.util.{ Success, Failure }
-import edu.illinois.ncsa.daffodil.dsom.RelativePathPastRootError
-import edu.illinois.ncsa.daffodil.equality._
+import org.apache.daffodil.dsom.RelativePathPastRootError
+import org.apache.daffodil.equality._
import java.math.{ BigDecimal => JBigDecimal, BigInteger => JBigInt }
-import edu.illinois.ncsa.daffodil.util.Numbers
+import org.apache.daffodil.util.Numbers
/**
* Root class of the type hierarchy for the AST nodes used when we
@@ -1303,13 +1303,22 @@ case class FunctionCallExpression(functionQNameString: String, expressions: List
val FUNC = XMLUtils.XPATH_FUNCTION_NAMESPACE
val MATH = XMLUtils.XPATH_MATH_NAMESPACE
val XSD = XMLUtils.XSD_NAMESPACE
- val DAF = XMLUtils.EXT_NS
+ val DAF_NCSA = XMLUtils.EXT_NS_NCSA
+ val DAF_APACHE = XMLUtils.EXT_NS_APACHE
val funcObj = (functionQName, expressions) match {
- case (RefQName(_, "trace", DAF), args) =>
+ case (RefQName(_, "trace", DAF_NCSA), args) =>
DAFTraceExpr(functionQNameString, functionQName, args)
- case (RefQName(_, "error", DAF), args) => {
+ case (RefQName(_, "trace", DAF_APACHE), args) =>
+ DAFTraceExpr(functionQNameString, functionQName, args)
+
+ case (RefQName(_, "error", DAF_NCSA), args) => {
+ SDW("Expression daf:error is deprecated. Use fn:error instead")
+ DAFErrorExpr(functionQNameString, functionQName, args)
+ }
+
+ case (RefQName(_, "error", DAF_APACHE), args) => {
SDW("Expression daf:error is deprecated. Use fn:error instead")
DAFErrorExpr(functionQNameString, functionQName, args)
}
diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/dpath/NodeInfoUtils.scala b/daffodil-core/src/main/scala/org/apache/daffodil/dpath/NodeInfoUtils.scala
index d134317..2316718 100644
--- a/daffodil-core/src/main/scala/org/apache/daffodil/dpath/NodeInfoUtils.scala
+++ b/daffodil-core/src/main/scala/org/apache/daffodil/dpath/NodeInfoUtils.scala
@@ -30,9 +30,9 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.dpath
+package org.apache.daffodil.dpath
-import edu.illinois.ncsa.daffodil.exceptions.Assert
+import org.apache.daffodil.exceptions.Assert
import NodeInfo._
diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/AnnotatedSchemaComponent.scala b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/AnnotatedSchemaComponent.scala
index af3787c..a63850d 100644
--- a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/AnnotatedSchemaComponent.scala
+++ b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/AnnotatedSchemaComponent.scala
@@ -30,18 +30,18 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.dsom
+package org.apache.daffodil.dsom
import scala.xml.Node
-import edu.illinois.ncsa.daffodil.exceptions.Assert
-import edu.illinois.ncsa.daffodil.ExecutionMode
-import edu.illinois.ncsa.daffodil.xml.XMLUtils
-import edu.illinois.ncsa.daffodil.xml.NS
-import edu.illinois.ncsa.daffodil.equality._
-import edu.illinois.ncsa.daffodil.schema.annotation.props.PropertyLookupResult
-import edu.illinois.ncsa.daffodil.schema.annotation.props.NotFound
-import edu.illinois.ncsa.daffodil.schema.annotation.props.Found
-import edu.illinois.ncsa.daffodil.schema.annotation.props.FindPropertyMixin
+import org.apache.daffodil.exceptions.Assert
+import org.apache.daffodil.ExecutionMode
+import org.apache.daffodil.xml.XMLUtils
+import org.apache.daffodil.xml.NS
+import org.apache.daffodil.equality._
+import org.apache.daffodil.schema.annotation.props.PropertyLookupResult
+import org.apache.daffodil.schema.annotation.props.NotFound
+import org.apache.daffodil.schema.annotation.props.Found
+import org.apache.daffodil.schema.annotation.props.FindPropertyMixin
/**
* Only objects from which we generate processors (parsers/unparsers)
diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/ChoOrd.scala b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/ChoOrd.scala
index 3ca3d36..6f12185 100644
--- a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/ChoOrd.scala
+++ b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/ChoOrd.scala
@@ -30,9 +30,9 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.dsom
+package org.apache.daffodil.dsom
-import edu.illinois.ncsa.daffodil.exceptions.Assert
+import org.apache.daffodil.exceptions.Assert
/**
* ChoOrd = Choice or Ordered
diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/ChoiceGroup.scala b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/ChoiceGroup.scala
index 271146b..857f5b4 100644
--- a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/ChoiceGroup.scala
+++ b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/ChoiceGroup.scala
@@ -30,22 +30,22 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.dsom
+package org.apache.daffodil.dsom
import scala.xml.Node
import scala.xml._
-import edu.illinois.ncsa.daffodil.schema.annotation.props.gen.Choice_AnnotationMixin
-import edu.illinois.ncsa.daffodil.grammar.ChoiceGrammarMixin
-import edu.illinois.ncsa.daffodil.processors.RuntimeData
-import edu.illinois.ncsa.daffodil.processors.ChoiceRuntimeData
-import edu.illinois.ncsa.daffodil.infoset.ChoiceBranchEvent
-import edu.illinois.ncsa.daffodil.infoset.ChoiceBranchStartEvent
-import edu.illinois.ncsa.daffodil.infoset.ChoiceBranchEndEvent
-import edu.illinois.ncsa.daffodil.exceptions.Assert
-import edu.illinois.ncsa.daffodil.dpath.NodeInfo
-import edu.illinois.ncsa.daffodil.processors.ChoiceDispatchKeyEv
-import edu.illinois.ncsa.daffodil.schema.annotation.props.gen.YesNo
-import edu.illinois.ncsa.daffodil.api.WarnID
+import org.apache.daffodil.schema.annotation.props.gen.Choice_AnnotationMixin
+import org.apache.daffodil.grammar.ChoiceGrammarMixin
+import org.apache.daffodil.processors.RuntimeData
+import org.apache.daffodil.processors.ChoiceRuntimeData
+import org.apache.daffodil.infoset.ChoiceBranchEvent
+import org.apache.daffodil.infoset.ChoiceBranchStartEvent
+import org.apache.daffodil.infoset.ChoiceBranchEndEvent
+import org.apache.daffodil.exceptions.Assert
+import org.apache.daffodil.dpath.NodeInfo
+import org.apache.daffodil.processors.ChoiceDispatchKeyEv
+import org.apache.daffodil.schema.annotation.props.gen.YesNo
+import org.apache.daffodil.api.WarnID
/**
*
diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/CompiledExpression.scala b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/CompiledExpression.scala
index 084a4e3..0b821de 100644
--- a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/CompiledExpression.scala
+++ b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/CompiledExpression.scala
@@ -30,14 +30,14 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.dsom
+package org.apache.daffodil.dsom
-import edu.illinois.ncsa.daffodil.dpath._
+import org.apache.daffodil.dpath._
import scala.xml.NamespaceBinding
-import edu.illinois.ncsa.daffodil.xml.NamedQName
+import org.apache.daffodil.xml.NamedQName
import java.lang.{ Long => JLong, Boolean => JBoolean }
-import edu.illinois.ncsa.daffodil.schema.annotation.props.Found
-import edu.illinois.ncsa.daffodil.oolag.OOLAG._
+import org.apache.daffodil.schema.annotation.props.Found
+import org.apache.daffodil.oolag.OOLAG._
object ExpressionCompilers extends ExpressionCompilerClass {
override val String = new ExpressionCompiler[String]
diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/ComplexTypes.scala b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/ComplexTypes.scala
index e69dd42..ca8dcbe 100644
--- a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/ComplexTypes.scala
+++ b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/ComplexTypes.scala
@@ -30,12 +30,12 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.dsom
+package org.apache.daffodil.dsom
import scala.xml.Node
-import edu.illinois.ncsa.daffodil.grammar.ComplexTypeBaseGrammarMixin
-import edu.illinois.ncsa.daffodil.dpath.NodeInfo
-import edu.illinois.ncsa.daffodil.xml.QName
+import org.apache.daffodil.grammar.ComplexTypeBaseGrammarMixin
+import org.apache.daffodil.dpath.NodeInfo
+import org.apache.daffodil.xml.QName
abstract class ComplexTypeBase(xmlArg: Node, parentArg: SchemaComponent)
extends SchemaComponentImpl(xmlArg, parentArg)
diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/DFDLAnnotation.scala b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/DFDLAnnotation.scala
index bc5be2c..b1c4a40 100644
--- a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/DFDLAnnotation.scala
+++ b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/DFDLAnnotation.scala
@@ -30,12 +30,12 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.dsom
+package org.apache.daffodil.dsom
import scala.xml.Node
-import edu.illinois.ncsa.daffodil.util.Misc
-import edu.illinois.ncsa.daffodil.schema.annotation.props.PropertyLookupResult
-import edu.illinois.ncsa.daffodil.schema.annotation.props.FindPropertyMixin
+import org.apache.daffodil.util.Misc
+import org.apache.daffodil.schema.annotation.props.PropertyLookupResult
+import org.apache.daffodil.schema.annotation.props.FindPropertyMixin
/**
* Base class for any DFDL annotation
diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/DFDLAssertion.scala b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/DFDLAssertion.scala
index 4348e90..4e24a50 100644
--- a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/DFDLAssertion.scala
+++ b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/DFDLAssertion.scala
@@ -30,19 +30,19 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.dsom
+package org.apache.daffodil.dsom
import scala.xml.Node
import scala.xml.NodeSeq.seqToNodeSeq
-import edu.illinois.ncsa.daffodil.exceptions._
-import edu.illinois.ncsa.daffodil.schema.annotation.props.gen.TestKind
+import org.apache.daffodil.exceptions._
+import org.apache.daffodil.schema.annotation.props.gen.TestKind
import com.ibm.icu.impl.UnicodeRegex
import java.util.regex.PatternSyntaxException
import java.util.regex.Pattern
-import edu.illinois.ncsa.daffodil.grammar.primitives.DiscriminatorPatternPrim
-import edu.illinois.ncsa.daffodil.grammar.primitives.DiscriminatorBooleanPrim
-import edu.illinois.ncsa.daffodil.grammar.primitives.AssertPatternPrim
-import edu.illinois.ncsa.daffodil.grammar.primitives.AssertBooleanPrim
+import org.apache.daffodil.grammar.primitives.DiscriminatorPatternPrim
+import org.apache.daffodil.grammar.primitives.DiscriminatorBooleanPrim
+import org.apache.daffodil.grammar.primitives.AssertPatternPrim
+import org.apache.daffodil.grammar.primitives.AssertBooleanPrim
abstract class DFDLAssertionBase(node: Node, decl: AnnotatedSchemaComponent)
extends DFDLStatement(node, decl) {
diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/DFDLDefineFormat.scala b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/DFDLDefineFormat.scala
index 10485c9..c34917f 100644
--- a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/DFDLDefineFormat.scala
+++ b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/DFDLDefineFormat.scala
@@ -30,11 +30,11 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.dsom
+package org.apache.daffodil.dsom
import scala.xml.Node
import scala.xml.Utility
-import edu.illinois.ncsa.daffodil.xml.XMLUtils
+import org.apache.daffodil.xml.XMLUtils
final class DFDLDefineFormat(node: Node, sd: SchemaDocument)
extends DFDLDefiningAnnotation(node, sd) // Note: DefineFormat is not a format annotation
diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/DFDLDefineVariable.scala b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/DFDLDefineVariable.scala
index b77af57..1c95b99 100644
--- a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/DFDLDefineVariable.scala
+++ b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/DFDLDefineVariable.scala
@@ -30,22 +30,22 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.dsom
+package org.apache.daffodil.dsom
import scala.xml.Node
import scala.xml.NodeSeq.seqToNodeSeq
-import edu.illinois.ncsa.daffodil.grammar.EmptyGram
-import edu.illinois.ncsa.daffodil.grammar.Gram
-import edu.illinois.ncsa.daffodil.processors._
-import edu.illinois.ncsa.daffodil.xml.XMLUtils
-import edu.illinois.ncsa.daffodil.xml.GlobalQName
-import edu.illinois.ncsa.daffodil.xml.QName
-import edu.illinois.ncsa.daffodil.dpath.NodeInfo.PrimType
-import edu.illinois.ncsa.daffodil.util.Maybe
-import edu.illinois.ncsa.daffodil.grammar.primitives.SetVariable
-import edu.illinois.ncsa.daffodil.grammar.primitives.NewVariableInstanceStart
-import edu.illinois.ncsa.daffodil.grammar.primitives.NewVariableInstanceEnd
-import edu.illinois.ncsa.daffodil.schema.annotation.props.Found
+import org.apache.daffodil.grammar.EmptyGram
+import org.apache.daffodil.grammar.Gram
+import org.apache.daffodil.processors._
+import org.apache.daffodil.xml.XMLUtils
+import org.apache.daffodil.xml.GlobalQName
+import org.apache.daffodil.xml.QName
+import org.apache.daffodil.dpath.NodeInfo.PrimType
+import org.apache.daffodil.util.Maybe
+import org.apache.daffodil.grammar.primitives.SetVariable
+import org.apache.daffodil.grammar.primitives.NewVariableInstanceStart
+import org.apache.daffodil.grammar.primitives.NewVariableInstanceEnd
+import org.apache.daffodil.schema.annotation.props.Found
class DFDLDefineVariable(node: Node, doc: SchemaDocument)
extends DFDLDefiningAnnotation(node, doc) {
diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/DFDLDefiningAnnotation.scala b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/DFDLDefiningAnnotation.scala
index d14360a..de5384e 100644
--- a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/DFDLDefiningAnnotation.scala
+++ b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/DFDLDefiningAnnotation.scala
@@ -30,7 +30,7 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.dsom
+package org.apache.daffodil.dsom
import scala.xml.Node
diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/DFDLEscapeScheme.scala b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/DFDLEscapeScheme.scala
index 846b8c8..46f44ce 100644
--- a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/DFDLEscapeScheme.scala
+++ b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/DFDLEscapeScheme.scala
@@ -30,26 +30,26 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.dsom
+package org.apache.daffodil.dsom
import scala.xml.Node
import scala.xml.Utility
-import edu.illinois.ncsa.daffodil.ExecutionMode
-import edu.illinois.ncsa.daffodil.schema.annotation.props.gen.EscapeScheme_AnnotationMixin
-import edu.illinois.ncsa.daffodil.dpath._
-import edu.illinois.ncsa.daffodil.schema.annotation.props.gen.EscapeKind
-import edu.illinois.ncsa.daffodil.processors.EscapeSchemeParseEv
-import edu.illinois.ncsa.daffodil.processors.EscapeSchemeBlockParseEv
-import edu.illinois.ncsa.daffodil.processors.EscapeSchemeCharParseEv
-import edu.illinois.ncsa.daffodil.processors.EscapeSchemeUnparseEv
-import edu.illinois.ncsa.daffodil.processors.EscapeSchemeBlockUnparseEv
-import edu.illinois.ncsa.daffodil.processors.EscapeSchemeCharUnparseEv
-import edu.illinois.ncsa.daffodil.processors.EscapeCharEv
-import edu.illinois.ncsa.daffodil.processors.EscapeEscapeCharEv
-import edu.illinois.ncsa.daffodil.util.Maybe._
-import edu.illinois.ncsa.daffodil.schema.annotation.props.PropertyLookupResult
-import edu.illinois.ncsa.daffodil.schema.annotation.props.NotFound
-import edu.illinois.ncsa.daffodil.schema.annotation.props.Found
+import org.apache.daffodil.ExecutionMode
+import org.apache.daffodil.schema.annotation.props.gen.EscapeScheme_AnnotationMixin
+import org.apache.daffodil.dpath._
+import org.apache.daffodil.schema.annotation.props.gen.EscapeKind
+import org.apache.daffodil.processors.EscapeSchemeParseEv
+import org.apache.daffodil.processors.EscapeSchemeBlockParseEv
+import org.apache.daffodil.processors.EscapeSchemeCharParseEv
+import org.apache.daffodil.processors.EscapeSchemeUnparseEv
+import org.apache.daffodil.processors.EscapeSchemeBlockUnparseEv
+import org.apache.daffodil.processors.EscapeSchemeCharUnparseEv
+import org.apache.daffodil.processors.EscapeCharEv
+import org.apache.daffodil.processors.EscapeEscapeCharEv
+import org.apache.daffodil.util.Maybe._
+import org.apache.daffodil.schema.annotation.props.PropertyLookupResult
+import org.apache.daffodil.schema.annotation.props.NotFound
+import org.apache.daffodil.schema.annotation.props.Found
final class DFDLEscapeScheme(node: Node, decl: AnnotatedSchemaComponent, defES: DFDLDefineEscapeScheme)
extends DFDLFormatAnnotation(node, decl)
diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/DFDLFormat.scala b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/DFDLFormat.scala
index e7ab278..bdf9dbd 100644
--- a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/DFDLFormat.scala
+++ b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/DFDLFormat.scala
@@ -30,7 +30,7 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.dsom
+package org.apache.daffodil.dsom
import scala.xml.Node
diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/DFDLFormatAnnotation.scala b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/DFDLFormatAnnotation.scala
index 491040e..a16e8fc 100644
--- a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/DFDLFormatAnnotation.scala
+++ b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/DFDLFormatAnnotation.scala
@@ -30,16 +30,16 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.dsom
+package org.apache.daffodil.dsom
import scala.collection.immutable.ListMap
import scala.xml.Node
-import edu.illinois.ncsa.daffodil.util.LogLevel
-import edu.illinois.ncsa.daffodil.xml.NS
-import edu.illinois.ncsa.daffodil.xml.NoNamespace
-import edu.illinois.ncsa.daffodil.xml.XMLUtils
-import edu.illinois.ncsa.daffodil.xml.RefQName
-import edu.illinois.ncsa.daffodil.schema.annotation.props.LookupLocation
+import org.apache.daffodil.util.LogLevel
+import org.apache.daffodil.xml.NS
+import org.apache.daffodil.xml.NoNamespace
+import org.apache.daffodil.xml.XMLUtils
+import org.apache.daffodil.xml.RefQName
+import org.apache.daffodil.schema.annotation.props.LookupLocation
/**
* Base class for annotations that carry format properties
diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/DFDLProperty.scala b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/DFDLProperty.scala
index 4c4c51a..bd88008 100644
--- a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/DFDLProperty.scala
+++ b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/DFDLProperty.scala
@@ -30,13 +30,13 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.dsom
+package org.apache.daffodil.dsom
import scala.xml.Node
import scala.xml.NodeSeq
-import edu.illinois.ncsa.daffodil.xml.QName
-import edu.illinois.ncsa.daffodil.xml.XMLUtils
-import edu.illinois.ncsa.daffodil.xml.NamedQName
+import org.apache.daffodil.xml.QName
+import org.apache.daffodil.xml.XMLUtils
+import org.apache.daffodil.xml.NamedQName
final class DFDLProperty(xmlArg: Node, formatAnnotation: DFDLFormatAnnotation)
extends DFDLAnnotation(xmlArg, formatAnnotation.annotatedSC)
diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/DFDLSchemaFile.scala b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/DFDLSchemaFile.scala
index fe0c67d..1b7b316 100644
--- a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/DFDLSchemaFile.scala
+++ b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/DFDLSchemaFile.scala
@@ -30,19 +30,19 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.dsom
+package org.apache.daffodil.dsom
import org.xml.sax.SAXParseException
-import edu.illinois.ncsa.daffodil.xml.DaffodilXMLLoader
-import edu.illinois.ncsa.daffodil.xml.NS
-import edu.illinois.ncsa.daffodil.xml.XMLUtils
-import edu.illinois.ncsa.daffodil.api._
-import edu.illinois.ncsa.daffodil.dsom.IIUtils._
-import edu.illinois.ncsa.daffodil.api.Diagnostic
-import edu.illinois.ncsa.daffodil.oolag.OOLAG
+import org.apache.daffodil.xml.DaffodilXMLLoader
+import org.apache.daffodil.xml.NS
+import org.apache.daffodil.xml.XMLUtils
+import org.apache.daffodil.api._
+import org.apache.daffodil.dsom.IIUtils._
+import org.apache.daffodil.api.Diagnostic
+import org.apache.daffodil.oolag.OOLAG
import org.xml.sax.SAXException
-import edu.illinois.ncsa.daffodil.util.LogLevel
-import edu.illinois.ncsa.daffodil.util.Misc
+import org.apache.daffodil.util.LogLevel
+import org.apache.daffodil.util.Misc
/**
* represents one schema document file
diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/DFDLStatement.scala b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/DFDLStatement.scala
index 2c439fc..7a90b11 100644
--- a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/DFDLStatement.scala
+++ b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/DFDLStatement.scala
@@ -30,10 +30,10 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.dsom
+package org.apache.daffodil.dsom
import scala.xml.Node
-import edu.illinois.ncsa.daffodil.grammar.Gram
+import org.apache.daffodil.grammar.Gram
/**
* Base class for assertions, variable assignments, etc
diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/DFDLStatementMixin.scala b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/DFDLStatementMixin.scala
index b38fc45..6eca7ee 100644
--- a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/DFDLStatementMixin.scala
+++ b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/DFDLStatementMixin.scala
@@ -30,13 +30,13 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.dsom
+package org.apache.daffodil.dsom
import scala.xml.Node
-import edu.illinois.ncsa.daffodil.exceptions.ThrowsSDE
-import edu.illinois.ncsa.daffodil.schema.annotation.props.gen.TestKind
-import edu.illinois.ncsa.daffodil.grammar.primitives.AssertBase
+import org.apache.daffodil.exceptions.ThrowsSDE
+import org.apache.daffodil.schema.annotation.props.gen.TestKind
+import org.apache.daffodil.grammar.primitives.AssertBase
trait ResolvesDFDLStatementMixin
extends ThrowsSDE
diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/ElementBase.scala b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/ElementBase.scala
index 53f4738..b0b1d8c 100644
--- a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/ElementBase.scala
+++ b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/ElementBase.scala
@@ -30,32 +30,32 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.dsom
+package org.apache.daffodil.dsom
import scala.xml.NamespaceBinding
-import edu.illinois.ncsa.daffodil.exceptions.Assert
-import edu.illinois.ncsa.daffodil.grammar._
-import edu.illinois.ncsa.daffodil.schema.annotation.props._
-import edu.illinois.ncsa.daffodil.schema.annotation.props.gen._
-import edu.illinois.ncsa.daffodil.xml._
-import edu.illinois.ncsa.daffodil.util.Misc
-import edu.illinois.ncsa.daffodil.processors._
-import edu.illinois.ncsa.daffodil.dpath.NodeInfo
-import edu.illinois.ncsa.daffodil.dpath.NodeInfo.PrimType
-import edu.illinois.ncsa.daffodil.grammar.ElementBaseGrammarMixin
-import edu.illinois.ncsa.daffodil.equality._
-
-import edu.illinois.ncsa.daffodil.processors.UseNilForDefault
-import edu.illinois.ncsa.daffodil.util.MaybeULong
+import org.apache.daffodil.exceptions.Assert
+import org.apache.daffodil.grammar._
+import org.apache.daffodil.schema.annotation.props._
+import org.apache.daffodil.schema.annotation.props.gen._
+import org.apache.daffodil.xml._
+import org.apache.daffodil.util.Misc
+import org.apache.daffodil.processors._
+import org.apache.daffodil.dpath.NodeInfo
+import org.apache.daffodil.dpath.NodeInfo.PrimType
+import org.apache.daffodil.grammar.ElementBaseGrammarMixin
+import org.apache.daffodil.equality._
+
+import org.apache.daffodil.processors.UseNilForDefault
+import org.apache.daffodil.util.MaybeULong
import java.lang.{ Integer => JInt }
-import edu.illinois.ncsa.daffodil.processors._
-import edu.illinois.ncsa.daffodil.infoset.SiblingResolver
-import edu.illinois.ncsa.daffodil.infoset.ResolverType
-import edu.illinois.ncsa.daffodil.infoset.SeveralPossibilitiesForNextElement
-import edu.illinois.ncsa.daffodil.infoset.NoNextElement
-import edu.illinois.ncsa.daffodil.infoset.OnlyOnePossibilityForNextElement
-import edu.illinois.ncsa.daffodil.infoset.NextElementResolver
-import edu.illinois.ncsa.daffodil.infoset.ChildResolver
+import org.apache.daffodil.processors._
+import org.apache.daffodil.infoset.SiblingResolver
+import org.apache.daffodil.infoset.ResolverType
+import org.apache.daffodil.infoset.SeveralPossibilitiesForNextElement
+import org.apache.daffodil.infoset.NoNextElement
+import org.apache.daffodil.infoset.OnlyOnePossibilityForNextElement
+import org.apache.daffodil.infoset.NextElementResolver
+import org.apache.daffodil.infoset.ChildResolver
/**
* Note about DSOM design versus say XSOM or Apache XSD library.
@@ -875,7 +875,7 @@ trait ElementBase
}
}.value
- import edu.illinois.ncsa.daffodil.dsom.FacetTypes._
+ import org.apache.daffodil.dsom.FacetTypes._
private lazy val hasPattern: Boolean = typeDef.optRestriction.map { _.hasPattern }.getOrElse(false)
private lazy val hasEnumeration: Boolean = typeDef.optRestriction.map { _.hasEnumeration }.getOrElse(false)
diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/ElementDeclMixin.scala b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/ElementDeclMixin.scala
index 5824d6b..0ebf0d4 100644
--- a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/ElementDeclMixin.scala
+++ b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/ElementDeclMixin.scala
@@ -30,12 +30,12 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.dsom
+package org.apache.daffodil.dsom
-import edu.illinois.ncsa.daffodil.exceptions.Assert
-import edu.illinois.ncsa.daffodil.xml._
-import edu.illinois.ncsa.daffodil.dpath.NodeInfo.PrimType
-import edu.illinois.ncsa.daffodil.equality._
+import org.apache.daffodil.exceptions.Assert
+import org.apache.daffodil.xml._
+import org.apache.daffodil.dpath.NodeInfo.PrimType
+import org.apache.daffodil.equality._
import scala.xml.Node
trait ElementLikeMixin
diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/ElementRef.scala b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/ElementRef.scala
index 6d4b928..8276ad5 100644
--- a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/ElementRef.scala
+++ b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/ElementRef.scala
@@ -30,13 +30,13 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.dsom
+package org.apache.daffodil.dsom
import scala.xml.Node
-import edu.illinois.ncsa.daffodil.grammar._
-import edu.illinois.ncsa.daffodil.xml._
-import edu.illinois.ncsa.daffodil.grammar.ElementReferenceGrammarMixin
-import edu.illinois.ncsa.daffodil.dpath.NodeInfo
+import org.apache.daffodil.grammar._
+import org.apache.daffodil.xml._
+import org.apache.daffodil.grammar.ElementReferenceGrammarMixin
+import org.apache.daffodil.dpath.NodeInfo
/**
* There are 3 first-class concrete children of ElementBase.
diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/EscapeSchemeRefMixin.scala b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/EscapeSchemeRefMixin.scala
index e565fee..386ea13 100644
--- a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/EscapeSchemeRefMixin.scala
+++ b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/EscapeSchemeRefMixin.scala
@@ -30,11 +30,11 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.dsom
+package org.apache.daffodil.dsom
-import edu.illinois.ncsa.daffodil.api.WarnID
-import edu.illinois.ncsa.daffodil.schema.annotation.props.Found
-import edu.illinois.ncsa.daffodil.schema.annotation.props.NotFound
+import org.apache.daffodil.api.WarnID
+import org.apache.daffodil.schema.annotation.props.Found
+import org.apache.daffodil.schema.annotation.props.NotFound
trait EscapeSchemeRefMixin { self: AnnotatedSchemaComponent =>
/**
diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/Facets.scala b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/Facets.scala
index d451bf3..92f559d 100644
--- a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/Facets.scala
+++ b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/Facets.scala
@@ -30,15 +30,15 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.dsom
+package org.apache.daffodil.dsom
import java.math.BigInteger
import scala.xml.Node
-import edu.illinois.ncsa.daffodil.exceptions.Assert
-import edu.illinois.ncsa.daffodil.dpath.NodeInfo.PrimType
+import org.apache.daffodil.exceptions.Assert
+import org.apache.daffodil.dpath.NodeInfo.PrimType
trait Facets { self: Restriction =>
- import edu.illinois.ncsa.daffodil.dsom.FacetTypes._
+ import org.apache.daffodil.dsom.FacetTypes._
requiredEvaluations(if (hasPattern) patternValues)
requiredEvaluations(if (hasEnumeration) enumerationValues)
diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/GlobalElementDecl.scala b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/GlobalElementDecl.scala
index 7221cd9..be9c6de 100644
--- a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/GlobalElementDecl.scala
+++ b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/GlobalElementDecl.scala
@@ -30,7 +30,7 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.dsom
+package org.apache.daffodil.dsom
import scala.xml.Node
diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/GlobalElementDeclFactory.scala b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/GlobalElementDeclFactory.scala
index f698012..d3a9238 100644
--- a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/GlobalElementDeclFactory.scala
+++ b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/GlobalElementDeclFactory.scala
@@ -30,7 +30,7 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.dsom
+package org.apache.daffodil.dsom
import scala.xml.Node
diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/GroupDef.scala b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/GroupDef.scala
index 5992095..e35f801 100644
--- a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/GroupDef.scala
+++ b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/GroupDef.scala
@@ -30,10 +30,10 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.dsom
+package org.apache.daffodil.dsom
import scala.xml.Node
-import edu.illinois.ncsa.daffodil.exceptions.Assert
+import org.apache.daffodil.exceptions.Assert
import scala.xml.Text
import scala.xml.Comment
diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/GroupRef.scala b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/GroupRef.scala
index 9222711..251a178 100644
--- a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/GroupRef.scala
+++ b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/GroupRef.scala
@@ -30,12 +30,12 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.dsom
+package org.apache.daffodil.dsom
import scala.xml.Node
import scala.xml._
-import edu.illinois.ncsa.daffodil.xml.HasRefMixin
-import edu.illinois.ncsa.daffodil.schema.annotation.props.NotFound
+import org.apache.daffodil.xml.HasRefMixin
+import org.apache.daffodil.schema.annotation.props.NotFound
trait GroupRef { self: ModelGroup =>
diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/IIBase.scala b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/IIBase.scala
index bfba75d..38f5334 100644
--- a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/IIBase.scala
+++ b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/IIBase.scala
@@ -30,21 +30,21 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.dsom
+package org.apache.daffodil.dsom
-import edu.illinois.ncsa.daffodil.util.Misc
+import org.apache.daffodil.util.Misc
import scala.xml.Node
import scala.collection.immutable.ListMap
-import edu.illinois.ncsa.daffodil.xml.NS
-import edu.illinois.ncsa.daffodil.util._
+import org.apache.daffodil.xml.NS
+import org.apache.daffodil.util._
import IIUtils._
import java.io.File
import java.net.URI
-import edu.illinois.ncsa.daffodil.xml._
-import edu.illinois.ncsa.daffodil.util.Delay
+import org.apache.daffodil.xml._
+import org.apache.daffodil.util.Delay
import java.net.URLEncoder
-import edu.illinois.ncsa.daffodil.api.DaffodilSchemaSource
-import edu.illinois.ncsa.daffodil.api.URISchemaSource
+import org.apache.daffodil.api.DaffodilSchemaSource
+import org.apache.daffodil.api.URISchemaSource
import java.net.URISyntaxException
/**
@@ -180,7 +180,17 @@ abstract class IIBase( final override val xml: Node, xsdArg: XMLSchemaDocument,
res
}.value
- final lazy val schemaLocationProperty = getAttributeOption("schemaLocation")
+ final lazy val schemaLocationProperty = {
+ val prop = getAttributeOption("schemaLocation")
+ prop.map { text =>
+ if (text.contains("edu/illinois/ncsa/daffodil")) {
+ SDW("schemaLocation property uses deprecated edu/illinois/ncsa/daffodil path instead of org/apache/daffodil. Converting to new path.")
+ text.replace("edu/illinois/ncsa/daffodil", "org/apache/daffodil")
+ } else {
+ text
+ }
+ }
+ }
protected final def isValidURI(uri: String): Boolean = {
try { new URI(uri) } catch { case ex: URISyntaxException => return false }
diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/Import.scala b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/Import.scala
index e87d799..1f2a80e 100644
--- a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/Import.scala
+++ b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/Import.scala
@@ -30,14 +30,14 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.dsom
+package org.apache.daffodil.dsom
import scala.xml.Node
-import edu.illinois.ncsa.daffodil.exceptions.Assert
-import edu.illinois.ncsa.daffodil.xml._
-import edu.illinois.ncsa.daffodil.api.DaffodilSchemaSource
-import edu.illinois.ncsa.daffodil.api.URISchemaSource
-import edu.illinois.ncsa.daffodil.util._
+import org.apache.daffodil.exceptions.Assert
+import org.apache.daffodil.xml._
+import org.apache.daffodil.api.DaffodilSchemaSource
+import org.apache.daffodil.api.URISchemaSource
+import org.apache.daffodil.util._
import IIUtils._
import java.net.URI
diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/Include.scala b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/Include.scala
index 1ca2aeb..e8abfcf 100644
--- a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/Include.scala
+++ b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/Include.scala
@@ -30,13 +30,13 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.dsom
+package org.apache.daffodil.dsom
import scala.xml.Node
-import edu.illinois.ncsa.daffodil.util._
+import org.apache.daffodil.util._
import IIUtils._
-import edu.illinois.ncsa.daffodil.oolag.OOLAG
+import org.apache.daffodil.oolag.OOLAG
/**
* enclosingGoalNS is None if this include
diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/InitiatedTerminatedMixin.scala b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/InitiatedTerminatedMixin.scala
index e5bad64..ad2bf06 100644
--- a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/InitiatedTerminatedMixin.scala
+++ b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/InitiatedTerminatedMixin.scala
@@ -30,14 +30,14 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.dsom
+package org.apache.daffodil.dsom
-import edu.illinois.ncsa.daffodil.grammar._
-import edu.illinois.ncsa.daffodil.schema.annotation.props.gen._
-import edu.illinois.ncsa.daffodil.grammar.GrammarMixin
-import edu.illinois.ncsa.daffodil.grammar.primitives.InitiatedContent
-import edu.illinois.ncsa.daffodil.grammar.primitives.Terminator
-import edu.illinois.ncsa.daffodil.grammar.primitives.Initiator
+import org.apache.daffodil.grammar._
+import org.apache.daffodil.schema.annotation.props.gen._
+import org.apache.daffodil.grammar.GrammarMixin
+import org.apache.daffodil.grammar.primitives.InitiatedContent
+import org.apache.daffodil.grammar.primitives.Terminator
+import org.apache.daffodil.grammar.primitives.Initiator
trait InitiatedTerminatedMixin
extends GrammarMixin
diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/LocalElementDecl.scala b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/LocalElementDecl.scala
index abd9868..72b3de4 100644
--- a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/LocalElementDecl.scala
+++ b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/LocalElementDecl.scala
@@ -30,7 +30,7 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.dsom
+package org.apache.daffodil.dsom
import scala.xml.Node
diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/LocalElementMixin.scala b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/LocalElementMixin.scala
index ec78d8a..28206f4 100644
--- a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/LocalElementMixin.scala
+++ b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/LocalElementMixin.scala
@@ -30,14 +30,14 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.dsom
+package org.apache.daffodil.dsom
-import edu.illinois.ncsa.daffodil.exceptions.Assert
-import edu.illinois.ncsa.daffodil.grammar._
-import edu.illinois.ncsa.daffodil.schema.annotation.props.gen._
-import edu.illinois.ncsa.daffodil.dpath.NodeInfo.PrimType
-import edu.illinois.ncsa.daffodil.grammar.LocalElementGrammarMixin
-import edu.illinois.ncsa.daffodil.equality._
+import org.apache.daffodil.exceptions.Assert
+import org.apache.daffodil.grammar._
+import org.apache.daffodil.schema.annotation.props.gen._
+import org.apache.daffodil.dpath.NodeInfo.PrimType
+import org.apache.daffodil.grammar.LocalElementGrammarMixin
+import org.apache.daffodil.equality._
import java.math.{ BigInteger => JBigInt }
/**
diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/ModelGroup.scala b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/ModelGroup.scala
index def47cf..40ea30c 100644
--- a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/ModelGroup.scala
+++ b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/ModelGroup.scala
@@ -30,23 +30,23 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.dsom
+package org.apache.daffodil.dsom
import scala.xml.Node
import scala.xml.NodeSeq.seqToNodeSeq
import scala.xml.Text
import scala.xml._
-import edu.illinois.ncsa.daffodil.exceptions.Assert
-import edu.illinois.ncsa.daffodil.processors.ModelGroupRuntimeData
-import edu.illinois.ncsa.daffodil.processors.RuntimeData
-import edu.illinois.ncsa.daffodil.processors.TermRuntimeData
-import edu.illinois.ncsa.daffodil.grammar.ModelGroupGrammarMixin
-import edu.illinois.ncsa.daffodil.infoset.ChoiceBranchEvent
-import edu.illinois.ncsa.daffodil.infoset.ChoiceBranchStartEvent
-import edu.illinois.ncsa.daffodil.infoset.ChoiceBranchEndEvent
+import org.apache.daffodil.exceptions.Assert
+import org.apache.daffodil.processors.ModelGroupRuntimeData
+import org.apache.daffodil.processors.RuntimeData
+import org.apache.daffodil.processors.TermRuntimeData
+import org.apache.daffodil.grammar.ModelGroupGrammarMixin
+import org.apache.daffodil.infoset.ChoiceBranchEvent
+import org.apache.daffodil.infoset.ChoiceBranchStartEvent
+import org.apache.daffodil.infoset.ChoiceBranchEndEvent
import java.lang.{ Integer => JInt }
-import edu.illinois.ncsa.daffodil.schema.annotation.props.AlignmentType
-import edu.illinois.ncsa.daffodil.schema.annotation.props.gen.AlignmentUnits
+import org.apache.daffodil.schema.annotation.props.AlignmentType
+import org.apache.daffodil.schema.annotation.props.gen.AlignmentUnits
/**
* A factory for model groups.
diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/NamedMixin.scala b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/NamedMixin.scala
index 1b49ed1..cfa148c 100644
--- a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/NamedMixin.scala
+++ b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/NamedMixin.scala
@@ -30,14 +30,14 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.dsom
+package org.apache.daffodil.dsom
-import edu.illinois.ncsa.daffodil.xml.GetAttributesMixin
+import org.apache.daffodil.xml.GetAttributesMixin
import scala.xml.Node
-import edu.illinois.ncsa.daffodil.xml._
-import edu.illinois.ncsa.daffodil.util.NamedMixinBase
-import edu.illinois.ncsa.daffodil.util.Misc
-import edu.illinois.ncsa.daffodil.api.DaffodilTunables
+import org.apache.daffodil.xml._
+import org.apache.daffodil.util.NamedMixinBase
+import org.apache.daffodil.util.Misc
+import org.apache.daffodil.api.DaffodilTunables
/**
* Common Mixin for things that have a name attribute.
diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/Nesting.scala b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/Nesting.scala
index 4ad0633..2e18ec2 100644
--- a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/Nesting.scala
+++ b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/Nesting.scala
@@ -30,9 +30,9 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.dsom
+package org.apache.daffodil.dsom
-import edu.illinois.ncsa.daffodil.exceptions.Assert
+import org.apache.daffodil.exceptions.Assert
trait NestingMixin {
diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/ParticleMixin.scala b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/ParticleMixin.scala
index 066bc0e..eff8087 100644
--- a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/ParticleMixin.scala
+++ b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/ParticleMixin.scala
@@ -30,10 +30,10 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.dsom
+package org.apache.daffodil.dsom
-import edu.illinois.ncsa.daffodil.schema.annotation.props.gen._
-import edu.illinois.ncsa.daffodil.equality._
+import org.apache.daffodil.schema.annotation.props.gen._
+import org.apache.daffodil.equality._
trait RequiredOptionalMixin { self: ElementBase =>
diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/PropProviders.scala b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/PropProviders.scala
index f7a6642..cee095b 100644
--- a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/PropProviders.scala
+++ b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/PropProviders.scala
@@ -30,15 +30,15 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.dsom
+package org.apache.daffodil.dsom
-import edu.illinois.ncsa.daffodil.util._
-import edu.illinois.ncsa.daffodil.util.Logging
-import edu.illinois.ncsa.daffodil.schema.annotation.props.LookupLocation
-import edu.illinois.ncsa.daffodil.schema.annotation.props.PropertyLookupResult
-import edu.illinois.ncsa.daffodil.schema.annotation.props.PropTypes
-import edu.illinois.ncsa.daffodil.schema.annotation.props.NotFound
-import edu.illinois.ncsa.daffodil.schema.annotation.props.Found
+import org.apache.daffodil.util._
+import org.apache.daffodil.util.Logging
+import org.apache.daffodil.schema.annotation.props.LookupLocation
+import org.apache.daffodil.schema.annotation.props.PropertyLookupResult
+import org.apache.daffodil.schema.annotation.props.PropTypes
+import org.apache.daffodil.schema.annotation.props.NotFound
+import org.apache.daffodil.schema.annotation.props.Found
/**
* Property lookup uses ChainPropProviders containing LeafPropProviders.
diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/RawCommonRuntimeValuedPropertiesMixin.scala b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/RawCommonRuntimeValuedPropertiesMixin.scala
index b675f91..df309cc 100644
--- a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/RawCommonRuntimeValuedPropertiesMixin.scala
+++ b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/RawCommonRuntimeValuedPropertiesMixin.scala
@@ -30,9 +30,9 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.dsom
+package org.apache.daffodil.dsom
-import edu.illinois.ncsa.daffodil.schema.annotation.props.PropertyMixin
+import org.apache.daffodil.schema.annotation.props.PropertyMixin
trait RawCommonRuntimeValuedPropertiesMixin
extends PropertyMixin {
diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/RealTermMixin.scala b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/RealTermMixin.scala
index 1f7e629..c7799d2 100644
--- a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/RealTermMixin.scala
+++ b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/RealTermMixin.scala
@@ -30,9 +30,9 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.dsom
+package org.apache.daffodil.dsom
-import edu.illinois.ncsa.daffodil.schema.annotation.props.PropertyLookupResult
+import org.apache.daffodil.schema.annotation.props.PropertyLookupResult
trait PropertyReferencedElementInfosMixin {
protected final type F = ContentValueReferencedElementInfoMixin => Set[DPathElementCompileInfo]
diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/RestrictionUnion.scala b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/RestrictionUnion.scala
index 85a6618..5b8ab4b 100644
--- a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/RestrictionUnion.scala
+++ b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/RestrictionUnion.scala
@@ -30,20 +30,20 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.dsom
+package org.apache.daffodil.dsom
import java.math.BigInteger
-import edu.illinois.ncsa.daffodil.exceptions.ThrowsSDE
-import edu.illinois.ncsa.daffodil.exceptions.UnsuppressableException
+import org.apache.daffodil.exceptions.ThrowsSDE
+import org.apache.daffodil.exceptions.UnsuppressableException
import scala.xml.Node
-import edu.illinois.ncsa.daffodil.xml.QName
-import edu.illinois.ncsa.daffodil.dpath.NodeInfo
+import org.apache.daffodil.xml.QName
+import org.apache.daffodil.dpath.NodeInfo
import com.ibm.icu.text.SimpleDateFormat
import scala.collection.mutable.Queue
-import edu.illinois.ncsa.daffodil.exceptions.Assert
+import org.apache.daffodil.exceptions.Assert
import com.ibm.icu.util.GregorianCalendar
import com.ibm.icu.util.TimeZone
-import edu.illinois.ncsa.daffodil.dpath.NodeInfo.PrimType
+import org.apache.daffodil.dpath.NodeInfo.PrimType
/**
* A schema component for simple type restrictions
@@ -56,7 +56,7 @@ final class Restriction(xmlArg: Node, val simpleType: SimpleTypeDefBase)
Assert.invariant(xmlArg.asInstanceOf[scala.xml.Elem].label == "restriction")
- import edu.illinois.ncsa.daffodil.dsom.FacetTypes._
+ import org.apache.daffodil.dsom.FacetTypes._
final lazy val primType: PrimType = {
optDirectPrimType.getOrElse(optBaseType.get.primType)
diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/Root.scala b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/Root.scala
index a385cb0..2fb246f 100644
--- a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/Root.scala
+++ b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/Root.scala
@@ -1,8 +1,8 @@
-package edu.illinois.ncsa.daffodil.dsom
+package org.apache.daffodil.dsom
-import edu.illinois.ncsa.daffodil.grammar.RootGrammarMixin
-import edu.illinois.ncsa.daffodil.xml.NamedQName
-import edu.illinois.ncsa.daffodil.xml.XMLUtils
+import org.apache.daffodil.grammar.RootGrammarMixin
+import org.apache.daffodil.xml.NamedQName
+import org.apache.daffodil.xml.XMLUtils
import scala.xml.Node
import scala.xml.UnprefixedAttribute
diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/RuntimePropertyMixins.scala b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/RuntimePropertyMixins.scala
index 57ab849..8efaaba 100644
--- a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/RuntimePropertyMixins.scala
+++ b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/RuntimePropertyMixins.scala
@@ -30,54 +30,54 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.dsom
-
-import edu.illinois.ncsa.daffodil.dpath.NodeInfo
-import edu.illinois.ncsa.daffodil.dpath.NodeInfo.PrimType
-import edu.illinois.ncsa.daffodil.equality.TypeEqual
-import edu.illinois.ncsa.daffodil.exceptions.Assert
-import edu.illinois.ncsa.daffodil.processors.BinaryFloatRepEv
-import edu.illinois.ncsa.daffodil.processors.ByteOrderEv
-import edu.illinois.ncsa.daffodil.processors.CharsetEv
-import edu.illinois.ncsa.daffodil.processors.EncodingEv
-import edu.illinois.ncsa.daffodil.processors.ExplicitLengthEv
-import edu.illinois.ncsa.daffodil.processors.FillByteEv
-import edu.illinois.ncsa.daffodil.processors.ImplicitLengthEv
-import edu.illinois.ncsa.daffodil.processors.InitiatorParseEv
-import edu.illinois.ncsa.daffodil.processors.InitiatorUnparseEv
-import edu.illinois.ncsa.daffodil.processors.OccursCountEv
-import edu.illinois.ncsa.daffodil.processors.OutputNewLineEv
-import edu.illinois.ncsa.daffodil.processors.SeparatorParseEv
-import edu.illinois.ncsa.daffodil.processors.SeparatorUnparseEv
-import edu.illinois.ncsa.daffodil.processors.TerminatorParseEv
-import edu.illinois.ncsa.daffodil.processors.TerminatorUnparseEv
-import edu.illinois.ncsa.daffodil.processors.TextBooleanFalseRepEv
-import edu.illinois.ncsa.daffodil.processors.TextBooleanTrueRepEv
-import edu.illinois.ncsa.daffodil.processors.TextStandardDecimalSeparatorEv
-import edu.illinois.ncsa.daffodil.processors.TextStandardExponentRepEv
-import edu.illinois.ncsa.daffodil.processors.TextStandardGroupingSeparatorEv
-import edu.illinois.ncsa.daffodil.schema.annotation.props.gen.DFDLBaseTypeMixin
-import edu.illinois.ncsa.daffodil.schema.annotation.props.gen.DFDLSimpleTypeMixin
-import edu.illinois.ncsa.daffodil.schema.annotation.props.gen.LengthAGMixin
-import edu.illinois.ncsa.daffodil.schema.annotation.props.gen.LengthKind
-import edu.illinois.ncsa.daffodil.schema.annotation.props.gen.OccursAGMixin
-import edu.illinois.ncsa.daffodil.schema.annotation.props.gen.Representation
-import edu.illinois.ncsa.daffodil.schema.annotation.props.gen.Sequence_AnnotationMixin
-import edu.illinois.ncsa.daffodil.processors.LengthInBitsEv
-import edu.illinois.ncsa.daffodil.schema.annotation.props.gen.LengthUnits
-import edu.illinois.ncsa.daffodil.util.Maybe._
-import edu.illinois.ncsa.daffodil.processors.LengthEv
-import edu.illinois.ncsa.daffodil.processors.MinLengthInBitsEv
-import edu.illinois.ncsa.daffodil.processors.UnparseTargetLengthInBitsEv
-import edu.illinois.ncsa.daffodil.processors.unparsers.NilStringLiteralForUnparserEv
-import edu.illinois.ncsa.daffodil.processors.UnparseTargetLengthInCharactersEv
-import edu.illinois.ncsa.daffodil.util.Maybe
-import edu.illinois.ncsa.daffodil.processors.Evaluatable
-import edu.illinois.ncsa.daffodil.util.MaybeJULong
-import edu.illinois.ncsa.daffodil.schema.annotation.props.gen.NilKind
-import edu.illinois.ncsa.daffodil.schema.annotation.props.gen.TextTrimKind
-import edu.illinois.ncsa.daffodil.schema.annotation.props.gen.TextPadKind
-import edu.illinois.ncsa.daffodil.schema.annotation.props.gen.YesNo
+package org.apache.daffodil.dsom
+
+import org.apache.daffodil.dpath.NodeInfo
+import org.apache.daffodil.dpath.NodeInfo.PrimType
+import org.apache.daffodil.equality.TypeEqual
+import org.apache.daffodil.exceptions.Assert
+import org.apache.daffodil.processors.BinaryFloatRepEv
+import org.apache.daffodil.processors.ByteOrderEv
+import org.apache.daffodil.processors.CharsetEv
+import org.apache.daffodil.processors.EncodingEv
+import org.apache.daffodil.processors.ExplicitLengthEv
+import org.apache.daffodil.processors.FillByteEv
+import org.apache.daffodil.processors.ImplicitLengthEv
+import org.apache.daffodil.processors.InitiatorParseEv
+import org.apache.daffodil.processors.InitiatorUnparseEv
+import org.apache.daffodil.processors.OccursCountEv
+import org.apache.daffodil.processors.OutputNewLineEv
+import org.apache.daffodil.processors.SeparatorParseEv
+import org.apache.daffodil.processors.SeparatorUnparseEv
+import org.apache.daffodil.processors.TerminatorParseEv
+import org.apache.daffodil.processors.TerminatorUnparseEv
+import org.apache.daffodil.processors.TextBooleanFalseRepEv
+import org.apache.daffodil.processors.TextBooleanTrueRepEv
+import org.apache.daffodil.processors.TextStandardDecimalSeparatorEv
+import org.apache.daffodil.processors.TextStandardExponentRepEv
+import org.apache.daffodil.processors.TextStandardGroupingSeparatorEv
+import org.apache.daffodil.schema.annotation.props.gen.DFDLBaseTypeMixin
+import org.apache.daffodil.schema.annotation.props.gen.DFDLSimpleTypeMixin
+import org.apache.daffodil.schema.annotation.props.gen.LengthAGMixin
+import org.apache.daffodil.schema.annotation.props.gen.LengthKind
+import org.apache.daffodil.schema.annotation.props.gen.OccursAGMixin
+import org.apache.daffodil.schema.annotation.props.gen.Representation
+import org.apache.daffodil.schema.annotation.props.gen.Sequence_AnnotationMixin
+import org.apache.daffodil.processors.LengthInBitsEv
+import org.apache.daffodil.schema.annotation.props.gen.LengthUnits
+import org.apache.daffodil.util.Maybe._
+import org.apache.daffodil.processors.LengthEv
+import org.apache.daffodil.processors.MinLengthInBitsEv
+import org.apache.daffodil.processors.UnparseTargetLengthInBitsEv
+import org.apache.daffodil.processors.unparsers.NilStringLiteralForUnparserEv
+import org.apache.daffodil.processors.UnparseTargetLengthInCharactersEv
+import org.apache.daffodil.util.Maybe
+import org.apache.daffodil.processors.Evaluatable
+import org.apache.daffodil.util.MaybeJULong
+import org.apache.daffodil.schema.annotation.props.gen.NilKind
+import org.apache.daffodil.schema.annotation.props.gen.TextTrimKind
+import org.apache.daffodil.schema.annotation.props.gen.TextPadKind
+import org.apache.daffodil.schema.annotation.props.gen.YesNo
/*
* These are the DFDL properties which can have their values come
diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/SchemaComponent.scala b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/SchemaComponent.scala
index 663b604..66878f3 100644
--- a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/SchemaComponent.scala
+++ b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/SchemaComponent.scala
@@ -30,25 +30,25 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.dsom
+package org.apache.daffodil.dsom
import scala.xml.Node
-import edu.illinois.ncsa.daffodil.exceptions.Assert
-import edu.illinois.ncsa.daffodil.xml.GetAttributesMixin
-import edu.illinois.ncsa.daffodil.xml.NS
-import edu.illinois.ncsa.daffodil.xml.XMLUtils
-import edu.illinois.ncsa.daffodil.processors.NonTermRuntimeData
-import edu.illinois.ncsa.daffodil.processors.RuntimeData
-import edu.illinois.ncsa.daffodil.util.Maybe
-import edu.illinois.ncsa.daffodil.processors.VariableMap
-import edu.illinois.ncsa.daffodil.processors.NonTermRuntimeData
-import edu.illinois.ncsa.daffodil.xml.ResolvesQNames
-import edu.illinois.ncsa.daffodil.schema.annotation.props.LookupLocation
-import edu.illinois.ncsa.daffodil.schema.annotation.props.PropTypes
-import edu.illinois.ncsa.daffodil.oolag.OOLAG._
-import edu.illinois.ncsa.daffodil.api.DaffodilTunables
-import edu.illinois.ncsa.daffodil.xml.GetAttributesMixin
-import edu.illinois.ncsa.daffodil.schema.annotation.props.PropTypes
+import org.apache.daffodil.exceptions.Assert
+import org.apache.daffodil.xml.GetAttributesMixin
+import org.apache.daffodil.xml.NS
+import org.apache.daffodil.xml.XMLUtils
+import org.apache.daffodil.processors.NonTermRuntimeData
+import org.apache.daffodil.processors.RuntimeData
+import org.apache.daffodil.util.Maybe
+import org.apache.daffodil.processors.VariableMap
+import org.apache.daffodil.processors.NonTermRuntimeData
+import org.apache.daffodil.xml.ResolvesQNames
+import org.apache.daffodil.schema.annotation.props.LookupLocation
+import org.apache.daffodil.schema.annotation.props.PropTypes
+import org.apache.daffodil.oolag.OOLAG._
+import org.apache.daffodil.api.DaffodilTunables
+import org.apache.daffodil.xml.GetAttributesMixin
+import org.apache.daffodil.schema.annotation.props.PropTypes
abstract class SchemaComponentImpl( final override val xml: Node,
final override val parent: SchemaComponent)
diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/SchemaComponentFactory.scala b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/SchemaComponentFactory.scala
index 343a514..0b56389 100644
--- a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/SchemaComponentFactory.scala
+++ b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/SchemaComponentFactory.scala
@@ -30,14 +30,14 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.dsom
+package org.apache.daffodil.dsom
-import edu.illinois.ncsa.daffodil.exceptions.SchemaFileLocatable
-import edu.illinois.ncsa.daffodil.xml.XMLUtils
-import edu.illinois.ncsa.daffodil.exceptions.ThrowsSDE
+import org.apache.daffodil.exceptions.SchemaFileLocatable
+import org.apache.daffodil.xml.XMLUtils
+import org.apache.daffodil.exceptions.ThrowsSDE
import scala.xml.NamespaceBinding
-import edu.illinois.ncsa.daffodil.xml.NS
-import edu.illinois.ncsa.daffodil.oolag.OOLAG.OOLAGHost
+import org.apache.daffodil.xml.NS
+import org.apache.daffodil.oolag.OOLAG.OOLAGHost
import scala.xml.Node
/**
diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/SchemaComponentIncludesAndImportsMixin.scala b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/SchemaComponentIncludesAndImportsMixin.scala
index 4d15f44..bd1fd8c 100644
--- a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/SchemaComponentIncludesAndImportsMixin.scala
+++ b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/SchemaComponentIncludesAndImportsMixin.scala
@@ -30,7 +30,7 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.dsom
+package org.apache.daffodil.dsom
/**
* Mixin for all SchemaComponents
diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/SchemaDocIncludesAndImportsMixin.scala b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/SchemaDocIncludesAndImportsMixin.scala
index c570b96..6a93d30 100644
--- a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/SchemaDocIncludesAndImportsMixin.scala
+++ b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/SchemaDocIncludesAndImportsMixin.scala
@@ -30,15 +30,15 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.dsom
+package org.apache.daffodil.dsom
import scala.xml.Node
-import edu.illinois.ncsa.daffodil.xml.NS
-import edu.illinois.ncsa.daffodil.xml.NoNamespace
-import edu.illinois.ncsa.daffodil.util._
+import org.apache.daffodil.xml.NS
+import org.apache.daffodil.xml.NoNamespace
+import org.apache.daffodil.util._
import IIUtils._
import scala.xml.NodeSeq
-import edu.illinois.ncsa.daffodil.equality._
+import org.apache.daffodil.equality._
/**
* Mixin for SchemaDocument
diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/SchemaDocument.scala b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/SchemaDocument.scala
index 317a7cf..7cfd6dc 100644
--- a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/SchemaDocument.scala
+++ b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/SchemaDocument.scala
@@ -30,14 +30,14 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.dsom
+package org.apache.daffodil.dsom
import scala.xml.Node
-import edu.illinois.ncsa.daffodil.dsom.IIUtils.IIMap
-import edu.illinois.ncsa.daffodil.exceptions.Assert
-import edu.illinois.ncsa.daffodil.schema.annotation.props.SeparatorSuppressionPolicyMixin
-import edu.illinois.ncsa.daffodil.schema.annotation.props.gen.Format_AnnotationMixin
+import org.apache.daffodil.dsom.IIUtils.IIMap
+import org.apache.daffodil.exceptions.Assert
+import org.apache.daffodil.schema.annotation.props.SeparatorSuppressionPolicyMixin
+import org.apache.daffodil.schema.annotation.props.gen.Format_AnnotationMixin
/**
* A schema document corresponds to one file usually named with an ".xsd" extension.
diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/SchemaSet.scala b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/SchemaSet.scala
index 98c3f02..c968f2d 100644
--- a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/SchemaSet.scala
+++ b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/SchemaSet.scala
@@ -30,28 +30,28 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.dsom
+package org.apache.daffodil.dsom
import scala.xml.Node
-import edu.illinois.ncsa.daffodil.externalvars.Binding
-import edu.illinois.ncsa.daffodil.compiler.RootSpec
-import edu.illinois.ncsa.daffodil.exceptions.Assert
-import edu.illinois.ncsa.daffodil.xml._
-import edu.illinois.ncsa.daffodil.api.Diagnostic
-import edu.illinois.ncsa.daffodil.xml.XMLUtils
-import edu.illinois.ncsa.daffodil.xml.NS
-import edu.illinois.ncsa.daffodil.oolag.OOLAG
-import edu.illinois.ncsa.daffodil.exceptions.ThrowsSDE
-import edu.illinois.ncsa.daffodil.grammar.primitives.VariableMapFactory
-import edu.illinois.ncsa.daffodil.externalvars.ExternalVariablesLoader
-import edu.illinois.ncsa.daffodil.dpath.NodeInfo
+import org.apache.daffodil.externalvars.Binding
+import org.apache.daffodil.compiler.RootSpec
+import org.apache.daffodil.exceptions.Assert
+import org.apache.daffodil.xml._
+import org.apache.daffodil.api.Diagnostic
+import org.apache.daffodil.xml.XMLUtils
+import org.apache.daffodil.xml.NS
+import org.apache.daffodil.oolag.OOLAG
+import org.apache.daffodil.exceptions.ThrowsSDE
+import org.apache.daffodil.grammar.primitives.VariableMapFactory
+import org.apache.daffodil.externalvars.ExternalVariablesLoader
+import org.apache.daffodil.dpath.NodeInfo
import java.io.File
-import edu.illinois.ncsa.daffodil.xml.DFDLCatalogResolver
-import edu.illinois.ncsa.daffodil.api.DaffodilSchemaSource
-import edu.illinois.ncsa.daffodil.api.UnitTestSchemaSource
-import edu.illinois.ncsa.daffodil.util.Misc
-import edu.illinois.ncsa.daffodil.schema.annotation.props.LookupLocation
-import edu.illinois.ncsa.daffodil.api.DaffodilTunables
+import org.apache.daffodil.xml.DFDLCatalogResolver
+import org.apache.daffodil.api.DaffodilSchemaSource
+import org.apache.daffodil.api.UnitTestSchemaSource
+import org.apache.daffodil.util.Misc
+import org.apache.daffodil.schema.annotation.props.LookupLocation
+import org.apache.daffodil.api.DaffodilTunables
/**
* A schema set is exactly that, a set of schemas. Each schema has
diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/SchemaSetIncludesAndImportsMixins.scala b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/SchemaSetIncludesAndImportsMixins.scala
index 6040d1e..792d62d 100644
--- a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/SchemaSetIncludesAndImportsMixins.scala
+++ b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/SchemaSetIncludesAndImportsMixins.scala
@@ -30,13 +30,13 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.dsom
+package org.apache.daffodil.dsom
import scala.collection.immutable.ListMap
-import edu.illinois.ncsa.daffodil.util._
+import org.apache.daffodil.util._
import IIUtils._
-import edu.illinois.ncsa.daffodil.xml.XMLUtils
-import edu.illinois.ncsa.daffodil.util.Delay
+import org.apache.daffodil.xml.XMLUtils
+import org.apache.daffodil.util.Delay
/**
* Mixin for SchemaSet
diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/SequenceGroup.scala b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/SequenceGroup.scala
index de82849..67f50d0 100644
--- a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/SequenceGroup.scala
+++ b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/SequenceGroup.scala
@@ -30,7 +30,7 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.dsom
+package org.apache.daffodil.dsom
import scala.xml.Attribute
import scala.xml.Elem
@@ -39,17 +39,17 @@ import scala.xml.NodeSeq.seqToNodeSeq
import scala.xml.Null
import scala.xml.Text
import scala.xml._
-import edu.illinois.ncsa.daffodil.schema.annotation.props.gen.Sequence_AnnotationMixin
-import edu.illinois.ncsa.daffodil.schema.annotation.props.SeparatorSuppressionPolicyMixin
-import edu.illinois.ncsa.daffodil.xml.XMLUtils
-import edu.illinois.ncsa.daffodil.schema.annotation.props.gen.OccursCountKind
-import edu.illinois.ncsa.daffodil.schema.annotation.props.gen.SequenceKind
-import edu.illinois.ncsa.daffodil.Implicits.ns2String
-import edu.illinois.ncsa.daffodil.grammar.SequenceGrammarMixin
-import edu.illinois.ncsa.daffodil.exceptions.Assert
-import edu.illinois.ncsa.daffodil.processors.SequenceRuntimeData
-import edu.illinois.ncsa.daffodil.schema.annotation.props.Found
-import edu.illinois.ncsa.daffodil.schema.annotation.props.PropertyLookupResult
+import org.apache.daffodil.schema.annotation.props.gen.Sequence_AnnotationMixin
+import org.apache.daffodil.schema.annotation.props.SeparatorSuppressionPolicyMixin
+import org.apache.daffodil.xml.XMLUtils
+import org.apache.daffodil.schema.annotation.props.gen.OccursCountKind
+import org.apache.daffodil.schema.annotation.props.gen.SequenceKind
+import org.apache.daffodil.Implicits.ns2String
+import org.apache.daffodil.grammar.SequenceGrammarMixin
+import org.apache.daffodil.exceptions.Assert
+import org.apache.daffodil.processors.SequenceRuntimeData
+import org.apache.daffodil.schema.annotation.props.Found
+import org.apache.daffodil.schema.annotation.props.PropertyLookupResult
abstract class SequenceTermBase(
final override val xml: Node,
diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/Siblings.scala b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/Siblings.scala
index cc762fd..0755e3e 100644
--- a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/Siblings.scala
+++ b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/Siblings.scala
@@ -30,7 +30,7 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.dsom
+package org.apache.daffodil.dsom
/**
* Information needed specifically for unparsing.
diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/SimpleTypes.scala b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/SimpleTypes.scala
index 1e61aec..ccd4440 100644
--- a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/SimpleTypes.scala
+++ b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/SimpleTypes.scala
@@ -30,14 +30,14 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.dsom
+package org.apache.daffodil.dsom
import scala.xml.Node
-import edu.illinois.ncsa.daffodil.exceptions.Assert
-import edu.illinois.ncsa.daffodil.dpath.NodeInfo.PrimType
-import edu.illinois.ncsa.daffodil.dpath.NodeInfo
-import edu.illinois.ncsa.daffodil.processors.SimpleTypeRuntimeData
-import edu.illinois.ncsa.daffodil.util.Misc
+import org.apache.daffodil.exceptions.Assert
+import org.apache.daffodil.dpath.NodeInfo.PrimType
+import org.apache.daffodil.dpath.NodeInfo
+import org.apache.daffodil.processors.SimpleTypeRuntimeData
+import org.apache.daffodil.util.Misc
trait TypeBase {
def optRestriction: Option[Restriction] = None
diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/Term.scala b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/Term.scala
index fad0853..27ebf64 100644
--- a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/Term.scala
+++ b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/Term.scala
@@ -30,16 +30,16 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.dsom
+package org.apache.daffodil.dsom
import java.util.UUID
-import edu.illinois.ncsa.daffodil.exceptions.Assert
-import edu.illinois.ncsa.daffodil.processors.TermRuntimeData
-import edu.illinois.ncsa.daffodil.grammar.TermGrammarMixin
-import edu.illinois.ncsa.daffodil.schema.annotation.props.gen.YesNo
+import org.apache.daffodil.exceptions.Assert
+import org.apache.daffodil.processors.TermRuntimeData
+import org.apache.daffodil.grammar.TermGrammarMixin
+import org.apache.daffodil.schema.annotation.props.gen.YesNo
import java.lang.{ Integer => JInt }
-import edu.illinois.ncsa.daffodil.schema.annotation.props.Found
-import edu.illinois.ncsa.daffodil.schema.annotation.props.gen.NilKind
+import org.apache.daffodil.schema.annotation.props.Found
+import org.apache.daffodil.schema.annotation.props.gen.NilKind
/**
* Term, and what is and isn't a Term, is a key concept in DSOM.
@@ -282,7 +282,7 @@ trait Term
final lazy val isDirectChildOfSequence = parent.isInstanceOf[Sequence]
- import edu.illinois.ncsa.daffodil.util.ListUtils
+ import org.apache.daffodil.util.ListUtils
final lazy val allSiblings: Seq[Term] = {
val res = nearestEnclosingSequence.map { enc =>
diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/TermEncodingMixin.scala b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/TermEncodingMixin.scala
index dbd381a..ec94298 100644
--- a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/TermEncodingMixin.scala
+++ b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/TermEncodingMixin.scala
@@ -30,12 +30,12 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.dsom
+package org.apache.daffodil.dsom
-import edu.illinois.ncsa.daffodil.processors.EncodingRuntimeData
-import edu.illinois.ncsa.daffodil.schema.annotation.props.gen.Representation
-import edu.illinois.ncsa.daffodil.schema.annotation.props.gen.EncodingErrorPolicy
-import edu.illinois.ncsa.daffodil.processors.KnownEncodingMixin
+import org.apache.daffodil.processors.EncodingRuntimeData
+import org.apache.daffodil.schema.annotation.props.gen.Representation
+import org.apache.daffodil.schema.annotation.props.gen.EncodingErrorPolicy
+import org.apache.daffodil.processors.KnownEncodingMixin
/**
* Captures concepts around dfdl:encoding property and Terms.
diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/package.scala b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/package.scala
index 4391be1..421ddc4 100644
--- a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/package.scala
+++ b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/package.scala
@@ -1,4 +1,4 @@
-package edu.illinois.ncsa.daffodil
+package org.apache.daffodil
/**
* DSOM - DFDL Schema Object Model
@@ -76,13 +76,13 @@ package edu.illinois.ncsa.daffodil
*
* Many attributes (in the attribute grammar sense, nothing to do with XML attributes)
* are simply Scala lazy val definitions, but some are declared as OOLAG
- * attributes (using `edu.illinois.ncsa.daffodil.oolag.OOLAG.OOLAGHost.LV`) which
+ * attributes (using `org.apache.daffodil.oolag.OOLAG.OOLAGHost.LV`) which
* provides for gathering of multiple diagnostic messages (`SchemaDefinitionError`)
* before abandoning compilation.
*
* DFDL schema compilation largely occurs by evaluating lazy val members of DSOM
* objects. These include the members of the grammar traits
- * (@see [[edu.illinois.ncsa.daffodil.grammar]] package), which are mixed
+ * (@see [[org.apache.daffodil.grammar]] package), which are mixed
* in to the appropriate DSOM traits/classes.
*
* ===FAQ===
diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/grammar/AlignedMixin.scala b/daffodil-core/src/main/scala/org/apache/daffodil/grammar/AlignedMixin.scala
index d503306..eb05d49 100644
--- a/daffodil-core/src/main/scala/org/apache/daffodil/grammar/AlignedMixin.scala
+++ b/daffodil-core/src/main/scala/org/apache/daffodil/grammar/AlignedMixin.scala
@@ -30,17 +30,17 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.grammar
+package org.apache.daffodil.grammar
-import edu.illinois.ncsa.daffodil.dsom.Term
-import edu.illinois.ncsa.daffodil.dsom.ElementBase
-import edu.illinois.ncsa.daffodil.dsom.ModelGroup
-import edu.illinois.ncsa.daffodil.schema.annotation.props.gen.AlignmentUnits
-import edu.illinois.ncsa.daffodil.schema.annotation.props.gen.LengthKind
-import edu.illinois.ncsa.daffodil.schema.annotation.props.gen.LengthUnits
-import edu.illinois.ncsa.daffodil.util.Math
-import edu.illinois.ncsa.daffodil.dsom.Root
-import edu.illinois.ncsa.daffodil.processors.charset.NBitsWidth_BitsCharset
+import org.apache.daffodil.dsom.Term
+import org.apache.daffodil.dsom.ElementBase
+import org.apache.daffodil.dsom.ModelGroup
+import org.apache.daffodil.schema.annotation.props.gen.AlignmentUnits
+import org.apache.daffodil.schema.annotation.props.gen.LengthKind
+import org.apache.daffodil.schema.annotation.props.gen.LengthUnits
+import org.apache.daffodil.util.Math
+import org.apache.daffodil.dsom.Root
+import org.apache.daffodil.processors.charset.NBitsWidth_BitsCharset
case class AlignmentMultipleOf(nBits: Long) {
def *(that: AlignmentMultipleOf) = AlignmentMultipleOf(Math.gcd(nBits, that.nBits))
diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/grammar/BitOrderMixin.scala b/daffodil-core/src/main/scala/org/apache/daffodil/grammar/BitOrderMixin.scala
index 1a2b4b6..0c047fd 100644
--- a/daffodil-core/src/main/scala/org/apache/daffodil/grammar/BitOrderMixin.scala
+++ b/daffodil-core/src/main/scala/org/apache/daffodil/grammar/BitOrderMixin.scala
@@ -30,14 +30,14 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.grammar
-import edu.illinois.ncsa.daffodil.dsom.Term
-import edu.illinois.ncsa.daffodil.equality.TypeEqual
-import edu.illinois.ncsa.daffodil.schema.annotation.props.gen.BitOrder
-import edu.illinois.ncsa.daffodil.processors.CheckByteAndBitOrderEv
-import edu.illinois.ncsa.daffodil.processors.CheckBitOrderAndCharsetEv
-import edu.illinois.ncsa.daffodil.util.Maybe
-import edu.illinois.ncsa.daffodil.dsom.{ Binary, NoText }
+package org.apache.daffodil.grammar
+import org.apache.daffodil.dsom.Term
+import org.apache.daffodil.equality.TypeEqual
+import org.apache.daffodil.schema.annotation.props.gen.BitOrder
+import org.apache.daffodil.processors.CheckByteAndBitOrderEv
+import org.apache.daffodil.processors.CheckBitOrderAndCharsetEv
+import org.apache.daffodil.util.Maybe
+import org.apache.daffodil.dsom.{ Binary, NoText }
trait BitOrderMixin extends GrammarMixin with ByteOrderAnalysisMixin { self: Term =>
diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/grammar/ByteOrderMixin.scala b/daffodil-core/src/main/scala/org/apache/daffodil/grammar/ByteOrderMixin.scala
index 84d6167..79a9819 100644
--- a/daffodil-core/src/main/scala/org/apache/daffodil/grammar/ByteOrderMixin.scala
+++ b/daffodil-core/src/main/scala/org/apache/daffodil/grammar/ByteOrderMixin.scala
@@ -30,12 +30,12 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.grammar
+package org.apache.daffodil.grammar
-import edu.illinois.ncsa.daffodil.dsom._
-import edu.illinois.ncsa.daffodil.equality._; object ENoWarn { EqualitySuppressUnusedImportWarning() }
-import edu.illinois.ncsa.daffodil.schema.annotation.props.NotFound
-import edu.illinois.ncsa.daffodil.schema.annotation.props.Found
+import org.apache.daffodil.dsom._
+import org.apache.daffodil.equality._; object ENoWarn { EqualitySuppressUnusedImportWarning() }
+import org.apache.daffodil.schema.annotation.props.NotFound
+import org.apache.daffodil.schema.annotation.props.Found
trait ByteOrderAnalysisMixin extends GrammarMixin { self: Term =>
diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/grammar/ChoiceGrammarMixin.scala b/daffodil-core/src/main/scala/org/apache/daffodil/grammar/ChoiceGrammarMixin.scala
index 5309307..ecebf90 100644
--- a/daffodil-core/src/main/scala/org/apache/daffodil/grammar/ChoiceGrammarMixin.scala
+++ b/daffodil-core/src/main/scala/org/apache/daffodil/grammar/ChoiceGrammarMixin.scala
@@ -30,10 +30,10 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.grammar
+package org.apache.daffodil.grammar
-import edu.illinois.ncsa.daffodil.dsom.ChoiceTermBase
-import edu.illinois.ncsa.daffodil.grammar.primitives.ChoiceCombinator
+import org.apache.daffodil.dsom.ChoiceTermBase
+import org.apache.daffodil.grammar.primitives.ChoiceCombinator
trait ChoiceGrammarMixin extends GrammarMixin { self: ChoiceTermBase =>
diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/grammar/ElementBaseGrammarMixin.scala b/daffodil-core/src/main/scala/org/apache/daffodil/grammar/ElementBaseGrammarMixin.scala
index 58866b6..d9bfd73 100644
--- a/daffodil-core/src/main/scala/org/apache/daffodil/grammar/ElementBaseGrammarMixin.scala
+++ b/daffodil-core/src/main/scala/org/apache/daffodil/grammar/ElementBaseGrammarMixin.scala
@@ -30,134 +30,134 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.grammar
-
-import edu.illinois.ncsa.daffodil.exceptions.Assert
-import edu.illinois.ncsa.daffodil.processors._
-import edu.illinois.ncsa.daffodil.schema.annotation.props.gen._
-import edu.illinois.ncsa.daffodil.dpath.NodeInfo.PrimType
-import edu.illinois.ncsa.daffodil.dsom.InitiatedTerminatedMixin
-import edu.illinois.ncsa.daffodil.dsom.ElementBase
+package org.apache.daffodil.grammar
+
+import org.apache.daffodil.exceptions.Assert
+import org.apache.daffodil.processors._
+import org.apache.daffodil.schema.annotation.props.gen._
+import org.apache.daffodil.dpath.NodeInfo.PrimType
+import org.apache.daffodil.dsom.InitiatedTerminatedMixin
+import org.apache.daffodil.dsom.ElementBase
import java.lang.{ Long => JLong }
-import edu.illinois.ncsa.daffodil.dpath.NodeInfo
-import edu.illinois.ncsa.daffodil.dsom.ExpressionCompilers
-import edu.illinois.ncsa.daffodil.xml.GlobalQName
-import edu.illinois.ncsa.daffodil.xml.XMLUtils
-import edu.illinois.ncsa.daffodil.util.PackedSignCodes
-import edu.illinois.ncsa.daffodil.grammar.primitives.InputValueCalc
-import edu.illinois.ncsa.daffodil.grammar.primitives.ZonedTextIntPrim
-import edu.illinois.ncsa.daffodil.grammar.primitives.PaddingInfoMixin
-import edu.illinois.ncsa.daffodil.grammar.primitives.StringOfSpecifiedLength
-import edu.illinois.ncsa.daffodil.grammar.primitives.StringDelimitedEndOfData
-import edu.illinois.ncsa.daffodil.grammar.primitives.PrefixLength
-import edu.illinois.ncsa.daffodil.grammar.primitives.LiteralNilDelimitedEndOfData
-import edu.illinois.ncsa.daffodil.grammar.primitives.HexBinarySpecifiedLength
-import edu.illinois.ncsa.daffodil.grammar.primitives.HexBinaryEndOfBitLimit
-import edu.illinois.ncsa.daffodil.grammar.primitives.HexBinaryDelimitedEndOfData
-import edu.illinois.ncsa.daffodil.grammar.primitives.TrailingSkipRegion
-import edu.illinois.ncsa.daffodil.grammar.primitives.LeadingSkipRegion
-import edu.illinois.ncsa.daffodil.grammar.primitives.AlignmentFill
-import edu.illinois.ncsa.daffodil.grammar.primitives.LogicalNilValue
-import edu.illinois.ncsa.daffodil.grammar.primitives.LiteralValueNilOfSpecifiedLength
-import edu.illinois.ncsa.daffodil.grammar.primitives.LiteralCharacterNilOfSpecifiedLength
-import edu.illinois.ncsa.daffodil.grammar.primitives.BinaryBoolean
-import edu.illinois.ncsa.daffodil.grammar.primitives.SpecifiedLengthPattern
-import edu.illinois.ncsa.daffodil.grammar.primitives.SpecifiedLengthImplicitCharacters
-import edu.illinois.ncsa.daffodil.grammar.primitives.SpecifiedLengthImplicit
-import edu.illinois.ncsa.daffodil.grammar.primitives.SpecifiedLengthExplicitCharacters
-import edu.illinois.ncsa.daffodil.grammar.primitives.SpecifiedLengthExplicit
-import edu.illinois.ncsa.daffodil.grammar.primitives.ConvertTextUnsignedShortPrim
-import edu.illinois.ncsa.daffodil.grammar.primitives.ConvertTextUnsignedLongPrim
-import edu.illinois.ncsa.daffodil.grammar.primitives.ConvertTextUnsignedIntPrim
-import edu.illinois.ncsa.daffodil.grammar.primitives.ConvertTextUnsignedBytePrim
-import edu.illinois.ncsa.daffodil.grammar.primitives.ConvertTextShortPrim
-import edu.illinois.ncsa.daffodil.grammar.primitives.ConvertTextNonNegativeIntegerPrim
-import edu.illinois.ncsa.daffodil.grammar.primitives.ConvertTextLongPrim
-import edu.illinois.ncsa.daffodil.grammar.primitives.ConvertTextIntegerPrim
-import edu.illinois.ncsa.daffodil.grammar.primitives.ConvertTextIntPrim
-import edu.illinois.ncsa.daffodil.grammar.primitives.ConvertTextFloatPrim
-import edu.illinois.ncsa.daffodil.grammar.primitives.ConvertTextDoublePrim
-import edu.illinois.ncsa.daffodil.grammar.primitives.ConvertTextDecimalPrim
-import edu.illinois.ncsa.daffodil.grammar.primitives.ConvertTextCombinator
-import edu.illinois.ncsa.daffodil.grammar.primitives.ConvertTextBytePrim
-import edu.illinois.ncsa.daffodil.grammar.primitives.ConvertTextBooleanPrim
-import edu.illinois.ncsa.daffodil.grammar.primitives.ConvertTextTimePrim
-import edu.illinois.ncsa.daffodil.grammar.primitives.ConvertTextDateTimePrim
-import edu.illinois.ncsa.daffodil.grammar.primitives.ConvertTextDatePrim
-import edu.illinois.ncsa.daffodil.grammar.primitives.Terminator
-import edu.illinois.ncsa.daffodil.grammar.primitives.Initiator
-import edu.illinois.ncsa.daffodil.grammar.primitives.RightFill
-import edu.illinois.ncsa.daffodil.grammar.primitives.RightCenteredPadding
-import edu.illinois.ncsa.daffodil.grammar.primitives.OnlyPadding
-import edu.illinois.ncsa.daffodil.grammar.primitives.OVCRetry
-import edu.illinois.ncsa.daffodil.grammar.primitives.NilLiteralCharacter
-import edu.illinois.ncsa.daffodil.grammar.primitives.LeftCenteredPadding
-import edu.illinois.ncsa.daffodil.grammar.primitives.ElementUnused
-import edu.illinois.ncsa.daffodil.grammar.primitives.ElementParseAndUnspecifiedLength
-import edu.illinois.ncsa.daffodil.grammar.primitives.ElementCombinator
-import edu.illinois.ncsa.daffodil.grammar.primitives.CaptureValueLengthStart
-import edu.illinois.ncsa.daffodil.grammar.primitives.CaptureValueLengthEnd
-import edu.illinois.ncsa.daffodil.grammar.primitives.CaptureContentLengthStart
-import edu.illinois.ncsa.daffodil.grammar.primitives.CaptureContentLengthEnd
-import edu.illinois.ncsa.daffodil.grammar.primitives.SimpleNilOrValue
-import edu.illinois.ncsa.daffodil.grammar.primitives.ComplexNilOrContent
-import edu.illinois.ncsa.daffodil.grammar.primitives.BinaryIntegerRuntimeLength
-import edu.illinois.ncsa.daffodil.grammar.primitives.BinaryIntegerKnownLength
-import edu.illinois.ncsa.daffodil.grammar.primitives.BinaryFloat
-import edu.illinois.ncsa.daffodil.grammar.primitives.BinaryDouble
-import edu.illinois.ncsa.daffodil.grammar.primitives.BinaryDecimalRuntimeLength
-import edu.illinois.ncsa.daffodil.grammar.primitives.BinaryDecimalKnownLength
-import edu.illinois.ncsa.daffodil.grammar.primitives.PackedIntegerRuntimeLength
-import edu.illinois.ncsa.daffodil.grammar.primitives.PackedIntegerKnownLength
-import edu.illinois.ncsa.daffodil.grammar.primitives.PackedIntegerDelimitedEndOfData
-import edu.illinois.ncsa.daffodil.grammar.primitives.PackedDecimalDelimitedEndOfData
-import edu.illinois.ncsa.daffodil.grammar.primitives.PackedDecimalRuntimeLength
-import edu.illinois.ncsa.daffodil.grammar.primitives.PackedDecimalKnownLength
-import edu.illinois.ncsa.daffodil.grammar.primitives.IBM4690PackedIntegerRuntimeLength
-import edu.illinois.ncsa.daffodil.grammar.primitives.IBM4690PackedIntegerKnownLength
-import edu.illinois.ncsa.daffodil.grammar.primitives.IBM4690PackedIntegerDelimitedEndOfData
-import edu.illinois.ncsa.daffodil.grammar.primitives.IBM4690PackedDecimalDelimitedEndOfData
-import edu.illinois.ncsa.daffodil.grammar.primitives.IBM4690PackedDecimalRuntimeLength
-import edu.illinois.ncsa.daffodil.grammar.primitives.IBM4690PackedDecimalKnownLength
-import edu.illinois.ncsa.daffodil.grammar.primitives.BCDIntegerRuntimeLength
-import edu.illinois.ncsa.daffodil.grammar.primitives.BCDIntegerKnownLength
-import edu.illinois.ncsa.daffodil.grammar.primitives.BCDIntegerDelimitedEndOfData
-import edu.illinois.ncsa.daffodil.grammar.primitives.BCDDecimalDelimitedEndOfData
-import edu.illinois.ncsa.daffodil.grammar.primitives.BCDDecimalRuntimeLength
-import edu.illinois.ncsa.daffodil.grammar.primitives.BCDDecimalKnownLength
-import edu.illinois.ncsa.daffodil.grammar.primitives.DynamicEscapeSchemeCombinatorElement
-import edu.illinois.ncsa.daffodil.grammar.primitives.DelimiterStackCombinatorElement
-import edu.illinois.ncsa.daffodil.grammar.primitives.LogicalNilValue
-import edu.illinois.ncsa.daffodil.grammar.primitives.ConvertTextDatePrim
-import edu.illinois.ncsa.daffodil.grammar.primitives.ZonedTextIntPrim
-import edu.illinois.ncsa.daffodil.grammar.primitives.ConvertTextShortPrim
-import edu.illinois.ncsa.daffodil.grammar.primitives.TrailingSkipRegion
-import edu.illinois.ncsa.daffodil.grammar.primitives.DynamicEscapeSchemeCombinatorElement
-import edu.illinois.ncsa.daffodil.grammar.primitives.ConvertTextDecimalPrim
-import edu.illinois.ncsa.daffodil.grammar.primitives.ConvertTextBooleanPrim
-import edu.illinois.ncsa.daffodil.grammar.primitives.ConvertTextBytePrim
-import edu.illinois.ncsa.daffodil.grammar.primitives.AlignmentFill
-import edu.illinois.ncsa.daffodil.grammar.primitives.ComplexNilOrContent
-import edu.illinois.ncsa.daffodil.grammar.primitives.LeadingSkipRegion
-import edu.illinois.ncsa.daffodil.grammar.primitives.ConvertTextFloatPrim
-import edu.illinois.ncsa.daffodil.grammar.primitives.ConvertTextUnsignedIntPrim
-import edu.illinois.ncsa.daffodil.grammar.primitives.ConvertTextUnsignedBytePrim
-import edu.illinois.ncsa.daffodil.grammar.primitives.ConvertTextUnsignedLongPrim
-import edu.illinois.ncsa.daffodil.grammar.primitives.ConvertTextIntPrim
-import edu.illinois.ncsa.daffodil.grammar.primitives.ConvertTextLongPrim
-import edu.illinois.ncsa.daffodil.grammar.primitives.ConvertTextNonNegativeIntegerPrim
-import edu.illinois.ncsa.daffodil.grammar.primitives.ConvertTextUnsignedShortPrim
-import edu.illinois.ncsa.daffodil.grammar.primitives.ConvertTextIntegerPrim
-import edu.illinois.ncsa.daffodil.grammar.primitives.ConvertTextDoublePrim
-import edu.illinois.ncsa.daffodil.grammar.primitives.LiteralCharacterNilOfSpecifiedLength
-import edu.illinois.ncsa.daffodil.grammar.primitives.ConvertTextTimePrim
-import edu.illinois.ncsa.daffodil.grammar.primitives.DelimiterStackCombinatorElement
-import edu.illinois.ncsa.daffodil.grammar.primitives.ConvertTextCombinator
-import edu.illinois.ncsa.daffodil.grammar.primitives.SimpleNilOrValue
-import edu.illinois.ncsa.daffodil.grammar.primitives.ConvertTextDateTimePrim
-import edu.illinois.ncsa.daffodil.grammar.primitives.LiteralValueNilOfSpecifiedLength
-import edu.illinois.ncsa.daffodil.schema.annotation.props.NotFound
-import edu.illinois.ncsa.daffodil.schema.annotation.props.Found
+import org.apache.daffodil.dpath.NodeInfo
+import org.apache.daffodil.dsom.ExpressionCompilers
+import org.apache.daffodil.xml.GlobalQName
+import org.apache.daffodil.xml.XMLUtils
+import org.apache.daffodil.util.PackedSignCodes
+import org.apache.daffodil.grammar.primitives.InputValueCalc
+import org.apache.daffodil.grammar.primitives.ZonedTextIntPrim
+import org.apache.daffodil.grammar.primitives.PaddingInfoMixin
+import org.apache.daffodil.grammar.primitives.StringOfSpecifiedLength
+import org.apache.daffodil.grammar.primitives.StringDelimitedEndOfData
+import org.apache.daffodil.grammar.primitives.PrefixLength
+import org.apache.daffodil.grammar.primitives.LiteralNilDelimitedEndOfData
+import org.apache.daffodil.grammar.primitives.HexBinarySpecifiedLength
+import org.apache.daffodil.grammar.primitives.HexBinaryEndOfBitLimit
+import org.apache.daffodil.grammar.primitives.HexBinaryDelimitedEndOfData
+import org.apache.daffodil.grammar.primitives.TrailingSkipRegion
+import org.apache.daffodil.grammar.primitives.LeadingSkipRegion
+import org.apache.daffodil.grammar.primitives.AlignmentFill
+import org.apache.daffodil.grammar.primitives.LogicalNilValue
+import org.apache.daffodil.grammar.primitives.LiteralValueNilOfSpecifiedLength
+import org.apache.daffodil.grammar.primitives.LiteralCharacterNilOfSpecifiedLength
+import org.apache.daffodil.grammar.primitives.BinaryBoolean
+import org.apache.daffodil.grammar.primitives.SpecifiedLengthPattern
+import org.apache.daffodil.grammar.primitives.SpecifiedLengthImplicitCharacters
+import org.apache.daffodil.grammar.primitives.SpecifiedLengthImplicit
+import org.apache.daffodil.grammar.primitives.SpecifiedLengthExplicitCharacters
+import org.apache.daffodil.grammar.primitives.SpecifiedLengthExplicit
+import org.apache.daffodil.grammar.primitives.ConvertTextUnsignedShortPrim
+import org.apache.daffodil.grammar.primitives.ConvertTextUnsignedLongPrim
+import org.apache.daffodil.grammar.primitives.ConvertTextUnsignedIntPrim
+import org.apache.daffodil.grammar.primitives.ConvertTextUnsignedBytePrim
+import org.apache.daffodil.grammar.primitives.ConvertTextShortPrim
+import org.apache.daffodil.grammar.primitives.ConvertTextNonNegativeIntegerPrim
+import org.apache.daffodil.grammar.primitives.ConvertTextLongPrim
+import org.apache.daffodil.grammar.primitives.ConvertTextIntegerPrim
+import org.apache.daffodil.grammar.primitives.ConvertTextIntPrim
+import org.apache.daffodil.grammar.primitives.ConvertTextFloatPrim
+import org.apache.daffodil.grammar.primitives.ConvertTextDoublePrim
+import org.apache.daffodil.grammar.primitives.ConvertTextDecimalPrim
+import org.apache.daffodil.grammar.primitives.ConvertTextCombinator
+import org.apache.daffodil.grammar.primitives.ConvertTextBytePrim
+import org.apache.daffodil.grammar.primitives.ConvertTextBooleanPrim
+import org.apache.daffodil.grammar.primitives.ConvertTextTimePrim
+import org.apache.daffodil.grammar.primitives.ConvertTextDateTimePrim
+import org.apache.daffodil.grammar.primitives.ConvertTextDatePrim
+import org.apache.daffodil.grammar.primitives.Terminator
+import org.apache.daffodil.grammar.primitives.Initiator
+import org.apache.daffodil.grammar.primitives.RightFill
+import org.apache.daffodil.grammar.primitives.RightCenteredPadding
+import org.apache.daffodil.grammar.primitives.OnlyPadding
+import org.apache.daffodil.grammar.primitives.OVCRetry
+import org.apache.daffodil.grammar.primitives.NilLiteralCharacter
+import org.apache.daffodil.grammar.primitives.LeftCenteredPadding
+import org.apache.daffodil.grammar.primitives.ElementUnused
+import org.apache.daffodil.grammar.primitives.ElementParseAndUnspecifiedLength
+import org.apache.daffodil.grammar.primitives.ElementCombinator
+import org.apache.daffodil.grammar.primitives.CaptureValueLengthStart
+import org.apache.daffodil.grammar.primitives.CaptureValueLengthEnd
+import org.apache.daffodil.grammar.primitives.CaptureContentLengthStart
+import org.apache.daffodil.grammar.primitives.CaptureContentLengthEnd
+import org.apache.daffodil.grammar.primitives.SimpleNilOrValue
+import org.apache.daffodil.grammar.primitives.ComplexNilOrContent
+import org.apache.daffodil.grammar.primitives.BinaryIntegerRuntimeLength
+import org.apache.daffodil.grammar.primitives.BinaryIntegerKnownLength
+import org.apache.daffodil.grammar.primitives.BinaryFloat
+import org.apache.daffodil.grammar.primitives.BinaryDouble
+import org.apache.daffodil.grammar.primitives.BinaryDecimalRuntimeLength
+import org.apache.daffodil.grammar.primitives.BinaryDecimalKnownLength
+import org.apache.daffodil.grammar.primitives.PackedIntegerRuntimeLength
+import org.apache.daffodil.grammar.primitives.PackedIntegerKnownLength
+import org.apache.daffodil.grammar.primitives.PackedIntegerDelimitedEndOfData
+import org.apache.daffodil.grammar.primitives.PackedDecimalDelimitedEndOfData
+import org.apache.daffodil.grammar.primitives.PackedDecimalRuntimeLength
+import org.apache.daffodil.grammar.primitives.PackedDecimalKnownLength
+import org.apache.daffodil.grammar.primitives.IBM4690PackedIntegerRuntimeLength
+import org.apache.daffodil.grammar.primitives.IBM4690PackedIntegerKnownLength
+import org.apache.daffodil.grammar.primitives.IBM4690PackedIntegerDelimitedEndOfData
+import org.apache.daffodil.grammar.primitives.IBM4690PackedDecimalDelimitedEndOfData
+import org.apache.daffodil.grammar.primitives.IBM4690PackedDecimalRuntimeLength
+import org.apache.daffodil.grammar.primitives.IBM4690PackedDecimalKnownLength
+import org.apache.daffodil.grammar.primitives.BCDIntegerRuntimeLength
+import org.apache.daffodil.grammar.primitives.BCDIntegerKnownLength
+import org.apache.daffodil.grammar.primitives.BCDIntegerDelimitedEndOfData
+import org.apache.daffodil.grammar.primitives.BCDDecimalDelimitedEndOfData
+import org.apache.daffodil.grammar.primitives.BCDDecimalRuntimeLength
+import org.apache.daffodil.grammar.primitives.BCDDecimalKnownLength
+import org.apache.daffodil.grammar.primitives.DynamicEscapeSchemeCombinatorElement
+import org.apache.daffodil.grammar.primitives.DelimiterStackCombinatorElement
+import org.apache.daffodil.grammar.primitives.LogicalNilValue
+import org.apache.daffodil.grammar.primitives.ConvertTextDatePrim
+import org.apache.daffodil.grammar.primitives.ZonedTextIntPrim
+import org.apache.daffodil.grammar.primitives.ConvertTextShortPrim
+import org.apache.daffodil.grammar.primitives.TrailingSkipRegion
+import org.apache.daffodil.grammar.primitives.DynamicEscapeSchemeCombinatorElement
+import org.apache.daffodil.grammar.primitives.ConvertTextDecimalPrim
+import org.apache.daffodil.grammar.primitives.ConvertTextBooleanPrim
+import org.apache.daffodil.grammar.primitives.ConvertTextBytePrim
+import org.apache.daffodil.grammar.primitives.AlignmentFill
+import org.apache.daffodil.grammar.primitives.ComplexNilOrContent
+import org.apache.daffodil.grammar.primitives.LeadingSkipRegion
+import org.apache.daffodil.grammar.primitives.ConvertTextFloatPrim
+import org.apache.daffodil.grammar.primitives.ConvertTextUnsignedIntPrim
+import org.apache.daffodil.grammar.primitives.ConvertTextUnsignedBytePrim
+import org.apache.daffodil.grammar.primitives.ConvertTextUnsignedLongPrim
+import org.apache.daffodil.grammar.primitives.ConvertTextIntPrim
+import org.apache.daffodil.grammar.primitives.ConvertTextLongPrim
+import org.apache.daffodil.grammar.primitives.ConvertTextNonNegativeIntegerPrim
+import org.apache.daffodil.grammar.primitives.ConvertTextUnsignedShortPrim
+import org.apache.daffodil.grammar.primitives.ConvertTextIntegerPrim
+import org.apache.daffodil.grammar.primitives.ConvertTextDoublePrim
+import org.apache.daffodil.grammar.primitives.LiteralCharacterNilOfSpecifiedLength
+import org.apache.daffodil.grammar.primitives.ConvertTextTimePrim
+import org.apache.daffodil.grammar.primitives.DelimiterStackCombinatorElement
+import org.apache.daffodil.grammar.primitives.ConvertTextCombinator
+import org.apache.daffodil.grammar.primitives.SimpleNilOrValue
+import org.apache.daffodil.grammar.primitives.ConvertTextDateTimePrim
+import org.apache.daffodil.grammar.primitives.LiteralValueNilOfSpecifiedLength
+import org.apache.daffodil.schema.annotation.props.NotFound
+import org.apache.daffodil.schema.annotation.props.Found
/////////////////////////////////////////////////////////////////
// Elements System
diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/grammar/ElementDeclGrammarMixin.scala b/daffodil-core/src/main/scala/org/apache/daffodil/grammar/ElementDeclGrammarMixin.scala
index 0ae7f8e..ed52db2 100644
--- a/daffodil-core/src/main/scala/org/apache/daffodil/grammar/ElementDeclGrammarMixin.scala
+++ b/daffodil-core/src/main/scala/org/apache/daffodil/grammar/ElementDeclGrammarMixin.scala
@@ -30,10 +30,10 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.grammar
+package org.apache.daffodil.grammar
-import edu.illinois.ncsa.daffodil.grammar.primitives.UnicodeByteOrderMark
-import edu.illinois.ncsa.daffodil.dsom.Root
+import org.apache.daffodil.grammar.primitives.UnicodeByteOrderMark
+import org.apache.daffodil.dsom.Root
trait RootGrammarMixin
extends LocalElementGrammarMixin // can be repeating if not root
diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/grammar/ElementReferenceGrammarMixin.scala b/daffodil-core/src/main/scala/org/apache/daffodil/grammar/ElementReferenceGrammarMixin.scala
index 71c2659..a9fab77 100644
--- a/daffodil-core/src/main/scala/org/apache/daffodil/grammar/ElementReferenceGrammarMixin.scala
+++ b/daffodil-core/src/main/scala/org/apache/daffodil/grammar/ElementReferenceGrammarMixin.scala
@@ -30,9 +30,9 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.grammar
+package org.apache.daffodil.grammar
-import edu.illinois.ncsa.daffodil.dsom.AbstractElementRef
+import org.apache.daffodil.dsom.AbstractElementRef
trait ElementReferenceGrammarMixin { self: AbstractElementRef =>
diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/grammar/Grammar.scala b/daffodil-core/src/main/scala/org/apache/daffodil/grammar/Grammar.scala
index e123489..121fe98 100644
--- a/daffodil-core/src/main/scala/org/apache/daffodil/grammar/Grammar.scala
+++ b/daffodil-core/src/main/scala/org/apache/daffodil/grammar/Grammar.scala
@@ -30,20 +30,20 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.grammar
-
-import edu.illinois.ncsa.daffodil.exceptions.Assert
-import edu.illinois.ncsa.daffodil.Implicits._; object INoWarn { ImplicitsSuppressUnusedImportWarning() }
-import edu.illinois.ncsa.daffodil.processors.unparsers.SeqCompUnparser
-import edu.illinois.ncsa.daffodil.dsom._
-import edu.illinois.ncsa.daffodil.grammar.primitives.Nada
-import edu.illinois.ncsa.daffodil.processors.parsers.SeqCompParser
-import edu.illinois.ncsa.daffodil.processors.parsers.AltCompParser
-import edu.illinois.ncsa.daffodil.compiler.ForUnparser
-import edu.illinois.ncsa.daffodil.compiler.ForParser
-import edu.illinois.ncsa.daffodil.processors.unparsers.NadaUnparser
-import edu.illinois.ncsa.daffodil.processors.parsers.NadaParser
-import edu.illinois.ncsa.daffodil.processors.unparsers.EmptyGramUnparser
+package org.apache.daffodil.grammar
+
+import org.apache.daffodil.exceptions.Assert
+import org.apache.daffodil.Implicits._; object INoWarn { ImplicitsSuppressUnusedImportWarning() }
+import org.apache.daffodil.processors.unparsers.SeqCompUnparser
+import org.apache.daffodil.dsom._
+import org.apache.daffodil.grammar.primitives.Nada
+import org.apache.daffodil.processors.parsers.SeqCompParser
+import org.apache.daffodil.processors.parsers.AltCompParser
+import org.apache.daffodil.compiler.ForUnparser
+import org.apache.daffodil.compiler.ForParser
+import org.apache.daffodil.processors.unparsers.NadaUnparser
+import org.apache.daffodil.processors.parsers.NadaParser
+import org.apache.daffodil.processors.unparsers.EmptyGramUnparser
abstract class UnaryGram(context: Term, rr: => Gram) extends NamedGram(context) {
private lazy val r = rr
diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/grammar/GrammarMixin.scala b/daffodil-core/src/main/scala/org/apache/daffodil/grammar/GrammarMixin.scala
index c79cce6..ba52900 100644
--- a/daffodil-core/src/main/scala/org/apache/daffodil/grammar/GrammarMixin.scala
+++ b/daffodil-core/src/main/scala/org/apache/daffodil/grammar/GrammarMixin.scala
@@ -30,9 +30,9 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.grammar
-import edu.illinois.ncsa.daffodil.compiler._
-import edu.illinois.ncsa.daffodil.dsom.SchemaComponent
+package org.apache.daffodil.grammar
+import org.apache.daffodil.compiler._
+import org.apache.daffodil.dsom.SchemaComponent
trait GrammarMixin {
diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/grammar/GrammarMixins.scala b/daffodil-core/src/main/scala/org/apache/daffodil/grammar/GrammarMixins.scala
index f8afb1e..00f3c35 100644
--- a/daffodil-core/src/main/scala/org/apache/daffodil/grammar/GrammarMixins.scala
+++ b/daffodil-core/src/main/scala/org/apache/daffodil/grammar/GrammarMixins.scala
@@ -30,10 +30,10 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.grammar
-import edu.illinois.ncsa.daffodil.dsom.ComplexTypeBase
-import edu.illinois.ncsa.daffodil.dsom.GroupRef
-import edu.illinois.ncsa.daffodil.grammar.primitives.ComplexTypeCombinator
+package org.apache.daffodil.grammar
+import org.apache.daffodil.dsom.ComplexTypeBase
+import org.apache.daffodil.dsom.GroupRef
+import org.apache.daffodil.grammar.primitives.ComplexTypeCombinator
trait GroupRefGrammarMixin extends GrammarMixin { self: GroupRef =>
diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/grammar/GrammarTerm.scala b/daffodil-core/src/main/scala/org/apache/daffodil/grammar/GrammarTerm.scala
index ca1aa63..d6ad420 100644
--- a/daffodil-core/src/main/scala/org/apache/daffodil/grammar/GrammarTerm.scala
+++ b/daffodil-core/src/main/scala/org/apache/daffodil/grammar/GrammarTerm.scala
@@ -30,17 +30,17 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.grammar
-
-import edu.illinois.ncsa.daffodil.exceptions.Assert
-import edu.illinois.ncsa.daffodil.processors.parsers.Parser
-import edu.illinois.ncsa.daffodil.processors.unparsers.Unparser
-import edu.illinois.ncsa.daffodil.grammar.primitives.Nada
-import edu.illinois.ncsa.daffodil.dsom.SchemaComponent
-import edu.illinois.ncsa.daffodil.oolag.OOLAG.OOLAGHostImpl
-import edu.illinois.ncsa.daffodil.compiler.ParserOrUnparser
-import edu.illinois.ncsa.daffodil.util.Misc
-import edu.illinois.ncsa.daffodil.compiler.BothParserAndUnparser
+package org.apache.daffodil.grammar
+
+import org.apache.daffodil.exceptions.Assert
+import org.apache.daffodil.processors.parsers.Parser
+import org.apache.daffodil.processors.unparsers.Unparser
+import org.apache.daffodil.grammar.primitives.Nada
+import org.apache.daffodil.dsom.SchemaComponent
+import org.apache.daffodil.oolag.OOLAG.OOLAGHostImpl
+import org.apache.daffodil.compiler.ParserOrUnparser
+import org.apache.daffodil.util.Misc
+import org.apache.daffodil.compiler.BothParserAndUnparser
trait HasNoUnparser {
final lazy val unparser: Unparser = hasNoUnparser
diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/grammar/HasStatementsGrammarMixin.scala b/daffodil-core/src/main/scala/org/apache/daffodil/grammar/HasStatementsGrammarMixin.scala
index 03744c2..aa740fe 100644
--- a/daffodil-core/src/main/scala/org/apache/daffodil/grammar/HasStatementsGrammarMixin.scala
+++ b/daffodil-core/src/main/scala/org/apache/daffodil/grammar/HasStatementsGrammarMixin.scala
@@ -30,9 +30,9 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.grammar
+package org.apache.daffodil.grammar
-import edu.illinois.ncsa.daffodil.dsom.Term
+import org.apache.daffodil.dsom.Term
trait HasStatementsGrammarMixin extends GrammarMixin { self: Term =>
diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/grammar/LocalElementGrammarMixin.scala b/daffodil-core/src/main/scala/org/apache/daffodil/grammar/LocalElementGrammarMixin.scala
index 84a2db3..7bbc51a 100644
--- a/daffodil-core/src/main/scala/org/apache/daffodil/grammar/LocalElementGrammarMixin.scala
+++ b/daffodil-core/src/main/scala/org/apache/daffodil/grammar/LocalElementGrammarMixin.scala
@@ -30,22 +30,22 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.grammar
-import edu.illinois.ncsa.daffodil.schema.annotation.props._
-import edu.illinois.ncsa.daffodil.schema.annotation.props.gen._
-import edu.illinois.ncsa.daffodil.dsom.ElementBase
-import edu.illinois.ncsa.daffodil.equality._; object ENoWarn2 { EqualitySuppressUnusedImportWarning() }
-import edu.illinois.ncsa.daffodil.grammar.primitives.StopValue
-import edu.illinois.ncsa.daffodil.grammar.primitives.NotStopValue
-import edu.illinois.ncsa.daffodil.grammar.primitives.RepUnbounded
-import edu.illinois.ncsa.daffodil.grammar.primitives.RepExactlyTotalOccursCount
-import edu.illinois.ncsa.daffodil.grammar.primitives.RepExactlyTotalN
-import edu.illinois.ncsa.daffodil.grammar.primitives.RepExactlyN
-import edu.illinois.ncsa.daffodil.grammar.primitives.RepAtMostTotalN
-import edu.illinois.ncsa.daffodil.grammar.primitives.RepAtMostOccursCount
-import edu.illinois.ncsa.daffodil.grammar.primitives.OccursCountExpression
-import edu.illinois.ncsa.daffodil.grammar.primitives.OptionalCombinator
-import edu.illinois.ncsa.daffodil.grammar.primitives.ArrayCombinator
+package org.apache.daffodil.grammar
+import org.apache.daffodil.schema.annotation.props._
+import org.apache.daffodil.schema.annotation.props.gen._
+import org.apache.daffodil.dsom.ElementBase
+import org.apache.daffodil.equality._; object ENoWarn2 { EqualitySuppressUnusedImportWarning() }
+import org.apache.daffodil.grammar.primitives.StopValue
+import org.apache.daffodil.grammar.primitives.NotStopValue
+import org.apache.daffodil.grammar.primitives.RepUnbounded
+import org.apache.daffodil.grammar.primitives.RepExactlyTotalOccursCount
+import org.apache.daffodil.grammar.primitives.RepExactlyTotalN
+import org.apache.daffodil.grammar.primitives.RepExactlyN
+import org.apache.daffodil.grammar.primitives.RepAtMostTotalN
+import org.apache.daffodil.grammar.primitives.RepAtMostOccursCount
+import org.apache.daffodil.grammar.primitives.OccursCountExpression
+import org.apache.daffodil.grammar.primitives.OptionalCombinator
+import org.apache.daffodil.grammar.primitives.ArrayCombinator
trait LocalElementGrammarMixin extends GrammarMixin { self: ElementBase =>
diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/grammar/ModelGroupGrammarMixin.scala b/daffodil-core/src/main/scala/org/apache/daffodil/grammar/ModelGroupGrammarMixin.scala
index e8b03ef..abd67d0 100644
--- a/daffodil-core/src/main/scala/org/apache/daffodil/grammar/ModelGroupGrammarMixin.scala
+++ b/daffodil-core/src/main/scala/org/apache/daffodil/grammar/ModelGroupGrammarMixin.scala
@@ -30,18 +30,18 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.grammar
+package org.apache.daffodil.grammar
-import edu.illinois.ncsa.daffodil.schema.annotation.props.gen._
-import edu.illinois.ncsa.daffodil.dsom.InitiatedTerminatedMixin
-import edu.illinois.ncsa.daffodil.dsom.ModelGroup
-import edu.illinois.ncsa.daffodil.grammar.primitives.TrailingSkipRegion
-import edu.illinois.ncsa.daffodil.grammar.primitives.LeadingSkipRegion
-import edu.illinois.ncsa.daffodil.grammar.primitives.AlignmentFill
-import edu.illinois.ncsa.daffodil.grammar.primitives.DelimiterStackCombinatorSequence
-import edu.illinois.ncsa.daffodil.grammar.primitives.DelimiterStackCombinatorChoice
-import edu.illinois.ncsa.daffodil.dsom.SequenceTermBase
-import edu.illinois.ncsa.daffodil.dsom.ChoiceTermBase
+import org.apache.daffodil.schema.annotation.props.gen._
+import org.apache.daffodil.dsom.InitiatedTerminatedMixin
+import org.apache.daffodil.dsom.ModelGroup
+import org.apache.daffodil.grammar.primitives.TrailingSkipRegion
+import org.apache.daffodil.grammar.primitives.LeadingSkipRegion
+import org.apache.daffodil.grammar.primitives.AlignmentFill
+import org.apache.daffodil.grammar.primitives.DelimiterStackCombinatorSequence
+import org.apache.daffodil.grammar.primitives.DelimiterStackCombinatorChoice
+import org.apache.daffodil.dsom.SequenceTermBase
+import org.apache.daffodil.dsom.ChoiceTermBase
trait ModelGroupGrammarMixin
extends InitiatedTerminatedMixin
diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/grammar/Production.scala b/daffodil-core/src/main/scala/org/apache/daffodil/grammar/Production.scala
index e2fbb63..9f1aee9 100644
--- a/daffodil-core/src/main/scala/org/apache/daffodil/grammar/Production.scala
+++ b/daffodil-core/src/main/scala/org/apache/daffodil/grammar/Production.scala
@@ -30,15 +30,15 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.grammar
+package org.apache.daffodil.grammar
-import edu.illinois.ncsa.daffodil.dsom.SchemaComponent
-import edu.illinois.ncsa.daffodil.compiler.ParserOrUnparser
-import edu.illinois.ncsa.daffodil.processors.parsers.NadaParser
-import edu.illinois.ncsa.daffodil.processors.unparsers.NadaUnparser
-import edu.illinois.ncsa.daffodil.compiler.ForUnparser
-import edu.illinois.ncsa.daffodil.compiler.ForParser
-import edu.illinois.ncsa.daffodil.util.LogLevel
+import org.apache.daffodil.dsom.SchemaComponent
+import org.apache.daffodil.compiler.ParserOrUnparser
+import org.apache.daffodil.processors.parsers.NadaParser
+import org.apache.daffodil.processors.unparsers.NadaUnparser
+import org.apache.daffodil.compiler.ForUnparser
+import org.apache.daffodil.compiler.ForParser
+import org.apache.daffodil.util.LogLevel
/**
* Prod or Grammar Production
diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/grammar/SequenceGrammarMixin.scala b/daffodil-core/src/main/scala/org/apache/daffodil/grammar/SequenceGrammarMixin.scala
index 383cf53..137e4ad 100644
--- a/daffodil-core/src/main/scala/org/apache/daffodil/grammar/SequenceGrammarMixin.scala
+++ b/daffodil-core/src/main/scala/org/apache/daffodil/grammar/SequenceGrammarMixin.scala
@@ -30,10 +30,10 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.grammar
-import edu.illinois.ncsa.daffodil.schema.annotation.props.gen._
-import edu.illinois.ncsa.daffodil.grammar.primitives.SequenceCombinator
-import edu.illinois.ncsa.daffodil.dsom.SequenceTermBase
+package org.apache.daffodil.grammar
+import org.apache.daffodil.schema.annotation.props.gen._
+import org.apache.daffodil.grammar.primitives.SequenceCombinator
+import org.apache.daffodil.dsom.SequenceTermBase
trait SequenceGrammarMixin extends GrammarMixin { self: SequenceTermBase =>
diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/grammar/TermGrammarMixin.scala b/daffodil-core/src/main/scala/org/apache/daffodil/grammar/TermGrammarMixin.scala
index fa46716..20e5a0d 100644
--- a/daffodil-core/src/main/scala/org/apache/daffodil/grammar/TermGrammarMixin.scala
+++ b/daffodil-core/src/main/scala/org/apache/daffodil/grammar/TermGrammarMixin.scala
@@ -30,15 +30,15 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.grammar
-import edu.illinois.ncsa.daffodil.exceptions.Assert
-import edu.illinois.ncsa.daffodil.dsom.DFDLNewVariableInstance
-import edu.illinois.ncsa.daffodil.dsom.ElementBase
-import edu.illinois.ncsa.daffodil.dsom.Term
-import edu.illinois.ncsa.daffodil.grammar.primitives.OptionalInfixSep
-import edu.illinois.ncsa.daffodil.grammar.primitives.Nada
-import edu.illinois.ncsa.daffodil.grammar.primitives.MandatoryTextAlignment
-import edu.illinois.ncsa.daffodil.grammar.primitives.Separator
+package org.apache.daffodil.grammar
+import org.apache.daffodil.exceptions.Assert
+import org.apache.daffodil.dsom.DFDLNewVariableInstance
+import org.apache.daffodil.dsom.ElementBase
+import org.apache.daffodil.dsom.Term
+import org.apache.daffodil.grammar.primitives.OptionalInfixSep
+import org.apache.daffodil.grammar.primitives.Nada
+import org.apache.daffodil.grammar.primitives.MandatoryTextAlignment
+import org.apache.daffodil.grammar.primitives.Separator
/////////////////////////////////////////////////////////////////
// Groups System
diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/grammar/package.scala b/daffodil-core/src/main/scala/org/apache/daffodil/grammar/package.scala
index 0deae3a..4afa0ce 100644
--- a/daffodil-core/src/main/scala/org/apache/daffodil/grammar/package.scala
+++ b/daffodil-core/src/main/scala/org/apache/daffodil/grammar/package.scala
@@ -1,4 +1,4 @@
-package edu.illinois.ncsa.daffodil
+package org.apache.daffodil
/**
* Grammar Mixins for Schema Compilation
@@ -24,7 +24,7 @@ package edu.illinois.ncsa.daffodil
* operators for expressing the rules. The concrete classes are the
* terminals of the grammar (instances of [[Terminal]]) and these
* are either primitives or combinators. The primitves and combinators are
- * defined in the [[edu.illinois.ncsa.daffodil.grammar.primitives]] package.
+ * defined in the [[org.apache.daffodil.grammar.primitives]] package.
*
* This all works very much like Scala's `scala.util.parsing.combinator` library,
* which is described in the [[http://www.artima.com/pins1ed/ Programming in Scala]] book
@@ -78,8 +78,8 @@ package edu.illinois.ncsa.daffodil
* method (`parser()` or `unparser()`) on the grammar object.
* Recursively each combinator constructs an instance of
* a class that implements
- * `edu.illinois.ncsa.daffodil.processors.parsers.Parser` (or
- * `edu.illinois.ncsa.daffodil.processors.unparsers.Unparser`)
+ * `org.apache.daffodil.processors.parsers.Parser` (or
+ * `org.apache.daffodil.processors.unparsers.Unparser`)
* and that instance recursively calls the parsers (or unparsers) generated
* from the parts of the grammar which did not optimize themselves away.
* Primitves construct atomic primitive parsers (and unparsers) for things like
diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/grammar/primitives/ElementCombinator.scala b/daffodil-core/src/main/scala/org/apache/daffodil/grammar/primitives/ElementCombinator.scala
index 3b41270..6c8c4ba 100644
--- a/daffodil-core/src/main/scala/org/apache/daffodil/grammar/primitives/ElementCombinator.scala
+++ b/daffodil-core/src/main/scala/org/apache/daffodil/grammar/primitives/ElementCombinator.scala
@@ -30,47 +30,47 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.grammar.primitives
-
-import edu.illinois.ncsa.daffodil.dsom.ElementBase
-import edu.illinois.ncsa.daffodil.equality.TypeEqual
-import edu.illinois.ncsa.daffodil.exceptions.Assert
-import edu.illinois.ncsa.daffodil.grammar.Gram
-import edu.illinois.ncsa.daffodil.grammar.HasNoUnparser
-import edu.illinois.ncsa.daffodil.grammar.NamedGram
-import edu.illinois.ncsa.daffodil.grammar.Terminal
-import edu.illinois.ncsa.daffodil.processors.parsers.ChoiceElementParser
-import edu.illinois.ncsa.daffodil.processors.parsers.ElementParser
-import edu.illinois.ncsa.daffodil.processors.parsers.ElementParserNoRep
-import edu.illinois.ncsa.daffodil.processors.parsers.Parser
-import edu.illinois.ncsa.daffodil.processors.parsers.CaptureEndOfContentLengthParser
-import edu.illinois.ncsa.daffodil.processors.parsers.CaptureEndOfValueLengthParser
-import edu.illinois.ncsa.daffodil.processors.parsers.CaptureStartOfContentLengthParser
-import edu.illinois.ncsa.daffodil.processors.parsers.CaptureStartOfValueLengthParser
-import edu.illinois.ncsa.daffodil.processors.unparsers.CaptureEndOfContentLengthUnparser
-import edu.illinois.ncsa.daffodil.processors.unparsers.CaptureEndOfValueLengthUnparser
-import edu.illinois.ncsa.daffodil.processors.unparsers.CaptureStartOfContentLengthUnparser
-import edu.illinois.ncsa.daffodil.processors.unparsers.CaptureStartOfValueLengthUnparser
-import edu.illinois.ncsa.daffodil.processors.unparsers.ElementOVCSpecifiedLengthUnparser
-import edu.illinois.ncsa.daffodil.processors.unparsers.ElementOVCUnspecifiedLengthUnparser
-import edu.illinois.ncsa.daffodil.processors.unparsers.ElementSpecifiedLengthUnparser
-import edu.illinois.ncsa.daffodil.processors.unparsers.ElementUnparserNoRep
-import edu.illinois.ncsa.daffodil.processors.unparsers.ElementUnspecifiedLengthUnparser
-import edu.illinois.ncsa.daffodil.processors.unparsers.ElementUnusedUnparser
-import edu.illinois.ncsa.daffodil.processors.unparsers.LeftCenteredPaddingUnparser
-import edu.illinois.ncsa.daffodil.processors.unparsers.NilLiteralCharacterUnparser
-import edu.illinois.ncsa.daffodil.processors.unparsers.OVCRetryUnparser
-import edu.illinois.ncsa.daffodil.processors.unparsers.OnlyPaddingUnparser
-import edu.illinois.ncsa.daffodil.processors.unparsers.RightCenteredPaddingUnparser
-import edu.illinois.ncsa.daffodil.processors.unparsers.RightFillUnparser
-import edu.illinois.ncsa.daffodil.processors.unparsers.Unparser
-import edu.illinois.ncsa.daffodil.schema.annotation.props.gen.LengthKind
-import edu.illinois.ncsa.daffodil.schema.annotation.props.gen.NilKind
-import edu.illinois.ncsa.daffodil.schema.annotation.props.gen.Representation
-import edu.illinois.ncsa.daffodil.schema.annotation.props.gen.TestKind
-import edu.illinois.ncsa.daffodil.util.Maybe
-import edu.illinois.ncsa.daffodil.processors.parsers.NadaParser
-import edu.illinois.ncsa.daffodil.processors.unparsers.NadaUnparser
+package org.apache.daffodil.grammar.primitives
+
+import org.apache.daffodil.dsom.ElementBase
+import org.apache.daffodil.equality.TypeEqual
+import org.apache.daffodil.exceptions.Assert
+import org.apache.daffodil.grammar.Gram
+import org.apache.daffodil.grammar.HasNoUnparser
+import org.apache.daffodil.grammar.NamedGram
+import org.apache.daffodil.grammar.Terminal
+import org.apache.daffodil.processors.parsers.ChoiceElementParser
+import org.apache.daffodil.processors.parsers.ElementParser
+import org.apache.daffodil.processors.parsers.ElementParserNoRep
+import org.apache.daffodil.processors.parsers.Parser
+import org.apache.daffodil.processors.parsers.CaptureEndOfContentLengthParser
+import org.apache.daffodil.processors.parsers.CaptureEndOfValueLengthParser
+import org.apache.daffodil.processors.parsers.CaptureStartOfContentLengthParser
+import org.apache.daffodil.processors.parsers.CaptureStartOfValueLengthParser
+import org.apache.daffodil.processors.unparsers.CaptureEndOfContentLengthUnparser
+import org.apache.daffodil.processors.unparsers.CaptureEndOfValueLengthUnparser
+import org.apache.daffodil.processors.unparsers.CaptureStartOfContentLengthUnparser
+import org.apache.daffodil.processors.unparsers.CaptureStartOfValueLengthUnparser
+import org.apache.daffodil.processors.unparsers.ElementOVCSpecifiedLengthUnparser
+import org.apache.daffodil.processors.unparsers.ElementOVCUnspecifiedLengthUnparser
+import org.apache.daffodil.processors.unparsers.ElementSpecifiedLengthUnparser
+import org.apache.daffodil.processors.unparsers.ElementUnparserNoRep
+import org.apache.daffodil.processors.unparsers.ElementUnspecifiedLengthUnparser
+import org.apache.daffodil.processors.unparsers.ElementUnusedUnparser
+import org.apache.daffodil.processors.unparsers.LeftCenteredPaddingUnparser
+import org.apache.daffodil.processors.unparsers.NilLiteralCharacterUnparser
+import org.apache.daffodil.processors.unparsers.OVCRetryUnparser
+import org.apache.daffodil.processors.unparsers.OnlyPaddingUnparser
+import org.apache.daffodil.processors.unparsers.RightCenteredPaddingUnparser
+import org.apache.daffodil.processors.unparsers.RightFillUnparser
+import org.apache.daffodil.processors.unparsers.Unparser
+import org.apache.daffodil.schema.annotation.props.gen.LengthKind
+import org.apache.daffodil.schema.annotation.props.gen.NilKind
+import org.apache.daffodil.schema.annotation.props.gen.Representation
+import org.apache.daffodil.schema.annotation.props.gen.TestKind
+import org.apache.daffodil.util.Maybe
+import org.apache.daffodil.processors.parsers.NadaParser
+import org.apache.daffodil.processors.unparsers.NadaUnparser
/**
* This uber combinator exists because we (currently) do quite different things
diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/grammar/primitives/Nada.scala b/daffodil-core/src/main/scala/org/apache/daffodil/grammar/primitives/Nada.scala
index d09cd85..2473524 100644
--- a/daffodil-core/src/main/scala/org/apache/daffodil/grammar/primitives/Nada.scala
+++ b/daffodil-core/src/main/scala/org/apache/daffodil/grammar/primitives/Nada.scala
@@ -30,12 +30,12 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.grammar.primitives
+package org.apache.daffodil.grammar.primitives
-import edu.illinois.ncsa.daffodil.grammar.Terminal
-import edu.illinois.ncsa.daffodil.dsom.Term
-import edu.illinois.ncsa.daffodil.grammar.HasNoUnparser
-import edu.illinois.ncsa.daffodil.processors.parsers.NadaParser
+import org.apache.daffodil.grammar.Terminal
+import org.apache.daffodil.dsom.Term
+import org.apache.daffodil.grammar.HasNoUnparser
+import org.apache.daffodil.processors.parsers.NadaParser
case class Nada(sc: Term) extends Terminal(sc, true) with HasNoUnparser {
// cannot optimize this out! It is used as an alternative to things
diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/grammar/primitives/NilEmptyCombinators.scala b/daffodil-core/src/main/scala/org/apache/daffodil/grammar/primitives/NilEmptyCombinators.scala
index d6d8cdf..2fa8901 100644
--- a/daffodil-core/src/main/scala/org/apache/daffodil/grammar/primitives/NilEmptyCombinators.scala
+++ b/daffodil-core/src/main/scala/org/apache/daffodil/grammar/primitives/NilEmptyCombinators.scala
@@ -30,20 +30,20 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.grammar.primitives
-
-import edu.illinois.ncsa.daffodil.grammar.Gram
-import edu.illinois.ncsa.daffodil.exceptions.Assert
-import edu.illinois.ncsa.daffodil.dsom.ElementBase
-import edu.illinois.ncsa.daffodil.processors.parsers.SimpleNilOrEmptyOrValueParser
-import edu.illinois.ncsa.daffodil.processors.unparsers.SimpleNilOrEmptyOrValueUnparser
-import edu.illinois.ncsa.daffodil.processors.parsers.SimpleNilOrValueParser
-import edu.illinois.ncsa.daffodil.processors.unparsers.SimpleNilOrValueUnparser
-import edu.illinois.ncsa.daffodil.processors.parsers.SimpleEmptyOrValueParser
-import edu.illinois.ncsa.daffodil.processors.unparsers.SimpleEmptyOrValueUnparser
-import edu.illinois.ncsa.daffodil.processors.parsers.ComplexNilOrContentParser
-import edu.illinois.ncsa.daffodil.processors.unparsers.ComplexNilOrContentUnparser
-import edu.illinois.ncsa.daffodil.grammar.Terminal
+package org.apache.daffodil.grammar.primitives
+
+import org.apache.daffodil.grammar.Gram
+import org.apache.daffodil.exceptions.Assert
+import org.apache.daffodil.dsom.ElementBase
+import org.apache.daffodil.processors.parsers.SimpleNilOrEmptyOrValueParser
+import org.apache.daffodil.processors.unparsers.SimpleNilOrEmptyOrValueUnparser
+import org.apache.daffodil.processors.parsers.SimpleNilOrValueParser
+import org.apache.daffodil.processors.unparsers.SimpleNilOrValueUnparser
+import org.apache.daffodil.processors.parsers.SimpleEmptyOrValueParser
+import org.apache.daffodil.processors.unparsers.SimpleEmptyOrValueUnparser
+import org.apache.daffodil.processors.parsers.ComplexNilOrContentParser
+import org.apache.daffodil.processors.unparsers.ComplexNilOrContentUnparser
+import org.apache.daffodil.grammar.Terminal
case class SimpleNilOrEmptyOrValue(ctxt: ElementBase, nilGram: Gram, emptyGram: Gram, valueGram: Gram) extends Terminal(ctxt, true) {
Assert.invariant(!nilGram.isEmpty)
diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/grammar/primitives/Padded.scala b/daffodil-core/src/main/scala/org/apache/daffodil/grammar/primitives/Padded.scala
index 57b26ed..f42717e 100644
--- a/daffodil-core/src/main/scala/org/apache/daffodil/grammar/primitives/Padded.scala
+++ b/daffodil-core/src/main/scala/org/apache/daffodil/grammar/primitives/Padded.scala
@@ -30,23 +30,23 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.grammar.primitives
+package org.apache.daffodil.grammar.primitives
-import edu.illinois.ncsa.daffodil.dpath.NodeInfo.PrimType
-import edu.illinois.ncsa.daffodil.dsom.ElementBase
-import edu.illinois.ncsa.daffodil.grammar.Gram
-import edu.illinois.ncsa.daffodil.processors.TextJustificationType
-import edu.illinois.ncsa.daffodil.processors.TextTruncationType
-import edu.illinois.ncsa.daffodil.schema.annotation.props.gen.LengthKind
-import edu.illinois.ncsa.daffodil.schema.annotation.props.gen.Representation
-import edu.illinois.ncsa.daffodil.schema.annotation.props.gen.TextBooleanJustification
-import edu.illinois.ncsa.daffodil.schema.annotation.props.gen.TextCalendarJustification
-import edu.illinois.ncsa.daffodil.schema.annotation.props.gen.TextNumberJustification
-import edu.illinois.ncsa.daffodil.schema.annotation.props.gen.TextPadKind
-import edu.illinois.ncsa.daffodil.schema.annotation.props.gen.TextStringJustification
-import edu.illinois.ncsa.daffodil.schema.annotation.props.gen.TextTrimKind
-import edu.illinois.ncsa.daffodil.schema.annotation.props.gen.YesNo
-import edu.illinois.ncsa.daffodil.util.MaybeChar
+import org.apache.daffodil.dpath.NodeInfo.PrimType
+import org.apache.daffodil.dsom.ElementBase
+import org.apache.daffodil.grammar.Gram
+import org.apache.daffodil.processors.TextJustificationType
+import org.apache.daffodil.processors.TextTruncationType
+import org.apache.daffodil.schema.annotation.props.gen.LengthKind
+import org.apache.daffodil.schema.annotation.props.gen.Representation
+import org.apache.daffodil.schema.annotation.props.gen.TextBooleanJustification
+import org.apache.daffodil.schema.annotation.props.gen.TextCalendarJustification
+import org.apache.daffodil.schema.annotation.props.gen.TextNumberJustification
+import org.apache.daffodil.schema.annotation.props.gen.TextPadKind
+import org.apache.daffodil.schema.annotation.props.gen.TextStringJustification
+import org.apache.daffodil.schema.annotation.props.gen.TextTrimKind
+import org.apache.daffodil.schema.annotation.props.gen.YesNo
+import org.apache.daffodil.util.MaybeChar
trait PaddingInfoMixin {
def eBase: ElementBase
diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/grammar/primitives/PatternChecker.scala b/daffodil-core/src/main/scala/org/apache/daffodil/grammar/primitives/PatternChecker.scala
index dcd9447..6405983 100644
--- a/daffodil-core/src/main/scala/org/apache/daffodil/grammar/primitives/PatternChecker.scala
+++ b/daffodil-core/src/main/scala/org/apache/daffodil/grammar/primitives/PatternChecker.scala
@@ -30,11 +30,11 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.grammar.primitives
+package org.apache.daffodil.grammar.primitives
-import edu.illinois.ncsa.daffodil.exceptions.SavesErrorsAndWarnings
+import org.apache.daffodil.exceptions.SavesErrorsAndWarnings
import java.util.regex.Pattern
-import edu.illinois.ncsa.daffodil.util.Misc
+import org.apache.daffodil.util.Misc
import java.util.regex.PatternSyntaxException
/**
diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/grammar/primitives/Primitives.scala b/daffodil-core/src/main/scala/org/apache/daffodil/grammar/primitives/Primitives.scala
index 7baaf30..2a567c8 100644
--- a/daffodil-core/src/main/scala/org/apache/daffodil/grammar/primitives/Primitives.scala
+++ b/daffodil-core/src/main/scala/org/apache/daffodil/grammar/primitives/Primitives.scala
@@ -30,11 +30,11 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.grammar.primitives
+package org.apache.daffodil.grammar.primitives
-import edu.illinois.ncsa.daffodil.dsom._
-import edu.illinois.ncsa.daffodil.grammar.Terminal
-import edu.illinois.ncsa.daffodil.grammar.HasNoUnparser
+import org.apache.daffodil.dsom._
+import org.apache.daffodil.grammar.Terminal
+import org.apache.daffodil.grammar.HasNoUnparser
abstract class Primitive(e: Term, guard: Boolean = false)
extends Terminal(e, guard) {
diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/grammar/primitives/PrimitivesBCD.scala b/daffodil-core/src/main/scala/org/apache/daffodil/grammar/primitives/PrimitivesBCD.scala
index 7cb40d4..07257f7 100644
--- a/daffodil-core/src/main/scala/org/apache/daffodil/grammar/primitives/PrimitivesBCD.scala
+++ b/daffodil-core/src/main/scala/org/apache/daffodil/grammar/primitives/PrimitivesBCD.scala
@@ -12,19 +12,19 @@
* limitations under the License.
*/
-package edu.illinois.ncsa.daffodil.grammar.primitives
-
-import edu.illinois.ncsa.daffodil.grammar.Terminal
-import edu.illinois.ncsa.daffodil.dsom.ElementBase
-import edu.illinois.ncsa.daffodil.processors.parsers.BCDIntegerRuntimeLengthParser
-import edu.illinois.ncsa.daffodil.processors.parsers.BCDIntegerKnownLengthParser
-import edu.illinois.ncsa.daffodil.processors.parsers.BCDDecimalRuntimeLengthParser
-import edu.illinois.ncsa.daffodil.processors.parsers.BCDDecimalKnownLengthParser
-import edu.illinois.ncsa.daffodil.processors.unparsers.Unparser
-import edu.illinois.ncsa.daffodil.processors.unparsers.BCDIntegerRuntimeLengthUnparser
-import edu.illinois.ncsa.daffodil.processors.unparsers.BCDIntegerKnownLengthUnparser
-import edu.illinois.ncsa.daffodil.processors.unparsers.BCDDecimalRuntimeLengthUnparser
-import edu.illinois.ncsa.daffodil.processors.unparsers.BCDDecimalKnownLengthUnparser
+package org.apache.daffodil.grammar.primitives
+
+import org.apache.daffodil.grammar.Terminal
+import org.apache.daffodil.dsom.ElementBase
+import org.apache.daffodil.processors.parsers.BCDIntegerRuntimeLengthParser
+import org.apache.daffodil.processors.parsers.BCDIntegerKnownLengthParser
+import org.apache.daffodil.processors.parsers.BCDDecimalRuntimeLengthParser
+import org.apache.daffodil.processors.parsers.BCDDecimalKnownLengthParser
+import org.apache.daffodil.processors.unparsers.Unparser
+import org.apache.daffodil.processors.unparsers.BCDIntegerRuntimeLengthUnparser
+import org.apache.daffodil.processors.unparsers.BCDIntegerKnownLengthUnparser
+import org.apache.daffodil.processors.unparsers.BCDDecimalRuntimeLengthUnparser
+import org.apache.daffodil.processors.unparsers.BCDDecimalKnownLengthUnparser
class BCDIntegerRuntimeLength(val e: ElementBase) extends Terminal(e, true) {
override lazy val parser = new BCDIntegerRuntimeLengthParser(e.elementRuntimeData, e.lengthEv, e.lengthUnits)
diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/grammar/primitives/PrimitivesBinaryBoolean.scala b/daffodil-core/src/main/scala/org/apache/daffodil/grammar/primitives/PrimitivesBinaryBoolean.scala
index 192fdfa..2053ae2 100644
--- a/daffodil-core/src/main/scala/org/apache/daffodil/grammar/primitives/PrimitivesBinaryBoolean.scala
+++ b/daffodil-core/src/main/scala/org/apache/daffodil/grammar/primitives/PrimitivesBinaryBoolean.scala
@@ -30,13 +30,13 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.grammar.primitives
+package org.apache.daffodil.grammar.primitives
-import edu.illinois.ncsa.daffodil.grammar.Terminal
-import edu.illinois.ncsa.daffodil.dsom.ElementBase
-import edu.illinois.ncsa.daffodil.processors.parsers.BinaryBooleanParser
-import edu.illinois.ncsa.daffodil.processors.unparsers.Unparser
-import edu.illinois.ncsa.daffodil.processors.unparsers.BinaryBooleanUnparser
+import org.apache.daffodil.grammar.Terminal
+import org.apache.daffodil.dsom.ElementBase
+import org.apache.daffodil.processors.parsers.BinaryBooleanParser
+import org.apache.daffodil.processors.unparsers.Unparser
+import org.apache.daffodil.processors.unparsers.BinaryBooleanUnparser
class BinaryBoolean(val e: ElementBase) extends Terminal(e, true) {
override lazy val parser = new BinaryBooleanParser(e.elementRuntimeData, e.binaryBooleanTrueRep, e.binaryBooleanFalseRep, e.lengthEv, e.lengthUnits, e.lengthKind)
diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/grammar/primitives/PrimitivesBinaryNumber.scala b/daffodil-core/src/main/scala/org/apache/daffodil/grammar/primitives/PrimitivesBinaryNumber.scala
index 92ac625..52948c3 100644
--- a/daffodil-core/src/main/scala/org/apache/daffodil/grammar/primitives/PrimitivesBinaryNumber.scala
+++ b/daffodil-core/src/main/scala/org/apache/daffodil/grammar/primitives/PrimitivesBinaryNumber.scala
@@ -30,23 +30,23 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.grammar.primitives
-
-import edu.illinois.ncsa.daffodil.grammar.Terminal
-import edu.illinois.ncsa.daffodil.dsom.ElementBase
-import edu.illinois.ncsa.daffodil.processors.parsers.BinaryIntegerRuntimeLengthParser
-import edu.illinois.ncsa.daffodil.processors.parsers.BinaryIntegerKnownLengthParser
-import edu.illinois.ncsa.daffodil.processors.parsers.BinaryDecimalRuntimeLengthParser
-import edu.illinois.ncsa.daffodil.processors.parsers.BinaryDecimalKnownLengthParser
-import edu.illinois.ncsa.daffodil.processors.parsers.BinaryFloatParser
-import edu.illinois.ncsa.daffodil.processors.parsers.BinaryDoubleParser
-import edu.illinois.ncsa.daffodil.processors.unparsers.Unparser
-import edu.illinois.ncsa.daffodil.processors.unparsers.BinaryIntegerKnownLengthUnparser
-import edu.illinois.ncsa.daffodil.processors.unparsers.BinaryIntegerRuntimeLengthUnparser
-import edu.illinois.ncsa.daffodil.processors.unparsers.BinaryDecimalRuntimeLengthUnparser
-import edu.illinois.ncsa.daffodil.processors.unparsers.BinaryDecimalKnownLengthUnparser
-import edu.illinois.ncsa.daffodil.processors.unparsers.BinaryDoubleUnparser
-import edu.illinois.ncsa.daffodil.processors.unparsers.BinaryFloatUnparser
+package org.apache.daffodil.grammar.primitives
+
+import org.apache.daffodil.grammar.Terminal
+import org.apache.daffodil.dsom.ElementBase
+import org.apache.daffodil.processors.parsers.BinaryIntegerRuntimeLengthParser
+import org.apache.daffodil.processors.parsers.BinaryIntegerKnownLengthParser
+import org.apache.daffodil.processors.parsers.BinaryDecimalRuntimeLengthParser
+import org.apache.daffodil.processors.parsers.BinaryDecimalKnownLengthParser
+import org.apache.daffodil.processors.parsers.BinaryFloatParser
+import org.apache.daffodil.processors.parsers.BinaryDoubleParser
+import org.apache.daffodil.processors.unparsers.Unparser
+import org.apache.daffodil.processors.unparsers.BinaryIntegerKnownLengthUnparser
+import org.apache.daffodil.processors.unparsers.BinaryIntegerRuntimeLengthUnparser
+import org.apache.daffodil.processors.unparsers.BinaryDecimalRuntimeLengthUnparser
+import org.apache.daffodil.processors.unparsers.BinaryDecimalKnownLengthUnparser
+import org.apache.daffodil.processors.unparsers.BinaryDoubleUnparser
+import org.apache.daffodil.processors.unparsers.BinaryFloatUnparser
class BinaryIntegerRuntimeLength(val e: ElementBase, signed: Boolean) extends Terminal(e, true) {
diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/grammar/primitives/PrimitivesDateTime.scala b/daffodil-core/src/main/scala/org/apache/daffodil/grammar/primitives/PrimitivesDateTime.scala
index 1f7de99..7421958 100644
--- a/daffodil-core/src/main/scala/org/apache/daffodil/grammar/primitives/PrimitivesDateTime.scala
+++ b/daffodil-core/src/main/scala/org/apache/daffodil/grammar/primitives/PrimitivesDateTime.scala
@@ -30,22 +30,22 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.grammar.primitives
+package org.apache.daffodil.grammar.primitives
import com.ibm.icu.util.Calendar
import com.ibm.icu.util.TimeZone
-import edu.illinois.ncsa.daffodil.dsom.ElementBase
-import edu.illinois.ncsa.daffodil.grammar.Terminal
-import edu.illinois.ncsa.daffodil.schema.annotation.props.gen.CalendarCheckPolicy
-import edu.illinois.ncsa.daffodil.schema.annotation.props.gen.CalendarFirstDayOfWeek
-import edu.illinois.ncsa.daffodil.schema.annotation.props.gen.CalendarPatternKind
-import edu.illinois.ncsa.daffodil.processors.unparsers.ConvertTextCalendarUnparser
+import org.apache.daffodil.dsom.ElementBase
+import org.apache.daffodil.grammar.Terminal
+import org.apache.daffodil.schema.annotation.props.gen.CalendarCheckPolicy
+import org.apache.daffodil.schema.annotation.props.gen.CalendarFirstDayOfWeek
+import org.apache.daffodil.schema.annotation.props.gen.CalendarPatternKind
+import org.apache.daffodil.processors.unparsers.ConvertTextCalendarUnparser
import com.ibm.icu.util.Calendar
import com.ibm.icu.util.TimeZone
-import edu.illinois.ncsa.daffodil.processors.CalendarEv
-import edu.illinois.ncsa.daffodil.processors.CalendarLanguageEv
-import edu.illinois.ncsa.daffodil.processors.parsers.ConvertTextCalendarParser
-import edu.illinois.ncsa.daffodil.processors.parsers.TextCalendarConstants
+import org.apache.daffodil.processors.CalendarEv
+import org.apache.daffodil.processors.CalendarLanguageEv
+import org.apache.daffodil.processors.parsers.ConvertTextCalendarParser
+import org.apache.daffodil.processors.parsers.TextCalendarConstants
import scala.Boolean
abstract class ConvertTextCalendarPrimBase(e: ElementBase, guard: Boolean)
diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/grammar/primitives/PrimitivesDelimiters.scala b/daffodil-core/src/main/scala/org/apache/daffodil/grammar/primitives/PrimitivesDelimiters.scala
index 138f000..2ded843 100644
--- a/daffodil-core/src/main/scala/org/apache/daffodil/grammar/primitives/PrimitivesDelimiters.scala
+++ b/daffodil-core/src/main/scala/org/apache/daffodil/grammar/primitives/PrimitivesDelimiters.scala
@@ -30,21 +30,21 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.grammar.primitives
-
-import edu.illinois.ncsa.daffodil.grammar.Terminal
-import edu.illinois.ncsa.daffodil.Implicits._;
-import edu.illinois.ncsa.daffodil.dsom._
-import edu.illinois.ncsa.daffodil.exceptions.Assert
-import edu.illinois.ncsa.daffodil.exceptions.ThrowsSDE
-import edu.illinois.ncsa.daffodil.grammar.Terminal
-import edu.illinois.ncsa.daffodil.processors.parsers.{ Parser => DaffodilParser }
-import edu.illinois.ncsa.daffodil.processors.unparsers.{ Unparser => DaffodilUnparser }
-import edu.illinois.ncsa.daffodil.processors.dfa.TextParser
-import edu.illinois.ncsa.daffodil.processors.parsers.DelimiterTextParser
-import edu.illinois.ncsa.daffodil.schema.annotation.props.gen.EscapeKind
-import edu.illinois.ncsa.daffodil.processors.parsers.DelimiterTextType
-import edu.illinois.ncsa.daffodil.processors.unparsers.DelimiterTextUnparser
+package org.apache.daffodil.grammar.primitives
+
+import org.apache.daffodil.grammar.Terminal
+import org.apache.daffodil.Implicits._;
+import org.apache.daffodil.dsom._
+import org.apache.daffodil.exceptions.Assert
+import org.apache.daffodil.exceptions.ThrowsSDE
+import org.apache.daffodil.grammar.Terminal
+import org.apache.daffodil.processors.parsers.{ Parser => DaffodilParser }
+import org.apache.daffodil.processors.unparsers.{ Unparser => DaffodilUnparser }
+import org.apache.daffodil.processors.dfa.TextParser
+import org.apache.daffodil.processors.parsers.DelimiterTextParser
+import org.apache.daffodil.schema.annotation.props.gen.EscapeKind
+import org.apache.daffodil.processors.parsers.DelimiterTextType
+import org.apache.daffodil.processors.unparsers.DelimiterTextUnparser
object INoWarn5 { ImplicitsSuppressUnusedImportWarning() }
diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/grammar/primitives/PrimitivesElementKinds.scala b/daffodil-core/src/main/scala/org/apache/daffodil/grammar/primitives/PrimitivesElementKinds.scala
index 0671e65..9d27281 100644
--- a/daffodil-core/src/main/scala/org/apache/daffodil/grammar/primitives/PrimitivesElementKinds.scala
+++ b/daffodil-core/src/main/scala/org/apache/daffodil/grammar/primitives/PrimitivesElementKinds.scala
@@ -30,35 +30,35 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.grammar.primitives
-
-import edu.illinois.ncsa.daffodil.grammar.Terminal
-import edu.illinois.ncsa.daffodil.dsom._
-import edu.illinois.ncsa.daffodil.processors.parsers.{ Parser => DaffodilParser }
-import edu.illinois.ncsa.daffodil.processors.unparsers.{ Unparser => DaffodilUnparser }
-import edu.illinois.ncsa.daffodil.grammar.Gram
-import edu.illinois.ncsa.daffodil.processors.parsers.ComplexTypeParser
-import edu.illinois.ncsa.daffodil.processors.parsers.SequenceCombinatorParser
-import edu.illinois.ncsa.daffodil.processors.parsers.ChoiceCombinatorParser
-import edu.illinois.ncsa.daffodil.processors.parsers.ChoiceDispatchCombinatorParser
-import edu.illinois.ncsa.daffodil.processors.parsers.ArrayCombinatorParser
-import edu.illinois.ncsa.daffodil.processors.parsers.OptionalCombinatorParser
-import edu.illinois.ncsa.daffodil.processors.unparsers.ComplexTypeUnparser
-import edu.illinois.ncsa.daffodil.processors.unparsers.SequenceCombinatorUnparser
-import edu.illinois.ncsa.daffodil.processors.unparsers.ChoiceCombinatorUnparser
-import edu.illinois.ncsa.daffodil.processors.unparsers.HiddenChoiceCombinatorUnparser
-import edu.illinois.ncsa.daffodil.processors.parsers.DelimiterStackParser
-import edu.illinois.ncsa.daffodil.processors.parsers.DynamicEscapeSchemeParser
-import edu.illinois.ncsa.daffodil.processors.unparsers.DynamicEscapeSchemeUnparser
-import edu.illinois.ncsa.daffodil.processors.unparsers.Unparser
-import edu.illinois.ncsa.daffodil.processors.unparsers.ArrayCombinatorUnparser
-import edu.illinois.ncsa.daffodil.processors.unparsers.OptionalCombinatorUnparser
-import edu.illinois.ncsa.daffodil.processors.unparsers.DelimiterStackUnparser
-import edu.illinois.ncsa.daffodil.grammar.EmptyGram
-import edu.illinois.ncsa.daffodil.equality._;
-import edu.illinois.ncsa.daffodil.exceptions.Assert
-import edu.illinois.ncsa.daffodil.util.Maybe._
-import edu.illinois.ncsa.daffodil.cookers.ChoiceBranchKeyCooker
+package org.apache.daffodil.grammar.primitives
+
+import org.apache.daffodil.grammar.Terminal
+import org.apache.daffodil.dsom._
+import org.apache.daffodil.processors.parsers.{ Parser => DaffodilParser }
+import org.apache.daffodil.processors.unparsers.{ Unparser => DaffodilUnparser }
+import org.apache.daffodil.grammar.Gram
+import org.apache.daffodil.processors.parsers.ComplexTypeParser
+import org.apache.daffodil.processors.parsers.SequenceCombinatorParser
+import org.apache.daffodil.processors.parsers.ChoiceCombinatorParser
+import org.apache.daffodil.processors.parsers.ChoiceDispatchCombinatorParser
+import org.apache.daffodil.processors.parsers.ArrayCombinatorParser
+import org.apache.daffodil.processors.parsers.OptionalCombinatorParser
+import org.apache.daffodil.processors.unparsers.ComplexTypeUnparser
+import org.apache.daffodil.processors.unparsers.SequenceCombinatorUnparser
+import org.apache.daffodil.processors.unparsers.ChoiceCombinatorUnparser
+import org.apache.daffodil.processors.unparsers.HiddenChoiceCombinatorUnparser
+import org.apache.daffodil.processors.parsers.DelimiterStackParser
+import org.apache.daffodil.processors.parsers.DynamicEscapeSchemeParser
+import org.apache.daffodil.processors.unparsers.DynamicEscapeSchemeUnparser
+import org.apache.daffodil.processors.unparsers.Unparser
+import org.apache.daffodil.processors.unparsers.ArrayCombinatorUnparser
+import org.apache.daffodil.processors.unparsers.OptionalCombinatorUnparser
+import org.apache.daffodil.processors.unparsers.DelimiterStackUnparser
+import org.apache.daffodil.grammar.EmptyGram
+import org.apache.daffodil.equality._;
+import org.apache.daffodil.exceptions.Assert
+import org.apache.daffodil.util.Maybe._
+import org.apache.daffodil.cookers.ChoiceBranchKeyCooker
object ENoWarn3 { EqualitySuppressUnusedImportWarning() }
diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/grammar/primitives/PrimitivesExpressions.scala b/daffodil-core/src/main/scala/org/apache/daffodil/grammar/primitives/PrimitivesExpressions.scala
index 00e2834..9b1eec3 100644
--- a/daffodil-core/src/main/scala/org/apache/daffodil/grammar/primitives/PrimitivesExpressions.scala
+++ b/daffodil-core/src/main/scala/org/apache/daffodil/grammar/primitives/PrimitivesExpressions.scala
@@ -30,36 +30,36 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.grammar.primitives
-
-import edu.illinois.ncsa.daffodil.grammar._
-import edu.illinois.ncsa.daffodil.dsom._
-import edu.illinois.ncsa.daffodil.dpath._
-import edu.illinois.ncsa.daffodil.xml.XMLUtils
-import edu.illinois.ncsa.daffodil.xml.GlobalQName
-import edu.illinois.ncsa.daffodil.processors.parsers.{ Parser => DaffodilParser }
-import edu.illinois.ncsa.daffodil.processors.unparsers.{ Unparser => DaffodilUnparser }
-import edu.illinois.ncsa.daffodil.exceptions.Assert
-import edu.illinois.ncsa.daffodil.Implicits._
-import edu.illinois.ncsa.daffodil.processors.parsers.NewVariableInstanceStartParser
-import edu.illinois.ncsa.daffodil.processors.parsers.AssertExpressionEvaluationParser
-import edu.illinois.ncsa.daffodil.dsom.ElementBase
-import edu.illinois.ncsa.daffodil.processors.parsers.AssertPatternParser
-import edu.illinois.ncsa.daffodil.processors.parsers.DiscriminatorPatternParser
-import edu.illinois.ncsa.daffodil.processors.parsers.NewVariableInstanceEndParser
-import edu.illinois.ncsa.daffodil.processors.parsers.SetVariableParser
-import edu.illinois.ncsa.daffodil.processors.parsers.IVCParser
-import edu.illinois.ncsa.daffodil.processors.unparsers.SetVariableUnparser
-import edu.illinois.ncsa.daffodil.processors.unparsers.NewVariableInstanceEndUnparser
-import edu.illinois.ncsa.daffodil.processors.unparsers.NewVariableInstanceStartUnparser
-import edu.illinois.ncsa.daffodil.compiler.ForParser
-import edu.illinois.ncsa.daffodil.processors.unparsers.NadaUnparser
-import edu.illinois.ncsa.daffodil.schema.annotation.props.PropertyLookupResult
-import edu.illinois.ncsa.daffodil.schema.annotation.props.Found
-import edu.illinois.ncsa.daffodil.dsom.ExpressionCompilers
-import edu.illinois.ncsa.daffodil.dsom.DFDLSetVariable
-import edu.illinois.ncsa.daffodil.dsom.ExpressionCompilers
-import edu.illinois.ncsa.daffodil.dsom.DFDLNewVariableInstance
+package org.apache.daffodil.grammar.primitives
+
+import org.apache.daffodil.grammar._
+import org.apache.daffodil.dsom._
+import org.apache.daffodil.dpath._
+import org.apache.daffodil.xml.XMLUtils
+import org.apache.daffodil.xml.GlobalQName
+import org.apache.daffodil.processors.parsers.{ Parser => DaffodilParser }
+import org.apache.daffodil.processors.unparsers.{ Unparser => DaffodilUnparser }
+import org.apache.daffodil.exceptions.Assert
+import org.apache.daffodil.Implicits._
+import org.apache.daffodil.processors.parsers.NewVariableInstanceStartParser
+import org.apache.daffodil.processors.parsers.AssertExpressionEvaluationParser
+import org.apache.daffodil.dsom.ElementBase
+import org.apache.daffodil.processors.parsers.AssertPatternParser
+import org.apache.daffodil.processors.parsers.DiscriminatorPatternParser
+import org.apache.daffodil.processors.parsers.NewVariableInstanceEndParser
+import org.apache.daffodil.processors.parsers.SetVariableParser
+import org.apache.daffodil.processors.parsers.IVCParser
+import org.apache.daffodil.processors.unparsers.SetVariableUnparser
+import org.apache.daffodil.processors.unparsers.NewVariableInstanceEndUnparser
+import org.apache.daffodil.processors.unparsers.NewVariableInstanceStartUnparser
+import org.apache.daffodil.compiler.ForParser
+import org.apache.daffodil.processors.unparsers.NadaUnparser
+import org.apache.daffodil.schema.annotation.props.PropertyLookupResult
+import org.apache.daffodil.schema.annotation.props.Found
+import org.apache.daffodil.dsom.ExpressionCompilers
+import org.apache.daffodil.dsom.DFDLSetVariable
+import org.apache.daffodil.dsom.ExpressionCompilers
+import org.apache.daffodil.dsom.DFDLNewVariableInstance
abstract class AssertBase(decl: AnnotatedSchemaComponent,
exprWithBraces: String,
diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/grammar/primitives/PrimitivesFraming.scala b/daffodil-core/src/main/scala/org/apache/daffodil/grammar/primitives/PrimitivesFraming.scala
index 7c00f96..fae0bc0 100644
--- a/daffodil-core/src/main/scala/org/apache/daffodil/grammar/primitives/PrimitivesFraming.scala
+++ b/daffodil-core/src/main/scala/org/apache/daffodil/grammar/primitives/PrimitivesFraming.scala
@@ -30,21 +30,21 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.grammar.primitives
+package org.apache.daffodil.grammar.primitives
-import edu.illinois.ncsa.daffodil.dsom.ElementBase
-import edu.illinois.ncsa.daffodil.dsom.Term
-import edu.illinois.ncsa.daffodil.exceptions.Assert
-import edu.illinois.ncsa.daffodil.grammar.Terminal
-import edu.illinois.ncsa.daffodil.processors.parsers.AlignmentFillParser
-import edu.illinois.ncsa.daffodil.processors.parsers.MandatoryTextAlignmentParser
-import edu.illinois.ncsa.daffodil.processors.parsers.Parser
-import edu.illinois.ncsa.daffodil.processors.parsers.SkipRegionParser
-import edu.illinois.ncsa.daffodil.processors.unparsers.AlignmentFillUnparser
-import edu.illinois.ncsa.daffodil.processors.unparsers.MandatoryTextAlignmentUnparser
-import edu.illinois.ncsa.daffodil.processors.unparsers.SkipRegionUnparser
-import edu.illinois.ncsa.daffodil.processors.unparsers.Unparser
-import edu.illinois.ncsa.daffodil.schema.annotation.props.gen.LengthKind
+import org.apache.daffodil.dsom.ElementBase
+import org.apache.daffodil.dsom.Term
+import org.apache.daffodil.exceptions.Assert
+import org.apache.daffodil.grammar.Terminal
+import org.apache.daffodil.processors.parsers.AlignmentFillParser
+import org.apache.daffodil.processors.parsers.MandatoryTextAlignmentParser
+import org.apache.daffodil.processors.parsers.Parser
+import org.apache.daffodil.processors.parsers.SkipRegionParser
+import org.apache.daffodil.processors.unparsers.AlignmentFillUnparser
+import org.apache.daffodil.processors.unparsers.MandatoryTextAlignmentUnparser
+import org.apache.daffodil.processors.unparsers.SkipRegionUnparser
+import org.apache.daffodil.processors.unparsers.Unparser
+import org.apache.daffodil.schema.annotation.props.gen.LengthKind
abstract class SkipRegion(e: Term, skipLengthInBits: Int, propName: String) extends Terminal(e, skipLengthInBits > 0) {
diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/grammar/primitives/PrimitivesIBM4690Packed.scala b/daffodil-core/src/main/scala/org/apache/daffodil/grammar/primitives/PrimitivesIBM4690Packed.scala
index 8b24a61..b01737c 100644
--- a/daffodil-core/src/main/scala/org/apache/daffodil/grammar/primitives/PrimitivesIBM4690Packed.scala
+++ b/daffodil-core/src/main/scala/org/apache/daffodil/grammar/primitives/PrimitivesIBM4690Packed.scala
@@ -13,19 +13,19 @@
*/
-package edu.illinois.ncsa.daffodil.grammar.primitives
-
-import edu.illinois.ncsa.daffodil.grammar.Terminal
-import edu.illinois.ncsa.daffodil.dsom.ElementBase
-import edu.illinois.ncsa.daffodil.processors.parsers.IBM4690PackedIntegerRuntimeLengthParser
-import edu.illinois.ncsa.daffodil.processors.parsers.IBM4690PackedIntegerKnownLengthParser
-import edu.illinois.ncsa.daffodil.processors.parsers.IBM4690PackedDecimalRuntimeLengthParser
-import edu.illinois.ncsa.daffodil.processors.parsers.IBM4690PackedDecimalKnownLengthParser
-import edu.illinois.ncsa.daffodil.processors.unparsers.Unparser
-import edu.illinois.ncsa.daffodil.processors.unparsers.IBM4690PackedIntegerRuntimeLengthUnparser
-import edu.illinois.ncsa.daffodil.processors.unparsers.IBM4690PackedIntegerKnownLengthUnparser
-import edu.illinois.ncsa.daffodil.processors.unparsers.IBM4690PackedDecimalRuntimeLengthUnparser
-import edu.illinois.ncsa.daffodil.processors.unparsers.IBM4690PackedDecimalKnownLengthUnparser
+package org.apache.daffodil.grammar.primitives
+
+import org.apache.daffodil.grammar.Terminal
+import org.apache.daffodil.dsom.ElementBase
+import org.apache.daffodil.processors.parsers.IBM4690PackedIntegerRuntimeLengthParser
+import org.apache.daffodil.processors.parsers.IBM4690PackedIntegerKnownLengthParser
+import org.apache.daffodil.processors.parsers.IBM4690PackedDecimalRuntimeLengthParser
+import org.apache.daffodil.processors.parsers.IBM4690PackedDecimalKnownLengthParser
+import org.apache.daffodil.processors.unparsers.Unparser
+import org.apache.daffodil.processors.unparsers.IBM4690PackedIntegerRuntimeLengthUnparser
+import org.apache.daffodil.processors.unparsers.IBM4690PackedIntegerKnownLengthUnparser
+import org.apache.daffodil.processors.unparsers.IBM4690PackedDecimalRuntimeLengthUnparser
+import org.apache.daffodil.processors.unparsers.IBM4690PackedDecimalKnownLengthUnparser
class IBM4690PackedIntegerRuntimeLength(val e: ElementBase, signed: Boolean) extends Terminal(e, true) {
override lazy val parser = new IBM4690PackedIntegerRuntimeLengthParser(e.elementRuntimeData, signed, e.lengthEv, e.lengthUnits)
diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/grammar/primitives/PrimitivesLengthKind.scala b/daffodil-core/src/main/scala/org/apache/daffodil/grammar/primitives/PrimitivesLengthKind.scala
index a270da1..744097e 100644
--- a/daffodil-core/src/main/scala/org/apache/daffodil/grammar/primitives/PrimitivesLengthKind.scala
+++ b/daffodil-core/src/main/scala/org/apache/daffodil/grammar/primitives/PrimitivesLengthKind.scala
@@ -30,53 +30,53 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.grammar.primitives
+package org.apache.daffodil.grammar.primitives
import scala.Boolean
-import edu.illinois.ncsa.daffodil.dsom.ElementBase
-import edu.illinois.ncsa.daffodil.dsom.Term
-import edu.illinois.ncsa.daffodil.grammar.Gram
-import edu.illinois.ncsa.daffodil.grammar.Terminal
-import edu.illinois.ncsa.daffodil.processors.dfa.TextDelimitedParser
-import edu.illinois.ncsa.daffodil.processors.dfa.TextDelimitedParserWithEscapeBlock
-import edu.illinois.ncsa.daffodil.processors.dfa.TextPaddingParser
-import edu.illinois.ncsa.daffodil.processors.parsers.HexBinaryDelimitedParser
-import edu.illinois.ncsa.daffodil.processors.parsers.HexBinaryEndOfBitLimitParser
-import edu.illinois.ncsa.daffodil.processors.parsers.HexBinarySpecifiedLengthParser
-import edu.illinois.ncsa.daffodil.processors.parsers.PackedIntegerDelimitedParser
-import edu.illinois.ncsa.daffodil.processors.parsers.PackedDecimalDelimitedParser
-import edu.illinois.ncsa.daffodil.processors.parsers.BCDIntegerDelimitedParser
-import edu.illinois.ncsa.daffodil.processors.parsers.BCDDecimalDelimitedParser
-import edu.illinois.ncsa.daffodil.processors.parsers.IBM4690PackedIntegerDelimitedParser
-import edu.illinois.ncsa.daffodil.processors.parsers.IBM4690PackedDecimalDelimitedParser
-import edu.illinois.ncsa.daffodil.processors.parsers.LiteralNilDelimitedEndOfDataParser
-import edu.illinois.ncsa.daffodil.processors.parsers.OptionalInfixSepParser
-import edu.illinois.ncsa.daffodil.processors.parsers.StringDelimitedParser
-import edu.illinois.ncsa.daffodil.processors.parsers.StringOfSpecifiedLengthParser
-import edu.illinois.ncsa.daffodil.processors.parsers.{ Parser => DaffodilParser }
-import edu.illinois.ncsa.daffodil.processors.unparsers.HexBinaryMinLengthInBytesUnparser
-import edu.illinois.ncsa.daffodil.processors.unparsers.PackedIntegerDelimitedUnparser
-import edu.illinois.ncsa.daffodil.processors.unparsers.PackedDecimalDelimitedUnparser
-import edu.illinois.ncsa.daffodil.processors.unparsers.BCDIntegerDelimitedUnparser
-import edu.illinois.ncsa.daffodil.processors.unparsers.BCDDecimalDelimitedUnparser
-import edu.illinois.ncsa.daffodil.processors.unparsers.IBM4690PackedIntegerDelimitedUnparser
-import edu.illinois.ncsa.daffodil.processors.unparsers.IBM4690PackedDecimalDelimitedUnparser
-import edu.illinois.ncsa.daffodil.processors.unparsers.HexBinarySpecifiedLengthUnparser
-import edu.illinois.ncsa.daffodil.processors.unparsers.LiteralNilDelimitedEndOfDataUnparser
-import edu.illinois.ncsa.daffodil.processors.unparsers.OptionalInfixSepUnparser
-import edu.illinois.ncsa.daffodil.processors.unparsers.StringDelimitedUnparser
-import edu.illinois.ncsa.daffodil.processors.unparsers.StringMaybeTruncateBitsUnparser
-import edu.illinois.ncsa.daffodil.processors.unparsers.StringMaybeTruncateCharactersUnparser
-import edu.illinois.ncsa.daffodil.processors.unparsers.StringNoTruncateUnparser
-import edu.illinois.ncsa.daffodil.processors.unparsers.{ Unparser => DaffodilUnparser }
-import edu.illinois.ncsa.daffodil.schema.annotation.props.gen.EscapeKind
-import edu.illinois.ncsa.daffodil.schema.annotation.props.gen.LengthKind
-import edu.illinois.ncsa.daffodil.schema.annotation.props.gen.LengthUnits
-import edu.illinois.ncsa.daffodil.util.Maybe.Nope
-import edu.illinois.ncsa.daffodil.util.Maybe.One
-import edu.illinois.ncsa.daffodil.util.PackedSignCodes
-import edu.illinois.ncsa.daffodil.processors.FieldDFAParseEv
-import edu.illinois.ncsa.daffodil.processors.TextTruncationType
+import org.apache.daffodil.dsom.ElementBase
+import org.apache.daffodil.dsom.Term
+import org.apache.daffodil.grammar.Gram
+import org.apache.daffodil.grammar.Terminal
+import org.apache.daffodil.processors.dfa.TextDelimitedParser
+import org.apache.daffodil.processors.dfa.TextDelimitedParserWithEscapeBlock
+import org.apache.daffodil.processors.dfa.TextPaddingParser
+import org.apache.daffodil.processors.parsers.HexBinaryDelimitedParser
+import org.apache.daffodil.processors.parsers.HexBinaryEndOfBitLimitParser
+import org.apache.daffodil.processors.parsers.HexBinarySpecifiedLengthParser
+import org.apache.daffodil.processors.parsers.PackedIntegerDelimitedParser
+import org.apache.daffodil.processors.parsers.PackedDecimalDelimitedParser
+import org.apache.daffodil.processors.parsers.BCDIntegerDelimitedParser
+import org.apache.daffodil.processors.parsers.BCDDecimalDelimitedParser
+import org.apache.daffodil.processors.parsers.IBM4690PackedIntegerDelimitedParser
+import org.apache.daffodil.processors.parsers.IBM4690PackedDecimalDelimitedParser
+import org.apache.daffodil.processors.parsers.LiteralNilDelimitedEndOfDataParser
+import org.apache.daffodil.processors.parsers.OptionalInfixSepParser
+import org.apache.daffodil.processors.parsers.StringDelimitedParser
+import org.apache.daffodil.processors.parsers.StringOfSpecifiedLengthParser
+import org.apache.daffodil.processors.parsers.{ Parser => DaffodilParser }
+import org.apache.daffodil.processors.unparsers.HexBinaryMinLengthInBytesUnparser
+import org.apache.daffodil.processors.unparsers.PackedIntegerDelimitedUnparser
+import org.apache.daffodil.processors.unparsers.PackedDecimalDelimitedUnparser
+import org.apache.daffodil.processors.unparsers.BCDIntegerDelimitedUnparser
+import org.apache.daffodil.processors.unparsers.BCDDecimalDelimitedUnparser
+import org.apache.daffodil.processors.unparsers.IBM4690PackedIntegerDelimitedUnparser
+import org.apache.daffodil.processors.unparsers.IBM4690PackedDecimalDelimitedUnparser
+import org.apache.daffodil.processors.unparsers.HexBinarySpecifiedLengthUnparser
+import org.apache.daffodil.processors.unparsers.LiteralNilDelimitedEndOfDataUnparser
+import org.apache.daffodil.processors.unparsers.OptionalInfixSepUnparser
+import org.apache.daffodil.processors.unparsers.StringDelimitedUnparser
+import org.apache.daffodil.processors.unparsers.StringMaybeTruncateBitsUnparser
+import org.apache.daffodil.processors.unparsers.StringMaybeTruncateCharactersUnparser
+import org.apache.daffodil.processors.unparsers.StringNoTruncateUnparser
+import org.apache.daffodil.processors.unparsers.{ Unparser => DaffodilUnparser }
+import org.apache.daffodil.schema.annotation.props.gen.EscapeKind
+import org.apache.daffodil.schema.annotation.props.gen.LengthKind
+import org.apache.daffodil.schema.annotation.props.gen.LengthUnits
+import org.apache.daffodil.util.Maybe.Nope
+import org.apache.daffodil.util.Maybe.One
+import org.apache.daffodil.util.PackedSignCodes
+import org.apache.daffodil.processors.FieldDFAParseEv
+import org.apache.daffodil.processors.TextTruncationType
case class HexBinarySpecifiedLength(e: ElementBase) extends Terminal(e, true) {
diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/grammar/primitives/PrimitivesNil.scala b/daffodil-core/src/main/scala/org/apache/daffodil/grammar/primitives/PrimitivesNil.scala
index f3ee777..c3aaaf5 100644
--- a/daffodil-core/src/main/scala/org/apache/daffodil/grammar/primitives/PrimitivesNil.scala
+++ b/daffodil-core/src/main/scala/org/apache/daffodil/grammar/primitives/PrimitivesNil.scala
@@ -30,15 +30,15 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.grammar.primitives
+package org.apache.daffodil.grammar.primitives
-import edu.illinois.ncsa.daffodil.dsom._
-import edu.illinois.ncsa.daffodil.grammar.Terminal
-import edu.illinois.ncsa.daffodil.processors.parsers.LiteralValueNilOfSpecifiedLengthParser
-import edu.illinois.ncsa.daffodil.processors.parsers.LiteralCharacterNilOfSpecifiedLengthParser
-import edu.illinois.ncsa.daffodil.processors.unparsers.LiteralValueNilOfSpecifiedLengthUnparser
-import edu.illinois.ncsa.daffodil.schema.annotation.props.gen.LengthKind
-import edu.illinois.ncsa.daffodil.processors.unparsers.NadaUnparser
+import org.apache.daffodil.dsom._
+import org.apache.daffodil.grammar.Terminal
+import org.apache.daffodil.processors.parsers.LiteralValueNilOfSpecifiedLengthParser
+import org.apache.daffodil.processors.parsers.LiteralCharacterNilOfSpecifiedLengthParser
+import org.apache.daffodil.processors.unparsers.LiteralValueNilOfSpecifiedLengthUnparser
+import org.apache.daffodil.schema.annotation.props.gen.LengthKind
+import org.apache.daffodil.processors.unparsers.NadaUnparser
case class LiteralValueNilOfSpecifiedLength(e: ElementBase)
extends Terminal(e, true)
diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/grammar/primitives/PrimitivesPacked.scala b/daffodil-core/src/main/scala/org/apache/daffodil/grammar/primitives/PrimitivesPacked.scala
index dfdb785..8a607be 100644
--- a/daffodil-core/src/main/scala/org/apache/daffodil/grammar/primitives/PrimitivesPacked.scala
+++ b/daffodil-core/src/main/scala/org/apache/daffodil/grammar/primitives/PrimitivesPacked.scala
@@ -12,20 +12,20 @@
* limitations under the License.
*/
-package edu.illinois.ncsa.daffodil.grammar.primitives
-
-import edu.illinois.ncsa.daffodil.grammar.Terminal
-import edu.illinois.ncsa.daffodil.dsom.ElementBase
-import edu.illinois.ncsa.daffodil.util.PackedSignCodes
-import edu.illinois.ncsa.daffodil.processors.parsers.PackedIntegerRuntimeLengthParser
-import edu.illinois.ncsa.daffodil.processors.parsers.PackedIntegerKnownLengthParser
-import edu.illinois.ncsa.daffodil.processors.parsers.PackedDecimalRuntimeLengthParser
-import edu.illinois.ncsa.daffodil.processors.parsers.PackedDecimalKnownLengthParser
-import edu.illinois.ncsa.daffodil.processors.unparsers.Unparser
-import edu.illinois.ncsa.daffodil.processors.unparsers.PackedIntegerRuntimeLengthUnparser
-import edu.illinois.ncsa.daffodil.processors.unparsers.PackedIntegerKnownLengthUnparser
-import edu.illinois.ncsa.daffodil.processors.unparsers.PackedDecimalRuntimeLengthUnparser
-import edu.illinois.ncsa.daffodil.processors.unparsers.PackedDecimalKnownLengthUnparser
+package org.apache.daffodil.grammar.primitives
+
+import org.apache.daffodil.grammar.Terminal
+import org.apache.daffodil.dsom.ElementBase
+import org.apache.daffodil.util.PackedSignCodes
+import org.apache.daffodil.processors.parsers.PackedIntegerRuntimeLengthParser
+import org.apache.daffodil.processors.parsers.PackedIntegerKnownLengthParser
+import org.apache.daffodil.processors.parsers.PackedDecimalRuntimeLengthParser
+import org.apache.daffodil.processors.parsers.PackedDecimalKnownLengthParser
+import org.apache.daffodil.processors.unparsers.Unparser
+import org.apache.daffodil.processors.unparsers.PackedIntegerRuntimeLengthUnparser
+import org.apache.daffodil.processors.unparsers.PackedIntegerKnownLengthUnparser
+import org.apache.daffodil.processors.unparsers.PackedDecimalRuntimeLengthUnparser
+import org.apache.daffodil.processors.unparsers.PackedDecimalKnownLengthUnparser
class PackedIntegerRuntimeLength(val e: ElementBase, signed: Boolean, packedSignCodes: PackedSignCodes) extends Terminal(e, true) {
override lazy val parser = new PackedIntegerRuntimeLengthParser(e.elementRuntimeData, signed, packedSignCodes, e.lengthEv, e.lengthUnits)
diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/grammar/primitives/PrimitivesTextBoolean.scala b/daffodil-core/src/main/scala/org/apache/daffodil/grammar/primitives/PrimitivesTextBoolean.scala
index f184f72..7c5d4ec 100644
--- a/daffodil-core/src/main/scala/org/apache/daffodil/grammar/primitives/PrimitivesTextBoolean.scala
+++ b/daffodil-core/src/main/scala/org/apache/daffodil/grammar/primitives/PrimitivesTextBoolean.scala
@@ -30,12 +30,12 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.grammar.primitives
+package org.apache.daffodil.grammar.primitives
-import edu.illinois.ncsa.daffodil.dsom.ElementBase
-import edu.illinois.ncsa.daffodil.grammar.Terminal
-import edu.illinois.ncsa.daffodil.processors.unparsers.ConvertTextBooleanUnparser
-import edu.illinois.ncsa.daffodil.processors.parsers.ConvertTextBooleanParser
+import org.apache.daffodil.dsom.ElementBase
+import org.apache.daffodil.grammar.Terminal
+import org.apache.daffodil.processors.unparsers.ConvertTextBooleanUnparser
+import org.apache.daffodil.processors.parsers.ConvertTextBooleanParser
case class ConvertTextBooleanPrim(e: ElementBase)
extends Terminal(e, true) {
diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/grammar/primitives/PrimitivesTextNumber.scala b/daffodil-core/src/main/scala/org/apache/daffodil/grammar/primitives/PrimitivesTextNumber.scala
index e406c43..9f7f432 100644
--- a/daffodil-core/src/main/scala/org/apache/daffodil/grammar/primitives/PrimitivesTextNumber.scala
+++ b/daffodil-core/src/main/scala/org/apache/daffodil/grammar/primitives/PrimitivesTextNumber.scala
@@ -30,43 +30,43 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.grammar.primitives
-
-import edu.illinois.ncsa.daffodil.dsom._
-import edu.illinois.ncsa.daffodil.grammar.Gram
-import edu.illinois.ncsa.daffodil.grammar.Terminal
-import edu.illinois.ncsa.daffodil.schema.annotation.props.gen.TextNumberRounding
-import edu.illinois.ncsa.daffodil.util.Maybe
-import edu.illinois.ncsa.daffodil.util.Maybe._
+package org.apache.daffodil.grammar.primitives
+
+import org.apache.daffodil.dsom._
+import org.apache.daffodil.grammar.Gram
+import org.apache.daffodil.grammar.Terminal
+import org.apache.daffodil.schema.annotation.props.gen.TextNumberRounding
+import org.apache.daffodil.util.Maybe
+import org.apache.daffodil.util.Maybe._
import com.ibm.icu.text.DecimalFormat
-import edu.illinois.ncsa.daffodil.processors.unparsers.Unparser
-import edu.illinois.ncsa.daffodil.processors.unparsers.ConvertTextNumberUnparser
-import edu.illinois.ncsa.daffodil.processors.unparsers.ConvertTextCombinatorUnparser
-import edu.illinois.ncsa.daffodil.util.MaybeDouble
+import org.apache.daffodil.processors.unparsers.Unparser
+import org.apache.daffodil.processors.unparsers.ConvertTextNumberUnparser
+import org.apache.daffodil.processors.unparsers.ConvertTextCombinatorUnparser
+import org.apache.daffodil.util.MaybeDouble
import java.math.{ BigDecimal => JBigDecimal, BigInteger => JBigInt }
-import edu.illinois.ncsa.daffodil.processors.parsers.ConvertTextByteParserUnparserHelper
-import edu.illinois.ncsa.daffodil.processors.parsers.ConvertTextCombinatorParser
-import edu.illinois.ncsa.daffodil.processors.parsers.ConvertTextDecimalParserUnparserHelper
-import edu.illinois.ncsa.daffodil.processors.parsers.ConvertTextDoubleParserUnparserHelper
-import edu.illinois.ncsa.daffodil.processors.parsers.ConvertTextFloatParserUnparserHelper
-import edu.illinois.ncsa.daffodil.processors.parsers.ConvertTextIntParserUnparserHelper
-import edu.illinois.ncsa.daffodil.processors.parsers.ConvertTextIntegerParserUnparserHelper
-import edu.illinois.ncsa.daffodil.processors.parsers.ConvertTextLongParserUnparserHelper
-import edu.illinois.ncsa.daffodil.processors.parsers.ConvertTextNonNegativeIntegerParserUnparserHelper
-import edu.illinois.ncsa.daffodil.processors.parsers.ConvertTextNumberParser
-import edu.illinois.ncsa.daffodil.processors.parsers.ConvertTextNumberParserUnparserHelperBase
-import edu.illinois.ncsa.daffodil.processors.parsers.ConvertTextShortParserUnparserHelper
-import edu.illinois.ncsa.daffodil.processors.parsers.ConvertTextUnsignedByteParserUnparserHelper
-import edu.illinois.ncsa.daffodil.processors.parsers.ConvertTextUnsignedLongParserUnparserHelper
-import edu.illinois.ncsa.daffodil.processors.parsers.ConvertTextUnsignedShortParserUnparserHelper
-import edu.illinois.ncsa.daffodil.processors.Evaluatable
-import edu.illinois.ncsa.daffodil.processors.parsers.NumberFormatFactoryBase
-import edu.illinois.ncsa.daffodil.processors.parsers.NumberFormatFactoryDynamic
-import edu.illinois.ncsa.daffodil.processors.parsers.NumberFormatFactoryStatic
+import org.apache.daffodil.processors.parsers.ConvertTextByteParserUnparserHelper
+import org.apache.daffodil.processors.parsers.ConvertTextCombinatorParser
+import org.apache.daffodil.processors.parsers.ConvertTextDecimalParserUnparserHelper
+import org.apache.daffodil.processors.parsers.ConvertTextDoubleParserUnparserHelper
+import org.apache.daffodil.processors.parsers.ConvertTextFloatParserUnparserHelper
+import org.apache.daffodil.processors.parsers.ConvertTextIntParserUnparserHelper
+import org.apache.daffodil.processors.parsers.ConvertTextIntegerParserUnparserHelper
+import org.apache.daffodil.processors.parsers.ConvertTextLongParserUnparserHelper
+import org.apache.daffodil.processors.parsers.ConvertTextNonNegativeIntegerParserUnparserHelper
+import org.apache.daffodil.processors.parsers.ConvertTextNumberParser
+import org.apache.daffodil.processors.parsers.ConvertTextNumberParserUnparserHelperBase
+import org.apache.daffodil.processors.parsers.ConvertTextShortParserUnparserHelper
+import org.apache.daffodil.processors.parsers.ConvertTextUnsignedByteParserUnparserHelper
+import org.apache.daffodil.processors.parsers.ConvertTextUnsignedLongParserUnparserHelper
+import org.apache.daffodil.processors.parsers.ConvertTextUnsignedShortParserUnparserHelper
+import org.apache.daffodil.processors.Evaluatable
+import org.apache.daffodil.processors.parsers.NumberFormatFactoryBase
+import org.apache.daffodil.processors.parsers.NumberFormatFactoryDynamic
+import org.apache.daffodil.processors.parsers.NumberFormatFactoryStatic
import java.math.{ BigDecimal => JBigDecimal }
import java.math.{ BigInteger => JBigInt }
-import edu.illinois.ncsa.daffodil.processors.parsers.ConvertTextUnsignedIntParserUnparserHelper
-import edu.illinois.ncsa.daffodil.processors.parsers.Parser
+import org.apache.daffodil.processors.parsers.ConvertTextUnsignedIntParserUnparserHelper
+import org.apache.daffodil.processors.parsers.Parser
case class ConvertTextCombinator(e: ElementBase, value: Gram, converter: Gram)
extends Terminal(e, !(value.isEmpty || converter.isEmpty)) {
diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/grammar/primitives/PrimitivesUnorderedSequence.scala b/daffodil-core/src/main/scala/org/apache/daffodil/grammar/primitives/PrimitivesUnorderedSequence.scala
index 469a453..bb7ce87 100644
--- a/daffodil-core/src/main/scala/org/apache/daffodil/grammar/primitives/PrimitivesUnorderedSequence.scala
+++ b/daffodil-core/src/main/scala/org/apache/daffodil/grammar/primitives/PrimitivesUnorderedSequence.scala
@@ -30,17 +30,17 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.grammar.primitives
+package org.apache.daffodil.grammar.primitives
-import edu.illinois.ncsa.daffodil.grammar.Gram
-import edu.illinois.ncsa.daffodil.exceptions.Assert
-import edu.illinois.ncsa.daffodil.dsom.ElementBase
-import edu.illinois.ncsa.daffodil.dsom.Term
-import edu.illinois.ncsa.daffodil.dsom.SequenceTermBase
-import edu.illinois.ncsa.daffodil.grammar.UnaryGram
-import edu.illinois.ncsa.daffodil.grammar.HasNoUnparser
-import edu.illinois.ncsa.daffodil.processors.ElementRuntimeData
-import edu.illinois.ncsa.daffodil.processors.parsers.Parser
+import org.apache.daffodil.grammar.Gram
+import org.apache.daffodil.exceptions.Assert
+import org.apache.daffodil.dsom.ElementBase
+import org.apache.daffodil.dsom.Term
+import org.apache.daffodil.dsom.SequenceTermBase
+import org.apache.daffodil.grammar.UnaryGram
+import org.apache.daffodil.grammar.HasNoUnparser
+import org.apache.daffodil.processors.ElementRuntimeData
+import org.apache.daffodil.processors.parsers.Parser
object UnorderedSequence {
def apply(context: Term, eGram: => Gram) = {
diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/grammar/primitives/PrimitivesZoned.scala b/daffodil-core/src/main/scala/org/apache/daffodil/grammar/primitives/PrimitivesZoned.scala
index cd7bd24..476510e 100644
--- a/daffodil-core/src/main/scala/org/apache/daffodil/grammar/primitives/PrimitivesZoned.scala
+++ b/daffodil-core/src/main/scala/org/apache/daffodil/grammar/primitives/PrimitivesZoned.scala
@@ -30,9 +30,9 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.grammar.primitives
+package org.apache.daffodil.grammar.primitives
-import edu.illinois.ncsa.daffodil.dsom.ElementBase
+import org.apache.daffodil.dsom.ElementBase
abstract class ZonedTextNumberPrim(e: ElementBase, guard: Boolean) extends UnimplementedPrimitive(e, guard) {
// lazy val parser: DaffodilParser = new ZonedTextNumberParser(e.elementRuntimeData)
diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/grammar/primitives/RepPrims.scala b/daffodil-core/src/main/scala/org/apache/daffodil/grammar/primitives/RepPrims.scala
index cc1d036..07eabbd 100644
--- a/daffodil-core/src/main/scala/org/apache/daffodil/grammar/primitives/RepPrims.scala
+++ b/daffodil-core/src/main/scala/org/apache/daffodil/grammar/primitives/RepPrims.scala
@@ -30,27 +30,27 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.grammar.primitives
+package org.apache.daffodil.grammar.primitives
-import edu.illinois.ncsa.daffodil.grammar._
-import edu.illinois.ncsa.daffodil.exceptions.Assert
-import edu.illinois.ncsa.daffodil.Implicits._;
-import edu.illinois.ncsa.daffodil.dsom._
+import org.apache.daffodil.grammar._
+import org.apache.daffodil.exceptions.Assert
+import org.apache.daffodil.Implicits._;
+import org.apache.daffodil.dsom._
import RepPrims._
-import edu.illinois.ncsa.daffodil.processors.parsers.RepAtMostTotalNParser
-import edu.illinois.ncsa.daffodil.processors.parsers.RepExactlyTotalNParser
-import edu.illinois.ncsa.daffodil.processors.parsers.RepUnboundedParser
-import edu.illinois.ncsa.daffodil.processors.parsers.OccursCountExpressionParser
-import edu.illinois.ncsa.daffodil.processors.parsers.RepExactlyNParser
-import edu.illinois.ncsa.daffodil.processors.parsers.RepAtMostOccursCountParser
-import edu.illinois.ncsa.daffodil.processors.parsers.RepExactlyTotalOccursCountParser
-import edu.illinois.ncsa.daffodil.processors.unparsers.RepExactlyNUnparser
-import edu.illinois.ncsa.daffodil.processors.unparsers.RepAtMostOccursCountUnparser
-import edu.illinois.ncsa.daffodil.processors.unparsers.RepUnboundedUnparser
-import edu.illinois.ncsa.daffodil.processors.unparsers.RepExactlyTotalNUnparser
-import edu.illinois.ncsa.daffodil.processors.unparsers.RepAtMostTotalNUnparser
-import edu.illinois.ncsa.daffodil.equality._;
-import edu.illinois.ncsa.daffodil.processors.unparsers.NadaUnparser
+import org.apache.daffodil.processors.parsers.RepAtMostTotalNParser
+import org.apache.daffodil.processors.parsers.RepExactlyTotalNParser
+import org.apache.daffodil.processors.parsers.RepUnboundedParser
+import org.apache.daffodil.processors.parsers.OccursCountExpressionParser
+import org.apache.daffodil.processors.parsers.RepExactlyNParser
+import org.apache.daffodil.processors.parsers.RepAtMostOccursCountParser
+import org.apache.daffodil.processors.parsers.RepExactlyTotalOccursCountParser
+import org.apache.daffodil.processors.unparsers.RepExactlyNUnparser
+import org.apache.daffodil.processors.unparsers.RepAtMostOccursCountUnparser
+import org.apache.daffodil.processors.unparsers.RepUnboundedUnparser
+import org.apache.daffodil.processors.unparsers.RepExactlyTotalNUnparser
+import org.apache.daffodil.processors.unparsers.RepAtMostTotalNUnparser
+import org.apache.daffodil.equality._;
+import org.apache.daffodil.processors.unparsers.NadaUnparser
object INoWarn6 { ImplicitsSuppressUnusedImportWarning() }
diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/grammar/primitives/SpecifiedLength.scala b/daffodil-core/src/main/scala/org/apache/daffodil/grammar/primitives/SpecifiedLength.scala
index 430767c..9a8cbe0 100644
--- a/daffodil-core/src/main/scala/org/apache/daffodil/grammar/primitives/SpecifiedLength.scala
+++ b/daffodil-core/src/main/scala/org/apache/daffodil/grammar/primitives/SpecifiedLength.scala
@@ -30,20 +30,20 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.grammar.primitives
+package org.apache.daffodil.grammar.primitives
import java.util.regex.PatternSyntaxException
-import edu.illinois.ncsa.daffodil.dsom.ElementBase
-import edu.illinois.ncsa.daffodil.grammar.Gram
-import edu.illinois.ncsa.daffodil.grammar.Terminal
-import edu.illinois.ncsa.daffodil.processors.parsers._
-import edu.illinois.ncsa.daffodil.processors.unparsers._
-import edu.illinois.ncsa.daffodil.exceptions.Assert
-import edu.illinois.ncsa.daffodil.processors.unparsers.SpecifiedLengthExplicitImplicitUnparser
-import edu.illinois.ncsa.daffodil.processors.parsers.SpecifiedLengthExplicitParser
-import edu.illinois.ncsa.daffodil.processors.parsers.SpecifiedLengthImplicitParser
-import edu.illinois.ncsa.daffodil.dpath.NodeInfo.PrimType
-import edu.illinois.ncsa.daffodil.processors.parsers.Parser
+import org.apache.daffodil.dsom.ElementBase
+import org.apache.daffodil.grammar.Gram
+import org.apache.daffodil.grammar.Terminal
+import org.apache.daffodil.processors.parsers._
+import org.apache.daffodil.processors.unparsers._
+import org.apache.daffodil.exceptions.Assert
+import org.apache.daffodil.processors.unparsers.SpecifiedLengthExplicitImplicitUnparser
+import org.apache.daffodil.processors.parsers.SpecifiedLengthExplicitParser
+import org.apache.daffodil.processors.parsers.SpecifiedLengthImplicitParser
+import org.apache.daffodil.dpath.NodeInfo.PrimType
+import org.apache.daffodil.processors.parsers.Parser
abstract class SpecifiedLengthCombinatorBase(val e: ElementBase, eGramArg: => Gram)
extends Terminal(e, true) {
diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/grammar/primitives/VariableMap.scala b/daffodil-core/src/main/scala/org/apache/daffodil/grammar/primitives/VariableMap.scala
index 44bedd1..562e7ed 100644
--- a/daffodil-core/src/main/scala/org/apache/daffodil/grammar/primitives/VariableMap.scala
+++ b/daffodil-core/src/main/scala/org/apache/daffodil/grammar/primitives/VariableMap.scala
@@ -30,16 +30,16 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.grammar.primitives
+package org.apache.daffodil.grammar.primitives
/*
* Note. None of the original NCSA-written code remains, so banner and such removed.
*/
-import edu.illinois.ncsa.daffodil.dsom._
-import edu.illinois.ncsa.daffodil.externalvars.Binding
-import edu.illinois.ncsa.daffodil.exceptions.ThrowsSDE
-import edu.illinois.ncsa.daffodil.processors.VariableMap
+import org.apache.daffodil.dsom._
+import org.apache.daffodil.externalvars.Binding
+import org.apache.daffodil.exceptions.ThrowsSDE
+import org.apache.daffodil.processors.VariableMap
object VariableMapFactory {
diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/util/CheckJavaVersion.scala b/daffodil-core/src/main/scala/org/apache/daffodil/util/CheckJavaVersion.scala
index bc8c03d..87ce0ef 100644
--- a/daffodil-core/src/main/scala/org/apache/daffodil/util/CheckJavaVersion.scala
+++ b/daffodil-core/src/main/scala/org/apache/daffodil/util/CheckJavaVersion.scala
@@ -30,10 +30,10 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.util
+package org.apache.daffodil.util
-import edu.illinois.ncsa.daffodil.exceptions.ThrowsSDE
-import edu.illinois.ncsa.daffodil.processors.charset.CharsetUtils
+import org.apache.daffodil.exceptions.ThrowsSDE
+import org.apache.daffodil.processors.charset.CharsetUtils
class InvalidJavaVersionException(msg: String, cause: Throwable = null) extends Exception(msg, cause)
diff --git a/daffodil-core/src/test/resources/test/example-of-most-dfdl-constructs.dfdl.xml b/daffodil-core/src/test/resources/test/example-of-most-dfdl-constructs.dfdl.xml
index 1d66b68..f324f5d 100644
--- a/daffodil-core/src/test/resources/test/example-of-most-dfdl-constructs.dfdl.xml
+++ b/daffodil-core/src/test/resources/test/example-of-most-dfdl-constructs.dfdl.xml
@@ -8,7 +8,7 @@
xsi:schemaLocation="http://www.ogf.org/dfdl/dfdl-1.0/ xsd/DFDL_part3_model.xsd
http://www.w3.org/2001/XMLSchema xsd/XMLSchema_for_DFDL.xsd">
- <xs:include schemaLocation="edu/illinois/ncsa/daffodil/xsd/built-in-formats.xsd"/>
+ <xs:include schemaLocation="org/apache/daffodil/xsd/built-in-formats.xsd"/>
<annotation>
<documentation>
@@ -325,4 +325,4 @@
dfdl:length="8" dfdl:lengthKind="explicit"></element>
</sequence>
</group>
-</xsd:schema>
\ No newline at end of file
+</xsd:schema>
diff --git a/daffodil-core/src/test/resources/test/external_vars_1.xml b/daffodil-core/src/test/resources/test/external_vars_1.xml
index 0c5ff9d..e221bae 100644
--- a/daffodil-core/src/test/resources/test/external_vars_1.xml
+++ b/daffodil-core/src/test/resources/test/external_vars_1.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<daf:externalVariableBindings xmlns="http://www.w3.org/2001/XMLSchema"
xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ex="http://example.com"
- xmlns:daf="urn:ogf:dfdl:2013:imp:opensource.ncsa.illinois.edu:2012:ext">
+ xmlns:daf="urn:ogf:dfdl:2013:imp:daffodil.apache.org:2018:ext">
<daf:bind name="ex:v_no_default">1</daf:bind>
<daf:bind name="ex:v_with_default">2</daf:bind>
</daf:externalVariableBindings>
\ No newline at end of file
diff --git a/daffodil-core/src/test/scala-debug/org/apache/daffodil/api/TestForMemLeak.scala b/daffodil-core/src/test/scala-debug/org/apache/daffodil/api/TestForMemLeak.scala
index 8e25f8f..e8f6143 100644
--- a/daffodil-core/src/test/scala-debug/org/apache/daffodil/api/TestForMemLeak.scala
+++ b/daffodil-core/src/test/scala-debug/org/apache/daffodil/api/TestForMemLeak.scala
@@ -30,12 +30,12 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.api
+package org.apache.daffodil.api
import scala.xml._
import org.junit.Test
-import edu.illinois.ncsa.daffodil.Implicits._; object INoWarnAPI1 { ImplicitsSuppressUnusedImportWarning() }
-import edu.illinois.ncsa.daffodil.util.SchemaUtils
-import edu.illinois.ncsa.daffodil.util.TestUtils
+import org.apache.daffodil.Implicits._; object INoWarnAPI1 { ImplicitsSuppressUnusedImportWarning() }
+import org.apache.daffodil.util.SchemaUtils
+import org.apache.daffodil.util.TestUtils
class TestForMemLeak {
diff --git a/daffodil-core/src/test/scala-debug/org/apache/daffodil/dsom/TestDsomCompiler2.scala b/daffodil-core/src/test/scala-debug/org/apache/daffodil/dsom/TestDsomCompiler2.scala
index 0575f47..f3c2164 100644
--- a/daffodil-core/src/test/scala-debug/org/apache/daffodil/dsom/TestDsomCompiler2.scala
+++ b/daffodil-core/src/test/scala-debug/org/apache/daffodil/dsom/TestDsomCompiler2.scala
@@ -30,11 +30,11 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.dsom
+package org.apache.daffodil.dsom
-import edu.illinois.ncsa.daffodil.xml.XMLUtils
-import edu.illinois.ncsa.daffodil.util._
-import edu.illinois.ncsa.daffodil.Implicits._
+import org.apache.daffodil.xml.XMLUtils
+import org.apache.daffodil.util._
+import org.apache.daffodil.Implicits._
import org.junit.Test
class TestDsomCompiler2 extends Logging {
diff --git a/daffodil-core/src/test/scala-debug/org/apache/daffodil/dsom/TestDsomCompilerNew.scala b/daffodil-core/src/test/scala-debug/org/apache/daffodil/dsom/TestDsomCompilerNew.scala
index cb4efaf..9128425 100644
--- a/daffodil-core/src/test/scala-debug/org/apache/daffodil/dsom/TestDsomCompilerNew.scala
+++ b/daffodil-core/src/test/scala-debug/org/apache/daffodil/dsom/TestDsomCompilerNew.scala
@@ -30,11 +30,11 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.dsom
+package org.apache.daffodil.dsom
-import edu.illinois.ncsa.daffodil.xml.XMLUtils
-import edu.illinois.ncsa.daffodil.util._
-import edu.illinois.ncsa.daffodil.compiler._
+import org.apache.daffodil.xml.XMLUtils
+import org.apache.daffodil.util._
+import org.apache.daffodil.compiler._
import junit.framework.Assert.assertEquals
import org.junit.Test
diff --git a/daffodil-core/src/test/scala-debug/org/apache/daffodil/infoset/TestInfosetDefaultingInUnparser.scala b/daffodil-core/src/test/scala-debug/org/apache/daffodil/infoset/TestInfosetDefaultingInUnparser.scala
index e8b9349..5fb08f7 100644
--- a/daffodil-core/src/test/scala-debug/org/apache/daffodil/infoset/TestInfosetDefaultingInUnparser.scala
+++ b/daffodil-core/src/test/scala-debug/org/apache/daffodil/infoset/TestInfosetDefaultingInUnparser.scala
@@ -30,17 +30,17 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.infoset
+package org.apache.daffodil.infoset
import org.junit.Test
import org.junit.Assert._
-import edu.illinois.ncsa.daffodil.xml.XMLUtils
-import edu.illinois.ncsa.daffodil.Implicits._
-import edu.illinois.ncsa.daffodil.equality._; object ENoWarnU1 { EqualitySuppressUnusedImportWarning() }
-import edu.illinois.ncsa.daffodil.util.SchemaUtils
-import edu.illinois.ncsa.daffodil.processors.DataProcessor
-import edu.illinois.ncsa.daffodil.compiler.Compiler
-import edu.illinois.ncsa.daffodil.xml._
+import org.apache.daffodil.xml.XMLUtils
+import org.apache.daffodil.Implicits._
+import org.apache.daffodil.equality._; object ENoWarnU1 { EqualitySuppressUnusedImportWarning() }
+import org.apache.daffodil.util.SchemaUtils
+import org.apache.daffodil.processors.DataProcessor
+import org.apache.daffodil.compiler.Compiler
+import org.apache.daffodil.xml._
/*
* These are all tests of default-value insertion.
diff --git a/daffodil-core/src/test/scala/org/apache/daffodil/api/TestAPI.scala b/daffodil-core/src/test/scala/org/apache/daffodil/api/TestAPI.scala
index e3c5449..b4cfd71 100644
--- a/daffodil-core/src/test/scala/org/apache/daffodil/api/TestAPI.scala
+++ b/daffodil-core/src/test/scala/org/apache/daffodil/api/TestAPI.scala
@@ -30,12 +30,12 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.api
+package org.apache.daffodil.api
-import edu.illinois.ncsa.daffodil.util._
+import org.apache.daffodil.util._
import org.junit.Test
-import edu.illinois.ncsa.daffodil.Implicits._; object INoWarn7 { ImplicitsSuppressUnusedImportWarning() }
-import edu.illinois.ncsa.daffodil.util.TestUtils
+import org.apache.daffodil.Implicits._; object INoWarn7 { ImplicitsSuppressUnusedImportWarning() }
+import org.apache.daffodil.util.TestUtils
class TestDFDLParser_New {
diff --git a/daffodil-core/src/test/scala/org/apache/daffodil/api/TestAPI1.scala b/daffodil-core/src/test/scala/org/apache/daffodil/api/TestAPI1.scala
index 7c8ca1c..568d7c4 100644
--- a/daffodil-core/src/test/scala/org/apache/daffodil/api/TestAPI1.scala
+++ b/daffodil-core/src/test/scala/org/apache/daffodil/api/TestAPI1.scala
@@ -30,13 +30,13 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.api
+package org.apache.daffodil.api
import junit.framework.Assert._
import scala.xml._
-import edu.illinois.ncsa.daffodil.util._
+import org.apache.daffodil.util._
import org.junit.Test
-import edu.illinois.ncsa.daffodil.Implicits._
+import org.apache.daffodil.Implicits._
class TestDFDLParser {
diff --git a/daffodil-core/src/test/scala/org/apache/daffodil/api/TestDsomCompiler3.scala b/daffodil-core/src/test/scala/org/apache/daffodil/api/TestDsomCompiler3.scala
index 255b58f..9ffeb8b 100644
--- a/daffodil-core/src/test/scala/org/apache/daffodil/api/TestDsomCompiler3.scala
+++ b/daffodil-core/src/test/scala/org/apache/daffodil/api/TestDsomCompiler3.scala
@@ -30,18 +30,18 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.api
+package org.apache.daffodil.api
-import edu.illinois.ncsa.daffodil.xml.XMLUtils
-import edu.illinois.ncsa.daffodil.util._
-import edu.illinois.ncsa.daffodil.Implicits._
-import edu.illinois.ncsa.daffodil.compiler._
-import edu.illinois.ncsa.daffodil.schema.annotation.props.gen._
+import org.apache.daffodil.xml.XMLUtils
+import org.apache.daffodil.util._
+import org.apache.daffodil.Implicits._
+import org.apache.daffodil.compiler._
+import org.apache.daffodil.schema.annotation.props.gen._
import junit.framework.Assert.assertEquals
import junit.framework.Assert.assertTrue
import java.io.File
import org.junit.Test
-import edu.illinois.ncsa.daffodil.dsom.DFDLElement
+import org.apache.daffodil.dsom.DFDLElement
class TestDsomCompiler3 {
diff --git a/daffodil-core/src/test/scala/org/apache/daffodil/dpath/TestDFDLExpressionEvaluation.scala b/daffodil-core/src/test/scala/org/apache/daffodil/dpath/TestDFDLExpressionEvaluation.scala
index 75ac045..4f176f5 100644
--- a/daffodil-core/src/test/scala/org/apache/daffodil/dpath/TestDFDLExpressionEvaluation.scala
+++ b/daffodil-core/src/test/scala/org/apache/daffodil/dpath/TestDFDLExpressionEvaluation.scala
@@ -30,22 +30,22 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.dpath
+package org.apache.daffodil.dpath
import junit.framework.Assert._
import org.junit.Test
-import edu.illinois.ncsa.daffodil.util.SchemaUtils
-import edu.illinois.ncsa.daffodil.compiler._
+import org.apache.daffodil.util.SchemaUtils
+import org.apache.daffodil.compiler._
import scala.util.parsing.combinator.Parsers
-import edu.illinois.ncsa.daffodil.xml.XMLUtils
-import edu.illinois.ncsa.daffodil.xml.GlobalQName
-import edu.illinois.ncsa.daffodil.Implicits._; object INoWarn2 { ImplicitsSuppressUnusedImportWarning() }
-import edu.illinois.ncsa.daffodil.processors.parsers.PState
-import edu.illinois.ncsa.daffodil.util.TestUtils
-import edu.illinois.ncsa.daffodil.io.ByteBufferDataInputStream
-import edu.illinois.ncsa.daffodil.infoset.DIDocument
-import edu.illinois.ncsa.daffodil.infoset.NullInfosetOutputter
-import edu.illinois.ncsa.daffodil.infoset.TestInfoset
+import org.apache.daffodil.xml.XMLUtils
+import org.apache.daffodil.xml.GlobalQName
+import org.apache.daffodil.Implicits._; object INoWarn2 { ImplicitsSuppressUnusedImportWarning() }
+import org.apache.daffodil.processors.parsers.PState
+import org.apache.daffodil.util.TestUtils
+import org.apache.daffodil.io.ByteBufferDataInputStream
+import org.apache.daffodil.infoset.DIDocument
+import org.apache.daffodil.infoset.NullInfosetOutputter
+import org.apache.daffodil.infoset.TestInfoset
class TestDFDLExpressionEvaluation extends Parsers {
diff --git a/daffodil-core/src/test/scala/org/apache/daffodil/dpath/TestDFDLExpressionTree.scala b/daffodil-core/src/test/scala/org/apache/daffodil/dpath/TestDFDLExpressionTree.scala
index 3f79e17..8dcb685 100644
--- a/daffodil-core/src/test/scala/org/apache/daffodil/dpath/TestDFDLExpressionTree.scala
+++ b/daffodil-core/src/test/scala/org/apache/daffodil/dpath/TestDFDLExpressionTree.scala
@@ -30,18 +30,18 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.dpath
+package org.apache.daffodil.dpath
import junit.framework.Assert._
import org.junit.Test
-import edu.illinois.ncsa.daffodil.util.SchemaUtils
-import edu.illinois.ncsa.daffodil.compiler._
+import org.apache.daffodil.util.SchemaUtils
+import org.apache.daffodil.compiler._
import scala.util.parsing.combinator.Parsers
-import edu.illinois.ncsa.daffodil.xml._
-import edu.illinois.ncsa.daffodil.dsom._
-import edu.illinois.ncsa.daffodil.processors.ElementRuntimeData
-import edu.illinois.ncsa.daffodil.xml.StepQName
-import edu.illinois.ncsa.daffodil.Implicits._
+import org.apache.daffodil.xml._
+import org.apache.daffodil.dsom._
+import org.apache.daffodil.processors.ElementRuntimeData
+import org.apache.daffodil.xml.StepQName
+import org.apache.daffodil.Implicits._
import java.math.{ BigDecimal => JBigDecimal, BigInteger => JBigInt }
class TestDFDLExpressionTree extends Parsers {
diff --git a/daffodil-core/src/test/scala/org/apache/daffodil/dpath/TestDPath.scala b/daffodil-core/src/test/scala/org/apache/daffodil/dpath/TestDPath.scala
index c0bc60a..6679105 100644
--- a/daffodil-core/src/test/scala/org/apache/daffodil/dpath/TestDPath.scala
+++ b/daffodil-core/src/test/scala/org/apache/daffodil/dpath/TestDPath.scala
@@ -30,12 +30,12 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.dpath
+package org.apache.daffodil.dpath
import org.junit.Test
-import edu.illinois.ncsa.daffodil.Implicits._; object INoWarn { ImplicitsSuppressUnusedImportWarning() }
-import edu.illinois.ncsa.daffodil.util.SchemaUtils
-import edu.illinois.ncsa.daffodil.util.TestUtils
+import org.apache.daffodil.Implicits._; object INoWarn { ImplicitsSuppressUnusedImportWarning() }
+import org.apache.daffodil.util.SchemaUtils
+import org.apache.daffodil.util.TestUtils
class TestDPath {
diff --git a/daffodil-core/src/test/scala/org/apache/daffodil/dsom/TestBinaryInput_01.scala b/daffodil-core/src/test/scala/org/apache/daffodil/dsom/TestBinaryInput_01.scala
index b961431..7cbc21a 100644
--- a/daffodil-core/src/test/scala/org/apache/daffodil/dsom/TestBinaryInput_01.scala
+++ b/daffodil-core/src/test/scala/org/apache/daffodil/dsom/TestBinaryInput_01.scala
@@ -30,25 +30,25 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.dsom
+package org.apache.daffodil.dsom
import junit.framework.Assert._
import org.junit.Test
import org.junit.After
-import edu.illinois.ncsa.daffodil.util.Misc
-import edu.illinois.ncsa.daffodil.schema.annotation.props.gen.BitOrder
-import edu.illinois.ncsa.daffodil.io.ByteBufferDataInputStream
-import edu.illinois.ncsa.daffodil.schema.annotation.props.gen.ByteOrder
+import org.apache.daffodil.util.Misc
+import org.apache.daffodil.schema.annotation.props.gen.BitOrder
+import org.apache.daffodil.io.ByteBufferDataInputStream
+import org.apache.daffodil.schema.annotation.props.gen.ByteOrder
import java.nio.ByteBuffer
-import edu.illinois.ncsa.daffodil.io.DataInputStream
-import edu.illinois.ncsa.daffodil.io.FormatInfo
-import edu.illinois.ncsa.daffodil.util.Maybe
-import edu.illinois.ncsa.daffodil.schema.annotation.props.gen.BinaryFloatRep
-import edu.illinois.ncsa.daffodil.util.MaybeInt
-import edu.illinois.ncsa.daffodil.schema.annotation.props.gen.EncodingErrorPolicy
-import edu.illinois.ncsa.daffodil.schema.annotation.props.gen.UTF16Width
-import edu.illinois.ncsa.daffodil.processors.charset.BitsCharsetDecoder
-import edu.illinois.ncsa.daffodil.processors.charset.BitsCharsetEncoder
+import org.apache.daffodil.io.DataInputStream
+import org.apache.daffodil.io.FormatInfo
+import org.apache.daffodil.util.Maybe
+import org.apache.daffodil.schema.annotation.props.gen.BinaryFloatRep
+import org.apache.daffodil.util.MaybeInt
+import org.apache.daffodil.schema.annotation.props.gen.EncodingErrorPolicy
+import org.apache.daffodil.schema.annotation.props.gen.UTF16Width
+import org.apache.daffodil.processors.charset.BitsCharsetDecoder
+import org.apache.daffodil.processors.charset.BitsCharsetEncoder
// Do no harm number 16 of 626 fail in regression, 154 in total of 797
diff --git a/daffodil-core/src/test/scala/org/apache/daffodil/dsom/TestCouldBeNextElement.scala b/daffodil-core/src/test/scala/org/apache/daffodil/dsom/TestCouldBeNextElement.scala
index 159d1ec..43a7f94 100644
--- a/daffodil-core/src/test/scala/org/apache/daffodil/dsom/TestCouldBeNextElement.scala
+++ b/daffodil-core/src/test/scala/org/apache/daffodil/dsom/TestCouldBeNextElement.scala
@@ -30,15 +30,15 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.dsom
+package org.apache.daffodil.dsom
import junit.framework.Assert._
import org.junit.Test
-import edu.illinois.ncsa.daffodil.util._
-import edu.illinois.ncsa.daffodil.compiler._
+import org.apache.daffodil.util._
+import org.apache.daffodil.compiler._
import junit.framework.Assert.assertEquals
-import edu.illinois.ncsa.daffodil.infoset.ChoiceBranchStartEvent
-import edu.illinois.ncsa.daffodil.infoset.ChoiceBranchEndEvent
+import org.apache.daffodil.infoset.ChoiceBranchStartEvent
+import org.apache.daffodil.infoset.ChoiceBranchEndEvent
class TestCouldBeNextElement {
diff --git a/daffodil-core/src/test/scala/org/apache/daffodil/dsom/TestDsomCompiler.scala b/daffodil-core/src/test/scala/org/apache/daffodil/dsom/TestDsomCompiler.scala
index df2413d..25fce81 100644
--- a/daffodil-core/src/test/scala/org/apache/daffodil/dsom/TestDsomCompiler.scala
+++ b/daffodil-core/src/test/scala/org/apache/daffodil/dsom/TestDsomCompiler.scala
@@ -30,22 +30,22 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.dsom
+package org.apache.daffodil.dsom
import scala.xml.{ XML, Utility, Node }
import org.junit.Test
-import edu.illinois.ncsa.daffodil.compiler._
-import edu.illinois.ncsa.daffodil.Implicits._; object INoWarnDSOM1 { ImplicitsSuppressUnusedImportWarning() }
-import edu.illinois.ncsa.daffodil.schema.annotation.props.gen.{ YesNo, TextNumberRep, SeparatorPosition, Representation, OccursCountKind, NilKind, LengthKind, ChoiceLengthKind, ByteOrder, BinaryNumberRep, AlignmentUnits }
+import org.apache.daffodil.compiler._
+import org.apache.daffodil.Implicits._; object INoWarnDSOM1 { ImplicitsSuppressUnusedImportWarning() }
+import org.apache.daffodil.schema.annotation.props.gen.{ YesNo, TextNumberRep, SeparatorPosition, Representation, OccursCountKind, NilKind, LengthKind, ChoiceLengthKind, ByteOrder, BinaryNumberRep, AlignmentUnits }
-import edu.illinois.ncsa.daffodil.schema.annotation.props.AlignmentType
-import edu.illinois.ncsa.daffodil.util.{ Misc, Logging }
-import edu.illinois.ncsa.daffodil.xml.XMLUtils
+import org.apache.daffodil.schema.annotation.props.AlignmentType
+import org.apache.daffodil.util.{ Misc, Logging }
+import org.apache.daffodil.xml.XMLUtils
import junit.framework.Assert._
-import edu.illinois.ncsa.daffodil.api.Diagnostic
-import edu.illinois.ncsa.daffodil.util.SchemaUtils
+import org.apache.daffodil.api.Diagnostic
+import org.apache.daffodil.util.SchemaUtils
import org.junit.Test
-import edu.illinois.ncsa.daffodil.schema.annotation.props.Found
+import org.apache.daffodil.schema.annotation.props.Found
class TestDsomCompiler extends Logging {
diff --git a/daffodil-core/src/test/scala/org/apache/daffodil/dsom/TestDsomCompilerUnparse1.scala b/daffodil-core/src/test/scala/org/apache/daffodil/dsom/TestDsomCompilerUnparse1.scala
index 69c58c7..57389c0 100644
--- a/daffodil-core/src/test/scala/org/apache/daffodil/dsom/TestDsomCompilerUnparse1.scala
+++ b/daffodil-core/src/test/scala/org/apache/daffodil/dsom/TestDsomCompilerUnparse1.scala
@@ -30,12 +30,12 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.dsom
+package org.apache.daffodil.dsom
import org.junit.Test
-import edu.illinois.ncsa.daffodil.xml.XMLUtils
-import edu.illinois.ncsa.daffodil.util._
-import edu.illinois.ncsa.daffodil.Implicits._
+import org.apache.daffodil.xml.XMLUtils
+import org.apache.daffodil.util._
+import org.apache.daffodil.Implicits._
class TestDsomCompilerUnparse1 {
diff --git a/daffodil-core/src/test/scala/org/apache/daffodil/dsom/TestExternalVariablesNew.scala b/daffodil-core/src/test/scala/org/apache/daffodil/dsom/TestExternalVariablesNew.scala
index 6705e30..8702e6c 100644
--- a/daffodil-core/src/test/scala/org/apache/daffodil/dsom/TestExternalVariablesNew.scala
+++ b/daffodil-core/src/test/scala/org/apache/daffodil/dsom/TestExternalVariablesNew.scala
@@ -30,25 +30,25 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.dsom
+package org.apache.daffodil.dsom
import org.junit.Test
-import edu.illinois.ncsa.daffodil.Implicits.ns2String
-import edu.illinois.ncsa.daffodil.compiler.Compiler
-import edu.illinois.ncsa.daffodil.processors.VariableMap
-import edu.illinois.ncsa.daffodil.util.SchemaUtils
-import edu.illinois.ncsa.daffodil.xml.XMLUtils
+import org.apache.daffodil.Implicits.ns2String
+import org.apache.daffodil.compiler.Compiler
+import org.apache.daffodil.processors.VariableMap
+import org.apache.daffodil.util.SchemaUtils
+import org.apache.daffodil.xml.XMLUtils
import junit.framework.Assert.assertFalse
import junit.framework.Assert.assertTrue
import junit.framework.Assert._
import org.junit.Test
-import edu.illinois.ncsa.daffodil.xml.NS
+import org.apache.daffodil.xml.NS
import scala.xml.Node
-import edu.illinois.ncsa.daffodil.externalvars.ExternalVariablesLoader
-import edu.illinois.ncsa.daffodil.Implicits._
-import edu.illinois.ncsa.daffodil.api.UnitTestSchemaSource
-import edu.illinois.ncsa.daffodil.xml.QName
-import edu.illinois.ncsa.daffodil.util.Misc
+import org.apache.daffodil.externalvars.ExternalVariablesLoader
+import org.apache.daffodil.Implicits._
+import org.apache.daffodil.api.UnitTestSchemaSource
+import org.apache.daffodil.xml.QName
+import org.apache.daffodil.util.Misc
/**
* Tests for compiler-oriented XPath interface aka CompiledExpression
diff --git a/daffodil-core/src/test/scala/org/apache/daffodil/dsom/TestInputValueCalc.scala b/daffodil-core/src/test/scala/org/apache/daffodil/dsom/TestInputValueCalc.scala
index 4307091..edf108e 100644
--- a/daffodil-core/src/test/scala/org/apache/daffodil/dsom/TestInputValueCalc.scala
+++ b/daffodil-core/src/test/scala/org/apache/daffodil/dsom/TestInputValueCalc.scala
@@ -30,9 +30,9 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.dsom
+package org.apache.daffodil.dsom
-import edu.illinois.ncsa.daffodil.util._
+import org.apache.daffodil.util._
import org.junit.Test
import scala.xml.Node
import org.junit.Test
diff --git a/daffodil-core/src/test/scala/org/apache/daffodil/dsom/TestIsScannable.scala b/daffodil-core/src/test/scala/org/apache/daffodil/dsom/TestIsScannable.scala
index 7f9229b..589905c 100644
--- a/daffodil-core/src/test/scala/org/apache/daffodil/dsom/TestIsScannable.scala
+++ b/daffodil-core/src/test/scala/org/apache/daffodil/dsom/TestIsScannable.scala
@@ -12,15 +12,15 @@
* limitations under the License.
*/
-package edu.illinois.ncsa.daffodil.dsom
+package org.apache.daffodil.dsom
import org.junit.Test
-import edu.illinois.ncsa.daffodil.compiler._
+import org.apache.daffodil.compiler._
-import edu.illinois.ncsa.daffodil.util.Logging
-import edu.illinois.ncsa.daffodil.xml.XMLUtils
+import org.apache.daffodil.util.Logging
+import org.apache.daffodil.xml.XMLUtils
import junit.framework.Assert._
-import edu.illinois.ncsa.daffodil.util.SchemaUtils
+import org.apache.daffodil.util.SchemaUtils
import org.junit.Test
class TestIsScannable extends Logging {
diff --git a/daffodil-core/src/test/scala/org/apache/daffodil/dsom/TestMiddleEndAttributes.scala b/daffodil-core/src/test/scala/org/apache/daffodil/dsom/TestMiddleEndAttributes.scala
index 02a747a..03c8a9d 100644
--- a/daffodil-core/src/test/scala/org/apache/daffodil/dsom/TestMiddleEndAttributes.scala
+++ b/daffodil-core/src/test/scala/org/apache/daffodil/dsom/TestMiddleEndAttributes.scala
@@ -30,11 +30,11 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.dsom
+package org.apache.daffodil.dsom
-import edu.illinois.ncsa.daffodil.xml.XMLUtils
+import org.apache.daffodil.xml.XMLUtils
import junit.framework.Assert._
-import edu.illinois.ncsa.daffodil.util._
+import org.apache.daffodil.util._
import org.junit.Test
import org.junit.Test
diff --git a/daffodil-core/src/test/scala/org/apache/daffodil/dsom/TestMiddleEndAttributes2.scala b/daffodil-core/src/test/scala/org/apache/daffodil/dsom/TestMiddleEndAttributes2.scala
index 59e7f54..ab8bd0d 100644
--- a/daffodil-core/src/test/scala/org/apache/daffodil/dsom/TestMiddleEndAttributes2.scala
+++ b/daffodil-core/src/test/scala/org/apache/daffodil/dsom/TestMiddleEndAttributes2.scala
@@ -30,11 +30,11 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.dsom
+package org.apache.daffodil.dsom
-import edu.illinois.ncsa.daffodil.util.SchemaUtils
+import org.apache.daffodil.util.SchemaUtils
import org.junit.Test
-import edu.illinois.ncsa.daffodil.util.TestUtils
+import org.apache.daffodil.util.TestUtils
class TestMiddleEndAttributes2 {
diff --git a/daffodil-core/src/test/scala/org/apache/daffodil/dsom/TestMiddleEndAttributes3.scala b/daffodil-core/src/test/scala/org/apache/daffodil/dsom/TestMiddleEndAttributes3.scala
index 8ea89a5..5bbc7fb 100644
--- a/daffodil-core/src/test/scala/org/apache/daffodil/dsom/TestMiddleEndAttributes3.scala
+++ b/daffodil-core/src/test/scala/org/apache/daffodil/dsom/TestMiddleEndAttributes3.scala
@@ -30,9 +30,9 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.dsom
+package org.apache.daffodil.dsom
-import edu.illinois.ncsa.daffodil.util.SchemaUtils
+import org.apache.daffodil.util.SchemaUtils
import org.junit.Test
import org.junit.Assert._
diff --git a/daffodil-core/src/test/scala/org/apache/daffodil/dsom/TestPropertyScoping.scala b/daffodil-core/src/test/scala/org/apache/daffodil/dsom/TestPropertyScoping.scala
index 49ae141..d59752f 100644
--- a/daffodil-core/src/test/scala/org/apache/daffodil/dsom/TestPropertyScoping.scala
+++ b/daffodil-core/src/test/scala/org/apache/daffodil/dsom/TestPropertyScoping.scala
@@ -30,13 +30,13 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.dsom
+package org.apache.daffodil.dsom
import scala.xml.Node
import org.junit.Test
import org.junit.Assert._
-import edu.illinois.ncsa.daffodil.util.LogLevel
-import edu.illinois.ncsa.daffodil.util.Fakes
+import org.apache.daffodil.util.LogLevel
+import org.apache.daffodil.util.Fakes
class HasProps(xml: Node) extends DFDLNonDefaultFormatAnnotation(xml, Fakes.fakeElem)
diff --git a/daffodil-core/src/test/scala/org/apache/daffodil/dsom/TestSimpleTypeUnions.scala b/daffodil-core/src/test/scala/org/apache/daffodil/dsom/TestSimpleTypeUnions.scala
index 89376fa..ab35661 100644
--- a/daffodil-core/src/test/scala/org/apache/daffodil/dsom/TestSimpleTypeUnions.scala
+++ b/daffodil-core/src/test/scala/org/apache/daffodil/dsom/TestSimpleTypeUnions.scala
@@ -30,16 +30,16 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.dsom
+package org.apache.daffodil.dsom
-import edu.illinois.ncsa.daffodil.xml.XMLUtils
+import org.apache.daffodil.xml.XMLUtils
import junit.framework.Assert._
-import edu.illinois.ncsa.daffodil.util._
-import edu.illinois.ncsa.daffodil.dpath.NodeInfo._
+import org.apache.daffodil.util._
+import org.apache.daffodil.dpath.NodeInfo._
import org.junit.Test
-import edu.illinois.ncsa.daffodil.infoset.DISimple
-import edu.illinois.ncsa.daffodil.infoset.DIDocument
-import edu.illinois.ncsa.daffodil.processors.parsers.PState
+import org.apache.daffodil.infoset.DISimple
+import org.apache.daffodil.infoset.DIDocument
+import org.apache.daffodil.processors.parsers.PState
class TestSimpleTypeUnions {
val xsd = XMLUtils.XSD_NAMESPACE
diff --git a/daffodil-core/src/test/scala/org/apache/daffodil/dsom/TextCompileExpressionExecution.scala b/daffodil-core/src/test/scala/org/apache/daffodil/dsom/TextCompileExpressionExecution.scala
index baaee3f..696dd2d 100644
--- a/daffodil-core/src/test/scala/org/apache/daffodil/dsom/TextCompileExpressionExecution.scala
+++ b/daffodil-core/src/test/scala/org/apache/daffodil/dsom/TextCompileExpressionExecution.scala
@@ -30,9 +30,9 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.dsom
+package org.apache.daffodil.dsom
-import edu.illinois.ncsa.daffodil.xml.XMLUtils
+import org.apache.daffodil.xml.XMLUtils
class TextCompileExpressionExecution {
val xsd = XMLUtils.XSD_NAMESPACE
diff --git a/daffodil-core/src/test/scala/org/apache/daffodil/externalvars/TestExternalVariablesLoader.scala b/daffodil-core/src/test/scala/org/apache/daffodil/externalvars/TestExternalVariablesLoader.scala
index 8e8f8bf..c46d287 100644
--- a/daffodil-core/src/test/scala/org/apache/daffodil/externalvars/TestExternalVariablesLoader.scala
+++ b/daffodil-core/src/test/scala/org/apache/daffodil/externalvars/TestExternalVariablesLoader.scala
@@ -30,21 +30,21 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.externalvars
+package org.apache.daffodil.externalvars
-import edu.illinois.ncsa.daffodil.xml._
-import edu.illinois.ncsa.daffodil.util._
+import org.apache.daffodil.xml._
+import org.apache.daffodil.util._
import scala.xml._
import junit.framework.Assert._
import org.junit.Test
-import edu.illinois.ncsa.daffodil.dsom.SchemaSet
-import edu.illinois.ncsa.daffodil.xml.NS
-import edu.illinois.ncsa.daffodil.Implicits._
+import org.apache.daffodil.dsom.SchemaSet
+import org.apache.daffodil.xml.NS
+import org.apache.daffodil.Implicits._
import org.junit.Test
-import edu.illinois.ncsa.daffodil.dsom.SchemaDefinitionError
+import org.apache.daffodil.dsom.SchemaDefinitionError
import scala.util.Success
-import edu.illinois.ncsa.daffodil.processors.VariableMap
-import edu.illinois.ncsa.daffodil.api.DaffodilTunables
+import org.apache.daffodil.processors.VariableMap
+import org.apache.daffodil.api.DaffodilTunables
class TestExternalVariablesLoader extends Logging {
val xsd = XMLUtils.XSD_NAMESPACE
diff --git a/daffodil-core/src/test/scala/org/apache/daffodil/externalvars/TestExternalVariablesLoaderNew.scala b/daffodil-core/src/test/scala/org/apache/daffodil/externalvars/TestExternalVariablesLoaderNew.scala
index 51b6d3d..e82b2c6 100644
--- a/daffodil-core/src/test/scala/org/apache/daffodil/externalvars/TestExternalVariablesLoaderNew.scala
+++ b/daffodil-core/src/test/scala/org/apache/daffodil/externalvars/TestExternalVariablesLoaderNew.scala
@@ -30,14 +30,14 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.externalvars
+package org.apache.daffodil.externalvars
-import edu.illinois.ncsa.daffodil.xml.XMLUtils
-import edu.illinois.ncsa.daffodil.util._
+import org.apache.daffodil.xml.XMLUtils
+import org.apache.daffodil.util._
import scala.xml._
-import edu.illinois.ncsa.daffodil.dsom.SchemaSet
-import edu.illinois.ncsa.daffodil.xml.NS
-import edu.illinois.ncsa.daffodil.Implicits._; object INoWarn1 { ImplicitsSuppressUnusedImportWarning() }
+import org.apache.daffodil.dsom.SchemaSet
+import org.apache.daffodil.xml.NS
+import org.apache.daffodil.Implicits._; object INoWarn1 { ImplicitsSuppressUnusedImportWarning() }
class TestExternalVariablesLoaderNew extends Logging {
val xsd = XMLUtils.XSD_NAMESPACE
diff --git a/daffodil-core/src/test/scala/org/apache/daffodil/externalvars/TestExternalVariablesNew.scala b/daffodil-core/src/test/scala/org/apache/daffodil/externalvars/TestExternalVariablesNew.scala
index 87f8efc..39ff27e 100644
--- a/daffodil-core/src/test/scala/org/apache/daffodil/externalvars/TestExternalVariablesNew.scala
+++ b/daffodil-core/src/test/scala/org/apache/daffodil/externalvars/TestExternalVariablesNew.scala
@@ -30,15 +30,15 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.externalvars
+package org.apache.daffodil.externalvars
-import edu.illinois.ncsa.daffodil.util._
+import org.apache.daffodil.util._
import junit.framework.Assert._
import org.junit.Test
-import edu.illinois.ncsa.daffodil.Implicits._; object INoWarn2 { ImplicitsSuppressUnusedImportWarning() }
+import org.apache.daffodil.Implicits._; object INoWarn2 { ImplicitsSuppressUnusedImportWarning() }
import org.junit.Test
-import edu.illinois.ncsa.daffodil.xml._
+import org.apache.daffodil.xml._
import scala.util.Success
class TestExternalVariablesNew extends Logging {
diff --git a/daffodil-core/src/test/scala/org/apache/daffodil/general/TestDFDLReaders.scala b/daffodil-core/src/test/scala/org/apache/daffodil/general/TestDFDLReaders.scala
index fe32012..0578505 100644
--- a/daffodil-core/src/test/scala/org/apache/daffodil/general/TestDFDLReaders.scala
+++ b/daffodil-core/src/test/scala/org/apache/daffodil/general/TestDFDLReaders.scala
@@ -30,7 +30,7 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.general
+package org.apache.daffodil.general
class TestDFDLReaders {
diff --git a/daffodil-core/src/test/scala/org/apache/daffodil/general/TestPrimitives.scala b/daffodil-core/src/test/scala/org/apache/daffodil/general/TestPrimitives.scala
index 7194fae..af08da3 100644
--- a/daffodil-core/src/test/scala/org/apache/daffodil/general/TestPrimitives.scala
+++ b/daffodil-core/src/test/scala/org/apache/daffodil/general/TestPrimitives.scala
@@ -30,14 +30,14 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.general
+package org.apache.daffodil.general
import scala.xml._
-import edu.illinois.ncsa.daffodil.util.TestUtils
+import org.apache.daffodil.util.TestUtils
import org.junit.Test
-import edu.illinois.ncsa.daffodil.Implicits._; object INoWarn9 { ImplicitsSuppressUnusedImportWarning() }
-import edu.illinois.ncsa.daffodil.util.SchemaUtils
+import org.apache.daffodil.Implicits._; object INoWarn9 { ImplicitsSuppressUnusedImportWarning() }
+import org.apache.daffodil.util.SchemaUtils
class TestPrimitives {
diff --git a/daffodil-core/src/test/scala/org/apache/daffodil/general/TestPrimitives2.scala b/daffodil-core/src/test/scala/org/apache/daffodil/general/TestPrimitives2.scala
index a16ab61..2eb652a 100644
--- a/daffodil-core/src/test/scala/org/apache/daffodil/general/TestPrimitives2.scala
+++ b/daffodil-core/src/test/scala/org/apache/daffodil/general/TestPrimitives2.scala
@@ -30,12 +30,12 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.general
+package org.apache.daffodil.general
import org.junit.Test
-import edu.illinois.ncsa.daffodil.util.SchemaUtils
-import edu.illinois.ncsa.daffodil.xml.XMLUtils
-import edu.illinois.ncsa.daffodil.util.TestUtils
+import org.apache.daffodil.util.SchemaUtils
+import org.apache.daffodil.xml.XMLUtils
+import org.apache.daffodil.util.TestUtils
class TestPrimitives2 {
diff --git a/daffodil-core/src/test/scala/org/apache/daffodil/general/TestTunables.scala b/daffodil-core/src/test/scala/org/apache/daffodil/general/TestTunables.scala
index 6b6ecb4..5b639d9 100644
--- a/daffodil-core/src/test/scala/org/apache/daffodil/general/TestTunables.scala
+++ b/daffodil-core/src/test/scala/org/apache/daffodil/general/TestTunables.scala
@@ -30,19 +30,19 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.general
+package org.apache.daffodil.general
import org.junit.Test
-import edu.illinois.ncsa.daffodil.Implicits.ImplicitsSuppressUnusedImportWarning
-import edu.illinois.ncsa.daffodil.compiler.Compiler; object INoWarnDSOM1 { ImplicitsSuppressUnusedImportWarning() }
+import org.apache.daffodil.Implicits.ImplicitsSuppressUnusedImportWarning
+import org.apache.daffodil.compiler.Compiler; object INoWarnDSOM1 { ImplicitsSuppressUnusedImportWarning() }
-import edu.illinois.ncsa.daffodil.util.Fakes
-import edu.illinois.ncsa.daffodil.util.Logging
-import edu.illinois.ncsa.daffodil.util.SchemaUtils
-import edu.illinois.ncsa.daffodil.xml.XMLUtils
+import org.apache.daffodil.util.Fakes
+import org.apache.daffodil.util.Logging
+import org.apache.daffodil.util.SchemaUtils
+import org.apache.daffodil.xml.XMLUtils
import junit.framework.Assert.assertEquals
-import edu.illinois.ncsa.daffodil.api.DaffodilTunables
+import org.apache.daffodil.api.DaffodilTunables
class TestTunables extends Logging {
diff --git a/daffodil-core/src/test/scala/org/apache/daffodil/grammar/TestGrammar.scala b/daffodil-core/src/test/scala/org/apache/daffodil/grammar/TestGrammar.scala
index 30266ee..0630e0d 100644
--- a/daffodil-core/src/test/scala/org/apache/daffodil/grammar/TestGrammar.scala
+++ b/daffodil-core/src/test/scala/org/apache/daffodil/grammar/TestGrammar.scala
@@ -31,15 +31,15 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.grammar
+package org.apache.daffodil.grammar
import junit.framework.Assert._
-import edu.illinois.ncsa.daffodil.Implicits._; object INoWarnG1 { ImplicitsSuppressUnusedImportWarning() }
-import edu.illinois.ncsa.daffodil.dsom._
-import edu.illinois.ncsa.daffodil.exceptions.Assert
-import edu.illinois.ncsa.daffodil.processors.parsers.Parser
+import org.apache.daffodil.Implicits._; object INoWarnG1 { ImplicitsSuppressUnusedImportWarning() }
+import org.apache.daffodil.dsom._
+import org.apache.daffodil.exceptions.Assert
+import org.apache.daffodil.processors.parsers.Parser
import org.junit.Test
-import edu.illinois.ncsa.daffodil.util.Fakes
+import org.apache.daffodil.util.Fakes
class TestGrammar extends GrammarMixin {
diff --git a/daffodil-core/src/test/scala/org/apache/daffodil/infoset/TestInfoset.scala b/daffodil-core/src/test/scala/org/apache/daffodil/infoset/TestInfoset.scala
index 6ab72be..aed5c3e 100644
--- a/daffodil-core/src/test/scala/org/apache/daffodil/infoset/TestInfoset.scala
+++ b/daffodil-core/src/test/scala/org/apache/daffodil/infoset/TestInfoset.scala
@@ -30,17 +30,17 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.infoset
+package org.apache.daffodil.infoset
-import edu.illinois.ncsa.daffodil.xml.XMLUtils
-import edu.illinois.ncsa.daffodil.util._
-import edu.illinois.ncsa.daffodil.Implicits._
-import edu.illinois.ncsa.daffodil.compiler._
+import org.apache.daffodil.xml.XMLUtils
+import org.apache.daffodil.util._
+import org.apache.daffodil.Implicits._
+import org.apache.daffodil.compiler._
import junit.framework.Assert._
import org.junit.Test
-import edu.illinois.ncsa.daffodil.processors.ElementRuntimeData
-import edu.illinois.ncsa.daffodil.exceptions.Assert
-import edu.illinois.ncsa.daffodil.api.DaffodilTunables
+import org.apache.daffodil.processors.ElementRuntimeData
+import org.apache.daffodil.exceptions.Assert
+import org.apache.daffodil.api.DaffodilTunables
object TestInfoset {
/**
diff --git a/daffodil-core/src/test/scala/org/apache/daffodil/infoset/TestInfoset2.scala b/daffodil-core/src/test/scala/org/apache/daffodil/infoset/TestInfoset2.scala
index c8b9df4..71108a6 100644
--- a/daffodil-core/src/test/scala/org/apache/daffodil/infoset/TestInfoset2.scala
+++ b/daffodil-core/src/test/scala/org/apache/daffodil/infoset/TestInfoset2.scala
@@ -30,11 +30,11 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.infoset
+package org.apache.daffodil.infoset
-import edu.illinois.ncsa.daffodil.xml.XMLUtils
-import edu.illinois.ncsa.daffodil.util._
-import edu.illinois.ncsa.daffodil.Implicits._;
+import org.apache.daffodil.xml.XMLUtils
+import org.apache.daffodil.util._
+import org.apache.daffodil.Implicits._;
import org.junit.Test
import org.junit.Assert._
diff --git a/daffodil-core/src/test/scala/org/apache/daffodil/infoset/TestInfosetCursor.scala b/daffodil-core/src/test/scala/org/apache/daffodil/infoset/TestInfosetCursor.scala
index fd59a7f..c3db8ff 100644
--- a/daffodil-core/src/test/scala/org/apache/daffodil/infoset/TestInfosetCursor.scala
+++ b/daffodil-core/src/test/scala/org/apache/daffodil/infoset/TestInfosetCursor.scala
@@ -30,16 +30,16 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.infoset
+package org.apache.daffodil.infoset
import org.junit.Test
import org.junit.Assert._
-import edu.illinois.ncsa.daffodil.xml._
-import edu.illinois.ncsa.daffodil.Implicits._
-import edu.illinois.ncsa.daffodil.equality._
-import edu.illinois.ncsa.daffodil.util.SchemaUtils
-import edu.illinois.ncsa.daffodil.processors.DataProcessor
-import edu.illinois.ncsa.daffodil.compiler.Compiler
+import org.apache.daffodil.xml._
+import org.apache.daffodil.Implicits._
+import org.apache.daffodil.equality._
+import org.apache.daffodil.util.SchemaUtils
+import org.apache.daffodil.processors.DataProcessor
+import org.apache.daffodil.compiler.Compiler
/**
* Lets us pattern deconstruct infoset events, which is nice for unit testing
diff --git a/daffodil-core/src/test/scala/org/apache/daffodil/infoset/TestInfosetCursor1.scala b/daffodil-core/src/test/scala/org/apache/daffodil/infoset/TestInfosetCursor1.scala
index 6300b7a..30eda9d 100644
--- a/daffodil-core/src/test/scala/org/apache/daffodil/infoset/TestInfosetCursor1.scala
+++ b/daffodil-core/src/test/scala/org/apache/daffodil/infoset/TestInfosetCursor1.scala
@@ -30,16 +30,16 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.infoset
+package org.apache.daffodil.infoset
import org.junit.Assert.assertTrue
import org.junit.Test
-import edu.illinois.ncsa.daffodil.Implicits.intercept
-import edu.illinois.ncsa.daffodil.compiler.Compiler
-import edu.illinois.ncsa.daffodil.processors.DataProcessor
-import edu.illinois.ncsa.daffodil.util.Misc
-import edu.illinois.ncsa.daffodil.util.SchemaUtils
-import edu.illinois.ncsa.daffodil.processors.unparsers.UnparseError
+import org.apache.daffodil.Implicits.intercept
+import org.apache.daffodil.compiler.Compiler
+import org.apache.daffodil.processors.DataProcessor
+import org.apache.daffodil.util.Misc
+import org.apache.daffodil.util.SchemaUtils
+import org.apache.daffodil.processors.unparsers.UnparseError
class TestInfosetInputter1 {
diff --git a/daffodil-core/src/test/scala/org/apache/daffodil/infoset/TestInfosetCursorFromReader.scala b/daffodil-core/src/test/scala/org/apache/daffodil/infoset/TestInfosetCursorFromReader.scala
index 354f6c0..c6571ae 100644
--- a/daffodil-core/src/test/scala/org/apache/daffodil/infoset/TestInfosetCursorFromReader.scala
+++ b/daffodil-core/src/test/scala/org/apache/daffodil/infoset/TestInfosetCursorFromReader.scala
@@ -30,18 +30,18 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.infoset
+package org.apache.daffodil.infoset
import org.junit.Test
import org.junit.Assert._
-import edu.illinois.ncsa.daffodil.xml._
-import edu.illinois.ncsa.daffodil.Implicits._
-import edu.illinois.ncsa.daffodil.equality._
-import edu.illinois.ncsa.daffodil.util.TestUtils
-import edu.illinois.ncsa.daffodil.util.SchemaUtils
-import edu.illinois.ncsa.daffodil.processors.DataProcessor
-import edu.illinois.ncsa.daffodil.compiler.Compiler
-import edu.illinois.ncsa.daffodil.util.IteratorFromCursor
+import org.apache.daffodil.xml._
+import org.apache.daffodil.Implicits._
+import org.apache.daffodil.equality._
+import org.apache.daffodil.util.TestUtils
+import org.apache.daffodil.util.SchemaUtils
+import org.apache.daffodil.processors.DataProcessor
+import org.apache.daffodil.compiler.Compiler
+import org.apache.daffodil.util.IteratorFromCursor
/**
* All these tests were written for iterator style.
diff --git a/daffodil-core/src/test/scala/org/apache/daffodil/infoset/TestInfosetCursorFromReader2.scala b/daffodil-core/src/test/scala/org/apache/daffodil/infoset/TestInfosetCursorFromReader2.scala
index 11412b0..8c1e9f1 100644
--- a/daffodil-core/src/test/scala/org/apache/daffodil/infoset/TestInfosetCursorFromReader2.scala
+++ b/daffodil-core/src/test/scala/org/apache/daffodil/infoset/TestInfosetCursorFromReader2.scala
@@ -30,16 +30,16 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.infoset
+package org.apache.daffodil.infoset
import org.junit.Test
import org.junit.Assert._
-import edu.illinois.ncsa.daffodil.Implicits._
-import edu.illinois.ncsa.daffodil.equality._
-import edu.illinois.ncsa.daffodil.util.SchemaUtils
-import edu.illinois.ncsa.daffodil.processors.DataProcessor
-import edu.illinois.ncsa.daffodil.compiler.Compiler
-import edu.illinois.ncsa.daffodil.xml.XMLUtils
+import org.apache.daffodil.Implicits._
+import org.apache.daffodil.equality._
+import org.apache.daffodil.util.SchemaUtils
+import org.apache.daffodil.processors.DataProcessor
+import org.apache.daffodil.compiler.Compiler
+import org.apache.daffodil.xml.XMLUtils
import scala.collection.immutable.Stream.consWrapper
object INoWarnU1 { ImplicitsSuppressUnusedImportWarning() }
diff --git a/daffodil-core/src/test/scala/org/apache/daffodil/outputValueCalc/TestOutputValueCalcAndAlignment.scala b/daffodil-core/src/test/scala/org/apache/daffodil/outputValueCalc/TestOutputValueCalcAndAlignment.scala
index c13e24a..c855a27 100644
--- a/daffodil-core/src/test/scala/org/apache/daffodil/outputValueCalc/TestOutputValueCalcAndAlignment.scala
+++ b/daffodil-core/src/test/scala/org/apache/daffodil/outputValueCalc/TestOutputValueCalcAndAlignment.scala
@@ -30,18 +30,18 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.outputValueCalc
+package org.apache.daffodil.outputValueCalc
import org.junit.Assert.assertTrue
import org.junit.Assert.fail
import org.junit.Test
-import edu.illinois.ncsa.daffodil.Implicits.ns2String
-import edu.illinois.ncsa.daffodil.dsom.RuntimeSchemaDefinitionError
-import edu.illinois.ncsa.daffodil.util.Misc
-import edu.illinois.ncsa.daffodil.util.SchemaUtils
-import edu.illinois.ncsa.daffodil.util.TestUtils
-import edu.illinois.ncsa.daffodil.xml.XMLUtils
+import org.apache.daffodil.Implicits.ns2String
+import org.apache.daffodil.dsom.RuntimeSchemaDefinitionError
+import org.apache.daffodil.util.Misc
+import org.apache.daffodil.util.SchemaUtils
+import org.apache.daffodil.util.TestUtils
+import org.apache.daffodil.xml.XMLUtils
/*
* These are all tests of OVC and alignment interactions
diff --git a/daffodil-core/src/test/scala/org/apache/daffodil/outputValueCalc/TestOutputValueCalcForwardReference.scala b/daffodil-core/src/test/scala/org/apache/daffodil/outputValueCalc/TestOutputValueCalcForwardReference.scala
index db8e998..a177da2 100644
--- a/daffodil-core/src/test/scala/org/apache/daffodil/outputValueCalc/TestOutputValueCalcForwardReference.scala
+++ b/daffodil-core/src/test/scala/org/apache/daffodil/outputValueCalc/TestOutputValueCalcForwardReference.scala
@@ -30,15 +30,15 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.outputValueCalc
+package org.apache.daffodil.outputValueCalc
import org.junit.Test
import org.junit.Assert._
-import edu.illinois.ncsa.daffodil.xml.XMLUtils
-import edu.illinois.ncsa.daffodil.Implicits._
-import edu.illinois.ncsa.daffodil.util.SchemaUtils
-import edu.illinois.ncsa.daffodil.xml._
-import edu.illinois.ncsa.daffodil.util.TestUtils
+import org.apache.daffodil.xml.XMLUtils
+import org.apache.daffodil.Implicits._
+import org.apache.daffodil.util.SchemaUtils
+import org.apache.daffodil.xml._
+import org.apache.daffodil.util.TestUtils
/*
* These are all tests of OVC expressions that forward reference
diff --git a/daffodil-core/src/test/scala/org/apache/daffodil/schema/annotation/props/TestPropertyRuntime.scala b/daffodil-core/src/test/scala/org/apache/daffodil/schema/annotation/props/TestPropertyRuntime.scala
index f4ca667..ba94e89 100644
--- a/daffodil-core/src/test/scala/org/apache/daffodil/schema/annotation/props/TestPropertyRuntime.scala
+++ b/daffodil-core/src/test/scala/org/apache/daffodil/schema/annotation/props/TestPropertyRuntime.scala
@@ -30,14 +30,14 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.schema.annotation.props
+package org.apache.daffodil.schema.annotation.props
import junit.framework.Assert._
-import edu.illinois.ncsa.daffodil.exceptions.ThrowsSDE
+import org.apache.daffodil.exceptions.ThrowsSDE
import org.junit.Test
-import edu.illinois.ncsa.daffodil.dsom.SchemaComponentImpl
-import edu.illinois.ncsa.daffodil.util.Fakes
-import edu.illinois.ncsa.daffodil.dsom.NestingLexicalMixin
+import org.apache.daffodil.dsom.SchemaComponentImpl
+import org.apache.daffodil.util.Fakes
+import org.apache.daffodil.dsom.NestingLexicalMixin
sealed trait MyPropType extends MyProp.Value
object MyProp extends Enum[MyPropType] // with ThrowsSDE
diff --git a/daffodil-core/src/test/scala/org/apache/daffodil/util/TestUtils.scala b/daffodil-core/src/test/scala/org/apache/daffodil/util/TestUtils.scala
index 33b68b0..d0be37f 100644
--- a/daffodil-core/src/test/scala/org/apache/daffodil/util/TestUtils.scala
+++ b/daffodil-core/src/test/scala/org/apache/daffodil/util/TestUtils.scala
@@ -30,30 +30,30 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.util
+package org.apache.daffodil.util
import scala.xml._
-import edu.illinois.ncsa.daffodil.xml.XMLUtils
+import org.apache.daffodil.xml.XMLUtils
import java.io.File
import java.io.FileNotFoundException
-import edu.illinois.ncsa.daffodil.Implicits._; object INoWarnU2 { ImplicitsSuppressUnusedImportWarning() }
-import edu.illinois.ncsa.daffodil.compiler.Compiler
+import org.apache.daffodil.Implicits._; object INoWarnU2 { ImplicitsSuppressUnusedImportWarning() }
+import org.apache.daffodil.compiler.Compiler
import java.nio.channels.ReadableByteChannel
import org.junit.Assert.assertEquals
-import edu.illinois.ncsa.daffodil.dsom._
-import edu.illinois.ncsa.daffodil.xml._
-import edu.illinois.ncsa.daffodil.grammar.primitives.VariableMapFactory
-import edu.illinois.ncsa.daffodil.api._
-import edu.illinois.ncsa.daffodil.externalvars.Binding
-import edu.illinois.ncsa.daffodil.api.DFDL
-import edu.illinois.ncsa.daffodil.processors.DataProcessor
-import edu.illinois.ncsa.daffodil.debugger._
+import org.apache.daffodil.dsom._
+import org.apache.daffodil.xml._
+import org.apache.daffodil.grammar.primitives.VariableMapFactory
+import org.apache.daffodil.api._
+import org.apache.daffodil.externalvars.Binding
+import org.apache.daffodil.api.DFDL
+import org.apache.daffodil.processors.DataProcessor
+import org.apache.daffodil.debugger._
import java.nio.channels.Channels
-import edu.illinois.ncsa.daffodil.processors.VariableMap
-import edu.illinois.ncsa.daffodil.infoset.ScalaXMLInfosetOutputter
-import edu.illinois.ncsa.daffodil.infoset.ScalaXMLInfosetInputter
-import edu.illinois.ncsa.daffodil.infoset.InfosetOutputter
-import edu.illinois.ncsa.daffodil.infoset.InfosetInputter
+import org.apache.daffodil.processors.VariableMap
+import org.apache.daffodil.infoset.ScalaXMLInfosetOutputter
+import org.apache.daffodil.infoset.ScalaXMLInfosetInputter
+import org.apache.daffodil.infoset.InfosetOutputter
+import org.apache.daffodil.infoset.InfosetInputter
/*
* This is not a file of tests.
diff --git a/daffodil-core/src/test/scala/org/apache/daffodil/xml/TestXMLLoaderWithLocation.scala b/daffodil-core/src/test/scala/org/apache/daffodil/xml/TestXMLLoaderWithLocation.scala
index ea488c2..1b7ad90 100644
--- a/daffodil-core/src/test/scala/org/apache/daffodil/xml/TestXMLLoaderWithLocation.scala
+++ b/daffodil-core/src/test/scala/org/apache/daffodil/xml/TestXMLLoaderWithLocation.scala
@@ -30,13 +30,13 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.xml
+package org.apache.daffodil.xml
import junit.framework.Assert._
import org.junit.Test
-import edu.illinois.ncsa.daffodil.Implicits._
+import org.apache.daffodil.Implicits._
import java.io.File
-import edu.illinois.ncsa.daffodil.api.URISchemaSource
+import org.apache.daffodil.api.URISchemaSource
class TestXMLLoaderWithLocation {
diff --git a/daffodil-io/src/main/scala/org/apache/daffodil/io/ByteBufferDataInputStream.scala b/daffodil-io/src/main/scala/org/apache/daffodil/io/ByteBufferDataInputStream.scala
index 74981fa..8ded6cc 100644
--- a/daffodil-io/src/main/scala/org/apache/daffodil/io/ByteBufferDataInputStream.scala
+++ b/daffodil-io/src/main/scala/org/apache/daffodil/io/ByteBufferDataInputStream.scala
@@ -30,33 +30,33 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.io
+package org.apache.daffodil.io
-import edu.illinois.ncsa.daffodil.util.MaybeChar
-import edu.illinois.ncsa.daffodil.util.MaybeULong
-import edu.illinois.ncsa.daffodil.schema.annotation.props.gen.UTF16Width
-import edu.illinois.ncsa.daffodil.schema.annotation.props.gen.BitOrder
-import edu.illinois.ncsa.daffodil.schema.annotation.props.gen.ByteOrder
+import org.apache.daffodil.util.MaybeChar
+import org.apache.daffodil.util.MaybeULong
+import org.apache.daffodil.schema.annotation.props.gen.UTF16Width
+import org.apache.daffodil.schema.annotation.props.gen.BitOrder
+import org.apache.daffodil.schema.annotation.props.gen.ByteOrder
import java.nio.charset.CodingErrorAction
import org.apache.commons.io.IOUtils
import java.io.ByteArrayOutputStream
import java.nio.ByteBuffer
-import edu.illinois.ncsa.daffodil.exceptions.Assert
+import org.apache.daffodil.exceptions.Assert
import java.nio.CharBuffer
import java.nio.channels.FileChannel
import java.nio.channels.Channels
-import edu.illinois.ncsa.daffodil.util.Bits
+import org.apache.daffodil.util.Bits
import passera.unsigned.ULong
import java.io.InputStream
import java.nio.charset.CoderResult
-import edu.illinois.ncsa.daffodil.equality._
-import edu.illinois.ncsa.daffodil.util.Pool
-import edu.illinois.ncsa.daffodil.util.MStackOf
-import edu.illinois.ncsa.daffodil.api.DataStreamLimits
-import edu.illinois.ncsa.daffodil.schema.annotation.props.gen.EncodingErrorPolicy
-import edu.illinois.ncsa.daffodil.processors.charset.NBitsWidth_BitsCharsetDecoder
-import edu.illinois.ncsa.daffodil.processors.charset.BitsCharsetDecoder
-import edu.illinois.ncsa.daffodil.processors.charset.StandardBitsCharsets
+import org.apache.daffodil.equality._
+import org.apache.daffodil.util.Pool
+import org.apache.daffodil.util.MStackOf
+import org.apache.daffodil.api.DataStreamLimits
+import org.apache.daffodil.schema.annotation.props.gen.EncodingErrorPolicy
+import org.apache.daffodil.processors.charset.NBitsWidth_BitsCharsetDecoder
+import org.apache.daffodil.processors.charset.BitsCharsetDecoder
+import org.apache.daffodil.processors.charset.StandardBitsCharsets
/**
* Factory for creating this type of DataInputStream
diff --git a/daffodil-io/src/main/scala/org/apache/daffodil/io/CopyrightAdditions.scala b/daffodil-io/src/main/scala/org/apache/daffodil/io/CopyrightAdditions.scala
index 591f178..29e002d 100644
--- a/daffodil-io/src/main/scala/org/apache/daffodil/io/CopyrightAdditions.scala
+++ b/daffodil-io/src/main/scala/org/apache/daffodil/io/CopyrightAdditions.scala
@@ -30,9 +30,9 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.io
+package org.apache.daffodil.io
-import edu.illinois.ncsa.daffodil.util.CopyrightNotices
+import org.apache.daffodil.util.CopyrightNotices
import passera.unsigned.PasseraCopyright
object CopyrightAdditions {
diff --git a/daffodil-io/src/main/scala/org/apache/daffodil/io/DataInputStream.scala b/daffodil-io/src/main/scala/org/apache/daffodil/io/DataInputStream.scala
index c14a4bb..c82cd97 100644
--- a/daffodil-io/src/main/scala/org/apache/daffodil/io/DataInputStream.scala
+++ b/daffodil-io/src/main/scala/org/apache/daffodil/io/DataInputStream.scala
@@ -30,15 +30,15 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.io
+package org.apache.daffodil.io
import java.nio.CharBuffer
import java.util.regex.Matcher
-import edu.illinois.ncsa.daffodil.util.Maybe
+import org.apache.daffodil.util.Maybe
import passera.unsigned.ULong
-import edu.illinois.ncsa.daffodil.exceptions.ThinThrowable
-import edu.illinois.ncsa.daffodil.util.MaybeULong
-import edu.illinois.ncsa.daffodil.util.Poolable
+import org.apache.daffodil.exceptions.ThinThrowable
+import org.apache.daffodil.util.MaybeULong
+import org.apache.daffodil.util.Poolable
/*
* TODO:
diff --git a/daffodil-io/src/main/scala/org/apache/daffodil/io/DataInputStreamImplMixin.scala b/daffodil-io/src/main/scala/org/apache/daffodil/io/DataInputStreamImplMixin.scala
index 21e2718..0541fe2 100644
--- a/daffodil-io/src/main/scala/org/apache/daffodil/io/DataInputStreamImplMixin.scala
+++ b/daffodil-io/src/main/scala/org/apache/daffodil/io/DataInputStreamImplMixin.scala
@@ -30,12 +30,12 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.io
+package org.apache.daffodil.io
-import edu.illinois.ncsa.daffodil.exceptions.Assert
-import edu.illinois.ncsa.daffodil.util.Maybe
-import edu.illinois.ncsa.daffodil.util.MaybeULong
-import edu.illinois.ncsa.daffodil.util.Maybe.Nope
+import org.apache.daffodil.exceptions.Assert
+import org.apache.daffodil.util.Maybe
+import org.apache.daffodil.util.MaybeULong
+import org.apache.daffodil.util.Maybe.Nope
import java.nio.CharBuffer
trait DataInputStreamImplMixin extends DataInputStream
diff --git a/daffodil-io/src/main/scala/org/apache/daffodil/io/DataOutputStream.scala b/daffodil-io/src/main/scala/org/apache/daffodil/io/DataOutputStream.scala
index 51bba7a..bae0441 100644
--- a/daffodil-io/src/main/scala/org/apache/daffodil/io/DataOutputStream.scala
+++ b/daffodil-io/src/main/scala/org/apache/daffodil/io/DataOutputStream.scala
@@ -30,12 +30,12 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.io
+package org.apache.daffodil.io
import passera.unsigned.ULong
import java.nio.CharBuffer
-import edu.illinois.ncsa.daffodil.util.MaybeULong
-import edu.illinois.ncsa.daffodil.util.Logging
+import org.apache.daffodil.util.MaybeULong
+import org.apache.daffodil.util.Logging
/**
* There is an asymmetry between DataInputStream and DataOutputStream with respect to the
diff --git a/daffodil-io/src/main/scala/org/apache/daffodil/io/DataOutputStreamImplMixin.scala b/daffodil-io/src/main/scala/org/apache/daffodil/io/DataOutputStreamImplMixin.scala
index 33f9c3e..6de6ed9 100644
--- a/daffodil-io/src/main/scala/org/apache/daffodil/io/DataOutputStreamImplMixin.scala
+++ b/daffodil-io/src/main/scala/org/apache/daffodil/io/DataOutputStreamImplMixin.scala
@@ -30,25 +30,25 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.io
+package org.apache.daffodil.io
-import edu.illinois.ncsa.daffodil.util.Maybe
-import edu.illinois.ncsa.daffodil.util.Maybe.One
-import edu.illinois.ncsa.daffodil.util.Maybe.Nope
-import edu.illinois.ncsa.daffodil.schema.annotation.props.gen.ByteOrder
-import edu.illinois.ncsa.daffodil.schema.annotation.props.gen.BitOrder
+import org.apache.daffodil.util.Maybe
+import org.apache.daffodil.util.Maybe.One
+import org.apache.daffodil.util.Maybe.Nope
+import org.apache.daffodil.schema.annotation.props.gen.ByteOrder
+import org.apache.daffodil.schema.annotation.props.gen.BitOrder
import passera.unsigned.ULong
import java.nio.ByteBuffer
-import edu.illinois.ncsa.daffodil.exceptions.Assert
+import org.apache.daffodil.exceptions.Assert
import java.nio.charset.CoderResult
import java.nio.channels.Channels
import java.io.ByteArrayOutputStream
import org.apache.commons.io.output.TeeOutputStream
-import edu.illinois.ncsa.daffodil.util.MaybeULong
-import edu.illinois.ncsa.daffodil.equality._
-import edu.illinois.ncsa.daffodil.util.Bits
-import edu.illinois.ncsa.daffodil.util.LogLevel
-import edu.illinois.ncsa.daffodil.processors.charset.NBitsWidth_BitsCharsetEncoder
+import org.apache.daffodil.util.MaybeULong
+import org.apache.daffodil.equality._
+import org.apache.daffodil.util.Bits
+import org.apache.daffodil.util.LogLevel
+import org.apache.daffodil.processors.charset.NBitsWidth_BitsCharsetEncoder
sealed trait DOSState
private[io] case object Active extends DOSState
diff --git a/daffodil-io/src/main/scala/org/apache/daffodil/io/DataStreamCommon.scala b/daffodil-io/src/main/scala/org/apache/daffodil/io/DataStreamCommon.scala
index d8ab340..9b0897b 100644
--- a/daffodil-io/src/main/scala/org/apache/daffodil/io/DataStreamCommon.scala
+++ b/daffodil-io/src/main/scala/org/apache/daffodil/io/DataStreamCommon.scala
@@ -30,12 +30,12 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.io
+package org.apache.daffodil.io
import java.nio.ByteBuffer
-import edu.illinois.ncsa.daffodil.util.MaybeULong
-import edu.illinois.ncsa.daffodil.api.DataStreamLimits
+import org.apache.daffodil.util.MaybeULong
+import org.apache.daffodil.api.DataStreamLimits
/**
* This is an interface trait, and it defines methods shared by
diff --git a/daffodil-io/src/main/scala/org/apache/daffodil/io/DataStreamCommonImplMixin.scala b/daffodil-io/src/main/scala/org/apache/daffodil/io/DataStreamCommonImplMixin.scala
index 285f206..178aa0a 100644
--- a/daffodil-io/src/main/scala/org/apache/daffodil/io/DataStreamCommonImplMixin.scala
+++ b/daffodil-io/src/main/scala/org/apache/daffodil/io/DataStreamCommonImplMixin.scala
@@ -30,14 +30,14 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.io
-import edu.illinois.ncsa.daffodil.util.MaybeChar
-import edu.illinois.ncsa.daffodil.util.Logging
-import edu.illinois.ncsa.daffodil.api.DataStreamLimits
-import edu.illinois.ncsa.daffodil.schema.annotation.props.gen.BitOrder
-import edu.illinois.ncsa.daffodil.util.Maybe
-import edu.illinois.ncsa.daffodil.util.Maybe._
-import edu.illinois.ncsa.daffodil.exceptions.Assert
+package org.apache.daffodil.io
+import org.apache.daffodil.util.MaybeChar
+import org.apache.daffodil.util.Logging
+import org.apache.daffodil.api.DataStreamLimits
+import org.apache.daffodil.schema.annotation.props.gen.BitOrder
+import org.apache.daffodil.util.Maybe
+import org.apache.daffodil.util.Maybe._
+import org.apache.daffodil.exceptions.Assert
trait DataStreamCommonState {
diff --git a/daffodil-io/src/main/scala/org/apache/daffodil/io/DirectOrBufferedDataOutputStream.scala b/daffodil-io/src/main/scala/org/apache/daffodil/io/DirectOrBufferedDataOutputStream.scala
index 9ebbb51..33412cc 100644
--- a/daffodil-io/src/main/scala/org/apache/daffodil/io/DirectOrBufferedDataOutputStream.scala
+++ b/daffodil-io/src/main/scala/org/apache/daffodil/io/DirectOrBufferedDataOutputStream.scala
@@ -30,19 +30,19 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.io
-
-import edu.illinois.ncsa.daffodil.exceptions.Assert
-import edu.illinois.ncsa.daffodil.equality._
-import edu.illinois.ncsa.daffodil.util.Misc
-import edu.illinois.ncsa.daffodil.util.MaybeULong
-import edu.illinois.ncsa.daffodil.util.Maybe
-import edu.illinois.ncsa.daffodil.util.Maybe._
+package org.apache.daffodil.io
+
+import org.apache.daffodil.exceptions.Assert
+import org.apache.daffodil.equality._
+import org.apache.daffodil.util.Misc
+import org.apache.daffodil.util.MaybeULong
+import org.apache.daffodil.util.Maybe
+import org.apache.daffodil.util.Maybe._
import passera.unsigned.ULong
-import edu.illinois.ncsa.daffodil.util.Bits
-import edu.illinois.ncsa.daffodil.exceptions.ThinThrowable
-import edu.illinois.ncsa.daffodil.util.LogLevel
-import edu.illinois.ncsa.daffodil.schema.annotation.props.gen.BitOrder
+import org.apache.daffodil.util.Bits
+import org.apache.daffodil.exceptions.ThinThrowable
+import org.apache.daffodil.util.LogLevel
+import org.apache.daffodil.schema.annotation.props.gen.BitOrder
/**
* This simple extension just gives us a public method for access to the underlying byte array.
@@ -749,7 +749,7 @@ object DirectOrBufferedDataOutputStream {
// fragment byte on directDOS, fragment byte on bufDOS, or both.
{
- import edu.illinois.ncsa.daffodil.util.MaybeULong
+ import org.apache.daffodil.util.MaybeULong
val dStream = directDOS
val newLengthLimit = bufferNBits.toLong
diff --git a/daffodil-io/src/main/scala/org/apache/daffodil/io/Dump.scala b/daffodil-io/src/main/scala/org/apache/daffodil/io/Dump.scala
index c95b11c..d73f019 100644
--- a/daffodil-io/src/main/scala/org/apache/daffodil/io/Dump.scala
+++ b/daffodil-io/src/main/scala/org/apache/daffodil/io/Dump.scala
@@ -30,16 +30,16 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.io
+package org.apache.daffodil.io
import java.nio.ByteBuffer
import java.nio.CharBuffer
import java.nio.charset.CodingErrorAction
-import edu.illinois.ncsa.daffodil.exceptions.Assert
+import org.apache.daffodil.exceptions.Assert
import com.ibm.icu.lang.UCharacter
import com.ibm.icu.lang.UProperty
-import edu.illinois.ncsa.daffodil.util.Misc
-import edu.illinois.ncsa.daffodil.equality._
+import org.apache.daffodil.util.Misc
+import org.apache.daffodil.equality._
import java.nio.charset.{ CharsetDecoder => JavaCharsetDecoder }
import java.nio.charset.{ Charset => JavaCharset }
diff --git a/daffodil-io/src/main/scala/org/apache/daffodil/io/FastAsciiToUnicodeConverter.scala b/daffodil-io/src/main/scala/org/apache/daffodil/io/FastAsciiToUnicodeConverter.scala
index eda3341..075c3cb 100644
--- a/daffodil-io/src/main/scala/org/apache/daffodil/io/FastAsciiToUnicodeConverter.scala
+++ b/daffodil-io/src/main/scala/org/apache/daffodil/io/FastAsciiToUnicodeConverter.scala
@@ -30,7 +30,7 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.io
+package org.apache.daffodil.io
import java.nio.ByteBuffer
diff --git a/daffodil-io/src/main/scala/org/apache/daffodil/io/FormatInfo.scala b/daffodil-io/src/main/scala/org/apache/daffodil/io/FormatInfo.scala
index fca78e6..71f794d 100644
--- a/daffodil-io/src/main/scala/org/apache/daffodil/io/FormatInfo.scala
+++ b/daffodil-io/src/main/scala/org/apache/daffodil/io/FormatInfo.scala
@@ -12,17 +12,17 @@
* limitations under the License.
*/
-package edu.illinois.ncsa.daffodil.io
-
-import edu.illinois.ncsa.daffodil.schema.annotation.props.gen.BitOrder
-import edu.illinois.ncsa.daffodil.schema.annotation.props.gen.ByteOrder
-import edu.illinois.ncsa.daffodil.schema.annotation.props.gen.BinaryFloatRep
-import edu.illinois.ncsa.daffodil.util.MaybeInt
-import edu.illinois.ncsa.daffodil.schema.annotation.props.gen.EncodingErrorPolicy
-import edu.illinois.ncsa.daffodil.util.Maybe
-import edu.illinois.ncsa.daffodil.schema.annotation.props.gen.UTF16Width
-import edu.illinois.ncsa.daffodil.processors.charset.BitsCharsetDecoder
-import edu.illinois.ncsa.daffodil.processors.charset.BitsCharsetEncoder
+package org.apache.daffodil.io
+
+import org.apache.daffodil.schema.annotation.props.gen.BitOrder
+import org.apache.daffodil.schema.annotation.props.gen.ByteOrder
+import org.apache.daffodil.schema.annotation.props.gen.BinaryFloatRep
+import org.apache.daffodil.util.MaybeInt
+import org.apache.daffodil.schema.annotation.props.gen.EncodingErrorPolicy
+import org.apache.daffodil.util.Maybe
+import org.apache.daffodil.schema.annotation.props.gen.UTF16Width
+import org.apache.daffodil.processors.charset.BitsCharsetDecoder
+import org.apache.daffodil.processors.charset.BitsCharsetEncoder
/**
* Abstract interface to obtain format properties or values derived from
diff --git a/daffodil-io/src/main/scala/org/apache/daffodil/io/LocalBuffer.scala b/daffodil-io/src/main/scala/org/apache/daffodil/io/LocalBuffer.scala
index 798ff25..f43a382 100644
--- a/daffodil-io/src/main/scala/org/apache/daffodil/io/LocalBuffer.scala
+++ b/daffodil-io/src/main/scala/org/apache/daffodil/io/LocalBuffer.scala
@@ -30,14 +30,14 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.io
+package org.apache.daffodil.io
-import edu.illinois.ncsa.daffodil.exceptions.Assert
-import edu.illinois.ncsa.daffodil.util.Maybe
-import edu.illinois.ncsa.daffodil.util.Maybe._
+import org.apache.daffodil.exceptions.Assert
+import org.apache.daffodil.util.Maybe
+import org.apache.daffodil.util.Maybe._
import java.nio.CharBuffer
import java.nio.ByteBuffer
-import edu.illinois.ncsa.daffodil.util.LocalStack
+import org.apache.daffodil.util.LocalStack
abstract class LocalBuffer[T <: java.nio.Buffer] {
protected def allocate(length: Long): T
diff --git a/daffodil-io/src/main/scala/org/apache/daffodil/io/StringDataInputStreamForUnparse.scala b/daffodil-io/src/main/scala/org/apache/daffodil/io/StringDataInputStreamForUnparse.scala
index 003505e..955a40c 100644
--- a/daffodil-io/src/main/scala/org/apache/daffodil/io/StringDataInputStreamForUnparse.scala
+++ b/daffodil-io/src/main/scala/org/apache/daffodil/io/StringDataInputStreamForUnparse.scala
@@ -30,12 +30,12 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.io
+package org.apache.daffodil.io
-import edu.illinois.ncsa.daffodil.util.Misc
-import edu.illinois.ncsa.daffodil.exceptions.Assert
-import edu.illinois.ncsa.daffodil.util.MaybeULong
-import edu.illinois.ncsa.daffodil.processors.charset.BitsCharsetWrappingJavaCharset
+import org.apache.daffodil.util.Misc
+import org.apache.daffodil.exceptions.Assert
+import org.apache.daffodil.util.MaybeULong
+import org.apache.daffodil.processors.charset.BitsCharsetWrappingJavaCharset
/**
* When unparsing, we reuse all the DFA logic to identify delimiters within
diff --git a/daffodil-io/src/main/scala/org/apache/daffodil/io/ThreadCheckMixin.scala b/daffodil-io/src/main/scala/org/apache/daffodil/io/ThreadCheckMixin.scala
index 7338848..1b52169 100644
--- a/daffodil-io/src/main/scala/org/apache/daffodil/io/ThreadCheckMixin.scala
+++ b/daffodil-io/src/main/scala/org/apache/daffodil/io/ThreadCheckMixin.scala
@@ -30,9 +30,9 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.io
+package org.apache.daffodil.io
-import edu.illinois.ncsa.daffodil.exceptions.Assert
+import org.apache.daffodil.exceptions.Assert
/**
* Mixin to classes that are supposed to exist 1 to 1 with threads.
diff --git a/daffodil-io/src/main/scala/org/apache/daffodil/io/Utils.scala b/daffodil-io/src/main/scala/org/apache/daffodil/io/Utils.scala
index 695d148..6f8d48e 100644
--- a/daffodil-io/src/main/scala/org/apache/daffodil/io/Utils.scala
+++ b/daffodil-io/src/main/scala/org/apache/daffodil/io/Utils.scala
@@ -30,7 +30,7 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.io
+package org.apache.daffodil.io
import java.nio.ByteBuffer
diff --git a/daffodil-io/src/main/scala/org/apache/daffodil/processors/charset/BitsCharset.scala b/daffodil-io/src/main/scala/org/apache/daffodil/processors/charset/BitsCharset.scala
index bacf5e6..88e538b 100644
--- a/daffodil-io/src/main/scala/org/apache/daffodil/processors/charset/BitsCharset.scala
+++ b/daffodil-io/src/main/scala/org/apache/daffodil/processors/charset/BitsCharset.scala
@@ -14,10 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package edu.illinois.ncsa.daffodil.processors.charset
+package org.apache.daffodil.processors.charset
-import edu.illinois.ncsa.daffodil.schema.annotation.props.gen.BitOrder
-import edu.illinois.ncsa.daffodil.exceptions.Assert
+import org.apache.daffodil.schema.annotation.props.gen.BitOrder
+import org.apache.daffodil.exceptions.Assert
import java.nio.charset.CoderResult
import java.nio.charset.CodingErrorAction
import java.nio.charset.{ CharsetEncoder => JavaCharsetEncoder }
@@ -26,8 +26,8 @@ import java.nio.charset.{ StandardCharsets => JavaStandardCharsets }
import java.nio.charset.{ Charset => JavaCharset }
import java.nio.CharBuffer
import java.nio.ByteBuffer
-import edu.illinois.ncsa.daffodil.util.MaybeULong
-import edu.illinois.ncsa.daffodil.util.MaybeInt
+import org.apache.daffodil.util.MaybeULong
+import org.apache.daffodil.util.MaybeInt
/**
* Charset enhanced with features allowing it to work with Daffodil's Bit-wise
diff --git a/daffodil-io/src/main/scala/org/apache/daffodil/processors/charset/CharsetUtils.scala b/daffodil-io/src/main/scala/org/apache/daffodil/processors/charset/CharsetUtils.scala
index e9fe5fc..b8f19ea 100644
--- a/daffodil-io/src/main/scala/org/apache/daffodil/processors/charset/CharsetUtils.scala
+++ b/daffodil-io/src/main/scala/org/apache/daffodil/processors/charset/CharsetUtils.scala
@@ -30,16 +30,16 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.processors.charset
+package org.apache.daffodil.processors.charset
import java.nio.ByteBuffer
import java.nio.CharBuffer
import java.nio.charset.{ Charset => JavaCharset }
import java.nio.charset.CoderResult
import java.nio.charset.CodingErrorAction
-import edu.illinois.ncsa.daffodil.exceptions.Assert
-import edu.illinois.ncsa.daffodil.io.LocalBufferMixin
-import edu.illinois.ncsa.daffodil.util.MaybeInt
+import org.apache.daffodil.exceptions.Assert
+import org.apache.daffodil.io.LocalBufferMixin
+import org.apache.daffodil.util.MaybeInt
object CharsetUtils {
diff --git a/daffodil-io/src/main/scala/org/apache/daffodil/processors/charset/DFDL5BitPackedDecoder.scala b/daffodil-io/src/main/scala/org/apache/daffodil/processors/charset/DFDL5BitPackedDecoder.scala
index 503090a..d6dcb3e 100644
--- a/daffodil-io/src/main/scala/org/apache/daffodil/processors/charset/DFDL5BitPackedDecoder.scala
+++ b/daffodil-io/src/main/scala/org/apache/daffodil/processors/charset/DFDL5BitPackedDecoder.scala
@@ -30,10 +30,10 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.processors.charset
+package org.apache.daffodil.processors.charset
-import edu.illinois.ncsa.daffodil.schema.annotation.props.gen.BitOrder
-import edu.illinois.ncsa.daffodil.util.MaybeInt
+import org.apache.daffodil.schema.annotation.props.gen.BitOrder
+import org.apache.daffodil.util.MaybeInt
/**
* Some encodings are not byte-oriented.
diff --git a/daffodil-io/src/main/scala/org/apache/daffodil/processors/charset/DaffodilCharsetProvider.scala b/daffodil-io/src/main/scala/org/apache/daffodil/processors/charset/DaffodilCharsetProvider.scala
index 8324375..72cc5a1 100644
--- a/daffodil-io/src/main/scala/org/apache/daffodil/processors/charset/DaffodilCharsetProvider.scala
+++ b/daffodil-io/src/main/scala/org/apache/daffodil/processors/charset/DaffodilCharsetProvider.scala
@@ -30,9 +30,9 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.processors.charset
+package org.apache.daffodil.processors.charset
-import edu.illinois.ncsa.daffodil.exceptions.Assert
+import org.apache.daffodil.exceptions.Assert
/**
* This implements a CharsetProvider that implements Daffodil's support
diff --git a/daffodil-io/src/main/scala/org/apache/daffodil/processors/charset/HexLSBF4BitDecoder.scala b/daffodil-io/src/main/scala/org/apache/daffodil/processors/charset/HexLSBF4BitDecoder.scala
index f41b0fa..2b76f15 100644
--- a/daffodil-io/src/main/scala/org/apache/daffodil/processors/charset/HexLSBF4BitDecoder.scala
+++ b/daffodil-io/src/main/scala/org/apache/daffodil/processors/charset/HexLSBF4BitDecoder.scala
@@ -30,9 +30,9 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.processors.charset
+package org.apache.daffodil.processors.charset
-import edu.illinois.ncsa.daffodil.schema.annotation.props.gen.BitOrder
+import org.apache.daffodil.schema.annotation.props.gen.BitOrder
/**
* Some encodings are not byte-oriented.
diff --git a/daffodil-io/src/main/scala/org/apache/daffodil/processors/charset/NBitsWidthCharsetBase.scala b/daffodil-io/src/main/scala/org/apache/daffodil/processors/charset/NBitsWidthCharsetBase.scala
index 3344164..9bfa678 100644
--- a/daffodil-io/src/main/scala/org/apache/daffodil/processors/charset/NBitsWidthCharsetBase.scala
+++ b/daffodil-io/src/main/scala/org/apache/daffodil/processors/charset/NBitsWidthCharsetBase.scala
@@ -30,22 +30,22 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.processors.charset
+package org.apache.daffodil.processors.charset
-import edu.illinois.ncsa.daffodil.exceptions.Assert
-import edu.illinois.ncsa.daffodil.schema.annotation.props.gen.BitOrder
-import edu.illinois.ncsa.daffodil.util.MaybeInt
+import org.apache.daffodil.exceptions.Assert
+import org.apache.daffodil.schema.annotation.props.gen.BitOrder
+import org.apache.daffodil.util.MaybeInt
-import edu.illinois.ncsa.daffodil.util.MaybeULong
-import edu.illinois.ncsa.daffodil.exceptions.Assert
-import edu.illinois.ncsa.daffodil.schema.annotation.props.gen.BitOrder
+import org.apache.daffodil.util.MaybeULong
+import org.apache.daffodil.exceptions.Assert
+import org.apache.daffodil.schema.annotation.props.gen.BitOrder
import java.nio.ByteBuffer
import java.nio.CharBuffer
-import edu.illinois.ncsa.daffodil.util.Bits
+import org.apache.daffodil.util.Bits
import java.nio.charset.CoderResult
import java.nio.charset.CodingErrorAction
-import edu.illinois.ncsa.daffodil.util.MaybeInt
-import edu.illinois.ncsa.daffodil.util.Maybe
+import org.apache.daffodil.util.MaybeInt
+import org.apache.daffodil.util.Maybe
import java.nio.charset.{ CharsetDecoder => JavaCharsetDecoder }
import java.nio.charset.{ CharsetEncoder => JavaCharsetEncoder }
diff --git a/daffodil-io/src/main/scala/org/apache/daffodil/processors/charset/OctalLSBF3BitDecoder.scala b/daffodil-io/src/main/scala/org/apache/daffodil/processors/charset/OctalLSBF3BitDecoder.scala
index d85f9c4..42a16ab 100644
--- a/daffodil-io/src/main/scala/org/apache/daffodil/processors/charset/OctalLSBF3BitDecoder.scala
+++ b/daffodil-io/src/main/scala/org/apache/daffodil/processors/charset/OctalLSBF3BitDecoder.scala
@@ -30,9 +30,9 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.processors.charset
+package org.apache.daffodil.processors.charset
-import edu.illinois.ncsa.daffodil.schema.annotation.props.gen.BitOrder
+import org.apache.daffodil.schema.annotation.props.gen.BitOrder
/**
* Some encodings are not byte-oriented.
diff --git a/daffodil-io/src/main/scala/org/apache/daffodil/processors/charset/USASCII6BitPackedDecoder.scala b/daffodil-io/src/main/scala/org/apache/daffodil/processors/charset/USASCII6BitPackedDecoder.scala
index d35687a..cc319d9 100644
--- a/daffodil-io/src/main/scala/org/apache/daffodil/processors/charset/USASCII6BitPackedDecoder.scala
+++ b/daffodil-io/src/main/scala/org/apache/daffodil/processors/charset/USASCII6BitPackedDecoder.scala
@@ -30,9 +30,9 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.processors.charset
+package org.apache.daffodil.processors.charset
-import edu.illinois.ncsa.daffodil.schema.annotation.props.gen.BitOrder
+import org.apache.daffodil.schema.annotation.props.gen.BitOrder
/**
* Some encodings are not byte-oriented.
diff --git a/daffodil-io/src/main/scala/org/apache/daffodil/processors/charset/USASCII7BitPackedDecoder.scala b/daffodil-io/src/main/scala/org/apache/daffodil/processors/charset/USASCII7BitPackedDecoder.scala
index d8e3c72..61c6952 100644
--- a/daffodil-io/src/main/scala/org/apache/daffodil/processors/charset/USASCII7BitPackedDecoder.scala
+++ b/daffodil-io/src/main/scala/org/apache/daffodil/processors/charset/USASCII7BitPackedDecoder.scala
@@ -30,9 +30,9 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.processors.charset
+package org.apache.daffodil.processors.charset
-import edu.illinois.ncsa.daffodil.schema.annotation.props.gen.BitOrder
+import org.apache.daffodil.schema.annotation.props.gen.BitOrder
/**
* Some encodings are not byte-oriented.
diff --git a/daffodil-io/src/main/scala/org/apache/daffodil/processors/charset/X_DFDL_6_BIT_DFI_264_DUI_001.scala b/daffodil-io/src/main/scala/org/apache/daffodil/processors/charset/X_DFDL_6_BIT_DFI_264_DUI_001.scala
index 6644bc8..4c1a19a 100644
--- a/daffodil-io/src/main/scala/org/apache/daffodil/processors/charset/X_DFDL_6_BIT_DFI_264_DUI_001.scala
+++ b/daffodil-io/src/main/scala/org/apache/daffodil/processors/charset/X_DFDL_6_BIT_DFI_264_DUI_001.scala
@@ -30,10 +30,10 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.processors.charset
+package org.apache.daffodil.processors.charset
-import edu.illinois.ncsa.daffodil.exceptions.Assert
-import edu.illinois.ncsa.daffodil.schema.annotation.props.gen.BitOrder
+import org.apache.daffodil.exceptions.Assert
+import org.apache.daffodil.schema.annotation.props.gen.BitOrder
/**
* Some encodings are not byte-oriented.
diff --git a/daffodil-io/src/main/scala/org/apache/daffodil/processors/charset/X_DFDL_BITS.scala b/daffodil-io/src/main/scala/org/apache/daffodil/processors/charset/X_DFDL_BITS.scala
index 8ff4806..3111403 100644
--- a/daffodil-io/src/main/scala/org/apache/daffodil/processors/charset/X_DFDL_BITS.scala
+++ b/daffodil-io/src/main/scala/org/apache/daffodil/processors/charset/X_DFDL_BITS.scala
@@ -30,9 +30,9 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.processors.charset
+package org.apache.daffodil.processors.charset
-import edu.illinois.ncsa.daffodil.schema.annotation.props.gen.BitOrder
+import org.apache.daffodil.schema.annotation.props.gen.BitOrder
/**
* A 1-bit wide encoding so you can get down to the bits level
diff --git a/daffodil-io/src/test/scala/org/apache/daffodil/io/FormatInfoForUnitTest.scala b/daffodil-io/src/test/scala/org/apache/daffodil/io/FormatInfoForUnitTest.scala
index e3742e1..03e4b66 100644
--- a/daffodil-io/src/test/scala/org/apache/daffodil/io/FormatInfoForUnitTest.scala
+++ b/daffodil-io/src/test/scala/org/apache/daffodil/io/FormatInfoForUnitTest.scala
@@ -1,18 +1,18 @@
-package edu.illinois.ncsa.daffodil.io
+package org.apache.daffodil.io
import java.nio.charset.CodingErrorAction
-import edu.illinois.ncsa.daffodil.util.Maybe
-import edu.illinois.ncsa.daffodil.schema.annotation.props.gen.BitOrder
-import edu.illinois.ncsa.daffodil.schema.annotation.props.gen.BinaryFloatRep
-import edu.illinois.ncsa.daffodil.util.MaybeInt
-import edu.illinois.ncsa.daffodil.schema.annotation.props.gen.ByteOrder
-import edu.illinois.ncsa.daffodil.schema.annotation.props.gen.UTF16Width
-import edu.illinois.ncsa.daffodil.schema.annotation.props.gen.EncodingErrorPolicy
-import edu.illinois.ncsa.daffodil.processors.charset.BitsCharset
-import edu.illinois.ncsa.daffodil.processors.charset.BitsCharsetDecoder
-import edu.illinois.ncsa.daffodil.processors.charset.BitsCharsetEncoder
-import edu.illinois.ncsa.daffodil.processors.charset.StandardBitsCharsets
-import edu.illinois.ncsa.daffodil.processors.charset.NBitsWidth_BitsCharset
+import org.apache.daffodil.util.Maybe
+import org.apache.daffodil.schema.annotation.props.gen.BitOrder
+import org.apache.daffodil.schema.annotation.props.gen.BinaryFloatRep
+import org.apache.daffodil.util.MaybeInt
+import org.apache.daffodil.schema.annotation.props.gen.ByteOrder
+import org.apache.daffodil.schema.annotation.props.gen.UTF16Width
+import org.apache.daffodil.schema.annotation.props.gen.EncodingErrorPolicy
+import org.apache.daffodil.processors.charset.BitsCharset
+import org.apache.daffodil.processors.charset.BitsCharsetDecoder
+import org.apache.daffodil.processors.charset.BitsCharsetEncoder
+import org.apache.daffodil.processors.charset.StandardBitsCharsets
+import org.apache.daffodil.processors.charset.NBitsWidth_BitsCharset
object FormatInfoForUnitTest {
def apply() = {
diff --git a/daffodil-io/src/test/scala/org/apache/daffodil/io/TestByteBufferDataInputStream.scala b/daffodil-io/src/test/scala/org/apache/daffodil/io/TestByteBufferDataInputStream.scala
index 9961d57..e9f9e2b 100644
--- a/daffodil-io/src/test/scala/org/apache/daffodil/io/TestByteBufferDataInputStream.scala
+++ b/daffodil-io/src/test/scala/org/apache/daffodil/io/TestByteBufferDataInputStream.scala
@@ -30,7 +30,7 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.io
+package org.apache.daffodil.io
import java.nio.ByteBuffer
import java.nio.CharBuffer
@@ -45,16 +45,16 @@ import org.junit.Assert.assertFalse
import org.junit.Assert.assertTrue
import org.junit.Test
-import edu.illinois.ncsa.daffodil.Implicits.intercept
-import edu.illinois.ncsa.daffodil.equality.TypeEqual
-import edu.illinois.ncsa.daffodil.schema.annotation.props.gen.BitOrder
-import edu.illinois.ncsa.daffodil.schema.annotation.props.gen.ByteOrder
-import edu.illinois.ncsa.daffodil.schema.annotation.props.gen.EncodingErrorPolicy
-import edu.illinois.ncsa.daffodil.util.MaybeULong
-import edu.illinois.ncsa.daffodil.util.Misc
+import org.apache.daffodil.Implicits.intercept
+import org.apache.daffodil.equality.TypeEqual
+import org.apache.daffodil.schema.annotation.props.gen.BitOrder
+import org.apache.daffodil.schema.annotation.props.gen.ByteOrder
+import org.apache.daffodil.schema.annotation.props.gen.EncodingErrorPolicy
+import org.apache.daffodil.util.MaybeULong
+import org.apache.daffodil.util.Misc
import passera.unsigned.ULong
import java.nio.charset.CodingErrorAction
-import edu.illinois.ncsa.daffodil.processors.charset.StandardBitsCharsets
+import org.apache.daffodil.processors.charset.StandardBitsCharsets
class TestByteBufferDataInputStream {
val tenDigits = "1234567890"
diff --git a/daffodil-io/src/test/scala/org/apache/daffodil/io/TestByteBufferDataInputStream2.scala b/daffodil-io/src/test/scala/org/apache/daffodil/io/TestByteBufferDataInputStream2.scala
index ea6435d..42d9a43 100644
--- a/daffodil-io/src/test/scala/org/apache/daffodil/io/TestByteBufferDataInputStream2.scala
+++ b/daffodil-io/src/test/scala/org/apache/daffodil/io/TestByteBufferDataInputStream2.scala
@@ -30,13 +30,13 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.io
+package org.apache.daffodil.io
import org.junit.Test
import org.junit.Assert._
-import edu.illinois.ncsa.daffodil.Implicits._
-import edu.illinois.ncsa.daffodil.exceptions.Abort
-import edu.illinois.ncsa.daffodil.util.MaybeULong
+import org.apache.daffodil.Implicits._
+import org.apache.daffodil.exceptions.Abort
+import org.apache.daffodil.util.MaybeULong
class TestByteBufferDataInputStream2 {
val tenDigits = "1234567890"
diff --git a/daffodil-io/src/test/scala/org/apache/daffodil/io/TestByteBufferDataInputStream3.scala b/daffodil-io/src/test/scala/org/apache/daffodil/io/TestByteBufferDataInputStream3.scala
index 7ca325c..61129f6 100644
--- a/daffodil-io/src/test/scala/org/apache/daffodil/io/TestByteBufferDataInputStream3.scala
+++ b/daffodil-io/src/test/scala/org/apache/daffodil/io/TestByteBufferDataInputStream3.scala
@@ -30,7 +30,7 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.io
+package org.apache.daffodil.io
import org.junit.Test
import org.junit.Assert._
diff --git a/daffodil-io/src/test/scala/org/apache/daffodil/io/TestByteBufferDataInputStream3Bit.scala b/daffodil-io/src/test/scala/org/apache/daffodil/io/TestByteBufferDataInputStream3Bit.scala
index 28c817d..2bc5119 100644
--- a/daffodil-io/src/test/scala/org/apache/daffodil/io/TestByteBufferDataInputStream3Bit.scala
+++ b/daffodil-io/src/test/scala/org/apache/daffodil/io/TestByteBufferDataInputStream3Bit.scala
@@ -30,7 +30,7 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.io
+package org.apache.daffodil.io
import java.nio.ByteBuffer
import java.nio.CharBuffer
@@ -39,11 +39,11 @@ import java.nio.charset.CoderResult
import org.junit.Assert._
import org.junit.Test
-import edu.illinois.ncsa.daffodil.exceptions.Assert
-import edu.illinois.ncsa.daffodil.util.MaybeULong
-import edu.illinois.ncsa.daffodil.util.Misc
-import edu.illinois.ncsa.daffodil.processors.charset.OctalLSBF3BitCharset
-import edu.illinois.ncsa.daffodil.processors.charset.NBitsWidth_BitsCharsetEncoder
+import org.apache.daffodil.exceptions.Assert
+import org.apache.daffodil.util.MaybeULong
+import org.apache.daffodil.util.Misc
+import org.apache.daffodil.processors.charset.OctalLSBF3BitCharset
+import org.apache.daffodil.processors.charset.NBitsWidth_BitsCharsetEncoder
/**
* tests of 7-bit characters
diff --git a/daffodil-io/src/test/scala/org/apache/daffodil/io/TestByteBufferDataInputStream4.scala b/daffodil-io/src/test/scala/org/apache/daffodil/io/TestByteBufferDataInputStream4.scala
index 2550e65..b18ccec 100644
--- a/daffodil-io/src/test/scala/org/apache/daffodil/io/TestByteBufferDataInputStream4.scala
+++ b/daffodil-io/src/test/scala/org/apache/daffodil/io/TestByteBufferDataInputStream4.scala
@@ -30,12 +30,12 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.io
+package org.apache.daffodil.io
import org.junit.Test
import org.junit.Assert._
import java.nio.ByteBuffer
-import edu.illinois.ncsa.daffodil.schema.annotation.props.gen.ByteOrder
+import org.apache.daffodil.schema.annotation.props.gen.ByteOrder
class TestByteBufferDataInputStream4 {
diff --git a/daffodil-io/src/test/scala/org/apache/daffodil/io/TestByteBufferDataInputStream5.scala b/daffodil-io/src/test/scala/org/apache/daffodil/io/TestByteBufferDataInputStream5.scala
index 3485aa8..30e6e91 100644
--- a/daffodil-io/src/test/scala/org/apache/daffodil/io/TestByteBufferDataInputStream5.scala
+++ b/daffodil-io/src/test/scala/org/apache/daffodil/io/TestByteBufferDataInputStream5.scala
@@ -30,13 +30,13 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.io
+package org.apache.daffodil.io
import org.junit.Test
import org.junit.Assert._
import java.nio.ByteBuffer
-import edu.illinois.ncsa.daffodil.schema.annotation.props.gen.ByteOrder
-import edu.illinois.ncsa.daffodil.schema.annotation.props.gen.BitOrder
+import org.apache.daffodil.schema.annotation.props.gen.ByteOrder
+import org.apache.daffodil.schema.annotation.props.gen.BitOrder
class TestByteBufferDataInputStream5 {
val leFinfo = FormatInfoForUnitTest()
diff --git a/daffodil-io/src/test/scala/org/apache/daffodil/io/TestByteBufferDataInputStream6.scala b/daffodil-io/src/test/scala/org/apache/daffodil/io/TestByteBufferDataInputStream6.scala
index b4e9f43..d5b73a2 100644
--- a/daffodil-io/src/test/scala/org/apache/daffodil/io/TestByteBufferDataInputStream6.scala
+++ b/daffodil-io/src/test/scala/org/apache/daffodil/io/TestByteBufferDataInputStream6.scala
@@ -30,15 +30,15 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.io
+package org.apache.daffodil.io
import org.junit.Test
import org.junit.Assert._
import java.nio.ByteBuffer
-import edu.illinois.ncsa.daffodil.schema.annotation.props.gen.ByteOrder
-import edu.illinois.ncsa.daffodil.schema.annotation.props.gen.BitOrder
+import org.apache.daffodil.schema.annotation.props.gen.ByteOrder
+import org.apache.daffodil.schema.annotation.props.gen.BitOrder
import java.nio.CharBuffer
-import edu.illinois.ncsa.daffodil.util.MaybeULong
+import org.apache.daffodil.util.MaybeULong
class TestByteBufferDataInputStream6 {
diff --git a/daffodil-io/src/test/scala/org/apache/daffodil/io/TestByteBufferDataInputStream7.scala b/daffodil-io/src/test/scala/org/apache/daffodil/io/TestByteBufferDataInputStream7.scala
index 18e1b62..9df1041 100644
--- a/daffodil-io/src/test/scala/org/apache/daffodil/io/TestByteBufferDataInputStream7.scala
+++ b/daffodil-io/src/test/scala/org/apache/daffodil/io/TestByteBufferDataInputStream7.scala
@@ -30,7 +30,7 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.io
+package org.apache.daffodil.io
import java.nio.ByteBuffer
import java.nio.CharBuffer
@@ -39,11 +39,11 @@ import java.nio.charset.CoderResult
import org.junit.Assert._
import org.junit.Test
-import edu.illinois.ncsa.daffodil.exceptions.Assert
-import edu.illinois.ncsa.daffodil.processors.charset.USASCII7BitPackedCharset
-import edu.illinois.ncsa.daffodil.util.MaybeULong
-import edu.illinois.ncsa.daffodil.util.Misc
-import edu.illinois.ncsa.daffodil.processors.charset.NBitsWidth_BitsCharsetEncoder
+import org.apache.daffodil.exceptions.Assert
+import org.apache.daffodil.processors.charset.USASCII7BitPackedCharset
+import org.apache.daffodil.util.MaybeULong
+import org.apache.daffodil.util.Misc
+import org.apache.daffodil.processors.charset.NBitsWidth_BitsCharsetEncoder
/**
* Helper class for creating example data that is unaligned.
diff --git a/daffodil-io/src/test/scala/org/apache/daffodil/io/TestDataOutputStream.scala b/daffodil-io/src/test/scala/org/apache/daffodil/io/TestDataOutputStream.scala
index 3bae966..cf4b60b 100644
--- a/daffodil-io/src/test/scala/org/apache/daffodil/io/TestDataOutputStream.scala
+++ b/daffodil-io/src/test/scala/org/apache/daffodil/io/TestDataOutputStream.scala
@@ -30,11 +30,11 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.io
+package org.apache.daffodil.io
import junit.framework.Assert._
import org.junit.Test
-import edu.illinois.ncsa.daffodil.schema.annotation.props.gen.BitOrder
+import org.apache.daffodil.schema.annotation.props.gen.BitOrder
class TestDataOutputStream {
diff --git a/daffodil-io/src/test/scala/org/apache/daffodil/io/TestDataOutputStream2.scala b/daffodil-io/src/test/scala/org/apache/daffodil/io/TestDataOutputStream2.scala
index d3af058..0e6b72b 100644
--- a/daffodil-io/src/test/scala/org/apache/daffodil/io/TestDataOutputStream2.scala
+++ b/daffodil-io/src/test/scala/org/apache/daffodil/io/TestDataOutputStream2.scala
@@ -30,7 +30,7 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.io
+package org.apache.daffodil.io
import junit.framework.Assert._
import org.junit.Test
diff --git a/daffodil-io/src/test/scala/org/apache/daffodil/io/TestDataOutputStream3.scala b/daffodil-io/src/test/scala/org/apache/daffodil/io/TestDataOutputStream3.scala
index b8b3505..379db10 100644
--- a/daffodil-io/src/test/scala/org/apache/daffodil/io/TestDataOutputStream3.scala
+++ b/daffodil-io/src/test/scala/org/apache/daffodil/io/TestDataOutputStream3.scala
@@ -30,11 +30,11 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.io
+package org.apache.daffodil.io
import junit.framework.Assert._
-import edu.illinois.ncsa.daffodil.schema.annotation.props.gen.BitOrder
-import edu.illinois.ncsa.daffodil.schema.annotation.props.gen.ByteOrder
+import org.apache.daffodil.schema.annotation.props.gen.BitOrder
+import org.apache.daffodil.schema.annotation.props.gen.ByteOrder
import org.junit.Test
class TestDataOutputStream3 {
diff --git a/daffodil-io/src/test/scala/org/apache/daffodil/io/TestDataOutputStream4.scala b/daffodil-io/src/test/scala/org/apache/daffodil/io/TestDataOutputStream4.scala
index 414c4a3..c6af9c1 100644
--- a/daffodil-io/src/test/scala/org/apache/daffodil/io/TestDataOutputStream4.scala
+++ b/daffodil-io/src/test/scala/org/apache/daffodil/io/TestDataOutputStream4.scala
@@ -30,12 +30,12 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.io
+package org.apache.daffodil.io
import junit.framework.Assert._
import org.junit.Test
import passera.unsigned.ULong
-import edu.illinois.ncsa.daffodil.schema.annotation.props.gen.BitOrder
+import org.apache.daffodil.schema.annotation.props.gen.BitOrder
class TestDataOutputStream4 {
diff --git a/daffodil-io/src/test/scala/org/apache/daffodil/io/TestDecoder.scala b/daffodil-io/src/test/scala/org/apache/daffodil/io/TestDecoder.scala
index d0551ee..e9578b6 100644
--- a/daffodil-io/src/test/scala/org/apache/daffodil/io/TestDecoder.scala
+++ b/daffodil-io/src/test/scala/org/apache/daffodil/io/TestDecoder.scala
@@ -33,7 +33,7 @@
//
// KEEP THIS FILE IN CASE WE HAVE TO GO BACK TO SUPPORTING JAVA 7
//
-package edu.illinois.ncsa.daffodil.io
+package org.apache.daffodil.io
//
import java.nio.charset.{ Charset => JavaCharset }
import java.nio.charset.CodingErrorAction
diff --git a/daffodil-io/src/test/scala/org/apache/daffodil/io/TestDirectOrBufferedDataOutputStream.scala b/daffodil-io/src/test/scala/org/apache/daffodil/io/TestDirectOrBufferedDataOutputStream.scala
index 2956fcc..c951026 100644
--- a/daffodil-io/src/test/scala/org/apache/daffodil/io/TestDirectOrBufferedDataOutputStream.scala
+++ b/daffodil-io/src/test/scala/org/apache/daffodil/io/TestDirectOrBufferedDataOutputStream.scala
@@ -30,7 +30,7 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.io
+package org.apache.daffodil.io
import org.junit.Test
import junit.framework.Assert._
@@ -38,7 +38,7 @@ import junit.framework.Assert._
import java.io.ByteArrayInputStream
import java.io.InputStreamReader
import org.apache.commons.io.IOUtils
-import edu.illinois.ncsa.daffodil.schema.annotation.props.gen.BitOrder
+import org.apache.daffodil.schema.annotation.props.gen.BitOrder
class TestDirectOrBufferedDataOutputStream {
diff --git a/daffodil-io/src/test/scala/org/apache/daffodil/io/TestDump.scala b/daffodil-io/src/test/scala/org/apache/daffodil/io/TestDump.scala
index e139d2e..4afa8ca 100644
--- a/daffodil-io/src/test/scala/org/apache/daffodil/io/TestDump.scala
+++ b/daffodil-io/src/test/scala/org/apache/daffodil/io/TestDump.scala
@@ -30,12 +30,12 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.io
+package org.apache.daffodil.io
import org.junit.Test
import org.junit.Assert._
-import edu.illinois.ncsa.daffodil.schema.annotation.props.gen.BitOrder
-import edu.illinois.ncsa.daffodil.util.Misc
+import org.apache.daffodil.schema.annotation.props.gen.BitOrder
+import org.apache.daffodil.util.Misc
class TestDump {
diff --git a/daffodil-io/src/test/scala/org/apache/daffodil/io/TestDumpDisplay.scala b/daffodil-io/src/test/scala/org/apache/daffodil/io/TestDumpDisplay.scala
index 60cd8b8..1204fb3 100644
--- a/daffodil-io/src/test/scala/org/apache/daffodil/io/TestDumpDisplay.scala
+++ b/daffodil-io/src/test/scala/org/apache/daffodil/io/TestDumpDisplay.scala
@@ -30,14 +30,14 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.io
+package org.apache.daffodil.io
import org.junit.Test
import org.junit.Assert._
-import edu.illinois.ncsa.daffodil.xml.XMLUtils
+import org.apache.daffodil.xml.XMLUtils
import java.nio.ByteBuffer
import java.nio.CharBuffer
-import edu.illinois.ncsa.daffodil.util.Misc
+import org.apache.daffodil.util.Misc
class TestDumpDisplay {
val dfdl = XMLUtils.DFDL_NAMESPACE
diff --git a/daffodil-io/src/test/scala/org/apache/daffodil/io/TestFastAsciiConvert.scala b/daffodil-io/src/test/scala/org/apache/daffodil/io/TestFastAsciiConvert.scala
index 63f8e4f..a4ad652 100644
--- a/daffodil-io/src/test/scala/org/apache/daffodil/io/TestFastAsciiConvert.scala
+++ b/daffodil-io/src/test/scala/org/apache/daffodil/io/TestFastAsciiConvert.scala
@@ -30,7 +30,7 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.io
+package org.apache.daffodil.io
import java.nio.ByteBuffer
import junit.framework.Assert._
diff --git a/daffodil-io/src/test/scala/org/apache/daffodil/io/TestISO8859_1.scala b/daffodil-io/src/test/scala/org/apache/daffodil/io/TestISO8859_1.scala
index f4ae3f1..4667da8 100644
--- a/daffodil-io/src/test/scala/org/apache/daffodil/io/TestISO8859_1.scala
+++ b/daffodil-io/src/test/scala/org/apache/daffodil/io/TestISO8859_1.scala
@@ -30,7 +30,7 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.io
+package org.apache.daffodil.io
import org.junit.Test
import org.junit.Assert._
diff --git a/daffodil-io/src/test/scala/org/apache/daffodil/io/TestNonByteSizedCharsetDecoders1Bit.scala b/daffodil-io/src/test/scala/org/apache/daffodil/io/TestNonByteSizedCharsetDecoders1Bit.scala
index 8ad61f9..ad184dd 100644
--- a/daffodil-io/src/test/scala/org/apache/daffodil/io/TestNonByteSizedCharsetDecoders1Bit.scala
+++ b/daffodil-io/src/test/scala/org/apache/daffodil/io/TestNonByteSizedCharsetDecoders1Bit.scala
@@ -30,7 +30,7 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.io
+package org.apache.daffodil.io
import java.nio.ByteBuffer
import java.nio.CharBuffer
@@ -38,10 +38,10 @@ import java.nio.CharBuffer
import org.junit.Assert._
import org.junit.Test
-import edu.illinois.ncsa.daffodil.processors.charset.CharsetUtils
-import edu.illinois.ncsa.daffodil.util.Misc
-import edu.illinois.ncsa.daffodil.util.MaybeULong
-import edu.illinois.ncsa.daffodil.processors.charset.NBitsWidth_BitsCharsetDecoder
+import org.apache.daffodil.processors.charset.CharsetUtils
+import org.apache.daffodil.util.Misc
+import org.apache.daffodil.util.MaybeULong
+import org.apache.daffodil.processors.charset.NBitsWidth_BitsCharsetDecoder
class TestNonByteSizedCharsetDecoders1Bit {
diff --git a/daffodil-io/src/test/scala/org/apache/daffodil/io/TestNonByteSizedCharsetDecoders3Bit.scala b/daffodil-io/src/test/scala/org/apache/daffodil/io/TestNonByteSizedCharsetDecoders3Bit.scala
index a555ef4..1e7ab77 100644
--- a/daffodil-io/src/test/scala/org/apache/daffodil/io/TestNonByteSizedCharsetDecoders3Bit.scala
+++ b/daffodil-io/src/test/scala/org/apache/daffodil/io/TestNonByteSizedCharsetDecoders3Bit.scala
@@ -30,7 +30,7 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.io
+package org.apache.daffodil.io
import java.nio.ByteBuffer
import java.nio.CharBuffer
@@ -38,9 +38,9 @@ import java.nio.CharBuffer
import org.junit.Assert._
import org.junit.Test
-import edu.illinois.ncsa.daffodil.processors.charset.CharsetUtils
-import edu.illinois.ncsa.daffodil.util.Misc
-import edu.illinois.ncsa.daffodil.util.MaybeULong
+import org.apache.daffodil.processors.charset.CharsetUtils
+import org.apache.daffodil.util.Misc
+import org.apache.daffodil.util.MaybeULong
class TestNonByteSizedCharsetDecoders3Bit {
diff --git a/daffodil-io/src/test/scala/org/apache/daffodil/io/TestNonByteSizedCharsetEncoders1Bit.scala b/daffodil-io/src/test/scala/org/apache/daffodil/io/TestNonByteSizedCharsetEncoders1Bit.scala
index 66f44c4..0d83790 100644
--- a/daffodil-io/src/test/scala/org/apache/daffodil/io/TestNonByteSizedCharsetEncoders1Bit.scala
+++ b/daffodil-io/src/test/scala/org/apache/daffodil/io/TestNonByteSizedCharsetEncoders1Bit.scala
@@ -30,7 +30,7 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.io
+package org.apache.daffodil.io
import java.nio.ByteBuffer
import java.nio.CharBuffer
@@ -38,8 +38,8 @@ import java.nio.CharBuffer
import org.junit.Assert._
import org.junit.Test
-import edu.illinois.ncsa.daffodil.processors.charset.CharsetUtils
-import edu.illinois.ncsa.daffodil.util.Misc
+import org.apache.daffodil.processors.charset.CharsetUtils
+import org.apache.daffodil.util.Misc
class TestNonByteSizedCharsetEncoders1Bit {
diff --git a/daffodil-io/src/test/scala/org/apache/daffodil/io/TestNonByteSizedCharsetEncoders3Bit.scala b/daffodil-io/src/test/scala/org/apache/daffodil/io/TestNonByteSizedCharsetEncoders3Bit.scala
index c0c5bbc..4b65215 100644
--- a/daffodil-io/src/test/scala/org/apache/daffodil/io/TestNonByteSizedCharsetEncoders3Bit.scala
+++ b/daffodil-io/src/test/scala/org/apache/daffodil/io/TestNonByteSizedCharsetEncoders3Bit.scala
@@ -30,7 +30,7 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.io
+package org.apache.daffodil.io
import java.nio.ByteBuffer
import java.nio.CharBuffer
@@ -38,8 +38,8 @@ import java.nio.CharBuffer
import org.junit.Assert._
import org.junit.Test
-import edu.illinois.ncsa.daffodil.processors.charset.CharsetUtils
-import edu.illinois.ncsa.daffodil.util.Misc
+import org.apache.daffodil.processors.charset.CharsetUtils
+import org.apache.daffodil.util.Misc
class TestNonByteSizedCharsetEncoders3Bit {
diff --git a/daffodil-io/src/test/scala/org/apache/daffodil/io/processors/charset/TestBitsCharset.scala b/daffodil-io/src/test/scala/org/apache/daffodil/io/processors/charset/TestBitsCharset.scala
index a34dcba..585e196 100644
--- a/daffodil-io/src/test/scala/org/apache/daffodil/io/processors/charset/TestBitsCharset.scala
+++ b/daffodil-io/src/test/scala/org/apache/daffodil/io/processors/charset/TestBitsCharset.scala
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package edu.illinois.ncsa.daffodil.processors.charset
+package org.apache.daffodil.processors.charset
import java.nio.charset.CodingErrorAction
import java.nio.ByteBuffer
diff --git a/daffodil-japi/src/main/java/org/apache/daffodil/japi/ValidationMode.java b/daffodil-japi/src/main/java/org/apache/daffodil/japi/ValidationMode.java
index cc00f32..19ebc0d 100644
--- a/daffodil-japi/src/main/java/org/apache/daffodil/japi/ValidationMode.java
+++ b/daffodil-japi/src/main/java/org/apache/daffodil/japi/ValidationMode.java
@@ -30,7 +30,7 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.japi;
+package org.apache.daffodil.japi;
/**
* Validation modes for validating the resulting infoset against the DFDL schema
diff --git a/daffodil-japi/src/main/java/org/apache/daffodil/japi/debugger/package-info.java b/daffodil-japi/src/main/java/org/apache/daffodil/japi/debugger/package-info.java
index f02254a..e1d0f2d 100644
--- a/daffodil-japi/src/main/java/org/apache/daffodil/japi/debugger/package-info.java
+++ b/daffodil-japi/src/main/java/org/apache/daffodil/japi/debugger/package-info.java
@@ -4,10 +4,10 @@
* <h3>Overview</h3>
*
* Daffodil comes with one prebuilt debugger, the {@link
- * edu.illinois.ncsa.daffodil.japi.debugger.TraceDebuggerRunner}, which outputs
+ * org.apache.daffodil.japi.debugger.TraceDebuggerRunner}, which outputs
* verbose information during the parsing processes, which can be used to aid
* in debugging a DFDL schema. For example, the {@link
- * edu.illinois.ncsa.daffodil.japi.debugger.TraceDebuggerRunner} can be use like so:
+ * org.apache.daffodil.japi.debugger.TraceDebuggerRunner} can be use like so:
*
* <pre>
* {@code
@@ -17,7 +17,7 @@
*
* Additionally, one may create their own debugger runner by implementing the
* methods in the {@link
- * edu.illinois.ncsa.daffodil.japi.debugger.DebuggerRunner}.
+ * org.apache.daffodil.japi.debugger.DebuggerRunner}.
* <p>
* Once the debugger is set, it must then be turned on, like so:
*
@@ -27,5 +27,5 @@
* }</pre>
*/
-package edu.illinois.ncsa.daffodil.japi.debugger;
+package org.apache.daffodil.japi.debugger;
diff --git a/daffodil-japi/src/main/java/org/apache/daffodil/japi/infoset/package-info.java b/daffodil-japi/src/main/java/org/apache/daffodil/japi/infoset/package-info.java
index 96c3821..2eb3572 100644
--- a/daffodil-japi/src/main/java/org/apache/daffodil/japi/infoset/package-info.java
+++ b/daffodil-japi/src/main/java/org/apache/daffodil/japi/infoset/package-info.java
@@ -1,11 +1,11 @@
/**
* Defines various classes used control the representation of the infoset for
- * parse and unparse. Classes that extend {@link edu.illinois.ncsa.daffodil.japi.infoset.InfosetOutputter} are provided to
- * the {@link edu.illinois.ncsa.daffodil.japi.DataProcessor#parse(java.nio.channels.ReadableByteChannel, edu.illinois.ncsa.daffodil.japi.infoset.InfosetOutputter, long)} method to deteremine how to output an infoset.
+ * parse and unparse. Classes that extend {@link org.apache.daffodil.japi.infoset.InfosetOutputter} are provided to
+ * the {@link org.apache.daffodil.japi.DataProcessor#parse(java.nio.channels.ReadableByteChannel, org.apache.daffodil.japi.infoset.InfosetOutputter, long)} method to deteremine how to output an infoset.
* These classes are not guaranteed to be thread-safe. Classes that extend
- * {@link edu.illinois.ncsa.daffodil.japi.infoset.InfosetInputter} are provided to the {@link edu.illinois.ncsa.daffodil.japi.DataProcessor#unparse(edu.illinois.ncsa.daffodil.japi.infoset.InfosetInputter, java.nio.channels.WritableByteChannel)} method to
+ * {@link org.apache.daffodil.japi.infoset.InfosetInputter} are provided to the {@link org.apache.daffodil.japi.DataProcessor#unparse(org.apache.daffodil.japi.infoset.InfosetInputter, java.nio.channels.WritableByteChannel)} method to
* determine how to read in an infoset. A new InfosetOutputter is required for
* each call to unparse().
*/
-package edu.illinois.ncsa.daffodil.japi.infoset;
+package org.apache.daffodil.japi.infoset;
diff --git a/daffodil-japi/src/main/java/org/apache/daffodil/japi/logger/LogLevel.java b/daffodil-japi/src/main/java/org/apache/daffodil/japi/logger/LogLevel.java
index d7cdacf..c265341 100644
--- a/daffodil-japi/src/main/java/org/apache/daffodil/japi/logger/LogLevel.java
+++ b/daffodil-japi/src/main/java/org/apache/daffodil/japi/logger/LogLevel.java
@@ -30,7 +30,7 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.japi.logger;
+package org.apache.daffodil.japi.logger;
/**
* Logging levels.
diff --git a/daffodil-japi/src/main/java/org/apache/daffodil/japi/logger/package-info.java b/daffodil-japi/src/main/java/org/apache/daffodil/japi/logger/package-info.java
index ce6b8cd..a57921e 100644
--- a/daffodil-japi/src/main/java/org/apache/daffodil/japi/logger/package-info.java
+++ b/daffodil-japi/src/main/java/org/apache/daffodil/japi/logger/package-info.java
@@ -5,13 +5,13 @@
*
* Daffodil comes with three prebuilt log writers:
* <ul>
- * <li>{@link edu.illinois.ncsa.daffodil.japi.logger.ConsoleLogWriter} - writes all log messages to stdout</li>
- * <li>{@link edu.illinois.ncsa.daffodil.japi.logger.FileLogWriter} - writes all log messages to file</li>
- * <li>{@link edu.illinois.ncsa.daffodil.japi.logger.NullLogWriter} - drop all log messages</li>
+ * <li>{@link org.apache.daffodil.japi.logger.ConsoleLogWriter} - writes all log messages to stdout</li>
+ * <li>{@link org.apache.daffodil.japi.logger.FileLogWriter} - writes all log messages to file</li>
+ * <li>{@link org.apache.daffodil.japi.logger.NullLogWriter} - drop all log messages</li>
*</ul>
*
* To use one of these log writers, create and instance of it and pass it to
- * {@link edu.illinois.ncsa.daffodil.japi.Daffodil#setLogWriter}. For example, to write all logs to {@code /var/log/daffodil.log}:
+ * {@link org.apache.daffodil.japi.Daffodil#setLogWriter}. For example, to write all logs to {@code /var/log/daffodil.log}:
*
* <pre>
* {@code
@@ -19,7 +19,7 @@
* Daffodil.setLogWriter(lw);
* }</pre>
*
- * One may also change the log level using {@link edu.illinois.ncsa.daffodil.japi.Daffodil#setLoggingLevel}, which defaults to {@link edu.illinois.ncsa.daffodil.japi.logger.LogLevel#Info} if not set. For example, to change the log level to {@link edu.illinois.ncsa.daffodil.japi.logger.LogLevel#Warning}:
+ * One may also change the log level using {@link org.apache.daffodil.japi.Daffodil#setLoggingLevel}, which defaults to {@link org.apache.daffodil.japi.logger.LogLevel#Info} if not set. For example, to change the log level to {@link org.apache.daffodil.japi.logger.LogLevel#Warning}:
* <pre>
* {@code
* Daffodil.setLoggingLevel(LogLevel.Warning);
@@ -27,5 +27,5 @@
*
*/
-package edu.illinois.ncsa.daffodil.japi.logger;
+package org.apache.daffodil.japi.logger;
diff --git a/daffodil-japi/src/main/java/org/apache/daffodil/japi/package-info.java b/daffodil-japi/src/main/java/org/apache/daffodil/japi/package-info.java
index ea1b634..99870b8 100644
--- a/daffodil-japi/src/main/java/org/apache/daffodil/japi/package-info.java
+++ b/daffodil-japi/src/main/java/org/apache/daffodil/japi/package-info.java
@@ -5,9 +5,9 @@
*
* <h3>Overview</h3>
*
- * The {@link edu.illinois.ncsa.daffodil.japi.Daffodil} object is a factory object to create a {@link edu.illinois.ncsa.daffodil.japi.Compiler}. The
- * {@link edu.illinois.ncsa.daffodil.japi.Compiler} provides a method to compils a provided DFDL schema into a
- * {@link edu.illinois.ncsa.daffodil.japi.ProcessorFactory}, which creates a {@link edu.illinois.ncsa.daffodil.japi.DataProcessor}:
+ * The {@link org.apache.daffodil.japi.Daffodil} object is a factory object to create a {@link org.apache.daffodil.japi.Compiler}. The
+ * {@link org.apache.daffodil.japi.Compiler} provides a method to compils a provided DFDL schema into a
+ * {@link org.apache.daffodil.japi.ProcessorFactory}, which creates a {@link org.apache.daffodil.japi.DataProcessor}:
*
* <pre>
* {@code
@@ -16,15 +16,15 @@
* DataProcessor dp = pf.onPath("/");
* }</pre>
*
- * The {@link edu.illinois.ncsa.daffodil.japi.DataProcessor} provides the necessary functions to parse and unparse
- * data, returning a {@link edu.illinois.ncsa.daffodil.japi.ParseResult} or {@link edu.illinois.ncsa.daffodil.japi.UnparseResult}, respectively. These
+ * The {@link org.apache.daffodil.japi.DataProcessor} provides the necessary functions to parse and unparse
+ * data, returning a {@link org.apache.daffodil.japi.ParseResult} or {@link org.apache.daffodil.japi.UnparseResult}, respectively. These
* contain information about the parse/unparse, such as whether or not the
* processing succeeded any diagnostic information.
*
* <h4>Parse</h4>
*
- * The {@link edu.illinois.ncsa.daffodil.japi.DataProcessor#parse(java.nio.channels.ReadableByteChannel, edu.illinois.ncsa.daffodil.japi.infoset.InfosetOutputter, long)} method accepts input data to parse in the form
- * of a {@link java.nio.channels.ReadableByteChannel} and an {@link edu.illinois.ncsa.daffodil.japi.infoset.InfosetOutputter}
+ * The {@link org.apache.daffodil.japi.DataProcessor#parse(java.nio.channels.ReadableByteChannel, org.apache.daffodil.japi.infoset.InfosetOutputter, long)} method accepts input data to parse in the form
+ * of a {@link java.nio.channels.ReadableByteChannel} and an {@link org.apache.daffodil.japi.infoset.InfosetOutputter}
* to determine the output representation of the infoset (e.g. Scala XML Nodes,
* JDOM2 Documents, etc.):
*
@@ -35,10 +35,10 @@
* Document doc = jdomOutputter.getResult();
* }</pre>
*
- * The {@link edu.illinois.ncsa.daffodil.japi.DataProcessor#parse(java.nio.channels.ReadableByteChannel, edu.illinois.ncsa.daffodil.japi.infoset.InfosetOutputter, long)} method is thread-safe and may be called multiple
+ * The {@link org.apache.daffodil.japi.DataProcessor#parse(java.nio.channels.ReadableByteChannel, org.apache.daffodil.japi.infoset.InfosetOutputter, long)} method is thread-safe and may be called multiple
* times without the need to create other data processors. However,
- * {@link edu.illinois.ncsa.daffodil.japi.infoset.InfosetOutputter}'s are not thread safe, requiring a unique instance per
- * thread. An {@link edu.illinois.ncsa.daffodil.japi.infoset.InfosetOutputter} should call {@link edu.illinois.ncsa.daffodil.japi.infoset.InfosetOutputter#reset()} before
+ * {@link org.apache.daffodil.japi.infoset.InfosetOutputter}'s are not thread safe, requiring a unique instance per
+ * thread. An {@link org.apache.daffodil.japi.infoset.InfosetOutputter} should call {@link org.apache.daffodil.japi.infoset.InfosetOutputter#reset()} before
* reuse (or a new one should be allocated). For example:
*
* <pre>
@@ -53,8 +53,8 @@
*
* <h4>Unparse</h4>
*
- * The same {@link edu.illinois.ncsa.daffodil.japi.DataProcessor} used for parse can be used to unparse an infoset
- * via the {@link edu.illinois.ncsa.daffodil.japi.DataProcessor#unparse(edu.illinois.ncsa.daffodil.japi.infoset.InfosetInputter, java.nio.channels.WritableByteChannel)} method. An {@link edu.illinois.ncsa.daffodil.japi.infoset.InfosetInputter}
+ * The same {@link org.apache.daffodil.japi.DataProcessor} used for parse can be used to unparse an infoset
+ * via the {@link org.apache.daffodil.japi.DataProcessor#unparse(org.apache.daffodil.japi.infoset.InfosetInputter, java.nio.channels.WritableByteChannel)} method. An {@link org.apache.daffodil.japi.infoset.InfosetInputter}
* provides the infoset to unparse, with the unparsed data written to the
* provided {@link java.nio.channels.WritableByteChannel}. For example:
*
@@ -67,12 +67,12 @@
* <h3>Failures and Diagnostics</h3>
*
* It is possible that failures could occur during the creation of the
- * {@link edu.illinois.ncsa.daffodil.japi.ProcessorFactory}, {@link edu.illinois.ncsa.daffodil.japi.DataProcessor}, or {@link edu.illinois.ncsa.daffodil.japi.ParseResult}. However, rather than
+ * {@link org.apache.daffodil.japi.ProcessorFactory}, {@link org.apache.daffodil.japi.DataProcessor}, or {@link org.apache.daffodil.japi.ParseResult}. However, rather than
* throwing an exception on error (e.g. invalid DFDL schema, parse
- * error, etc), these classes extend {@link edu.illinois.ncsa.daffodil.japi.WithDiagnostics}, which is used to
+ * error, etc), these classes extend {@link org.apache.daffodil.japi.WithDiagnostics}, which is used to
* determine if an error occurred, and any diagnostic information (see
- * {@link edu.illinois.ncsa.daffodil.japi.Diagnostic}) related to the step. Thus, before continuing, one must check
- * {@link edu.illinois.ncsa.daffodil.japi.WithDiagnostics#isError}. For example:
+ * {@link org.apache.daffodil.japi.Diagnostic}) related to the step. Thus, before continuing, one must check
+ * {@link org.apache.daffodil.japi.WithDiagnostics#isError}. For example:
*
* <pre>
* {@code
@@ -91,7 +91,7 @@
* In some cases, it may be beneficial to save a parser and reload it.
* For example, when starting up, it may be quicker to reload an
* already compiled parser than to compile it from scratch. To save a
- * {@link edu.illinois.ncsa.daffodil.japi.DataProcessor}:
+ * {@link org.apache.daffodil.japi.DataProcessor}:
*
* <pre>
* {@code
@@ -99,7 +99,7 @@
* dp.save(saveFile);
* }</pre>
*
- * And to restore a saved {@link edu.illinois.ncsa.daffodil.japi.DataProcessor}:
+ * And to restore a saved {@link org.apache.daffodil.japi.DataProcessor}:
*
* <pre>
* {@code
@@ -109,5 +109,5 @@
*
*/
-package edu.illinois.ncsa.daffodil.japi;
+package org.apache.daffodil.japi;
diff --git a/daffodil-japi/src/main/scala/org/apache/daffodil/japi/Daffodil.scala b/daffodil-japi/src/main/scala/org/apache/daffodil/japi/Daffodil.scala
index 8a82425..5bd480f 100644
--- a/daffodil-japi/src/main/scala/org/apache/daffodil/japi/Daffodil.scala
+++ b/daffodil-japi/src/main/scala/org/apache/daffodil/japi/Daffodil.scala
@@ -30,42 +30,42 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.japi
-
-import edu.illinois.ncsa.daffodil.compiler.{ Compiler => SCompiler }
-import edu.illinois.ncsa.daffodil.japi.debugger._
-import edu.illinois.ncsa.daffodil.japi.logger._
-import edu.illinois.ncsa.daffodil.japi.packageprivate._
-import edu.illinois.ncsa.daffodil.japi.infoset._
-import edu.illinois.ncsa.daffodil.debugger.{ InteractiveDebugger => SInteractiveDebugger }
-import edu.illinois.ncsa.daffodil.debugger.{ TraceDebuggerRunner => STraceDebuggerRunner }
-import edu.illinois.ncsa.daffodil.api.{ Diagnostic => SDiagnostic }
+package org.apache.daffodil.japi
+
+import org.apache.daffodil.compiler.{ Compiler => SCompiler }
+import org.apache.daffodil.japi.debugger._
+import org.apache.daffodil.japi.logger._
+import org.apache.daffodil.japi.packageprivate._
+import org.apache.daffodil.japi.infoset._
+import org.apache.daffodil.debugger.{ InteractiveDebugger => SInteractiveDebugger }
+import org.apache.daffodil.debugger.{ TraceDebuggerRunner => STraceDebuggerRunner }
+import org.apache.daffodil.api.{ Diagnostic => SDiagnostic }
import scala.collection.JavaConversions._
import java.io.File
import java.nio.channels.ReadableByteChannel
import java.nio.channels.WritableByteChannel
import scala.collection.JavaConversions.seqAsJavaList
-import edu.illinois.ncsa.daffodil.api.{ DataLocation => SDataLocation }
-import edu.illinois.ncsa.daffodil.api.{ Diagnostic => SDiagnostic }
-import edu.illinois.ncsa.daffodil.api.{ LocationInSchemaFile => SLocationInSchemaFile }
-import edu.illinois.ncsa.daffodil.api.{ WithDiagnostics => SWithDiagnostics }
-import edu.illinois.ncsa.daffodil.compiler.{ ProcessorFactory => SProcessorFactory }
-import edu.illinois.ncsa.daffodil.processors.{ DataProcessor => SDataProcessor }
-import edu.illinois.ncsa.daffodil.processors.{ ParseResult => SParseResult }
-import edu.illinois.ncsa.daffodil.processors.{ UnparseResult => SUnparseResult }
-import edu.illinois.ncsa.daffodil.util.{ ConsoleWriter => SConsoleWriter }
-import edu.illinois.ncsa.daffodil.util.{ FileWriter => SFileWriter }
-import edu.illinois.ncsa.daffodil.util.{ LogWriter => SLogWriter }
-import edu.illinois.ncsa.daffodil.util.{ LoggingDefaults => SLoggingDefaults }
-import edu.illinois.ncsa.daffodil.util.{ NullLogWriter => SNullLogWriter }
-import edu.illinois.ncsa.daffodil.externalvars.ExternalVariablesLoader
-import edu.illinois.ncsa.daffodil.dsom.ExpressionCompilers
-import edu.illinois.ncsa.daffodil.compiler.{ InvalidParserException => SInvalidParserException }
-import edu.illinois.ncsa.daffodil.processors.{ InvalidUsageException => SInvalidUsageException }
+import org.apache.daffodil.api.{ DataLocation => SDataLocation }
+import org.apache.daffodil.api.{ Diagnostic => SDiagnostic }
+import org.apache.daffodil.api.{ LocationInSchemaFile => SLocationInSchemaFile }
+import org.apache.daffodil.api.{ WithDiagnostics => SWithDiagnostics }
+import org.apache.daffodil.compiler.{ ProcessorFactory => SProcessorFactory }
+import org.apache.daffodil.processors.{ DataProcessor => SDataProcessor }
+import org.apache.daffodil.processors.{ ParseResult => SParseResult }
+import org.apache.daffodil.processors.{ UnparseResult => SUnparseResult }
+import org.apache.daffodil.util.{ ConsoleWriter => SConsoleWriter }
+import org.apache.daffodil.util.{ FileWriter => SFileWriter }
+import org.apache.daffodil.util.{ LogWriter => SLogWriter }
+import org.apache.daffodil.util.{ LoggingDefaults => SLoggingDefaults }
+import org.apache.daffodil.util.{ NullLogWriter => SNullLogWriter }
+import org.apache.daffodil.externalvars.ExternalVariablesLoader
+import org.apache.daffodil.dsom.ExpressionCompilers
+import org.apache.daffodil.compiler.{ InvalidParserException => SInvalidParserException }
+import org.apache.daffodil.processors.{ InvalidUsageException => SInvalidUsageException }
import java.net.URI
-import edu.illinois.ncsa.daffodil.api.URISchemaSource
-import edu.illinois.ncsa.daffodil.util.Maybe
-import edu.illinois.ncsa.daffodil.util.Maybe._
+import org.apache.daffodil.api.URISchemaSource
+import org.apache.daffodil.util.Maybe
+import org.apache.daffodil.util.Maybe._
/**
* API Suitable for Java programmers to use.
@@ -612,7 +612,7 @@ class ParseResult private[japi] (pr: SParseResult, deprecatedOutput: Maybe[JDOMI
if (deprecatedOutput.isDefined) {
deprecatedOutput.get.getResult()
} else {
- val ex = new edu.illinois.ncsa.daffodil.processors.InvalidUsageException(
+ val ex = new org.apache.daffodil.processors.InvalidUsageException(
"When passing an InfosetOutputter to parse(), you must get the infoset result from the InfosetOutputter instead of the ParseResult.")
throw new InvalidUsageException(ex)
}
@@ -657,9 +657,9 @@ class UnparseResult private[japi] (ur: SUnparseResult)
* that is invalid (not a parser file, corrupt, etc.) or
* is not in the GZIP format.
*/
-class InvalidParserException private[japi] (cause: edu.illinois.ncsa.daffodil.compiler.InvalidParserException) extends Exception(cause.getMessage(), cause.getCause())
+class InvalidParserException private[japi] (cause: org.apache.daffodil.compiler.InvalidParserException) extends Exception(cause.getMessage(), cause.getCause())
/**
* This exception will be thrown as a result of an invalid usage of the Daffodil API
*/
-class InvalidUsageException private[japi] (cause: edu.illinois.ncsa.daffodil.processors.InvalidUsageException) extends Exception(cause.getMessage(), cause.getCause())
+class InvalidUsageException private[japi] (cause: org.apache.daffodil.processors.InvalidUsageException) extends Exception(cause.getMessage(), cause.getCause())
diff --git a/daffodil-japi/src/main/scala/org/apache/daffodil/japi/debugger/Debugger.scala b/daffodil-japi/src/main/scala/org/apache/daffodil/japi/debugger/Debugger.scala
index 6860b37..e38cfa9 100644
--- a/daffodil-japi/src/main/scala/org/apache/daffodil/japi/debugger/Debugger.scala
+++ b/daffodil-japi/src/main/scala/org/apache/daffodil/japi/debugger/Debugger.scala
@@ -30,7 +30,7 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.japi.debugger
+package org.apache.daffodil.japi.debugger
/**
* Abstract debugger runner, which can be implemented to create a custom debugger runner
diff --git a/daffodil-japi/src/main/scala/org/apache/daffodil/japi/infoset/Infoset.scala b/daffodil-japi/src/main/scala/org/apache/daffodil/japi/infoset/Infoset.scala
index d43e232..0dcd875 100644
--- a/daffodil-japi/src/main/scala/org/apache/daffodil/japi/infoset/Infoset.scala
+++ b/daffodil-japi/src/main/scala/org/apache/daffodil/japi/infoset/Infoset.scala
@@ -30,29 +30,29 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.japi.infoset
-
-import edu.illinois.ncsa.daffodil.infoset.{ InfosetOutputter => SInfosetOutputter }
-import edu.illinois.ncsa.daffodil.infoset.{ InfosetInputter => SInfosetInputter }
-import edu.illinois.ncsa.daffodil.infoset.{ ScalaXMLInfosetOutputter => SScalaXMLInfosetOutputter }
-import edu.illinois.ncsa.daffodil.infoset.{ XMLTextInfosetOutputter => SXMLTextInfosetOutputter }
-import edu.illinois.ncsa.daffodil.infoset.{ JsonInfosetOutputter => SJsonInfosetOutputter }
-import edu.illinois.ncsa.daffodil.infoset.{ NullInfosetOutputter => SNullInfosetOutputter }
-import edu.illinois.ncsa.daffodil.infoset.{ JDOMInfosetOutputter => SJDOMInfosetOutputter }
-import edu.illinois.ncsa.daffodil.infoset.{ W3CDOMInfosetOutputter => SW3CDOMInfosetOutputter }
-import edu.illinois.ncsa.daffodil.infoset.{ ScalaXMLInfosetInputter => SScalaXMLInfosetInputter }
-import edu.illinois.ncsa.daffodil.infoset.{ XMLTextInfosetInputter => SXMLTextInfosetInputter }
-import edu.illinois.ncsa.daffodil.infoset.{ JsonInfosetInputter => SJsonInfosetInputter }
-import edu.illinois.ncsa.daffodil.infoset.{ JDOMInfosetInputter => SJDOMInfosetInputter }
-import edu.illinois.ncsa.daffodil.infoset.{ W3CDOMInfosetInputter => SW3CDOMInfosetInputter }
-import edu.illinois.ncsa.daffodil.util.MaybeBoolean
-import edu.illinois.ncsa.daffodil.infoset.InfosetInputterEventType
+package org.apache.daffodil.japi.infoset
+
+import org.apache.daffodil.infoset.{ InfosetOutputter => SInfosetOutputter }
+import org.apache.daffodil.infoset.{ InfosetInputter => SInfosetInputter }
+import org.apache.daffodil.infoset.{ ScalaXMLInfosetOutputter => SScalaXMLInfosetOutputter }
+import org.apache.daffodil.infoset.{ XMLTextInfosetOutputter => SXMLTextInfosetOutputter }
+import org.apache.daffodil.infoset.{ JsonInfosetOutputter => SJsonInfosetOutputter }
+import org.apache.daffodil.infoset.{ NullInfosetOutputter => SNullInfosetOutputter }
+import org.apache.daffodil.infoset.{ JDOMInfosetOutputter => SJDOMInfosetOutputter }
+import org.apache.daffodil.infoset.{ W3CDOMInfosetOutputter => SW3CDOMInfosetOutputter }
+import org.apache.daffodil.infoset.{ ScalaXMLInfosetInputter => SScalaXMLInfosetInputter }
+import org.apache.daffodil.infoset.{ XMLTextInfosetInputter => SXMLTextInfosetInputter }
+import org.apache.daffodil.infoset.{ JsonInfosetInputter => SJsonInfosetInputter }
+import org.apache.daffodil.infoset.{ JDOMInfosetInputter => SJDOMInfosetInputter }
+import org.apache.daffodil.infoset.{ W3CDOMInfosetInputter => SW3CDOMInfosetInputter }
+import org.apache.daffodil.util.MaybeBoolean
+import org.apache.daffodil.infoset.InfosetInputterEventType
// TODO: Not sure about the access to internal infoset implementation details.
// Should API users have this deep access to our internal infoset?
-import edu.illinois.ncsa.daffodil.infoset.DISimple
-import edu.illinois.ncsa.daffodil.infoset.DIComplex
-import edu.illinois.ncsa.daffodil.infoset.DIArray
-import edu.illinois.ncsa.daffodil.dpath.NodeInfo
+import org.apache.daffodil.infoset.DISimple
+import org.apache.daffodil.infoset.DIComplex
+import org.apache.daffodil.infoset.DIArray
+import org.apache.daffodil.dpath.NodeInfo
/**
* Abstract class used to determine how the infoset representation should be
diff --git a/daffodil-japi/src/main/scala/org/apache/daffodil/japi/logger/Logger.scala b/daffodil-japi/src/main/scala/org/apache/daffodil/japi/logger/Logger.scala
index 6e501d7..0d30565 100644
--- a/daffodil-japi/src/main/scala/org/apache/daffodil/japi/logger/Logger.scala
+++ b/daffodil-japi/src/main/scala/org/apache/daffodil/japi/logger/Logger.scala
@@ -30,7 +30,7 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.japi.logger
+package org.apache.daffodil.japi.logger
import java.io.File
import scala.collection.JavaConversions._
diff --git a/daffodil-japi/src/main/scala/org/apache/daffodil/japi/packageprivate/Utils.scala b/daffodil-japi/src/main/scala/org/apache/daffodil/japi/packageprivate/Utils.scala
index ceab147..34f3ddf 100644
--- a/daffodil-japi/src/main/scala/org/apache/daffodil/japi/packageprivate/Utils.scala
+++ b/daffodil-japi/src/main/scala/org/apache/daffodil/japi/packageprivate/Utils.scala
@@ -30,7 +30,7 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.japi.packageprivate
+package org.apache.daffodil.japi.packageprivate
// The compiler plugin that converts Scala code to Java code for Javadoc
// generation has no concept of package private. So if there is anything that
// should be package private and thus not part of the public API (e.g.
@@ -39,14 +39,14 @@ package edu.illinois.ncsa.daffodil.japi.packageprivate
// anything in the japiexclude package. So anything that should be package
// private should go in this package.
-import edu.illinois.ncsa.daffodil.japi._
-import edu.illinois.ncsa.daffodil.japi.logger._
-import edu.illinois.ncsa.daffodil.japi.debugger._
-import edu.illinois.ncsa.daffodil.api.{ ValidationMode => SValidationMode }
-import edu.illinois.ncsa.daffodil.util.{ LogLevel => SLogLevel }
-import edu.illinois.ncsa.daffodil.util.{ LogWriter => SLogWriter }
-import edu.illinois.ncsa.daffodil.debugger.{ InteractiveDebugger => SInteractiveDebugger }
-import edu.illinois.ncsa.daffodil.debugger.{ InteractiveDebuggerRunner => SInteractiveDebuggerRunner }
+import org.apache.daffodil.japi._
+import org.apache.daffodil.japi.logger._
+import org.apache.daffodil.japi.debugger._
+import org.apache.daffodil.api.{ ValidationMode => SValidationMode }
+import org.apache.daffodil.util.{ LogLevel => SLogLevel }
+import org.apache.daffodil.util.{ LogWriter => SLogWriter }
+import org.apache.daffodil.debugger.{ InteractiveDebugger => SInteractiveDebugger }
+import org.apache.daffodil.debugger.{ InteractiveDebuggerRunner => SInteractiveDebuggerRunner }
import scala.collection.JavaConversions._
diff --git a/daffodil-japi/src/test/java/org/apache/daffodil/example/DebuggerRunnerForJAPITest.java b/daffodil-japi/src/test/java/org/apache/daffodil/example/DebuggerRunnerForJAPITest.java
index 9d11fd6..fd753c0 100644
--- a/daffodil-japi/src/test/java/org/apache/daffodil/example/DebuggerRunnerForJAPITest.java
+++ b/daffodil-japi/src/test/java/org/apache/daffodil/example/DebuggerRunnerForJAPITest.java
@@ -30,9 +30,9 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.example;
+package org.apache.daffodil.example;
-import edu.illinois.ncsa.daffodil.japi.debugger.*;
+import org.apache.daffodil.japi.debugger.*;
import java.util.ArrayList;
import java.util.Iterator;
diff --git a/daffodil-japi/src/test/java/org/apache/daffodil/example/LogWriterForJAPITest.java b/daffodil-japi/src/test/java/org/apache/daffodil/example/LogWriterForJAPITest.java
index 8c97f92..20756a4 100644
--- a/daffodil-japi/src/test/java/org/apache/daffodil/example/LogWriterForJAPITest.java
+++ b/daffodil-japi/src/test/java/org/apache/daffodil/example/LogWriterForJAPITest.java
@@ -30,9 +30,9 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.example;
+package org.apache.daffodil.example;
-import edu.illinois.ncsa.daffodil.japi.logger.*;
+import org.apache.daffodil.japi.logger.*;
import java.util.List;
import java.util.ArrayList;
diff --git a/daffodil-japi/src/test/java/org/apache/daffodil/example/LogWriterForJAPITest2.java b/daffodil-japi/src/test/java/org/apache/daffodil/example/LogWriterForJAPITest2.java
index 6b5736e..1f75211 100644
--- a/daffodil-japi/src/test/java/org/apache/daffodil/example/LogWriterForJAPITest2.java
+++ b/daffodil-japi/src/test/java/org/apache/daffodil/example/LogWriterForJAPITest2.java
@@ -30,9 +30,9 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.example;
+package org.apache.daffodil.example;
-import edu.illinois.ncsa.daffodil.japi.logger.*;
+import org.apache.daffodil.japi.logger.*;
import java.util.ArrayList;
diff --git a/daffodil-japi/src/test/java/org/apache/daffodil/example/TestJavaAPI.java b/daffodil-japi/src/test/java/org/apache/daffodil/example/TestJavaAPI.java
index 63fb7d7..6d5acb4 100644
--- a/daffodil-japi/src/test/java/org/apache/daffodil/example/TestJavaAPI.java
+++ b/daffodil-japi/src/test/java/org/apache/daffodil/example/TestJavaAPI.java
@@ -30,7 +30,7 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.example;
+package org.apache.daffodil.example;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -49,19 +49,19 @@ import java.util.List;
import org.jdom2.output.Format;
import org.junit.Test;
-import edu.illinois.ncsa.daffodil.japi.Daffodil;
-import edu.illinois.ncsa.daffodil.japi.DataProcessor;
-import edu.illinois.ncsa.daffodil.japi.Diagnostic;
-import edu.illinois.ncsa.daffodil.japi.InvalidUsageException;
-import edu.illinois.ncsa.daffodil.japi.LocationInSchemaFile;
-import edu.illinois.ncsa.daffodil.japi.ParseResult;
-import edu.illinois.ncsa.daffodil.japi.ProcessorFactory;
-import edu.illinois.ncsa.daffodil.japi.UnparseResult;
-import edu.illinois.ncsa.daffodil.japi.ValidationMode;
-import edu.illinois.ncsa.daffodil.japi.infoset.JDOMInfosetInputter;
-import edu.illinois.ncsa.daffodil.japi.infoset.JDOMInfosetOutputter;
-import edu.illinois.ncsa.daffodil.japi.logger.ConsoleLogWriter;
-import edu.illinois.ncsa.daffodil.japi.logger.LogLevel;
+import org.apache.daffodil.japi.Daffodil;
+import org.apache.daffodil.japi.DataProcessor;
+import org.apache.daffodil.japi.Diagnostic;
+import org.apache.daffodil.japi.InvalidUsageException;
+import org.apache.daffodil.japi.LocationInSchemaFile;
+import org.apache.daffodil.japi.ParseResult;
+import org.apache.daffodil.japi.ProcessorFactory;
+import org.apache.daffodil.japi.UnparseResult;
+import org.apache.daffodil.japi.ValidationMode;
+import org.apache.daffodil.japi.infoset.JDOMInfosetInputter;
+import org.apache.daffodil.japi.infoset.JDOMInfosetOutputter;
+import org.apache.daffodil.japi.logger.ConsoleLogWriter;
+import org.apache.daffodil.japi.logger.LogLevel;
public class TestJavaAPI {
@@ -81,7 +81,7 @@ public class TestJavaAPI {
Daffodil.setLogWriter(lw);
Daffodil.setLoggingLevel(LogLevel.Debug);
- edu.illinois.ncsa.daffodil.japi.Compiler c = Daffodil.compiler();
+ org.apache.daffodil.japi.Compiler c = Daffodil.compiler();
c.setValidateDFDLSchemas(false);
java.io.File schemaFile = getResource("/test/japi/mySchema1.dfdl.xsd");
ProcessorFactory pf = c.compileFile(schemaFile);
@@ -126,7 +126,7 @@ public class TestJavaAPI {
Daffodil.setLogWriter(lw);
Daffodil.setLoggingLevel(LogLevel.Debug);
- edu.illinois.ncsa.daffodil.japi.Compiler c = Daffodil.compiler();
+ org.apache.daffodil.japi.Compiler c = Daffodil.compiler();
c.setValidateDFDLSchemas(false);
java.io.File schemaFile = getResource("/test/japi/mySchema1.dfdl.xsd");
ProcessorFactory pf = c.compileFile(schemaFile);
@@ -139,7 +139,7 @@ public class TestJavaAPI {
ByteArrayInputStream is = new ByteArrayInputStream(os.toByteArray());
ReadableByteChannel input = Channels.newChannel(is);
- edu.illinois.ncsa.daffodil.japi.Compiler compiler = Daffodil.compiler();
+ org.apache.daffodil.japi.Compiler compiler = Daffodil.compiler();
DataProcessor parser = compiler.reload(input);
parser.setDebugger(debugger);
parser.setDebugging(true);
@@ -182,7 +182,7 @@ public class TestJavaAPI {
Daffodil.setLogWriter(lw);
Daffodil.setLoggingLevel(LogLevel.Debug);
- edu.illinois.ncsa.daffodil.japi.Compiler c = Daffodil.compiler();
+ org.apache.daffodil.japi.Compiler c = Daffodil.compiler();
c.setValidateDFDLSchemas(false);
java.io.File schemaFile = getResource("/test/japi/mySchema1.dfdl.xsd");
ProcessorFactory pf = c.compileFile(schemaFile);
@@ -197,7 +197,7 @@ public class TestJavaAPI {
ByteArrayInputStream is = new ByteArrayInputStream(os.toByteArray());
ReadableByteChannel input = Channels.newChannel(is);
- edu.illinois.ncsa.daffodil.japi.Compiler compiler = Daffodil.compiler();
+ org.apache.daffodil.japi.Compiler compiler = Daffodil.compiler();
DataProcessor parser = compiler.reload(input);
try {
@@ -219,7 +219,7 @@ public class TestJavaAPI {
Daffodil.setLogWriter(lw);
Daffodil.setLoggingLevel(LogLevel.Info);
- edu.illinois.ncsa.daffodil.japi.Compiler c = Daffodil.compiler();
+ org.apache.daffodil.japi.Compiler c = Daffodil.compiler();
c.setValidateDFDLSchemas(false);
java.io.File schemaFile = getResource("/test/japi/mySchema1.dfdl.xsd");
ProcessorFactory pf = c.compileFile(schemaFile);
@@ -267,7 +267,7 @@ public class TestJavaAPI {
*/
@Test
public void testJavaAPI3() throws IOException {
- edu.illinois.ncsa.daffodil.japi.Compiler c = Daffodil.compiler();
+ org.apache.daffodil.japi.Compiler c = Daffodil.compiler();
c.setValidateDFDLSchemas(false);
java.io.File schemaFile = getResource("/test/japi/mySchema3.dfdl.xsd");
ProcessorFactory pf = c.compileFile(schemaFile);
@@ -297,7 +297,7 @@ public class TestJavaAPI {
// before executing the test.
@Test
public void testJavaAPI3_A() throws Exception {
- edu.illinois.ncsa.daffodil.japi.Compiler c = Daffodil.compiler();
+ org.apache.daffodil.japi.Compiler c = Daffodil.compiler();
c.setValidateDFDLSchemas(false);
java.io.File schemaFile = getResource("/test/japi/mySchema3.dfdl.xsd");
ProcessorFactory pf = c.compileFile(schemaFile);
@@ -311,7 +311,7 @@ public class TestJavaAPI {
ByteArrayInputStream is = new ByteArrayInputStream(os.toByteArray());
ReadableByteChannel input = Channels.newChannel(is);
- edu.illinois.ncsa.daffodil.japi.Compiler compiler = Daffodil.compiler();
+ org.apache.daffodil.japi.Compiler compiler = Daffodil.compiler();
DataProcessor parser = compiler.reload(input);
java.io.File file = getResource("/test/japi/myData16.dat");
@@ -336,7 +336,7 @@ public class TestJavaAPI {
@Test
public void testJavaAPI4b() throws IOException {
- edu.illinois.ncsa.daffodil.japi.Compiler c = Daffodil.compiler();
+ org.apache.daffodil.japi.Compiler c = Daffodil.compiler();
c.setValidateDFDLSchemas(false);
File schemaFileName = getResource("/test/japi/mySchema3.dfdl.xsd");
c.setDistinguishedRootNode("e4", null);
@@ -364,7 +364,7 @@ public class TestJavaAPI {
@Test
public void testJavaAPI5() throws IOException {
- edu.illinois.ncsa.daffodil.japi.Compiler c = Daffodil.compiler();
+ org.apache.daffodil.japi.Compiler c = Daffodil.compiler();
c.setValidateDFDLSchemas(false);
File schemaFileName = getResource("/test/japi/mySchema3.dfdl.xsd");
c.setDistinguishedRootNode("e4", null); // e4 is a 4-byte long string
@@ -405,7 +405,7 @@ public class TestJavaAPI {
Daffodil.setLogWriter(lw);
Daffodil.setLoggingLevel(LogLevel.Debug);
- edu.illinois.ncsa.daffodil.japi.Compiler c = Daffodil.compiler();
+ org.apache.daffodil.japi.Compiler c = Daffodil.compiler();
c.setValidateDFDLSchemas(false);
java.io.File schemaFile = new java.io.File("/test/japi/notHere1.dfdl.xsd");
ProcessorFactory pf = c.compileFile(schemaFile);
@@ -441,7 +441,7 @@ public class TestJavaAPI {
Daffodil.setLogWriter(lw);
Daffodil.setLoggingLevel(LogLevel.Debug);
- edu.illinois.ncsa.daffodil.japi.Compiler c = Daffodil.compiler();
+ org.apache.daffodil.japi.Compiler c = Daffodil.compiler();
c.setValidateDFDLSchemas(false);
java.io.File schemaFile = getResource("/test/japi/TopLevel.xsd");
c.setDistinguishedRootNode("TopLevel", null);
@@ -484,7 +484,7 @@ public class TestJavaAPI {
Daffodil.setLogWriter(lw);
Daffodil.setLoggingLevel(LogLevel.Debug);
- edu.illinois.ncsa.daffodil.japi.Compiler c = Daffodil.compiler();
+ org.apache.daffodil.japi.Compiler c = Daffodil.compiler();
c.setValidateDFDLSchemas(false);
java.io.File schemaFile = getResource("/test/japi/TopLevel.xsd");
c.setDistinguishedRootNode("TopLevel2", null);
@@ -523,7 +523,7 @@ public class TestJavaAPI {
Daffodil.setLogWriter(lw);
Daffodil.setLoggingLevel(LogLevel.Debug);
- edu.illinois.ncsa.daffodil.japi.Compiler c = Daffodil.compiler();
+ org.apache.daffodil.japi.Compiler c = Daffodil.compiler();
c.setValidateDFDLSchemas(false);
java.io.File schemaFile = getResource("/test/japi/TopLevel.xsd");
c.setDistinguishedRootNode("TopLevel2", null);
@@ -569,7 +569,7 @@ public class TestJavaAPI {
@Test
public void testJavaAPI10() throws IOException {
- edu.illinois.ncsa.daffodil.japi.Compiler c = Daffodil.compiler();
+ org.apache.daffodil.japi.Compiler c = Daffodil.compiler();
c.setValidateDFDLSchemas(false);
java.io.File schemaFile = getResource("/test/japi/mySchema4.dfdl.xsd");
ProcessorFactory pf = c.compileFile(schemaFile);
@@ -596,7 +596,7 @@ public class TestJavaAPI {
@Test
public void testJavaAPI11() throws IOException {
- edu.illinois.ncsa.daffodil.japi.Compiler c = Daffodil.compiler();
+ org.apache.daffodil.japi.Compiler c = Daffodil.compiler();
c.setValidateDFDLSchemas(false);
java.io.File schemaFile = getResource("/test/japi/mySchema5.dfdl.xsd");
ProcessorFactory pf = c.compileFile(schemaFile);
@@ -638,7 +638,7 @@ public class TestJavaAPI {
Daffodil.setLogWriter(lw2);
Daffodil.setLoggingLevel(LogLevel.Debug);
- edu.illinois.ncsa.daffodil.japi.Compiler c = Daffodil.compiler();
+ org.apache.daffodil.japi.Compiler c = Daffodil.compiler();
c.setValidateDFDLSchemas(false);
java.io.File schemaFile = getResource("/test/japi/mySchema1.dfdl.xsd");
@@ -677,7 +677,7 @@ public class TestJavaAPI {
Daffodil.setLogWriter(lw);
Daffodil.setLoggingLevel(LogLevel.Debug);
- edu.illinois.ncsa.daffodil.japi.Compiler c = Daffodil.compiler();
+ org.apache.daffodil.japi.Compiler c = Daffodil.compiler();
c.setValidateDFDLSchemas(false);
java.io.File extVarsFile = getResource("/test/japi/external_vars_1.xml");
java.io.File schemaFile = getResource("/test/japi/mySchemaWithVars.dfdl.xsd");
@@ -719,7 +719,7 @@ public class TestJavaAPI {
Daffodil.setLogWriter(lw);
Daffodil.setLoggingLevel(LogLevel.Debug);
- edu.illinois.ncsa.daffodil.japi.Compiler c = Daffodil.compiler();
+ org.apache.daffodil.japi.Compiler c = Daffodil.compiler();
c.setValidateDFDLSchemas(false);
java.io.File extVarFile = getResource("/test/japi/external_vars_1.xml");
java.io.File schemaFile = getResource("/test/japi/mySchemaWithVars.dfdl.xsd");
@@ -764,7 +764,7 @@ public class TestJavaAPI {
Daffodil.setLogWriter(lw);
Daffodil.setLoggingLevel(LogLevel.Info);
- edu.illinois.ncsa.daffodil.japi.Compiler c = Daffodil.compiler();
+ org.apache.daffodil.japi.Compiler c = Daffodil.compiler();
c.setValidateDFDLSchemas(false);
java.io.File schemaFile = getResource("/test/japi/mySchema1.dfdl.xsd");
ProcessorFactory pf = c.compileFile(schemaFile);
@@ -799,7 +799,7 @@ public class TestJavaAPI {
@Test
public void testJavaAPI16() throws IOException, InvalidUsageException {
- edu.illinois.ncsa.daffodil.japi.Compiler c = Daffodil.compiler();
+ org.apache.daffodil.japi.Compiler c = Daffodil.compiler();
c.setValidateDFDLSchemas(false);
java.io.File schemaFile = getResource("/test/japi/mySchema1.dfdl.xsd");
ProcessorFactory pf = c.compileFile(schemaFile);
@@ -825,7 +825,7 @@ public class TestJavaAPI {
@Test
public void testJavaAPI17() throws IOException, InvalidUsageException {
- edu.illinois.ncsa.daffodil.japi.Compiler c = Daffodil.compiler();
+ org.apache.daffodil.japi.Compiler c = Daffodil.compiler();
c.setValidateDFDLSchemas(false);
java.io.File schemaFile = getResource("/test/japi/mySchema1.dfdl.xsd");
ProcessorFactory pf = c.compileFile(schemaFile);
diff --git a/daffodil-japi/src/test/resources/test/japi/external_vars_1.xml b/daffodil-japi/src/test/resources/test/japi/external_vars_1.xml
index 7fb7112..c62063b 100644
--- a/daffodil-japi/src/test/resources/test/japi/external_vars_1.xml
+++ b/daffodil-japi/src/test/resources/test/japi/external_vars_1.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<daf:externalVariableBindings xmlns="http://www.w3.org/2001/XMLSchema"
xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ex="http://example.com"
- xmlns:daf="urn:ogf:dfdl:2013:imp:opensource.ncsa.illinois.edu:2012:ext">
+ xmlns:daf="urn:ogf:dfdl:2013:imp:daffodil.apache.org:2018:ext">
<daf:bind name="ex:var1">externallySet</daf:bind>
</daf:externalVariableBindings>
\ No newline at end of file
diff --git a/daffodil-japi/src/test/resources/test/japi/mySchema1.dfdl.xsd b/daffodil-japi/src/test/resources/test/japi/mySchema1.dfdl.xsd
index b199ee7..78f5e30 100644
--- a/daffodil-japi/src/test/resources/test/japi/mySchema1.dfdl.xsd
+++ b/daffodil-japi/src/test/resources/test/japi/mySchema1.dfdl.xsd
@@ -10,7 +10,7 @@
</appinfo>
</annotation>
- <include schemaLocation="edu/illinois/ncsa/daffodil/xsd/built-in-formats.xsd"/>
+ <include schemaLocation="org/apache/daffodil/xsd/built-in-formats.xsd"/>
<include schemaLocation="mySchema2.dfdl.xsd"/>
diff --git a/daffodil-japi/src/test/resources/test/japi/mySchema2.dfdl.xsd b/daffodil-japi/src/test/resources/test/japi/mySchema2.dfdl.xsd
index 2acb805..4bace6a 100644
--- a/daffodil-japi/src/test/resources/test/japi/mySchema2.dfdl.xsd
+++ b/daffodil-japi/src/test/resources/test/japi/mySchema2.dfdl.xsd
@@ -10,7 +10,7 @@
</appinfo>
</annotation>
- <include schemaLocation="edu/illinois/ncsa/daffodil/xsd/built-in-formats.xsd"/>
+ <include schemaLocation="org/apache/daffodil/xsd/built-in-formats.xsd"/>
<element name="e2" dfdl:lengthKind="delimited">
<simpleType>
diff --git a/daffodil-japi/src/test/resources/test/japi/mySchema3.dfdl.xsd b/daffodil-japi/src/test/resources/test/japi/mySchema3.dfdl.xsd
index d95aa7b..a9fdd1d 100644
--- a/daffodil-japi/src/test/resources/test/japi/mySchema3.dfdl.xsd
+++ b/daffodil-japi/src/test/resources/test/japi/mySchema3.dfdl.xsd
@@ -10,7 +10,7 @@
</appinfo>
</annotation>
- <include schemaLocation="edu/illinois/ncsa/daffodil/xsd/built-in-formats.xsd"/>
+ <include schemaLocation="org/apache/daffodil/xsd/built-in-formats.xsd"/>
<element name="e3" type="xsd:string" dfdl:lengthKind="explicit" dfdl:length="1"/>
<element name="e4" type="xsd:string" dfdl:lengthKind="explicit" dfdl:length="4"/>
diff --git a/daffodil-japi/src/test/resources/test/japi/mySchema4.dfdl.xsd b/daffodil-japi/src/test/resources/test/japi/mySchema4.dfdl.xsd
index 646cc0e..24edc6a 100644
--- a/daffodil-japi/src/test/resources/test/japi/mySchema4.dfdl.xsd
+++ b/daffodil-japi/src/test/resources/test/japi/mySchema4.dfdl.xsd
@@ -10,7 +10,7 @@
</appinfo>
</annotation>
- <include schemaLocation="edu/illinois/ncsa/daffodil/xsd/built-in-formats.xsd"/>
+ <include schemaLocation="org/apache/daffodil/xsd/built-in-formats.xsd"/>
<element name="e1">
<complexType>
diff --git a/daffodil-japi/src/test/resources/test/japi/mySchema5.dfdl.xsd b/daffodil-japi/src/test/resources/test/japi/mySchema5.dfdl.xsd
index 31622d7..ced86e1 100644
--- a/daffodil-japi/src/test/resources/test/japi/mySchema5.dfdl.xsd
+++ b/daffodil-japi/src/test/resources/test/japi/mySchema5.dfdl.xsd
@@ -10,7 +10,7 @@
</appinfo>
</annotation>
- <include schemaLocation="edu/illinois/ncsa/daffodil/xsd/built-in-formats.xsd"/>
+ <include schemaLocation="org/apache/daffodil/xsd/built-in-formats.xsd"/>
<element name="e1" dfdl:terminator="%NL;" type="tns:e1Type"/>
diff --git a/daffodil-japi/src/test/resources/test/japi/mySchemaWithVars.dfdl.xsd b/daffodil-japi/src/test/resources/test/japi/mySchemaWithVars.dfdl.xsd
index 6f7f15d..d006bc1 100644
--- a/daffodil-japi/src/test/resources/test/japi/mySchemaWithVars.dfdl.xsd
+++ b/daffodil-japi/src/test/resources/test/japi/mySchemaWithVars.dfdl.xsd
@@ -12,7 +12,7 @@
</appinfo>
</annotation>
- <include schemaLocation="edu/illinois/ncsa/daffodil/xsd/built-in-formats.xsd"/>
+ <include schemaLocation="org/apache/daffodil/xsd/built-in-formats.xsd"/>
<include schemaLocation="mySchema2.dfdl.xsd"/>
diff --git a/daffodil-lib/src/main/resources/daffodil-built-in-catalog.xml b/daffodil-lib/src/main/resources/daffodil-built-in-catalog.xml
index a2187d1..95b70d0 100644
--- a/daffodil-lib/src/main/resources/daffodil-built-in-catalog.xml
+++ b/daffodil-lib/src/main/resources/daffodil-built-in-catalog.xml
@@ -6,23 +6,23 @@
not obeying the pattern.
-->
<uri name="http://www.ibm.com/xmlns/dfdl/testData"
- uri="edu/illinois/ncsa/daffodil/xsd/tdml.xsd" />
- <uri name="http://www.ogf.org/dfdl/dfdl-1.0/" uri="edu/illinois/ncsa/daffodil/xsd/DFDL_part3_model.xsd" />
+ uri="org/apache/daffodil/xsd/tdml.xsd" />
+ <uri name="http://www.ogf.org/dfdl/dfdl-1.0/" uri="org/apache/daffodil/xsd/DFDL_part3_model.xsd" />
<!-- <uri name="http://www.ogf.org/dfdl/dfdl-1.0/XMLSchemaSubset"
- uri="edu/illinois/ncsa/daffodil/xsd/DFDLSubsetOfXMLSchema_v1_036.xsd" /> -->
+ uri="org/apache/daffodil/xsd/DFDLSubsetOfXMLSchema_v1_036.xsd" /> -->
<uri name="http://www.w3.org/2001/XMLSchema"
- uri="edu/illinois/ncsa/daffodil/xsd/XMLSchema_for_DFDL.xsd" />
+ uri="org/apache/daffodil/xsd/XMLSchema_for_DFDL.xsd" />
<uri name="http://www.w3.org/XML/1998/namespace"
- uri="edu/illinois/ncsa/daffodil/xsd/xml.xsd" />
+ uri="org/apache/daffodil/xsd/xml.xsd" />
<!--
Seems the format of catalogs doesn't allow spaces in the publicId.
I don't know if one can replace them with escape %20 stuff or not.
<public publicId="-//W3C//DTD XMLSCHEMA 200102//EN"
- uri="edu/illinois/ncsa/daffodil/xsd/XMLSchema.dtd" /> -->
+ uri="org/apache/daffodil/xsd/XMLSchema.dtd" /> -->
<public publicId="datatypes"
- uri="edu/illinois/ncsa/daffodil/xsd/datatypes.dtd" />
- <uri name="urn:ogf:dfdl:2013:imp:opensource.ncsa.illinois.edu:2012:int"
- uri="edu/illinois/ncsa/daffodil/xsd/dafint.xsd"/>
- <uri name="urn:ogf:dfdl:2013:imp:opensource.ncsa.illinois.edu:2012:ext"
- uri="edu/illinois/ncsa/daffodil/xsd/dafext.xsd"/>
+ uri="org/apache/daffodil/xsd/datatypes.dtd" />
+ <uri name="urn:ogf:dfdl:2013:imp:daffodil.apache.org:2018:int"
+ uri="org/apache/daffodil/xsd/dafint.xsd"/>
+ <uri name="urn:ogf:dfdl:2013:imp:daffodil.apache.org:2018:ext"
+ uri="org/apache/daffodil/xsd/dafext.xsd"/>
</catalog>
diff --git a/daffodil-lib/src/main/resources/eclipse-xml-catalog.xml b/daffodil-lib/src/main/resources/eclipse-xml-catalog.xml
index 639623e..0cd3cea 100644
--- a/daffodil-lib/src/main/resources/eclipse-xml-catalog.xml
+++ b/daffodil-lib/src/main/resources/eclipse-xml-catalog.xml
@@ -10,8 +10,8 @@
uri="platform:/resource/daffodil-lib/src/main/resources/xsd/XMLSchema.dtd" />
<public publicId="datatypes"
uri="platform:/resource/daffodil-lib/src/main/resources/xsd/datatypes.dtd" />
- <uri name="urn:ogf:dfdl:2013:imp:opensource.ncsa.illinois.edu:2012:ext"
+ <uri name="urn:ogf:dfdl:2013:imp:daffodil.apache.org:2018:ext"
uri="platform:/resource/daffodil-lib/src/main/resources/xsd/dafext.xsd" />
- <uri name="urn:ogf:dfdl:2013:imp:opensource.ncsa.illinois.edu:2012:int"
+ <uri name="urn:ogf:dfdl:2013:imp:daffodil.apache.org:2018:int"
uri="platform:/resource/daffodil-lib/src/main/resources/xsd/dafint.xsd" />
</catalog>
diff --git a/daffodil-lib/src/main/resources/org/apache/daffodil/xsd/XMLSchema_for_DFDL.xsd b/daffodil-lib/src/main/resources/org/apache/daffodil/xsd/XMLSchema_for_DFDL.xsd
index 6adcbda..629cf21 100644
--- a/daffodil-lib/src/main/resources/org/apache/daffodil/xsd/XMLSchema_for_DFDL.xsd
+++ b/daffodil-lib/src/main/resources/org/apache/daffodil/xsd/XMLSchema_for_DFDL.xsd
@@ -22,14 +22,14 @@ this to validate when we load a DFDL Schema.
xmlns:sub="http://www.w3.org/2001/XMLSchema"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/"
- xsi:schemaLocation="urn:ogf:dfdl:2013:imp:opensource.ncsa.illinois.edu:2012:int dafint.xsd">
+ xsi:schemaLocation="urn:ogf:dfdl:2013:imp:daffodil.apache.org:2018:int dafint.xsd">
<!-- Use the real URI for this, not the subset URI
"http://www.w3.org/2001/XMLSchema"
-->
<xsd:import namespace="http://www.ogf.org/dfdl/dfdl-1.0/" />
- <xsd:import namespace="urn:ogf:dfdl:2013:imp:opensource.ncsa.illinois.edu:2012:int"
+ <xsd:import namespace="urn:ogf:dfdl:2013:imp:daffodil.apache.org:2018:int"
schemaLocation="dafint.xsd"/>
<xsd:annotation>
@@ -583,8 +583,8 @@ this to validate when we load a DFDL Schema.
<!-- <xsd:anyAttribute
namespace="http://www.w3.org/XML/1998/namespace
- urn:ogf:dfdl:2013:imp:opensource.ncsa.illinois.edu:2012:int
- urn:ogf:dfdl:2013:imp:opensource.ncsa.illinois.edu:2012:ext
+ urn:ogf:dfdl:2013:imp:daffodil.apache.org:2018:int
+ urn:ogf:dfdl:2013:imp:daffodil.apache.org:2018:ext
http://www.ibm.com/schema/extensions"
processContents="lax"
/> -->
diff --git a/daffodil-lib/src/main/resources/org/apache/daffodil/xsd/dafint.xsd b/daffodil-lib/src/main/resources/org/apache/daffodil/xsd/dafint.xsd
index cef5bd0..d64d628 100644
--- a/daffodil-lib/src/main/resources/org/apache/daffodil/xsd/dafint.xsd
+++ b/daffodil-lib/src/main/resources/org/apache/daffodil/xsd/dafint.xsd
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
attributeFormDefault="unqualified" elementFormDefault="qualified"
- targetNamespace="urn:ogf:dfdl:2013:imp:opensource.ncsa.illinois.edu:2012:int"
- xmlns:dafint="urn:ogf:dfdl:2013:imp:opensource.ncsa.illinois.edu:2012:int"
+ targetNamespace="urn:ogf:dfdl:2013:imp:daffodil.apache.org:2018:int"
+ xmlns:dafint="urn:ogf:dfdl:2013:imp:daffodil.apache.org:2018:int"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<!--
This schema is for daffodil-specific internal use attribute definitions.
@@ -18,8 +18,8 @@
attributes -->
<xsd:anyAttribute
namespace="http://www.w3.org/XML/1998/namespace
- urn:ogf:dfdl:2013:imp:opensource.ncsa.illinois.edu:2012:int
- urn:ogf:dfdl:2013:imp:opensource.ncsa.illinois.edu:2012:ext" />
+ urn:ogf:dfdl:2013:imp:daffodil.apache.org:2018:int
+ urn:ogf:dfdl:2013:imp:daffodil.apache.org:2018:ext" />
</xsd:attributeGroup>
<xsd:element name="testElement">
diff --git a/daffodil-lib/src/main/resources/org/apache/daffodil/xsd/dfdl-config-format.xsd b/daffodil-lib/src/main/resources/org/apache/daffodil/xsd/dfdl-config-format.xsd
index 9d32b55..c1004b4 100644
--- a/daffodil-lib/src/main/resources/org/apache/daffodil/xsd/dfdl-config-format.xsd
+++ b/daffodil-lib/src/main/resources/org/apache/daffodil/xsd/dfdl-config-format.xsd
@@ -2,8 +2,8 @@
<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns="http://www.w3.org/2001/XMLSchema"
- targetNamespace="urn:ogf:dfdl:2013:imp:opensource.ncsa.illinois.edu:2012:ext"
- xmlns:tns="urn:ogf:dfdl:2013:imp:opensource.ncsa.illinois.edu:2012:ext"
+ targetNamespace="urn:ogf:dfdl:2013:imp:daffodil.apache.org:2018:ext"
+ xmlns:tns="urn:ogf:dfdl:2013:imp:daffodil.apache.org:2018:ext"
elementFormDefault="unqualified"
xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/daffodil-lib/src/main/resources/org/apache/daffodil/xsd/tdml.xsd b/daffodil-lib/src/main/resources/org/apache/daffodil/xsd/tdml.xsd
index cb488a9..4b6af71 100644
--- a/daffodil-lib/src/main/resources/org/apache/daffodil/xsd/tdml.xsd
+++ b/daffodil-lib/src/main/resources/org/apache/daffodil/xsd/tdml.xsd
@@ -6,15 +6,15 @@
xmlns:tns="http://www.ibm.com/xmlns/dfdl/testData"
elementFormDefault="unqualified"
xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/"
- xmlns:daf="urn:ogf:dfdl:2013:imp:opensource.ncsa.illinois.edu:2012:ext"
+ xmlns:daf="urn:ogf:dfdl:2013:imp:daffodil.apache.org:2018:ext"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.ogf.org/dfdl/dfdl-1.0/ edu/illinois/ncsa/daffodil/xsd/DFDL_part3_model.xsd
+ xsi:schemaLocation="http://www.ogf.org/dfdl/dfdl-1.0/ org/apache/daffodil/xsd/DFDL_part3_model.xsd
http://www.w3.org/2001/XMLSchema XMLSchema_for_DFDL.xsd
- urn:ogf:dfdl:2013:imp:opensource.ncsa.illinois.edu:2012:ext edu/illinois/ncsa/daffodil/xsd/dafext.xsd">
+ urn:ogf:dfdl:2013:imp:daffodil.apache.org:2018:ext org/apache/daffodil/xsd/dafext.xsd">
<xsd:import namespace="http://www.w3.org/2001/XMLSchema" schemaLocation="XMLSchema_for_DFDL.xsd"/>
- <xsd:import namespace="urn:ogf:dfdl:2013:imp:opensource.ncsa.illinois.edu:2012:ext" schemaLocation="edu/illinois/ncsa/daffodil/xsd/dafext.xsd"/>
- <xsd:import namespace="http://www.ogf.org/dfdl/dfdl-1.0/" schemaLocation="edu/illinois/ncsa/daffodil/xsd/DFDL_part3_model.xsd"/>
+ <xsd:import namespace="urn:ogf:dfdl:2013:imp:daffodil.apache.org:2018:ext" schemaLocation="org/apache/daffodil/xsd/dafext.xsd"/>
+ <xsd:import namespace="http://www.ogf.org/dfdl/dfdl-1.0/" schemaLocation="org/apache/daffodil/xsd/DFDL_part3_model.xsd"/>
<xs:attribute name="tutorialInclude" type="xs:string" fixed="no"/>
diff --git a/daffodil-lib/src/main/scala/org/apache/daffodil/ExecutionMode.scala b/daffodil-lib/src/main/scala/org/apache/daffodil/ExecutionMode.scala
index 6b107cf..15848ef 100644
--- a/daffodil-lib/src/main/scala/org/apache/daffodil/ExecutionMode.scala
+++ b/daffodil-lib/src/main/scala/org/apache/daffodil/ExecutionMode.scala
@@ -30,10 +30,10 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil
+package org.apache.daffodil
import scala.util.DynamicVariable
-import edu.illinois.ncsa.daffodil.exceptions.Assert
+import org.apache.daffodil.exceptions.Assert
/**
* This uses a scala DynamicVariable to create a dynamically scoped binding of
diff --git a/daffodil-lib/src/main/scala/org/apache/daffodil/Implicits.scala b/daffodil-lib/src/main/scala/org/apache/daffodil/Implicits.scala
index 7a25239..20491a4 100644
--- a/daffodil-lib/src/main/scala/org/apache/daffodil/Implicits.scala
+++ b/daffodil-lib/src/main/scala/org/apache/daffodil/Implicits.scala
@@ -30,12 +30,12 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil
+package org.apache.daffodil
import java.io.{ ByteArrayInputStream, BufferedInputStream }
-import edu.illinois.ncsa.daffodil.xml.NS
-import edu.illinois.ncsa.daffodil.exceptions.Assert
+import org.apache.daffodil.xml.NS
+import org.apache.daffodil.exceptions.Assert
import scala.language.reflectiveCalls
import scala.language.implicitConversions
import scala.language.{ implicitConversions, reflectiveCalls } // silences scala 2.10 warnings
diff --git a/daffodil-lib/src/main/scala/org/apache/daffodil/TypedEquality.scala b/daffodil-lib/src/main/scala/org/apache/daffodil/TypedEquality.scala
index 9d16299..c0a2256 100644
--- a/daffodil-lib/src/main/scala/org/apache/daffodil/TypedEquality.scala
+++ b/daffodil-lib/src/main/scala/org/apache/daffodil/TypedEquality.scala
@@ -30,10 +30,10 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil
+package org.apache.daffodil
import scala.annotation.implicitNotFound
-import edu.illinois.ncsa.daffodil.exceptions.Assert
+import org.apache.daffodil.exceptions.Assert
/**
* Strongly typed equality operators
diff --git a/daffodil-lib/src/main/scala/org/apache/daffodil/api/DaffodilSchemaSource.scala b/daffodil-lib/src/main/scala/org/apache/daffodil/api/DaffodilSchemaSource.scala
index 52999fb..0678418 100644
--- a/daffodil-lib/src/main/scala/org/apache/daffodil/api/DaffodilSchemaSource.scala
+++ b/daffodil-lib/src/main/scala/org/apache/daffodil/api/DaffodilSchemaSource.scala
@@ -30,17 +30,17 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.api
+package org.apache.daffodil.api
import org.xml.sax.InputSource
import java.net.URI
import scala.xml.Node
import java.io.FileInputStream
-import edu.illinois.ncsa.daffodil.xml.XMLUtils
+import org.apache.daffodil.xml.XMLUtils
import org.apache.commons.io.input.XmlStreamReader
import java.io.File
import java.nio.file.Paths
-import edu.illinois.ncsa.daffodil.exceptions.Assert
-import edu.illinois.ncsa.daffodil.equality._
+import org.apache.daffodil.exceptions.Assert
+import org.apache.daffodil.equality._
import java.nio.file.FileSystemNotFoundException
/**
diff --git a/daffodil-lib/src/main/scala/org/apache/daffodil/api/DaffodilTunables.scala b/daffodil-lib/src/main/scala/org/apache/daffodil/api/DaffodilTunables.scala
index 36f881c..27e4978 100644
--- a/daffodil-lib/src/main/scala/org/apache/daffodil/api/DaffodilTunables.scala
+++ b/daffodil-lib/src/main/scala/org/apache/daffodil/api/DaffodilTunables.scala
@@ -30,12 +30,12 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.api
+package org.apache.daffodil.api
-import edu.illinois.ncsa.daffodil.exceptions.Assert
-import edu.illinois.ncsa.daffodil.schema.annotation.props.gen.ParseUnparsePolicy
-import edu.illinois.ncsa.daffodil.util.LogLevel
-import edu.illinois.ncsa.daffodil.util.Logging
+import org.apache.daffodil.exceptions.Assert
+import org.apache.daffodil.schema.annotation.props.gen.ParseUnparsePolicy
+import org.apache.daffodil.util.LogLevel
+import org.apache.daffodil.util.Logging
object DaffodilTunables {
diff --git a/daffodil-lib/src/main/scala/org/apache/daffodil/api/DataStreamLimits.scala b/daffodil-lib/src/main/scala/org/apache/daffodil/api/DataStreamLimits.scala
index 403b4f2..13f1250 100644
--- a/daffodil-lib/src/main/scala/org/apache/daffodil/api/DataStreamLimits.scala
+++ b/daffodil-lib/src/main/scala/org/apache/daffodil/api/DataStreamLimits.scala
@@ -1,4 +1,4 @@
-package edu.illinois.ncsa.daffodil.api
+package org.apache.daffodil.api
trait DataStreamLimits {
def maximumSimpleElementSizeInBytes: Long
diff --git a/daffodil-lib/src/main/scala/org/apache/daffodil/api/Diagnostic.scala b/daffodil-lib/src/main/scala/org/apache/daffodil/api/Diagnostic.scala
index 604d178..3004f14 100644
--- a/daffodil-lib/src/main/scala/org/apache/daffodil/api/Diagnostic.scala
+++ b/daffodil-lib/src/main/scala/org/apache/daffodil/api/Diagnostic.scala
@@ -30,13 +30,13 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.api
+package org.apache.daffodil.api
-import edu.illinois.ncsa.daffodil.util.Misc
-import edu.illinois.ncsa.daffodil.exceptions.Assert
-import edu.illinois.ncsa.daffodil.util.Maybe
-import edu.illinois.ncsa.daffodil.exceptions.SchemaFileLocation
-import edu.illinois.ncsa.daffodil.exceptions.ThinThrowableWithCause
+import org.apache.daffodil.util.Misc
+import org.apache.daffodil.exceptions.Assert
+import org.apache.daffodil.util.Maybe
+import org.apache.daffodil.exceptions.SchemaFileLocation
+import org.apache.daffodil.exceptions.ThinThrowableWithCause
/**
* Base class for all error, warning, info, and other sorts of objects
diff --git a/daffodil-lib/src/main/scala/org/apache/daffodil/api/TunableLimitExceededError.scala b/daffodil-lib/src/main/scala/org/apache/daffodil/api/TunableLimitExceededError.scala
index a12c4cb..5ea1583 100644
--- a/daffodil-lib/src/main/scala/org/apache/daffodil/api/TunableLimitExceededError.scala
+++ b/daffodil-lib/src/main/scala/org/apache/daffodil/api/TunableLimitExceededError.scala
@@ -1,7 +1,7 @@
-package edu.illinois.ncsa.daffodil.api
+package org.apache.daffodil.api
-import edu.illinois.ncsa.daffodil.util.Maybe._
-import edu.illinois.ncsa.daffodil.util.Maybe
+import org.apache.daffodil.util.Maybe._
+import org.apache.daffodil.util.Maybe
/**
* Exceeding these limits is not a back-trackable parse error. It's more severe
diff --git a/daffodil-lib/src/main/scala/org/apache/daffodil/api/UnqualifiedPathStepPolicy.scala b/daffodil-lib/src/main/scala/org/apache/daffodil/api/UnqualifiedPathStepPolicy.scala
index a014269..78c2f68 100644
--- a/daffodil-lib/src/main/scala/org/apache/daffodil/api/UnqualifiedPathStepPolicy.scala
+++ b/daffodil-lib/src/main/scala/org/apache/daffodil/api/UnqualifiedPathStepPolicy.scala
@@ -1,6 +1,6 @@
-package edu.illinois.ncsa.daffodil.api
+package org.apache.daffodil.api
-import edu.illinois.ncsa.daffodil.util.Enum
+import org.apache.daffodil.util.Enum
/**
* Specified how unqualified path steps are resolved.
diff --git a/daffodil-lib/src/main/scala/org/apache/daffodil/api/ValidationMode.scala b/daffodil-lib/src/main/scala/org/apache/daffodil/api/ValidationMode.scala
index 399abff..6d7fc01 100644
--- a/daffodil-lib/src/main/scala/org/apache/daffodil/api/ValidationMode.scala
+++ b/daffodil-lib/src/main/scala/org/apache/daffodil/api/ValidationMode.scala
@@ -30,9 +30,9 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.api
+package org.apache.daffodil.api
-import edu.illinois.ncsa.daffodil.util.Enum
+import org.apache.daffodil.util.Enum
object ValidationMode extends Enum {
sealed abstract class Type protected (val mode: Int) extends EnumValueType with Ordered[Type] with Serializable {
diff --git a/daffodil-lib/src/main/scala/org/apache/daffodil/api/WarnID.scala b/daffodil-lib/src/main/scala/org/apache/daffodil/api/WarnID.scala
index 48a6e9e..b425b09 100644
--- a/daffodil-lib/src/main/scala/org/apache/daffodil/api/WarnID.scala
+++ b/daffodil-lib/src/main/scala/org/apache/daffodil/api/WarnID.scala
@@ -1,8 +1,8 @@
-package edu.illinois.ncsa.daffodil.api
+package org.apache.daffodil.api
-import edu.illinois.ncsa.daffodil.exceptions.ThrowsSDE
-import edu.illinois.ncsa.daffodil.exceptions.Assert
-import edu.illinois.ncsa.daffodil.schema.annotation.props.{ Enum => PropsEnum }
+import org.apache.daffodil.exceptions.ThrowsSDE
+import org.apache.daffodil.exceptions.Assert
+import org.apache.daffodil.schema.annotation.props.{ Enum => PropsEnum }
sealed trait WarnID extends WarnID.Value
diff --git a/daffodil-lib/src/main/scala/org/apache/daffodil/cookers/Converter.scala b/daffodil-lib/src/main/scala/org/apache/daffodil/cookers/Converter.scala
index eb64df0..1c6b0f9 100644
--- a/daffodil-lib/src/main/scala/org/apache/daffodil/cookers/Converter.scala
+++ b/daffodil-lib/src/main/scala/org/apache/daffodil/cookers/Converter.scala
@@ -30,9 +30,9 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.cookers
+package org.apache.daffodil.cookers
-import edu.illinois.ncsa.daffodil.exceptions.ThrowsSDE
+import org.apache.daffodil.exceptions.ThrowsSDE
/*
* Quick tutorial on -Before +After.
diff --git a/daffodil-lib/src/main/scala/org/apache/daffodil/cookers/Cookers.scala b/daffodil-lib/src/main/scala/org/apache/daffodil/cookers/Cookers.scala
index a7f1544..d570825 100644
--- a/daffodil-lib/src/main/scala/org/apache/daffodil/cookers/Cookers.scala
+++ b/daffodil-lib/src/main/scala/org/apache/daffodil/cookers/Cookers.scala
@@ -30,7 +30,7 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.cookers
+package org.apache.daffodil.cookers
object TextStandardInfinityRepCooker extends StringLiteralNonEmptyNoCharClassEntitiesNoByteEntities()
diff --git a/daffodil-lib/src/main/scala/org/apache/daffodil/cookers/EntityReplacer.scala b/daffodil-lib/src/main/scala/org/apache/daffodil/cookers/EntityReplacer.scala
index c98fe66..0aee262 100644
--- a/daffodil-lib/src/main/scala/org/apache/daffodil/cookers/EntityReplacer.scala
+++ b/daffodil-lib/src/main/scala/org/apache/daffodil/cookers/EntityReplacer.scala
@@ -30,16 +30,16 @@
* SOFTWARE.
*/
-package edu.illinois.ncsa.daffodil.cookers
+package org.apache.daffodil.cookers
import java.util.regex.Matcher
import java.util.regex.Pattern
-import edu.illinois.ncsa.daffodil.exceptions.Assert
+import org.apache.daffodil.exceptions.Assert
import java.lang.Byte
-import edu.illinois.ncsa.daffodil.equality._
-import edu.illinois.ncsa.daffodil.exceptions.ThrowsSDE
-import edu.illinois.ncsa.daffodil.util.Misc
-import edu.illinois.ncsa.daffodil.util.Maybe
+import org.apache.daffodil.equality._
+import org.apache.daffodil.exceptions.ThrowsSDE
+import org.apache.daffodil.util.Misc
+import org.apache.daffodil.util.Maybe
import scala.collection.mutable.ListBuffer
... 13911 lines suppressed ...
--
To stop receiving notification emails like this one, please contact
slawrence@apache.org.