From 7e60ba257c4fbd8c429d05604a8f03ce520a7923 Mon Sep 17 00:00:00 2001 From: "Michael R. Crusoe" Date: Fri, 31 Oct 2025 16:24:54 +0100 Subject: [PATCH] rename package to a namespace that we control --- README.md | 2 +- adding_new_cwl_versions.txt | 4 +- pom.xml | 6 +- .../cwl => commonwl/cwlsdk}/cwl1_1/Any.java | 4 +- .../cwlsdk}/cwl1_1/ArraySchema.java | 9 +- .../cwlsdk/cwl1_1}/ArraySchemaImpl.java | 26 ++- .../cwlsdk/cwl1_1}/Array_name.java | 4 +- .../cwlsdk/cwl1_1}/CWLArraySchema.java | 9 +- .../cwlsdk}/cwl1_1/CWLArraySchemaImpl.java | 26 ++- .../cwlsdk}/cwl1_1/CWLRecordField.java | 9 +- .../cwlsdk/cwl1_1}/CWLRecordFieldImpl.java | 26 ++- .../cwlsdk/cwl1_1}/CWLRecordSchema.java | 9 +- .../cwlsdk/cwl1_1}/CWLRecordSchemaImpl.java | 26 ++- .../cwlsdk}/cwl1_1/CWLType.java | 4 +- .../cwlsdk}/cwl1_1/CWLVersion.java | 4 +- .../cwl1_1}/CommandInputArraySchema.java | 9 +- .../cwl1_1}/CommandInputArraySchemaImpl.java | 26 ++- .../cwl1_1}/CommandInputEnumSchema.java | 9 +- .../cwl1_1}/CommandInputEnumSchemaImpl.java | 26 ++- .../cwlsdk}/cwl1_1/CommandInputParameter.java | 9 +- .../cwl1_1/CommandInputParameterImpl.java | 26 ++- .../cwl1_1/CommandInputRecordField.java | 9 +- .../cwl1_1/CommandInputRecordFieldImpl.java | 26 ++- .../cwl1_1}/CommandInputRecordSchema.java | 9 +- .../cwl1_1}/CommandInputRecordSchemaImpl.java | 26 ++- .../cwlsdk}/cwl1_1/CommandInputSchema.java | 9 +- .../cwlsdk}/cwl1_1/CommandLineBindable.java | 9 +- .../cwl1_1/CommandLineBindableImpl.java | 26 ++- .../cwlsdk}/cwl1_1/CommandLineBinding.java | 9 +- .../cwl1_1/CommandLineBindingImpl.java | 26 ++- .../cwlsdk}/cwl1_1/CommandLineTool.java | 9 +- .../cwlsdk}/cwl1_1/CommandLineToolImpl.java | 26 ++- .../cwlsdk/cwl1_1}/CommandLineTool_class.java | 4 +- .../cwl1_1/CommandOutputArraySchema.java | 9 +- .../cwl1_1/CommandOutputArraySchemaImpl.java | 26 ++- .../cwlsdk}/cwl1_1/CommandOutputBinding.java | 9 +- .../cwl1_1/CommandOutputBindingImpl.java | 26 ++- .../cwl1_1}/CommandOutputEnumSchema.java | 9 +- .../cwl1_1}/CommandOutputEnumSchemaImpl.java | 26 ++- .../cwl1_1}/CommandOutputParameter.java | 9 +- .../cwl1_1/CommandOutputParameterImpl.java | 26 ++- .../cwl1_1}/CommandOutputRecordField.java | 9 +- .../cwl1_1/CommandOutputRecordFieldImpl.java | 26 ++- .../cwl1_1}/CommandOutputRecordSchema.java | 9 +- .../cwl1_1/CommandOutputRecordSchemaImpl.java | 26 ++- .../cwlsdk}/cwl1_1/Directory.java | 9 +- .../cwlsdk}/cwl1_1/DirectoryImpl.java | 26 ++- .../cwlsdk}/cwl1_1/Directory_class.java | 4 +- .../cwlsdk}/cwl1_1/Dirent.java | 9 +- .../cwlsdk}/cwl1_1/DirentImpl.java | 26 ++- .../cwlsdk}/cwl1_1/DockerRequirement.java | 9 +- .../cwlsdk}/cwl1_1/DockerRequirementImpl.java | 26 ++- .../cwl1_1/DockerRequirement_class.java | 4 +- .../cwlsdk}/cwl1_1/Documented.java | 9 +- .../cwlsdk/cwl1_1}/EnumSchema.java | 9 +- .../cwlsdk}/cwl1_1/EnumSchemaImpl.java | 26 ++- .../cwlsdk/cwl1_1}/Enum_name.java | 4 +- .../cwlsdk}/cwl1_1/EnvVarRequirement.java | 9 +- .../cwlsdk}/cwl1_1/EnvVarRequirementImpl.java | 26 ++- .../cwl1_1/EnvVarRequirement_class.java | 4 +- .../cwlsdk/cwl1_1}/EnvironmentDef.java | 9 +- .../cwlsdk/cwl1_1}/EnvironmentDefImpl.java | 26 ++- .../cwlsdk}/cwl1_1/Expression.java | 4 +- .../cwlsdk}/cwl1_1/ExpressionTool.java | 9 +- .../cwlsdk}/cwl1_1/ExpressionToolImpl.java | 26 ++- .../cwl1_1/ExpressionToolOutputParameter.java | 9 +- .../ExpressionToolOutputParameterImpl.java | 26 ++- .../cwlsdk}/cwl1_1/ExpressionTool_class.java | 4 +- .../cwlsdk}/cwl1_1/FieldBase.java | 9 +- .../cwl => commonwl/cwlsdk}/cwl1_1/File.java | 9 +- .../cwlsdk}/cwl1_1/FileImpl.java | 26 ++- .../cwlsdk/cwl1_1}/File_class.java | 4 +- .../cwlsdk/cwl1_1}/IOSchema.java | 9 +- .../cwlsdk/cwl1_1}/Identified.java | 9 +- .../cwl1_1/InitialWorkDirRequirement.java | 9 +- .../cwl1_1/InitialWorkDirRequirementImpl.java | 26 ++- .../InitialWorkDirRequirement_class.java | 4 +- .../cwl1_1/InlineJavascriptRequirement.java | 9 +- .../InlineJavascriptRequirementImpl.java | 26 ++- .../InlineJavascriptRequirement_class.java | 4 +- .../cwl1_1/InplaceUpdateRequirement.java | 9 +- .../cwl1_1/InplaceUpdateRequirementImpl.java | 26 ++- .../InplaceUpdateRequirement_class.java | 4 +- .../cwlsdk/cwl1_1}/InputArraySchema.java | 9 +- .../cwlsdk}/cwl1_1/InputArraySchemaImpl.java | 26 ++- .../cwlsdk}/cwl1_1/InputBinding.java | 9 +- .../cwlsdk}/cwl1_1/InputBindingImpl.java | 26 ++- .../cwlsdk/cwl1_1}/InputEnumSchema.java | 9 +- .../cwlsdk}/cwl1_1/InputEnumSchemaImpl.java | 26 ++- .../cwlsdk}/cwl1_1/InputFormat.java | 9 +- .../cwlsdk}/cwl1_1/InputParameter.java | 9 +- .../cwlsdk}/cwl1_1/InputRecordField.java | 9 +- .../cwlsdk}/cwl1_1/InputRecordFieldImpl.java | 26 ++- .../cwlsdk/cwl1_1}/InputRecordSchema.java | 9 +- .../cwlsdk/cwl1_1}/InputRecordSchemaImpl.java | 26 ++- .../cwlsdk/cwl1_1}/InputSchema.java | 9 +- .../cwlsdk}/cwl1_1/Labeled.java | 9 +- .../cwlsdk}/cwl1_1/LinkMergeMethod.java | 4 +- .../cwlsdk}/cwl1_1/LoadContents.java | 9 +- .../cwlsdk/cwl1_1}/LoadListingEnum.java | 4 +- .../cwl1_1/LoadListingRequirement.java | 9 +- .../cwl1_1}/LoadListingRequirementImpl.java | 26 ++- .../cwl1_1/LoadListingRequirement_class.java | 4 +- .../cwlsdk}/cwl1_1/MapSchema.java | 9 +- .../cwlsdk/cwl1_1}/MapSchemaImpl.java | 26 ++- .../cwlsdk/cwl1_1}/Map_name.java | 4 +- .../MultipleInputFeatureRequirement.java | 9 +- .../MultipleInputFeatureRequirementImpl.java | 26 ++- ...MultipleInputFeatureRequirement_class.java | 4 +- .../cwlsdk}/cwl1_1/NetworkAccess.java | 9 +- .../cwlsdk}/cwl1_1/NetworkAccessImpl.java | 26 ++- .../cwlsdk}/cwl1_1/NetworkAccess_class.java | 4 +- .../cwlsdk/cwl1_1}/OutputArraySchema.java | 9 +- .../cwlsdk/cwl1_1}/OutputArraySchemaImpl.java | 26 ++- .../cwlsdk/cwl1_1}/OutputEnumSchema.java | 9 +- .../cwlsdk/cwl1_1}/OutputEnumSchemaImpl.java | 26 ++- .../cwlsdk}/cwl1_1/OutputFormat.java | 9 +- .../cwlsdk/cwl1_1}/OutputParameter.java | 9 +- .../cwlsdk/cwl1_1}/OutputRecordField.java | 9 +- .../cwlsdk/cwl1_1}/OutputRecordFieldImpl.java | 26 ++- .../cwlsdk/cwl1_1}/OutputRecordSchema.java | 9 +- .../cwl1_1/OutputRecordSchemaImpl.java | 26 ++- .../cwlsdk/cwl1_1}/OutputSchema.java | 9 +- .../cwlsdk/cwl1_1}/Parameter.java | 9 +- .../cwlsdk}/cwl1_1/PrimitiveType.java | 4 +- .../cwlsdk}/cwl1_1/Process.java | 9 +- .../cwlsdk}/cwl1_1/ProcessRequirement.java | 9 +- .../cwlsdk/cwl1_1}/RecordField.java | 9 +- .../cwlsdk}/cwl1_1/RecordFieldImpl.java | 26 ++- .../cwlsdk/cwl1_1}/RecordSchema.java | 9 +- .../cwlsdk}/cwl1_1/RecordSchemaImpl.java | 26 ++- .../cwlsdk}/cwl1_1/Record_name.java | 4 +- .../cwlsdk}/cwl1_1/ResourceRequirement.java | 9 +- .../cwl1_1/ResourceRequirementImpl.java | 26 ++- .../cwl1_1/ResourceRequirement_class.java | 4 +- .../cwl1_1}/ScatterFeatureRequirement.java | 9 +- .../cwl1_1/ScatterFeatureRequirementImpl.java | 26 ++- .../ScatterFeatureRequirement_class.java | 4 +- .../cwlsdk}/cwl1_1/ScatterMethod.java | 4 +- .../cwlsdk}/cwl1_1/SchemaDefRequirement.java | 9 +- .../cwl1_1/SchemaDefRequirementImpl.java | 26 ++- .../cwl1_1/SchemaDefRequirement_class.java | 4 +- .../cwlsdk}/cwl1_1/SecondaryFileSchema.java | 9 +- .../cwl1_1/SecondaryFileSchemaImpl.java | 26 ++- .../cwl1_1/ShellCommandRequirement.java | 9 +- .../cwl1_1/ShellCommandRequirementImpl.java | 26 ++- .../cwl1_1/ShellCommandRequirement_class.java | 4 +- .../cwl => commonwl/cwlsdk}/cwl1_1/Sink.java | 9 +- .../cwlsdk}/cwl1_1/SoftwarePackage.java | 9 +- .../cwlsdk}/cwl1_1/SoftwarePackageImpl.java | 26 ++- .../cwlsdk}/cwl1_1/SoftwareRequirement.java | 9 +- .../cwl1_1}/SoftwareRequirementImpl.java | 26 ++- .../cwl1_1/SoftwareRequirement_class.java | 4 +- .../StepInputExpressionRequirement.java | 9 +- .../StepInputExpressionRequirementImpl.java | 26 ++- .../StepInputExpressionRequirement_class.java | 4 +- .../SubworkflowFeatureRequirement.java | 9 +- .../SubworkflowFeatureRequirementImpl.java | 26 ++- .../SubworkflowFeatureRequirement_class.java | 4 +- .../cwlsdk}/cwl1_1/ToolTimeLimit.java | 9 +- .../cwlsdk}/cwl1_1/ToolTimeLimitImpl.java | 26 ++- .../cwlsdk}/cwl1_1/ToolTimeLimit_class.java | 4 +- .../cwlsdk}/cwl1_1/UnionSchema.java | 9 +- .../cwlsdk/cwl1_1}/UnionSchemaImpl.java | 26 ++- .../cwlsdk}/cwl1_1/Union_name.java | 4 +- .../cwlsdk}/cwl1_1/WorkReuse.java | 9 +- .../cwlsdk}/cwl1_1/WorkReuseImpl.java | 26 ++- .../cwlsdk}/cwl1_1/WorkReuse_class.java | 4 +- .../cwlsdk}/cwl1_1/Workflow.java | 9 +- .../cwlsdk}/cwl1_1/WorkflowImpl.java | 26 ++- .../cwl1_1/WorkflowInputParameter.java | 9 +- .../cwl1_1/WorkflowInputParameterImpl.java | 26 ++- .../cwl1_1/WorkflowOutputParameter.java | 9 +- .../cwl1_1/WorkflowOutputParameterImpl.java | 26 ++- .../cwlsdk}/cwl1_1/WorkflowStep.java | 9 +- .../cwlsdk}/cwl1_1/WorkflowStepImpl.java | 26 ++- .../cwlsdk}/cwl1_1/WorkflowStepInput.java | 9 +- .../cwlsdk}/cwl1_1/WorkflowStepInputImpl.java | 26 ++- .../cwlsdk}/cwl1_1/WorkflowStepOutput.java | 9 +- .../cwl1_1}/WorkflowStepOutputImpl.java | 26 ++- .../cwlsdk}/cwl1_1/Workflow_class.java | 4 +- .../cwlsdk}/cwl1_1/package.html | 0 .../cwlsdk/cwl1_1}/stderr.java | 4 +- .../cwlsdk/cwl1_1}/stdin.java | 4 +- .../cwlsdk}/cwl1_1/stdout.java | 4 +- .../cwlsdk}/cwl1_1/utils/AnyLoader.java | 2 +- .../cwlsdk}/cwl1_1/utils/ArrayLoader.java | 2 +- .../cwlsdk}/cwl1_1/utils/ConstantMaps.java | 2 +- .../cwlsdk/cwl1_1}/utils/DefaultFetcher.java | 2 +- .../cwlsdk}/cwl1_1/utils/EnumLoader.java | 2 +- .../cwl1_1}/utils/ExpressionLoader.java | 2 +- .../cwlsdk}/cwl1_1/utils/Fetcher.java | 2 +- .../cwlsdk}/cwl1_1/utils/IdMapLoader.java | 2 +- .../cwlsdk/cwl1_1}/utils/Loader.java | 2 +- .../cwlsdk}/cwl1_1/utils/LoaderInstances.java | 164 ++++++++--------- .../cwlsdk}/cwl1_1/utils/LoadingOptions.java | 4 +- .../cwl1_1/utils/LoadingOptionsBuilder.java | 2 +- .../cwlsdk}/cwl1_1/utils/MapLoader.java | 2 +- .../cwlsdk/cwl1_1}/utils/NullLoader.java | 2 +- .../cwlsdk/cwl1_1}/utils/OneOrListOf.java | 2 +- .../cwl1_1/utils/OneOrListOfLoader.java | 2 +- .../cwlsdk/cwl1_1}/utils/OptionalLoader.java | 2 +- .../cwlsdk/cwl1_1}/utils/PrimitiveLoader.java | 2 +- .../cwlsdk}/cwl1_1/utils/RecordLoader.java | 2 +- .../cwlsdk}/cwl1_1/utils/RootLoader.java | 2 +- .../cwlsdk/cwl1_1}/utils/Saveable.java | 2 +- .../cwlsdk}/cwl1_1/utils/SaveableImpl.java | 2 +- .../utils/SecondaryFilesDslLoader.java | 2 +- .../cwlsdk/cwl1_1}/utils/TypeDslLoader.java | 2 +- .../cwlsdk/cwl1_1}/utils/UnionLoader.java | 2 +- .../cwlsdk}/cwl1_1/utils/UriLoader.java | 2 +- .../cwlsdk}/cwl1_1/utils/Uris.java | 2 +- .../cwl1_1}/utils/ValidationException.java | 2 +- .../cwlsdk/cwl1_1}/utils/Validator.java | 2 +- .../cwlsdk/cwl1_1}/utils/YamlUtils.java | 2 +- .../cwlsdk}/cwl1_1/utils/package.html | 2 +- .../cwl => commonwl/cwlsdk}/cwl1_2/Any.java | 4 +- .../cwlsdk}/cwl1_2/ArraySchema.java | 9 +- .../cwlsdk/cwl1_2}/ArraySchemaImpl.java | 26 ++- .../cwlsdk/cwl1_2}/Array_name.java | 4 +- .../cwlsdk/cwl1_2}/CWLArraySchema.java | 9 +- .../cwlsdk}/cwl1_2/CWLArraySchemaImpl.java | 26 ++- .../cwlsdk}/cwl1_2/CWLRecordField.java | 9 +- .../cwlsdk/cwl1_2}/CWLRecordFieldImpl.java | 26 ++- .../cwlsdk/cwl1_2}/CWLRecordSchema.java | 9 +- .../cwlsdk/cwl1_2}/CWLRecordSchemaImpl.java | 26 ++- .../cwlsdk}/cwl1_2/CWLType.java | 4 +- .../cwlsdk}/cwl1_2/CWLVersion.java | 4 +- .../cwl1_2}/CommandInputArraySchema.java | 9 +- .../cwl1_2}/CommandInputArraySchemaImpl.java | 26 ++- .../cwl1_2}/CommandInputEnumSchema.java | 9 +- .../cwl1_2}/CommandInputEnumSchemaImpl.java | 26 ++- .../cwlsdk}/cwl1_2/CommandInputParameter.java | 9 +- .../cwl1_2/CommandInputParameterImpl.java | 26 ++- .../cwl1_2/CommandInputRecordField.java | 9 +- .../cwl1_2/CommandInputRecordFieldImpl.java | 26 ++- .../cwl1_2}/CommandInputRecordSchema.java | 9 +- .../cwl1_2}/CommandInputRecordSchemaImpl.java | 26 ++- .../cwlsdk}/cwl1_2/CommandInputSchema.java | 9 +- .../cwlsdk}/cwl1_2/CommandLineBindable.java | 9 +- .../cwl1_2/CommandLineBindableImpl.java | 26 ++- .../cwlsdk}/cwl1_2/CommandLineBinding.java | 9 +- .../cwl1_2/CommandLineBindingImpl.java | 26 ++- .../cwlsdk}/cwl1_2/CommandLineTool.java | 9 +- .../cwlsdk}/cwl1_2/CommandLineToolImpl.java | 26 ++- .../cwlsdk/cwl1_2}/CommandLineTool_class.java | 4 +- .../cwl1_2/CommandOutputArraySchema.java | 9 +- .../cwl1_2/CommandOutputArraySchemaImpl.java | 26 ++- .../cwlsdk}/cwl1_2/CommandOutputBinding.java | 9 +- .../cwl1_2/CommandOutputBindingImpl.java | 26 ++- .../cwl1_2}/CommandOutputEnumSchema.java | 9 +- .../cwl1_2}/CommandOutputEnumSchemaImpl.java | 26 ++- .../cwl1_2}/CommandOutputParameter.java | 9 +- .../cwl1_2/CommandOutputParameterImpl.java | 26 ++- .../cwl1_2}/CommandOutputRecordField.java | 9 +- .../cwl1_2/CommandOutputRecordFieldImpl.java | 26 ++- .../cwl1_2}/CommandOutputRecordSchema.java | 9 +- .../cwl1_2/CommandOutputRecordSchemaImpl.java | 26 ++- .../cwlsdk}/cwl1_2/Directory.java | 9 +- .../cwlsdk}/cwl1_2/DirectoryImpl.java | 26 ++- .../cwlsdk}/cwl1_2/Directory_class.java | 4 +- .../cwlsdk}/cwl1_2/Dirent.java | 9 +- .../cwlsdk}/cwl1_2/DirentImpl.java | 26 ++- .../cwlsdk}/cwl1_2/DockerRequirement.java | 9 +- .../cwlsdk}/cwl1_2/DockerRequirementImpl.java | 26 ++- .../cwl1_2/DockerRequirement_class.java | 4 +- .../cwlsdk}/cwl1_2/Documented.java | 9 +- .../cwlsdk/cwl1_2}/EnumSchema.java | 9 +- .../cwlsdk}/cwl1_2/EnumSchemaImpl.java | 26 ++- .../cwlsdk/cwl1_2}/Enum_name.java | 4 +- .../cwlsdk}/cwl1_2/EnvVarRequirement.java | 9 +- .../cwlsdk}/cwl1_2/EnvVarRequirementImpl.java | 26 ++- .../cwl1_2/EnvVarRequirement_class.java | 4 +- .../cwlsdk/cwl1_2}/EnvironmentDef.java | 9 +- .../cwlsdk/cwl1_2}/EnvironmentDefImpl.java | 26 ++- .../cwlsdk}/cwl1_2/Expression.java | 4 +- .../cwlsdk}/cwl1_2/ExpressionTool.java | 9 +- .../cwlsdk}/cwl1_2/ExpressionToolImpl.java | 26 ++- .../cwl1_2/ExpressionToolOutputParameter.java | 9 +- .../ExpressionToolOutputParameterImpl.java | 26 ++- .../cwlsdk}/cwl1_2/ExpressionTool_class.java | 4 +- .../cwlsdk}/cwl1_2/FieldBase.java | 9 +- .../cwl => commonwl/cwlsdk}/cwl1_2/File.java | 9 +- .../cwlsdk}/cwl1_2/FileImpl.java | 26 ++- .../cwlsdk/cwl1_2}/File_class.java | 4 +- .../cwlsdk/cwl1_2}/IOSchema.java | 9 +- .../cwlsdk/cwl1_2}/Identified.java | 9 +- .../cwl1_2/InitialWorkDirRequirement.java | 9 +- .../cwl1_2/InitialWorkDirRequirementImpl.java | 26 ++- .../InitialWorkDirRequirement_class.java | 4 +- .../cwl1_2/InlineJavascriptRequirement.java | 9 +- .../InlineJavascriptRequirementImpl.java | 26 ++- .../InlineJavascriptRequirement_class.java | 4 +- .../cwl1_2/InplaceUpdateRequirement.java | 9 +- .../cwl1_2/InplaceUpdateRequirementImpl.java | 26 ++- .../InplaceUpdateRequirement_class.java | 4 +- .../cwlsdk/cwl1_2}/InputArraySchema.java | 9 +- .../cwlsdk}/cwl1_2/InputArraySchemaImpl.java | 26 ++- .../cwlsdk}/cwl1_2/InputBinding.java | 9 +- .../cwlsdk}/cwl1_2/InputBindingImpl.java | 26 ++- .../cwlsdk/cwl1_2}/InputEnumSchema.java | 9 +- .../cwlsdk}/cwl1_2/InputEnumSchemaImpl.java | 26 ++- .../cwlsdk}/cwl1_2/InputFormat.java | 9 +- .../cwlsdk}/cwl1_2/InputParameter.java | 9 +- .../cwlsdk}/cwl1_2/InputRecordField.java | 9 +- .../cwlsdk}/cwl1_2/InputRecordFieldImpl.java | 26 ++- .../cwlsdk/cwl1_2}/InputRecordSchema.java | 9 +- .../cwlsdk/cwl1_2}/InputRecordSchemaImpl.java | 26 ++- .../cwlsdk/cwl1_2}/InputSchema.java | 9 +- .../cwlsdk}/cwl1_2/Labeled.java | 9 +- .../cwlsdk}/cwl1_2/LinkMergeMethod.java | 4 +- .../cwlsdk}/cwl1_2/LoadContents.java | 9 +- .../cwlsdk/cwl1_2}/LoadListingEnum.java | 4 +- .../cwl1_2/LoadListingRequirement.java | 9 +- .../cwl1_2}/LoadListingRequirementImpl.java | 26 ++- .../cwl1_2/LoadListingRequirement_class.java | 4 +- .../cwlsdk}/cwl1_2/MapSchema.java | 9 +- .../cwlsdk/cwl1_2}/MapSchemaImpl.java | 26 ++- .../cwlsdk/cwl1_2}/Map_name.java | 4 +- .../MultipleInputFeatureRequirement.java | 9 +- .../MultipleInputFeatureRequirementImpl.java | 26 ++- ...MultipleInputFeatureRequirement_class.java | 4 +- .../cwlsdk}/cwl1_2/NetworkAccess.java | 9 +- .../cwlsdk}/cwl1_2/NetworkAccessImpl.java | 26 ++- .../cwlsdk}/cwl1_2/NetworkAccess_class.java | 4 +- .../cwlsdk}/cwl1_2/Operation.java | 9 +- .../cwlsdk}/cwl1_2/OperationImpl.java | 26 ++- .../cwl1_2/OperationInputParameter.java | 9 +- .../cwl1_2/OperationInputParameterImpl.java | 26 ++- .../cwl1_2/OperationOutputParameter.java | 9 +- .../cwl1_2/OperationOutputParameterImpl.java | 26 ++- .../cwlsdk}/cwl1_2/Operation_class.java | 4 +- .../cwlsdk/cwl1_2}/OutputArraySchema.java | 9 +- .../cwlsdk/cwl1_2}/OutputArraySchemaImpl.java | 26 ++- .../cwlsdk/cwl1_2}/OutputEnumSchema.java | 9 +- .../cwlsdk/cwl1_2}/OutputEnumSchemaImpl.java | 26 ++- .../cwlsdk}/cwl1_2/OutputFormat.java | 9 +- .../cwlsdk/cwl1_2}/OutputParameter.java | 9 +- .../cwlsdk/cwl1_2}/OutputRecordField.java | 9 +- .../cwlsdk/cwl1_2}/OutputRecordFieldImpl.java | 26 ++- .../cwlsdk/cwl1_2}/OutputRecordSchema.java | 9 +- .../cwl1_2/OutputRecordSchemaImpl.java | 26 ++- .../cwlsdk/cwl1_2}/OutputSchema.java | 9 +- .../cwlsdk/cwl1_2}/Parameter.java | 9 +- .../cwlsdk}/cwl1_2/PickValueMethod.java | 4 +- .../cwlsdk}/cwl1_2/PrimitiveType.java | 4 +- .../cwlsdk}/cwl1_2/Process.java | 9 +- .../cwlsdk}/cwl1_2/ProcessRequirement.java | 9 +- .../cwlsdk/cwl1_2}/RecordField.java | 9 +- .../cwlsdk}/cwl1_2/RecordFieldImpl.java | 26 ++- .../cwlsdk/cwl1_2}/RecordSchema.java | 9 +- .../cwlsdk}/cwl1_2/RecordSchemaImpl.java | 26 ++- .../cwlsdk}/cwl1_2/Record_name.java | 4 +- .../cwlsdk}/cwl1_2/ResourceRequirement.java | 9 +- .../cwl1_2/ResourceRequirementImpl.java | 26 ++- .../cwl1_2/ResourceRequirement_class.java | 4 +- .../cwl1_2}/ScatterFeatureRequirement.java | 9 +- .../cwl1_2/ScatterFeatureRequirementImpl.java | 26 ++- .../ScatterFeatureRequirement_class.java | 4 +- .../cwlsdk}/cwl1_2/ScatterMethod.java | 4 +- .../cwlsdk}/cwl1_2/SchemaDefRequirement.java | 9 +- .../cwl1_2/SchemaDefRequirementImpl.java | 26 ++- .../cwl1_2/SchemaDefRequirement_class.java | 4 +- .../cwlsdk}/cwl1_2/SecondaryFileSchema.java | 9 +- .../cwl1_2/SecondaryFileSchemaImpl.java | 26 ++- .../cwl1_2/ShellCommandRequirement.java | 9 +- .../cwl1_2/ShellCommandRequirementImpl.java | 26 ++- .../cwl1_2/ShellCommandRequirement_class.java | 4 +- .../cwl => commonwl/cwlsdk}/cwl1_2/Sink.java | 9 +- .../cwlsdk}/cwl1_2/SoftwarePackage.java | 9 +- .../cwlsdk}/cwl1_2/SoftwarePackageImpl.java | 26 ++- .../cwlsdk}/cwl1_2/SoftwareRequirement.java | 9 +- .../cwl1_2}/SoftwareRequirementImpl.java | 26 ++- .../cwl1_2/SoftwareRequirement_class.java | 4 +- .../StepInputExpressionRequirement.java | 9 +- .../StepInputExpressionRequirementImpl.java | 26 ++- .../StepInputExpressionRequirement_class.java | 4 +- .../SubworkflowFeatureRequirement.java | 9 +- .../SubworkflowFeatureRequirementImpl.java | 26 ++- .../SubworkflowFeatureRequirement_class.java | 4 +- .../cwlsdk}/cwl1_2/ToolTimeLimit.java | 9 +- .../cwlsdk}/cwl1_2/ToolTimeLimitImpl.java | 26 ++- .../cwlsdk}/cwl1_2/ToolTimeLimit_class.java | 4 +- .../cwlsdk}/cwl1_2/UnionSchema.java | 9 +- .../cwlsdk/cwl1_2}/UnionSchemaImpl.java | 26 ++- .../cwlsdk}/cwl1_2/Union_name.java | 4 +- .../cwlsdk}/cwl1_2/WorkReuse.java | 9 +- .../cwlsdk}/cwl1_2/WorkReuseImpl.java | 26 ++- .../cwlsdk}/cwl1_2/WorkReuse_class.java | 4 +- .../cwlsdk}/cwl1_2/Workflow.java | 9 +- .../cwlsdk}/cwl1_2/WorkflowImpl.java | 26 ++- .../cwl1_2/WorkflowInputParameter.java | 9 +- .../cwl1_2/WorkflowInputParameterImpl.java | 26 ++- .../cwl1_2/WorkflowOutputParameter.java | 9 +- .../cwl1_2/WorkflowOutputParameterImpl.java | 26 ++- .../cwlsdk}/cwl1_2/WorkflowStep.java | 9 +- .../cwlsdk}/cwl1_2/WorkflowStepImpl.java | 26 ++- .../cwlsdk}/cwl1_2/WorkflowStepInput.java | 9 +- .../cwlsdk}/cwl1_2/WorkflowStepInputImpl.java | 26 ++- .../cwlsdk}/cwl1_2/WorkflowStepOutput.java | 9 +- .../cwl1_2}/WorkflowStepOutputImpl.java | 26 ++- .../cwlsdk}/cwl1_2/Workflow_class.java | 4 +- .../cwlsdk}/cwl1_2/package.html | 0 .../cwlsdk/cwl1_2}/stderr.java | 4 +- .../cwlsdk/cwl1_2}/stdin.java | 4 +- .../cwlsdk}/cwl1_2/stdout.java | 4 +- .../cwlsdk}/cwl1_2/utils/AnyLoader.java | 2 +- .../cwlsdk}/cwl1_2/utils/ArrayLoader.java | 2 +- .../cwlsdk}/cwl1_2/utils/ConstantMaps.java | 2 +- .../cwlsdk/cwl1_2}/utils/DefaultFetcher.java | 2 +- .../cwlsdk}/cwl1_2/utils/EnumLoader.java | 2 +- .../cwl1_2}/utils/ExpressionLoader.java | 2 +- .../cwlsdk}/cwl1_2/utils/Fetcher.java | 2 +- .../cwlsdk}/cwl1_2/utils/IdMapLoader.java | 2 +- .../cwlsdk/cwl1_2}/utils/Loader.java | 2 +- .../cwlsdk}/cwl1_2/utils/LoaderInstances.java | 170 +++++++++--------- .../cwlsdk}/cwl1_2/utils/LoadingOptions.java | 4 +- .../cwl1_2/utils/LoadingOptionsBuilder.java | 2 +- .../cwlsdk}/cwl1_2/utils/MapLoader.java | 2 +- .../cwlsdk/cwl1_2}/utils/NullLoader.java | 2 +- .../cwlsdk/cwl1_2}/utils/OneOrListOf.java | 2 +- .../cwl1_2/utils/OneOrListOfLoader.java | 2 +- .../cwlsdk/cwl1_2}/utils/OptionalLoader.java | 2 +- .../cwlsdk/cwl1_2}/utils/PrimitiveLoader.java | 2 +- .../cwlsdk}/cwl1_2/utils/RecordLoader.java | 2 +- .../cwlsdk}/cwl1_2/utils/RootLoader.java | 2 +- .../cwlsdk/cwl1_2}/utils/Saveable.java | 2 +- .../cwlsdk}/cwl1_2/utils/SaveableImpl.java | 2 +- .../utils/SecondaryFilesDslLoader.java | 2 +- .../cwlsdk/cwl1_2}/utils/TypeDslLoader.java | 2 +- .../cwlsdk/cwl1_2}/utils/UnionLoader.java | 2 +- .../cwlsdk}/cwl1_2/utils/UriLoader.java | 2 +- .../cwlsdk}/cwl1_2/utils/Uris.java | 2 +- .../cwl1_2}/utils/ValidationException.java | 2 +- .../cwlsdk/cwl1_2}/utils/Validator.java | 2 +- .../cwlsdk/cwl1_2}/utils/YamlUtils.java | 2 +- .../cwlsdk}/cwl1_2/utils/package.html | 2 +- src/main/resources/META-INF/MANIFEST.MF | 2 +- .../cwl1_1/utils/AnonymousRecordTest.java | 2 +- .../cwl1_1}/utils/DefaultFetcherTest.java | 2 +- .../cwlsdk}/cwl1_1/utils/ExamplesTest.java | 2 +- .../utils/PackedWorkflowClassTest.java | 10 +- .../cwl1_1/utils/RequirementsClassTest.java | 8 +- .../cwlsdk}/cwl1_1/utils/SchemaDefTest.java | 8 +- .../cwl1_1/utils/SecondaryFilesTest.java | 10 +- .../cwlsdk}/cwl1_1/utils/ShortnameTest.java | 2 +- .../cwl1_1/utils/WorkflowClassTest.java | 6 +- .../cwlsdk}/cwl1_1/utils/YamlUtilsTest.java | 2 +- .../cwl1_2/utils/AnonymousRecordTest.java | 2 +- .../cwl1_2}/utils/DefaultFetcherTest.java | 2 +- .../cwlsdk}/cwl1_2/utils/ExamplesTest.java | 2 +- .../utils/PackedWorkflowClassTest.java | 10 +- .../cwl1_2/utils/RequirementsClassTest.java | 8 +- .../cwlsdk}/cwl1_2/utils/SchemaDefTest.java | 8 +- .../cwl1_2/utils/SecondaryFilesTest.java | 10 +- .../cwlsdk}/cwl1_2/utils/ShortnameTest.java | 2 +- .../cwl1_2/utils/WorkflowClassTest.java | 6 +- .../cwlsdk}/cwl1_2/utils/YamlUtilsTest.java | 2 +- .../cwlsdk}/cwl1_1/utils/525.cwl | 0 .../cwlsdk}/cwl1_1/utils/capture_kit.yml | 0 .../cwlsdk}/cwl1_1/utils/envvar.yml | 0 .../cwlsdk}/cwl1_1/utils/params_inc.yml | 0 .../cwl1_1/utils/record-in-format.cwl.json | 0 .../cwlsdk}/cwl1_1/utils/schemadef-type.yml | 0 .../cwlsdk}/cwl1_1/utils/underscore.js | 0 .../utils/valid_anon_enum_inside_array.cwl | 0 ...non_enum_inside_array_inside_schemadef.cwl | 0 .../cwl1_1/utils/valid_any-type-compat.cwl | 0 .../utils/valid_basename-fields-test.cwl | 0 .../cwl1_1/utils/valid_binding-test.cwl | 0 .../utils/valid_bool-empty-inputbinding.cwl | 0 .../cwl1_1/utils/valid_bwa-mem-tool.cwl | 0 .../cwl1_1/utils/valid_cat-from-dir.cwl | 0 .../cwlsdk}/cwl1_1/utils/valid_cat-tool.cwl | 0 .../cwl1_1/utils/valid_cat1-testcli.cwl | 0 .../cwl1_1/utils/valid_cat3-from-dir.cwl | 0 .../cwl1_1/utils/valid_cat3-nodocker.cwl | 0 .../cwl1_1/utils/valid_cat3-tool-docker.cwl | 0 .../utils/valid_cat3-tool-mediumcut.cwl | 0 .../cwl1_1/utils/valid_cat3-tool-shortcut.cwl | 0 .../cwlsdk}/cwl1_1/utils/valid_cat3-tool.cwl | 0 .../cwlsdk}/cwl1_1/utils/valid_cat4-tool.cwl | 0 .../cwlsdk}/cwl1_1/utils/valid_cat5-tool.cwl | 0 .../cwl1_1/utils/valid_conflict-wf.cwl | 0 .../utils/valid_count-lines1-wf-noET.cwl | 0 .../cwl1_1/utils/valid_count-lines1-wf.cwl | 0 .../cwl1_1/utils/valid_count-lines10-wf.cwl | 0 ...valid_count-lines11-extra-step-wf-noET.cwl | 0 .../valid_count-lines11-extra-step-wf.cwl | 0 .../valid_count-lines11-null-step-wf-noET.cwl | 0 .../valid_count-lines11-null-step-wf.cwl | 0 .../utils/valid_count-lines11-wf-noET.cwl | 0 .../cwl1_1/utils/valid_count-lines11-wf.cwl | 0 .../cwl1_1/utils/valid_count-lines12-wf.cwl | 0 .../cwl1_1/utils/valid_count-lines13-wf.cwl | 0 .../cwl1_1/utils/valid_count-lines14-wf.cwl | 0 .../cwl1_1/utils/valid_count-lines15-wf.cwl | 0 .../cwl1_1/utils/valid_count-lines16-wf.cwl | 0 .../cwl1_1/utils/valid_count-lines17-wf.cwl | 0 .../cwl1_1/utils/valid_count-lines18-wf.cwl | 0 .../cwl1_1/utils/valid_count-lines2-wf.cwl | 0 .../cwl1_1/utils/valid_count-lines3-wf.cwl | 0 .../cwl1_1/utils/valid_count-lines4-wf.cwl | 0 .../cwl1_1/utils/valid_count-lines5-wf.cwl | 0 .../cwl1_1/utils/valid_count-lines6-wf.cwl | 0 .../cwl1_1/utils/valid_count-lines7-wf.cwl | 0 .../utils/valid_count-lines8-wf-noET.cwl | 0 .../cwl1_1/utils/valid_count-lines8-wf.cwl | 0 .../utils/valid_count-lines9-wf-noET.cwl | 0 .../cwl1_1/utils/valid_count-lines9-wf.cwl | 0 .../cwl1_1/utils/valid_default_path.cwl | 0 .../cwlsdk}/cwl1_1/utils/valid_dir.cwl | 0 .../cwlsdk}/cwl1_1/utils/valid_dir2.cwl | 0 .../cwlsdk}/cwl1_1/utils/valid_dir3.cwl | 0 .../cwlsdk}/cwl1_1/utils/valid_dir4.cwl | 0 .../cwlsdk}/cwl1_1/utils/valid_dir5.cwl | 0 .../cwlsdk}/cwl1_1/utils/valid_dir6.cwl | 0 .../cwlsdk}/cwl1_1/utils/valid_dir7.cwl | 0 .../valid_docker-array-secondaryfiles.cwl | 0 .../cwl1_1/utils/valid_docker-output-dir.cwl | 0 .../cwl1_1/utils/valid_docker-run-cmd.cwl | 0 .../cwl1_1/utils/valid_dynresreq-default.cwl | 0 .../cwl1_1/utils/valid_dynresreq-dir.cwl | 0 .../valid_dynresreq-workflow-inputdefault.cwl | 0 .../valid_dynresreq-workflow-stepdefault.cwl | 0 .../valid_dynresreq-workflow-tooldefault.cwl | 0 .../cwl1_1/utils/valid_dynresreq-workflow.cwl | 0 .../cwlsdk}/cwl1_1/utils/valid_dynresreq.cwl | 0 .../cwl1_1/utils/valid_echo-file-tool.cwl | 0 .../cwl1_1/utils/valid_echo-position-expr.cwl | 0 .../cwl1_1/utils/valid_echo-tool-default.cwl | 0 .../cwl1_1/utils/valid_echo-tool-packed.cwl | 0 .../cwl1_1/utils/valid_echo-tool-packed2.cwl | 0 .../cwlsdk}/cwl1_1/utils/valid_echo-tool.cwl | 0 .../cwl1_1/utils/valid_echo-wf-default.cwl | 0 .../cwl1_1/utils/valid_empty-array-input.cwl | 0 .../cwlsdk}/cwl1_1/utils/valid_env-tool1.cwl | 0 .../cwlsdk}/cwl1_1/utils/valid_env-tool2.cwl | 0 .../cwlsdk}/cwl1_1/utils/valid_env-tool3.cwl | 0 .../cwlsdk}/cwl1_1/utils/valid_env-tool4.cwl | 0 .../cwlsdk}/cwl1_1/utils/valid_env-wf1.cwl | 0 .../cwlsdk}/cwl1_1/utils/valid_env-wf2.cwl | 0 .../cwlsdk}/cwl1_1/utils/valid_env-wf3.cwl | 0 .../cwlsdk}/cwl1_1/utils/valid_envvar.cwl | 0 .../cwlsdk}/cwl1_1/utils/valid_envvar2.cwl | 0 .../cwlsdk}/cwl1_1/utils/valid_envvar3.cwl | 0 .../cwl1_1/utils/valid_exit-success.cwl | 0 .../cwlsdk}/cwl1_1/utils/valid_exitcode.cwl | 0 .../cwl1_1/utils/valid_fail-unconnected.cwl | 0 .../utils/valid_fail-unspecified-input.cwl | 0 .../cwl1_1/utils/valid_file-literal-ex.cwl | 0 .../cwlsdk}/cwl1_1/utils/valid_formattest.cwl | 0 .../cwl1_1/utils/valid_formattest2.cwl | 0 .../cwl1_1/utils/valid_formattest3.cwl | 0 .../cwl1_1/utils/valid_glob-expr-list.cwl | 0 .../cwl1_1/utils/valid_glob-path-error.cwl | 0 .../cwl1_1/utils/valid_glob_directory.cwl | 0 .../cwlsdk}/cwl1_1/utils/valid_glob_test.cwl | 0 .../cwl1_1/utils/valid_import_schema-def.cwl | 0 .../utils/valid_import_schema-def_packed.cwl | 0 .../cwl1_1/utils/valid_imported-hint.cwl | 0 .../cwl1_1/utils/valid_initialwork-path.cwl | 0 .../valid_initialworkdir-glob-fullpath.cwl | 0 ...d_initialworkdirrequirement-docker-out.cwl | 0 .../cwlsdk}/cwl1_1/utils/valid_inline-js.cwl | 0 .../cwl1_1/utils/valid_inp_update_wf.cwl | 0 .../cwl1_1/utils/valid_inpdir_update_wf.cwl | 0 .../cwlsdk}/cwl1_1/utils/valid_io-any-1.cwl | 0 .../cwl1_1/utils/valid_io-any-wf-1.cwl | 0 .../cwl1_1/utils/valid_io-file-default-wf.cwl | 0 .../cwl1_1/utils/valid_io-file-or-files.cwl | 0 .../valid_io-int-default-tool-and-wf.cwl | 0 .../cwl1_1/utils/valid_io-int-default-wf.cwl | 0 .../cwl1_1/utils/valid_io-int-optional-wf.cwl | 0 .../cwlsdk}/cwl1_1/utils/valid_io-int-wf.cwl | 0 .../utils/valid_io-union-input-default-wf.cwl | 0 .../cwlsdk}/cwl1_1/utils/valid_iwdr-entry.cwl | 0 .../utils/valid_iwdr_with_nested_dirs.cwl | 0 .../cwl1_1/utils/valid_js-expr-req-wf.cwl | 0 .../cwlsdk}/cwl1_1/utils/valid_linkfile.cwl | 0 .../cwl1_1/utils/valid_listing_deep1.cwl | 0 .../cwl1_1/utils/valid_listing_deep2.cwl | 0 .../cwl1_1/utils/valid_listing_none1.cwl | 0 .../cwl1_1/utils/valid_listing_none2.cwl | 0 .../cwl1_1/utils/valid_listing_none3.cwl | 0 .../cwl1_1/utils/valid_listing_shallow1.cwl | 0 .../cwl1_1/utils/valid_listing_shallow2.cwl | 0 .../cwlsdk}/cwl1_1/utils/valid_metadata.cwl | 0 .../cwlsdk}/cwl1_1/utils/valid_mkdir.cwl | 0 .../cwlsdk}/cwl1_1/utils/valid_nameroot.cwl | 0 .../cwl1_1/utils/valid_nested-array.cwl | 0 .../cwl1_1/utils/valid_networkaccess.cwl | 0 .../cwl1_1/utils/valid_networkaccess2.cwl | 0 .../cwl1_1/utils/valid_no-inputs-tool.cwl | 0 .../cwl1_1/utils/valid_no-inputs-wf.cwl | 0 .../cwl1_1/utils/valid_no-outputs-tool.cwl | 0 .../cwl1_1/utils/valid_no-outputs-wf.cwl | 0 .../cwl1_1/utils/valid_null-defined.cwl | 0 .../utils/valid_null-expression1-tool.cwl | 0 .../utils/valid_null-expression2-tool.cwl | 0 .../utils/valid_null-expression3-tool.cwl | 0 .../valid_optional-numerical-output-0.cwl | 0 .../cwl1_1/utils/valid_optional-output.cwl | 0 .../utils/valid_output-arrays-file-wf.cwl | 0 .../utils/valid_output-arrays-int-wf.cwl | 0 .../cwl1_1/utils/valid_output-arrays-int.cwl | 0 .../cwlsdk}/cwl1_1/utils/valid_params.cwl | 0 .../cwlsdk}/cwl1_1/utils/valid_params2.cwl | 0 .../cwl1_1/utils/valid_parseInt-tool.cwl | 0 .../cwl1_1/utils/valid_pass-unconnected.cwl | 0 .../cwl1_1/utils/valid_record-in-format.cwl | 0 ...id_record-in-secondaryFiles-missing-wf.cwl | 0 .../valid_record-in-secondaryFiles-wf.cwl | 0 .../utils/valid_record-in-secondaryFiles.cwl | 0 .../cwl1_1/utils/valid_record-out-format.cwl | 0 .../utils/valid_record-out-secondaryFiles.cwl | 0 .../cwl1_1/utils/valid_record-output-wf.cwl | 0 .../cwl1_1/utils/valid_record-output.cwl | 0 .../utils/valid_record-sd-secondaryFiles.cwl | 0 .../utils/valid_recursive-input-directory.cwl | 0 .../cwlsdk}/cwl1_1/utils/valid_rename.cwl | 0 .../cwl1_1/utils/valid_revsort-packed.cwl | 0 .../cwlsdk}/cwl1_1/utils/valid_revsort.cwl | 0 .../cwlsdk}/cwl1_1/utils/valid_revtool.cwl | 0 .../utils/valid_runtime-paths-distinct.cwl | 0 .../utils/valid_scatter-valueFrom-tool.cwl | 0 .../valid_scatter-valuefrom-inputs-wf1.cwl | 0 .../utils/valid_scatter-valuefrom-wf1.cwl | 0 .../utils/valid_scatter-valuefrom-wf2.cwl | 0 .../utils/valid_scatter-valuefrom-wf3.cwl | 0 .../utils/valid_scatter-valuefrom-wf4.cwl | 0 .../utils/valid_scatter-valuefrom-wf5.cwl | 0 .../utils/valid_scatter-valuefrom-wf6.cwl | 0 .../cwl1_1/utils/valid_scatter-wf1.cwl | 0 .../cwl1_1/utils/valid_scatter-wf2.cwl | 0 .../cwl1_1/utils/valid_scatter-wf3.cwl | 0 .../cwl1_1/utils/valid_scatter-wf4.cwl | 0 .../cwl1_1/utils/valid_schemadef-tool.cwl | 0 .../cwl1_1/utils/valid_schemadef-wf.cwl | 0 .../cwlsdk}/cwl1_1/utils/valid_search.cwl | 0 .../cwlsdk}/cwl1_1/utils/valid_shellchar.cwl | 0 .../cwlsdk}/cwl1_1/utils/valid_shellchar2.cwl | 0 .../utils/valid_size-expression-tool.cwl | 0 .../cwlsdk}/cwl1_1/utils/valid_sorttool.cwl | 0 .../cwl1_1/utils/valid_stage-array-dirs.cwl | 0 .../cwl1_1/utils/valid_stage-array.cwl | 0 .../utils/valid_stage-unprovided-file.cwl | 0 .../cwl1_1/utils/valid_stage_file_array.cwl | 0 .../utils/valid_stage_file_array_basename.cwl | 0 ...tage_file_array_basename_and_entryname.cwl | 0 .../cwlsdk}/cwl1_1/utils/valid_stagefile.cwl | 0 .../cwl1_1/utils/valid_stderr-mediumcut.cwl | 0 .../cwl1_1/utils/valid_stderr-shortcut.cwl | 0 .../cwlsdk}/cwl1_1/utils/valid_stderr.cwl | 0 .../cwl1_1/utils/valid_step-valuefrom-wf.cwl | 0 .../cwl1_1/utils/valid_step-valuefrom2-wf.cwl | 0 .../cwl1_1/utils/valid_step-valuefrom3-wf.cwl | 0 .../cwl1_1/utils/valid_step-valuefrom4-wf.cwl | 0 .../cwl1_1/utils/valid_step-valuefrom5-wf.cwl | 0 .../cwl1_1/utils/valid_steplevel-resreq.cwl | 0 .../cwl1_1/utils/valid_sum-wf-noET.cwl | 0 .../cwlsdk}/cwl1_1/utils/valid_sum-wf.cwl | 0 .../cwl1_1/utils/valid_symlink-illegal.cwl | 0 .../cwl1_1/utils/valid_symlink-legal.cwl | 0 .../cwl1_1/utils/valid_template-tool.cwl | 0 .../cwl1_1/utils/valid_test-cwl-out.cwl | 0 .../cwl1_1/utils/valid_test-cwl-out2.cwl | 0 .../cwlsdk}/cwl1_1/utils/valid_timelimit.cwl | 0 .../cwl1_1/utils/valid_timelimit2-wf.cwl | 0 .../cwlsdk}/cwl1_1/utils/valid_timelimit2.cwl | 0 .../cwl1_1/utils/valid_timelimit3-wf.cwl | 0 .../cwlsdk}/cwl1_1/utils/valid_timelimit3.cwl | 0 .../cwlsdk}/cwl1_1/utils/valid_timelimit4.cwl | 0 .../cwlsdk}/cwl1_1/utils/valid_timelimit5.cwl | 0 .../cwlsdk}/cwl1_1/utils/valid_tmap-tool.cwl | 0 .../cwlsdk}/cwl1_1/utils/valid_touch.cwl | 0 .../cwl1_1/utils/valid_updatedir_inplace.cwl | 0 .../cwl1_1/utils/valid_updateval_inplace.cwl | 0 .../cwl1_1/utils/valid_valueFrom-constant.cwl | 0 .../cwlsdk}/cwl1_1/utils/valid_vf-concat.cwl | 0 .../cwl1_1/utils/valid_wc-tool-shortcut.cwl | 0 .../cwlsdk}/cwl1_1/utils/valid_wc-tool.cwl | 0 .../cwlsdk}/cwl1_1/utils/valid_wc2-tool.cwl | 0 .../cwlsdk}/cwl1_1/utils/valid_wc3-tool.cwl | 0 .../cwlsdk}/cwl1_1/utils/valid_wc4-tool.cwl | 0 .../cwl1_1/utils/valid_wf-loadContents.cwl | 0 .../cwl1_1/utils/valid_wf-loadContents2.cwl | 0 .../cwl1_1/utils/valid_wf-loadContents3.cwl | 0 .../cwl1_1/utils/valid_wf-loadContents4.cwl | 0 .../utils/valid_writable-dir-docker.cwl | 0 .../cwl1_1/utils/valid_writable-dir.cwl | 0 .../cwlsdk}/cwl1_2/utils/525.cwl | 0 .../cwlsdk}/cwl1_2/utils/EDAM.owl | 0 .../cwlsdk}/cwl1_2/utils/action.cwl | 0 .../cwlsdk}/cwl1_2/utils/args.py | 0 .../cwlsdk}/cwl1_2/utils/bar.cwl | 0 .../cwlsdk}/cwl1_2/utils/capture_kit.yml | 0 .../cwlsdk}/cwl1_2/utils/cat-tool.cwl | 0 .../cwlsdk}/cwl1_2/utils/cat.cwl | 0 .../cwlsdk}/cwl1_2/utils/check.cwl | 0 .../cwl1_2/utils/count-lines1-wf-noET.cwl | 0 .../cwlsdk}/cwl1_2/utils/count-lines1-wf.cwl | 0 .../cwlsdk}/cwl1_2/utils/dcterms.rdf | 0 .../cwl1_2/utils/dynresreq-default.cwl | 0 .../cwlsdk}/cwl1_2/utils/dynresreq.cwl | 0 .../cwlsdk}/cwl1_2/utils/echo-file-tool.cwl | 0 .../cwl1_2/utils/echo-tool-default.cwl | 0 .../cwlsdk}/cwl1_2/utils/echo-tool.cwl | 0 .../cwlsdk}/cwl1_2/utils/env-tool1.cwl | 0 .../cwlsdk}/cwl1_2/utils/env-tool2.cwl | 0 .../cwlsdk}/cwl1_2/utils/envvar.yml | 0 .../cwl1_2/utils/fail-unspecified-input.cwl | 0 .../cwlsdk}/cwl1_2/utils/foaf.rdf | 0 .../cwlsdk}/cwl1_2/utils/foo.cwl | 0 .../cwlsdk}/cwl1_2/utils/gx_edam.ttl | 0 .../cwlsdk}/cwl1_2/utils/hello.txt | 0 .../cwlsdk}/cwl1_2/utils/inp-filelist.txt | 0 .../cwlsdk}/cwl1_2/utils/io-any-1.cwl | 0 .../cwlsdk}/cwl1_2/utils/loadit.py | 0 .../cwlsdk}/cwl1_2/utils/mkdir.cwl | 0 .../cwlsdk}/cwl1_2/utils/mkfilelist.py | 0 .../cwl1_2/utils/null-expression3-tool.cwl | 0 .../cwlsdk}/cwl1_2/utils/params_inc.yml | 0 .../cwlsdk}/cwl1_2/utils/parseInt-tool.cwl | 0 .../cwl1_2/utils/record-in-format.cwl.json | 0 .../cwl1_2/utils/record-in-secondaryFiles.cwl | 0 .../cwlsdk}/cwl1_2/utils/record-output.cwl | 0 .../cwlsdk}/cwl1_2/utils/rename-inputs.yml | 0 .../cwlsdk}/cwl1_2/utils/rename.cwl | 0 .../cwlsdk}/cwl1_2/utils/revtool.cwl | 0 .../cwl1_2/utils/scatter-valueFrom-tool.cwl | 0 .../cwlsdk}/cwl1_2/utils/schemadef-tool.cwl | 0 .../cwlsdk}/cwl1_2/utils/schemadef-type.yml | 0 .../schemadef_types_with_import-tool.cwl | 0 .../schemadef_types_with_import_readgroup.yml | 0 .../cwlsdk}/cwl1_2/utils/search.py | 0 .../cwlsdk}/cwl1_2/utils/sorttool.cwl | 0 .../cwlsdk}/cwl1_2/utils/special_file | 0 .../cwlsdk}/cwl1_2/utils/testdir/a | 0 .../cwlsdk}/cwl1_2/utils/testdir/b | 0 .../cwlsdk}/cwl1_2/utils/testdir/c/d | 0 .../cwlsdk}/cwl1_2/utils/touch.cwl | 0 .../cwlsdk}/cwl1_2/utils/underscore.js | 0 .../cwl1_2/utils/updatedir_inplace.cwl | 0 .../cwlsdk}/cwl1_2/utils/updateval.py | 0 .../cwl1_2/utils/updateval_inplace.cwl | 0 .../cwlsdk}/cwl1_2/utils/valid_action.cwl | 0 .../utils/valid_anon_enum_inside_array.cwl | 0 ...non_enum_inside_array_inside_schemadef.cwl | 0 .../cwl1_2/utils/valid_any-type-compat.cwl | 0 .../cwlsdk}/cwl1_2/utils/valid_bar.cwl | 0 .../utils/valid_basename-fields-test.cwl | 0 .../cwl1_2/utils/valid_bash-dollar-quote.cwl | 0 ...bash-line-continuation-with-expression.cwl | 0 .../utils/valid_bash-line-continuation.cwl | 0 .../cwl1_2/utils/valid_binding-test.cwl | 0 .../utils/valid_bool-empty-inputbinding.cwl | 0 .../cwl1_2/utils/valid_bwa-mem-tool.cwl | 0 .../cwl1_2/utils/valid_cat-from-dir.cwl | 0 .../cwl1_2/utils/valid_cat-tool-shortcut.cwl | 0 .../cwlsdk}/cwl1_2/utils/valid_cat-tool.cwl | 0 .../cwlsdk}/cwl1_2/utils/valid_cat.cwl | 0 .../cwl1_2/utils/valid_cat1-testcli.cwl | 0 .../cwl1_2/utils/valid_cat3-from-dir.cwl | 0 .../cwl1_2/utils/valid_cat3-nodocker.cwl | 0 .../cwl1_2/utils/valid_cat3-tool-docker.cwl | 0 .../utils/valid_cat3-tool-mediumcut.cwl | 0 .../cwl1_2/utils/valid_cat3-tool-shortcut.cwl | 0 .../cwlsdk}/cwl1_2/utils/valid_cat3-tool.cwl | 0 .../cwl1_2/utils/valid_cat4-from-dir.cwl | 0 .../cwlsdk}/cwl1_2/utils/valid_cat4-tool.cwl | 0 .../cwlsdk}/cwl1_2/utils/valid_cat5-tool.cwl | 0 .../cwlsdk}/cwl1_2/utils/valid_check.cwl | 0 .../cwlsdk}/cwl1_2/utils/valid_colon:test.cwl | 0 .../cwl1_2/utils/valid_colon_test_output.cwl | 0 .../cwl1_2/utils/valid_cond-wf-001.cwl | 0 .../cwl1_2/utils/valid_cond-wf-001_nojs.cwl | 0 .../cwl1_2/utils/valid_cond-wf-002.cwl | 0 .../cwl1_2/utils/valid_cond-wf-002_nojs.cwl | 0 .../cwl1_2/utils/valid_cond-wf-003.1.cwl | 0 .../cwl1_2/utils/valid_cond-wf-003.1_nojs.cwl | 0 .../cwl1_2/utils/valid_cond-wf-003.cwl | 0 .../cwl1_2/utils/valid_cond-wf-003_nojs.cwl | 0 .../cwl1_2/utils/valid_cond-wf-004.cwl | 0 .../cwl1_2/utils/valid_cond-wf-004_nojs.cwl | 0 .../cwl1_2/utils/valid_cond-wf-006.cwl | 0 .../cwl1_2/utils/valid_cond-wf-006_nojs.cwl | 0 .../cwl1_2/utils/valid_cond-wf-007.cwl | 0 .../cwl1_2/utils/valid_cond-wf-007_nojs.cwl | 0 .../cwl1_2/utils/valid_cond-wf-009.cwl | 0 .../cwl1_2/utils/valid_cond-wf-009_nojs.cwl | 0 .../cwl1_2/utils/valid_cond-wf-010.cwl | 0 .../cwl1_2/utils/valid_cond-wf-010_nojs.cwl | 0 .../cwl1_2/utils/valid_cond-wf-011.cwl | 0 .../cwl1_2/utils/valid_cond-wf-011_nojs.cwl | 0 .../cwl1_2/utils/valid_cond-wf-012.cwl | 0 .../cwl1_2/utils/valid_cond-wf-012_nojs.cwl | 0 .../cwl1_2/utils/valid_cond-wf-013.cwl | 0 .../cwl1_2/utils/valid_cond-wf-013_nojs.cwl | 0 .../cwl1_2/utils/valid_cond-with-defaults.cwl | 0 .../cwl1_2/utils/valid_cores_float.cwl | 0 .../utils/valid_count-lines1-wf-noET.cwl | 0 .../cwl1_2/utils/valid_count-lines1-wf.cwl | 0 .../cwl1_2/utils/valid_count-lines10-wf.cwl | 0 ...valid_count-lines11-extra-step-wf-noET.cwl | 0 .../valid_count-lines11-extra-step-wf.cwl | 0 .../valid_count-lines11-null-step-wf-noET.cwl | 0 .../valid_count-lines11-null-step-wf.cwl | 0 .../utils/valid_count-lines11-wf-noET.cwl | 0 .../cwl1_2/utils/valid_count-lines11-wf.cwl | 0 .../cwl1_2/utils/valid_count-lines12-wf.cwl | 0 .../cwl1_2/utils/valid_count-lines13-wf.cwl | 0 .../cwl1_2/utils/valid_count-lines14-wf.cwl | 0 .../cwl1_2/utils/valid_count-lines15-wf.cwl | 0 .../cwl1_2/utils/valid_count-lines16-wf.cwl | 0 .../cwl1_2/utils/valid_count-lines17-wf.cwl | 0 .../cwl1_2/utils/valid_count-lines18-wf.cwl | 0 .../cwl1_2/utils/valid_count-lines19-wf.cwl | 0 .../cwl1_2/utils/valid_count-lines2-wf.cwl | 0 .../cwl1_2/utils/valid_count-lines3-wf.cwl | 0 .../cwl1_2/utils/valid_count-lines4-wf.cwl | 0 .../cwl1_2/utils/valid_count-lines5-wf.cwl | 0 .../cwl1_2/utils/valid_count-lines6-wf.cwl | 0 .../cwl1_2/utils/valid_count-lines7-wf.cwl | 0 .../utils/valid_count-lines8-wf-noET.cwl | 0 .../cwl1_2/utils/valid_count-lines8-wf.cwl | 0 .../utils/valid_count-lines9-wf-noET.cwl | 0 .../cwl1_2/utils/valid_count-lines9-wf.cwl | 0 .../cwl1_2/utils/valid_cwloutput-nolimit.cwl | 0 .../cwl1_2/utils/valid_default_path.cwl | 0 .../cwlsdk}/cwl1_2/utils/valid_dir.cwl | 0 .../cwlsdk}/cwl1_2/utils/valid_dir2.cwl | 0 .../cwlsdk}/cwl1_2/utils/valid_dir3.cwl | 0 .../cwlsdk}/cwl1_2/utils/valid_dir4.cwl | 0 .../cwlsdk}/cwl1_2/utils/valid_dir5.cwl | 0 .../cwlsdk}/cwl1_2/utils/valid_dir6.cwl | 0 .../cwlsdk}/cwl1_2/utils/valid_dir7.cwl | 0 .../valid_docker-array-secondaryfiles.cwl | 0 .../cwl1_2/utils/valid_docker-output-dir.cwl | 0 .../cwl1_2/utils/valid_docker-run-cmd.cwl | 0 .../cwl1_2/utils/valid_dynresreq-default.cwl | 0 .../cwl1_2/utils/valid_dynresreq-dir.cwl | 0 .../valid_dynresreq-workflow-inputdefault.cwl | 0 .../valid_dynresreq-workflow-stepdefault.cwl | 0 .../valid_dynresreq-workflow-tooldefault.cwl | 0 .../cwl1_2/utils/valid_dynresreq-workflow.cwl | 0 .../cwlsdk}/cwl1_2/utils/valid_dynresreq.cwl | 0 .../cwl1_2/utils/valid_echo-file-tool.cwl | 0 .../cwl1_2/utils/valid_echo-position-expr.cwl | 0 .../cwl1_2/utils/valid_echo-tool-default.cwl | 0 .../cwl1_2/utils/valid_echo-tool-packed.cwl | 0 .../cwl1_2/utils/valid_echo-tool-packed2.cwl | 0 .../cwlsdk}/cwl1_2/utils/valid_echo-tool.cwl | 0 .../cwl1_2/utils/valid_echo-wf-default.cwl | 0 .../cwl1_2/utils/valid_empty-array-input.cwl | 0 .../cwlsdk}/cwl1_2/utils/valid_env-tool1.cwl | 0 .../cwlsdk}/cwl1_2/utils/valid_env-tool2.cwl | 0 .../cwlsdk}/cwl1_2/utils/valid_env-tool3.cwl | 0 .../cwlsdk}/cwl1_2/utils/valid_env-tool4.cwl | 0 .../cwlsdk}/cwl1_2/utils/valid_env-wf1.cwl | 0 .../cwlsdk}/cwl1_2/utils/valid_env-wf2.cwl | 0 .../cwlsdk}/cwl1_2/utils/valid_env-wf3.cwl | 0 .../cwlsdk}/cwl1_2/utils/valid_envvar.cwl | 0 .../cwlsdk}/cwl1_2/utils/valid_envvar2.cwl | 0 .../cwlsdk}/cwl1_2/utils/valid_envvar3.cwl | 0 .../cwl1_2/utils/valid_exit-success.cwl | 0 .../cwlsdk}/cwl1_2/utils/valid_exitcode.cwl | 0 .../cwl1_2/utils/valid_fail-unconnected.cwl | 0 .../utils/valid_fail-unspecified-input.cwl | 0 .../cwl1_2/utils/valid_file-literal-ex.cwl | 0 .../cwlsdk}/cwl1_2/utils/valid_foo.cwl | 0 .../cwlsdk}/cwl1_2/utils/valid_formattest.cwl | 0 .../cwl1_2/utils/valid_formattest2.cwl | 0 .../cwl1_2/utils/valid_formattest3.cwl | 0 .../cwl1_2/utils/valid_glob-expr-list.cwl | 0 .../cwl1_2/utils/valid_glob-path-error.cwl | 0 .../cwl1_2/utils/valid_glob_directory.cwl | 0 .../cwlsdk}/cwl1_2/utils/valid_glob_test.cwl | 0 .../cwl1_2/utils/valid_import_schema-def.cwl | 0 .../cwl1_2/utils/valid_import_schema-def2.cwl | 0 .../utils/valid_import_schema-def_packed.cwl | 0 .../cwl1_2/utils/valid_imported-hint.cwl | 0 .../cwl1_2/utils/valid_initialwork-path.cwl | 0 .../valid_initialworkdir-glob-fullpath.cwl | 0 ...d_initialworkdirrequirement-docker-out.cwl | 0 .../cwlsdk}/cwl1_2/utils/valid_inline-js.cwl | 0 .../cwl1_2/utils/valid_inp_update_wf.cwl | 0 .../cwl1_2/utils/valid_inpdir_update_wf.cwl | 0 .../cwlsdk}/cwl1_2/utils/valid_io-any-1.cwl | 0 .../cwl1_2/utils/valid_io-any-wf-1.cwl | 0 .../cwl1_2/utils/valid_io-file-default-wf.cwl | 0 .../cwl1_2/utils/valid_io-file-or-files.cwl | 0 .../valid_io-int-default-tool-and-wf.cwl | 0 .../cwl1_2/utils/valid_io-int-default-wf.cwl | 0 .../cwl1_2/utils/valid_io-int-optional-wf.cwl | 0 .../cwlsdk}/cwl1_2/utils/valid_io-int-wf.cwl | 0 .../utils/valid_io-union-input-default-wf.cwl | 0 .../utils/valid_iwd-container-entryname1.cwl | 0 .../utils/valid_iwd-container-entryname2.cwl | 0 .../utils/valid_iwd-container-entryname3.cwl | 0 .../utils/valid_iwd-container-entryname4.cwl | 0 .../cwl1_2/utils/valid_iwd-fileobjs1.cwl | 0 .../cwl1_2/utils/valid_iwd-fileobjs2.cwl | 0 .../cwl1_2/utils/valid_iwd-jsondump1-nl.cwl | 0 .../cwl1_2/utils/valid_iwd-jsondump1.cwl | 0 .../cwl1_2/utils/valid_iwd-jsondump2-nl.cwl | 0 .../cwl1_2/utils/valid_iwd-jsondump2.cwl | 0 .../cwl1_2/utils/valid_iwd-jsondump3-nl.cwl | 0 .../cwl1_2/utils/valid_iwd-jsondump3.cwl | 0 .../cwl1_2/utils/valid_iwd-nolimit.cwl | 0 .../cwl1_2/utils/valid_iwd-passthrough1.cwl | 0 .../cwl1_2/utils/valid_iwd-passthrough2.cwl | 0 .../cwl1_2/utils/valid_iwd-passthrough3.cwl | 0 .../cwl1_2/utils/valid_iwd-passthrough4.cwl | 0 .../cwlsdk}/cwl1_2/utils/valid_iwdr-entry.cwl | 0 .../valid_iwdr_dir_literal_real_file.cwl | 0 .../utils/valid_iwdr_with_nested_dirs.cwl | 0 .../cwl1_2/utils/valid_js-input-record.cwl | 0 .../cwlsdk}/cwl1_2/utils/valid_js-quote.cwl | 0 .../cwlsdk}/cwl1_2/utils/valid_linkfile.cwl | 0 .../cwl1_2/utils/valid_listing_deep1.cwl | 0 .../cwl1_2/utils/valid_listing_deep2.cwl | 0 .../cwl1_2/utils/valid_listing_none1.cwl | 0 .../cwl1_2/utils/valid_listing_none2.cwl | 0 .../cwl1_2/utils/valid_listing_none3.cwl | 0 .../cwl1_2/utils/valid_listing_shallow1.cwl | 0 .../cwl1_2/utils/valid_listing_shallow2.cwl | 0 .../cwl1_2/utils/valid_loadContents-limit.cwl | 0 .../cwlsdk}/cwl1_2/utils/valid_metadata.cwl | 0 .../cwlsdk}/cwl1_2/utils/valid_mkdir.cwl | 0 ...lid_multiple_input_feature_requirement.cwl | 0 .../cwlsdk}/cwl1_2/utils/valid_nameroot.cwl | 0 .../cwl1_2/utils/valid_nested-array.cwl | 0 .../cwl1_2/utils/valid_networkaccess.cwl | 0 .../cwl1_2/utils/valid_networkaccess2.cwl | 0 .../cwl1_2/utils/valid_no-inputs-tool.cwl | 0 .../cwl1_2/utils/valid_no-inputs-wf.cwl | 0 .../cwl1_2/utils/valid_no-outputs-tool.cwl | 0 .../cwl1_2/utils/valid_no-outputs-wf.cwl | 0 .../cwl1_2/utils/valid_null-defined.cwl | 0 .../utils/valid_null-expression1-tool.cwl | 0 .../utils/valid_null-expression2-tool.cwl | 0 .../utils/valid_null-expression3-tool.cwl | 0 .../cwlsdk}/cwl1_2/utils/valid_operation.cwl | 0 .../valid_optional-numerical-output-0.cwl | 0 .../cwl1_2/utils/valid_optional-output.cwl | 0 .../utils/valid_output-arrays-file-wf.cwl | 0 .../utils/valid_output-arrays-int-wf.cwl | 0 .../cwl1_2/utils/valid_output-arrays-int.cwl | 0 .../valid_output_reference_workflow_input.cwl | 0 .../cwl1_2/utils/valid_packed_action.cwl | 0 .../valid_packed_anon_enum_inside_array.cwl | 0 ...non_enum_inside_array_inside_schemadef.cwl | 0 .../utils/valid_packed_any-type-compat.cwl | 0 .../cwlsdk}/cwl1_2/utils/valid_packed_bar.cwl | 0 .../valid_packed_basename-fields-test.cwl | 0 .../utils/valid_packed_bash-dollar-quote.cwl | 0 ...bash-line-continuation-with-expression.cwl | 0 .../valid_packed_bash-line-continuation.cwl | 0 .../utils/valid_packed_binding-test.cwl | 0 .../valid_packed_bool-empty-inputbinding.cwl | 0 .../utils/valid_packed_bwa-mem-tool.cwl | 0 .../utils/valid_packed_cat-from-dir.cwl | 0 .../utils/valid_packed_cat-tool-shortcut.cwl | 0 .../cwl1_2/utils/valid_packed_cat-tool.cwl | 0 .../cwlsdk}/cwl1_2/utils/valid_packed_cat.cwl | 0 .../utils/valid_packed_cat1-testcli.cwl | 0 .../utils/valid_packed_cat3-from-dir.cwl | 0 .../utils/valid_packed_cat3-nodocker.cwl | 0 .../utils/valid_packed_cat3-tool-docker.cwl | 0 .../valid_packed_cat3-tool-mediumcut.cwl | 0 .../utils/valid_packed_cat3-tool-shortcut.cwl | 0 .../cwl1_2/utils/valid_packed_cat3-tool.cwl | 0 .../utils/valid_packed_cat4-from-dir.cwl | 0 .../cwl1_2/utils/valid_packed_cat4-tool.cwl | 0 .../cwl1_2/utils/valid_packed_cat5-tool.cwl | 0 .../cwl1_2/utils/valid_packed_check.cwl | 0 .../cwl1_2/utils/valid_packed_colon:test.cwl | 0 .../utils/valid_packed_colon_test_output.cwl | 0 .../cwl1_2/utils/valid_packed_cond-wf-001.cwl | 0 .../utils/valid_packed_cond-wf-001_nojs.cwl | 0 .../cwl1_2/utils/valid_packed_cond-wf-002.cwl | 0 .../utils/valid_packed_cond-wf-002_nojs.cwl | 0 .../utils/valid_packed_cond-wf-003.1.cwl | 0 .../utils/valid_packed_cond-wf-003.1_nojs.cwl | 0 .../cwl1_2/utils/valid_packed_cond-wf-003.cwl | 0 .../utils/valid_packed_cond-wf-003_nojs.cwl | 0 .../cwl1_2/utils/valid_packed_cond-wf-004.cwl | 0 .../utils/valid_packed_cond-wf-004_nojs.cwl | 0 .../cwl1_2/utils/valid_packed_cond-wf-006.cwl | 0 .../utils/valid_packed_cond-wf-006_nojs.cwl | 0 .../cwl1_2/utils/valid_packed_cond-wf-007.cwl | 0 .../utils/valid_packed_cond-wf-007_nojs.cwl | 0 .../cwl1_2/utils/valid_packed_cond-wf-009.cwl | 0 .../utils/valid_packed_cond-wf-009_nojs.cwl | 0 .../cwl1_2/utils/valid_packed_cond-wf-010.cwl | 0 .../utils/valid_packed_cond-wf-010_nojs.cwl | 0 .../cwl1_2/utils/valid_packed_cond-wf-011.cwl | 0 .../utils/valid_packed_cond-wf-011_nojs.cwl | 0 .../cwl1_2/utils/valid_packed_cond-wf-012.cwl | 0 .../utils/valid_packed_cond-wf-012_nojs.cwl | 0 .../cwl1_2/utils/valid_packed_cond-wf-013.cwl | 0 .../utils/valid_packed_cond-wf-013_nojs.cwl | 0 .../utils/valid_packed_cond-with-defaults.cwl | 0 .../cwl1_2/utils/valid_packed_cores_float.cwl | 0 .../valid_packed_count-lines1-wf-noET.cwl | 0 .../utils/valid_packed_count-lines1-wf.cwl | 0 .../utils/valid_packed_count-lines10-wf.cwl | 0 ...acked_count-lines11-extra-step-wf-noET.cwl | 0 ...lid_packed_count-lines11-extra-step-wf.cwl | 0 ...packed_count-lines11-null-step-wf-noET.cwl | 0 ...alid_packed_count-lines11-null-step-wf.cwl | 0 .../valid_packed_count-lines11-wf-noET.cwl | 0 .../utils/valid_packed_count-lines11-wf.cwl | 0 .../utils/valid_packed_count-lines12-wf.cwl | 0 .../utils/valid_packed_count-lines13-wf.cwl | 0 .../utils/valid_packed_count-lines14-wf.cwl | 0 .../utils/valid_packed_count-lines15-wf.cwl | 0 .../utils/valid_packed_count-lines16-wf.cwl | 0 .../utils/valid_packed_count-lines17-wf.cwl | 0 .../utils/valid_packed_count-lines18-wf.cwl | 0 .../utils/valid_packed_count-lines19-wf.cwl | 0 .../utils/valid_packed_count-lines2-wf.cwl | 0 .../utils/valid_packed_count-lines3-wf.cwl | 0 .../utils/valid_packed_count-lines4-wf.cwl | 0 .../utils/valid_packed_count-lines5-wf.cwl | 0 .../utils/valid_packed_count-lines6-wf.cwl | 0 .../utils/valid_packed_count-lines7-wf.cwl | 0 .../valid_packed_count-lines8-wf-noET.cwl | 0 .../utils/valid_packed_count-lines8-wf.cwl | 0 .../valid_packed_count-lines9-wf-noET.cwl | 0 .../utils/valid_packed_count-lines9-wf.cwl | 0 .../utils/valid_packed_cwloutput-nolimit.cwl | 0 .../utils/valid_packed_default_path.cwl | 0 .../cwlsdk}/cwl1_2/utils/valid_packed_dir.cwl | 0 .../cwl1_2/utils/valid_packed_dir2.cwl | 0 .../cwl1_2/utils/valid_packed_dir3.cwl | 0 .../cwl1_2/utils/valid_packed_dir4.cwl | 0 .../cwl1_2/utils/valid_packed_dir5.cwl | 0 .../cwl1_2/utils/valid_packed_dir6.cwl | 0 .../cwl1_2/utils/valid_packed_dir7.cwl | 0 ...lid_packed_docker-array-secondaryfiles.cwl | 0 .../utils/valid_packed_docker-output-dir.cwl | 0 .../utils/valid_packed_docker-run-cmd.cwl | 0 .../utils/valid_packed_dynresreq-default.cwl | 0 .../utils/valid_packed_dynresreq-dir.cwl | 0 ...packed_dynresreq-workflow-inputdefault.cwl | 0 ..._packed_dynresreq-workflow-stepdefault.cwl | 0 ..._packed_dynresreq-workflow-tooldefault.cwl | 0 .../utils/valid_packed_dynresreq-workflow.cwl | 0 .../cwl1_2/utils/valid_packed_dynresreq.cwl | 0 .../utils/valid_packed_echo-file-tool.cwl | 0 .../utils/valid_packed_echo-position-expr.cwl | 0 .../utils/valid_packed_echo-tool-default.cwl | 0 .../utils/valid_packed_echo-tool-packed.cwl | 0 .../utils/valid_packed_echo-tool-packed2.cwl | 0 .../cwl1_2/utils/valid_packed_echo-tool.cwl | 0 .../utils/valid_packed_echo-wf-default.cwl | 0 .../utils/valid_packed_empty-array-input.cwl | 0 .../cwl1_2/utils/valid_packed_env-tool1.cwl | 0 .../cwl1_2/utils/valid_packed_env-tool2.cwl | 0 .../cwl1_2/utils/valid_packed_env-tool3.cwl | 0 .../cwl1_2/utils/valid_packed_env-tool4.cwl | 0 .../cwl1_2/utils/valid_packed_env-wf1.cwl | 0 .../cwl1_2/utils/valid_packed_env-wf2.cwl | 0 .../cwl1_2/utils/valid_packed_env-wf3.cwl | 0 .../cwl1_2/utils/valid_packed_envvar.cwl | 0 .../cwl1_2/utils/valid_packed_envvar2.cwl | 0 .../cwl1_2/utils/valid_packed_envvar3.cwl | 0 .../utils/valid_packed_exit-success.cwl | 0 .../cwl1_2/utils/valid_packed_exitcode.cwl | 0 .../utils/valid_packed_fail-unconnected.cwl | 0 .../valid_packed_fail-unspecified-input.cwl | 0 .../utils/valid_packed_file-literal-ex.cwl | 0 .../cwlsdk}/cwl1_2/utils/valid_packed_foo.cwl | 0 .../cwl1_2/utils/valid_packed_formattest.cwl | 0 .../cwl1_2/utils/valid_packed_formattest2.cwl | 0 .../cwl1_2/utils/valid_packed_formattest3.cwl | 0 .../utils/valid_packed_glob-expr-list.cwl | 0 .../utils/valid_packed_glob-path-error.cwl | 0 .../utils/valid_packed_glob_directory.cwl | 0 .../cwl1_2/utils/valid_packed_glob_test.cwl | 0 .../utils/valid_packed_import_schema-def.cwl | 0 .../utils/valid_packed_import_schema-def2.cwl | 0 .../valid_packed_import_schema-def_packed.cwl | 0 .../utils/valid_packed_imported-hint.cwl | 0 .../utils/valid_packed_initialwork-path.cwl | 0 ...id_packed_initialworkdir-glob-fullpath.cwl | 0 ...d_initialworkdirrequirement-docker-out.cwl | 0 .../cwl1_2/utils/valid_packed_inline-js.cwl | 0 .../utils/valid_packed_inp_update_wf.cwl | 0 .../utils/valid_packed_inpdir_update_wf.cwl | 0 .../cwl1_2/utils/valid_packed_io-any-1.cwl | 0 .../cwl1_2/utils/valid_packed_io-any-wf-1.cwl | 0 .../utils/valid_packed_io-file-default-wf.cwl | 0 .../utils/valid_packed_io-file-or-files.cwl | 0 ...alid_packed_io-int-default-tool-and-wf.cwl | 0 .../utils/valid_packed_io-int-default-wf.cwl | 0 .../utils/valid_packed_io-int-optional-wf.cwl | 0 .../cwl1_2/utils/valid_packed_io-int-wf.cwl | 0 ...valid_packed_io-union-input-default-wf.cwl | 0 .../valid_packed_iwd-container-entryname1.cwl | 0 .../valid_packed_iwd-container-entryname2.cwl | 0 .../valid_packed_iwd-container-entryname3.cwl | 0 .../valid_packed_iwd-container-entryname4.cwl | 0 .../utils/valid_packed_iwd-fileobjs1.cwl | 0 .../utils/valid_packed_iwd-fileobjs2.cwl | 0 .../utils/valid_packed_iwd-jsondump1-nl.cwl | 0 .../utils/valid_packed_iwd-jsondump1.cwl | 0 .../utils/valid_packed_iwd-jsondump2-nl.cwl | 0 .../utils/valid_packed_iwd-jsondump2.cwl | 0 .../utils/valid_packed_iwd-jsondump3-nl.cwl | 0 .../utils/valid_packed_iwd-jsondump3.cwl | 0 .../cwl1_2/utils/valid_packed_iwd-nolimit.cwl | 0 .../utils/valid_packed_iwd-passthrough1.cwl | 0 .../utils/valid_packed_iwd-passthrough2.cwl | 0 .../utils/valid_packed_iwd-passthrough3.cwl | 0 .../utils/valid_packed_iwd-passthrough4.cwl | 0 .../cwl1_2/utils/valid_packed_iwdr-entry.cwl | 0 ...alid_packed_iwdr_dir_literal_real_file.cwl | 0 .../valid_packed_iwdr_with_nested_dirs.cwl | 0 .../utils/valid_packed_js-input-record.cwl | 0 .../cwl1_2/utils/valid_packed_js-quote.cwl | 0 .../cwl1_2/utils/valid_packed_linkfile.cwl | 0 .../utils/valid_packed_listing_deep1.cwl | 0 .../utils/valid_packed_listing_deep2.cwl | 0 .../utils/valid_packed_listing_none1.cwl | 0 .../utils/valid_packed_listing_none2.cwl | 0 .../utils/valid_packed_listing_none3.cwl | 0 .../utils/valid_packed_listing_shallow1.cwl | 0 .../utils/valid_packed_listing_shallow2.cwl | 0 .../utils/valid_packed_loadContents-limit.cwl | 0 .../cwl1_2/utils/valid_packed_metadata.cwl | 0 .../cwl1_2/utils/valid_packed_mkdir.cwl | 0 ...ked_multiple_input_feature_requirement.cwl | 0 .../cwl1_2/utils/valid_packed_nameroot.cwl | 0 .../utils/valid_packed_nested-array.cwl | 0 .../utils/valid_packed_networkaccess.cwl | 0 .../utils/valid_packed_networkaccess2.cwl | 0 .../utils/valid_packed_no-inputs-tool.cwl | 0 .../utils/valid_packed_no-inputs-wf.cwl | 0 .../utils/valid_packed_no-outputs-tool.cwl | 0 .../utils/valid_packed_no-outputs-wf.cwl | 0 .../utils/valid_packed_null-defined.cwl | 0 .../valid_packed_null-expression1-tool.cwl | 0 .../valid_packed_null-expression2-tool.cwl | 0 .../valid_packed_null-expression3-tool.cwl | 0 .../cwl1_2/utils/valid_packed_operation.cwl | 0 ...lid_packed_optional-numerical-output-0.cwl | 0 .../utils/valid_packed_optional-output.cwl | 0 .../valid_packed_output-arrays-file-wf.cwl | 0 .../valid_packed_output-arrays-int-wf.cwl | 0 .../utils/valid_packed_output-arrays-int.cwl | 0 ...packed_output_reference_workflow_input.cwl | 0 .../cwl1_2/utils/valid_packed_params.cwl | 0 .../cwl1_2/utils/valid_packed_params2.cwl | 0 ...d_packed_params_input_length_non_array.cwl | 0 .../utils/valid_packed_parseInt-tool.cwl | 0 .../utils/valid_packed_pass-unconnected.cwl | 0 .../utils/valid_packed_record-in-format.cwl | 0 ...ed_record-in-secondaryFiles-missing-wf.cwl | 0 ...lid_packed_record-in-secondaryFiles-wf.cwl | 0 .../valid_packed_record-in-secondaryFiles.cwl | 0 .../utils/valid_packed_record-order.cwl | 0 .../utils/valid_packed_record-out-format.cwl | 0 ...valid_packed_record-out-secondaryFiles.cwl | 0 .../utils/valid_packed_record-output-wf.cwl | 0 .../utils/valid_packed_record-output.cwl | 0 .../valid_packed_record-sd-secondaryFiles.cwl | 0 .../utils/valid_packed_record_outputeval.cwl | 0 .../valid_packed_record_outputeval_nojs.cwl | 0 ...valid_packed_recursive-input-directory.cwl | 0 .../utils/valid_packed_rename-inputs.cwl | 0 .../utils/valid_packed_rename-outputs.cwl | 0 .../cwl1_2/utils/valid_packed_rename.cwl | 0 .../utils/valid_packed_revsort-abstract.cwl | 0 .../utils/valid_packed_revsort-packed.cwl | 0 .../cwl1_2/utils/valid_packed_revsort.cwl | 0 .../cwl1_2/utils/valid_packed_revtool.cwl | 0 .../utils/valid_packed_runtime-outdir.cwl | 0 .../valid_packed_runtime-paths-distinct.cwl | 0 .../valid_packed_scatter-valueFrom-tool.cwl | 0 ...id_packed_scatter-valuefrom-inputs-wf1.cwl | 0 .../valid_packed_scatter-valuefrom-wf1.cwl | 0 .../valid_packed_scatter-valuefrom-wf2.cwl | 0 .../valid_packed_scatter-valuefrom-wf3.cwl | 0 .../valid_packed_scatter-valuefrom-wf4.cwl | 0 .../valid_packed_scatter-valuefrom-wf5.cwl | 0 .../valid_packed_scatter-valuefrom-wf6.cwl | 0 .../cwl1_2/utils/valid_packed_scatter-wf1.cwl | 0 .../cwl1_2/utils/valid_packed_scatter-wf2.cwl | 0 .../cwl1_2/utils/valid_packed_scatter-wf3.cwl | 0 .../cwl1_2/utils/valid_packed_scatter-wf4.cwl | 0 .../utils/valid_packed_schemadef-tool.cwl | 0 .../utils/valid_packed_schemadef-wf.cwl | 0 ..._packed_schemadef_types_with_import-wf.cwl | 0 .../cwl1_2/utils/valid_packed_search.cwl | 0 .../cwl1_2/utils/valid_packed_shellchar.cwl | 0 .../cwl1_2/utils/valid_packed_shellchar2.cwl | 0 .../valid_packed_size-expression-tool.cwl | 0 .../cwl1_2/utils/valid_packed_sorttool.cwl | 0 .../utils/valid_packed_stage-array-dirs.cwl | 0 .../cwl1_2/utils/valid_packed_stage-array.cwl | 0 .../valid_packed_stage-unprovided-file.cwl | 0 .../utils/valid_packed_stage_file_array.cwl | 0 ...valid_packed_stage_file_array_basename.cwl | 0 ...tage_file_array_basename_and_entryname.cwl | 0 .../cwl1_2/utils/valid_packed_stagefile.cwl | 0 .../utils/valid_packed_stderr-mediumcut.cwl | 0 .../utils/valid_packed_stderr-shortcut.cwl | 0 .../cwl1_2/utils/valid_packed_stderr.cwl | 0 .../valid_packed_stdout_chained_commands.cwl | 0 .../utils/valid_packed_step-valuefrom-wf.cwl | 0 .../utils/valid_packed_step-valuefrom2-wf.cwl | 0 .../utils/valid_packed_step-valuefrom3-wf.cwl | 0 .../utils/valid_packed_step-valuefrom4-wf.cwl | 0 .../utils/valid_packed_step-valuefrom5-wf.cwl | 0 .../utils/valid_packed_steplevel-resreq.cwl | 0 .../utils/valid_packed_storage_float.cwl | 0 .../cwl1_2/utils/valid_packed_sum-wf-noET.cwl | 0 .../cwl1_2/utils/valid_packed_sum-wf.cwl | 0 .../utils/valid_packed_symlink-illegal.cwl | 0 .../utils/valid_packed_symlink-legal.cwl | 0 .../cwl1_2/utils/valid_packed_synth-file.cwl | 0 .../utils/valid_packed_template-tool.cwl | 0 .../utils/valid_packed_test-cwl-out.cwl | 0 .../utils/valid_packed_test-cwl-out2.cwl | 0 .../cwl1_2/utils/valid_packed_timelimit.cwl | 0 .../utils/valid_packed_timelimit2-wf.cwl | 0 .../cwl1_2/utils/valid_packed_timelimit2.cwl | 0 .../utils/valid_packed_timelimit3-wf.cwl | 0 .../cwl1_2/utils/valid_packed_timelimit3.cwl | 0 .../cwl1_2/utils/valid_packed_timelimit4.cwl | 0 .../cwl1_2/utils/valid_packed_timelimit5.cwl | 0 .../cwl1_2/utils/valid_packed_tmap-tool.cwl | 0 .../cwl1_2/utils/valid_packed_tool-v12.cwl | 0 .../cwl1_2/utils/valid_packed_touch.cwl | 0 .../utils/valid_packed_updatedir_inplace.cwl | 0 .../utils/valid_packed_updateval_inplace.cwl | 0 ...d_valid_schemadef_types_with_import-wf.cwl | 0 .../utils/valid_packed_valueFrom-constant.cwl | 0 .../cwl1_2/utils/valid_packed_vf-concat.cwl | 0 .../utils/valid_packed_wc-tool-shortcut.cwl | 0 .../cwl1_2/utils/valid_packed_wc-tool.cwl | 0 .../cwl1_2/utils/valid_packed_wc2-tool.cwl | 0 .../cwl1_2/utils/valid_packed_wc3-tool.cwl | 0 .../cwl1_2/utils/valid_packed_wc4-tool.cwl | 0 .../utils/valid_packed_wf-loadContents.cwl | 0 .../utils/valid_packed_wf-loadContents2.cwl | 0 .../utils/valid_packed_wf-loadContents3.cwl | 0 .../utils/valid_packed_wf-loadContents4.cwl | 0 .../cwl1_2/utils/valid_packed_wf_ren.cwl | 0 .../valid_packed_writable-dir-docker.cwl | 0 .../utils/valid_packed_writable-dir.cwl | 0 .../cwlsdk}/cwl1_2/utils/valid_params.cwl | 0 .../cwlsdk}/cwl1_2/utils/valid_params2.cwl | 0 .../valid_params_input_length_non_array.cwl | 0 .../cwl1_2/utils/valid_parseInt-tool.cwl | 0 .../cwl1_2/utils/valid_pass-unconnected.cwl | 0 .../cwl1_2/utils/valid_record-in-format.cwl | 0 ...id_record-in-secondaryFiles-missing-wf.cwl | 0 .../valid_record-in-secondaryFiles-wf.cwl | 0 .../utils/valid_record-in-secondaryFiles.cwl | 0 .../cwl1_2/utils/valid_record-order.cwl | 0 .../cwl1_2/utils/valid_record-out-format.cwl | 0 .../utils/valid_record-out-secondaryFiles.cwl | 0 .../cwl1_2/utils/valid_record-output-wf.cwl | 0 .../cwl1_2/utils/valid_record-output.cwl | 0 .../utils/valid_record-sd-secondaryFiles.cwl | 0 .../cwl1_2/utils/valid_record_outputeval.cwl | 0 .../utils/valid_record_outputeval_nojs.cwl | 0 .../utils/valid_recursive-input-directory.cwl | 0 .../cwl1_2/utils/valid_rename-inputs.cwl | 0 .../cwl1_2/utils/valid_rename-outputs.cwl | 0 .../cwlsdk}/cwl1_2/utils/valid_rename.cwl | 0 .../cwl1_2/utils/valid_revsort-abstract.cwl | 0 .../cwl1_2/utils/valid_revsort-packed.cwl | 0 .../cwlsdk}/cwl1_2/utils/valid_revsort.cwl | 0 .../cwlsdk}/cwl1_2/utils/valid_revtool.cwl | 0 .../cwl1_2/utils/valid_runtime-outdir.cwl | 0 .../utils/valid_runtime-paths-distinct.cwl | 0 .../utils/valid_scatter-valueFrom-tool.cwl | 0 .../valid_scatter-valuefrom-inputs-wf1.cwl | 0 .../utils/valid_scatter-valuefrom-wf1.cwl | 0 .../utils/valid_scatter-valuefrom-wf2.cwl | 0 .../utils/valid_scatter-valuefrom-wf3.cwl | 0 .../utils/valid_scatter-valuefrom-wf4.cwl | 0 .../utils/valid_scatter-valuefrom-wf5.cwl | 0 .../utils/valid_scatter-valuefrom-wf6.cwl | 0 .../cwl1_2/utils/valid_scatter-wf1.cwl | 0 .../cwl1_2/utils/valid_scatter-wf2.cwl | 0 .../cwl1_2/utils/valid_scatter-wf3.cwl | 0 .../cwl1_2/utils/valid_scatter-wf4.cwl | 0 .../cwl1_2/utils/valid_schemadef-tool.cwl | 0 .../cwl1_2/utils/valid_schemadef-wf.cwl | 0 .../valid_schemadef_types_with_import-wf.cwl | 0 .../cwlsdk}/cwl1_2/utils/valid_search.cwl | 0 .../cwlsdk}/cwl1_2/utils/valid_shellchar.cwl | 0 .../cwlsdk}/cwl1_2/utils/valid_shellchar2.cwl | 0 .../utils/valid_size-expression-tool.cwl | 0 .../cwlsdk}/cwl1_2/utils/valid_sorttool.cwl | 0 .../cwl1_2/utils/valid_stage-array-dirs.cwl | 0 .../cwl1_2/utils/valid_stage-array.cwl | 0 .../utils/valid_stage-unprovided-file.cwl | 0 .../cwl1_2/utils/valid_stage_file_array.cwl | 0 .../utils/valid_stage_file_array_basename.cwl | 0 ...tage_file_array_basename_and_entryname.cwl | 0 .../cwlsdk}/cwl1_2/utils/valid_stagefile.cwl | 0 .../cwl1_2/utils/valid_stderr-mediumcut.cwl | 0 .../cwl1_2/utils/valid_stderr-shortcut.cwl | 0 .../cwlsdk}/cwl1_2/utils/valid_stderr.cwl | 0 .../utils/valid_stdout_chained_commands.cwl | 0 .../cwl1_2/utils/valid_step-valuefrom-wf.cwl | 0 .../cwl1_2/utils/valid_step-valuefrom2-wf.cwl | 0 .../cwl1_2/utils/valid_step-valuefrom3-wf.cwl | 0 .../cwl1_2/utils/valid_step-valuefrom4-wf.cwl | 0 .../cwl1_2/utils/valid_step-valuefrom5-wf.cwl | 0 .../cwl1_2/utils/valid_steplevel-resreq.cwl | 0 .../cwl1_2/utils/valid_storage_float.cwl | 0 .../cwl1_2/utils/valid_sum-wf-noET.cwl | 0 .../cwlsdk}/cwl1_2/utils/valid_sum-wf.cwl | 0 .../cwl1_2/utils/valid_symlink-illegal.cwl | 0 .../cwl1_2/utils/valid_symlink-legal.cwl | 0 .../cwlsdk}/cwl1_2/utils/valid_synth-file.cwl | 0 .../cwl1_2/utils/valid_template-tool.cwl | 0 .../cwl1_2/utils/valid_test-cwl-out.cwl | 0 .../cwl1_2/utils/valid_test-cwl-out2.cwl | 0 .../cwlsdk}/cwl1_2/utils/valid_timelimit.cwl | 0 .../cwl1_2/utils/valid_timelimit2-wf.cwl | 0 .../cwlsdk}/cwl1_2/utils/valid_timelimit2.cwl | 0 .../cwl1_2/utils/valid_timelimit3-wf.cwl | 0 .../cwlsdk}/cwl1_2/utils/valid_timelimit3.cwl | 0 .../cwlsdk}/cwl1_2/utils/valid_timelimit4.cwl | 0 .../cwlsdk}/cwl1_2/utils/valid_timelimit5.cwl | 0 .../cwlsdk}/cwl1_2/utils/valid_tmap-tool.cwl | 0 .../cwlsdk}/cwl1_2/utils/valid_tool-v12.cwl | 0 .../cwlsdk}/cwl1_2/utils/valid_touch.cwl | 0 .../cwl1_2/utils/valid_updatedir_inplace.cwl | 0 .../cwl1_2/utils/valid_updateval_inplace.cwl | 0 .../cwl1_2/utils/valid_valueFrom-constant.cwl | 0 .../cwlsdk}/cwl1_2/utils/valid_vf-concat.cwl | 0 .../cwl1_2/utils/valid_wc-tool-shortcut.cwl | 0 .../cwlsdk}/cwl1_2/utils/valid_wc-tool.cwl | 0 .../cwlsdk}/cwl1_2/utils/valid_wc2-tool.cwl | 0 .../cwlsdk}/cwl1_2/utils/valid_wc3-tool.cwl | 0 .../cwlsdk}/cwl1_2/utils/valid_wc4-tool.cwl | 0 .../cwl1_2/utils/valid_wf-loadContents.cwl | 0 .../cwl1_2/utils/valid_wf-loadContents2.cwl | 0 .../cwl1_2/utils/valid_wf-loadContents3.cwl | 0 .../cwl1_2/utils/valid_wf-loadContents4.cwl | 0 .../cwlsdk}/cwl1_2/utils/valid_wf_ren.cwl | 0 .../utils/valid_writable-dir-docker.cwl | 0 .../cwl1_2/utils/valid_writable-dir.cwl | 0 .../cwlsdk}/cwl1_2/utils/wc-tool.cwl | 0 .../cwlsdk}/cwl1_2/utils/wc2-tool.cwl | 0 .../cwlsdk}/cwl1_2/utils/wc3-tool.cwl | 0 .../cwlsdk}/cwl1_2/utils/whale.txt | 0 1357 files changed, 4036 insertions(+), 1673 deletions(-) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/Any.java (91%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/ArraySchema.java (83%) rename src/main/java/org/{w3id/cwl/cwl1_2 => commonwl/cwlsdk/cwl1_1}/ArraySchemaImpl.java (82%) rename src/main/java/org/{w3id/cwl/cwl1_2 => commonwl/cwlsdk/cwl1_1}/Array_name.java (92%) rename src/main/java/org/{w3id/cwl/cwl1_2 => commonwl/cwlsdk/cwl1_1}/CWLArraySchema.java (83%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/CWLArraySchemaImpl.java (82%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/CWLRecordField.java (85%) rename src/main/java/org/{w3id/cwl/cwl1_2 => commonwl/cwlsdk/cwl1_1}/CWLRecordFieldImpl.java (85%) rename src/main/java/org/{w3id/cwl/cwl1_2 => commonwl/cwlsdk/cwl1_1}/CWLRecordSchema.java (83%) rename src/main/java/org/{w3id/cwl/cwl1_2 => commonwl/cwlsdk/cwl1_1}/CWLRecordSchemaImpl.java (82%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/CWLType.java (93%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/CWLVersion.java (94%) rename src/main/java/org/{w3id/cwl/cwl1_2 => commonwl/cwlsdk/cwl1_1}/CommandInputArraySchema.java (90%) rename src/main/java/org/{w3id/cwl/cwl1_2 => commonwl/cwlsdk/cwl1_1}/CommandInputArraySchemaImpl.java (89%) rename src/main/java/org/{w3id/cwl/cwl1_2 => commonwl/cwlsdk/cwl1_1}/CommandInputEnumSchema.java (90%) rename src/main/java/org/{w3id/cwl/cwl1_2 => commonwl/cwlsdk/cwl1_1}/CommandInputEnumSchemaImpl.java (89%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/CommandInputParameter.java (96%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/CommandInputParameterImpl.java (94%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/CommandInputRecordField.java (96%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/CommandInputRecordFieldImpl.java (93%) rename src/main/java/org/{w3id/cwl/cwl1_2 => commonwl/cwlsdk/cwl1_1}/CommandInputRecordSchema.java (90%) rename src/main/java/org/{w3id/cwl/cwl1_2 => commonwl/cwlsdk/cwl1_1}/CommandInputRecordSchemaImpl.java (89%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/CommandInputSchema.java (76%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/CommandLineBindable.java (82%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/CommandLineBindableImpl.java (80%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/CommandLineBinding.java (96%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/CommandLineBindingImpl.java (92%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/CommandLineTool.java (97%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/CommandLineToolImpl.java (95%) rename src/main/java/org/{w3id/cwl/cwl1_2 => commonwl/cwlsdk/cwl1_1}/CommandLineTool_class.java (92%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/CommandOutputArraySchema.java (88%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/CommandOutputArraySchemaImpl.java (88%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/CommandOutputBinding.java (95%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/CommandOutputBindingImpl.java (91%) rename src/main/java/org/{w3id/cwl/cwl1_2 => commonwl/cwlsdk/cwl1_1}/CommandOutputEnumSchema.java (88%) rename src/main/java/org/{w3id/cwl/cwl1_2 => commonwl/cwlsdk/cwl1_1}/CommandOutputEnumSchemaImpl.java (88%) rename src/main/java/org/{w3id/cwl/cwl1_2 => commonwl/cwlsdk/cwl1_1}/CommandOutputParameter.java (95%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/CommandOutputParameterImpl.java (93%) rename src/main/java/org/{w3id/cwl/cwl1_2 => commonwl/cwlsdk/cwl1_1}/CommandOutputRecordField.java (95%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/CommandOutputRecordFieldImpl.java (93%) rename src/main/java/org/{w3id/cwl/cwl1_2 => commonwl/cwlsdk/cwl1_1}/CommandOutputRecordSchema.java (89%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/CommandOutputRecordSchemaImpl.java (88%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/Directory.java (96%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/DirectoryImpl.java (92%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/Directory_class.java (92%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/Dirent.java (92%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/DirentImpl.java (88%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/DockerRequirement.java (96%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/DockerRequirementImpl.java (92%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/DockerRequirement_class.java (92%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/Documented.java (80%) rename src/main/java/org/{w3id/cwl/cwl1_2 => commonwl/cwlsdk/cwl1_1}/EnumSchema.java (85%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/EnumSchemaImpl.java (85%) rename src/main/java/org/{w3id/cwl/cwl1_2 => commonwl/cwlsdk/cwl1_1}/Enum_name.java (91%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/EnvVarRequirement.java (85%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/EnvVarRequirementImpl.java (82%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/EnvVarRequirement_class.java (92%) rename src/main/java/org/{w3id/cwl/cwl1_2 => commonwl/cwlsdk/cwl1_1}/EnvironmentDef.java (86%) rename src/main/java/org/{w3id/cwl/cwl1_2 => commonwl/cwlsdk/cwl1_1}/EnvironmentDefImpl.java (82%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/Expression.java (92%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/ExpressionTool.java (95%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/ExpressionToolImpl.java (93%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/ExpressionToolOutputParameter.java (95%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/ExpressionToolOutputParameterImpl.java (92%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/ExpressionTool_class.java (92%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/FieldBase.java (94%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/File.java (98%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/FileImpl.java (95%) rename src/main/java/org/{w3id/cwl/cwl1_2 => commonwl/cwlsdk/cwl1_1}/File_class.java (92%) rename src/main/java/org/{w3id/cwl/cwl1_2 => commonwl/cwlsdk/cwl1_1}/IOSchema.java (83%) rename src/main/java/org/{w3id/cwl/cwl1_2 => commonwl/cwlsdk/cwl1_1}/Identified.java (76%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/InitialWorkDirRequirement.java (90%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/InitialWorkDirRequirementImpl.java (85%) rename src/main/java/org/{w3id/cwl/cwl1_2 => commonwl/cwlsdk/cwl1_1}/InitialWorkDirRequirement_class.java (93%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/InlineJavascriptRequirement.java (88%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/InlineJavascriptRequirementImpl.java (84%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/InlineJavascriptRequirement_class.java (93%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/InplaceUpdateRequirement.java (92%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/InplaceUpdateRequirementImpl.java (86%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/InplaceUpdateRequirement_class.java (93%) rename src/main/java/org/{w3id/cwl/cwl1_2 => commonwl/cwlsdk/cwl1_1}/InputArraySchema.java (88%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/InputArraySchemaImpl.java (88%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/InputBinding.java (85%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/InputBindingImpl.java (81%) rename src/main/java/org/{w3id/cwl/cwl1_2 => commonwl/cwlsdk/cwl1_1}/InputEnumSchema.java (88%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/InputEnumSchemaImpl.java (88%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/InputFormat.java (83%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/InputParameter.java (96%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/InputRecordField.java (96%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/InputRecordFieldImpl.java (93%) rename src/main/java/org/{w3id/cwl/cwl1_2 => commonwl/cwlsdk/cwl1_1}/InputRecordSchema.java (88%) rename src/main/java/org/{w3id/cwl/cwl1_2 => commonwl/cwlsdk/cwl1_1}/InputRecordSchemaImpl.java (88%) rename src/main/java/org/{w3id/cwl/cwl1_2 => commonwl/cwlsdk/cwl1_1}/InputSchema.java (83%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/Labeled.java (80%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/LinkMergeMethod.java (92%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/LoadContents.java (88%) rename src/main/java/org/{w3id/cwl/cwl1_2 => commonwl/cwlsdk/cwl1_1}/LoadListingEnum.java (92%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/LoadListingRequirement.java (85%) rename src/main/java/org/{w3id/cwl/cwl1_2 => commonwl/cwlsdk/cwl1_1}/LoadListingRequirementImpl.java (83%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/LoadListingRequirement_class.java (92%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/MapSchema.java (83%) rename src/main/java/org/{w3id/cwl/cwl1_2 => commonwl/cwlsdk/cwl1_1}/MapSchemaImpl.java (82%) rename src/main/java/org/{w3id/cwl/cwl1_2 => commonwl/cwlsdk/cwl1_1}/Map_name.java (91%) rename src/main/java/org/{w3id/cwl/cwl1_2 => commonwl/cwlsdk/cwl1_1}/MultipleInputFeatureRequirement.java (84%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/MultipleInputFeatureRequirementImpl.java (80%) rename src/main/java/org/{w3id/cwl/cwl1_2 => commonwl/cwlsdk/cwl1_1}/MultipleInputFeatureRequirement_class.java (93%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/NetworkAccess.java (88%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/NetworkAccessImpl.java (84%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/NetworkAccess_class.java (92%) rename src/main/java/org/{w3id/cwl/cwl1_2 => commonwl/cwlsdk/cwl1_1}/OutputArraySchema.java (88%) rename src/main/java/org/{w3id/cwl/cwl1_2 => commonwl/cwlsdk/cwl1_1}/OutputArraySchemaImpl.java (88%) rename src/main/java/org/{w3id/cwl/cwl1_2 => commonwl/cwlsdk/cwl1_1}/OutputEnumSchema.java (88%) rename src/main/java/org/{w3id/cwl/cwl1_2 => commonwl/cwlsdk/cwl1_1}/OutputEnumSchemaImpl.java (88%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/OutputFormat.java (81%) rename src/main/java/org/{w3id/cwl/cwl1_2 => commonwl/cwlsdk/cwl1_1}/OutputParameter.java (95%) rename src/main/java/org/{w3id/cwl/cwl1_2 => commonwl/cwlsdk/cwl1_1}/OutputRecordField.java (95%) rename src/main/java/org/{w3id/cwl/cwl1_2 => commonwl/cwlsdk/cwl1_1}/OutputRecordFieldImpl.java (92%) rename src/main/java/org/{w3id/cwl/cwl1_2 => commonwl/cwlsdk/cwl1_1}/OutputRecordSchema.java (88%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/OutputRecordSchemaImpl.java (88%) rename src/main/java/org/{w3id/cwl/cwl1_2 => commonwl/cwlsdk/cwl1_1}/OutputSchema.java (83%) rename src/main/java/org/{w3id/cwl/cwl1_2 => commonwl/cwlsdk/cwl1_1}/Parameter.java (94%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/PrimitiveType.java (93%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/Process.java (94%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/ProcessRequirement.java (82%) rename src/main/java/org/{w3id/cwl/cwl1_2 => commonwl/cwlsdk/cwl1_1}/RecordField.java (87%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/RecordFieldImpl.java (86%) rename src/main/java/org/{w3id/cwl/cwl1_2 => commonwl/cwlsdk/cwl1_1}/RecordSchema.java (83%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/RecordSchemaImpl.java (82%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/Record_name.java (92%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/ResourceRequirement.java (94%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/ResourceRequirementImpl.java (92%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/ResourceRequirement_class.java (92%) rename src/main/java/org/{w3id/cwl/cwl1_2 => commonwl/cwlsdk/cwl1_1}/ScatterFeatureRequirement.java (84%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/ScatterFeatureRequirementImpl.java (80%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/ScatterFeatureRequirement_class.java (93%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/ScatterMethod.java (93%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/SchemaDefRequirement.java (88%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/SchemaDefRequirementImpl.java (84%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/SchemaDefRequirement_class.java (92%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/SecondaryFileSchema.java (93%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/SecondaryFileSchemaImpl.java (87%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/ShellCommandRequirement.java (87%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/ShellCommandRequirementImpl.java (81%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/ShellCommandRequirement_class.java (93%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/Sink.java (84%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/SoftwarePackage.java (94%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/SoftwarePackageImpl.java (89%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/SoftwareRequirement.java (85%) rename src/main/java/org/{w3id/cwl/cwl1_2 => commonwl/cwlsdk/cwl1_1}/SoftwareRequirementImpl.java (82%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/SoftwareRequirement_class.java (92%) rename src/main/java/org/{w3id/cwl/cwl1_2 => commonwl/cwlsdk/cwl1_1}/StepInputExpressionRequirement.java (84%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/StepInputExpressionRequirementImpl.java (80%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/StepInputExpressionRequirement_class.java (93%) rename src/main/java/org/{w3id/cwl/cwl1_2 => commonwl/cwlsdk/cwl1_1}/SubworkflowFeatureRequirement.java (84%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/SubworkflowFeatureRequirementImpl.java (80%) rename src/main/java/org/{w3id/cwl/cwl1_2 => commonwl/cwlsdk/cwl1_1}/SubworkflowFeatureRequirement_class.java (93%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/ToolTimeLimit.java (88%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/ToolTimeLimitImpl.java (83%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/ToolTimeLimit_class.java (92%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/UnionSchema.java (83%) rename src/main/java/org/{w3id/cwl/cwl1_2 => commonwl/cwlsdk/cwl1_1}/UnionSchemaImpl.java (82%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/Union_name.java (92%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/WorkReuse.java (87%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/WorkReuseImpl.java (83%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/WorkReuse_class.java (92%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/Workflow.java (96%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/WorkflowImpl.java (94%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/WorkflowInputParameter.java (96%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/WorkflowInputParameterImpl.java (94%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/WorkflowOutputParameter.java (96%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/WorkflowOutputParameterImpl.java (93%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/WorkflowStep.java (96%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/WorkflowStepImpl.java (94%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/WorkflowStepInput.java (96%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/WorkflowStepInputImpl.java (93%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/WorkflowStepOutput.java (86%) rename src/main/java/org/{w3id/cwl/cwl1_2 => commonwl/cwlsdk/cwl1_1}/WorkflowStepOutputImpl.java (83%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/Workflow_class.java (92%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/package.html (100%) rename src/main/java/org/{w3id/cwl/cwl1_2 => commonwl/cwlsdk/cwl1_1}/stderr.java (91%) rename src/main/java/org/{w3id/cwl/cwl1_2 => commonwl/cwlsdk/cwl1_1}/stdin.java (91%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/stdout.java (91%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/AnyLoader.java (88%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/ArrayLoader.java (96%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/ConstantMaps.java (99%) rename src/main/java/org/{w3id/cwl/cwl1_2 => commonwl/cwlsdk/cwl1_1}/utils/DefaultFetcher.java (97%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/EnumLoader.java (95%) rename src/main/java/org/{w3id/cwl/cwl1_2 => commonwl/cwlsdk/cwl1_1}/utils/ExpressionLoader.java (90%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/Fetcher.java (79%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/IdMapLoader.java (97%) rename src/main/java/org/{w3id/cwl/cwl1_2 => commonwl/cwlsdk/cwl1_1}/utils/Loader.java (99%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/LoaderInstances.java (75%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/LoadingOptions.java (97%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/LoadingOptionsBuilder.java (98%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/MapLoader.java (97%) rename src/main/java/org/{w3id/cwl/cwl1_2 => commonwl/cwlsdk/cwl1_1}/utils/NullLoader.java (87%) rename src/main/java/org/{w3id/cwl/cwl1_2 => commonwl/cwlsdk/cwl1_1}/utils/OneOrListOf.java (96%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/OneOrListOfLoader.java (96%) rename src/main/java/org/{w3id/cwl/cwl1_2 => commonwl/cwlsdk/cwl1_1}/utils/OptionalLoader.java (92%) rename src/main/java/org/{w3id/cwl/cwl1_2 => commonwl/cwlsdk/cwl1_1}/utils/PrimitiveLoader.java (89%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/RecordLoader.java (97%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/RootLoader.java (98%) rename src/main/java/org/{w3id/cwl/cwl1_2 => commonwl/cwlsdk/cwl1_1}/utils/Saveable.java (78%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/SaveableImpl.java (78%) rename src/main/java/org/{w3id/cwl/cwl1_2 => commonwl/cwlsdk/cwl1_1}/utils/SecondaryFilesDslLoader.java (98%) rename src/main/java/org/{w3id/cwl/cwl1_2 => commonwl/cwlsdk/cwl1_1}/utils/TypeDslLoader.java (98%) rename src/main/java/org/{w3id/cwl/cwl1_2 => commonwl/cwlsdk/cwl1_1}/utils/UnionLoader.java (96%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/UriLoader.java (97%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/Uris.java (98%) rename src/main/java/org/{w3id/cwl/cwl1_2 => commonwl/cwlsdk/cwl1_1}/utils/ValidationException.java (98%) rename src/main/java/org/{w3id/cwl/cwl1_2 => commonwl/cwlsdk/cwl1_1}/utils/Validator.java (94%) rename src/main/java/org/{w3id/cwl/cwl1_2 => commonwl/cwlsdk/cwl1_1}/utils/YamlUtils.java (95%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/package.html (53%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/Any.java (91%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/ArraySchema.java (83%) rename src/main/java/org/{w3id/cwl/cwl1_1 => commonwl/cwlsdk/cwl1_2}/ArraySchemaImpl.java (82%) rename src/main/java/org/{w3id/cwl/cwl1_1 => commonwl/cwlsdk/cwl1_2}/Array_name.java (92%) rename src/main/java/org/{w3id/cwl/cwl1_1 => commonwl/cwlsdk/cwl1_2}/CWLArraySchema.java (83%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/CWLArraySchemaImpl.java (82%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/CWLRecordField.java (85%) rename src/main/java/org/{w3id/cwl/cwl1_1 => commonwl/cwlsdk/cwl1_2}/CWLRecordFieldImpl.java (85%) rename src/main/java/org/{w3id/cwl/cwl1_1 => commonwl/cwlsdk/cwl1_2}/CWLRecordSchema.java (83%) rename src/main/java/org/{w3id/cwl/cwl1_1 => commonwl/cwlsdk/cwl1_2}/CWLRecordSchemaImpl.java (82%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/CWLType.java (93%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/CWLVersion.java (95%) rename src/main/java/org/{w3id/cwl/cwl1_1 => commonwl/cwlsdk/cwl1_2}/CommandInputArraySchema.java (90%) rename src/main/java/org/{w3id/cwl/cwl1_1 => commonwl/cwlsdk/cwl1_2}/CommandInputArraySchemaImpl.java (89%) rename src/main/java/org/{w3id/cwl/cwl1_1 => commonwl/cwlsdk/cwl1_2}/CommandInputEnumSchema.java (90%) rename src/main/java/org/{w3id/cwl/cwl1_1 => commonwl/cwlsdk/cwl1_2}/CommandInputEnumSchemaImpl.java (89%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/CommandInputParameter.java (96%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/CommandInputParameterImpl.java (94%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/CommandInputRecordField.java (96%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/CommandInputRecordFieldImpl.java (94%) rename src/main/java/org/{w3id/cwl/cwl1_1 => commonwl/cwlsdk/cwl1_2}/CommandInputRecordSchema.java (90%) rename src/main/java/org/{w3id/cwl/cwl1_1 => commonwl/cwlsdk/cwl1_2}/CommandInputRecordSchemaImpl.java (89%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/CommandInputSchema.java (76%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/CommandLineBindable.java (82%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/CommandLineBindableImpl.java (80%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/CommandLineBinding.java (96%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/CommandLineBindingImpl.java (92%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/CommandLineTool.java (97%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/CommandLineToolImpl.java (95%) rename src/main/java/org/{w3id/cwl/cwl1_1 => commonwl/cwlsdk/cwl1_2}/CommandLineTool_class.java (92%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/CommandOutputArraySchema.java (88%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/CommandOutputArraySchemaImpl.java (88%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/CommandOutputBinding.java (96%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/CommandOutputBindingImpl.java (91%) rename src/main/java/org/{w3id/cwl/cwl1_1 => commonwl/cwlsdk/cwl1_2}/CommandOutputEnumSchema.java (88%) rename src/main/java/org/{w3id/cwl/cwl1_1 => commonwl/cwlsdk/cwl1_2}/CommandOutputEnumSchemaImpl.java (88%) rename src/main/java/org/{w3id/cwl/cwl1_1 => commonwl/cwlsdk/cwl1_2}/CommandOutputParameter.java (95%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/CommandOutputParameterImpl.java (93%) rename src/main/java/org/{w3id/cwl/cwl1_1 => commonwl/cwlsdk/cwl1_2}/CommandOutputRecordField.java (95%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/CommandOutputRecordFieldImpl.java (93%) rename src/main/java/org/{w3id/cwl/cwl1_1 => commonwl/cwlsdk/cwl1_2}/CommandOutputRecordSchema.java (89%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/CommandOutputRecordSchemaImpl.java (88%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/Directory.java (96%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/DirectoryImpl.java (92%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/Directory_class.java (92%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/Dirent.java (95%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/DirentImpl.java (90%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/DockerRequirement.java (96%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/DockerRequirementImpl.java (92%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/DockerRequirement_class.java (92%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/Documented.java (80%) rename src/main/java/org/{w3id/cwl/cwl1_1 => commonwl/cwlsdk/cwl1_2}/EnumSchema.java (85%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/EnumSchemaImpl.java (85%) rename src/main/java/org/{w3id/cwl/cwl1_1 => commonwl/cwlsdk/cwl1_2}/Enum_name.java (91%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/EnvVarRequirement.java (85%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/EnvVarRequirementImpl.java (82%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/EnvVarRequirement_class.java (92%) rename src/main/java/org/{w3id/cwl/cwl1_1 => commonwl/cwlsdk/cwl1_2}/EnvironmentDef.java (86%) rename src/main/java/org/{w3id/cwl/cwl1_1 => commonwl/cwlsdk/cwl1_2}/EnvironmentDefImpl.java (82%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/Expression.java (92%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/ExpressionTool.java (96%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/ExpressionToolImpl.java (94%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/ExpressionToolOutputParameter.java (95%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/ExpressionToolOutputParameterImpl.java (92%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/ExpressionTool_class.java (92%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/FieldBase.java (94%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/File.java (98%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/FileImpl.java (95%) rename src/main/java/org/{w3id/cwl/cwl1_1 => commonwl/cwlsdk/cwl1_2}/File_class.java (92%) rename src/main/java/org/{w3id/cwl/cwl1_1 => commonwl/cwlsdk/cwl1_2}/IOSchema.java (83%) rename src/main/java/org/{w3id/cwl/cwl1_1 => commonwl/cwlsdk/cwl1_2}/Identified.java (76%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/InitialWorkDirRequirement.java (92%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/InitialWorkDirRequirementImpl.java (86%) rename src/main/java/org/{w3id/cwl/cwl1_1 => commonwl/cwlsdk/cwl1_2}/InitialWorkDirRequirement_class.java (93%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/InlineJavascriptRequirement.java (88%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/InlineJavascriptRequirementImpl.java (84%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/InlineJavascriptRequirement_class.java (93%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/InplaceUpdateRequirement.java (92%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/InplaceUpdateRequirementImpl.java (86%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/InplaceUpdateRequirement_class.java (93%) rename src/main/java/org/{w3id/cwl/cwl1_1 => commonwl/cwlsdk/cwl1_2}/InputArraySchema.java (88%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/InputArraySchemaImpl.java (88%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/InputBinding.java (83%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/InputBindingImpl.java (80%) rename src/main/java/org/{w3id/cwl/cwl1_1 => commonwl/cwlsdk/cwl1_2}/InputEnumSchema.java (88%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/InputEnumSchemaImpl.java (88%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/InputFormat.java (83%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/InputParameter.java (96%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/InputRecordField.java (96%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/InputRecordFieldImpl.java (93%) rename src/main/java/org/{w3id/cwl/cwl1_1 => commonwl/cwlsdk/cwl1_2}/InputRecordSchema.java (88%) rename src/main/java/org/{w3id/cwl/cwl1_1 => commonwl/cwlsdk/cwl1_2}/InputRecordSchemaImpl.java (88%) rename src/main/java/org/{w3id/cwl/cwl1_1 => commonwl/cwlsdk/cwl1_2}/InputSchema.java (83%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/Labeled.java (80%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/LinkMergeMethod.java (92%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/LoadContents.java (89%) rename src/main/java/org/{w3id/cwl/cwl1_1 => commonwl/cwlsdk/cwl1_2}/LoadListingEnum.java (92%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/LoadListingRequirement.java (85%) rename src/main/java/org/{w3id/cwl/cwl1_1 => commonwl/cwlsdk/cwl1_2}/LoadListingRequirementImpl.java (83%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/LoadListingRequirement_class.java (92%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/MapSchema.java (83%) rename src/main/java/org/{w3id/cwl/cwl1_1 => commonwl/cwlsdk/cwl1_2}/MapSchemaImpl.java (82%) rename src/main/java/org/{w3id/cwl/cwl1_1 => commonwl/cwlsdk/cwl1_2}/Map_name.java (91%) rename src/main/java/org/{w3id/cwl/cwl1_1 => commonwl/cwlsdk/cwl1_2}/MultipleInputFeatureRequirement.java (84%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/MultipleInputFeatureRequirementImpl.java (80%) rename src/main/java/org/{w3id/cwl/cwl1_1 => commonwl/cwlsdk/cwl1_2}/MultipleInputFeatureRequirement_class.java (93%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/NetworkAccess.java (88%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/NetworkAccessImpl.java (84%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/NetworkAccess_class.java (92%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/Operation.java (96%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/OperationImpl.java (94%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/OperationInputParameter.java (96%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/OperationInputParameterImpl.java (94%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/OperationOutputParameter.java (95%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/OperationOutputParameterImpl.java (92%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/Operation_class.java (92%) rename src/main/java/org/{w3id/cwl/cwl1_1 => commonwl/cwlsdk/cwl1_2}/OutputArraySchema.java (88%) rename src/main/java/org/{w3id/cwl/cwl1_1 => commonwl/cwlsdk/cwl1_2}/OutputArraySchemaImpl.java (88%) rename src/main/java/org/{w3id/cwl/cwl1_1 => commonwl/cwlsdk/cwl1_2}/OutputEnumSchema.java (88%) rename src/main/java/org/{w3id/cwl/cwl1_1 => commonwl/cwlsdk/cwl1_2}/OutputEnumSchemaImpl.java (88%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/OutputFormat.java (81%) rename src/main/java/org/{w3id/cwl/cwl1_1 => commonwl/cwlsdk/cwl1_2}/OutputParameter.java (95%) rename src/main/java/org/{w3id/cwl/cwl1_1 => commonwl/cwlsdk/cwl1_2}/OutputRecordField.java (95%) rename src/main/java/org/{w3id/cwl/cwl1_1 => commonwl/cwlsdk/cwl1_2}/OutputRecordFieldImpl.java (92%) rename src/main/java/org/{w3id/cwl/cwl1_1 => commonwl/cwlsdk/cwl1_2}/OutputRecordSchema.java (88%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/OutputRecordSchemaImpl.java (88%) rename src/main/java/org/{w3id/cwl/cwl1_1 => commonwl/cwlsdk/cwl1_2}/OutputSchema.java (83%) rename src/main/java/org/{w3id/cwl/cwl1_1 => commonwl/cwlsdk/cwl1_2}/Parameter.java (94%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/PickValueMethod.java (93%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/PrimitiveType.java (93%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/Process.java (95%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/ProcessRequirement.java (82%) rename src/main/java/org/{w3id/cwl/cwl1_1 => commonwl/cwlsdk/cwl1_2}/RecordField.java (87%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/RecordFieldImpl.java (86%) rename src/main/java/org/{w3id/cwl/cwl1_1 => commonwl/cwlsdk/cwl1_2}/RecordSchema.java (83%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/RecordSchemaImpl.java (82%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/Record_name.java (92%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/ResourceRequirement.java (96%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/ResourceRequirementImpl.java (93%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/ResourceRequirement_class.java (92%) rename src/main/java/org/{w3id/cwl/cwl1_1 => commonwl/cwlsdk/cwl1_2}/ScatterFeatureRequirement.java (84%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/ScatterFeatureRequirementImpl.java (80%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/ScatterFeatureRequirement_class.java (93%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/ScatterMethod.java (93%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/SchemaDefRequirement.java (89%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/SchemaDefRequirementImpl.java (84%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/SchemaDefRequirement_class.java (92%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/SecondaryFileSchema.java (95%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/SecondaryFileSchemaImpl.java (89%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/ShellCommandRequirement.java (87%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/ShellCommandRequirementImpl.java (81%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/ShellCommandRequirement_class.java (93%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/Sink.java (87%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/SoftwarePackage.java (94%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/SoftwarePackageImpl.java (89%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/SoftwareRequirement.java (85%) rename src/main/java/org/{w3id/cwl/cwl1_1 => commonwl/cwlsdk/cwl1_2}/SoftwareRequirementImpl.java (82%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/SoftwareRequirement_class.java (92%) rename src/main/java/org/{w3id/cwl/cwl1_1 => commonwl/cwlsdk/cwl1_2}/StepInputExpressionRequirement.java (84%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/StepInputExpressionRequirementImpl.java (80%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/StepInputExpressionRequirement_class.java (93%) rename src/main/java/org/{w3id/cwl/cwl1_1 => commonwl/cwlsdk/cwl1_2}/SubworkflowFeatureRequirement.java (84%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/SubworkflowFeatureRequirementImpl.java (80%) rename src/main/java/org/{w3id/cwl/cwl1_1 => commonwl/cwlsdk/cwl1_2}/SubworkflowFeatureRequirement_class.java (93%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/ToolTimeLimit.java (88%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/ToolTimeLimitImpl.java (83%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/ToolTimeLimit_class.java (92%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/UnionSchema.java (83%) rename src/main/java/org/{w3id/cwl/cwl1_1 => commonwl/cwlsdk/cwl1_2}/UnionSchemaImpl.java (82%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/Union_name.java (92%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/WorkReuse.java (87%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/WorkReuseImpl.java (83%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/WorkReuse_class.java (92%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/Workflow.java (97%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/WorkflowImpl.java (95%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/WorkflowInputParameter.java (96%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/WorkflowInputParameterImpl.java (94%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/WorkflowOutputParameter.java (96%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/WorkflowOutputParameterImpl.java (94%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/WorkflowStep.java (97%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/WorkflowStepImpl.java (94%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/WorkflowStepInput.java (97%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/WorkflowStepInputImpl.java (94%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/WorkflowStepOutput.java (86%) rename src/main/java/org/{w3id/cwl/cwl1_1 => commonwl/cwlsdk/cwl1_2}/WorkflowStepOutputImpl.java (83%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/Workflow_class.java (92%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/package.html (100%) rename src/main/java/org/{w3id/cwl/cwl1_1 => commonwl/cwlsdk/cwl1_2}/stderr.java (91%) rename src/main/java/org/{w3id/cwl/cwl1_1 => commonwl/cwlsdk/cwl1_2}/stdin.java (91%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/stdout.java (91%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/AnyLoader.java (88%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/ArrayLoader.java (96%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/ConstantMaps.java (99%) rename src/main/java/org/{w3id/cwl/cwl1_1 => commonwl/cwlsdk/cwl1_2}/utils/DefaultFetcher.java (97%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/EnumLoader.java (95%) rename src/main/java/org/{w3id/cwl/cwl1_1 => commonwl/cwlsdk/cwl1_2}/utils/ExpressionLoader.java (90%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/Fetcher.java (79%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/IdMapLoader.java (97%) rename src/main/java/org/{w3id/cwl/cwl1_1 => commonwl/cwlsdk/cwl1_2}/utils/Loader.java (99%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/LoaderInstances.java (75%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/LoadingOptions.java (97%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/LoadingOptionsBuilder.java (98%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/MapLoader.java (97%) rename src/main/java/org/{w3id/cwl/cwl1_1 => commonwl/cwlsdk/cwl1_2}/utils/NullLoader.java (87%) rename src/main/java/org/{w3id/cwl/cwl1_1 => commonwl/cwlsdk/cwl1_2}/utils/OneOrListOf.java (96%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/OneOrListOfLoader.java (96%) rename src/main/java/org/{w3id/cwl/cwl1_1 => commonwl/cwlsdk/cwl1_2}/utils/OptionalLoader.java (92%) rename src/main/java/org/{w3id/cwl/cwl1_1 => commonwl/cwlsdk/cwl1_2}/utils/PrimitiveLoader.java (89%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/RecordLoader.java (97%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/RootLoader.java (98%) rename src/main/java/org/{w3id/cwl/cwl1_1 => commonwl/cwlsdk/cwl1_2}/utils/Saveable.java (78%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/SaveableImpl.java (78%) rename src/main/java/org/{w3id/cwl/cwl1_1 => commonwl/cwlsdk/cwl1_2}/utils/SecondaryFilesDslLoader.java (98%) rename src/main/java/org/{w3id/cwl/cwl1_1 => commonwl/cwlsdk/cwl1_2}/utils/TypeDslLoader.java (98%) rename src/main/java/org/{w3id/cwl/cwl1_1 => commonwl/cwlsdk/cwl1_2}/utils/UnionLoader.java (96%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/UriLoader.java (97%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/Uris.java (98%) rename src/main/java/org/{w3id/cwl/cwl1_1 => commonwl/cwlsdk/cwl1_2}/utils/ValidationException.java (98%) rename src/main/java/org/{w3id/cwl/cwl1_1 => commonwl/cwlsdk/cwl1_2}/utils/Validator.java (94%) rename src/main/java/org/{w3id/cwl/cwl1_1 => commonwl/cwlsdk/cwl1_2}/utils/YamlUtils.java (95%) rename src/main/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/package.html (53%) rename src/test/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/AnonymousRecordTest.java (88%) rename src/test/java/org/{w3id/cwl/cwl1_2 => commonwl/cwlsdk/cwl1_1}/utils/DefaultFetcherTest.java (96%) rename src/test/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/ExamplesTest.java (99%) rename src/test/java/org/{w3id/cwl/cwl1_2 => commonwl/cwlsdk/cwl1_1}/utils/PackedWorkflowClassTest.java (83%) rename src/test/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/RequirementsClassTest.java (88%) rename src/test/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/SchemaDefTest.java (89%) rename src/test/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/SecondaryFilesTest.java (87%) rename src/test/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/ShortnameTest.java (96%) rename src/test/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/WorkflowClassTest.java (84%) rename src/test/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/YamlUtilsTest.java (89%) rename src/test/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/AnonymousRecordTest.java (88%) rename src/test/java/org/{w3id/cwl/cwl1_1 => commonwl/cwlsdk/cwl1_2}/utils/DefaultFetcherTest.java (96%) rename src/test/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/ExamplesTest.java (99%) rename src/test/java/org/{w3id/cwl/cwl1_1 => commonwl/cwlsdk/cwl1_2}/utils/PackedWorkflowClassTest.java (83%) rename src/test/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/RequirementsClassTest.java (88%) rename src/test/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/SchemaDefTest.java (89%) rename src/test/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/SecondaryFilesTest.java (87%) rename src/test/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/ShortnameTest.java (96%) rename src/test/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/WorkflowClassTest.java (84%) rename src/test/java/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/YamlUtilsTest.java (89%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/525.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/capture_kit.yml (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/envvar.yml (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/params_inc.yml (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/record-in-format.cwl.json (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/schemadef-type.yml (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/underscore.js (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_anon_enum_inside_array.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_anon_enum_inside_array_inside_schemadef.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_any-type-compat.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_basename-fields-test.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_binding-test.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_bool-empty-inputbinding.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_bwa-mem-tool.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_cat-from-dir.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_cat-tool.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_cat1-testcli.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_cat3-from-dir.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_cat3-nodocker.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_cat3-tool-docker.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_cat3-tool-mediumcut.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_cat3-tool-shortcut.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_cat3-tool.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_cat4-tool.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_cat5-tool.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_conflict-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_count-lines1-wf-noET.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_count-lines1-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_count-lines10-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_count-lines11-extra-step-wf-noET.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_count-lines11-extra-step-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_count-lines11-null-step-wf-noET.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_count-lines11-null-step-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_count-lines11-wf-noET.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_count-lines11-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_count-lines12-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_count-lines13-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_count-lines14-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_count-lines15-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_count-lines16-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_count-lines17-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_count-lines18-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_count-lines2-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_count-lines3-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_count-lines4-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_count-lines5-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_count-lines6-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_count-lines7-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_count-lines8-wf-noET.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_count-lines8-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_count-lines9-wf-noET.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_count-lines9-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_default_path.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_dir.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_dir2.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_dir3.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_dir4.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_dir5.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_dir6.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_dir7.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_docker-array-secondaryfiles.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_docker-output-dir.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_docker-run-cmd.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_dynresreq-default.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_dynresreq-dir.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_dynresreq-workflow-inputdefault.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_dynresreq-workflow-stepdefault.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_dynresreq-workflow-tooldefault.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_dynresreq-workflow.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_dynresreq.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_echo-file-tool.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_echo-position-expr.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_echo-tool-default.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_echo-tool-packed.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_echo-tool-packed2.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_echo-tool.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_echo-wf-default.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_empty-array-input.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_env-tool1.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_env-tool2.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_env-tool3.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_env-tool4.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_env-wf1.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_env-wf2.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_env-wf3.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_envvar.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_envvar2.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_envvar3.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_exit-success.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_exitcode.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_fail-unconnected.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_fail-unspecified-input.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_file-literal-ex.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_formattest.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_formattest2.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_formattest3.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_glob-expr-list.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_glob-path-error.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_glob_directory.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_glob_test.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_import_schema-def.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_import_schema-def_packed.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_imported-hint.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_initialwork-path.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_initialworkdir-glob-fullpath.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_initialworkdirrequirement-docker-out.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_inline-js.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_inp_update_wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_inpdir_update_wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_io-any-1.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_io-any-wf-1.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_io-file-default-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_io-file-or-files.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_io-int-default-tool-and-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_io-int-default-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_io-int-optional-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_io-int-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_io-union-input-default-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_iwdr-entry.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_iwdr_with_nested_dirs.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_js-expr-req-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_linkfile.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_listing_deep1.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_listing_deep2.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_listing_none1.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_listing_none2.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_listing_none3.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_listing_shallow1.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_listing_shallow2.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_metadata.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_mkdir.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_nameroot.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_nested-array.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_networkaccess.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_networkaccess2.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_no-inputs-tool.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_no-inputs-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_no-outputs-tool.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_no-outputs-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_null-defined.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_null-expression1-tool.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_null-expression2-tool.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_null-expression3-tool.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_optional-numerical-output-0.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_optional-output.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_output-arrays-file-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_output-arrays-int-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_output-arrays-int.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_params.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_params2.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_parseInt-tool.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_pass-unconnected.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_record-in-format.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_record-in-secondaryFiles-missing-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_record-in-secondaryFiles-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_record-in-secondaryFiles.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_record-out-format.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_record-out-secondaryFiles.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_record-output-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_record-output.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_record-sd-secondaryFiles.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_recursive-input-directory.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_rename.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_revsort-packed.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_revsort.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_revtool.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_runtime-paths-distinct.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_scatter-valueFrom-tool.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_scatter-valuefrom-inputs-wf1.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_scatter-valuefrom-wf1.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_scatter-valuefrom-wf2.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_scatter-valuefrom-wf3.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_scatter-valuefrom-wf4.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_scatter-valuefrom-wf5.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_scatter-valuefrom-wf6.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_scatter-wf1.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_scatter-wf2.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_scatter-wf3.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_scatter-wf4.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_schemadef-tool.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_schemadef-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_search.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_shellchar.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_shellchar2.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_size-expression-tool.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_sorttool.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_stage-array-dirs.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_stage-array.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_stage-unprovided-file.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_stage_file_array.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_stage_file_array_basename.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_stage_file_array_basename_and_entryname.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_stagefile.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_stderr-mediumcut.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_stderr-shortcut.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_stderr.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_step-valuefrom-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_step-valuefrom2-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_step-valuefrom3-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_step-valuefrom4-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_step-valuefrom5-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_steplevel-resreq.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_sum-wf-noET.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_sum-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_symlink-illegal.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_symlink-legal.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_template-tool.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_test-cwl-out.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_test-cwl-out2.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_timelimit.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_timelimit2-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_timelimit2.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_timelimit3-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_timelimit3.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_timelimit4.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_timelimit5.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_tmap-tool.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_touch.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_updatedir_inplace.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_updateval_inplace.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_valueFrom-constant.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_vf-concat.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_wc-tool-shortcut.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_wc-tool.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_wc2-tool.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_wc3-tool.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_wc4-tool.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_wf-loadContents.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_wf-loadContents2.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_wf-loadContents3.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_wf-loadContents4.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_writable-dir-docker.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_1/utils/valid_writable-dir.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/525.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/EDAM.owl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/action.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/args.py (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/bar.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/capture_kit.yml (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/cat-tool.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/cat.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/check.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/count-lines1-wf-noET.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/count-lines1-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/dcterms.rdf (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/dynresreq-default.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/dynresreq.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/echo-file-tool.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/echo-tool-default.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/echo-tool.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/env-tool1.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/env-tool2.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/envvar.yml (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/fail-unspecified-input.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/foaf.rdf (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/foo.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/gx_edam.ttl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/hello.txt (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/inp-filelist.txt (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/io-any-1.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/loadit.py (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/mkdir.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/mkfilelist.py (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/null-expression3-tool.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/params_inc.yml (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/parseInt-tool.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/record-in-format.cwl.json (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/record-in-secondaryFiles.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/record-output.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/rename-inputs.yml (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/rename.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/revtool.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/scatter-valueFrom-tool.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/schemadef-tool.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/schemadef-type.yml (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/schemadef_types_with_import-tool.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/schemadef_types_with_import_readgroup.yml (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/search.py (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/sorttool.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/special_file (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/testdir/a (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/testdir/b (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/testdir/c/d (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/touch.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/underscore.js (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/updatedir_inplace.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/updateval.py (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/updateval_inplace.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_action.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_anon_enum_inside_array.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_anon_enum_inside_array_inside_schemadef.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_any-type-compat.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_bar.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_basename-fields-test.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_bash-dollar-quote.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_bash-line-continuation-with-expression.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_bash-line-continuation.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_binding-test.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_bool-empty-inputbinding.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_bwa-mem-tool.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_cat-from-dir.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_cat-tool-shortcut.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_cat-tool.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_cat.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_cat1-testcli.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_cat3-from-dir.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_cat3-nodocker.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_cat3-tool-docker.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_cat3-tool-mediumcut.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_cat3-tool-shortcut.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_cat3-tool.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_cat4-from-dir.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_cat4-tool.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_cat5-tool.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_check.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_colon:test.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_colon_test_output.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_cond-wf-001.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_cond-wf-001_nojs.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_cond-wf-002.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_cond-wf-002_nojs.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_cond-wf-003.1.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_cond-wf-003.1_nojs.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_cond-wf-003.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_cond-wf-003_nojs.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_cond-wf-004.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_cond-wf-004_nojs.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_cond-wf-006.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_cond-wf-006_nojs.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_cond-wf-007.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_cond-wf-007_nojs.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_cond-wf-009.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_cond-wf-009_nojs.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_cond-wf-010.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_cond-wf-010_nojs.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_cond-wf-011.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_cond-wf-011_nojs.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_cond-wf-012.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_cond-wf-012_nojs.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_cond-wf-013.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_cond-wf-013_nojs.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_cond-with-defaults.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_cores_float.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_count-lines1-wf-noET.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_count-lines1-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_count-lines10-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_count-lines11-extra-step-wf-noET.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_count-lines11-extra-step-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_count-lines11-null-step-wf-noET.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_count-lines11-null-step-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_count-lines11-wf-noET.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_count-lines11-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_count-lines12-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_count-lines13-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_count-lines14-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_count-lines15-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_count-lines16-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_count-lines17-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_count-lines18-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_count-lines19-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_count-lines2-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_count-lines3-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_count-lines4-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_count-lines5-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_count-lines6-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_count-lines7-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_count-lines8-wf-noET.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_count-lines8-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_count-lines9-wf-noET.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_count-lines9-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_cwloutput-nolimit.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_default_path.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_dir.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_dir2.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_dir3.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_dir4.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_dir5.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_dir6.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_dir7.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_docker-array-secondaryfiles.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_docker-output-dir.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_docker-run-cmd.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_dynresreq-default.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_dynresreq-dir.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_dynresreq-workflow-inputdefault.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_dynresreq-workflow-stepdefault.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_dynresreq-workflow-tooldefault.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_dynresreq-workflow.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_dynresreq.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_echo-file-tool.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_echo-position-expr.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_echo-tool-default.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_echo-tool-packed.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_echo-tool-packed2.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_echo-tool.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_echo-wf-default.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_empty-array-input.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_env-tool1.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_env-tool2.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_env-tool3.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_env-tool4.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_env-wf1.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_env-wf2.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_env-wf3.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_envvar.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_envvar2.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_envvar3.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_exit-success.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_exitcode.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_fail-unconnected.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_fail-unspecified-input.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_file-literal-ex.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_foo.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_formattest.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_formattest2.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_formattest3.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_glob-expr-list.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_glob-path-error.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_glob_directory.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_glob_test.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_import_schema-def.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_import_schema-def2.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_import_schema-def_packed.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_imported-hint.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_initialwork-path.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_initialworkdir-glob-fullpath.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_initialworkdirrequirement-docker-out.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_inline-js.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_inp_update_wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_inpdir_update_wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_io-any-1.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_io-any-wf-1.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_io-file-default-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_io-file-or-files.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_io-int-default-tool-and-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_io-int-default-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_io-int-optional-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_io-int-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_io-union-input-default-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_iwd-container-entryname1.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_iwd-container-entryname2.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_iwd-container-entryname3.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_iwd-container-entryname4.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_iwd-fileobjs1.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_iwd-fileobjs2.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_iwd-jsondump1-nl.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_iwd-jsondump1.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_iwd-jsondump2-nl.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_iwd-jsondump2.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_iwd-jsondump3-nl.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_iwd-jsondump3.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_iwd-nolimit.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_iwd-passthrough1.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_iwd-passthrough2.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_iwd-passthrough3.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_iwd-passthrough4.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_iwdr-entry.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_iwdr_dir_literal_real_file.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_iwdr_with_nested_dirs.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_js-input-record.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_js-quote.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_linkfile.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_listing_deep1.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_listing_deep2.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_listing_none1.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_listing_none2.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_listing_none3.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_listing_shallow1.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_listing_shallow2.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_loadContents-limit.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_metadata.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_mkdir.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_multiple_input_feature_requirement.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_nameroot.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_nested-array.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_networkaccess.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_networkaccess2.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_no-inputs-tool.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_no-inputs-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_no-outputs-tool.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_no-outputs-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_null-defined.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_null-expression1-tool.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_null-expression2-tool.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_null-expression3-tool.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_operation.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_optional-numerical-output-0.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_optional-output.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_output-arrays-file-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_output-arrays-int-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_output-arrays-int.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_output_reference_workflow_input.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_action.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_anon_enum_inside_array.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_anon_enum_inside_array_inside_schemadef.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_any-type-compat.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_bar.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_basename-fields-test.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_bash-dollar-quote.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_bash-line-continuation-with-expression.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_bash-line-continuation.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_binding-test.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_bool-empty-inputbinding.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_bwa-mem-tool.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_cat-from-dir.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_cat-tool-shortcut.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_cat-tool.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_cat.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_cat1-testcli.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_cat3-from-dir.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_cat3-nodocker.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_cat3-tool-docker.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_cat3-tool-mediumcut.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_cat3-tool-shortcut.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_cat3-tool.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_cat4-from-dir.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_cat4-tool.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_cat5-tool.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_check.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_colon:test.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_colon_test_output.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_cond-wf-001.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_cond-wf-001_nojs.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_cond-wf-002.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_cond-wf-002_nojs.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_cond-wf-003.1.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_cond-wf-003.1_nojs.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_cond-wf-003.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_cond-wf-003_nojs.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_cond-wf-004.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_cond-wf-004_nojs.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_cond-wf-006.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_cond-wf-006_nojs.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_cond-wf-007.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_cond-wf-007_nojs.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_cond-wf-009.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_cond-wf-009_nojs.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_cond-wf-010.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_cond-wf-010_nojs.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_cond-wf-011.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_cond-wf-011_nojs.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_cond-wf-012.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_cond-wf-012_nojs.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_cond-wf-013.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_cond-wf-013_nojs.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_cond-with-defaults.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_cores_float.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_count-lines1-wf-noET.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_count-lines1-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_count-lines10-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_count-lines11-extra-step-wf-noET.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_count-lines11-extra-step-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_count-lines11-null-step-wf-noET.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_count-lines11-null-step-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_count-lines11-wf-noET.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_count-lines11-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_count-lines12-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_count-lines13-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_count-lines14-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_count-lines15-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_count-lines16-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_count-lines17-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_count-lines18-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_count-lines19-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_count-lines2-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_count-lines3-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_count-lines4-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_count-lines5-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_count-lines6-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_count-lines7-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_count-lines8-wf-noET.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_count-lines8-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_count-lines9-wf-noET.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_count-lines9-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_cwloutput-nolimit.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_default_path.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_dir.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_dir2.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_dir3.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_dir4.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_dir5.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_dir6.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_dir7.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_docker-array-secondaryfiles.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_docker-output-dir.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_docker-run-cmd.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_dynresreq-default.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_dynresreq-dir.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_dynresreq-workflow-inputdefault.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_dynresreq-workflow-stepdefault.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_dynresreq-workflow-tooldefault.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_dynresreq-workflow.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_dynresreq.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_echo-file-tool.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_echo-position-expr.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_echo-tool-default.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_echo-tool-packed.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_echo-tool-packed2.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_echo-tool.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_echo-wf-default.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_empty-array-input.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_env-tool1.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_env-tool2.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_env-tool3.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_env-tool4.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_env-wf1.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_env-wf2.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_env-wf3.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_envvar.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_envvar2.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_envvar3.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_exit-success.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_exitcode.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_fail-unconnected.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_fail-unspecified-input.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_file-literal-ex.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_foo.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_formattest.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_formattest2.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_formattest3.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_glob-expr-list.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_glob-path-error.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_glob_directory.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_glob_test.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_import_schema-def.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_import_schema-def2.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_import_schema-def_packed.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_imported-hint.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_initialwork-path.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_initialworkdir-glob-fullpath.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_initialworkdirrequirement-docker-out.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_inline-js.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_inp_update_wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_inpdir_update_wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_io-any-1.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_io-any-wf-1.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_io-file-default-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_io-file-or-files.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_io-int-default-tool-and-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_io-int-default-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_io-int-optional-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_io-int-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_io-union-input-default-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_iwd-container-entryname1.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_iwd-container-entryname2.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_iwd-container-entryname3.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_iwd-container-entryname4.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_iwd-fileobjs1.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_iwd-fileobjs2.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_iwd-jsondump1-nl.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_iwd-jsondump1.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_iwd-jsondump2-nl.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_iwd-jsondump2.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_iwd-jsondump3-nl.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_iwd-jsondump3.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_iwd-nolimit.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_iwd-passthrough1.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_iwd-passthrough2.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_iwd-passthrough3.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_iwd-passthrough4.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_iwdr-entry.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_iwdr_dir_literal_real_file.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_iwdr_with_nested_dirs.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_js-input-record.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_js-quote.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_linkfile.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_listing_deep1.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_listing_deep2.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_listing_none1.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_listing_none2.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_listing_none3.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_listing_shallow1.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_listing_shallow2.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_loadContents-limit.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_metadata.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_mkdir.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_multiple_input_feature_requirement.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_nameroot.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_nested-array.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_networkaccess.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_networkaccess2.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_no-inputs-tool.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_no-inputs-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_no-outputs-tool.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_no-outputs-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_null-defined.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_null-expression1-tool.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_null-expression2-tool.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_null-expression3-tool.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_operation.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_optional-numerical-output-0.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_optional-output.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_output-arrays-file-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_output-arrays-int-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_output-arrays-int.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_output_reference_workflow_input.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_params.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_params2.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_params_input_length_non_array.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_parseInt-tool.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_pass-unconnected.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_record-in-format.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_record-in-secondaryFiles-missing-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_record-in-secondaryFiles-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_record-in-secondaryFiles.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_record-order.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_record-out-format.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_record-out-secondaryFiles.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_record-output-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_record-output.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_record-sd-secondaryFiles.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_record_outputeval.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_record_outputeval_nojs.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_recursive-input-directory.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_rename-inputs.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_rename-outputs.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_rename.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_revsort-abstract.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_revsort-packed.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_revsort.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_revtool.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_runtime-outdir.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_runtime-paths-distinct.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_scatter-valueFrom-tool.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_scatter-valuefrom-inputs-wf1.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_scatter-valuefrom-wf1.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_scatter-valuefrom-wf2.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_scatter-valuefrom-wf3.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_scatter-valuefrom-wf4.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_scatter-valuefrom-wf5.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_scatter-valuefrom-wf6.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_scatter-wf1.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_scatter-wf2.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_scatter-wf3.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_scatter-wf4.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_schemadef-tool.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_schemadef-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_schemadef_types_with_import-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_search.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_shellchar.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_shellchar2.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_size-expression-tool.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_sorttool.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_stage-array-dirs.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_stage-array.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_stage-unprovided-file.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_stage_file_array.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_stage_file_array_basename.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_stage_file_array_basename_and_entryname.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_stagefile.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_stderr-mediumcut.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_stderr-shortcut.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_stderr.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_stdout_chained_commands.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_step-valuefrom-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_step-valuefrom2-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_step-valuefrom3-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_step-valuefrom4-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_step-valuefrom5-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_steplevel-resreq.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_storage_float.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_sum-wf-noET.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_sum-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_symlink-illegal.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_symlink-legal.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_synth-file.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_template-tool.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_test-cwl-out.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_test-cwl-out2.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_timelimit.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_timelimit2-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_timelimit2.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_timelimit3-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_timelimit3.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_timelimit4.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_timelimit5.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_tmap-tool.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_tool-v12.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_touch.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_updatedir_inplace.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_updateval_inplace.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_valid_schemadef_types_with_import-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_valueFrom-constant.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_vf-concat.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_wc-tool-shortcut.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_wc-tool.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_wc2-tool.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_wc3-tool.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_wc4-tool.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_wf-loadContents.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_wf-loadContents2.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_wf-loadContents3.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_wf-loadContents4.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_wf_ren.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_writable-dir-docker.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_packed_writable-dir.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_params.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_params2.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_params_input_length_non_array.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_parseInt-tool.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_pass-unconnected.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_record-in-format.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_record-in-secondaryFiles-missing-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_record-in-secondaryFiles-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_record-in-secondaryFiles.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_record-order.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_record-out-format.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_record-out-secondaryFiles.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_record-output-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_record-output.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_record-sd-secondaryFiles.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_record_outputeval.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_record_outputeval_nojs.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_recursive-input-directory.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_rename-inputs.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_rename-outputs.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_rename.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_revsort-abstract.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_revsort-packed.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_revsort.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_revtool.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_runtime-outdir.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_runtime-paths-distinct.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_scatter-valueFrom-tool.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_scatter-valuefrom-inputs-wf1.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_scatter-valuefrom-wf1.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_scatter-valuefrom-wf2.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_scatter-valuefrom-wf3.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_scatter-valuefrom-wf4.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_scatter-valuefrom-wf5.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_scatter-valuefrom-wf6.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_scatter-wf1.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_scatter-wf2.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_scatter-wf3.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_scatter-wf4.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_schemadef-tool.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_schemadef-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_schemadef_types_with_import-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_search.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_shellchar.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_shellchar2.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_size-expression-tool.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_sorttool.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_stage-array-dirs.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_stage-array.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_stage-unprovided-file.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_stage_file_array.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_stage_file_array_basename.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_stage_file_array_basename_and_entryname.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_stagefile.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_stderr-mediumcut.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_stderr-shortcut.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_stderr.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_stdout_chained_commands.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_step-valuefrom-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_step-valuefrom2-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_step-valuefrom3-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_step-valuefrom4-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_step-valuefrom5-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_steplevel-resreq.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_storage_float.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_sum-wf-noET.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_sum-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_symlink-illegal.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_symlink-legal.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_synth-file.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_template-tool.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_test-cwl-out.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_test-cwl-out2.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_timelimit.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_timelimit2-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_timelimit2.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_timelimit3-wf.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_timelimit3.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_timelimit4.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_timelimit5.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_tmap-tool.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_tool-v12.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_touch.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_updatedir_inplace.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_updateval_inplace.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_valueFrom-constant.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_vf-concat.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_wc-tool-shortcut.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_wc-tool.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_wc2-tool.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_wc3-tool.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_wc4-tool.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_wf-loadContents.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_wf-loadContents2.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_wf-loadContents3.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_wf-loadContents4.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_wf_ren.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_writable-dir-docker.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/valid_writable-dir.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/wc-tool.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/wc2-tool.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/wc3-tool.cwl (100%) rename src/test/resources/org/{w3id/cwl => commonwl/cwlsdk}/cwl1_2/utils/whale.txt (100%) diff --git a/README.md b/README.md index c3a69e05..75928d4a 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![Coverage Status](https://coveralls.io/repos/github/common-workflow-language/cwljava/badge.svg?branch=cwl-1.2.0)](https://coveralls.io/github/common-workflow-language/cwljava?branch=cwl-1.2.0) -# org.w3id.cwl.cwl1_2 +# org.commonwl.cwlsdk This project contains Java objects and utilities auto-generated by Schema Salad for parsing documents corresponding to the https://w3id.org/cwl/cwl# schema. diff --git a/adding_new_cwl_versions.txt b/adding_new_cwl_versions.txt index e554c7b2..ca4b8c3b 100644 --- a/adding_new_cwl_versions.txt +++ b/adding_new_cwl_versions.txt @@ -6,7 +6,7 @@ git ls-files -- tests | grep cwl$ | xargs -I{} bash -c 'cwltool --relax-path-che mkdir valid-examples; for file in $(cat valid_examples.txt); do cp ${file} valid-examples/valid_$(basename ${file}) ; done # build the Java parser -schema-salad-tool --codegen java --codegen-package org.w3id.cwl.cwl1_1 --codegen-examples ~/cwl-v1.1/valid-examples ~/cwl-v1.1/CommonWorkflowLanguage.yml +schema-salad-tool --codegen java --codegen-package org.commonwl.cwlsdk.cwl1_1 --codegen-examples ~/cwl-v1.1/valid-examples ~/cwl-v1.1/CommonWorkflowLanguage.yml mvn test -# copy missing files into ./src/test/resources/org/w3id/cwl/cwl1_1/utils +# copy missing files into ./src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils diff --git a/pom.xml b/pom.xml index 05f955e9..35ec2597 100644 --- a/pom.xml +++ b/pom.xml @@ -1,8 +1,8 @@ 4.0.0 - org.w3id.cwl.sdk - cwljava + org.commonwl + cwlsdk jar Common Workflow Language SDK Schema Salad for parsing documents corresponding to the https://w3id.org/cwl/cwl# schema.]]> @@ -70,7 +70,7 @@ - org.w3id.cwl.cwl1_2.utils.Validator + org.commonwl.cwlsdk.cwl1_2.utils.Validator diff --git a/src/main/java/org/w3id/cwl/cwl1_1/Any.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/Any.java similarity index 91% rename from src/main/java/org/w3id/cwl/cwl1_1/Any.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/Any.java index 396a0375..bf92975e 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/Any.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/Any.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_1.utils.ValidationException; public enum Any { ANY("Any"); diff --git a/src/main/java/org/w3id/cwl/cwl1_1/ArraySchema.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/ArraySchema.java similarity index 83% rename from src/main/java/org/w3id/cwl/cwl1_1/ArraySchema.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/ArraySchema.java index 88206707..ff57c37f 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/ArraySchema.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/ArraySchema.java @@ -12,14 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/salad#ArraySchema
This interface is implemented by {@link ArraySchemaImpl}
*/ public interface ArraySchema extends Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/salad#items
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/ArraySchemaImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/ArraySchemaImpl.java similarity index 82% rename from src/main/java/org/w3id/cwl/cwl1_2/ArraySchemaImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/ArraySchemaImpl.java index 90458275..5197cb6a 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/ArraySchemaImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/ArraySchemaImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_2.utils.LoaderInstances; -import org.w3id.cwl.cwl1_2.utils.LoadingOptions; -import org.w3id.cwl.cwl1_2.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_2.utils.SaveableImpl; -import org.w3id.cwl.cwl1_2.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_1.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_1.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_1.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/salad#ArraySchema
@@ -27,6 +27,9 @@ public class ArraySchemaImpl extends SaveableImpl implements ArraySchema { private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -56,7 +59,7 @@ public Array_name getType() { } /** - * Used by {@link org.w3id.cwl.cwl1_2.utils.RootLoader} to construct instances of ArraySchemaImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_1.utils.RootLoader} to construct instances of ArraySchemaImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -112,5 +115,14 @@ public ArraySchemaImpl( } this.items = (Object) items; this.type = (Array_name) type; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("items", "type"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_2/Array_name.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/Array_name.java similarity index 92% rename from src/main/java/org/w3id/cwl/cwl1_2/Array_name.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/Array_name.java index 48982ad0..91fdc1fe 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/Array_name.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/Array_name.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_2.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_1.utils.ValidationException; public enum Array_name { ARRAY("array"); diff --git a/src/main/java/org/w3id/cwl/cwl1_2/CWLArraySchema.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/CWLArraySchema.java similarity index 83% rename from src/main/java/org/w3id/cwl/cwl1_2/CWLArraySchema.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/CWLArraySchema.java index 9da23786..9003654e 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/CWLArraySchema.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/CWLArraySchema.java @@ -12,14 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_2.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#CWLArraySchema
This interface is implemented by {@link CWLArraySchemaImpl}
*/ public interface CWLArraySchema extends ArraySchema, Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/salad#items
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_1/CWLArraySchemaImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/CWLArraySchemaImpl.java similarity index 82% rename from src/main/java/org/w3id/cwl/cwl1_1/CWLArraySchemaImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/CWLArraySchemaImpl.java index caca7dd4..8cf046fc 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/CWLArraySchemaImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/CWLArraySchemaImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.LoaderInstances; -import org.w3id.cwl.cwl1_1.utils.LoadingOptions; -import org.w3id.cwl.cwl1_1.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_1.utils.SaveableImpl; -import org.w3id.cwl.cwl1_1.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_1.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_1.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_1.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/cwl#CWLArraySchema
@@ -27,6 +27,9 @@ public class CWLArraySchemaImpl extends SaveableImpl implements CWLArraySchema { private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -56,7 +59,7 @@ public Array_name getType() { } /** - * Used by {@link org.w3id.cwl.cwl1_1.utils.RootLoader} to construct instances of CWLArraySchemaImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_1.utils.RootLoader} to construct instances of CWLArraySchemaImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -112,5 +115,14 @@ public CWLArraySchemaImpl( } this.items = (Object) items; this.type = (Array_name) type; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("items", "type"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_1/CWLRecordField.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/CWLRecordField.java similarity index 85% rename from src/main/java/org/w3id/cwl/cwl1_1/CWLRecordField.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/CWLRecordField.java index c66ccb8c..a5cb4193 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/CWLRecordField.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/CWLRecordField.java @@ -12,14 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#CWLRecordField
This interface is implemented by {@link CWLRecordFieldImpl}
*/ public interface CWLRecordField extends RecordField, Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/salad#RecordField/name
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/CWLRecordFieldImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/CWLRecordFieldImpl.java similarity index 85% rename from src/main/java/org/w3id/cwl/cwl1_2/CWLRecordFieldImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/CWLRecordFieldImpl.java index 334ba626..3dccc3d3 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/CWLRecordFieldImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/CWLRecordFieldImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_2.utils.LoaderInstances; -import org.w3id.cwl.cwl1_2.utils.LoadingOptions; -import org.w3id.cwl.cwl1_2.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_2.utils.SaveableImpl; -import org.w3id.cwl.cwl1_2.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_1.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_1.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_1.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/cwl#CWLRecordField
@@ -27,6 +27,9 @@ public class CWLRecordFieldImpl extends SaveableImpl implements CWLRecordField { private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -70,7 +73,7 @@ public Object getType() { } /** - * Used by {@link org.w3id.cwl.cwl1_2.utils.RootLoader} to construct instances of CWLRecordFieldImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_1.utils.RootLoader} to construct instances of CWLRecordFieldImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -159,5 +162,14 @@ public CWLRecordFieldImpl( this.doc = (Object) doc; this.name = (String) name; this.type = (Object) type; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("doc", "name", "type"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_2/CWLRecordSchema.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/CWLRecordSchema.java similarity index 83% rename from src/main/java/org/w3id/cwl/cwl1_2/CWLRecordSchema.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/CWLRecordSchema.java index 6bc19361..4bdfc29e 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/CWLRecordSchema.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/CWLRecordSchema.java @@ -12,14 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_2.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#CWLRecordSchema
This interface is implemented by {@link CWLRecordSchemaImpl}
*/ public interface CWLRecordSchema extends RecordSchema, Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/salad#fields
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/CWLRecordSchemaImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/CWLRecordSchemaImpl.java similarity index 82% rename from src/main/java/org/w3id/cwl/cwl1_2/CWLRecordSchemaImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/CWLRecordSchemaImpl.java index e423a1aa..4e2aa4be 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/CWLRecordSchemaImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/CWLRecordSchemaImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_2.utils.LoaderInstances; -import org.w3id.cwl.cwl1_2.utils.LoadingOptions; -import org.w3id.cwl.cwl1_2.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_2.utils.SaveableImpl; -import org.w3id.cwl.cwl1_2.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_1.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_1.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_1.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/cwl#CWLRecordSchema
@@ -27,6 +27,9 @@ public class CWLRecordSchemaImpl extends SaveableImpl implements CWLRecordSchema private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -56,7 +59,7 @@ public Record_name getType() { } /** - * Used by {@link org.w3id.cwl.cwl1_2.utils.RootLoader} to construct instances of CWLRecordSchemaImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_1.utils.RootLoader} to construct instances of CWLRecordSchemaImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -118,5 +121,14 @@ public CWLRecordSchemaImpl( } this.fields = (java.util.Optional>) fields; this.type = (Record_name) type; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("fields", "type"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_1/CWLType.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/CWLType.java similarity index 93% rename from src/main/java/org/w3id/cwl/cwl1_1/CWLType.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/CWLType.java index 3d1902c8..e0037687 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/CWLType.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/CWLType.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_1.utils.ValidationException; public enum CWLType { NULL("null"), diff --git a/src/main/java/org/w3id/cwl/cwl1_1/CWLVersion.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/CWLVersion.java similarity index 94% rename from src/main/java/org/w3id/cwl/cwl1_1/CWLVersion.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/CWLVersion.java index ec233550..02f81525 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/CWLVersion.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/CWLVersion.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_1.utils.ValidationException; public enum CWLVersion { DRAFT_2("draft-2"), diff --git a/src/main/java/org/w3id/cwl/cwl1_2/CommandInputArraySchema.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/CommandInputArraySchema.java similarity index 90% rename from src/main/java/org/w3id/cwl/cwl1_2/CommandInputArraySchema.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/CommandInputArraySchema.java index 9dbdeb84..56eeef7c 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/CommandInputArraySchema.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/CommandInputArraySchema.java @@ -12,14 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_2.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#CommandInputArraySchema
This interface is implemented by {@link CommandInputArraySchemaImpl}
*/ public interface CommandInputArraySchema extends InputArraySchema, CommandInputSchema, CommandLineBindable, Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#IOSchema/name
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/CommandInputArraySchemaImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/CommandInputArraySchemaImpl.java similarity index 89% rename from src/main/java/org/w3id/cwl/cwl1_2/CommandInputArraySchemaImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/CommandInputArraySchemaImpl.java index 2e1bd0fb..9da0e555 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/CommandInputArraySchemaImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/CommandInputArraySchemaImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_2.utils.LoaderInstances; -import org.w3id.cwl.cwl1_2.utils.LoadingOptions; -import org.w3id.cwl.cwl1_2.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_2.utils.SaveableImpl; -import org.w3id.cwl.cwl1_2.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_1.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_1.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_1.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/cwl#CommandInputArraySchema
@@ -27,6 +27,9 @@ public class CommandInputArraySchemaImpl extends SaveableImpl implements Command private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -104,7 +107,7 @@ public java.util.Optional getInputBinding() { } /** - * Used by {@link org.w3id.cwl.cwl1_2.utils.RootLoader} to construct instances of CommandInputArraySchemaImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_1.utils.RootLoader} to construct instances of CommandInputArraySchemaImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -246,5 +249,14 @@ public CommandInputArraySchemaImpl( this.doc = (Object) doc; this.name = (java.util.Optional) name; this.inputBinding = (java.util.Optional) inputBinding; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("items", "type", "label", "doc", "name", "inputBinding"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_2/CommandInputEnumSchema.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/CommandInputEnumSchema.java similarity index 90% rename from src/main/java/org/w3id/cwl/cwl1_2/CommandInputEnumSchema.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/CommandInputEnumSchema.java index b0e5f58c..0a97a945 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/CommandInputEnumSchema.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/CommandInputEnumSchema.java @@ -12,14 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_2.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#CommandInputEnumSchema
This interface is implemented by {@link CommandInputEnumSchemaImpl}
*/ public interface CommandInputEnumSchema extends InputEnumSchema, CommandInputSchema, CommandLineBindable, Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#IOSchema/name
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/CommandInputEnumSchemaImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/CommandInputEnumSchemaImpl.java similarity index 89% rename from src/main/java/org/w3id/cwl/cwl1_2/CommandInputEnumSchemaImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/CommandInputEnumSchemaImpl.java index bc010454..c75f93ea 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/CommandInputEnumSchemaImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/CommandInputEnumSchemaImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_2.utils.LoaderInstances; -import org.w3id.cwl.cwl1_2.utils.LoadingOptions; -import org.w3id.cwl.cwl1_2.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_2.utils.SaveableImpl; -import org.w3id.cwl.cwl1_2.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_1.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_1.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_1.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/cwl#CommandInputEnumSchema
@@ -27,6 +27,9 @@ public class CommandInputEnumSchemaImpl extends SaveableImpl implements CommandI private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -104,7 +107,7 @@ public java.util.Optional getInputBinding() { } /** - * Used by {@link org.w3id.cwl.cwl1_2.utils.RootLoader} to construct instances of CommandInputEnumSchemaImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_1.utils.RootLoader} to construct instances of CommandInputEnumSchemaImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -246,5 +249,14 @@ public CommandInputEnumSchemaImpl( this.label = (java.util.Optional) label; this.doc = (Object) doc; this.inputBinding = (java.util.Optional) inputBinding; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("name", "symbols", "type", "label", "doc", "inputBinding"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_1/CommandInputParameter.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/CommandInputParameter.java similarity index 96% rename from src/main/java/org/w3id/cwl/cwl1_1/CommandInputParameter.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/CommandInputParameter.java index e4529ebb..950f71bd 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/CommandInputParameter.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/CommandInputParameter.java @@ -12,15 +12,20 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#CommandInputParameter
This interface is implemented by {@link CommandInputParameterImpl}
An input parameter for a CommandLineTool.
*/ public interface CommandInputParameter extends InputParameter, Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#Identified/id
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_1/CommandInputParameterImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/CommandInputParameterImpl.java similarity index 94% rename from src/main/java/org/w3id/cwl/cwl1_1/CommandInputParameterImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/CommandInputParameterImpl.java index d0ab6b8a..6d30b778 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/CommandInputParameterImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/CommandInputParameterImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.LoaderInstances; -import org.w3id.cwl.cwl1_1.utils.LoadingOptions; -import org.w3id.cwl.cwl1_1.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_1.utils.SaveableImpl; -import org.w3id.cwl.cwl1_1.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_1.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_1.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_1.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/cwl#CommandInputParameter
@@ -28,6 +28,9 @@ public class CommandInputParameterImpl extends SaveableImpl implements CommandIn private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -239,7 +242,7 @@ public java.util.Optional getInputBinding() { } /** - * Used by {@link org.w3id.cwl.cwl1_1.utils.RootLoader} to construct instances of CommandInputParameterImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_1.utils.RootLoader} to construct instances of CommandInputParameterImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -477,5 +480,14 @@ public CommandInputParameterImpl( this.default_ = (java.util.Optional) default_; this.type = (Object) type; this.inputBinding = (java.util.Optional) inputBinding; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("label", "secondaryFiles", "streamable", "doc", "id", "format", "loadContents", "loadListing", "default", "type", "inputBinding"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_1/CommandInputRecordField.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/CommandInputRecordField.java similarity index 96% rename from src/main/java/org/w3id/cwl/cwl1_1/CommandInputRecordField.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/CommandInputRecordField.java index 7ac737f2..7b51b9d0 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/CommandInputRecordField.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/CommandInputRecordField.java @@ -12,14 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#CommandInputRecordField
This interface is implemented by {@link CommandInputRecordFieldImpl}
*/ public interface CommandInputRecordField extends InputRecordField, CommandLineBindable, Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/salad#RecordField/name
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_1/CommandInputRecordFieldImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/CommandInputRecordFieldImpl.java similarity index 93% rename from src/main/java/org/w3id/cwl/cwl1_1/CommandInputRecordFieldImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/CommandInputRecordFieldImpl.java index a938bd05..bdc8c333 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/CommandInputRecordFieldImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/CommandInputRecordFieldImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.LoaderInstances; -import org.w3id.cwl.cwl1_1.utils.LoadingOptions; -import org.w3id.cwl.cwl1_1.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_1.utils.SaveableImpl; -import org.w3id.cwl.cwl1_1.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_1.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_1.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_1.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/cwl#CommandInputRecordField
@@ -27,6 +27,9 @@ public class CommandInputRecordFieldImpl extends SaveableImpl implements Command private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -221,7 +224,7 @@ public java.util.Optional getInputBinding() { } /** - * Used by {@link org.w3id.cwl.cwl1_1.utils.RootLoader} to construct instances of CommandInputRecordFieldImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_1.utils.RootLoader} to construct instances of CommandInputRecordFieldImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -436,5 +439,14 @@ public CommandInputRecordFieldImpl( this.loadContents = (java.util.Optional) loadContents; this.loadListing = (java.util.Optional) loadListing; this.inputBinding = (java.util.Optional) inputBinding; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("doc", "name", "type", "label", "secondaryFiles", "streamable", "format", "loadContents", "loadListing", "inputBinding"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_2/CommandInputRecordSchema.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/CommandInputRecordSchema.java similarity index 90% rename from src/main/java/org/w3id/cwl/cwl1_2/CommandInputRecordSchema.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/CommandInputRecordSchema.java index 96efd636..20b6db9d 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/CommandInputRecordSchema.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/CommandInputRecordSchema.java @@ -12,14 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_2.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#CommandInputRecordSchema
This interface is implemented by {@link CommandInputRecordSchemaImpl}
*/ public interface CommandInputRecordSchema extends InputRecordSchema, CommandInputSchema, CommandLineBindable, Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#IOSchema/name
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/CommandInputRecordSchemaImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/CommandInputRecordSchemaImpl.java similarity index 89% rename from src/main/java/org/w3id/cwl/cwl1_2/CommandInputRecordSchemaImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/CommandInputRecordSchemaImpl.java index 6bcac93d..2c546a5f 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/CommandInputRecordSchemaImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/CommandInputRecordSchemaImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_2.utils.LoaderInstances; -import org.w3id.cwl.cwl1_2.utils.LoadingOptions; -import org.w3id.cwl.cwl1_2.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_2.utils.SaveableImpl; -import org.w3id.cwl.cwl1_2.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_1.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_1.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_1.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/cwl#CommandInputRecordSchema
@@ -27,6 +27,9 @@ public class CommandInputRecordSchemaImpl extends SaveableImpl implements Comman private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -104,7 +107,7 @@ public java.util.Optional getInputBinding() { } /** - * Used by {@link org.w3id.cwl.cwl1_2.utils.RootLoader} to construct instances of CommandInputRecordSchemaImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_1.utils.RootLoader} to construct instances of CommandInputRecordSchemaImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -252,5 +255,14 @@ public CommandInputRecordSchemaImpl( this.doc = (Object) doc; this.name = (java.util.Optional) name; this.inputBinding = (java.util.Optional) inputBinding; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("fields", "type", "label", "doc", "name", "inputBinding"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_1/CommandInputSchema.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/CommandInputSchema.java similarity index 76% rename from src/main/java/org/w3id/cwl/cwl1_1/CommandInputSchema.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/CommandInputSchema.java index 3cfd0a73..1bd47582 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/CommandInputSchema.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/CommandInputSchema.java @@ -12,12 +12,17 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#CommandInputSchema
*/ public interface CommandInputSchema extends Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + } diff --git a/src/main/java/org/w3id/cwl/cwl1_1/CommandLineBindable.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/CommandLineBindable.java similarity index 82% rename from src/main/java/org/w3id/cwl/cwl1_1/CommandLineBindable.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/CommandLineBindable.java index b9189232..a4777934 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/CommandLineBindable.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/CommandLineBindable.java @@ -12,14 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#CommandLineBindable
This interface is implemented by {@link CommandLineBindableImpl}
*/ public interface CommandLineBindable extends Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#CommandLineBindable/inputBinding
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_1/CommandLineBindableImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/CommandLineBindableImpl.java similarity index 80% rename from src/main/java/org/w3id/cwl/cwl1_1/CommandLineBindableImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/CommandLineBindableImpl.java index abd40db4..818a1cce 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/CommandLineBindableImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/CommandLineBindableImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.LoaderInstances; -import org.w3id.cwl.cwl1_1.utils.LoadingOptions; -import org.w3id.cwl.cwl1_1.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_1.utils.SaveableImpl; -import org.w3id.cwl.cwl1_1.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_1.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_1.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_1.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/cwl#CommandLineBindable
@@ -27,6 +27,9 @@ public class CommandLineBindableImpl extends SaveableImpl implements CommandLine private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -44,7 +47,7 @@ public java.util.Optional getInputBinding() { } /** - * Used by {@link org.w3id.cwl.cwl1_1.utils.RootLoader} to construct instances of CommandLineBindableImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_1.utils.RootLoader} to construct instances of CommandLineBindableImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -94,5 +97,14 @@ public CommandLineBindableImpl( throw new ValidationException("Trying 'RecordField'", __errors); } this.inputBinding = (java.util.Optional) inputBinding; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("inputBinding"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_1/CommandLineBinding.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/CommandLineBinding.java similarity index 96% rename from src/main/java/org/w3id/cwl/cwl1_1/CommandLineBinding.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/CommandLineBinding.java index 111257b3..b1c37c5f 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/CommandLineBinding.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/CommandLineBinding.java @@ -12,9 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#CommandLineBinding
This interface is implemented by {@link CommandLineBindingImpl}
@@ -56,6 +57,10 @@
*/ public interface CommandLineBinding extends InputBinding, Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#InputBinding/loadContents
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_1/CommandLineBindingImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/CommandLineBindingImpl.java similarity index 92% rename from src/main/java/org/w3id/cwl/cwl1_1/CommandLineBindingImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/CommandLineBindingImpl.java index 2409509f..6e7a6deb 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/CommandLineBindingImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/CommandLineBindingImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.LoaderInstances; -import org.w3id.cwl.cwl1_1.utils.LoadingOptions; -import org.w3id.cwl.cwl1_1.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_1.utils.SaveableImpl; -import org.w3id.cwl.cwl1_1.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_1.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_1.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_1.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/cwl#CommandLineBinding
@@ -63,6 +63,9 @@ public class CommandLineBindingImpl extends SaveableImpl implements CommandLineB private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -193,7 +196,7 @@ public java.util.Optional getShellQuote() { } /** - * Used by {@link org.w3id.cwl.cwl1_1.utils.RootLoader} to construct instances of CommandLineBindingImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_1.utils.RootLoader} to construct instances of CommandLineBindingImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -351,5 +354,14 @@ public CommandLineBindingImpl( this.itemSeparator = (java.util.Optional) itemSeparator; this.valueFrom = (Object) valueFrom; this.shellQuote = (java.util.Optional) shellQuote; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("loadContents", "position", "prefix", "separate", "itemSeparator", "valueFrom", "shellQuote"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_1/CommandLineTool.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/CommandLineTool.java similarity index 97% rename from src/main/java/org/w3id/cwl/cwl1_1/CommandLineTool.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/CommandLineTool.java index eb87ca85..56602b42 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/CommandLineTool.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/CommandLineTool.java @@ -12,9 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#CommandLineTool
This interface is implemented by {@link CommandLineToolImpl}
@@ -22,6 +23,10 @@
*/ public interface CommandLineTool extends Process, Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#Identified/id
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_1/CommandLineToolImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/CommandLineToolImpl.java similarity index 95% rename from src/main/java/org/w3id/cwl/cwl1_1/CommandLineToolImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/CommandLineToolImpl.java index 12211748..09b01b2b 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/CommandLineToolImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/CommandLineToolImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.LoaderInstances; -import org.w3id.cwl.cwl1_1.utils.LoadingOptions; -import org.w3id.cwl.cwl1_1.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_1.utils.SaveableImpl; -import org.w3id.cwl.cwl1_1.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_1.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_1.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_1.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/cwl#CommandLineTool
@@ -29,6 +29,9 @@ public class CommandLineToolImpl extends SaveableImpl implements CommandLineTool private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -305,7 +308,7 @@ public java.util.Optional> getPermanentFailCodes() { } /** - * Used by {@link org.w3id.cwl.cwl1_1.utils.RootLoader} to construct instances of CommandLineToolImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_1.utils.RootLoader} to construct instances of CommandLineToolImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -639,5 +642,14 @@ public CommandLineToolImpl( this.successCodes = (java.util.Optional>) successCodes; this.temporaryFailCodes = (java.util.Optional>) temporaryFailCodes; this.permanentFailCodes = (java.util.Optional>) permanentFailCodes; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("id", "label", "doc", "inputs", "outputs", "requirements", "hints", "cwlVersion", "class", "baseCommand", "arguments", "stdin", "stderr", "stdout", "successCodes", "temporaryFailCodes", "permanentFailCodes"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_2/CommandLineTool_class.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/CommandLineTool_class.java similarity index 92% rename from src/main/java/org/w3id/cwl/cwl1_2/CommandLineTool_class.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/CommandLineTool_class.java index 91de36a6..2f18bc27 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/CommandLineTool_class.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/CommandLineTool_class.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_2.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_1.utils.ValidationException; public enum CommandLineTool_class { COMMANDLINETOOL("CommandLineTool"); diff --git a/src/main/java/org/w3id/cwl/cwl1_1/CommandOutputArraySchema.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/CommandOutputArraySchema.java similarity index 88% rename from src/main/java/org/w3id/cwl/cwl1_1/CommandOutputArraySchema.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/CommandOutputArraySchema.java index 1d077adf..ce2a0994 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/CommandOutputArraySchema.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/CommandOutputArraySchema.java @@ -12,14 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#CommandOutputArraySchema
This interface is implemented by {@link CommandOutputArraySchemaImpl}
*/ public interface CommandOutputArraySchema extends OutputArraySchema, Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#IOSchema/name
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_1/CommandOutputArraySchemaImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/CommandOutputArraySchemaImpl.java similarity index 88% rename from src/main/java/org/w3id/cwl/cwl1_1/CommandOutputArraySchemaImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/CommandOutputArraySchemaImpl.java index caf8b958..44253996 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/CommandOutputArraySchemaImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/CommandOutputArraySchemaImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.LoaderInstances; -import org.w3id.cwl.cwl1_1.utils.LoadingOptions; -import org.w3id.cwl.cwl1_1.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_1.utils.SaveableImpl; -import org.w3id.cwl.cwl1_1.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_1.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_1.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_1.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/cwl#CommandOutputArraySchema
@@ -27,6 +27,9 @@ public class CommandOutputArraySchemaImpl extends SaveableImpl implements Comman private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -92,7 +95,7 @@ public Object getDoc() { } /** - * Used by {@link org.w3id.cwl.cwl1_1.utils.RootLoader} to construct instances of CommandOutputArraySchemaImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_1.utils.RootLoader} to construct instances of CommandOutputArraySchemaImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -216,5 +219,14 @@ public CommandOutputArraySchemaImpl( this.label = (java.util.Optional) label; this.doc = (Object) doc; this.name = (java.util.Optional) name; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("items", "type", "label", "doc", "name"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_1/CommandOutputBinding.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/CommandOutputBinding.java similarity index 95% rename from src/main/java/org/w3id/cwl/cwl1_1/CommandOutputBinding.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/CommandOutputBinding.java index b89b32c9..0eaf3c1a 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/CommandOutputBinding.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/CommandOutputBinding.java @@ -12,9 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#CommandOutputBinding
This interface is implemented by {@link CommandOutputBindingImpl}
@@ -31,6 +32,10 @@
*/ public interface CommandOutputBinding extends LoadContents, Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#LoadContents/loadContents
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_1/CommandOutputBindingImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/CommandOutputBindingImpl.java similarity index 91% rename from src/main/java/org/w3id/cwl/cwl1_1/CommandOutputBindingImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/CommandOutputBindingImpl.java index a5eedccc..cadccac1 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/CommandOutputBindingImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/CommandOutputBindingImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.LoaderInstances; -import org.w3id.cwl.cwl1_1.utils.LoadingOptions; -import org.w3id.cwl.cwl1_1.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_1.utils.SaveableImpl; -import org.w3id.cwl.cwl1_1.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_1.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_1.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_1.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/cwl#CommandOutputBinding
@@ -38,6 +38,9 @@ public class CommandOutputBindingImpl extends SaveableImpl implements CommandOut private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -149,7 +152,7 @@ public java.util.Optional getOutputEval() { } /** - * Used by {@link org.w3id.cwl.cwl1_1.utils.RootLoader} to construct instances of CommandOutputBindingImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_1.utils.RootLoader} to construct instances of CommandOutputBindingImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -253,5 +256,14 @@ public CommandOutputBindingImpl( this.loadListing = (java.util.Optional) loadListing; this.glob = (Object) glob; this.outputEval = (java.util.Optional) outputEval; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("loadContents", "loadListing", "glob", "outputEval"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_2/CommandOutputEnumSchema.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/CommandOutputEnumSchema.java similarity index 88% rename from src/main/java/org/w3id/cwl/cwl1_2/CommandOutputEnumSchema.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/CommandOutputEnumSchema.java index cf9aa402..bd5625b6 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/CommandOutputEnumSchema.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/CommandOutputEnumSchema.java @@ -12,14 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_2.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#CommandOutputEnumSchema
This interface is implemented by {@link CommandOutputEnumSchemaImpl}
*/ public interface CommandOutputEnumSchema extends OutputEnumSchema, Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#IOSchema/name
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/CommandOutputEnumSchemaImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/CommandOutputEnumSchemaImpl.java similarity index 88% rename from src/main/java/org/w3id/cwl/cwl1_2/CommandOutputEnumSchemaImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/CommandOutputEnumSchemaImpl.java index ce9d7fe7..136bbd2d 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/CommandOutputEnumSchemaImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/CommandOutputEnumSchemaImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_2.utils.LoaderInstances; -import org.w3id.cwl.cwl1_2.utils.LoadingOptions; -import org.w3id.cwl.cwl1_2.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_2.utils.SaveableImpl; -import org.w3id.cwl.cwl1_2.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_1.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_1.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_1.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/cwl#CommandOutputEnumSchema
@@ -27,6 +27,9 @@ public class CommandOutputEnumSchemaImpl extends SaveableImpl implements Command private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -92,7 +95,7 @@ public Object getDoc() { } /** - * Used by {@link org.w3id.cwl.cwl1_2.utils.RootLoader} to construct instances of CommandOutputEnumSchemaImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_1.utils.RootLoader} to construct instances of CommandOutputEnumSchemaImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -216,5 +219,14 @@ public CommandOutputEnumSchemaImpl( this.type = (Enum_name) type; this.label = (java.util.Optional) label; this.doc = (Object) doc; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("name", "symbols", "type", "label", "doc"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_2/CommandOutputParameter.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/CommandOutputParameter.java similarity index 95% rename from src/main/java/org/w3id/cwl/cwl1_2/CommandOutputParameter.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/CommandOutputParameter.java index ec07146a..86153645 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/CommandOutputParameter.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/CommandOutputParameter.java @@ -12,15 +12,20 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_2.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#CommandOutputParameter
This interface is implemented by {@link CommandOutputParameterImpl}
An output parameter for a CommandLineTool.
*/ public interface CommandOutputParameter extends OutputParameter, Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#Identified/id
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_1/CommandOutputParameterImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/CommandOutputParameterImpl.java similarity index 93% rename from src/main/java/org/w3id/cwl/cwl1_1/CommandOutputParameterImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/CommandOutputParameterImpl.java index 1ca70be7..e39a9a03 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/CommandOutputParameterImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/CommandOutputParameterImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.LoaderInstances; -import org.w3id.cwl.cwl1_1.utils.LoadingOptions; -import org.w3id.cwl.cwl1_1.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_1.utils.SaveableImpl; -import org.w3id.cwl.cwl1_1.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_1.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_1.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_1.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/cwl#CommandOutputParameter
@@ -28,6 +28,9 @@ public class CommandOutputParameterImpl extends SaveableImpl implements CommandO private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -181,7 +184,7 @@ public java.util.Optional getOutputBinding() { } /** - * Used by {@link org.w3id.cwl.cwl1_1.utils.RootLoader} to construct instances of CommandOutputParameterImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_1.utils.RootLoader} to construct instances of CommandOutputParameterImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -365,5 +368,14 @@ public CommandOutputParameterImpl( this.format = (Object) format; this.type = (Object) type; this.outputBinding = (java.util.Optional) outputBinding; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("label", "secondaryFiles", "streamable", "doc", "id", "format", "type", "outputBinding"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_2/CommandOutputRecordField.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/CommandOutputRecordField.java similarity index 95% rename from src/main/java/org/w3id/cwl/cwl1_2/CommandOutputRecordField.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/CommandOutputRecordField.java index b16606a9..538ee909 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/CommandOutputRecordField.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/CommandOutputRecordField.java @@ -12,14 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_2.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#CommandOutputRecordField
This interface is implemented by {@link CommandOutputRecordFieldImpl}
*/ public interface CommandOutputRecordField extends OutputRecordField, Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/salad#RecordField/name
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_1/CommandOutputRecordFieldImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/CommandOutputRecordFieldImpl.java similarity index 93% rename from src/main/java/org/w3id/cwl/cwl1_1/CommandOutputRecordFieldImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/CommandOutputRecordFieldImpl.java index 6d89e08f..bf765d25 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/CommandOutputRecordFieldImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/CommandOutputRecordFieldImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.LoaderInstances; -import org.w3id.cwl.cwl1_1.utils.LoadingOptions; -import org.w3id.cwl.cwl1_1.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_1.utils.SaveableImpl; -import org.w3id.cwl.cwl1_1.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_1.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_1.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_1.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/cwl#CommandOutputRecordField
@@ -27,6 +27,9 @@ public class CommandOutputRecordFieldImpl extends SaveableImpl implements Comman private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -183,7 +186,7 @@ public java.util.Optional getOutputBinding() { } /** - * Used by {@link org.w3id.cwl.cwl1_1.utils.RootLoader} to construct instances of CommandOutputRecordFieldImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_1.utils.RootLoader} to construct instances of CommandOutputRecordFieldImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -362,5 +365,14 @@ public CommandOutputRecordFieldImpl( this.streamable = (java.util.Optional) streamable; this.format = (Object) format; this.outputBinding = (java.util.Optional) outputBinding; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("doc", "name", "type", "label", "secondaryFiles", "streamable", "format", "outputBinding"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_2/CommandOutputRecordSchema.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/CommandOutputRecordSchema.java similarity index 89% rename from src/main/java/org/w3id/cwl/cwl1_2/CommandOutputRecordSchema.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/CommandOutputRecordSchema.java index 55f41695..af27b61d 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/CommandOutputRecordSchema.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/CommandOutputRecordSchema.java @@ -12,14 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_2.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#CommandOutputRecordSchema
This interface is implemented by {@link CommandOutputRecordSchemaImpl}
*/ public interface CommandOutputRecordSchema extends OutputRecordSchema, Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#IOSchema/name
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_1/CommandOutputRecordSchemaImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/CommandOutputRecordSchemaImpl.java similarity index 88% rename from src/main/java/org/w3id/cwl/cwl1_1/CommandOutputRecordSchemaImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/CommandOutputRecordSchemaImpl.java index 42513191..36219652 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/CommandOutputRecordSchemaImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/CommandOutputRecordSchemaImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.LoaderInstances; -import org.w3id.cwl.cwl1_1.utils.LoadingOptions; -import org.w3id.cwl.cwl1_1.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_1.utils.SaveableImpl; -import org.w3id.cwl.cwl1_1.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_1.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_1.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_1.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/cwl#CommandOutputRecordSchema
@@ -27,6 +27,9 @@ public class CommandOutputRecordSchemaImpl extends SaveableImpl implements Comma private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -92,7 +95,7 @@ public Object getDoc() { } /** - * Used by {@link org.w3id.cwl.cwl1_1.utils.RootLoader} to construct instances of CommandOutputRecordSchemaImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_1.utils.RootLoader} to construct instances of CommandOutputRecordSchemaImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -222,5 +225,14 @@ public CommandOutputRecordSchemaImpl( this.label = (java.util.Optional) label; this.doc = (Object) doc; this.name = (java.util.Optional) name; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("fields", "type", "label", "doc", "name"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_1/Directory.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/Directory.java similarity index 96% rename from src/main/java/org/w3id/cwl/cwl1_1/Directory.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/Directory.java index 8821684b..5742e263 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/Directory.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/Directory.java @@ -12,9 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#Directory
This interface is implemented by {@link DirectoryImpl}
@@ -64,6 +65,10 @@ Name conflicts (the same `basename` appearing multiple times in `listing`
*/ public interface Directory extends Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#Directory/class
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_1/DirectoryImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/DirectoryImpl.java similarity index 92% rename from src/main/java/org/w3id/cwl/cwl1_1/DirectoryImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/DirectoryImpl.java index 656ec7dd..0bcc3dd2 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/DirectoryImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/DirectoryImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.LoaderInstances; -import org.w3id.cwl.cwl1_1.utils.LoadingOptions; -import org.w3id.cwl.cwl1_1.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_1.utils.SaveableImpl; -import org.w3id.cwl.cwl1_1.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_1.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_1.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_1.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/cwl#Directory
@@ -71,6 +71,9 @@ public class DirectoryImpl extends SaveableImpl implements Directory { private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -183,7 +186,7 @@ public java.util.Optional> getListing() { } /** - * Used by {@link org.w3id.cwl.cwl1_1.utils.RootLoader} to construct instances of DirectoryImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_1.utils.RootLoader} to construct instances of DirectoryImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -299,5 +302,14 @@ public DirectoryImpl( this.path = (java.util.Optional) path; this.basename = (java.util.Optional) basename; this.listing = (java.util.Optional>) listing; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("class", "location", "path", "basename", "listing"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_1/Directory_class.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/Directory_class.java similarity index 92% rename from src/main/java/org/w3id/cwl/cwl1_1/Directory_class.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/Directory_class.java index 4f1e6a4c..a3116455 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/Directory_class.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/Directory_class.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_1.utils.ValidationException; public enum Directory_class { DIRECTORY("Directory"); diff --git a/src/main/java/org/w3id/cwl/cwl1_1/Dirent.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/Dirent.java similarity index 92% rename from src/main/java/org/w3id/cwl/cwl1_1/Dirent.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/Dirent.java index 640d8b4a..ec831d32 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/Dirent.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/Dirent.java @@ -12,9 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#Dirent
This interface is implemented by {@link DirentImpl}
@@ -25,6 +26,10 @@
*/ public interface Dirent extends Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#entryname
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_1/DirentImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/DirentImpl.java similarity index 88% rename from src/main/java/org/w3id/cwl/cwl1_1/DirentImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/DirentImpl.java index 3a0de3ac..16d7fdd1 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/DirentImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/DirentImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.LoaderInstances; -import org.w3id.cwl.cwl1_1.utils.LoadingOptions; -import org.w3id.cwl.cwl1_1.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_1.utils.SaveableImpl; -import org.w3id.cwl.cwl1_1.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_1.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_1.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_1.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/cwl#Dirent
@@ -32,6 +32,9 @@ public class DirentImpl extends SaveableImpl implements Dirent { private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -98,7 +101,7 @@ public java.util.Optional getWritable() { } /** - * Used by {@link org.w3id.cwl.cwl1_1.utils.RootLoader} to construct instances of DirentImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_1.utils.RootLoader} to construct instances of DirentImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -178,5 +181,14 @@ public DirentImpl( this.entryname = (Object) entryname; this.entry = (Object) entry; this.writable = (java.util.Optional) writable; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("entryname", "entry", "writable"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_1/DockerRequirement.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/DockerRequirement.java similarity index 96% rename from src/main/java/org/w3id/cwl/cwl1_1/DockerRequirement.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/DockerRequirement.java index e6f728a7..1424e698 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/DockerRequirement.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/DockerRequirement.java @@ -12,9 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#DockerRequirement
This interface is implemented by {@link DockerRequirementImpl}
@@ -72,6 +73,10 @@ concerns of the implicit hidden execution point (For further discussion, see
*/ public interface DockerRequirement extends ProcessRequirement, Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#DockerRequirement/class
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_1/DockerRequirementImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/DockerRequirementImpl.java similarity index 92% rename from src/main/java/org/w3id/cwl/cwl1_1/DockerRequirementImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/DockerRequirementImpl.java index ab580145..17290703 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/DockerRequirementImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/DockerRequirementImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.LoaderInstances; -import org.w3id.cwl.cwl1_1.utils.LoadingOptions; -import org.w3id.cwl.cwl1_1.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_1.utils.SaveableImpl; -import org.w3id.cwl.cwl1_1.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_1.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_1.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_1.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/cwl#DockerRequirement
@@ -79,6 +79,9 @@ public class DockerRequirementImpl extends SaveableImpl implements DockerRequire private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -177,7 +180,7 @@ public java.util.Optional getDockerOutputDirectory() { } /** - * Used by {@link org.w3id.cwl.cwl1_1.utils.RootLoader} to construct instances of DockerRequirementImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_1.utils.RootLoader} to construct instances of DockerRequirementImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -329,5 +332,14 @@ public DockerRequirementImpl( this.dockerImport = (java.util.Optional) dockerImport; this.dockerImageId = (java.util.Optional) dockerImageId; this.dockerOutputDirectory = (java.util.Optional) dockerOutputDirectory; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("class", "dockerPull", "dockerLoad", "dockerFile", "dockerImport", "dockerImageId", "dockerOutputDirectory"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_1/DockerRequirement_class.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/DockerRequirement_class.java similarity index 92% rename from src/main/java/org/w3id/cwl/cwl1_1/DockerRequirement_class.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/DockerRequirement_class.java index 2e9aa9ab..a130d08e 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/DockerRequirement_class.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/DockerRequirement_class.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_1.utils.ValidationException; public enum DockerRequirement_class { DOCKERREQUIREMENT("DockerRequirement"); diff --git a/src/main/java/org/w3id/cwl/cwl1_1/Documented.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/Documented.java similarity index 80% rename from src/main/java/org/w3id/cwl/cwl1_1/Documented.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/Documented.java index bb9ed45a..234977d7 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/Documented.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/Documented.java @@ -12,14 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/salad#Documented
*/ public interface Documented extends Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/salad#Documented/doc
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/EnumSchema.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/EnumSchema.java similarity index 85% rename from src/main/java/org/w3id/cwl/cwl1_2/EnumSchema.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/EnumSchema.java index 20033829..0fc88977 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/EnumSchema.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/EnumSchema.java @@ -12,9 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_2.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/salad#EnumSchema
This interface is implemented by {@link EnumSchemaImpl}
@@ -22,6 +23,10 @@
*/ public interface EnumSchema extends Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/salad#EnumSchema/name
diff --git a/src/main/java/org/w3id/cwl/cwl1_1/EnumSchemaImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/EnumSchemaImpl.java similarity index 85% rename from src/main/java/org/w3id/cwl/cwl1_1/EnumSchemaImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/EnumSchemaImpl.java index 33725ea3..48ca5347 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/EnumSchemaImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/EnumSchemaImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.LoaderInstances; -import org.w3id.cwl.cwl1_1.utils.LoadingOptions; -import org.w3id.cwl.cwl1_1.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_1.utils.SaveableImpl; -import org.w3id.cwl.cwl1_1.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_1.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_1.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_1.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/salad#EnumSchema
@@ -29,6 +29,9 @@ public class EnumSchemaImpl extends SaveableImpl implements EnumSchema { private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -69,7 +72,7 @@ public Enum_name getType() { } /** - * Used by {@link org.w3id.cwl.cwl1_1.utils.RootLoader} to construct instances of EnumSchemaImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_1.utils.RootLoader} to construct instances of EnumSchemaImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -157,5 +160,14 @@ public EnumSchemaImpl( this.name = (java.util.Optional) name; this.symbols = (java.util.List) symbols; this.type = (Enum_name) type; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("name", "symbols", "type"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_2/Enum_name.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/Enum_name.java similarity index 91% rename from src/main/java/org/w3id/cwl/cwl1_2/Enum_name.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/Enum_name.java index 09c8b689..9c03e65e 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/Enum_name.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/Enum_name.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_2.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_1.utils.ValidationException; public enum Enum_name { ENUM("enum"); diff --git a/src/main/java/org/w3id/cwl/cwl1_1/EnvVarRequirement.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/EnvVarRequirement.java similarity index 85% rename from src/main/java/org/w3id/cwl/cwl1_1/EnvVarRequirement.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/EnvVarRequirement.java index 6363339e..e06f7d2b 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/EnvVarRequirement.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/EnvVarRequirement.java @@ -12,9 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#EnvVarRequirement
This interface is implemented by {@link EnvVarRequirementImpl}
@@ -23,6 +24,10 @@
*/ public interface EnvVarRequirement extends ProcessRequirement, Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#EnvVarRequirement/class
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_1/EnvVarRequirementImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/EnvVarRequirementImpl.java similarity index 82% rename from src/main/java/org/w3id/cwl/cwl1_1/EnvVarRequirementImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/EnvVarRequirementImpl.java index 3fd486e9..31996783 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/EnvVarRequirementImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/EnvVarRequirementImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.LoaderInstances; -import org.w3id.cwl.cwl1_1.utils.LoadingOptions; -import org.w3id.cwl.cwl1_1.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_1.utils.SaveableImpl; -import org.w3id.cwl.cwl1_1.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_1.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_1.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_1.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/cwl#EnvVarRequirement
@@ -30,6 +30,9 @@ public class EnvVarRequirementImpl extends SaveableImpl implements EnvVarRequire private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -59,7 +62,7 @@ public java.util.List getEnvDef() { } /** - * Used by {@link org.w3id.cwl.cwl1_1.utils.RootLoader} to construct instances of EnvVarRequirementImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_1.utils.RootLoader} to construct instances of EnvVarRequirementImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -115,5 +118,14 @@ public EnvVarRequirementImpl( } this.class_ = (EnvVarRequirement_class) class_; this.envDef = (java.util.List) envDef; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("class", "envDef"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_1/EnvVarRequirement_class.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/EnvVarRequirement_class.java similarity index 92% rename from src/main/java/org/w3id/cwl/cwl1_1/EnvVarRequirement_class.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/EnvVarRequirement_class.java index 03dabd31..afe066c2 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/EnvVarRequirement_class.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/EnvVarRequirement_class.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_1.utils.ValidationException; public enum EnvVarRequirement_class { ENVVARREQUIREMENT("EnvVarRequirement"); diff --git a/src/main/java/org/w3id/cwl/cwl1_2/EnvironmentDef.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/EnvironmentDef.java similarity index 86% rename from src/main/java/org/w3id/cwl/cwl1_2/EnvironmentDef.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/EnvironmentDef.java index d3e92f0a..4a634b31 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/EnvironmentDef.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/EnvironmentDef.java @@ -12,9 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_2.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#EnvironmentDef
This interface is implemented by {@link EnvironmentDefImpl}
@@ -24,6 +25,10 @@
*/ public interface EnvironmentDef extends Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#EnvironmentDef/envName
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/EnvironmentDefImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/EnvironmentDefImpl.java similarity index 82% rename from src/main/java/org/w3id/cwl/cwl1_2/EnvironmentDefImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/EnvironmentDefImpl.java index 8041c98e..0dcbfe75 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/EnvironmentDefImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/EnvironmentDefImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_2.utils.LoaderInstances; -import org.w3id.cwl.cwl1_2.utils.LoadingOptions; -import org.w3id.cwl.cwl1_2.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_2.utils.SaveableImpl; -import org.w3id.cwl.cwl1_2.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_1.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_1.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_1.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/cwl#EnvironmentDef
@@ -31,6 +31,9 @@ public class EnvironmentDefImpl extends SaveableImpl implements EnvironmentDef { private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -60,7 +63,7 @@ public Object getEnvValue() { } /** - * Used by {@link org.w3id.cwl.cwl1_2.utils.RootLoader} to construct instances of EnvironmentDefImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_1.utils.RootLoader} to construct instances of EnvironmentDefImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -116,5 +119,14 @@ public EnvironmentDefImpl( } this.envName = (String) envName; this.envValue = (Object) envValue; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("envName", "envValue"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_1/Expression.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/Expression.java similarity index 92% rename from src/main/java/org/w3id/cwl/cwl1_1/Expression.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/Expression.java index 41d11132..e34232e8 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/Expression.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/Expression.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_1.utils.ValidationException; public enum Expression { EXPRESSIONPLACEHOLDER("ExpressionPlaceholder"); diff --git a/src/main/java/org/w3id/cwl/cwl1_1/ExpressionTool.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/ExpressionTool.java similarity index 95% rename from src/main/java/org/w3id/cwl/cwl1_1/ExpressionTool.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/ExpressionTool.java index 4ecb7557..51a8163d 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/ExpressionTool.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/ExpressionTool.java @@ -12,9 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#ExpressionTool
This interface is implemented by {@link ExpressionToolImpl}
@@ -28,6 +29,10 @@
*/ public interface ExpressionTool extends Process, Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#Identified/id
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_1/ExpressionToolImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/ExpressionToolImpl.java similarity index 93% rename from src/main/java/org/w3id/cwl/cwl1_1/ExpressionToolImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/ExpressionToolImpl.java index 20c6d35b..aac4f8a2 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/ExpressionToolImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/ExpressionToolImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.LoaderInstances; -import org.w3id.cwl.cwl1_1.utils.LoadingOptions; -import org.w3id.cwl.cwl1_1.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_1.utils.SaveableImpl; -import org.w3id.cwl.cwl1_1.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_1.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_1.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_1.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/cwl#ExpressionTool
@@ -35,6 +35,9 @@ public class ExpressionToolImpl extends SaveableImpl implements ExpressionTool { private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -186,7 +189,7 @@ public String getExpression() { } /** - * Used by {@link org.w3id.cwl.cwl1_1.utils.RootLoader} to construct instances of ExpressionToolImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_1.utils.RootLoader} to construct instances of ExpressionToolImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -388,5 +391,14 @@ public ExpressionToolImpl( this.cwlVersion = (java.util.Optional) cwlVersion; this.class_ = (ExpressionTool_class) class_; this.expression = (String) expression; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("id", "label", "doc", "inputs", "outputs", "requirements", "hints", "cwlVersion", "class", "expression"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_1/ExpressionToolOutputParameter.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/ExpressionToolOutputParameter.java similarity index 95% rename from src/main/java/org/w3id/cwl/cwl1_1/ExpressionToolOutputParameter.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/ExpressionToolOutputParameter.java index ebb26e58..f0028d09 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/ExpressionToolOutputParameter.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/ExpressionToolOutputParameter.java @@ -12,14 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#ExpressionToolOutputParameter
This interface is implemented by {@link ExpressionToolOutputParameterImpl}
*/ public interface ExpressionToolOutputParameter extends OutputParameter, Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#Identified/id
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_1/ExpressionToolOutputParameterImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/ExpressionToolOutputParameterImpl.java similarity index 92% rename from src/main/java/org/w3id/cwl/cwl1_1/ExpressionToolOutputParameterImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/ExpressionToolOutputParameterImpl.java index 6b2229fa..c2dc1a63 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/ExpressionToolOutputParameterImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/ExpressionToolOutputParameterImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.LoaderInstances; -import org.w3id.cwl.cwl1_1.utils.LoadingOptions; -import org.w3id.cwl.cwl1_1.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_1.utils.SaveableImpl; -import org.w3id.cwl.cwl1_1.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_1.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_1.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_1.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/cwl#ExpressionToolOutputParameter
@@ -27,6 +27,9 @@ public class ExpressionToolOutputParameterImpl extends SaveableImpl implements E private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -168,7 +171,7 @@ public Object getType() { } /** - * Used by {@link org.w3id.cwl.cwl1_1.utils.RootLoader} to construct instances of ExpressionToolOutputParameterImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_1.utils.RootLoader} to construct instances of ExpressionToolOutputParameterImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -334,5 +337,14 @@ public ExpressionToolOutputParameterImpl( this.id = (java.util.Optional) id; this.format = (Object) format; this.type = (Object) type; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("label", "secondaryFiles", "streamable", "doc", "id", "format", "type"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_1/ExpressionTool_class.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/ExpressionTool_class.java similarity index 92% rename from src/main/java/org/w3id/cwl/cwl1_1/ExpressionTool_class.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/ExpressionTool_class.java index c51dcbea..ecafc318 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/ExpressionTool_class.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/ExpressionTool_class.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_1.utils.ValidationException; public enum ExpressionTool_class { EXPRESSIONTOOL("ExpressionTool"); diff --git a/src/main/java/org/w3id/cwl/cwl1_1/FieldBase.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/FieldBase.java similarity index 94% rename from src/main/java/org/w3id/cwl/cwl1_1/FieldBase.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/FieldBase.java index 743479e2..392c67ed 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/FieldBase.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/FieldBase.java @@ -12,14 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#FieldBase
*/ public interface FieldBase extends Labeled, Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#Labeled/label
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_1/File.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/File.java similarity index 98% rename from src/main/java/org/w3id/cwl/cwl1_1/File.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/File.java index 843c95c4..2127913a 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/File.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/File.java @@ -12,9 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#File
This interface is implemented by {@link FileImpl}
@@ -87,6 +88,10 @@ property in the context of the tool execution runtime (local to the compute
*/ public interface File extends Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#File/class
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_1/FileImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/FileImpl.java similarity index 95% rename from src/main/java/org/w3id/cwl/cwl1_1/FileImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/FileImpl.java index 3fab9407..1d9098d1 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/FileImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/FileImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.LoaderInstances; -import org.w3id.cwl.cwl1_1.utils.LoadingOptions; -import org.w3id.cwl.cwl1_1.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_1.utils.SaveableImpl; -import org.w3id.cwl.cwl1_1.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_1.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_1.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_1.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/cwl#File
@@ -94,6 +94,9 @@ public class FileImpl extends SaveableImpl implements File { private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -342,7 +345,7 @@ public java.util.Optional getContents() { } /** - * Used by {@link org.w3id.cwl.cwl1_1.utils.RootLoader} to construct instances of FileImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_1.utils.RootLoader} to construct instances of FileImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -584,5 +587,14 @@ public FileImpl( this.secondaryFiles = (java.util.Optional>) secondaryFiles; this.format = (java.util.Optional) format; this.contents = (java.util.Optional) contents; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("class", "location", "path", "basename", "dirname", "nameroot", "nameext", "checksum", "size", "secondaryFiles", "format", "contents"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_2/File_class.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/File_class.java similarity index 92% rename from src/main/java/org/w3id/cwl/cwl1_2/File_class.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/File_class.java index 0bf42204..c362b611 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/File_class.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/File_class.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_2.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_1.utils.ValidationException; public enum File_class { FILE("File"); diff --git a/src/main/java/org/w3id/cwl/cwl1_2/IOSchema.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/IOSchema.java similarity index 83% rename from src/main/java/org/w3id/cwl/cwl1_2/IOSchema.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/IOSchema.java index c6324d88..2ede6fdf 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/IOSchema.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/IOSchema.java @@ -12,14 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_2.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#IOSchema
*/ public interface IOSchema extends Labeled, Documented, Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#Labeled/label
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/Identified.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/Identified.java similarity index 76% rename from src/main/java/org/w3id/cwl/cwl1_2/Identified.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/Identified.java index 1f28ce96..cbab3751 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/Identified.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/Identified.java @@ -12,12 +12,17 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_2.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#Identified
*/ public interface Identified extends Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + } diff --git a/src/main/java/org/w3id/cwl/cwl1_1/InitialWorkDirRequirement.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/InitialWorkDirRequirement.java similarity index 90% rename from src/main/java/org/w3id/cwl/cwl1_1/InitialWorkDirRequirement.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/InitialWorkDirRequirement.java index 51ca7fbb..52ce795e 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/InitialWorkDirRequirement.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/InitialWorkDirRequirement.java @@ -12,15 +12,20 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#InitialWorkDirRequirement
This interface is implemented by {@link InitialWorkDirRequirementImpl}
Define a list of files and subdirectories that must be created by the workflow platform in the designated output directory prior to executing the command line tool.
*/ public interface InitialWorkDirRequirement extends ProcessRequirement, Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#InitialWorkDirRequirement/class
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_1/InitialWorkDirRequirementImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/InitialWorkDirRequirementImpl.java similarity index 85% rename from src/main/java/org/w3id/cwl/cwl1_1/InitialWorkDirRequirementImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/InitialWorkDirRequirementImpl.java index fae57f5a..905e7ba9 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/InitialWorkDirRequirementImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/InitialWorkDirRequirementImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.LoaderInstances; -import org.w3id.cwl.cwl1_1.utils.LoadingOptions; -import org.w3id.cwl.cwl1_1.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_1.utils.SaveableImpl; -import org.w3id.cwl.cwl1_1.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_1.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_1.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_1.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/cwl#InitialWorkDirRequirement
@@ -28,6 +28,9 @@ public class InitialWorkDirRequirementImpl extends SaveableImpl implements Initi private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -69,7 +72,7 @@ public Object getListing() { } /** - * Used by {@link org.w3id.cwl.cwl1_1.utils.RootLoader} to construct instances of InitialWorkDirRequirementImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_1.utils.RootLoader} to construct instances of InitialWorkDirRequirementImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -125,5 +128,14 @@ public InitialWorkDirRequirementImpl( } this.class_ = (InitialWorkDirRequirement_class) class_; this.listing = (Object) listing; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("class", "listing"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_2/InitialWorkDirRequirement_class.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/InitialWorkDirRequirement_class.java similarity index 93% rename from src/main/java/org/w3id/cwl/cwl1_2/InitialWorkDirRequirement_class.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/InitialWorkDirRequirement_class.java index 8f61ec7f..d19b43d3 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/InitialWorkDirRequirement_class.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/InitialWorkDirRequirement_class.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_2.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_1.utils.ValidationException; public enum InitialWorkDirRequirement_class { INITIALWORKDIRREQUIREMENT("InitialWorkDirRequirement"); diff --git a/src/main/java/org/w3id/cwl/cwl1_1/InlineJavascriptRequirement.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/InlineJavascriptRequirement.java similarity index 88% rename from src/main/java/org/w3id/cwl/cwl1_1/InlineJavascriptRequirement.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/InlineJavascriptRequirement.java index e71a003d..20cb3830 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/InlineJavascriptRequirement.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/InlineJavascriptRequirement.java @@ -12,9 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#InlineJavascriptRequirement
This interface is implemented by {@link InlineJavascriptRequirementImpl}
@@ -24,6 +25,10 @@
*/ public interface InlineJavascriptRequirement extends ProcessRequirement, Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#InlineJavascriptRequirement/class
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_1/InlineJavascriptRequirementImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/InlineJavascriptRequirementImpl.java similarity index 84% rename from src/main/java/org/w3id/cwl/cwl1_1/InlineJavascriptRequirementImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/InlineJavascriptRequirementImpl.java index d4885eff..7074770c 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/InlineJavascriptRequirementImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/InlineJavascriptRequirementImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.LoaderInstances; -import org.w3id.cwl.cwl1_1.utils.LoadingOptions; -import org.w3id.cwl.cwl1_1.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_1.utils.SaveableImpl; -import org.w3id.cwl.cwl1_1.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_1.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_1.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_1.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/cwl#InlineJavascriptRequirement
@@ -31,6 +31,9 @@ public class InlineJavascriptRequirementImpl extends SaveableImpl implements Inl private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -63,7 +66,7 @@ public java.util.Optional> getExpressionLib() { } /** - * Used by {@link org.w3id.cwl.cwl1_1.utils.RootLoader} to construct instances of InlineJavascriptRequirementImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_1.utils.RootLoader} to construct instances of InlineJavascriptRequirementImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -125,5 +128,14 @@ public InlineJavascriptRequirementImpl( } this.class_ = (InlineJavascriptRequirement_class) class_; this.expressionLib = (java.util.Optional>) expressionLib; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("class", "expressionLib"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_1/InlineJavascriptRequirement_class.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/InlineJavascriptRequirement_class.java similarity index 93% rename from src/main/java/org/w3id/cwl/cwl1_1/InlineJavascriptRequirement_class.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/InlineJavascriptRequirement_class.java index c80e0b39..888e7a3c 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/InlineJavascriptRequirement_class.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/InlineJavascriptRequirement_class.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_1.utils.ValidationException; public enum InlineJavascriptRequirement_class { INLINEJAVASCRIPTREQUIREMENT("InlineJavascriptRequirement"); diff --git a/src/main/java/org/w3id/cwl/cwl1_1/InplaceUpdateRequirement.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/InplaceUpdateRequirement.java similarity index 92% rename from src/main/java/org/w3id/cwl/cwl1_1/InplaceUpdateRequirement.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/InplaceUpdateRequirement.java index 87ca44f7..5a5322d3 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/InplaceUpdateRequirement.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/InplaceUpdateRequirement.java @@ -12,9 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#InplaceUpdateRequirement
This interface is implemented by {@link InplaceUpdateRequirementImpl}
@@ -51,6 +52,10 @@ is writable by one workflow step file is accessed (for reading or
*/ public interface InplaceUpdateRequirement extends ProcessRequirement, Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#InplaceUpdateRequirement/class
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_1/InplaceUpdateRequirementImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/InplaceUpdateRequirementImpl.java similarity index 86% rename from src/main/java/org/w3id/cwl/cwl1_1/InplaceUpdateRequirementImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/InplaceUpdateRequirementImpl.java index ecc98e03..e792af7d 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/InplaceUpdateRequirementImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/InplaceUpdateRequirementImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.LoaderInstances; -import org.w3id.cwl.cwl1_1.utils.LoadingOptions; -import org.w3id.cwl.cwl1_1.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_1.utils.SaveableImpl; -import org.w3id.cwl.cwl1_1.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_1.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_1.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_1.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/cwl#InplaceUpdateRequirement
@@ -58,6 +58,9 @@ public class InplaceUpdateRequirementImpl extends SaveableImpl implements Inplac private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -86,7 +89,7 @@ public Boolean getInplaceUpdate() { } /** - * Used by {@link org.w3id.cwl.cwl1_1.utils.RootLoader} to construct instances of InplaceUpdateRequirementImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_1.utils.RootLoader} to construct instances of InplaceUpdateRequirementImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -142,5 +145,14 @@ public InplaceUpdateRequirementImpl( } this.class_ = (InplaceUpdateRequirement_class) class_; this.inplaceUpdate = (Boolean) inplaceUpdate; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("class", "inplaceUpdate"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_1/InplaceUpdateRequirement_class.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/InplaceUpdateRequirement_class.java similarity index 93% rename from src/main/java/org/w3id/cwl/cwl1_1/InplaceUpdateRequirement_class.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/InplaceUpdateRequirement_class.java index c8181878..e86b7130 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/InplaceUpdateRequirement_class.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/InplaceUpdateRequirement_class.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_1.utils.ValidationException; public enum InplaceUpdateRequirement_class { INPLACEUPDATEREQUIREMENT("InplaceUpdateRequirement"); diff --git a/src/main/java/org/w3id/cwl/cwl1_2/InputArraySchema.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/InputArraySchema.java similarity index 88% rename from src/main/java/org/w3id/cwl/cwl1_2/InputArraySchema.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/InputArraySchema.java index f18c972c..0d9bb5ac 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/InputArraySchema.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/InputArraySchema.java @@ -12,14 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_2.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#InputArraySchema
This interface is implemented by {@link InputArraySchemaImpl}
*/ public interface InputArraySchema extends CWLArraySchema, InputSchema, Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#IOSchema/name
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_1/InputArraySchemaImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/InputArraySchemaImpl.java similarity index 88% rename from src/main/java/org/w3id/cwl/cwl1_1/InputArraySchemaImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/InputArraySchemaImpl.java index 15084862..86bed2fe 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/InputArraySchemaImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/InputArraySchemaImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.LoaderInstances; -import org.w3id.cwl.cwl1_1.utils.LoadingOptions; -import org.w3id.cwl.cwl1_1.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_1.utils.SaveableImpl; -import org.w3id.cwl.cwl1_1.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_1.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_1.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_1.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/cwl#InputArraySchema
@@ -27,6 +27,9 @@ public class InputArraySchemaImpl extends SaveableImpl implements InputArraySche private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -92,7 +95,7 @@ public Object getDoc() { } /** - * Used by {@link org.w3id.cwl.cwl1_1.utils.RootLoader} to construct instances of InputArraySchemaImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_1.utils.RootLoader} to construct instances of InputArraySchemaImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -216,5 +219,14 @@ public InputArraySchemaImpl( this.label = (java.util.Optional) label; this.doc = (Object) doc; this.name = (java.util.Optional) name; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("items", "type", "label", "doc", "name"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_1/InputBinding.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/InputBinding.java similarity index 85% rename from src/main/java/org/w3id/cwl/cwl1_1/InputBinding.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/InputBinding.java index ae0adc9f..2c2d4e94 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/InputBinding.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/InputBinding.java @@ -12,14 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#InputBinding
This interface is implemented by {@link InputBindingImpl}
*/ public interface InputBinding extends Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#InputBinding/loadContents
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_1/InputBindingImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/InputBindingImpl.java similarity index 81% rename from src/main/java/org/w3id/cwl/cwl1_1/InputBindingImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/InputBindingImpl.java index 7bd64b7e..6623cc74 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/InputBindingImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/InputBindingImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.LoaderInstances; -import org.w3id.cwl.cwl1_1.utils.LoadingOptions; -import org.w3id.cwl.cwl1_1.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_1.utils.SaveableImpl; -import org.w3id.cwl.cwl1_1.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_1.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_1.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_1.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/cwl#InputBinding
@@ -27,6 +27,9 @@ public class InputBindingImpl extends SaveableImpl implements InputBinding { private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -52,7 +55,7 @@ public java.util.Optional getLoadContents() { } /** - * Used by {@link org.w3id.cwl.cwl1_1.utils.RootLoader} to construct instances of InputBindingImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_1.utils.RootLoader} to construct instances of InputBindingImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -102,5 +105,14 @@ public InputBindingImpl( throw new ValidationException("Trying 'RecordField'", __errors); } this.loadContents = (java.util.Optional) loadContents; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("loadContents"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_2/InputEnumSchema.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/InputEnumSchema.java similarity index 88% rename from src/main/java/org/w3id/cwl/cwl1_2/InputEnumSchema.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/InputEnumSchema.java index 9fbf9b58..fa9dce07 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/InputEnumSchema.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/InputEnumSchema.java @@ -12,14 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_2.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#InputEnumSchema
This interface is implemented by {@link InputEnumSchemaImpl}
*/ public interface InputEnumSchema extends EnumSchema, InputSchema, Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#IOSchema/name
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_1/InputEnumSchemaImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/InputEnumSchemaImpl.java similarity index 88% rename from src/main/java/org/w3id/cwl/cwl1_1/InputEnumSchemaImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/InputEnumSchemaImpl.java index e71ee837..bd91a6a0 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/InputEnumSchemaImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/InputEnumSchemaImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.LoaderInstances; -import org.w3id.cwl.cwl1_1.utils.LoadingOptions; -import org.w3id.cwl.cwl1_1.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_1.utils.SaveableImpl; -import org.w3id.cwl.cwl1_1.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_1.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_1.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_1.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/cwl#InputEnumSchema
@@ -27,6 +27,9 @@ public class InputEnumSchemaImpl extends SaveableImpl implements InputEnumSchema private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -92,7 +95,7 @@ public Object getDoc() { } /** - * Used by {@link org.w3id.cwl.cwl1_1.utils.RootLoader} to construct instances of InputEnumSchemaImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_1.utils.RootLoader} to construct instances of InputEnumSchemaImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -216,5 +219,14 @@ public InputEnumSchemaImpl( this.type = (Enum_name) type; this.label = (java.util.Optional) label; this.doc = (Object) doc; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("name", "symbols", "type", "label", "doc"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_1/InputFormat.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/InputFormat.java similarity index 83% rename from src/main/java/org/w3id/cwl/cwl1_1/InputFormat.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/InputFormat.java index 40ec52d6..379d3f95 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/InputFormat.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/InputFormat.java @@ -12,14 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#InputFormat
*/ public interface InputFormat extends Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#format
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_1/InputParameter.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/InputParameter.java similarity index 96% rename from src/main/java/org/w3id/cwl/cwl1_1/InputParameter.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/InputParameter.java index eb3b55ba..82310a9c 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/InputParameter.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/InputParameter.java @@ -12,14 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#InputParameter
*/ public interface InputParameter extends Parameter, InputFormat, LoadContents, Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#Labeled/label
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_1/InputRecordField.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/InputRecordField.java similarity index 96% rename from src/main/java/org/w3id/cwl/cwl1_1/InputRecordField.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/InputRecordField.java index 53c02618..9e26261e 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/InputRecordField.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/InputRecordField.java @@ -12,14 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#InputRecordField
This interface is implemented by {@link InputRecordFieldImpl}
*/ public interface InputRecordField extends CWLRecordField, FieldBase, InputFormat, LoadContents, Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/salad#RecordField/name
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_1/InputRecordFieldImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/InputRecordFieldImpl.java similarity index 93% rename from src/main/java/org/w3id/cwl/cwl1_1/InputRecordFieldImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/InputRecordFieldImpl.java index 66b369b2..3898945e 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/InputRecordFieldImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/InputRecordFieldImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.LoaderInstances; -import org.w3id.cwl.cwl1_1.utils.LoadingOptions; -import org.w3id.cwl.cwl1_1.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_1.utils.SaveableImpl; -import org.w3id.cwl.cwl1_1.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_1.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_1.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_1.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/cwl#InputRecordField
@@ -27,6 +27,9 @@ public class InputRecordFieldImpl extends SaveableImpl implements InputRecordFie private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -209,7 +212,7 @@ public java.util.Optional getLoadListing() { } /** - * Used by {@link org.w3id.cwl.cwl1_1.utils.RootLoader} to construct instances of InputRecordFieldImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_1.utils.RootLoader} to construct instances of InputRecordFieldImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -406,5 +409,14 @@ public InputRecordFieldImpl( this.format = (Object) format; this.loadContents = (java.util.Optional) loadContents; this.loadListing = (java.util.Optional) loadListing; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("doc", "name", "type", "label", "secondaryFiles", "streamable", "format", "loadContents", "loadListing"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_2/InputRecordSchema.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/InputRecordSchema.java similarity index 88% rename from src/main/java/org/w3id/cwl/cwl1_2/InputRecordSchema.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/InputRecordSchema.java index 815d6b68..ece42164 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/InputRecordSchema.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/InputRecordSchema.java @@ -12,14 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_2.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#InputRecordSchema
This interface is implemented by {@link InputRecordSchemaImpl}
*/ public interface InputRecordSchema extends CWLRecordSchema, InputSchema, Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#IOSchema/name
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/InputRecordSchemaImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/InputRecordSchemaImpl.java similarity index 88% rename from src/main/java/org/w3id/cwl/cwl1_2/InputRecordSchemaImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/InputRecordSchemaImpl.java index edc5181b..4405ca00 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/InputRecordSchemaImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/InputRecordSchemaImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_2.utils.LoaderInstances; -import org.w3id.cwl.cwl1_2.utils.LoadingOptions; -import org.w3id.cwl.cwl1_2.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_2.utils.SaveableImpl; -import org.w3id.cwl.cwl1_2.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_1.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_1.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_1.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/cwl#InputRecordSchema
@@ -27,6 +27,9 @@ public class InputRecordSchemaImpl extends SaveableImpl implements InputRecordSc private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -92,7 +95,7 @@ public Object getDoc() { } /** - * Used by {@link org.w3id.cwl.cwl1_2.utils.RootLoader} to construct instances of InputRecordSchemaImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_1.utils.RootLoader} to construct instances of InputRecordSchemaImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -222,5 +225,14 @@ public InputRecordSchemaImpl( this.label = (java.util.Optional) label; this.doc = (Object) doc; this.name = (java.util.Optional) name; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("fields", "type", "label", "doc", "name"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_2/InputSchema.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/InputSchema.java similarity index 83% rename from src/main/java/org/w3id/cwl/cwl1_2/InputSchema.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/InputSchema.java index f06ff5be..6b8ac168 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/InputSchema.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/InputSchema.java @@ -12,14 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_2.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#InputSchema
*/ public interface InputSchema extends IOSchema, Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#Labeled/label
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_1/Labeled.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/Labeled.java similarity index 80% rename from src/main/java/org/w3id/cwl/cwl1_1/Labeled.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/Labeled.java index c370ec55..389a5254 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/Labeled.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/Labeled.java @@ -12,14 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#Labeled
*/ public interface Labeled extends Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#Labeled/label
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_1/LinkMergeMethod.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/LinkMergeMethod.java similarity index 92% rename from src/main/java/org/w3id/cwl/cwl1_1/LinkMergeMethod.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/LinkMergeMethod.java index 1a5a6b84..eb0d1546 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/LinkMergeMethod.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/LinkMergeMethod.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_1.utils.ValidationException; public enum LinkMergeMethod { MERGE_NESTED("merge_nested"), diff --git a/src/main/java/org/w3id/cwl/cwl1_1/LoadContents.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/LoadContents.java similarity index 88% rename from src/main/java/org/w3id/cwl/cwl1_1/LoadContents.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/LoadContents.java index 6997308b..07930367 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/LoadContents.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/LoadContents.java @@ -12,14 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#LoadContents
*/ public interface LoadContents extends Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#LoadContents/loadContents
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/LoadListingEnum.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/LoadListingEnum.java similarity index 92% rename from src/main/java/org/w3id/cwl/cwl1_2/LoadListingEnum.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/LoadListingEnum.java index 6b2f5a62..c3a489d5 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/LoadListingEnum.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/LoadListingEnum.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_2.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_1.utils.ValidationException; public enum LoadListingEnum { NO_LISTING("no_listing"), diff --git a/src/main/java/org/w3id/cwl/cwl1_1/LoadListingRequirement.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/LoadListingRequirement.java similarity index 85% rename from src/main/java/org/w3id/cwl/cwl1_1/LoadListingRequirement.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/LoadListingRequirement.java index d5a13d95..c9f88690 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/LoadListingRequirement.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/LoadListingRequirement.java @@ -12,9 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#LoadListingRequirement
This interface is implemented by {@link LoadListingRequirementImpl}
@@ -23,6 +24,10 @@
*/ public interface LoadListingRequirement extends ProcessRequirement, Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#LoadListingRequirement/class
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/LoadListingRequirementImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/LoadListingRequirementImpl.java similarity index 83% rename from src/main/java/org/w3id/cwl/cwl1_2/LoadListingRequirementImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/LoadListingRequirementImpl.java index 8c777ca6..6b46c160 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/LoadListingRequirementImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/LoadListingRequirementImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_2.utils.LoaderInstances; -import org.w3id.cwl.cwl1_2.utils.LoadingOptions; -import org.w3id.cwl.cwl1_2.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_2.utils.SaveableImpl; -import org.w3id.cwl.cwl1_2.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_1.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_1.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_1.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/cwl#LoadListingRequirement
@@ -30,6 +30,9 @@ public class LoadListingRequirementImpl extends SaveableImpl implements LoadList private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -58,7 +61,7 @@ public java.util.Optional getLoadListing() { } /** - * Used by {@link org.w3id.cwl.cwl1_2.utils.RootLoader} to construct instances of LoadListingRequirementImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_1.utils.RootLoader} to construct instances of LoadListingRequirementImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -120,5 +123,14 @@ public LoadListingRequirementImpl( } this.class_ = (LoadListingRequirement_class) class_; this.loadListing = (java.util.Optional) loadListing; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("class", "loadListing"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_1/LoadListingRequirement_class.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/LoadListingRequirement_class.java similarity index 92% rename from src/main/java/org/w3id/cwl/cwl1_1/LoadListingRequirement_class.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/LoadListingRequirement_class.java index 19d9e799..1abcc983 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/LoadListingRequirement_class.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/LoadListingRequirement_class.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_1.utils.ValidationException; public enum LoadListingRequirement_class { LOADLISTINGREQUIREMENT("LoadListingRequirement"); diff --git a/src/main/java/org/w3id/cwl/cwl1_1/MapSchema.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/MapSchema.java similarity index 83% rename from src/main/java/org/w3id/cwl/cwl1_1/MapSchema.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/MapSchema.java index 309d366f..4e0f7419 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/MapSchema.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/MapSchema.java @@ -12,14 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/salad#MapSchema
This interface is implemented by {@link MapSchemaImpl}
*/ public interface MapSchema extends Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/salad#type
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/MapSchemaImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/MapSchemaImpl.java similarity index 82% rename from src/main/java/org/w3id/cwl/cwl1_2/MapSchemaImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/MapSchemaImpl.java index 20735048..7cb05c82 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/MapSchemaImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/MapSchemaImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_2.utils.LoaderInstances; -import org.w3id.cwl.cwl1_2.utils.LoadingOptions; -import org.w3id.cwl.cwl1_2.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_2.utils.SaveableImpl; -import org.w3id.cwl.cwl1_2.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_1.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_1.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_1.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/salad#MapSchema
@@ -27,6 +27,9 @@ public class MapSchemaImpl extends SaveableImpl implements MapSchema { private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -56,7 +59,7 @@ public Object getValues() { } /** - * Used by {@link org.w3id.cwl.cwl1_2.utils.RootLoader} to construct instances of MapSchemaImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_1.utils.RootLoader} to construct instances of MapSchemaImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -112,5 +115,14 @@ public MapSchemaImpl( } this.type = (Map_name) type; this.values = (Object) values; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("type", "values"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_2/Map_name.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/Map_name.java similarity index 91% rename from src/main/java/org/w3id/cwl/cwl1_2/Map_name.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/Map_name.java index 7672c11a..a42d8669 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/Map_name.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/Map_name.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_2.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_1.utils.ValidationException; public enum Map_name { MAP("map"); diff --git a/src/main/java/org/w3id/cwl/cwl1_2/MultipleInputFeatureRequirement.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/MultipleInputFeatureRequirement.java similarity index 84% rename from src/main/java/org/w3id/cwl/cwl1_2/MultipleInputFeatureRequirement.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/MultipleInputFeatureRequirement.java index 28d19fe5..0a1ebb9d 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/MultipleInputFeatureRequirement.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/MultipleInputFeatureRequirement.java @@ -12,9 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_2.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#MultipleInputFeatureRequirement
This interface is implemented by {@link MultipleInputFeatureRequirementImpl}
@@ -23,6 +24,10 @@
*/ public interface MultipleInputFeatureRequirement extends ProcessRequirement, Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#MultipleInputFeatureRequirement/class
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_1/MultipleInputFeatureRequirementImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/MultipleInputFeatureRequirementImpl.java similarity index 80% rename from src/main/java/org/w3id/cwl/cwl1_1/MultipleInputFeatureRequirementImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/MultipleInputFeatureRequirementImpl.java index a57fdc8a..18dad168 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/MultipleInputFeatureRequirementImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/MultipleInputFeatureRequirementImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.LoaderInstances; -import org.w3id.cwl.cwl1_1.utils.LoadingOptions; -import org.w3id.cwl.cwl1_1.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_1.utils.SaveableImpl; -import org.w3id.cwl.cwl1_1.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_1.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_1.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_1.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/cwl#MultipleInputFeatureRequirement
@@ -30,6 +30,9 @@ public class MultipleInputFeatureRequirementImpl extends SaveableImpl implements private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -47,7 +50,7 @@ public MultipleInputFeatureRequirement_class getClass_() { } /** - * Used by {@link org.w3id.cwl.cwl1_1.utils.RootLoader} to construct instances of MultipleInputFeatureRequirementImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_1.utils.RootLoader} to construct instances of MultipleInputFeatureRequirementImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -91,5 +94,14 @@ public MultipleInputFeatureRequirementImpl( throw new ValidationException("Trying 'RecordField'", __errors); } this.class_ = (MultipleInputFeatureRequirement_class) class_; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("class"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_2/MultipleInputFeatureRequirement_class.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/MultipleInputFeatureRequirement_class.java similarity index 93% rename from src/main/java/org/w3id/cwl/cwl1_2/MultipleInputFeatureRequirement_class.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/MultipleInputFeatureRequirement_class.java index 5f7b8559..fce3949b 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/MultipleInputFeatureRequirement_class.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/MultipleInputFeatureRequirement_class.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_2.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_1.utils.ValidationException; public enum MultipleInputFeatureRequirement_class { MULTIPLEINPUTFEATUREREQUIREMENT("MultipleInputFeatureRequirement"); diff --git a/src/main/java/org/w3id/cwl/cwl1_1/NetworkAccess.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/NetworkAccess.java similarity index 88% rename from src/main/java/org/w3id/cwl/cwl1_1/NetworkAccess.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/NetworkAccess.java index d09696a4..8317a2d2 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/NetworkAccess.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/NetworkAccess.java @@ -12,9 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#NetworkAccess
This interface is implemented by {@link NetworkAccessImpl}
@@ -36,6 +37,10 @@ assume network access, except for localhost (the loopback device).
*/ public interface NetworkAccess extends ProcessRequirement, Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#NetworkAccess/class
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_1/NetworkAccessImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/NetworkAccessImpl.java similarity index 84% rename from src/main/java/org/w3id/cwl/cwl1_1/NetworkAccessImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/NetworkAccessImpl.java index cc287fd3..f65e93c7 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/NetworkAccessImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/NetworkAccessImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.LoaderInstances; -import org.w3id.cwl.cwl1_1.utils.LoadingOptions; -import org.w3id.cwl.cwl1_1.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_1.utils.SaveableImpl; -import org.w3id.cwl.cwl1_1.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_1.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_1.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_1.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/cwl#NetworkAccess
@@ -43,6 +43,9 @@ public class NetworkAccessImpl extends SaveableImpl implements NetworkAccess { private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -71,7 +74,7 @@ public Object getNetworkAccess() { } /** - * Used by {@link org.w3id.cwl.cwl1_1.utils.RootLoader} to construct instances of NetworkAccessImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_1.utils.RootLoader} to construct instances of NetworkAccessImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -127,5 +130,14 @@ public NetworkAccessImpl( } this.class_ = (NetworkAccess_class) class_; this.networkAccess = (Object) networkAccess; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("class", "networkAccess"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_1/NetworkAccess_class.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/NetworkAccess_class.java similarity index 92% rename from src/main/java/org/w3id/cwl/cwl1_1/NetworkAccess_class.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/NetworkAccess_class.java index 56916e10..d0f48225 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/NetworkAccess_class.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/NetworkAccess_class.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_1.utils.ValidationException; public enum NetworkAccess_class { NETWORKACCESS("NetworkAccess"); diff --git a/src/main/java/org/w3id/cwl/cwl1_2/OutputArraySchema.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/OutputArraySchema.java similarity index 88% rename from src/main/java/org/w3id/cwl/cwl1_2/OutputArraySchema.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/OutputArraySchema.java index 1370e744..d26d6ae9 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/OutputArraySchema.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/OutputArraySchema.java @@ -12,14 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_2.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#OutputArraySchema
This interface is implemented by {@link OutputArraySchemaImpl}
*/ public interface OutputArraySchema extends CWLArraySchema, OutputSchema, Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#IOSchema/name
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/OutputArraySchemaImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/OutputArraySchemaImpl.java similarity index 88% rename from src/main/java/org/w3id/cwl/cwl1_2/OutputArraySchemaImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/OutputArraySchemaImpl.java index ab24a3d3..9261e32c 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/OutputArraySchemaImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/OutputArraySchemaImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_2.utils.LoaderInstances; -import org.w3id.cwl.cwl1_2.utils.LoadingOptions; -import org.w3id.cwl.cwl1_2.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_2.utils.SaveableImpl; -import org.w3id.cwl.cwl1_2.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_1.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_1.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_1.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/cwl#OutputArraySchema
@@ -27,6 +27,9 @@ public class OutputArraySchemaImpl extends SaveableImpl implements OutputArraySc private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -92,7 +95,7 @@ public Object getDoc() { } /** - * Used by {@link org.w3id.cwl.cwl1_2.utils.RootLoader} to construct instances of OutputArraySchemaImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_1.utils.RootLoader} to construct instances of OutputArraySchemaImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -216,5 +219,14 @@ public OutputArraySchemaImpl( this.label = (java.util.Optional) label; this.doc = (Object) doc; this.name = (java.util.Optional) name; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("items", "type", "label", "doc", "name"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_2/OutputEnumSchema.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/OutputEnumSchema.java similarity index 88% rename from src/main/java/org/w3id/cwl/cwl1_2/OutputEnumSchema.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/OutputEnumSchema.java index 9eb2a423..aee84a8a 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/OutputEnumSchema.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/OutputEnumSchema.java @@ -12,14 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_2.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#OutputEnumSchema
This interface is implemented by {@link OutputEnumSchemaImpl}
*/ public interface OutputEnumSchema extends EnumSchema, OutputSchema, Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#IOSchema/name
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/OutputEnumSchemaImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/OutputEnumSchemaImpl.java similarity index 88% rename from src/main/java/org/w3id/cwl/cwl1_2/OutputEnumSchemaImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/OutputEnumSchemaImpl.java index 8b6aa288..0b691ae0 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/OutputEnumSchemaImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/OutputEnumSchemaImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_2.utils.LoaderInstances; -import org.w3id.cwl.cwl1_2.utils.LoadingOptions; -import org.w3id.cwl.cwl1_2.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_2.utils.SaveableImpl; -import org.w3id.cwl.cwl1_2.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_1.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_1.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_1.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/cwl#OutputEnumSchema
@@ -27,6 +27,9 @@ public class OutputEnumSchemaImpl extends SaveableImpl implements OutputEnumSche private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -92,7 +95,7 @@ public Object getDoc() { } /** - * Used by {@link org.w3id.cwl.cwl1_2.utils.RootLoader} to construct instances of OutputEnumSchemaImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_1.utils.RootLoader} to construct instances of OutputEnumSchemaImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -216,5 +219,14 @@ public OutputEnumSchemaImpl( this.type = (Enum_name) type; this.label = (java.util.Optional) label; this.doc = (Object) doc; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("name", "symbols", "type", "label", "doc"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_1/OutputFormat.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/OutputFormat.java similarity index 81% rename from src/main/java/org/w3id/cwl/cwl1_1/OutputFormat.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/OutputFormat.java index 95ab85eb..6fc88bf8 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/OutputFormat.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/OutputFormat.java @@ -12,14 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#OutputFormat
*/ public interface OutputFormat extends Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#format
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/OutputParameter.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/OutputParameter.java similarity index 95% rename from src/main/java/org/w3id/cwl/cwl1_2/OutputParameter.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/OutputParameter.java index 269ca014..7ff65a02 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/OutputParameter.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/OutputParameter.java @@ -12,14 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_2.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#OutputParameter
*/ public interface OutputParameter extends Parameter, OutputFormat, Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#Labeled/label
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/OutputRecordField.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/OutputRecordField.java similarity index 95% rename from src/main/java/org/w3id/cwl/cwl1_2/OutputRecordField.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/OutputRecordField.java index 30250e7e..57cc62a4 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/OutputRecordField.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/OutputRecordField.java @@ -12,14 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_2.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#OutputRecordField
This interface is implemented by {@link OutputRecordFieldImpl}
*/ public interface OutputRecordField extends CWLRecordField, FieldBase, OutputFormat, Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/salad#RecordField/name
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/OutputRecordFieldImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/OutputRecordFieldImpl.java similarity index 92% rename from src/main/java/org/w3id/cwl/cwl1_2/OutputRecordFieldImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/OutputRecordFieldImpl.java index 669993ae..4d98b3c5 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/OutputRecordFieldImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/OutputRecordFieldImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_2.utils.LoaderInstances; -import org.w3id.cwl.cwl1_2.utils.LoadingOptions; -import org.w3id.cwl.cwl1_2.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_2.utils.SaveableImpl; -import org.w3id.cwl.cwl1_2.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_1.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_1.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_1.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/cwl#OutputRecordField
@@ -27,6 +27,9 @@ public class OutputRecordFieldImpl extends SaveableImpl implements OutputRecordF private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -169,7 +172,7 @@ public Object getFormat() { } /** - * Used by {@link org.w3id.cwl.cwl1_2.utils.RootLoader} to construct instances of OutputRecordFieldImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_1.utils.RootLoader} to construct instances of OutputRecordFieldImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -330,5 +333,14 @@ public OutputRecordFieldImpl( this.secondaryFiles = (Object) secondaryFiles; this.streamable = (java.util.Optional) streamable; this.format = (Object) format; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("doc", "name", "type", "label", "secondaryFiles", "streamable", "format"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_2/OutputRecordSchema.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/OutputRecordSchema.java similarity index 88% rename from src/main/java/org/w3id/cwl/cwl1_2/OutputRecordSchema.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/OutputRecordSchema.java index b20c6242..60914e74 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/OutputRecordSchema.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/OutputRecordSchema.java @@ -12,14 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_2.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#OutputRecordSchema
This interface is implemented by {@link OutputRecordSchemaImpl}
*/ public interface OutputRecordSchema extends CWLRecordSchema, OutputSchema, Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#IOSchema/name
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_1/OutputRecordSchemaImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/OutputRecordSchemaImpl.java similarity index 88% rename from src/main/java/org/w3id/cwl/cwl1_1/OutputRecordSchemaImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/OutputRecordSchemaImpl.java index 5454d6e7..8cdacaae 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/OutputRecordSchemaImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/OutputRecordSchemaImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.LoaderInstances; -import org.w3id.cwl.cwl1_1.utils.LoadingOptions; -import org.w3id.cwl.cwl1_1.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_1.utils.SaveableImpl; -import org.w3id.cwl.cwl1_1.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_1.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_1.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_1.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/cwl#OutputRecordSchema
@@ -27,6 +27,9 @@ public class OutputRecordSchemaImpl extends SaveableImpl implements OutputRecord private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -92,7 +95,7 @@ public Object getDoc() { } /** - * Used by {@link org.w3id.cwl.cwl1_1.utils.RootLoader} to construct instances of OutputRecordSchemaImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_1.utils.RootLoader} to construct instances of OutputRecordSchemaImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -222,5 +225,14 @@ public OutputRecordSchemaImpl( this.label = (java.util.Optional) label; this.doc = (Object) doc; this.name = (java.util.Optional) name; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("fields", "type", "label", "doc", "name"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_2/OutputSchema.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/OutputSchema.java similarity index 83% rename from src/main/java/org/w3id/cwl/cwl1_2/OutputSchema.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/OutputSchema.java index c13b40f2..4980babb 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/OutputSchema.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/OutputSchema.java @@ -12,14 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_2.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#OutputSchema
*/ public interface OutputSchema extends IOSchema, Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#Labeled/label
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/Parameter.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/Parameter.java similarity index 94% rename from src/main/java/org/w3id/cwl/cwl1_2/Parameter.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/Parameter.java index b8f4fb48..70944268 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/Parameter.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/Parameter.java @@ -12,9 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_2.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#Parameter
@@ -22,6 +23,10 @@
*/ public interface Parameter extends FieldBase, Documented, Identified, Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#Labeled/label
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_1/PrimitiveType.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/PrimitiveType.java similarity index 93% rename from src/main/java/org/w3id/cwl/cwl1_1/PrimitiveType.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/PrimitiveType.java index 53b05376..a6774d37 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/PrimitiveType.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/PrimitiveType.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_1.utils.ValidationException; public enum PrimitiveType { NULL("null"), diff --git a/src/main/java/org/w3id/cwl/cwl1_1/Process.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/Process.java similarity index 94% rename from src/main/java/org/w3id/cwl/cwl1_1/Process.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/Process.java index e138ec0e..270750c2 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/Process.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/Process.java @@ -12,9 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#Process
@@ -25,6 +26,10 @@
*/ public interface Process extends Identified, Labeled, Documented, Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#Labeled/label
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_1/ProcessRequirement.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/ProcessRequirement.java similarity index 82% rename from src/main/java/org/w3id/cwl/cwl1_1/ProcessRequirement.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/ProcessRequirement.java index 6e2dc02f..2c658b3a 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/ProcessRequirement.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/ProcessRequirement.java @@ -12,9 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#ProcessRequirement
@@ -27,4 +28,8 @@
*/ public interface ProcessRequirement extends Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + } diff --git a/src/main/java/org/w3id/cwl/cwl1_2/RecordField.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/RecordField.java similarity index 87% rename from src/main/java/org/w3id/cwl/cwl1_2/RecordField.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/RecordField.java index 9dcbac90..30249bfd 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/RecordField.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/RecordField.java @@ -12,15 +12,20 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_2.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/salad#RecordField
This interface is implemented by {@link RecordFieldImpl}
A field of a record.
*/ public interface RecordField extends Documented, Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/salad#RecordField/name
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_1/RecordFieldImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/RecordFieldImpl.java similarity index 86% rename from src/main/java/org/w3id/cwl/cwl1_1/RecordFieldImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/RecordFieldImpl.java index ad459010..aa1d316a 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/RecordFieldImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/RecordFieldImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.LoaderInstances; -import org.w3id.cwl.cwl1_1.utils.LoadingOptions; -import org.w3id.cwl.cwl1_1.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_1.utils.SaveableImpl; -import org.w3id.cwl.cwl1_1.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_1.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_1.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_1.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/salad#RecordField
@@ -28,6 +28,9 @@ public class RecordFieldImpl extends SaveableImpl implements RecordField { private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -73,7 +76,7 @@ public Object getType() { } /** - * Used by {@link org.w3id.cwl.cwl1_1.utils.RootLoader} to construct instances of RecordFieldImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_1.utils.RootLoader} to construct instances of RecordFieldImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -162,5 +165,14 @@ public RecordFieldImpl( this.doc = (Object) doc; this.name = (String) name; this.type = (Object) type; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("doc", "name", "type"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_2/RecordSchema.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/RecordSchema.java similarity index 83% rename from src/main/java/org/w3id/cwl/cwl1_2/RecordSchema.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/RecordSchema.java index 95e56e6c..d8a5966f 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/RecordSchema.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/RecordSchema.java @@ -12,14 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_2.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/salad#RecordSchema
This interface is implemented by {@link RecordSchemaImpl}
*/ public interface RecordSchema extends Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/salad#fields
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_1/RecordSchemaImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/RecordSchemaImpl.java similarity index 82% rename from src/main/java/org/w3id/cwl/cwl1_1/RecordSchemaImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/RecordSchemaImpl.java index 14f9002b..38f3f08f 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/RecordSchemaImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/RecordSchemaImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.LoaderInstances; -import org.w3id.cwl.cwl1_1.utils.LoadingOptions; -import org.w3id.cwl.cwl1_1.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_1.utils.SaveableImpl; -import org.w3id.cwl.cwl1_1.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_1.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_1.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_1.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/salad#RecordSchema
@@ -27,6 +27,9 @@ public class RecordSchemaImpl extends SaveableImpl implements RecordSchema { private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -56,7 +59,7 @@ public Record_name getType() { } /** - * Used by {@link org.w3id.cwl.cwl1_1.utils.RootLoader} to construct instances of RecordSchemaImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_1.utils.RootLoader} to construct instances of RecordSchemaImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -118,5 +121,14 @@ public RecordSchemaImpl( } this.fields = (java.util.Optional>) fields; this.type = (Record_name) type; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("fields", "type"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_1/Record_name.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/Record_name.java similarity index 92% rename from src/main/java/org/w3id/cwl/cwl1_1/Record_name.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/Record_name.java index ff3c664f..9dad005d 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/Record_name.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/Record_name.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_1.utils.ValidationException; public enum Record_name { RECORD("record"); diff --git a/src/main/java/org/w3id/cwl/cwl1_1/ResourceRequirement.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/ResourceRequirement.java similarity index 94% rename from src/main/java/org/w3id/cwl/cwl1_1/ResourceRequirement.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/ResourceRequirement.java index d239cdfa..469c950e 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/ResourceRequirement.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/ResourceRequirement.java @@ -12,9 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#ResourceRequirement
This interface is implemented by {@link ResourceRequirementImpl}
@@ -41,6 +42,10 @@
*/ public interface ResourceRequirement extends ProcessRequirement, Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#ResourceRequirement/class
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_1/ResourceRequirementImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/ResourceRequirementImpl.java similarity index 92% rename from src/main/java/org/w3id/cwl/cwl1_1/ResourceRequirementImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/ResourceRequirementImpl.java index d0898a7b..8b9de21d 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/ResourceRequirementImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/ResourceRequirementImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.LoaderInstances; -import org.w3id.cwl.cwl1_1.utils.LoadingOptions; -import org.w3id.cwl.cwl1_1.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_1.utils.SaveableImpl; -import org.w3id.cwl.cwl1_1.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_1.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_1.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_1.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/cwl#ResourceRequirement
@@ -48,6 +48,9 @@ public class ResourceRequirementImpl extends SaveableImpl implements ResourceReq private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -161,7 +164,7 @@ public Object getOutdirMax() { } /** - * Used by {@link org.w3id.cwl.cwl1_1.utils.RootLoader} to construct instances of ResourceRequirementImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_1.utils.RootLoader} to construct instances of ResourceRequirementImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -349,5 +352,14 @@ public ResourceRequirementImpl( this.tmpdirMax = (Object) tmpdirMax; this.outdirMin = (Object) outdirMin; this.outdirMax = (Object) outdirMax; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("class", "coresMin", "coresMax", "ramMin", "ramMax", "tmpdirMin", "tmpdirMax", "outdirMin", "outdirMax"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_1/ResourceRequirement_class.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/ResourceRequirement_class.java similarity index 92% rename from src/main/java/org/w3id/cwl/cwl1_1/ResourceRequirement_class.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/ResourceRequirement_class.java index 320377de..846cbedc 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/ResourceRequirement_class.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/ResourceRequirement_class.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_1.utils.ValidationException; public enum ResourceRequirement_class { RESOURCEREQUIREMENT("ResourceRequirement"); diff --git a/src/main/java/org/w3id/cwl/cwl1_2/ScatterFeatureRequirement.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/ScatterFeatureRequirement.java similarity index 84% rename from src/main/java/org/w3id/cwl/cwl1_2/ScatterFeatureRequirement.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/ScatterFeatureRequirement.java index d323e050..4387e905 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/ScatterFeatureRequirement.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/ScatterFeatureRequirement.java @@ -12,9 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_2.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#ScatterFeatureRequirement
This interface is implemented by {@link ScatterFeatureRequirementImpl}
@@ -23,6 +24,10 @@
*/ public interface ScatterFeatureRequirement extends ProcessRequirement, Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#ScatterFeatureRequirement/class
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_1/ScatterFeatureRequirementImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/ScatterFeatureRequirementImpl.java similarity index 80% rename from src/main/java/org/w3id/cwl/cwl1_1/ScatterFeatureRequirementImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/ScatterFeatureRequirementImpl.java index e2732395..ab826911 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/ScatterFeatureRequirementImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/ScatterFeatureRequirementImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.LoaderInstances; -import org.w3id.cwl.cwl1_1.utils.LoadingOptions; -import org.w3id.cwl.cwl1_1.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_1.utils.SaveableImpl; -import org.w3id.cwl.cwl1_1.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_1.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_1.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_1.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/cwl#ScatterFeatureRequirement
@@ -30,6 +30,9 @@ public class ScatterFeatureRequirementImpl extends SaveableImpl implements Scatt private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -47,7 +50,7 @@ public ScatterFeatureRequirement_class getClass_() { } /** - * Used by {@link org.w3id.cwl.cwl1_1.utils.RootLoader} to construct instances of ScatterFeatureRequirementImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_1.utils.RootLoader} to construct instances of ScatterFeatureRequirementImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -91,5 +94,14 @@ public ScatterFeatureRequirementImpl( throw new ValidationException("Trying 'RecordField'", __errors); } this.class_ = (ScatterFeatureRequirement_class) class_; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("class"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_1/ScatterFeatureRequirement_class.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/ScatterFeatureRequirement_class.java similarity index 93% rename from src/main/java/org/w3id/cwl/cwl1_1/ScatterFeatureRequirement_class.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/ScatterFeatureRequirement_class.java index 4526da54..63f85244 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/ScatterFeatureRequirement_class.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/ScatterFeatureRequirement_class.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_1.utils.ValidationException; public enum ScatterFeatureRequirement_class { SCATTERFEATUREREQUIREMENT("ScatterFeatureRequirement"); diff --git a/src/main/java/org/w3id/cwl/cwl1_1/ScatterMethod.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/ScatterMethod.java similarity index 93% rename from src/main/java/org/w3id/cwl/cwl1_1/ScatterMethod.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/ScatterMethod.java index 8f6ea379..dd530a96 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/ScatterMethod.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/ScatterMethod.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_1.utils.ValidationException; public enum ScatterMethod { DOTPRODUCT("dotproduct"), diff --git a/src/main/java/org/w3id/cwl/cwl1_1/SchemaDefRequirement.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/SchemaDefRequirement.java similarity index 88% rename from src/main/java/org/w3id/cwl/cwl1_1/SchemaDefRequirement.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/SchemaDefRequirement.java index 70c73893..9fc51cb2 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/SchemaDefRequirement.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/SchemaDefRequirement.java @@ -12,9 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#SchemaDefRequirement
This interface is implemented by {@link SchemaDefRequirementImpl}
@@ -28,6 +29,10 @@
*/ public interface SchemaDefRequirement extends ProcessRequirement, Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#SchemaDefRequirement/class
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_1/SchemaDefRequirementImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/SchemaDefRequirementImpl.java similarity index 84% rename from src/main/java/org/w3id/cwl/cwl1_1/SchemaDefRequirementImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/SchemaDefRequirementImpl.java index e1745f81..6ad1720f 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/SchemaDefRequirementImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/SchemaDefRequirementImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.LoaderInstances; -import org.w3id.cwl.cwl1_1.utils.LoadingOptions; -import org.w3id.cwl.cwl1_1.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_1.utils.SaveableImpl; -import org.w3id.cwl.cwl1_1.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_1.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_1.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_1.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/cwl#SchemaDefRequirement
@@ -35,6 +35,9 @@ public class SchemaDefRequirementImpl extends SaveableImpl implements SchemaDefR private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -64,7 +67,7 @@ public java.util.List getTypes() { } /** - * Used by {@link org.w3id.cwl.cwl1_1.utils.RootLoader} to construct instances of SchemaDefRequirementImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_1.utils.RootLoader} to construct instances of SchemaDefRequirementImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -120,5 +123,14 @@ public SchemaDefRequirementImpl( } this.class_ = (SchemaDefRequirement_class) class_; this.types = (java.util.List) types; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("class", "types"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_1/SchemaDefRequirement_class.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/SchemaDefRequirement_class.java similarity index 92% rename from src/main/java/org/w3id/cwl/cwl1_1/SchemaDefRequirement_class.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/SchemaDefRequirement_class.java index 4ba8175f..22a8cb87 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/SchemaDefRequirement_class.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/SchemaDefRequirement_class.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_1.utils.ValidationException; public enum SchemaDefRequirement_class { SCHEMADEFREQUIREMENT("SchemaDefRequirement"); diff --git a/src/main/java/org/w3id/cwl/cwl1_1/SecondaryFileSchema.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/SecondaryFileSchema.java similarity index 93% rename from src/main/java/org/w3id/cwl/cwl1_1/SecondaryFileSchema.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/SecondaryFileSchema.java index b520bb7d..805ed37d 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/SecondaryFileSchema.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/SecondaryFileSchema.java @@ -12,14 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#SecondaryFileSchema
This interface is implemented by {@link SecondaryFileSchemaImpl}
*/ public interface SecondaryFileSchema extends Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#SecondaryFileSchema/pattern
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_1/SecondaryFileSchemaImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/SecondaryFileSchemaImpl.java similarity index 87% rename from src/main/java/org/w3id/cwl/cwl1_1/SecondaryFileSchemaImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/SecondaryFileSchemaImpl.java index f8d78526..38f071e3 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/SecondaryFileSchemaImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/SecondaryFileSchemaImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.LoaderInstances; -import org.w3id.cwl.cwl1_1.utils.LoadingOptions; -import org.w3id.cwl.cwl1_1.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_1.utils.SaveableImpl; -import org.w3id.cwl.cwl1_1.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_1.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_1.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_1.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/cwl#SecondaryFileSchema
@@ -27,6 +27,9 @@ public class SecondaryFileSchemaImpl extends SaveableImpl implements SecondaryFi private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -91,7 +94,7 @@ public Object getRequired() { } /** - * Used by {@link org.w3id.cwl.cwl1_1.utils.RootLoader} to construct instances of SecondaryFileSchemaImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_1.utils.RootLoader} to construct instances of SecondaryFileSchemaImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -153,5 +156,14 @@ public SecondaryFileSchemaImpl( } this.pattern = (Object) pattern; this.required = (Object) required; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("pattern", "required"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_1/ShellCommandRequirement.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/ShellCommandRequirement.java similarity index 87% rename from src/main/java/org/w3id/cwl/cwl1_1/ShellCommandRequirement.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/ShellCommandRequirement.java index 48f71ff9..1ed7d619 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/ShellCommandRequirement.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/ShellCommandRequirement.java @@ -12,9 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#ShellCommandRequirement
This interface is implemented by {@link ShellCommandRequirementImpl}
@@ -28,6 +29,10 @@
*/ public interface ShellCommandRequirement extends ProcessRequirement, Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#ShellCommandRequirement/class
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_1/ShellCommandRequirementImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/ShellCommandRequirementImpl.java similarity index 81% rename from src/main/java/org/w3id/cwl/cwl1_1/ShellCommandRequirementImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/ShellCommandRequirementImpl.java index b8d7d9d0..2c8a635c 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/ShellCommandRequirementImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/ShellCommandRequirementImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.LoaderInstances; -import org.w3id.cwl.cwl1_1.utils.LoadingOptions; -import org.w3id.cwl.cwl1_1.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_1.utils.SaveableImpl; -import org.w3id.cwl.cwl1_1.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_1.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_1.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_1.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/cwl#ShellCommandRequirement
@@ -35,6 +35,9 @@ public class ShellCommandRequirementImpl extends SaveableImpl implements ShellCo private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -52,7 +55,7 @@ public ShellCommandRequirement_class getClass_() { } /** - * Used by {@link org.w3id.cwl.cwl1_1.utils.RootLoader} to construct instances of ShellCommandRequirementImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_1.utils.RootLoader} to construct instances of ShellCommandRequirementImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -96,5 +99,14 @@ public ShellCommandRequirementImpl( throw new ValidationException("Trying 'RecordField'", __errors); } this.class_ = (ShellCommandRequirement_class) class_; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("class"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_1/ShellCommandRequirement_class.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/ShellCommandRequirement_class.java similarity index 93% rename from src/main/java/org/w3id/cwl/cwl1_1/ShellCommandRequirement_class.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/ShellCommandRequirement_class.java index c7b56717..29dea997 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/ShellCommandRequirement_class.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/ShellCommandRequirement_class.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_1.utils.ValidationException; public enum ShellCommandRequirement_class { SHELLCOMMANDREQUIREMENT("ShellCommandRequirement"); diff --git a/src/main/java/org/w3id/cwl/cwl1_1/Sink.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/Sink.java similarity index 84% rename from src/main/java/org/w3id/cwl/cwl1_1/Sink.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/Sink.java index 1cd868bc..ea563d9d 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/Sink.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/Sink.java @@ -12,14 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#Sink
*/ public interface Sink extends Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#source
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_1/SoftwarePackage.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/SoftwarePackage.java similarity index 94% rename from src/main/java/org/w3id/cwl/cwl1_1/SoftwarePackage.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/SoftwarePackage.java index e8552884..d30b9d69 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/SoftwarePackage.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/SoftwarePackage.java @@ -12,14 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#SoftwarePackage
This interface is implemented by {@link SoftwarePackageImpl}
*/ public interface SoftwarePackage extends Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#SoftwarePackage/package
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_1/SoftwarePackageImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/SoftwarePackageImpl.java similarity index 89% rename from src/main/java/org/w3id/cwl/cwl1_1/SoftwarePackageImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/SoftwarePackageImpl.java index c2680c1f..fd5445fa 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/SoftwarePackageImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/SoftwarePackageImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.LoaderInstances; -import org.w3id.cwl.cwl1_1.utils.LoadingOptions; -import org.w3id.cwl.cwl1_1.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_1.utils.SaveableImpl; -import org.w3id.cwl.cwl1_1.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_1.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_1.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_1.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/cwl#SoftwarePackage
@@ -27,6 +27,9 @@ public class SoftwarePackageImpl extends SaveableImpl implements SoftwarePackage private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -114,7 +117,7 @@ public java.util.Optional> getSpecs() { } /** - * Used by {@link org.w3id.cwl.cwl1_1.utils.RootLoader} to construct instances of SoftwarePackageImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_1.utils.RootLoader} to construct instances of SoftwarePackageImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -194,5 +197,14 @@ public SoftwarePackageImpl( this.package_ = (String) package_; this.version = (java.util.Optional>) version; this.specs = (java.util.Optional>) specs; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("package", "version", "specs"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_1/SoftwareRequirement.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/SoftwareRequirement.java similarity index 85% rename from src/main/java/org/w3id/cwl/cwl1_1/SoftwareRequirement.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/SoftwareRequirement.java index e93600d5..88a6940e 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/SoftwareRequirement.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/SoftwareRequirement.java @@ -12,9 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#SoftwareRequirement
This interface is implemented by {@link SoftwareRequirementImpl}
@@ -23,6 +24,10 @@
*/ public interface SoftwareRequirement extends ProcessRequirement, Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#SoftwareRequirement/class
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/SoftwareRequirementImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/SoftwareRequirementImpl.java similarity index 82% rename from src/main/java/org/w3id/cwl/cwl1_2/SoftwareRequirementImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/SoftwareRequirementImpl.java index 5fb6a59b..9f623c3f 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/SoftwareRequirementImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/SoftwareRequirementImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_2.utils.LoaderInstances; -import org.w3id.cwl.cwl1_2.utils.LoadingOptions; -import org.w3id.cwl.cwl1_2.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_2.utils.SaveableImpl; -import org.w3id.cwl.cwl1_2.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_1.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_1.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_1.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/cwl#SoftwareRequirement
@@ -30,6 +30,9 @@ public class SoftwareRequirementImpl extends SaveableImpl implements SoftwareReq private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -59,7 +62,7 @@ public java.util.List getPackages() { } /** - * Used by {@link org.w3id.cwl.cwl1_2.utils.RootLoader} to construct instances of SoftwareRequirementImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_1.utils.RootLoader} to construct instances of SoftwareRequirementImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -115,5 +118,14 @@ public SoftwareRequirementImpl( } this.class_ = (SoftwareRequirement_class) class_; this.packages = (java.util.List) packages; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("class", "packages"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_1/SoftwareRequirement_class.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/SoftwareRequirement_class.java similarity index 92% rename from src/main/java/org/w3id/cwl/cwl1_1/SoftwareRequirement_class.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/SoftwareRequirement_class.java index 9f56cc01..ae0fa1e6 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/SoftwareRequirement_class.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/SoftwareRequirement_class.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_1.utils.ValidationException; public enum SoftwareRequirement_class { SOFTWAREREQUIREMENT("SoftwareRequirement"); diff --git a/src/main/java/org/w3id/cwl/cwl1_2/StepInputExpressionRequirement.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/StepInputExpressionRequirement.java similarity index 84% rename from src/main/java/org/w3id/cwl/cwl1_2/StepInputExpressionRequirement.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/StepInputExpressionRequirement.java index f5ed04d5..e6363436 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/StepInputExpressionRequirement.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/StepInputExpressionRequirement.java @@ -12,9 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_2.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#StepInputExpressionRequirement
This interface is implemented by {@link StepInputExpressionRequirementImpl}
@@ -23,6 +24,10 @@
*/ public interface StepInputExpressionRequirement extends ProcessRequirement, Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#StepInputExpressionRequirement/class
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_1/StepInputExpressionRequirementImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/StepInputExpressionRequirementImpl.java similarity index 80% rename from src/main/java/org/w3id/cwl/cwl1_1/StepInputExpressionRequirementImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/StepInputExpressionRequirementImpl.java index 4efff15c..2bf4d2ce 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/StepInputExpressionRequirementImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/StepInputExpressionRequirementImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.LoaderInstances; -import org.w3id.cwl.cwl1_1.utils.LoadingOptions; -import org.w3id.cwl.cwl1_1.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_1.utils.SaveableImpl; -import org.w3id.cwl.cwl1_1.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_1.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_1.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_1.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/cwl#StepInputExpressionRequirement
@@ -30,6 +30,9 @@ public class StepInputExpressionRequirementImpl extends SaveableImpl implements private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -47,7 +50,7 @@ public StepInputExpressionRequirement_class getClass_() { } /** - * Used by {@link org.w3id.cwl.cwl1_1.utils.RootLoader} to construct instances of StepInputExpressionRequirementImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_1.utils.RootLoader} to construct instances of StepInputExpressionRequirementImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -91,5 +94,14 @@ public StepInputExpressionRequirementImpl( throw new ValidationException("Trying 'RecordField'", __errors); } this.class_ = (StepInputExpressionRequirement_class) class_; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("class"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_1/StepInputExpressionRequirement_class.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/StepInputExpressionRequirement_class.java similarity index 93% rename from src/main/java/org/w3id/cwl/cwl1_1/StepInputExpressionRequirement_class.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/StepInputExpressionRequirement_class.java index f6a7139d..a6bf0b81 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/StepInputExpressionRequirement_class.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/StepInputExpressionRequirement_class.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_1.utils.ValidationException; public enum StepInputExpressionRequirement_class { STEPINPUTEXPRESSIONREQUIREMENT("StepInputExpressionRequirement"); diff --git a/src/main/java/org/w3id/cwl/cwl1_2/SubworkflowFeatureRequirement.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/SubworkflowFeatureRequirement.java similarity index 84% rename from src/main/java/org/w3id/cwl/cwl1_2/SubworkflowFeatureRequirement.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/SubworkflowFeatureRequirement.java index 9cdbb840..ce5d6ae1 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/SubworkflowFeatureRequirement.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/SubworkflowFeatureRequirement.java @@ -12,9 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_2.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#SubworkflowFeatureRequirement
This interface is implemented by {@link SubworkflowFeatureRequirementImpl}
@@ -23,6 +24,10 @@
*/ public interface SubworkflowFeatureRequirement extends ProcessRequirement, Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#SubworkflowFeatureRequirement/class
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_1/SubworkflowFeatureRequirementImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/SubworkflowFeatureRequirementImpl.java similarity index 80% rename from src/main/java/org/w3id/cwl/cwl1_1/SubworkflowFeatureRequirementImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/SubworkflowFeatureRequirementImpl.java index 4373aab3..230383db 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/SubworkflowFeatureRequirementImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/SubworkflowFeatureRequirementImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.LoaderInstances; -import org.w3id.cwl.cwl1_1.utils.LoadingOptions; -import org.w3id.cwl.cwl1_1.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_1.utils.SaveableImpl; -import org.w3id.cwl.cwl1_1.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_1.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_1.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_1.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/cwl#SubworkflowFeatureRequirement
@@ -30,6 +30,9 @@ public class SubworkflowFeatureRequirementImpl extends SaveableImpl implements S private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -47,7 +50,7 @@ public SubworkflowFeatureRequirement_class getClass_() { } /** - * Used by {@link org.w3id.cwl.cwl1_1.utils.RootLoader} to construct instances of SubworkflowFeatureRequirementImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_1.utils.RootLoader} to construct instances of SubworkflowFeatureRequirementImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -91,5 +94,14 @@ public SubworkflowFeatureRequirementImpl( throw new ValidationException("Trying 'RecordField'", __errors); } this.class_ = (SubworkflowFeatureRequirement_class) class_; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("class"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_2/SubworkflowFeatureRequirement_class.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/SubworkflowFeatureRequirement_class.java similarity index 93% rename from src/main/java/org/w3id/cwl/cwl1_2/SubworkflowFeatureRequirement_class.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/SubworkflowFeatureRequirement_class.java index 94d01c88..63d465dd 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/SubworkflowFeatureRequirement_class.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/SubworkflowFeatureRequirement_class.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_2.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_1.utils.ValidationException; public enum SubworkflowFeatureRequirement_class { SUBWORKFLOWFEATUREREQUIREMENT("SubworkflowFeatureRequirement"); diff --git a/src/main/java/org/w3id/cwl/cwl1_1/ToolTimeLimit.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/ToolTimeLimit.java similarity index 88% rename from src/main/java/org/w3id/cwl/cwl1_1/ToolTimeLimit.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/ToolTimeLimit.java index 167eb1d2..0c738c6e 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/ToolTimeLimit.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/ToolTimeLimit.java @@ -12,9 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#ToolTimeLimit
This interface is implemented by {@link ToolTimeLimitImpl}
@@ -28,6 +29,10 @@
*/ public interface ToolTimeLimit extends ProcessRequirement, Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#ToolTimeLimit/class
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_1/ToolTimeLimitImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/ToolTimeLimitImpl.java similarity index 83% rename from src/main/java/org/w3id/cwl/cwl1_1/ToolTimeLimitImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/ToolTimeLimitImpl.java index a53376f1..2b4954d9 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/ToolTimeLimitImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/ToolTimeLimitImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.LoaderInstances; -import org.w3id.cwl.cwl1_1.utils.LoadingOptions; -import org.w3id.cwl.cwl1_1.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_1.utils.SaveableImpl; -import org.w3id.cwl.cwl1_1.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_1.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_1.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_1.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/cwl#ToolTimeLimit
@@ -35,6 +35,9 @@ public class ToolTimeLimitImpl extends SaveableImpl implements ToolTimeLimit { private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -66,7 +69,7 @@ public Object getTimelimit() { } /** - * Used by {@link org.w3id.cwl.cwl1_1.utils.RootLoader} to construct instances of ToolTimeLimitImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_1.utils.RootLoader} to construct instances of ToolTimeLimitImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -122,5 +125,14 @@ public ToolTimeLimitImpl( } this.class_ = (ToolTimeLimit_class) class_; this.timelimit = (Object) timelimit; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("class", "timelimit"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_1/ToolTimeLimit_class.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/ToolTimeLimit_class.java similarity index 92% rename from src/main/java/org/w3id/cwl/cwl1_1/ToolTimeLimit_class.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/ToolTimeLimit_class.java index 15395f57..078a8f0c 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/ToolTimeLimit_class.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/ToolTimeLimit_class.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_1.utils.ValidationException; public enum ToolTimeLimit_class { TOOLTIMELIMIT("ToolTimeLimit"); diff --git a/src/main/java/org/w3id/cwl/cwl1_1/UnionSchema.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/UnionSchema.java similarity index 83% rename from src/main/java/org/w3id/cwl/cwl1_1/UnionSchema.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/UnionSchema.java index 58a8e291..52067ba2 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/UnionSchema.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/UnionSchema.java @@ -12,14 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/salad#UnionSchema
This interface is implemented by {@link UnionSchemaImpl}
*/ public interface UnionSchema extends Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/salad#names
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/UnionSchemaImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/UnionSchemaImpl.java similarity index 82% rename from src/main/java/org/w3id/cwl/cwl1_2/UnionSchemaImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/UnionSchemaImpl.java index d4b7ced8..ed701215 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/UnionSchemaImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/UnionSchemaImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_2.utils.LoaderInstances; -import org.w3id.cwl.cwl1_2.utils.LoadingOptions; -import org.w3id.cwl.cwl1_2.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_2.utils.SaveableImpl; -import org.w3id.cwl.cwl1_2.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_1.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_1.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_1.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/salad#UnionSchema
@@ -27,6 +27,9 @@ public class UnionSchemaImpl extends SaveableImpl implements UnionSchema { private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -56,7 +59,7 @@ public Union_name getType() { } /** - * Used by {@link org.w3id.cwl.cwl1_2.utils.RootLoader} to construct instances of UnionSchemaImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_1.utils.RootLoader} to construct instances of UnionSchemaImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -112,5 +115,14 @@ public UnionSchemaImpl( } this.names = (Object) names; this.type = (Union_name) type; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("names", "type"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_1/Union_name.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/Union_name.java similarity index 92% rename from src/main/java/org/w3id/cwl/cwl1_1/Union_name.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/Union_name.java index dbbb0e0c..c7d160c6 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/Union_name.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/Union_name.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_1.utils.ValidationException; public enum Union_name { UNION("union"); diff --git a/src/main/java/org/w3id/cwl/cwl1_1/WorkReuse.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/WorkReuse.java similarity index 87% rename from src/main/java/org/w3id/cwl/cwl1_1/WorkReuse.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/WorkReuse.java index a094fbd4..e3de98d8 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/WorkReuse.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/WorkReuse.java @@ -12,9 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#WorkReuse
This interface is implemented by {@link WorkReuseImpl}
@@ -30,6 +31,10 @@ For implementations that support reusing output from past work (on
*/ public interface WorkReuse extends ProcessRequirement, Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#WorkReuse/class
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_1/WorkReuseImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/WorkReuseImpl.java similarity index 83% rename from src/main/java/org/w3id/cwl/cwl1_1/WorkReuseImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/WorkReuseImpl.java index 516fc90c..5e1f2448 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/WorkReuseImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/WorkReuseImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.LoaderInstances; -import org.w3id.cwl.cwl1_1.utils.LoadingOptions; -import org.w3id.cwl.cwl1_1.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_1.utils.SaveableImpl; -import org.w3id.cwl.cwl1_1.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_1.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_1.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_1.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/cwl#WorkReuse
@@ -37,6 +37,9 @@ public class WorkReuseImpl extends SaveableImpl implements WorkReuse { private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -65,7 +68,7 @@ public Object getEnableReuse() { } /** - * Used by {@link org.w3id.cwl.cwl1_1.utils.RootLoader} to construct instances of WorkReuseImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_1.utils.RootLoader} to construct instances of WorkReuseImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -121,5 +124,14 @@ public WorkReuseImpl( } this.class_ = (WorkReuse_class) class_; this.enableReuse = (Object) enableReuse; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("class", "enableReuse"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_1/WorkReuse_class.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/WorkReuse_class.java similarity index 92% rename from src/main/java/org/w3id/cwl/cwl1_1/WorkReuse_class.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/WorkReuse_class.java index 01900bd4..756e2a46 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/WorkReuse_class.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/WorkReuse_class.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_1.utils.ValidationException; public enum WorkReuse_class { WORKREUSE("WorkReuse"); diff --git a/src/main/java/org/w3id/cwl/cwl1_1/Workflow.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/Workflow.java similarity index 96% rename from src/main/java/org/w3id/cwl/cwl1_1/Workflow.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/Workflow.java index dc16b560..400b8e3b 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/Workflow.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/Workflow.java @@ -12,9 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#Workflow
This interface is implemented by {@link WorkflowImpl}
@@ -66,6 +67,10 @@
*/ public interface Workflow extends Process, Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#Identified/id
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_1/WorkflowImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/WorkflowImpl.java similarity index 94% rename from src/main/java/org/w3id/cwl/cwl1_1/WorkflowImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/WorkflowImpl.java index 393cf5f2..bdf7c0c6 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/WorkflowImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/WorkflowImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.LoaderInstances; -import org.w3id.cwl.cwl1_1.utils.LoadingOptions; -import org.w3id.cwl.cwl1_1.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_1.utils.SaveableImpl; -import org.w3id.cwl.cwl1_1.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_1.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_1.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_1.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/cwl#Workflow
@@ -73,6 +73,9 @@ public class WorkflowImpl extends SaveableImpl implements Workflow { private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -226,7 +229,7 @@ public java.util.List getSteps() { } /** - * Used by {@link org.w3id.cwl.cwl1_1.utils.RootLoader} to construct instances of WorkflowImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_1.utils.RootLoader} to construct instances of WorkflowImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -428,5 +431,14 @@ public WorkflowImpl( this.cwlVersion = (java.util.Optional) cwlVersion; this.class_ = (Workflow_class) class_; this.steps = (java.util.List) steps; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("id", "label", "doc", "inputs", "outputs", "requirements", "hints", "cwlVersion", "class", "steps"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_1/WorkflowInputParameter.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/WorkflowInputParameter.java similarity index 96% rename from src/main/java/org/w3id/cwl/cwl1_1/WorkflowInputParameter.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/WorkflowInputParameter.java index 76a05564..2e890650 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/WorkflowInputParameter.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/WorkflowInputParameter.java @@ -12,14 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#WorkflowInputParameter
This interface is implemented by {@link WorkflowInputParameterImpl}
*/ public interface WorkflowInputParameter extends InputParameter, Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#Identified/id
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_1/WorkflowInputParameterImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/WorkflowInputParameterImpl.java similarity index 94% rename from src/main/java/org/w3id/cwl/cwl1_1/WorkflowInputParameterImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/WorkflowInputParameterImpl.java index 22aafde3..986b788a 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/WorkflowInputParameterImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/WorkflowInputParameterImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.LoaderInstances; -import org.w3id.cwl.cwl1_1.utils.LoadingOptions; -import org.w3id.cwl.cwl1_1.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_1.utils.SaveableImpl; -import org.w3id.cwl.cwl1_1.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_1.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_1.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_1.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/cwl#WorkflowInputParameter
@@ -27,6 +27,9 @@ public class WorkflowInputParameterImpl extends SaveableImpl implements Workflow private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -238,7 +241,7 @@ public java.util.Optional getInputBinding() { } /** - * Used by {@link org.w3id.cwl.cwl1_1.utils.RootLoader} to construct instances of WorkflowInputParameterImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_1.utils.RootLoader} to construct instances of WorkflowInputParameterImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -476,5 +479,14 @@ public WorkflowInputParameterImpl( this.default_ = (java.util.Optional) default_; this.type = (Object) type; this.inputBinding = (java.util.Optional) inputBinding; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("label", "secondaryFiles", "streamable", "doc", "id", "format", "loadContents", "loadListing", "default", "type", "inputBinding"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_1/WorkflowOutputParameter.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/WorkflowOutputParameter.java similarity index 96% rename from src/main/java/org/w3id/cwl/cwl1_1/WorkflowOutputParameter.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/WorkflowOutputParameter.java index 0e352a37..12967443 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/WorkflowOutputParameter.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/WorkflowOutputParameter.java @@ -12,9 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#WorkflowOutputParameter
This interface is implemented by {@link WorkflowOutputParameterImpl}
@@ -25,6 +26,10 @@
*/ public interface WorkflowOutputParameter extends OutputParameter, Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#Identified/id
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_1/WorkflowOutputParameterImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/WorkflowOutputParameterImpl.java similarity index 93% rename from src/main/java/org/w3id/cwl/cwl1_1/WorkflowOutputParameterImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/WorkflowOutputParameterImpl.java index 7e044c9e..3e196dd7 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/WorkflowOutputParameterImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/WorkflowOutputParameterImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.LoaderInstances; -import org.w3id.cwl.cwl1_1.utils.LoadingOptions; -import org.w3id.cwl.cwl1_1.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_1.utils.SaveableImpl; -import org.w3id.cwl.cwl1_1.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_1.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_1.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_1.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/cwl#WorkflowOutputParameter
@@ -32,6 +32,9 @@ public class WorkflowOutputParameterImpl extends SaveableImpl implements Workflo private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -201,7 +204,7 @@ public Object getType() { } /** - * Used by {@link org.w3id.cwl.cwl1_1.utils.RootLoader} to construct instances of WorkflowOutputParameterImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_1.utils.RootLoader} to construct instances of WorkflowOutputParameterImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -403,5 +406,14 @@ public WorkflowOutputParameterImpl( this.outputSource = (Object) outputSource; this.linkMerge = (java.util.Optional) linkMerge; this.type = (Object) type; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("label", "secondaryFiles", "streamable", "doc", "id", "format", "outputSource", "linkMerge", "type"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_1/WorkflowStep.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/WorkflowStep.java similarity index 96% rename from src/main/java/org/w3id/cwl/cwl1_1/WorkflowStep.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/WorkflowStep.java index d1133ac7..1ace23c2 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/WorkflowStep.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/WorkflowStep.java @@ -12,9 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#WorkflowStep
This interface is implemented by {@link WorkflowStepImpl}
@@ -76,6 +77,10 @@ a subworkflow (recursive workflows are not allowed).
*/ public interface WorkflowStep extends Identified, Labeled, Documented, Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#Identified/id
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_1/WorkflowStepImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/WorkflowStepImpl.java similarity index 94% rename from src/main/java/org/w3id/cwl/cwl1_1/WorkflowStepImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/WorkflowStepImpl.java index 63de9817..90b6ce04 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/WorkflowStepImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/WorkflowStepImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.LoaderInstances; -import org.w3id.cwl.cwl1_1.utils.LoadingOptions; -import org.w3id.cwl.cwl1_1.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_1.utils.SaveableImpl; -import org.w3id.cwl.cwl1_1.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_1.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_1.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_1.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/cwl#WorkflowStep
@@ -83,6 +83,9 @@ public class WorkflowStepImpl extends SaveableImpl implements WorkflowStep { private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -226,7 +229,7 @@ public java.util.Optional getScatterMethod() { } /** - * Used by {@link org.w3id.cwl.cwl1_1.utils.RootLoader} to construct instances of WorkflowStepImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_1.utils.RootLoader} to construct instances of WorkflowStepImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -434,5 +437,14 @@ public WorkflowStepImpl( this.run = (Object) run; this.scatter = (Object) scatter; this.scatterMethod = (java.util.Optional) scatterMethod; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("id", "label", "doc", "in", "out", "requirements", "hints", "run", "scatter", "scatterMethod"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_1/WorkflowStepInput.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/WorkflowStepInput.java similarity index 96% rename from src/main/java/org/w3id/cwl/cwl1_1/WorkflowStepInput.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/WorkflowStepInput.java index dae97028..a28e88ae 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/WorkflowStepInput.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/WorkflowStepInput.java @@ -12,9 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#WorkflowStepInput
This interface is implemented by {@link WorkflowStepInputImpl}
@@ -64,6 +65,10 @@ though additonal parameters may be specified (for use within `valueFrom`
*/ public interface WorkflowStepInput extends Identified, Sink, LoadContents, Labeled, Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#Identified/id
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_1/WorkflowStepInputImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/WorkflowStepInputImpl.java similarity index 93% rename from src/main/java/org/w3id/cwl/cwl1_1/WorkflowStepInputImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/WorkflowStepInputImpl.java index 086a28e8..b5911fb9 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/WorkflowStepInputImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/WorkflowStepInputImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.LoaderInstances; -import org.w3id.cwl.cwl1_1.utils.LoadingOptions; -import org.w3id.cwl.cwl1_1.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_1.utils.SaveableImpl; -import org.w3id.cwl.cwl1_1.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_1.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_1.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_1.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/cwl#WorkflowStepInput
@@ -71,6 +71,9 @@ public class WorkflowStepInputImpl extends SaveableImpl implements WorkflowStepI private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -215,7 +218,7 @@ public Object getValueFrom() { } /** - * Used by {@link org.w3id.cwl.cwl1_1.utils.RootLoader} to construct instances of WorkflowStepInputImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_1.utils.RootLoader} to construct instances of WorkflowStepInputImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -405,5 +408,14 @@ public WorkflowStepInputImpl( this.label = (java.util.Optional) label; this.default_ = (java.util.Optional) default_; this.valueFrom = (Object) valueFrom; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("id", "source", "linkMerge", "loadContents", "loadListing", "label", "default", "valueFrom"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_1/WorkflowStepOutput.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/WorkflowStepOutput.java similarity index 86% rename from src/main/java/org/w3id/cwl/cwl1_1/WorkflowStepOutput.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/WorkflowStepOutput.java index 421f8454..f0762883 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/WorkflowStepOutput.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/WorkflowStepOutput.java @@ -12,9 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#WorkflowStepOutput
This interface is implemented by {@link WorkflowStepOutputImpl}
@@ -29,6 +30,10 @@ parameter. The workflow parameter (given in the `id` field) be may be used
*/ public interface WorkflowStepOutput extends Identified, Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#Identified/id
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/WorkflowStepOutputImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/WorkflowStepOutputImpl.java similarity index 83% rename from src/main/java/org/w3id/cwl/cwl1_2/WorkflowStepOutputImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/WorkflowStepOutputImpl.java index 172236d0..cf8bb936 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/WorkflowStepOutputImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/WorkflowStepOutputImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_2.utils.LoaderInstances; -import org.w3id.cwl.cwl1_2.utils.LoadingOptions; -import org.w3id.cwl.cwl1_2.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_2.utils.SaveableImpl; -import org.w3id.cwl.cwl1_2.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_1.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_1.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_1.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_1.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/cwl#WorkflowStepOutput
@@ -36,6 +36,9 @@ public class WorkflowStepOutputImpl extends SaveableImpl implements WorkflowStep private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -53,7 +56,7 @@ public java.util.Optional getId() { } /** - * Used by {@link org.w3id.cwl.cwl1_2.utils.RootLoader} to construct instances of WorkflowStepOutputImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_1.utils.RootLoader} to construct instances of WorkflowStepOutputImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -117,5 +120,14 @@ public WorkflowStepOutputImpl( throw new ValidationException("Trying 'RecordField'", __errors); } this.id = (java.util.Optional) id; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("id"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_1/Workflow_class.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/Workflow_class.java similarity index 92% rename from src/main/java/org/w3id/cwl/cwl1_1/Workflow_class.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/Workflow_class.java index a6fa8242..17a1ead3 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/Workflow_class.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/Workflow_class.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_1.utils.ValidationException; public enum Workflow_class { WORKFLOW("Workflow"); diff --git a/src/main/java/org/w3id/cwl/cwl1_1/package.html b/src/main/java/org/commonwl/cwlsdk/cwl1_1/package.html similarity index 100% rename from src/main/java/org/w3id/cwl/cwl1_1/package.html rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/package.html diff --git a/src/main/java/org/w3id/cwl/cwl1_2/stderr.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/stderr.java similarity index 91% rename from src/main/java/org/w3id/cwl/cwl1_2/stderr.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/stderr.java index a904dd41..dcde2ceb 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/stderr.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/stderr.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_2.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_1.utils.ValidationException; public enum stderr { STDERR("stderr"); diff --git a/src/main/java/org/w3id/cwl/cwl1_2/stdin.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/stdin.java similarity index 91% rename from src/main/java/org/w3id/cwl/cwl1_2/stdin.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/stdin.java index f1411709..dd99c871 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/stdin.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/stdin.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_2.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_1.utils.ValidationException; public enum stdin { STDIN("stdin"); diff --git a/src/main/java/org/w3id/cwl/cwl1_1/stdout.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/stdout.java similarity index 91% rename from src/main/java/org/w3id/cwl/cwl1_1/stdout.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/stdout.java index 01dd5892..04743421 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/stdout.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/stdout.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_1; -import org.w3id.cwl.cwl1_1.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_1.utils.ValidationException; public enum stdout { STDOUT("stdout"); diff --git a/src/main/java/org/w3id/cwl/cwl1_1/utils/AnyLoader.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/utils/AnyLoader.java similarity index 88% rename from src/main/java/org/w3id/cwl/cwl1_1/utils/AnyLoader.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/utils/AnyLoader.java index fbadf050..b6158c12 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/utils/AnyLoader.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/utils/AnyLoader.java @@ -1,4 +1,4 @@ -package org.w3id.cwl.cwl1_1.utils; +package org.commonwl.cwlsdk.cwl1_1.utils; public class AnyLoader implements Loader { diff --git a/src/main/java/org/w3id/cwl/cwl1_1/utils/ArrayLoader.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/utils/ArrayLoader.java similarity index 96% rename from src/main/java/org/w3id/cwl/cwl1_1/utils/ArrayLoader.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/utils/ArrayLoader.java index edd07293..47f2f247 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/utils/ArrayLoader.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/utils/ArrayLoader.java @@ -1,4 +1,4 @@ -package org.w3id.cwl.cwl1_1.utils; +package org.commonwl.cwlsdk.cwl1_1.utils; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/org/w3id/cwl/cwl1_1/utils/ConstantMaps.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/utils/ConstantMaps.java similarity index 99% rename from src/main/java/org/w3id/cwl/cwl1_1/utils/ConstantMaps.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/utils/ConstantMaps.java index 24d01c9f..73c60751 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/utils/ConstantMaps.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/utils/ConstantMaps.java @@ -1,4 +1,4 @@ -package org.w3id.cwl.cwl1_1.utils; +package org.commonwl.cwlsdk.cwl1_1.utils; import java.util.HashMap; diff --git a/src/main/java/org/w3id/cwl/cwl1_2/utils/DefaultFetcher.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/utils/DefaultFetcher.java similarity index 97% rename from src/main/java/org/w3id/cwl/cwl1_2/utils/DefaultFetcher.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/utils/DefaultFetcher.java index 711db079..3c706d77 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/utils/DefaultFetcher.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/utils/DefaultFetcher.java @@ -1,4 +1,4 @@ -package org.w3id.cwl.cwl1_2.utils; +package org.commonwl.cwlsdk.cwl1_1.utils; import java.io.IOException; import java.net.URI; diff --git a/src/main/java/org/w3id/cwl/cwl1_1/utils/EnumLoader.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/utils/EnumLoader.java similarity index 95% rename from src/main/java/org/w3id/cwl/cwl1_1/utils/EnumLoader.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/utils/EnumLoader.java index 48ca37dc..524025b4 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/utils/EnumLoader.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/utils/EnumLoader.java @@ -1,4 +1,4 @@ -package org.w3id.cwl.cwl1_1.utils; +package org.commonwl.cwlsdk.cwl1_1.utils; import java.lang.reflect.Method; import java.lang.ReflectiveOperationException; diff --git a/src/main/java/org/w3id/cwl/cwl1_2/utils/ExpressionLoader.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/utils/ExpressionLoader.java similarity index 90% rename from src/main/java/org/w3id/cwl/cwl1_2/utils/ExpressionLoader.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/utils/ExpressionLoader.java index 96abe8e2..c30a127e 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/utils/ExpressionLoader.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/utils/ExpressionLoader.java @@ -1,4 +1,4 @@ -package org.w3id.cwl.cwl1_2.utils; +package org.commonwl.cwlsdk.cwl1_1.utils; public class ExpressionLoader implements Loader { diff --git a/src/main/java/org/w3id/cwl/cwl1_1/utils/Fetcher.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/utils/Fetcher.java similarity index 79% rename from src/main/java/org/w3id/cwl/cwl1_1/utils/Fetcher.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/utils/Fetcher.java index e00db04d..f21df68c 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/utils/Fetcher.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/utils/Fetcher.java @@ -1,4 +1,4 @@ -package org.w3id.cwl.cwl1_1.utils; +package org.commonwl.cwlsdk.cwl1_1.utils; public interface Fetcher { diff --git a/src/main/java/org/w3id/cwl/cwl1_1/utils/IdMapLoader.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/utils/IdMapLoader.java similarity index 97% rename from src/main/java/org/w3id/cwl/cwl1_1/utils/IdMapLoader.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/utils/IdMapLoader.java index ed30f525..c9a163ca 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/utils/IdMapLoader.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/utils/IdMapLoader.java @@ -1,4 +1,4 @@ -package org.w3id.cwl.cwl1_1.utils; +package org.commonwl.cwlsdk.cwl1_1.utils; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/main/java/org/w3id/cwl/cwl1_2/utils/Loader.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/utils/Loader.java similarity index 99% rename from src/main/java/org/w3id/cwl/cwl1_2/utils/Loader.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/utils/Loader.java index c941518d..2e49adab 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/utils/Loader.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/utils/Loader.java @@ -1,4 +1,4 @@ -package org.w3id.cwl.cwl1_2.utils; +package org.commonwl.cwlsdk.cwl1_1.utils; import java.util.HashMap; import java.util.List; diff --git a/src/main/java/org/w3id/cwl/cwl1_1/utils/LoaderInstances.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/utils/LoaderInstances.java similarity index 75% rename from src/main/java/org/w3id/cwl/cwl1_1/utils/LoaderInstances.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/utils/LoaderInstances.java index f7f28a2a..f030f0c0 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/utils/LoaderInstances.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/utils/LoaderInstances.java @@ -1,7 +1,7 @@ -package org.w3id.cwl.cwl1_1.utils; +package org.commonwl.cwlsdk.cwl1_1.utils; import java.util.List; -import org.w3id.cwl.cwl1_1.*; +import org.commonwl.cwlsdk.cwl1_1.*; public class LoaderInstances { public static Loader StringInstance = new PrimitiveLoader(String.class); @@ -11,105 +11,105 @@ public class LoaderInstances { public static Loader BooleanInstance = new PrimitiveLoader(Boolean.class); public static Loader NullInstance = new NullLoader(); public static Loader AnyInstance = new AnyLoader(); - public static Loader Documented = new RecordLoader(org.w3id.cwl.cwl1_1.Documented.class, null, null); + public static Loader Documented = new RecordLoader(org.commonwl.cwlsdk.cwl1_1.Documented.class, null, null); public static Loader PrimitiveType = new EnumLoader(PrimitiveType.class); public static Loader Any = new EnumLoader(Any.class); - public static Loader RecordField = new RecordLoader(org.w3id.cwl.cwl1_1.RecordFieldImpl.class, null, null); - public static Loader RecordSchema = new RecordLoader(org.w3id.cwl.cwl1_1.RecordSchemaImpl.class, null, null); - public static Loader EnumSchema = new RecordLoader(org.w3id.cwl.cwl1_1.EnumSchemaImpl.class, null, null); - public static Loader ArraySchema = new RecordLoader(org.w3id.cwl.cwl1_1.ArraySchemaImpl.class, null, null); - public static Loader MapSchema = new RecordLoader(org.w3id.cwl.cwl1_1.MapSchemaImpl.class, null, null); - public static Loader UnionSchema = new RecordLoader(org.w3id.cwl.cwl1_1.UnionSchemaImpl.class, null, null); + public static Loader RecordField = new RecordLoader(org.commonwl.cwlsdk.cwl1_1.RecordFieldImpl.class, null, null); + public static Loader RecordSchema = new RecordLoader(org.commonwl.cwlsdk.cwl1_1.RecordSchemaImpl.class, null, null); + public static Loader EnumSchema = new RecordLoader(org.commonwl.cwlsdk.cwl1_1.EnumSchemaImpl.class, null, null); + public static Loader ArraySchema = new RecordLoader(org.commonwl.cwlsdk.cwl1_1.ArraySchemaImpl.class, null, null); + public static Loader MapSchema = new RecordLoader(org.commonwl.cwlsdk.cwl1_1.MapSchemaImpl.class, null, null); + public static Loader UnionSchema = new RecordLoader(org.commonwl.cwlsdk.cwl1_1.UnionSchemaImpl.class, null, null); public static Loader CWLType = new EnumLoader(CWLType.class); - public static Loader CWLArraySchema = new RecordLoader(org.w3id.cwl.cwl1_1.CWLArraySchemaImpl.class, null, null); - public static Loader CWLRecordField = new RecordLoader(org.w3id.cwl.cwl1_1.CWLRecordFieldImpl.class, null, null); - public static Loader CWLRecordSchema = new RecordLoader(org.w3id.cwl.cwl1_1.CWLRecordSchemaImpl.class, null, null); - public static Loader File = new RecordLoader(org.w3id.cwl.cwl1_1.FileImpl.class, null, null); - public static Loader Directory = new RecordLoader(org.w3id.cwl.cwl1_1.DirectoryImpl.class, null, null); + public static Loader CWLArraySchema = new RecordLoader(org.commonwl.cwlsdk.cwl1_1.CWLArraySchemaImpl.class, null, null); + public static Loader CWLRecordField = new RecordLoader(org.commonwl.cwlsdk.cwl1_1.CWLRecordFieldImpl.class, null, null); + public static Loader CWLRecordSchema = new RecordLoader(org.commonwl.cwlsdk.cwl1_1.CWLRecordSchemaImpl.class, null, null); + public static Loader File = new RecordLoader(org.commonwl.cwlsdk.cwl1_1.FileImpl.class, null, null); + public static Loader Directory = new RecordLoader(org.commonwl.cwlsdk.cwl1_1.DirectoryImpl.class, null, null); public static Loader CWLObjectType = new UnionLoader(new Loader[] {}); public static Loader> optional_CWLObjectType = new OptionalLoader(CWLObjectType); public static Loader>> array_of_optional_CWLObjectType = new ArrayLoader(optional_CWLObjectType); public static Loader>> map_of_optional_CWLObjectType = new MapLoader(optional_CWLObjectType, null, null); - public static Loader InlineJavascriptRequirement = new RecordLoader(org.w3id.cwl.cwl1_1.InlineJavascriptRequirementImpl.class, null, null); - public static Loader SchemaDefRequirement = new RecordLoader(org.w3id.cwl.cwl1_1.SchemaDefRequirementImpl.class, null, null); - public static Loader LoadListingRequirement = new RecordLoader(org.w3id.cwl.cwl1_1.LoadListingRequirementImpl.class, null, null); - public static Loader DockerRequirement = new RecordLoader(org.w3id.cwl.cwl1_1.DockerRequirementImpl.class, null, null); - public static Loader SoftwareRequirement = new RecordLoader(org.w3id.cwl.cwl1_1.SoftwareRequirementImpl.class, null, null); - public static Loader InitialWorkDirRequirement = new RecordLoader(org.w3id.cwl.cwl1_1.InitialWorkDirRequirementImpl.class, null, null); - public static Loader EnvVarRequirement = new RecordLoader(org.w3id.cwl.cwl1_1.EnvVarRequirementImpl.class, null, null); - public static Loader ShellCommandRequirement = new RecordLoader(org.w3id.cwl.cwl1_1.ShellCommandRequirementImpl.class, null, null); - public static Loader ResourceRequirement = new RecordLoader(org.w3id.cwl.cwl1_1.ResourceRequirementImpl.class, null, null); - public static Loader WorkReuse = new RecordLoader(org.w3id.cwl.cwl1_1.WorkReuseImpl.class, null, null); - public static Loader NetworkAccess = new RecordLoader(org.w3id.cwl.cwl1_1.NetworkAccessImpl.class, null, null); - public static Loader InplaceUpdateRequirement = new RecordLoader(org.w3id.cwl.cwl1_1.InplaceUpdateRequirementImpl.class, null, null); - public static Loader ToolTimeLimit = new RecordLoader(org.w3id.cwl.cwl1_1.ToolTimeLimitImpl.class, null, null); - public static Loader SubworkflowFeatureRequirement = new RecordLoader(org.w3id.cwl.cwl1_1.SubworkflowFeatureRequirementImpl.class, null, null); - public static Loader ScatterFeatureRequirement = new RecordLoader(org.w3id.cwl.cwl1_1.ScatterFeatureRequirementImpl.class, null, null); - public static Loader MultipleInputFeatureRequirement = new RecordLoader(org.w3id.cwl.cwl1_1.MultipleInputFeatureRequirementImpl.class, null, null); - public static Loader StepInputExpressionRequirement = new RecordLoader(org.w3id.cwl.cwl1_1.StepInputExpressionRequirementImpl.class, null, null); + public static Loader InlineJavascriptRequirement = new RecordLoader(org.commonwl.cwlsdk.cwl1_1.InlineJavascriptRequirementImpl.class, null, null); + public static Loader SchemaDefRequirement = new RecordLoader(org.commonwl.cwlsdk.cwl1_1.SchemaDefRequirementImpl.class, null, null); + public static Loader LoadListingRequirement = new RecordLoader(org.commonwl.cwlsdk.cwl1_1.LoadListingRequirementImpl.class, null, null); + public static Loader DockerRequirement = new RecordLoader(org.commonwl.cwlsdk.cwl1_1.DockerRequirementImpl.class, null, null); + public static Loader SoftwareRequirement = new RecordLoader(org.commonwl.cwlsdk.cwl1_1.SoftwareRequirementImpl.class, null, null); + public static Loader InitialWorkDirRequirement = new RecordLoader(org.commonwl.cwlsdk.cwl1_1.InitialWorkDirRequirementImpl.class, null, null); + public static Loader EnvVarRequirement = new RecordLoader(org.commonwl.cwlsdk.cwl1_1.EnvVarRequirementImpl.class, null, null); + public static Loader ShellCommandRequirement = new RecordLoader(org.commonwl.cwlsdk.cwl1_1.ShellCommandRequirementImpl.class, null, null); + public static Loader ResourceRequirement = new RecordLoader(org.commonwl.cwlsdk.cwl1_1.ResourceRequirementImpl.class, null, null); + public static Loader WorkReuse = new RecordLoader(org.commonwl.cwlsdk.cwl1_1.WorkReuseImpl.class, null, null); + public static Loader NetworkAccess = new RecordLoader(org.commonwl.cwlsdk.cwl1_1.NetworkAccessImpl.class, null, null); + public static Loader InplaceUpdateRequirement = new RecordLoader(org.commonwl.cwlsdk.cwl1_1.InplaceUpdateRequirementImpl.class, null, null); + public static Loader ToolTimeLimit = new RecordLoader(org.commonwl.cwlsdk.cwl1_1.ToolTimeLimitImpl.class, null, null); + public static Loader SubworkflowFeatureRequirement = new RecordLoader(org.commonwl.cwlsdk.cwl1_1.SubworkflowFeatureRequirementImpl.class, null, null); + public static Loader ScatterFeatureRequirement = new RecordLoader(org.commonwl.cwlsdk.cwl1_1.ScatterFeatureRequirementImpl.class, null, null); + public static Loader MultipleInputFeatureRequirement = new RecordLoader(org.commonwl.cwlsdk.cwl1_1.MultipleInputFeatureRequirementImpl.class, null, null); + public static Loader StepInputExpressionRequirement = new RecordLoader(org.commonwl.cwlsdk.cwl1_1.StepInputExpressionRequirementImpl.class, null, null); public static Loader union_of_InlineJavascriptRequirement_or_SchemaDefRequirement_or_LoadListingRequirement_or_DockerRequirement_or_SoftwareRequirement_or_InitialWorkDirRequirement_or_EnvVarRequirement_or_ShellCommandRequirement_or_ResourceRequirement_or_WorkReuse_or_NetworkAccess_or_InplaceUpdateRequirement_or_ToolTimeLimit_or_SubworkflowFeatureRequirement_or_ScatterFeatureRequirement_or_MultipleInputFeatureRequirement_or_StepInputExpressionRequirement = new UnionLoader(new Loader[] { InlineJavascriptRequirement, SchemaDefRequirement, LoadListingRequirement, DockerRequirement, SoftwareRequirement, InitialWorkDirRequirement, EnvVarRequirement, ShellCommandRequirement, ResourceRequirement, WorkReuse, NetworkAccess, InplaceUpdateRequirement, ToolTimeLimit, SubworkflowFeatureRequirement, ScatterFeatureRequirement, MultipleInputFeatureRequirement, StepInputExpressionRequirement }); public static Loader> array_of_union_of_InlineJavascriptRequirement_or_SchemaDefRequirement_or_LoadListingRequirement_or_DockerRequirement_or_SoftwareRequirement_or_InitialWorkDirRequirement_or_EnvVarRequirement_or_ShellCommandRequirement_or_ResourceRequirement_or_WorkReuse_or_NetworkAccess_or_InplaceUpdateRequirement_or_ToolTimeLimit_or_SubworkflowFeatureRequirement_or_ScatterFeatureRequirement_or_MultipleInputFeatureRequirement_or_StepInputExpressionRequirement = new ArrayLoader(union_of_InlineJavascriptRequirement_or_SchemaDefRequirement_or_LoadListingRequirement_or_DockerRequirement_or_SoftwareRequirement_or_InitialWorkDirRequirement_or_EnvVarRequirement_or_ShellCommandRequirement_or_ResourceRequirement_or_WorkReuse_or_NetworkAccess_or_InplaceUpdateRequirement_or_ToolTimeLimit_or_SubworkflowFeatureRequirement_or_ScatterFeatureRequirement_or_MultipleInputFeatureRequirement_or_StepInputExpressionRequirement); public static Loader union_of_NullInstance_or_array_of_union_of_InlineJavascriptRequirement_or_SchemaDefRequirement_or_LoadListingRequirement_or_DockerRequirement_or_SoftwareRequirement_or_InitialWorkDirRequirement_or_EnvVarRequirement_or_ShellCommandRequirement_or_ResourceRequirement_or_WorkReuse_or_NetworkAccess_or_InplaceUpdateRequirement_or_ToolTimeLimit_or_SubworkflowFeatureRequirement_or_ScatterFeatureRequirement_or_MultipleInputFeatureRequirement_or_StepInputExpressionRequirement_or_CWLObjectType = new UnionLoader(new Loader[] { NullInstance, array_of_union_of_InlineJavascriptRequirement_or_SchemaDefRequirement_or_LoadListingRequirement_or_DockerRequirement_or_SoftwareRequirement_or_InitialWorkDirRequirement_or_EnvVarRequirement_or_ShellCommandRequirement_or_ResourceRequirement_or_WorkReuse_or_NetworkAccess_or_InplaceUpdateRequirement_or_ToolTimeLimit_or_SubworkflowFeatureRequirement_or_ScatterFeatureRequirement_or_MultipleInputFeatureRequirement_or_StepInputExpressionRequirement, CWLObjectType }); public static Loader> map_of_union_of_NullInstance_or_array_of_union_of_InlineJavascriptRequirement_or_SchemaDefRequirement_or_LoadListingRequirement_or_DockerRequirement_or_SoftwareRequirement_or_InitialWorkDirRequirement_or_EnvVarRequirement_or_ShellCommandRequirement_or_ResourceRequirement_or_WorkReuse_or_NetworkAccess_or_InplaceUpdateRequirement_or_ToolTimeLimit_or_SubworkflowFeatureRequirement_or_ScatterFeatureRequirement_or_MultipleInputFeatureRequirement_or_StepInputExpressionRequirement_or_CWLObjectType = new MapLoader(union_of_NullInstance_or_array_of_union_of_InlineJavascriptRequirement_or_SchemaDefRequirement_or_LoadListingRequirement_or_DockerRequirement_or_SoftwareRequirement_or_InitialWorkDirRequirement_or_EnvVarRequirement_or_ShellCommandRequirement_or_ResourceRequirement_or_WorkReuse_or_NetworkAccess_or_InplaceUpdateRequirement_or_ToolTimeLimit_or_SubworkflowFeatureRequirement_or_ScatterFeatureRequirement_or_MultipleInputFeatureRequirement_or_StepInputExpressionRequirement_or_CWLObjectType, "@list", true); public static Loader CWLVersion = new EnumLoader(CWLVersion.class); - public static Loader Labeled = new RecordLoader(org.w3id.cwl.cwl1_1.Labeled.class, null, null); - public static Loader Identified = new RecordLoader(org.w3id.cwl.cwl1_1.Identified.class, null, null); + public static Loader Labeled = new RecordLoader(org.commonwl.cwlsdk.cwl1_1.Labeled.class, null, null); + public static Loader Identified = new RecordLoader(org.commonwl.cwlsdk.cwl1_1.Identified.class, null, null); public static Loader LoadListingEnum = new EnumLoader(LoadListingEnum.class); - public static Loader LoadContents = new RecordLoader(org.w3id.cwl.cwl1_1.LoadContents.class, null, null); - public static Loader FieldBase = new RecordLoader(org.w3id.cwl.cwl1_1.FieldBase.class, null, null); - public static Loader InputFormat = new RecordLoader(org.w3id.cwl.cwl1_1.InputFormat.class, null, null); - public static Loader OutputFormat = new RecordLoader(org.w3id.cwl.cwl1_1.OutputFormat.class, null, null); - public static Loader Parameter = new RecordLoader(org.w3id.cwl.cwl1_1.Parameter.class, null, null); + public static Loader LoadContents = new RecordLoader(org.commonwl.cwlsdk.cwl1_1.LoadContents.class, null, null); + public static Loader FieldBase = new RecordLoader(org.commonwl.cwlsdk.cwl1_1.FieldBase.class, null, null); + public static Loader InputFormat = new RecordLoader(org.commonwl.cwlsdk.cwl1_1.InputFormat.class, null, null); + public static Loader OutputFormat = new RecordLoader(org.commonwl.cwlsdk.cwl1_1.OutputFormat.class, null, null); + public static Loader Parameter = new RecordLoader(org.commonwl.cwlsdk.cwl1_1.Parameter.class, null, null); public static Loader Expression = new EnumLoader(Expression.class); - public static Loader InputBinding = new RecordLoader(org.w3id.cwl.cwl1_1.InputBindingImpl.class, null, null); - public static Loader IOSchema = new RecordLoader(org.w3id.cwl.cwl1_1.IOSchema.class, null, null); - public static Loader InputSchema = new RecordLoader(org.w3id.cwl.cwl1_1.InputSchema.class, null, null); - public static Loader OutputSchema = new RecordLoader(org.w3id.cwl.cwl1_1.OutputSchema.class, null, null); - public static Loader InputRecordField = new RecordLoader(org.w3id.cwl.cwl1_1.InputRecordFieldImpl.class, null, null); - public static Loader InputRecordSchema = new RecordLoader(org.w3id.cwl.cwl1_1.InputRecordSchemaImpl.class, null, null); - public static Loader InputEnumSchema = new RecordLoader(org.w3id.cwl.cwl1_1.InputEnumSchemaImpl.class, null, null); - public static Loader InputArraySchema = new RecordLoader(org.w3id.cwl.cwl1_1.InputArraySchemaImpl.class, null, null); - public static Loader OutputRecordField = new RecordLoader(org.w3id.cwl.cwl1_1.OutputRecordFieldImpl.class, null, null); - public static Loader OutputRecordSchema = new RecordLoader(org.w3id.cwl.cwl1_1.OutputRecordSchemaImpl.class, null, null); - public static Loader OutputEnumSchema = new RecordLoader(org.w3id.cwl.cwl1_1.OutputEnumSchemaImpl.class, null, null); - public static Loader OutputArraySchema = new RecordLoader(org.w3id.cwl.cwl1_1.OutputArraySchemaImpl.class, null, null); - public static Loader InputParameter = new RecordLoader(org.w3id.cwl.cwl1_1.InputParameter.class, null, null); - public static Loader OutputParameter = new RecordLoader(org.w3id.cwl.cwl1_1.OutputParameter.class, null, null); - public static Loader ProcessRequirement = new RecordLoader(org.w3id.cwl.cwl1_1.ProcessRequirement.class, null, null); - public static Loader Process = new RecordLoader(org.w3id.cwl.cwl1_1.Process.class, null, null); - public static Loader CommandInputSchema = new RecordLoader(org.w3id.cwl.cwl1_1.CommandInputSchema.class, null, null); - public static Loader SecondaryFileSchema = new RecordLoader(org.w3id.cwl.cwl1_1.SecondaryFileSchemaImpl.class, null, null); - public static Loader EnvironmentDef = new RecordLoader(org.w3id.cwl.cwl1_1.EnvironmentDefImpl.class, null, null); - public static Loader CommandLineBinding = new RecordLoader(org.w3id.cwl.cwl1_1.CommandLineBindingImpl.class, null, null); - public static Loader CommandOutputBinding = new RecordLoader(org.w3id.cwl.cwl1_1.CommandOutputBindingImpl.class, null, null); - public static Loader CommandLineBindable = new RecordLoader(org.w3id.cwl.cwl1_1.CommandLineBindableImpl.class, null, null); - public static Loader CommandInputRecordField = new RecordLoader(org.w3id.cwl.cwl1_1.CommandInputRecordFieldImpl.class, null, null); - public static Loader CommandInputRecordSchema = new RecordLoader(org.w3id.cwl.cwl1_1.CommandInputRecordSchemaImpl.class, null, null); - public static Loader CommandInputEnumSchema = new RecordLoader(org.w3id.cwl.cwl1_1.CommandInputEnumSchemaImpl.class, null, null); - public static Loader CommandInputArraySchema = new RecordLoader(org.w3id.cwl.cwl1_1.CommandInputArraySchemaImpl.class, null, null); - public static Loader CommandOutputRecordField = new RecordLoader(org.w3id.cwl.cwl1_1.CommandOutputRecordFieldImpl.class, null, null); - public static Loader CommandOutputRecordSchema = new RecordLoader(org.w3id.cwl.cwl1_1.CommandOutputRecordSchemaImpl.class, null, null); - public static Loader CommandOutputEnumSchema = new RecordLoader(org.w3id.cwl.cwl1_1.CommandOutputEnumSchemaImpl.class, null, null); - public static Loader CommandOutputArraySchema = new RecordLoader(org.w3id.cwl.cwl1_1.CommandOutputArraySchemaImpl.class, null, null); - public static Loader CommandInputParameter = new RecordLoader(org.w3id.cwl.cwl1_1.CommandInputParameterImpl.class, null, null); - public static Loader CommandOutputParameter = new RecordLoader(org.w3id.cwl.cwl1_1.CommandOutputParameterImpl.class, null, null); + public static Loader InputBinding = new RecordLoader(org.commonwl.cwlsdk.cwl1_1.InputBindingImpl.class, null, null); + public static Loader IOSchema = new RecordLoader(org.commonwl.cwlsdk.cwl1_1.IOSchema.class, null, null); + public static Loader InputSchema = new RecordLoader(org.commonwl.cwlsdk.cwl1_1.InputSchema.class, null, null); + public static Loader OutputSchema = new RecordLoader(org.commonwl.cwlsdk.cwl1_1.OutputSchema.class, null, null); + public static Loader InputRecordField = new RecordLoader(org.commonwl.cwlsdk.cwl1_1.InputRecordFieldImpl.class, null, null); + public static Loader InputRecordSchema = new RecordLoader(org.commonwl.cwlsdk.cwl1_1.InputRecordSchemaImpl.class, null, null); + public static Loader InputEnumSchema = new RecordLoader(org.commonwl.cwlsdk.cwl1_1.InputEnumSchemaImpl.class, null, null); + public static Loader InputArraySchema = new RecordLoader(org.commonwl.cwlsdk.cwl1_1.InputArraySchemaImpl.class, null, null); + public static Loader OutputRecordField = new RecordLoader(org.commonwl.cwlsdk.cwl1_1.OutputRecordFieldImpl.class, null, null); + public static Loader OutputRecordSchema = new RecordLoader(org.commonwl.cwlsdk.cwl1_1.OutputRecordSchemaImpl.class, null, null); + public static Loader OutputEnumSchema = new RecordLoader(org.commonwl.cwlsdk.cwl1_1.OutputEnumSchemaImpl.class, null, null); + public static Loader OutputArraySchema = new RecordLoader(org.commonwl.cwlsdk.cwl1_1.OutputArraySchemaImpl.class, null, null); + public static Loader InputParameter = new RecordLoader(org.commonwl.cwlsdk.cwl1_1.InputParameter.class, null, null); + public static Loader OutputParameter = new RecordLoader(org.commonwl.cwlsdk.cwl1_1.OutputParameter.class, null, null); + public static Loader ProcessRequirement = new RecordLoader(org.commonwl.cwlsdk.cwl1_1.ProcessRequirement.class, null, null); + public static Loader Process = new RecordLoader(org.commonwl.cwlsdk.cwl1_1.Process.class, null, null); + public static Loader CommandInputSchema = new RecordLoader(org.commonwl.cwlsdk.cwl1_1.CommandInputSchema.class, null, null); + public static Loader SecondaryFileSchema = new RecordLoader(org.commonwl.cwlsdk.cwl1_1.SecondaryFileSchemaImpl.class, null, null); + public static Loader EnvironmentDef = new RecordLoader(org.commonwl.cwlsdk.cwl1_1.EnvironmentDefImpl.class, null, null); + public static Loader CommandLineBinding = new RecordLoader(org.commonwl.cwlsdk.cwl1_1.CommandLineBindingImpl.class, null, null); + public static Loader CommandOutputBinding = new RecordLoader(org.commonwl.cwlsdk.cwl1_1.CommandOutputBindingImpl.class, null, null); + public static Loader CommandLineBindable = new RecordLoader(org.commonwl.cwlsdk.cwl1_1.CommandLineBindableImpl.class, null, null); + public static Loader CommandInputRecordField = new RecordLoader(org.commonwl.cwlsdk.cwl1_1.CommandInputRecordFieldImpl.class, null, null); + public static Loader CommandInputRecordSchema = new RecordLoader(org.commonwl.cwlsdk.cwl1_1.CommandInputRecordSchemaImpl.class, null, null); + public static Loader CommandInputEnumSchema = new RecordLoader(org.commonwl.cwlsdk.cwl1_1.CommandInputEnumSchemaImpl.class, null, null); + public static Loader CommandInputArraySchema = new RecordLoader(org.commonwl.cwlsdk.cwl1_1.CommandInputArraySchemaImpl.class, null, null); + public static Loader CommandOutputRecordField = new RecordLoader(org.commonwl.cwlsdk.cwl1_1.CommandOutputRecordFieldImpl.class, null, null); + public static Loader CommandOutputRecordSchema = new RecordLoader(org.commonwl.cwlsdk.cwl1_1.CommandOutputRecordSchemaImpl.class, null, null); + public static Loader CommandOutputEnumSchema = new RecordLoader(org.commonwl.cwlsdk.cwl1_1.CommandOutputEnumSchemaImpl.class, null, null); + public static Loader CommandOutputArraySchema = new RecordLoader(org.commonwl.cwlsdk.cwl1_1.CommandOutputArraySchemaImpl.class, null, null); + public static Loader CommandInputParameter = new RecordLoader(org.commonwl.cwlsdk.cwl1_1.CommandInputParameterImpl.class, null, null); + public static Loader CommandOutputParameter = new RecordLoader(org.commonwl.cwlsdk.cwl1_1.CommandOutputParameterImpl.class, null, null); public static Loader stdin = new EnumLoader(stdin.class); public static Loader stdout = new EnumLoader(stdout.class); public static Loader stderr = new EnumLoader(stderr.class); - public static Loader CommandLineTool = new RecordLoader(org.w3id.cwl.cwl1_1.CommandLineToolImpl.class, null, null); - public static Loader SoftwarePackage = new RecordLoader(org.w3id.cwl.cwl1_1.SoftwarePackageImpl.class, null, null); - public static Loader Dirent = new RecordLoader(org.w3id.cwl.cwl1_1.DirentImpl.class, null, null); - public static Loader ExpressionToolOutputParameter = new RecordLoader(org.w3id.cwl.cwl1_1.ExpressionToolOutputParameterImpl.class, null, null); - public static Loader WorkflowInputParameter = new RecordLoader(org.w3id.cwl.cwl1_1.WorkflowInputParameterImpl.class, null, null); - public static Loader ExpressionTool = new RecordLoader(org.w3id.cwl.cwl1_1.ExpressionToolImpl.class, null, null); + public static Loader CommandLineTool = new RecordLoader(org.commonwl.cwlsdk.cwl1_1.CommandLineToolImpl.class, null, null); + public static Loader SoftwarePackage = new RecordLoader(org.commonwl.cwlsdk.cwl1_1.SoftwarePackageImpl.class, null, null); + public static Loader Dirent = new RecordLoader(org.commonwl.cwlsdk.cwl1_1.DirentImpl.class, null, null); + public static Loader ExpressionToolOutputParameter = new RecordLoader(org.commonwl.cwlsdk.cwl1_1.ExpressionToolOutputParameterImpl.class, null, null); + public static Loader WorkflowInputParameter = new RecordLoader(org.commonwl.cwlsdk.cwl1_1.WorkflowInputParameterImpl.class, null, null); + public static Loader ExpressionTool = new RecordLoader(org.commonwl.cwlsdk.cwl1_1.ExpressionToolImpl.class, null, null); public static Loader LinkMergeMethod = new EnumLoader(LinkMergeMethod.class); - public static Loader WorkflowOutputParameter = new RecordLoader(org.w3id.cwl.cwl1_1.WorkflowOutputParameterImpl.class, null, null); - public static Loader Sink = new RecordLoader(org.w3id.cwl.cwl1_1.Sink.class, null, null); - public static Loader WorkflowStepInput = new RecordLoader(org.w3id.cwl.cwl1_1.WorkflowStepInputImpl.class, null, null); - public static Loader WorkflowStepOutput = new RecordLoader(org.w3id.cwl.cwl1_1.WorkflowStepOutputImpl.class, null, null); + public static Loader WorkflowOutputParameter = new RecordLoader(org.commonwl.cwlsdk.cwl1_1.WorkflowOutputParameterImpl.class, null, null); + public static Loader Sink = new RecordLoader(org.commonwl.cwlsdk.cwl1_1.Sink.class, null, null); + public static Loader WorkflowStepInput = new RecordLoader(org.commonwl.cwlsdk.cwl1_1.WorkflowStepInputImpl.class, null, null); + public static Loader WorkflowStepOutput = new RecordLoader(org.commonwl.cwlsdk.cwl1_1.WorkflowStepOutputImpl.class, null, null); public static Loader ScatterMethod = new EnumLoader(ScatterMethod.class); - public static Loader WorkflowStep = new RecordLoader(org.w3id.cwl.cwl1_1.WorkflowStepImpl.class, null, null); - public static Loader Workflow = new RecordLoader(org.w3id.cwl.cwl1_1.WorkflowImpl.class, null, null); + public static Loader WorkflowStep = new RecordLoader(org.commonwl.cwlsdk.cwl1_1.WorkflowStepImpl.class, null, null); + public static Loader Workflow = new RecordLoader(org.commonwl.cwlsdk.cwl1_1.WorkflowImpl.class, null, null); public static Loader> array_of_StringInstance = new ArrayLoader(StringInstance); public static Loader union_of_NullInstance_or_StringInstance_or_array_of_StringInstance = new UnionLoader(new Loader[] { NullInstance, StringInstance, array_of_StringInstance }); public static Loader uri_StringInstance_True_False_None_None = new UriLoader(StringInstance, true, false, null, null); diff --git a/src/main/java/org/w3id/cwl/cwl1_1/utils/LoadingOptions.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/utils/LoadingOptions.java similarity index 97% rename from src/main/java/org/w3id/cwl/cwl1_1/utils/LoadingOptions.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/utils/LoadingOptions.java index 8e4cd367..28642a6d 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/utils/LoadingOptions.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/utils/LoadingOptions.java @@ -1,4 +1,4 @@ -package org.w3id.cwl.cwl1_1.utils; +package org.commonwl.cwlsdk.cwl1_1.utils; import java.net.URI; import java.util.ArrayList; @@ -65,7 +65,7 @@ public String expandUrl( } if (!this.vocab.isEmpty() && url.contains(":")) { - String prefix = url.split(":", 1)[0]; + String prefix = url.split(":")[0]; if (this.vocab.containsKey(prefix)) { url = this.vocab.get(prefix) + url.substring(prefix.length() + 1); } diff --git a/src/main/java/org/w3id/cwl/cwl1_1/utils/LoadingOptionsBuilder.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/utils/LoadingOptionsBuilder.java similarity index 98% rename from src/main/java/org/w3id/cwl/cwl1_1/utils/LoadingOptionsBuilder.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/utils/LoadingOptionsBuilder.java index f3c3677f..a8a20f8a 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/utils/LoadingOptionsBuilder.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/utils/LoadingOptionsBuilder.java @@ -1,4 +1,4 @@ -package org.w3id.cwl.cwl1_1.utils; +package org.commonwl.cwlsdk.cwl1_1.utils; import java.util.HashMap; import java.util.List; diff --git a/src/main/java/org/w3id/cwl/cwl1_1/utils/MapLoader.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/utils/MapLoader.java similarity index 97% rename from src/main/java/org/w3id/cwl/cwl1_1/utils/MapLoader.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/utils/MapLoader.java index 71b77317..05a4901f 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/utils/MapLoader.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/utils/MapLoader.java @@ -1,4 +1,4 @@ -package org.w3id.cwl.cwl1_1.utils; +package org.commonwl.cwlsdk.cwl1_1.utils; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/main/java/org/w3id/cwl/cwl1_2/utils/NullLoader.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/utils/NullLoader.java similarity index 87% rename from src/main/java/org/w3id/cwl/cwl1_2/utils/NullLoader.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/utils/NullLoader.java index 09e9c964..24cd8ae7 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/utils/NullLoader.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/utils/NullLoader.java @@ -1,4 +1,4 @@ -package org.w3id.cwl.cwl1_2.utils; +package org.commonwl.cwlsdk.cwl1_1.utils; public class NullLoader implements Loader { diff --git a/src/main/java/org/w3id/cwl/cwl1_2/utils/OneOrListOf.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/utils/OneOrListOf.java similarity index 96% rename from src/main/java/org/w3id/cwl/cwl1_2/utils/OneOrListOf.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/utils/OneOrListOf.java index 862be317..90d6d46e 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/utils/OneOrListOf.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/utils/OneOrListOf.java @@ -1,4 +1,4 @@ -package org.w3id.cwl.cwl1_2.utils; +package org.commonwl.cwlsdk.cwl1_1.utils; import java.util.List; import java.util.Optional; diff --git a/src/main/java/org/w3id/cwl/cwl1_1/utils/OneOrListOfLoader.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/utils/OneOrListOfLoader.java similarity index 96% rename from src/main/java/org/w3id/cwl/cwl1_1/utils/OneOrListOfLoader.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/utils/OneOrListOfLoader.java index 94d1125f..9ef54778 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/utils/OneOrListOfLoader.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/utils/OneOrListOfLoader.java @@ -1,4 +1,4 @@ -package org.w3id.cwl.cwl1_1.utils; +package org.commonwl.cwlsdk.cwl1_1.utils; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/org/w3id/cwl/cwl1_2/utils/OptionalLoader.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/utils/OptionalLoader.java similarity index 92% rename from src/main/java/org/w3id/cwl/cwl1_2/utils/OptionalLoader.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/utils/OptionalLoader.java index 02b09fbf..347d171e 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/utils/OptionalLoader.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/utils/OptionalLoader.java @@ -1,4 +1,4 @@ -package org.w3id.cwl.cwl1_2.utils; +package org.commonwl.cwlsdk.cwl1_1.utils; import java.util.Optional; diff --git a/src/main/java/org/w3id/cwl/cwl1_2/utils/PrimitiveLoader.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/utils/PrimitiveLoader.java similarity index 89% rename from src/main/java/org/w3id/cwl/cwl1_2/utils/PrimitiveLoader.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/utils/PrimitiveLoader.java index 85add1b5..108b9756 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/utils/PrimitiveLoader.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/utils/PrimitiveLoader.java @@ -1,4 +1,4 @@ -package org.w3id.cwl.cwl1_2.utils; +package org.commonwl.cwlsdk.cwl1_1.utils; public class PrimitiveLoader implements Loader { private Class clazz; diff --git a/src/main/java/org/w3id/cwl/cwl1_1/utils/RecordLoader.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/utils/RecordLoader.java similarity index 97% rename from src/main/java/org/w3id/cwl/cwl1_1/utils/RecordLoader.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/utils/RecordLoader.java index bf233097..7cc2184e 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/utils/RecordLoader.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/utils/RecordLoader.java @@ -1,4 +1,4 @@ -package org.w3id.cwl.cwl1_1.utils; +package org.commonwl.cwlsdk.cwl1_1.utils; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; diff --git a/src/main/java/org/w3id/cwl/cwl1_1/utils/RootLoader.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/utils/RootLoader.java similarity index 98% rename from src/main/java/org/w3id/cwl/cwl1_1/utils/RootLoader.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/utils/RootLoader.java index d0182274..2bdc5bba 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/utils/RootLoader.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/utils/RootLoader.java @@ -1,4 +1,4 @@ -package org.w3id.cwl.cwl1_1.utils; +package org.commonwl.cwlsdk.cwl1_1.utils; import java.io.File; import java.io.IOException; diff --git a/src/main/java/org/w3id/cwl/cwl1_2/utils/Saveable.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/utils/Saveable.java similarity index 78% rename from src/main/java/org/w3id/cwl/cwl1_2/utils/Saveable.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/utils/Saveable.java index 9f250c15..e25365c9 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/utils/Saveable.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/utils/Saveable.java @@ -1,4 +1,4 @@ -package org.w3id.cwl.cwl1_2.utils; +package org.commonwl.cwlsdk.cwl1_1.utils; public interface Saveable { // TODO: implement writable interface diff --git a/src/main/java/org/w3id/cwl/cwl1_1/utils/SaveableImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/utils/SaveableImpl.java similarity index 78% rename from src/main/java/org/w3id/cwl/cwl1_1/utils/SaveableImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/utils/SaveableImpl.java index cd00f0f5..24361e62 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/utils/SaveableImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/utils/SaveableImpl.java @@ -1,4 +1,4 @@ -package org.w3id.cwl.cwl1_1.utils; +package org.commonwl.cwlsdk.cwl1_1.utils; public class SaveableImpl implements Saveable { public SaveableImpl(Object doc, String baseUri, LoadingOptions loadingOptions, String docRoot) {} diff --git a/src/main/java/org/w3id/cwl/cwl1_2/utils/SecondaryFilesDslLoader.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/utils/SecondaryFilesDslLoader.java similarity index 98% rename from src/main/java/org/w3id/cwl/cwl1_2/utils/SecondaryFilesDslLoader.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/utils/SecondaryFilesDslLoader.java index 64c26918..0837f62c 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/utils/SecondaryFilesDslLoader.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/utils/SecondaryFilesDslLoader.java @@ -1,4 +1,4 @@ -package org.w3id.cwl.cwl1_2.utils; +package org.commonwl.cwlsdk.cwl1_1.utils; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/main/java/org/w3id/cwl/cwl1_2/utils/TypeDslLoader.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/utils/TypeDslLoader.java similarity index 98% rename from src/main/java/org/w3id/cwl/cwl1_2/utils/TypeDslLoader.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/utils/TypeDslLoader.java index 0a44c017..6caec158 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/utils/TypeDslLoader.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/utils/TypeDslLoader.java @@ -1,4 +1,4 @@ -package org.w3id.cwl.cwl1_2.utils; +package org.commonwl.cwlsdk.cwl1_1.utils; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/main/java/org/w3id/cwl/cwl1_2/utils/UnionLoader.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/utils/UnionLoader.java similarity index 96% rename from src/main/java/org/w3id/cwl/cwl1_2/utils/UnionLoader.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/utils/UnionLoader.java index 105741b1..b7516ce0 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/utils/UnionLoader.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/utils/UnionLoader.java @@ -1,4 +1,4 @@ -package org.w3id.cwl.cwl1_2.utils; +package org.commonwl.cwlsdk.cwl1_1.utils; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/main/java/org/w3id/cwl/cwl1_1/utils/UriLoader.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/utils/UriLoader.java similarity index 97% rename from src/main/java/org/w3id/cwl/cwl1_1/utils/UriLoader.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/utils/UriLoader.java index 96300574..4ddbbb63 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/utils/UriLoader.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/utils/UriLoader.java @@ -1,4 +1,4 @@ -package org.w3id.cwl.cwl1_1.utils; +package org.commonwl.cwlsdk.cwl1_1.utils; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/org/w3id/cwl/cwl1_1/utils/Uris.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/utils/Uris.java similarity index 98% rename from src/main/java/org/w3id/cwl/cwl1_1/utils/Uris.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/utils/Uris.java index 3294ec2c..5a0279ef 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/utils/Uris.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/utils/Uris.java @@ -1,4 +1,4 @@ -package org.w3id.cwl.cwl1_1.utils; +package org.commonwl.cwlsdk.cwl1_1.utils; import java.io.UnsupportedEncodingException; import java.net.URI; diff --git a/src/main/java/org/w3id/cwl/cwl1_2/utils/ValidationException.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/utils/ValidationException.java similarity index 98% rename from src/main/java/org/w3id/cwl/cwl1_2/utils/ValidationException.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/utils/ValidationException.java index 0ee5e6ca..a1f6c44b 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/utils/ValidationException.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/utils/ValidationException.java @@ -1,4 +1,4 @@ -package org.w3id.cwl.cwl1_2.utils; +package org.commonwl.cwlsdk.cwl1_1.utils; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/main/java/org/w3id/cwl/cwl1_2/utils/Validator.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/utils/Validator.java similarity index 94% rename from src/main/java/org/w3id/cwl/cwl1_2/utils/Validator.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/utils/Validator.java index 4faaf6c5..7b71142d 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/utils/Validator.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/utils/Validator.java @@ -1,4 +1,4 @@ -package org.w3id.cwl.cwl1_2.utils; +package org.commonwl.cwlsdk.cwl1_1.utils; import java.io.File; import org.snakeyaml.engine.v2.api.Dump; diff --git a/src/main/java/org/w3id/cwl/cwl1_2/utils/YamlUtils.java b/src/main/java/org/commonwl/cwlsdk/cwl1_1/utils/YamlUtils.java similarity index 95% rename from src/main/java/org/w3id/cwl/cwl1_2/utils/YamlUtils.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/utils/YamlUtils.java index 5d0ba46a..94781bc7 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/utils/YamlUtils.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/utils/YamlUtils.java @@ -1,4 +1,4 @@ -package org.w3id.cwl.cwl1_2.utils; +package org.commonwl.cwlsdk.cwl1_1.utils; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/main/java/org/w3id/cwl/cwl1_1/utils/package.html b/src/main/java/org/commonwl/cwlsdk/cwl1_1/utils/package.html similarity index 53% rename from src/main/java/org/w3id/cwl/cwl1_1/utils/package.html rename to src/main/java/org/commonwl/cwlsdk/cwl1_1/utils/package.html index dfb90954..317b1d96 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/utils/package.html +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_1/utils/package.html @@ -1,3 +1,3 @@ -This package contains utilities for working the SchemaSalad generated code for the org.w3id.cwl.cwl1_1 package. +This package contains utilities for working the SchemaSalad generated code for the org.commonwl.cwlsdk.cwl1_1 package. diff --git a/src/main/java/org/w3id/cwl/cwl1_2/Any.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/Any.java similarity index 91% rename from src/main/java/org/w3id/cwl/cwl1_2/Any.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/Any.java index 93c446f6..95d5748b 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/Any.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/Any.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_2.utils.ValidationException; public enum Any { ANY("Any"); diff --git a/src/main/java/org/w3id/cwl/cwl1_2/ArraySchema.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/ArraySchema.java similarity index 83% rename from src/main/java/org/w3id/cwl/cwl1_2/ArraySchema.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/ArraySchema.java index c91e6927..229ef6d9 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/ArraySchema.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/ArraySchema.java @@ -12,14 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/salad#ArraySchema
This interface is implemented by {@link ArraySchemaImpl}
*/ public interface ArraySchema extends Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/salad#items
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_1/ArraySchemaImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/ArraySchemaImpl.java similarity index 82% rename from src/main/java/org/w3id/cwl/cwl1_1/ArraySchemaImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/ArraySchemaImpl.java index cafd401b..c2c62502 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/ArraySchemaImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/ArraySchemaImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_1.utils.LoaderInstances; -import org.w3id.cwl.cwl1_1.utils.LoadingOptions; -import org.w3id.cwl.cwl1_1.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_1.utils.SaveableImpl; -import org.w3id.cwl.cwl1_1.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_2.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_2.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_2.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/salad#ArraySchema
@@ -27,6 +27,9 @@ public class ArraySchemaImpl extends SaveableImpl implements ArraySchema { private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -56,7 +59,7 @@ public Array_name getType() { } /** - * Used by {@link org.w3id.cwl.cwl1_1.utils.RootLoader} to construct instances of ArraySchemaImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_2.utils.RootLoader} to construct instances of ArraySchemaImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -112,5 +115,14 @@ public ArraySchemaImpl( } this.items = (Object) items; this.type = (Array_name) type; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("items", "type"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_1/Array_name.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/Array_name.java similarity index 92% rename from src/main/java/org/w3id/cwl/cwl1_1/Array_name.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/Array_name.java index 70618b15..68142666 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/Array_name.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/Array_name.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_1.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_2.utils.ValidationException; public enum Array_name { ARRAY("array"); diff --git a/src/main/java/org/w3id/cwl/cwl1_1/CWLArraySchema.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/CWLArraySchema.java similarity index 83% rename from src/main/java/org/w3id/cwl/cwl1_1/CWLArraySchema.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/CWLArraySchema.java index fe04d0e9..77edf95f 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/CWLArraySchema.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/CWLArraySchema.java @@ -12,14 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_1.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#CWLArraySchema
This interface is implemented by {@link CWLArraySchemaImpl}
*/ public interface CWLArraySchema extends ArraySchema, Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/salad#items
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/CWLArraySchemaImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/CWLArraySchemaImpl.java similarity index 82% rename from src/main/java/org/w3id/cwl/cwl1_2/CWLArraySchemaImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/CWLArraySchemaImpl.java index 09abb025..e642c62d 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/CWLArraySchemaImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/CWLArraySchemaImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.LoaderInstances; -import org.w3id.cwl.cwl1_2.utils.LoadingOptions; -import org.w3id.cwl.cwl1_2.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_2.utils.SaveableImpl; -import org.w3id.cwl.cwl1_2.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_2.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_2.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_2.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/cwl#CWLArraySchema
@@ -27,6 +27,9 @@ public class CWLArraySchemaImpl extends SaveableImpl implements CWLArraySchema { private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -56,7 +59,7 @@ public Array_name getType() { } /** - * Used by {@link org.w3id.cwl.cwl1_2.utils.RootLoader} to construct instances of CWLArraySchemaImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_2.utils.RootLoader} to construct instances of CWLArraySchemaImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -112,5 +115,14 @@ public CWLArraySchemaImpl( } this.items = (Object) items; this.type = (Array_name) type; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("items", "type"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_2/CWLRecordField.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/CWLRecordField.java similarity index 85% rename from src/main/java/org/w3id/cwl/cwl1_2/CWLRecordField.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/CWLRecordField.java index bd5eb897..5962f3ea 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/CWLRecordField.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/CWLRecordField.java @@ -12,14 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#CWLRecordField
This interface is implemented by {@link CWLRecordFieldImpl}
*/ public interface CWLRecordField extends RecordField, Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/salad#RecordField/name
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_1/CWLRecordFieldImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/CWLRecordFieldImpl.java similarity index 85% rename from src/main/java/org/w3id/cwl/cwl1_1/CWLRecordFieldImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/CWLRecordFieldImpl.java index a4a6c6de..94185e74 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/CWLRecordFieldImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/CWLRecordFieldImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_1.utils.LoaderInstances; -import org.w3id.cwl.cwl1_1.utils.LoadingOptions; -import org.w3id.cwl.cwl1_1.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_1.utils.SaveableImpl; -import org.w3id.cwl.cwl1_1.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_2.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_2.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_2.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/cwl#CWLRecordField
@@ -27,6 +27,9 @@ public class CWLRecordFieldImpl extends SaveableImpl implements CWLRecordField { private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -70,7 +73,7 @@ public Object getType() { } /** - * Used by {@link org.w3id.cwl.cwl1_1.utils.RootLoader} to construct instances of CWLRecordFieldImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_2.utils.RootLoader} to construct instances of CWLRecordFieldImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -159,5 +162,14 @@ public CWLRecordFieldImpl( this.doc = (Object) doc; this.name = (String) name; this.type = (Object) type; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("doc", "name", "type"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_1/CWLRecordSchema.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/CWLRecordSchema.java similarity index 83% rename from src/main/java/org/w3id/cwl/cwl1_1/CWLRecordSchema.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/CWLRecordSchema.java index 645d59c6..a5d80cba 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/CWLRecordSchema.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/CWLRecordSchema.java @@ -12,14 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_1.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#CWLRecordSchema
This interface is implemented by {@link CWLRecordSchemaImpl}
*/ public interface CWLRecordSchema extends RecordSchema, Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/salad#fields
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_1/CWLRecordSchemaImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/CWLRecordSchemaImpl.java similarity index 82% rename from src/main/java/org/w3id/cwl/cwl1_1/CWLRecordSchemaImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/CWLRecordSchemaImpl.java index 8ee3ab03..899c33de 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/CWLRecordSchemaImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/CWLRecordSchemaImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_1.utils.LoaderInstances; -import org.w3id.cwl.cwl1_1.utils.LoadingOptions; -import org.w3id.cwl.cwl1_1.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_1.utils.SaveableImpl; -import org.w3id.cwl.cwl1_1.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_2.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_2.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_2.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/cwl#CWLRecordSchema
@@ -27,6 +27,9 @@ public class CWLRecordSchemaImpl extends SaveableImpl implements CWLRecordSchema private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -56,7 +59,7 @@ public Record_name getType() { } /** - * Used by {@link org.w3id.cwl.cwl1_1.utils.RootLoader} to construct instances of CWLRecordSchemaImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_2.utils.RootLoader} to construct instances of CWLRecordSchemaImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -118,5 +121,14 @@ public CWLRecordSchemaImpl( } this.fields = (java.util.Optional>) fields; this.type = (Record_name) type; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("fields", "type"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_2/CWLType.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/CWLType.java similarity index 93% rename from src/main/java/org/w3id/cwl/cwl1_2/CWLType.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/CWLType.java index b2943285..b7e3f5dd 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/CWLType.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/CWLType.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_2.utils.ValidationException; public enum CWLType { NULL("null"), diff --git a/src/main/java/org/w3id/cwl/cwl1_2/CWLVersion.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/CWLVersion.java similarity index 95% rename from src/main/java/org/w3id/cwl/cwl1_2/CWLVersion.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/CWLVersion.java index b1db26d1..d901cf8b 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/CWLVersion.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/CWLVersion.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_2.utils.ValidationException; public enum CWLVersion { DRAFT_2("draft-2"), diff --git a/src/main/java/org/w3id/cwl/cwl1_1/CommandInputArraySchema.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/CommandInputArraySchema.java similarity index 90% rename from src/main/java/org/w3id/cwl/cwl1_1/CommandInputArraySchema.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/CommandInputArraySchema.java index 5a9a4a65..912c3906 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/CommandInputArraySchema.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/CommandInputArraySchema.java @@ -12,14 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_1.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#CommandInputArraySchema
This interface is implemented by {@link CommandInputArraySchemaImpl}
*/ public interface CommandInputArraySchema extends InputArraySchema, CommandInputSchema, CommandLineBindable, Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#IOSchema/name
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_1/CommandInputArraySchemaImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/CommandInputArraySchemaImpl.java similarity index 89% rename from src/main/java/org/w3id/cwl/cwl1_1/CommandInputArraySchemaImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/CommandInputArraySchemaImpl.java index e1517b00..df99f642 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/CommandInputArraySchemaImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/CommandInputArraySchemaImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_1.utils.LoaderInstances; -import org.w3id.cwl.cwl1_1.utils.LoadingOptions; -import org.w3id.cwl.cwl1_1.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_1.utils.SaveableImpl; -import org.w3id.cwl.cwl1_1.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_2.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_2.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_2.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/cwl#CommandInputArraySchema
@@ -27,6 +27,9 @@ public class CommandInputArraySchemaImpl extends SaveableImpl implements Command private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -104,7 +107,7 @@ public java.util.Optional getInputBinding() { } /** - * Used by {@link org.w3id.cwl.cwl1_1.utils.RootLoader} to construct instances of CommandInputArraySchemaImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_2.utils.RootLoader} to construct instances of CommandInputArraySchemaImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -246,5 +249,14 @@ public CommandInputArraySchemaImpl( this.doc = (Object) doc; this.name = (java.util.Optional) name; this.inputBinding = (java.util.Optional) inputBinding; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("items", "type", "label", "doc", "name", "inputBinding"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_1/CommandInputEnumSchema.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/CommandInputEnumSchema.java similarity index 90% rename from src/main/java/org/w3id/cwl/cwl1_1/CommandInputEnumSchema.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/CommandInputEnumSchema.java index 730ec168..a5f1dc6d 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/CommandInputEnumSchema.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/CommandInputEnumSchema.java @@ -12,14 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_1.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#CommandInputEnumSchema
This interface is implemented by {@link CommandInputEnumSchemaImpl}
*/ public interface CommandInputEnumSchema extends InputEnumSchema, CommandInputSchema, CommandLineBindable, Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#IOSchema/name
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_1/CommandInputEnumSchemaImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/CommandInputEnumSchemaImpl.java similarity index 89% rename from src/main/java/org/w3id/cwl/cwl1_1/CommandInputEnumSchemaImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/CommandInputEnumSchemaImpl.java index acc1c7ec..55e7b4b7 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/CommandInputEnumSchemaImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/CommandInputEnumSchemaImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_1.utils.LoaderInstances; -import org.w3id.cwl.cwl1_1.utils.LoadingOptions; -import org.w3id.cwl.cwl1_1.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_1.utils.SaveableImpl; -import org.w3id.cwl.cwl1_1.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_2.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_2.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_2.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/cwl#CommandInputEnumSchema
@@ -27,6 +27,9 @@ public class CommandInputEnumSchemaImpl extends SaveableImpl implements CommandI private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -104,7 +107,7 @@ public java.util.Optional getInputBinding() { } /** - * Used by {@link org.w3id.cwl.cwl1_1.utils.RootLoader} to construct instances of CommandInputEnumSchemaImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_2.utils.RootLoader} to construct instances of CommandInputEnumSchemaImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -246,5 +249,14 @@ public CommandInputEnumSchemaImpl( this.label = (java.util.Optional) label; this.doc = (Object) doc; this.inputBinding = (java.util.Optional) inputBinding; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("name", "symbols", "type", "label", "doc", "inputBinding"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_2/CommandInputParameter.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/CommandInputParameter.java similarity index 96% rename from src/main/java/org/w3id/cwl/cwl1_2/CommandInputParameter.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/CommandInputParameter.java index 8c5117a7..81bf8926 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/CommandInputParameter.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/CommandInputParameter.java @@ -12,15 +12,20 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#CommandInputParameter
This interface is implemented by {@link CommandInputParameterImpl}
An input parameter for a CommandLineTool.
*/ public interface CommandInputParameter extends InputParameter, Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#Identified/id
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/CommandInputParameterImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/CommandInputParameterImpl.java similarity index 94% rename from src/main/java/org/w3id/cwl/cwl1_2/CommandInputParameterImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/CommandInputParameterImpl.java index 8ab09f5a..fd7d5091 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/CommandInputParameterImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/CommandInputParameterImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.LoaderInstances; -import org.w3id.cwl.cwl1_2.utils.LoadingOptions; -import org.w3id.cwl.cwl1_2.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_2.utils.SaveableImpl; -import org.w3id.cwl.cwl1_2.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_2.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_2.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_2.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/cwl#CommandInputParameter
@@ -28,6 +28,9 @@ public class CommandInputParameterImpl extends SaveableImpl implements CommandIn private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -243,7 +246,7 @@ public java.util.Optional getInputBinding() { } /** - * Used by {@link org.w3id.cwl.cwl1_2.utils.RootLoader} to construct instances of CommandInputParameterImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_2.utils.RootLoader} to construct instances of CommandInputParameterImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -481,5 +484,14 @@ public CommandInputParameterImpl( this.default_ = (java.util.Optional) default_; this.type = (Object) type; this.inputBinding = (java.util.Optional) inputBinding; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("label", "secondaryFiles", "streamable", "doc", "id", "format", "loadContents", "loadListing", "default", "type", "inputBinding"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_2/CommandInputRecordField.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/CommandInputRecordField.java similarity index 96% rename from src/main/java/org/w3id/cwl/cwl1_2/CommandInputRecordField.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/CommandInputRecordField.java index f45500ee..6fa2c2be 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/CommandInputRecordField.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/CommandInputRecordField.java @@ -12,14 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#CommandInputRecordField
This interface is implemented by {@link CommandInputRecordFieldImpl}
*/ public interface CommandInputRecordField extends InputRecordField, CommandLineBindable, Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/salad#RecordField/name
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/CommandInputRecordFieldImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/CommandInputRecordFieldImpl.java similarity index 94% rename from src/main/java/org/w3id/cwl/cwl1_2/CommandInputRecordFieldImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/CommandInputRecordFieldImpl.java index be375529..029c772f 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/CommandInputRecordFieldImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/CommandInputRecordFieldImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.LoaderInstances; -import org.w3id.cwl.cwl1_2.utils.LoadingOptions; -import org.w3id.cwl.cwl1_2.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_2.utils.SaveableImpl; -import org.w3id.cwl.cwl1_2.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_2.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_2.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_2.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/cwl#CommandInputRecordField
@@ -27,6 +27,9 @@ public class CommandInputRecordFieldImpl extends SaveableImpl implements Command private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -225,7 +228,7 @@ public java.util.Optional getInputBinding() { } /** - * Used by {@link org.w3id.cwl.cwl1_2.utils.RootLoader} to construct instances of CommandInputRecordFieldImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_2.utils.RootLoader} to construct instances of CommandInputRecordFieldImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -440,5 +443,14 @@ public CommandInputRecordFieldImpl( this.loadContents = (java.util.Optional) loadContents; this.loadListing = (java.util.Optional) loadListing; this.inputBinding = (java.util.Optional) inputBinding; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("doc", "name", "type", "label", "secondaryFiles", "streamable", "format", "loadContents", "loadListing", "inputBinding"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_1/CommandInputRecordSchema.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/CommandInputRecordSchema.java similarity index 90% rename from src/main/java/org/w3id/cwl/cwl1_1/CommandInputRecordSchema.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/CommandInputRecordSchema.java index bae44062..ea5d2de5 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/CommandInputRecordSchema.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/CommandInputRecordSchema.java @@ -12,14 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_1.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#CommandInputRecordSchema
This interface is implemented by {@link CommandInputRecordSchemaImpl}
*/ public interface CommandInputRecordSchema extends InputRecordSchema, CommandInputSchema, CommandLineBindable, Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#IOSchema/name
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_1/CommandInputRecordSchemaImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/CommandInputRecordSchemaImpl.java similarity index 89% rename from src/main/java/org/w3id/cwl/cwl1_1/CommandInputRecordSchemaImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/CommandInputRecordSchemaImpl.java index 5db6bcfe..b460918f 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/CommandInputRecordSchemaImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/CommandInputRecordSchemaImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_1.utils.LoaderInstances; -import org.w3id.cwl.cwl1_1.utils.LoadingOptions; -import org.w3id.cwl.cwl1_1.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_1.utils.SaveableImpl; -import org.w3id.cwl.cwl1_1.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_2.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_2.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_2.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/cwl#CommandInputRecordSchema
@@ -27,6 +27,9 @@ public class CommandInputRecordSchemaImpl extends SaveableImpl implements Comman private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -104,7 +107,7 @@ public java.util.Optional getInputBinding() { } /** - * Used by {@link org.w3id.cwl.cwl1_1.utils.RootLoader} to construct instances of CommandInputRecordSchemaImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_2.utils.RootLoader} to construct instances of CommandInputRecordSchemaImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -252,5 +255,14 @@ public CommandInputRecordSchemaImpl( this.doc = (Object) doc; this.name = (java.util.Optional) name; this.inputBinding = (java.util.Optional) inputBinding; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("fields", "type", "label", "doc", "name", "inputBinding"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_2/CommandInputSchema.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/CommandInputSchema.java similarity index 76% rename from src/main/java/org/w3id/cwl/cwl1_2/CommandInputSchema.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/CommandInputSchema.java index 4dd291df..5312a084 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/CommandInputSchema.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/CommandInputSchema.java @@ -12,12 +12,17 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#CommandInputSchema
*/ public interface CommandInputSchema extends Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + } diff --git a/src/main/java/org/w3id/cwl/cwl1_2/CommandLineBindable.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/CommandLineBindable.java similarity index 82% rename from src/main/java/org/w3id/cwl/cwl1_2/CommandLineBindable.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/CommandLineBindable.java index 7b64da15..1b8d67da 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/CommandLineBindable.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/CommandLineBindable.java @@ -12,14 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#CommandLineBindable
This interface is implemented by {@link CommandLineBindableImpl}
*/ public interface CommandLineBindable extends Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#CommandLineBindable/inputBinding
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/CommandLineBindableImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/CommandLineBindableImpl.java similarity index 80% rename from src/main/java/org/w3id/cwl/cwl1_2/CommandLineBindableImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/CommandLineBindableImpl.java index f229703c..15d3de30 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/CommandLineBindableImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/CommandLineBindableImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.LoaderInstances; -import org.w3id.cwl.cwl1_2.utils.LoadingOptions; -import org.w3id.cwl.cwl1_2.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_2.utils.SaveableImpl; -import org.w3id.cwl.cwl1_2.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_2.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_2.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_2.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/cwl#CommandLineBindable
@@ -27,6 +27,9 @@ public class CommandLineBindableImpl extends SaveableImpl implements CommandLine private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -44,7 +47,7 @@ public java.util.Optional getInputBinding() { } /** - * Used by {@link org.w3id.cwl.cwl1_2.utils.RootLoader} to construct instances of CommandLineBindableImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_2.utils.RootLoader} to construct instances of CommandLineBindableImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -94,5 +97,14 @@ public CommandLineBindableImpl( throw new ValidationException("Trying 'RecordField'", __errors); } this.inputBinding = (java.util.Optional) inputBinding; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("inputBinding"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_2/CommandLineBinding.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/CommandLineBinding.java similarity index 96% rename from src/main/java/org/w3id/cwl/cwl1_2/CommandLineBinding.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/CommandLineBinding.java index c7dbf67b..957526ae 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/CommandLineBinding.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/CommandLineBinding.java @@ -12,9 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#CommandLineBinding
This interface is implemented by {@link CommandLineBindingImpl}
@@ -56,6 +57,10 @@
*/ public interface CommandLineBinding extends InputBinding, Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#InputBinding/loadContents
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/CommandLineBindingImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/CommandLineBindingImpl.java similarity index 92% rename from src/main/java/org/w3id/cwl/cwl1_2/CommandLineBindingImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/CommandLineBindingImpl.java index 1619471b..d3cfee9e 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/CommandLineBindingImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/CommandLineBindingImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.LoaderInstances; -import org.w3id.cwl.cwl1_2.utils.LoadingOptions; -import org.w3id.cwl.cwl1_2.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_2.utils.SaveableImpl; -import org.w3id.cwl.cwl1_2.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_2.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_2.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_2.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/cwl#CommandLineBinding
@@ -63,6 +63,9 @@ public class CommandLineBindingImpl extends SaveableImpl implements CommandLineB private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -189,7 +192,7 @@ public java.util.Optional getShellQuote() { } /** - * Used by {@link org.w3id.cwl.cwl1_2.utils.RootLoader} to construct instances of CommandLineBindingImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_2.utils.RootLoader} to construct instances of CommandLineBindingImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -347,5 +350,14 @@ public CommandLineBindingImpl( this.itemSeparator = (java.util.Optional) itemSeparator; this.valueFrom = (Object) valueFrom; this.shellQuote = (java.util.Optional) shellQuote; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("loadContents", "position", "prefix", "separate", "itemSeparator", "valueFrom", "shellQuote"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_2/CommandLineTool.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/CommandLineTool.java similarity index 97% rename from src/main/java/org/w3id/cwl/cwl1_2/CommandLineTool.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/CommandLineTool.java index d2daf66c..0678a9d9 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/CommandLineTool.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/CommandLineTool.java @@ -12,9 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#CommandLineTool
This interface is implemented by {@link CommandLineToolImpl}
@@ -22,6 +23,10 @@
*/ public interface CommandLineTool extends Process, Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#Process/id
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/CommandLineToolImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/CommandLineToolImpl.java similarity index 95% rename from src/main/java/org/w3id/cwl/cwl1_2/CommandLineToolImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/CommandLineToolImpl.java index 4b4870fa..8a8803a8 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/CommandLineToolImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/CommandLineToolImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.LoaderInstances; -import org.w3id.cwl.cwl1_2.utils.LoadingOptions; -import org.w3id.cwl.cwl1_2.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_2.utils.SaveableImpl; -import org.w3id.cwl.cwl1_2.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_2.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_2.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_2.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/cwl#CommandLineTool
@@ -29,6 +29,9 @@ public class CommandLineToolImpl extends SaveableImpl implements CommandLineTool private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -344,7 +347,7 @@ public java.util.Optional> getPermanentFailCodes() { } /** - * Used by {@link org.w3id.cwl.cwl1_2.utils.RootLoader} to construct instances of CommandLineToolImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_2.utils.RootLoader} to construct instances of CommandLineToolImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -696,5 +699,14 @@ public CommandLineToolImpl( this.successCodes = (java.util.Optional>) successCodes; this.temporaryFailCodes = (java.util.Optional>) temporaryFailCodes; this.permanentFailCodes = (java.util.Optional>) permanentFailCodes; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("id", "label", "doc", "inputs", "outputs", "requirements", "hints", "cwlVersion", "intent", "class", "baseCommand", "arguments", "stdin", "stderr", "stdout", "successCodes", "temporaryFailCodes", "permanentFailCodes"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_1/CommandLineTool_class.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/CommandLineTool_class.java similarity index 92% rename from src/main/java/org/w3id/cwl/cwl1_1/CommandLineTool_class.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/CommandLineTool_class.java index 3674e1b8..ca9bb74b 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/CommandLineTool_class.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/CommandLineTool_class.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_1.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_2.utils.ValidationException; public enum CommandLineTool_class { COMMANDLINETOOL("CommandLineTool"); diff --git a/src/main/java/org/w3id/cwl/cwl1_2/CommandOutputArraySchema.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/CommandOutputArraySchema.java similarity index 88% rename from src/main/java/org/w3id/cwl/cwl1_2/CommandOutputArraySchema.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/CommandOutputArraySchema.java index d8e7a3f5..5456f569 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/CommandOutputArraySchema.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/CommandOutputArraySchema.java @@ -12,14 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#CommandOutputArraySchema
This interface is implemented by {@link CommandOutputArraySchemaImpl}
*/ public interface CommandOutputArraySchema extends OutputArraySchema, Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#IOSchema/name
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/CommandOutputArraySchemaImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/CommandOutputArraySchemaImpl.java similarity index 88% rename from src/main/java/org/w3id/cwl/cwl1_2/CommandOutputArraySchemaImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/CommandOutputArraySchemaImpl.java index 80ad20e9..f7aded0f 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/CommandOutputArraySchemaImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/CommandOutputArraySchemaImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.LoaderInstances; -import org.w3id.cwl.cwl1_2.utils.LoadingOptions; -import org.w3id.cwl.cwl1_2.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_2.utils.SaveableImpl; -import org.w3id.cwl.cwl1_2.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_2.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_2.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_2.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/cwl#CommandOutputArraySchema
@@ -27,6 +27,9 @@ public class CommandOutputArraySchemaImpl extends SaveableImpl implements Comman private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -92,7 +95,7 @@ public Object getDoc() { } /** - * Used by {@link org.w3id.cwl.cwl1_2.utils.RootLoader} to construct instances of CommandOutputArraySchemaImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_2.utils.RootLoader} to construct instances of CommandOutputArraySchemaImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -216,5 +219,14 @@ public CommandOutputArraySchemaImpl( this.label = (java.util.Optional) label; this.doc = (Object) doc; this.name = (java.util.Optional) name; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("items", "type", "label", "doc", "name"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_2/CommandOutputBinding.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/CommandOutputBinding.java similarity index 96% rename from src/main/java/org/w3id/cwl/cwl1_2/CommandOutputBinding.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/CommandOutputBinding.java index 475b20bd..e91c9bd3 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/CommandOutputBinding.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/CommandOutputBinding.java @@ -12,9 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#CommandOutputBinding
This interface is implemented by {@link CommandOutputBindingImpl}
@@ -31,6 +32,10 @@
*/ public interface CommandOutputBinding extends LoadContents, Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#LoadContents/loadContents
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/CommandOutputBindingImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/CommandOutputBindingImpl.java similarity index 91% rename from src/main/java/org/w3id/cwl/cwl1_2/CommandOutputBindingImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/CommandOutputBindingImpl.java index a093cc9d..8bf84292 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/CommandOutputBindingImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/CommandOutputBindingImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.LoaderInstances; -import org.w3id.cwl.cwl1_2.utils.LoadingOptions; -import org.w3id.cwl.cwl1_2.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_2.utils.SaveableImpl; -import org.w3id.cwl.cwl1_2.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_2.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_2.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_2.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/cwl#CommandOutputBinding
@@ -38,6 +38,9 @@ public class CommandOutputBindingImpl extends SaveableImpl implements CommandOut private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -163,7 +166,7 @@ public java.util.Optional getOutputEval() { } /** - * Used by {@link org.w3id.cwl.cwl1_2.utils.RootLoader} to construct instances of CommandOutputBindingImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_2.utils.RootLoader} to construct instances of CommandOutputBindingImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -267,5 +270,14 @@ public CommandOutputBindingImpl( this.loadListing = (java.util.Optional) loadListing; this.glob = (Object) glob; this.outputEval = (java.util.Optional) outputEval; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("loadContents", "loadListing", "glob", "outputEval"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_1/CommandOutputEnumSchema.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/CommandOutputEnumSchema.java similarity index 88% rename from src/main/java/org/w3id/cwl/cwl1_1/CommandOutputEnumSchema.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/CommandOutputEnumSchema.java index 2a4782f2..34d2562e 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/CommandOutputEnumSchema.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/CommandOutputEnumSchema.java @@ -12,14 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_1.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#CommandOutputEnumSchema
This interface is implemented by {@link CommandOutputEnumSchemaImpl}
*/ public interface CommandOutputEnumSchema extends OutputEnumSchema, Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#IOSchema/name
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_1/CommandOutputEnumSchemaImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/CommandOutputEnumSchemaImpl.java similarity index 88% rename from src/main/java/org/w3id/cwl/cwl1_1/CommandOutputEnumSchemaImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/CommandOutputEnumSchemaImpl.java index 08adf037..5ddcaf32 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/CommandOutputEnumSchemaImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/CommandOutputEnumSchemaImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_1.utils.LoaderInstances; -import org.w3id.cwl.cwl1_1.utils.LoadingOptions; -import org.w3id.cwl.cwl1_1.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_1.utils.SaveableImpl; -import org.w3id.cwl.cwl1_1.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_2.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_2.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_2.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/cwl#CommandOutputEnumSchema
@@ -27,6 +27,9 @@ public class CommandOutputEnumSchemaImpl extends SaveableImpl implements Command private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -92,7 +95,7 @@ public Object getDoc() { } /** - * Used by {@link org.w3id.cwl.cwl1_1.utils.RootLoader} to construct instances of CommandOutputEnumSchemaImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_2.utils.RootLoader} to construct instances of CommandOutputEnumSchemaImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -216,5 +219,14 @@ public CommandOutputEnumSchemaImpl( this.type = (Enum_name) type; this.label = (java.util.Optional) label; this.doc = (Object) doc; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("name", "symbols", "type", "label", "doc"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_1/CommandOutputParameter.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/CommandOutputParameter.java similarity index 95% rename from src/main/java/org/w3id/cwl/cwl1_1/CommandOutputParameter.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/CommandOutputParameter.java index 89687c0a..4fa8649c 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/CommandOutputParameter.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/CommandOutputParameter.java @@ -12,15 +12,20 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_1.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#CommandOutputParameter
This interface is implemented by {@link CommandOutputParameterImpl}
An output parameter for a CommandLineTool.
*/ public interface CommandOutputParameter extends OutputParameter, Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#Identified/id
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/CommandOutputParameterImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/CommandOutputParameterImpl.java similarity index 93% rename from src/main/java/org/w3id/cwl/cwl1_2/CommandOutputParameterImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/CommandOutputParameterImpl.java index 366dc864..31ddcf41 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/CommandOutputParameterImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/CommandOutputParameterImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.LoaderInstances; -import org.w3id.cwl.cwl1_2.utils.LoadingOptions; -import org.w3id.cwl.cwl1_2.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_2.utils.SaveableImpl; -import org.w3id.cwl.cwl1_2.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_2.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_2.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_2.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/cwl#CommandOutputParameter
@@ -28,6 +28,9 @@ public class CommandOutputParameterImpl extends SaveableImpl implements CommandO private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -181,7 +184,7 @@ public java.util.Optional getOutputBinding() { } /** - * Used by {@link org.w3id.cwl.cwl1_2.utils.RootLoader} to construct instances of CommandOutputParameterImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_2.utils.RootLoader} to construct instances of CommandOutputParameterImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -365,5 +368,14 @@ public CommandOutputParameterImpl( this.format = (Object) format; this.type = (Object) type; this.outputBinding = (java.util.Optional) outputBinding; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("label", "secondaryFiles", "streamable", "doc", "id", "format", "type", "outputBinding"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_1/CommandOutputRecordField.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/CommandOutputRecordField.java similarity index 95% rename from src/main/java/org/w3id/cwl/cwl1_1/CommandOutputRecordField.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/CommandOutputRecordField.java index 9ab4ee44..6b2a31a3 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/CommandOutputRecordField.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/CommandOutputRecordField.java @@ -12,14 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_1.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#CommandOutputRecordField
This interface is implemented by {@link CommandOutputRecordFieldImpl}
*/ public interface CommandOutputRecordField extends OutputRecordField, Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/salad#RecordField/name
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/CommandOutputRecordFieldImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/CommandOutputRecordFieldImpl.java similarity index 93% rename from src/main/java/org/w3id/cwl/cwl1_2/CommandOutputRecordFieldImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/CommandOutputRecordFieldImpl.java index 91530a3d..488f122b 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/CommandOutputRecordFieldImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/CommandOutputRecordFieldImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.LoaderInstances; -import org.w3id.cwl.cwl1_2.utils.LoadingOptions; -import org.w3id.cwl.cwl1_2.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_2.utils.SaveableImpl; -import org.w3id.cwl.cwl1_2.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_2.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_2.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_2.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/cwl#CommandOutputRecordField
@@ -27,6 +27,9 @@ public class CommandOutputRecordFieldImpl extends SaveableImpl implements Comman private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -183,7 +186,7 @@ public java.util.Optional getOutputBinding() { } /** - * Used by {@link org.w3id.cwl.cwl1_2.utils.RootLoader} to construct instances of CommandOutputRecordFieldImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_2.utils.RootLoader} to construct instances of CommandOutputRecordFieldImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -362,5 +365,14 @@ public CommandOutputRecordFieldImpl( this.streamable = (java.util.Optional) streamable; this.format = (Object) format; this.outputBinding = (java.util.Optional) outputBinding; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("doc", "name", "type", "label", "secondaryFiles", "streamable", "format", "outputBinding"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_1/CommandOutputRecordSchema.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/CommandOutputRecordSchema.java similarity index 89% rename from src/main/java/org/w3id/cwl/cwl1_1/CommandOutputRecordSchema.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/CommandOutputRecordSchema.java index 33e35c28..97b04cb0 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/CommandOutputRecordSchema.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/CommandOutputRecordSchema.java @@ -12,14 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_1.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#CommandOutputRecordSchema
This interface is implemented by {@link CommandOutputRecordSchemaImpl}
*/ public interface CommandOutputRecordSchema extends OutputRecordSchema, Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#IOSchema/name
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/CommandOutputRecordSchemaImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/CommandOutputRecordSchemaImpl.java similarity index 88% rename from src/main/java/org/w3id/cwl/cwl1_2/CommandOutputRecordSchemaImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/CommandOutputRecordSchemaImpl.java index 0b339965..f0b9e058 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/CommandOutputRecordSchemaImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/CommandOutputRecordSchemaImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.LoaderInstances; -import org.w3id.cwl.cwl1_2.utils.LoadingOptions; -import org.w3id.cwl.cwl1_2.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_2.utils.SaveableImpl; -import org.w3id.cwl.cwl1_2.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_2.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_2.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_2.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/cwl#CommandOutputRecordSchema
@@ -27,6 +27,9 @@ public class CommandOutputRecordSchemaImpl extends SaveableImpl implements Comma private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -92,7 +95,7 @@ public Object getDoc() { } /** - * Used by {@link org.w3id.cwl.cwl1_2.utils.RootLoader} to construct instances of CommandOutputRecordSchemaImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_2.utils.RootLoader} to construct instances of CommandOutputRecordSchemaImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -222,5 +225,14 @@ public CommandOutputRecordSchemaImpl( this.label = (java.util.Optional) label; this.doc = (Object) doc; this.name = (java.util.Optional) name; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("fields", "type", "label", "doc", "name"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_2/Directory.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/Directory.java similarity index 96% rename from src/main/java/org/w3id/cwl/cwl1_2/Directory.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/Directory.java index 968b416f..25817bf5 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/Directory.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/Directory.java @@ -12,9 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#Directory
This interface is implemented by {@link DirectoryImpl}
@@ -64,6 +65,10 @@ Name conflicts (the same `basename` appearing multiple times in `listing`
*/ public interface Directory extends Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#Directory/class
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/DirectoryImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/DirectoryImpl.java similarity index 92% rename from src/main/java/org/w3id/cwl/cwl1_2/DirectoryImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/DirectoryImpl.java index dfccaa94..ca110334 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/DirectoryImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/DirectoryImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.LoaderInstances; -import org.w3id.cwl.cwl1_2.utils.LoadingOptions; -import org.w3id.cwl.cwl1_2.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_2.utils.SaveableImpl; -import org.w3id.cwl.cwl1_2.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_2.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_2.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_2.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/cwl#Directory
@@ -71,6 +71,9 @@ public class DirectoryImpl extends SaveableImpl implements Directory { private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -183,7 +186,7 @@ public java.util.Optional> getListing() { } /** - * Used by {@link org.w3id.cwl.cwl1_2.utils.RootLoader} to construct instances of DirectoryImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_2.utils.RootLoader} to construct instances of DirectoryImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -299,5 +302,14 @@ public DirectoryImpl( this.path = (java.util.Optional) path; this.basename = (java.util.Optional) basename; this.listing = (java.util.Optional>) listing; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("class", "location", "path", "basename", "listing"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_2/Directory_class.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/Directory_class.java similarity index 92% rename from src/main/java/org/w3id/cwl/cwl1_2/Directory_class.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/Directory_class.java index faf3f21d..aa95ad48 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/Directory_class.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/Directory_class.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_2.utils.ValidationException; public enum Directory_class { DIRECTORY("Directory"); diff --git a/src/main/java/org/w3id/cwl/cwl1_2/Dirent.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/Dirent.java similarity index 95% rename from src/main/java/org/w3id/cwl/cwl1_2/Dirent.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/Dirent.java index 4d991a82..a788e932 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/Dirent.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/Dirent.java @@ -12,9 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#Dirent
This interface is implemented by {@link DirentImpl}
@@ -29,6 +30,10 @@
*/ public interface Dirent extends Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#entryname
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/DirentImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/DirentImpl.java similarity index 90% rename from src/main/java/org/w3id/cwl/cwl1_2/DirentImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/DirentImpl.java index b524ee79..cd56eb48 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/DirentImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/DirentImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.LoaderInstances; -import org.w3id.cwl.cwl1_2.utils.LoadingOptions; -import org.w3id.cwl.cwl1_2.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_2.utils.SaveableImpl; -import org.w3id.cwl.cwl1_2.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_2.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_2.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_2.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/cwl#Dirent
@@ -36,6 +36,9 @@ public class DirentImpl extends SaveableImpl implements Dirent { private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -142,7 +145,7 @@ public java.util.Optional getWritable() { } /** - * Used by {@link org.w3id.cwl.cwl1_2.utils.RootLoader} to construct instances of DirentImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_2.utils.RootLoader} to construct instances of DirentImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -222,5 +225,14 @@ public DirentImpl( this.entryname = (Object) entryname; this.entry = (Object) entry; this.writable = (java.util.Optional) writable; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("entryname", "entry", "writable"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_2/DockerRequirement.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/DockerRequirement.java similarity index 96% rename from src/main/java/org/w3id/cwl/cwl1_2/DockerRequirement.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/DockerRequirement.java index 0f69cd10..de173dd5 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/DockerRequirement.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/DockerRequirement.java @@ -12,9 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#DockerRequirement
This interface is implemented by {@link DockerRequirementImpl}
@@ -72,6 +73,10 @@ concerns of the implicit hidden execution point (For further discussion, see
*/ public interface DockerRequirement extends ProcessRequirement, Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#DockerRequirement/class
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/DockerRequirementImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/DockerRequirementImpl.java similarity index 92% rename from src/main/java/org/w3id/cwl/cwl1_2/DockerRequirementImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/DockerRequirementImpl.java index 5fe1c612..6ad9754b 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/DockerRequirementImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/DockerRequirementImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.LoaderInstances; -import org.w3id.cwl.cwl1_2.utils.LoadingOptions; -import org.w3id.cwl.cwl1_2.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_2.utils.SaveableImpl; -import org.w3id.cwl.cwl1_2.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_2.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_2.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_2.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/cwl#DockerRequirement
@@ -79,6 +79,9 @@ public class DockerRequirementImpl extends SaveableImpl implements DockerRequire private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -177,7 +180,7 @@ public java.util.Optional getDockerOutputDirectory() { } /** - * Used by {@link org.w3id.cwl.cwl1_2.utils.RootLoader} to construct instances of DockerRequirementImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_2.utils.RootLoader} to construct instances of DockerRequirementImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -329,5 +332,14 @@ public DockerRequirementImpl( this.dockerImport = (java.util.Optional) dockerImport; this.dockerImageId = (java.util.Optional) dockerImageId; this.dockerOutputDirectory = (java.util.Optional) dockerOutputDirectory; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("class", "dockerPull", "dockerLoad", "dockerFile", "dockerImport", "dockerImageId", "dockerOutputDirectory"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_2/DockerRequirement_class.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/DockerRequirement_class.java similarity index 92% rename from src/main/java/org/w3id/cwl/cwl1_2/DockerRequirement_class.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/DockerRequirement_class.java index b2d07d31..37761629 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/DockerRequirement_class.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/DockerRequirement_class.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_2.utils.ValidationException; public enum DockerRequirement_class { DOCKERREQUIREMENT("DockerRequirement"); diff --git a/src/main/java/org/w3id/cwl/cwl1_2/Documented.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/Documented.java similarity index 80% rename from src/main/java/org/w3id/cwl/cwl1_2/Documented.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/Documented.java index 62460ab8..9980e551 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/Documented.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/Documented.java @@ -12,14 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/salad#Documented
*/ public interface Documented extends Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/salad#Documented/doc
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_1/EnumSchema.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/EnumSchema.java similarity index 85% rename from src/main/java/org/w3id/cwl/cwl1_1/EnumSchema.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/EnumSchema.java index d75bda5c..9daf2f80 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/EnumSchema.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/EnumSchema.java @@ -12,9 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_1.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/salad#EnumSchema
This interface is implemented by {@link EnumSchemaImpl}
@@ -22,6 +23,10 @@
*/ public interface EnumSchema extends Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/salad#EnumSchema/name
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/EnumSchemaImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/EnumSchemaImpl.java similarity index 85% rename from src/main/java/org/w3id/cwl/cwl1_2/EnumSchemaImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/EnumSchemaImpl.java index db038b36..1945eefd 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/EnumSchemaImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/EnumSchemaImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.LoaderInstances; -import org.w3id.cwl.cwl1_2.utils.LoadingOptions; -import org.w3id.cwl.cwl1_2.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_2.utils.SaveableImpl; -import org.w3id.cwl.cwl1_2.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_2.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_2.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_2.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/salad#EnumSchema
@@ -29,6 +29,9 @@ public class EnumSchemaImpl extends SaveableImpl implements EnumSchema { private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -69,7 +72,7 @@ public Enum_name getType() { } /** - * Used by {@link org.w3id.cwl.cwl1_2.utils.RootLoader} to construct instances of EnumSchemaImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_2.utils.RootLoader} to construct instances of EnumSchemaImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -157,5 +160,14 @@ public EnumSchemaImpl( this.name = (java.util.Optional) name; this.symbols = (java.util.List) symbols; this.type = (Enum_name) type; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("name", "symbols", "type"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_1/Enum_name.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/Enum_name.java similarity index 91% rename from src/main/java/org/w3id/cwl/cwl1_1/Enum_name.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/Enum_name.java index 8d9877cb..eb814c9f 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/Enum_name.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/Enum_name.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_1.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_2.utils.ValidationException; public enum Enum_name { ENUM("enum"); diff --git a/src/main/java/org/w3id/cwl/cwl1_2/EnvVarRequirement.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/EnvVarRequirement.java similarity index 85% rename from src/main/java/org/w3id/cwl/cwl1_2/EnvVarRequirement.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/EnvVarRequirement.java index 197df67d..8e1e917f 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/EnvVarRequirement.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/EnvVarRequirement.java @@ -12,9 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#EnvVarRequirement
This interface is implemented by {@link EnvVarRequirementImpl}
@@ -23,6 +24,10 @@
*/ public interface EnvVarRequirement extends ProcessRequirement, Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#EnvVarRequirement/class
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/EnvVarRequirementImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/EnvVarRequirementImpl.java similarity index 82% rename from src/main/java/org/w3id/cwl/cwl1_2/EnvVarRequirementImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/EnvVarRequirementImpl.java index b43661c9..086f4cd8 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/EnvVarRequirementImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/EnvVarRequirementImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.LoaderInstances; -import org.w3id.cwl.cwl1_2.utils.LoadingOptions; -import org.w3id.cwl.cwl1_2.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_2.utils.SaveableImpl; -import org.w3id.cwl.cwl1_2.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_2.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_2.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_2.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/cwl#EnvVarRequirement
@@ -30,6 +30,9 @@ public class EnvVarRequirementImpl extends SaveableImpl implements EnvVarRequire private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -59,7 +62,7 @@ public java.util.List getEnvDef() { } /** - * Used by {@link org.w3id.cwl.cwl1_2.utils.RootLoader} to construct instances of EnvVarRequirementImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_2.utils.RootLoader} to construct instances of EnvVarRequirementImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -115,5 +118,14 @@ public EnvVarRequirementImpl( } this.class_ = (EnvVarRequirement_class) class_; this.envDef = (java.util.List) envDef; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("class", "envDef"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_2/EnvVarRequirement_class.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/EnvVarRequirement_class.java similarity index 92% rename from src/main/java/org/w3id/cwl/cwl1_2/EnvVarRequirement_class.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/EnvVarRequirement_class.java index 7ae99315..b02c8af1 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/EnvVarRequirement_class.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/EnvVarRequirement_class.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_2.utils.ValidationException; public enum EnvVarRequirement_class { ENVVARREQUIREMENT("EnvVarRequirement"); diff --git a/src/main/java/org/w3id/cwl/cwl1_1/EnvironmentDef.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/EnvironmentDef.java similarity index 86% rename from src/main/java/org/w3id/cwl/cwl1_1/EnvironmentDef.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/EnvironmentDef.java index 9c3e8c5a..309578d4 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/EnvironmentDef.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/EnvironmentDef.java @@ -12,9 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_1.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#EnvironmentDef
This interface is implemented by {@link EnvironmentDefImpl}
@@ -24,6 +25,10 @@
*/ public interface EnvironmentDef extends Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#EnvironmentDef/envName
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_1/EnvironmentDefImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/EnvironmentDefImpl.java similarity index 82% rename from src/main/java/org/w3id/cwl/cwl1_1/EnvironmentDefImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/EnvironmentDefImpl.java index f02aa908..1bb4af69 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/EnvironmentDefImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/EnvironmentDefImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_1.utils.LoaderInstances; -import org.w3id.cwl.cwl1_1.utils.LoadingOptions; -import org.w3id.cwl.cwl1_1.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_1.utils.SaveableImpl; -import org.w3id.cwl.cwl1_1.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_2.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_2.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_2.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/cwl#EnvironmentDef
@@ -31,6 +31,9 @@ public class EnvironmentDefImpl extends SaveableImpl implements EnvironmentDef { private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -60,7 +63,7 @@ public Object getEnvValue() { } /** - * Used by {@link org.w3id.cwl.cwl1_1.utils.RootLoader} to construct instances of EnvironmentDefImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_2.utils.RootLoader} to construct instances of EnvironmentDefImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -116,5 +119,14 @@ public EnvironmentDefImpl( } this.envName = (String) envName; this.envValue = (Object) envValue; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("envName", "envValue"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_2/Expression.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/Expression.java similarity index 92% rename from src/main/java/org/w3id/cwl/cwl1_2/Expression.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/Expression.java index 7286535a..d2a1f251 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/Expression.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/Expression.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_2.utils.ValidationException; public enum Expression { EXPRESSIONPLACEHOLDER("ExpressionPlaceholder"); diff --git a/src/main/java/org/w3id/cwl/cwl1_2/ExpressionTool.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/ExpressionTool.java similarity index 96% rename from src/main/java/org/w3id/cwl/cwl1_2/ExpressionTool.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/ExpressionTool.java index 4a29792f..c0c52555 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/ExpressionTool.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/ExpressionTool.java @@ -12,9 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#ExpressionTool
This interface is implemented by {@link ExpressionToolImpl}
@@ -28,6 +29,10 @@
*/ public interface ExpressionTool extends Process, Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#Process/id
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/ExpressionToolImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/ExpressionToolImpl.java similarity index 94% rename from src/main/java/org/w3id/cwl/cwl1_2/ExpressionToolImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/ExpressionToolImpl.java index e111aed5..595f1119 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/ExpressionToolImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/ExpressionToolImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.LoaderInstances; -import org.w3id.cwl.cwl1_2.utils.LoadingOptions; -import org.w3id.cwl.cwl1_2.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_2.utils.SaveableImpl; -import org.w3id.cwl.cwl1_2.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_2.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_2.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_2.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/cwl#ExpressionTool
@@ -35,6 +35,9 @@ public class ExpressionToolImpl extends SaveableImpl implements ExpressionTool { private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -217,7 +220,7 @@ public String getExpression() { } /** - * Used by {@link org.w3id.cwl.cwl1_2.utils.RootLoader} to construct instances of ExpressionToolImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_2.utils.RootLoader} to construct instances of ExpressionToolImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -437,5 +440,14 @@ public ExpressionToolImpl( this.intent = (java.util.Optional>) intent; this.class_ = (ExpressionTool_class) class_; this.expression = (String) expression; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("id", "label", "doc", "inputs", "outputs", "requirements", "hints", "cwlVersion", "intent", "class", "expression"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_2/ExpressionToolOutputParameter.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/ExpressionToolOutputParameter.java similarity index 95% rename from src/main/java/org/w3id/cwl/cwl1_2/ExpressionToolOutputParameter.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/ExpressionToolOutputParameter.java index bca11d27..306985d9 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/ExpressionToolOutputParameter.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/ExpressionToolOutputParameter.java @@ -12,14 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#ExpressionToolOutputParameter
This interface is implemented by {@link ExpressionToolOutputParameterImpl}
*/ public interface ExpressionToolOutputParameter extends OutputParameter, Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#Identified/id
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/ExpressionToolOutputParameterImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/ExpressionToolOutputParameterImpl.java similarity index 92% rename from src/main/java/org/w3id/cwl/cwl1_2/ExpressionToolOutputParameterImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/ExpressionToolOutputParameterImpl.java index 7992ab81..1e3b20cb 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/ExpressionToolOutputParameterImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/ExpressionToolOutputParameterImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.LoaderInstances; -import org.w3id.cwl.cwl1_2.utils.LoadingOptions; -import org.w3id.cwl.cwl1_2.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_2.utils.SaveableImpl; -import org.w3id.cwl.cwl1_2.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_2.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_2.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_2.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/cwl#ExpressionToolOutputParameter
@@ -27,6 +27,9 @@ public class ExpressionToolOutputParameterImpl extends SaveableImpl implements E private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -170,7 +173,7 @@ public Object getType() { } /** - * Used by {@link org.w3id.cwl.cwl1_2.utils.RootLoader} to construct instances of ExpressionToolOutputParameterImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_2.utils.RootLoader} to construct instances of ExpressionToolOutputParameterImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -336,5 +339,14 @@ public ExpressionToolOutputParameterImpl( this.id = (java.util.Optional) id; this.format = (Object) format; this.type = (Object) type; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("label", "secondaryFiles", "streamable", "doc", "id", "format", "type"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_2/ExpressionTool_class.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/ExpressionTool_class.java similarity index 92% rename from src/main/java/org/w3id/cwl/cwl1_2/ExpressionTool_class.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/ExpressionTool_class.java index 070f921c..76c00adc 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/ExpressionTool_class.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/ExpressionTool_class.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_2.utils.ValidationException; public enum ExpressionTool_class { EXPRESSIONTOOL("ExpressionTool"); diff --git a/src/main/java/org/w3id/cwl/cwl1_2/FieldBase.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/FieldBase.java similarity index 94% rename from src/main/java/org/w3id/cwl/cwl1_2/FieldBase.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/FieldBase.java index 34829126..76852b5e 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/FieldBase.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/FieldBase.java @@ -12,14 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#FieldBase
*/ public interface FieldBase extends Labeled, Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#Labeled/label
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/File.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/File.java similarity index 98% rename from src/main/java/org/w3id/cwl/cwl1_2/File.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/File.java index 01275ca4..d7ba075e 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/File.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/File.java @@ -12,9 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#File
This interface is implemented by {@link FileImpl}
@@ -87,6 +88,10 @@ property in the context of the tool execution runtime (local to the compute
*/ public interface File extends Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#File/class
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/FileImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/FileImpl.java similarity index 95% rename from src/main/java/org/w3id/cwl/cwl1_2/FileImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/FileImpl.java index bd0d3003..8deb6089 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/FileImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/FileImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.LoaderInstances; -import org.w3id.cwl.cwl1_2.utils.LoadingOptions; -import org.w3id.cwl.cwl1_2.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_2.utils.SaveableImpl; -import org.w3id.cwl.cwl1_2.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_2.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_2.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_2.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/cwl#File
@@ -94,6 +94,9 @@ public class FileImpl extends SaveableImpl implements File { private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -353,7 +356,7 @@ public java.util.Optional getContents() { } /** - * Used by {@link org.w3id.cwl.cwl1_2.utils.RootLoader} to construct instances of FileImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_2.utils.RootLoader} to construct instances of FileImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -595,5 +598,14 @@ public FileImpl( this.secondaryFiles = (java.util.Optional>) secondaryFiles; this.format = (java.util.Optional) format; this.contents = (java.util.Optional) contents; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("class", "location", "path", "basename", "dirname", "nameroot", "nameext", "checksum", "size", "secondaryFiles", "format", "contents"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_1/File_class.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/File_class.java similarity index 92% rename from src/main/java/org/w3id/cwl/cwl1_1/File_class.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/File_class.java index 216069a5..d8ae0b3d 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/File_class.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/File_class.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_1.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_2.utils.ValidationException; public enum File_class { FILE("File"); diff --git a/src/main/java/org/w3id/cwl/cwl1_1/IOSchema.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/IOSchema.java similarity index 83% rename from src/main/java/org/w3id/cwl/cwl1_1/IOSchema.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/IOSchema.java index 4ee33764..4fa4facc 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/IOSchema.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/IOSchema.java @@ -12,14 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_1.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#IOSchema
*/ public interface IOSchema extends Labeled, Documented, Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#Labeled/label
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_1/Identified.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/Identified.java similarity index 76% rename from src/main/java/org/w3id/cwl/cwl1_1/Identified.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/Identified.java index 5ad30973..15736c75 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/Identified.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/Identified.java @@ -12,12 +12,17 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_1.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#Identified
*/ public interface Identified extends Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + } diff --git a/src/main/java/org/w3id/cwl/cwl1_2/InitialWorkDirRequirement.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/InitialWorkDirRequirement.java similarity index 92% rename from src/main/java/org/w3id/cwl/cwl1_2/InitialWorkDirRequirement.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/InitialWorkDirRequirement.java index 8d23446b..73d54aac 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/InitialWorkDirRequirement.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/InitialWorkDirRequirement.java @@ -12,9 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#InitialWorkDirRequirement
This interface is implemented by {@link InitialWorkDirRequirementImpl}
@@ -22,6 +23,10 @@ Normally files are staged within the designated output directory. However, when running inside containers, files may be staged at arbitrary locations, see discussion for [`Dirent.entryname`](#Dirent). Together with `DockerRequirement.dockerOutputDirectory` it is possible to control the locations of both input and output files when running in containers.
*/ public interface InitialWorkDirRequirement extends ProcessRequirement, Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#InitialWorkDirRequirement/class
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/InitialWorkDirRequirementImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/InitialWorkDirRequirementImpl.java similarity index 86% rename from src/main/java/org/w3id/cwl/cwl1_2/InitialWorkDirRequirementImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/InitialWorkDirRequirementImpl.java index 41e0c28d..3e488f33 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/InitialWorkDirRequirementImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/InitialWorkDirRequirementImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.LoaderInstances; -import org.w3id.cwl.cwl1_2.utils.LoadingOptions; -import org.w3id.cwl.cwl1_2.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_2.utils.SaveableImpl; -import org.w3id.cwl.cwl1_2.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_2.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_2.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_2.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/cwl#InitialWorkDirRequirement
@@ -29,6 +29,9 @@ public class InitialWorkDirRequirementImpl extends SaveableImpl implements Initi private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -82,7 +85,7 @@ public Object getListing() { } /** - * Used by {@link org.w3id.cwl.cwl1_2.utils.RootLoader} to construct instances of InitialWorkDirRequirementImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_2.utils.RootLoader} to construct instances of InitialWorkDirRequirementImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -138,5 +141,14 @@ public InitialWorkDirRequirementImpl( } this.class_ = (InitialWorkDirRequirement_class) class_; this.listing = (Object) listing; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("class", "listing"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_1/InitialWorkDirRequirement_class.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/InitialWorkDirRequirement_class.java similarity index 93% rename from src/main/java/org/w3id/cwl/cwl1_1/InitialWorkDirRequirement_class.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/InitialWorkDirRequirement_class.java index e1e30e1d..297a71fa 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/InitialWorkDirRequirement_class.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/InitialWorkDirRequirement_class.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_1.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_2.utils.ValidationException; public enum InitialWorkDirRequirement_class { INITIALWORKDIRREQUIREMENT("InitialWorkDirRequirement"); diff --git a/src/main/java/org/w3id/cwl/cwl1_2/InlineJavascriptRequirement.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/InlineJavascriptRequirement.java similarity index 88% rename from src/main/java/org/w3id/cwl/cwl1_2/InlineJavascriptRequirement.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/InlineJavascriptRequirement.java index b7743b8b..1d03d48a 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/InlineJavascriptRequirement.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/InlineJavascriptRequirement.java @@ -12,9 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#InlineJavascriptRequirement
This interface is implemented by {@link InlineJavascriptRequirementImpl}
@@ -24,6 +25,10 @@
*/ public interface InlineJavascriptRequirement extends ProcessRequirement, Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#InlineJavascriptRequirement/class
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/InlineJavascriptRequirementImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/InlineJavascriptRequirementImpl.java similarity index 84% rename from src/main/java/org/w3id/cwl/cwl1_2/InlineJavascriptRequirementImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/InlineJavascriptRequirementImpl.java index 4eae1497..56b349f9 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/InlineJavascriptRequirementImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/InlineJavascriptRequirementImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.LoaderInstances; -import org.w3id.cwl.cwl1_2.utils.LoadingOptions; -import org.w3id.cwl.cwl1_2.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_2.utils.SaveableImpl; -import org.w3id.cwl.cwl1_2.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_2.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_2.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_2.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/cwl#InlineJavascriptRequirement
@@ -31,6 +31,9 @@ public class InlineJavascriptRequirementImpl extends SaveableImpl implements Inl private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -63,7 +66,7 @@ public java.util.Optional> getExpressionLib() { } /** - * Used by {@link org.w3id.cwl.cwl1_2.utils.RootLoader} to construct instances of InlineJavascriptRequirementImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_2.utils.RootLoader} to construct instances of InlineJavascriptRequirementImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -125,5 +128,14 @@ public InlineJavascriptRequirementImpl( } this.class_ = (InlineJavascriptRequirement_class) class_; this.expressionLib = (java.util.Optional>) expressionLib; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("class", "expressionLib"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_2/InlineJavascriptRequirement_class.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/InlineJavascriptRequirement_class.java similarity index 93% rename from src/main/java/org/w3id/cwl/cwl1_2/InlineJavascriptRequirement_class.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/InlineJavascriptRequirement_class.java index 15c5fb9a..d5944c02 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/InlineJavascriptRequirement_class.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/InlineJavascriptRequirement_class.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_2.utils.ValidationException; public enum InlineJavascriptRequirement_class { INLINEJAVASCRIPTREQUIREMENT("InlineJavascriptRequirement"); diff --git a/src/main/java/org/w3id/cwl/cwl1_2/InplaceUpdateRequirement.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/InplaceUpdateRequirement.java similarity index 92% rename from src/main/java/org/w3id/cwl/cwl1_2/InplaceUpdateRequirement.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/InplaceUpdateRequirement.java index 335bbef9..452bc892 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/InplaceUpdateRequirement.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/InplaceUpdateRequirement.java @@ -12,9 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#InplaceUpdateRequirement
This interface is implemented by {@link InplaceUpdateRequirementImpl}
@@ -51,6 +52,10 @@ is writable by one workflow step file is accessed (for reading or
*/ public interface InplaceUpdateRequirement extends ProcessRequirement, Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#InplaceUpdateRequirement/class
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/InplaceUpdateRequirementImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/InplaceUpdateRequirementImpl.java similarity index 86% rename from src/main/java/org/w3id/cwl/cwl1_2/InplaceUpdateRequirementImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/InplaceUpdateRequirementImpl.java index 913969a9..37c27405 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/InplaceUpdateRequirementImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/InplaceUpdateRequirementImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.LoaderInstances; -import org.w3id.cwl.cwl1_2.utils.LoadingOptions; -import org.w3id.cwl.cwl1_2.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_2.utils.SaveableImpl; -import org.w3id.cwl.cwl1_2.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_2.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_2.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_2.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/cwl#InplaceUpdateRequirement
@@ -58,6 +58,9 @@ public class InplaceUpdateRequirementImpl extends SaveableImpl implements Inplac private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -86,7 +89,7 @@ public Boolean getInplaceUpdate() { } /** - * Used by {@link org.w3id.cwl.cwl1_2.utils.RootLoader} to construct instances of InplaceUpdateRequirementImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_2.utils.RootLoader} to construct instances of InplaceUpdateRequirementImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -142,5 +145,14 @@ public InplaceUpdateRequirementImpl( } this.class_ = (InplaceUpdateRequirement_class) class_; this.inplaceUpdate = (Boolean) inplaceUpdate; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("class", "inplaceUpdate"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_2/InplaceUpdateRequirement_class.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/InplaceUpdateRequirement_class.java similarity index 93% rename from src/main/java/org/w3id/cwl/cwl1_2/InplaceUpdateRequirement_class.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/InplaceUpdateRequirement_class.java index f467a741..05c0a2b0 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/InplaceUpdateRequirement_class.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/InplaceUpdateRequirement_class.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_2.utils.ValidationException; public enum InplaceUpdateRequirement_class { INPLACEUPDATEREQUIREMENT("InplaceUpdateRequirement"); diff --git a/src/main/java/org/w3id/cwl/cwl1_1/InputArraySchema.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/InputArraySchema.java similarity index 88% rename from src/main/java/org/w3id/cwl/cwl1_1/InputArraySchema.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/InputArraySchema.java index 30b4154c..c1e3b024 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/InputArraySchema.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/InputArraySchema.java @@ -12,14 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_1.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#InputArraySchema
This interface is implemented by {@link InputArraySchemaImpl}
*/ public interface InputArraySchema extends CWLArraySchema, InputSchema, Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#IOSchema/name
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/InputArraySchemaImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/InputArraySchemaImpl.java similarity index 88% rename from src/main/java/org/w3id/cwl/cwl1_2/InputArraySchemaImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/InputArraySchemaImpl.java index bad7ae72..bffce6ed 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/InputArraySchemaImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/InputArraySchemaImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.LoaderInstances; -import org.w3id.cwl.cwl1_2.utils.LoadingOptions; -import org.w3id.cwl.cwl1_2.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_2.utils.SaveableImpl; -import org.w3id.cwl.cwl1_2.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_2.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_2.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_2.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/cwl#InputArraySchema
@@ -27,6 +27,9 @@ public class InputArraySchemaImpl extends SaveableImpl implements InputArraySche private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -92,7 +95,7 @@ public Object getDoc() { } /** - * Used by {@link org.w3id.cwl.cwl1_2.utils.RootLoader} to construct instances of InputArraySchemaImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_2.utils.RootLoader} to construct instances of InputArraySchemaImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -216,5 +219,14 @@ public InputArraySchemaImpl( this.label = (java.util.Optional) label; this.doc = (Object) doc; this.name = (java.util.Optional) name; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("items", "type", "label", "doc", "name"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_2/InputBinding.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/InputBinding.java similarity index 83% rename from src/main/java/org/w3id/cwl/cwl1_2/InputBinding.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/InputBinding.java index 7124d070..8c101b9b 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/InputBinding.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/InputBinding.java @@ -12,14 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#InputBinding
This interface is implemented by {@link InputBindingImpl}
*/ public interface InputBinding extends Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#InputBinding/loadContents
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/InputBindingImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/InputBindingImpl.java similarity index 80% rename from src/main/java/org/w3id/cwl/cwl1_2/InputBindingImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/InputBindingImpl.java index 33d651bd..7afedd9f 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/InputBindingImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/InputBindingImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.LoaderInstances; -import org.w3id.cwl.cwl1_2.utils.LoadingOptions; -import org.w3id.cwl.cwl1_2.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_2.utils.SaveableImpl; -import org.w3id.cwl.cwl1_2.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_2.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_2.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_2.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/cwl#InputBinding
@@ -27,6 +27,9 @@ public class InputBindingImpl extends SaveableImpl implements InputBinding { private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -47,7 +50,7 @@ public java.util.Optional getLoadContents() { } /** - * Used by {@link org.w3id.cwl.cwl1_2.utils.RootLoader} to construct instances of InputBindingImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_2.utils.RootLoader} to construct instances of InputBindingImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -97,5 +100,14 @@ public InputBindingImpl( throw new ValidationException("Trying 'RecordField'", __errors); } this.loadContents = (java.util.Optional) loadContents; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("loadContents"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_1/InputEnumSchema.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/InputEnumSchema.java similarity index 88% rename from src/main/java/org/w3id/cwl/cwl1_1/InputEnumSchema.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/InputEnumSchema.java index 8ec71472..9a252c27 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/InputEnumSchema.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/InputEnumSchema.java @@ -12,14 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_1.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#InputEnumSchema
This interface is implemented by {@link InputEnumSchemaImpl}
*/ public interface InputEnumSchema extends EnumSchema, InputSchema, Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#IOSchema/name
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/InputEnumSchemaImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/InputEnumSchemaImpl.java similarity index 88% rename from src/main/java/org/w3id/cwl/cwl1_2/InputEnumSchemaImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/InputEnumSchemaImpl.java index 6a4a7bae..1f6cb8d5 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/InputEnumSchemaImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/InputEnumSchemaImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.LoaderInstances; -import org.w3id.cwl.cwl1_2.utils.LoadingOptions; -import org.w3id.cwl.cwl1_2.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_2.utils.SaveableImpl; -import org.w3id.cwl.cwl1_2.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_2.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_2.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_2.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/cwl#InputEnumSchema
@@ -27,6 +27,9 @@ public class InputEnumSchemaImpl extends SaveableImpl implements InputEnumSchema private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -92,7 +95,7 @@ public Object getDoc() { } /** - * Used by {@link org.w3id.cwl.cwl1_2.utils.RootLoader} to construct instances of InputEnumSchemaImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_2.utils.RootLoader} to construct instances of InputEnumSchemaImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -216,5 +219,14 @@ public InputEnumSchemaImpl( this.type = (Enum_name) type; this.label = (java.util.Optional) label; this.doc = (Object) doc; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("name", "symbols", "type", "label", "doc"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_2/InputFormat.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/InputFormat.java similarity index 83% rename from src/main/java/org/w3id/cwl/cwl1_2/InputFormat.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/InputFormat.java index 6990e448..094ceb90 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/InputFormat.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/InputFormat.java @@ -12,14 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#InputFormat
*/ public interface InputFormat extends Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#format
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/InputParameter.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/InputParameter.java similarity index 96% rename from src/main/java/org/w3id/cwl/cwl1_2/InputParameter.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/InputParameter.java index f0a737c9..b5911163 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/InputParameter.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/InputParameter.java @@ -12,14 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#InputParameter
*/ public interface InputParameter extends Parameter, InputFormat, LoadContents, Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#Labeled/label
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/InputRecordField.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/InputRecordField.java similarity index 96% rename from src/main/java/org/w3id/cwl/cwl1_2/InputRecordField.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/InputRecordField.java index 23fcfef2..1f8063af 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/InputRecordField.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/InputRecordField.java @@ -12,14 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#InputRecordField
This interface is implemented by {@link InputRecordFieldImpl}
*/ public interface InputRecordField extends CWLRecordField, FieldBase, InputFormat, LoadContents, Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/salad#RecordField/name
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/InputRecordFieldImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/InputRecordFieldImpl.java similarity index 93% rename from src/main/java/org/w3id/cwl/cwl1_2/InputRecordFieldImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/InputRecordFieldImpl.java index 14a965d0..045e19e7 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/InputRecordFieldImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/InputRecordFieldImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.LoaderInstances; -import org.w3id.cwl.cwl1_2.utils.LoadingOptions; -import org.w3id.cwl.cwl1_2.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_2.utils.SaveableImpl; -import org.w3id.cwl.cwl1_2.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_2.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_2.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_2.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/cwl#InputRecordField
@@ -27,6 +27,9 @@ public class InputRecordFieldImpl extends SaveableImpl implements InputRecordFie private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -213,7 +216,7 @@ public java.util.Optional getLoadListing() { } /** - * Used by {@link org.w3id.cwl.cwl1_2.utils.RootLoader} to construct instances of InputRecordFieldImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_2.utils.RootLoader} to construct instances of InputRecordFieldImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -410,5 +413,14 @@ public InputRecordFieldImpl( this.format = (Object) format; this.loadContents = (java.util.Optional) loadContents; this.loadListing = (java.util.Optional) loadListing; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("doc", "name", "type", "label", "secondaryFiles", "streamable", "format", "loadContents", "loadListing"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_1/InputRecordSchema.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/InputRecordSchema.java similarity index 88% rename from src/main/java/org/w3id/cwl/cwl1_1/InputRecordSchema.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/InputRecordSchema.java index b888029d..c9acc178 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/InputRecordSchema.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/InputRecordSchema.java @@ -12,14 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_1.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#InputRecordSchema
This interface is implemented by {@link InputRecordSchemaImpl}
*/ public interface InputRecordSchema extends CWLRecordSchema, InputSchema, Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#IOSchema/name
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_1/InputRecordSchemaImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/InputRecordSchemaImpl.java similarity index 88% rename from src/main/java/org/w3id/cwl/cwl1_1/InputRecordSchemaImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/InputRecordSchemaImpl.java index 8f622934..31cf073e 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/InputRecordSchemaImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/InputRecordSchemaImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_1.utils.LoaderInstances; -import org.w3id.cwl.cwl1_1.utils.LoadingOptions; -import org.w3id.cwl.cwl1_1.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_1.utils.SaveableImpl; -import org.w3id.cwl.cwl1_1.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_2.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_2.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_2.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/cwl#InputRecordSchema
@@ -27,6 +27,9 @@ public class InputRecordSchemaImpl extends SaveableImpl implements InputRecordSc private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -92,7 +95,7 @@ public Object getDoc() { } /** - * Used by {@link org.w3id.cwl.cwl1_1.utils.RootLoader} to construct instances of InputRecordSchemaImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_2.utils.RootLoader} to construct instances of InputRecordSchemaImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -222,5 +225,14 @@ public InputRecordSchemaImpl( this.label = (java.util.Optional) label; this.doc = (Object) doc; this.name = (java.util.Optional) name; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("fields", "type", "label", "doc", "name"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_1/InputSchema.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/InputSchema.java similarity index 83% rename from src/main/java/org/w3id/cwl/cwl1_1/InputSchema.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/InputSchema.java index ac5df073..933fbb39 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/InputSchema.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/InputSchema.java @@ -12,14 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_1.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#InputSchema
*/ public interface InputSchema extends IOSchema, Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#Labeled/label
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/Labeled.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/Labeled.java similarity index 80% rename from src/main/java/org/w3id/cwl/cwl1_2/Labeled.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/Labeled.java index c0dd6254..057c76fe 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/Labeled.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/Labeled.java @@ -12,14 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#Labeled
*/ public interface Labeled extends Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#Labeled/label
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/LinkMergeMethod.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/LinkMergeMethod.java similarity index 92% rename from src/main/java/org/w3id/cwl/cwl1_2/LinkMergeMethod.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/LinkMergeMethod.java index 12aad297..4e55cf1e 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/LinkMergeMethod.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/LinkMergeMethod.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_2.utils.ValidationException; public enum LinkMergeMethod { MERGE_NESTED("merge_nested"), diff --git a/src/main/java/org/w3id/cwl/cwl1_2/LoadContents.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/LoadContents.java similarity index 89% rename from src/main/java/org/w3id/cwl/cwl1_2/LoadContents.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/LoadContents.java index cb979739..2d7c7fb7 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/LoadContents.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/LoadContents.java @@ -12,14 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#LoadContents
*/ public interface LoadContents extends Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#LoadContents/loadContents
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_1/LoadListingEnum.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/LoadListingEnum.java similarity index 92% rename from src/main/java/org/w3id/cwl/cwl1_1/LoadListingEnum.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/LoadListingEnum.java index 0fd6aa32..63cecdde 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/LoadListingEnum.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/LoadListingEnum.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_1.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_2.utils.ValidationException; public enum LoadListingEnum { NO_LISTING("no_listing"), diff --git a/src/main/java/org/w3id/cwl/cwl1_2/LoadListingRequirement.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/LoadListingRequirement.java similarity index 85% rename from src/main/java/org/w3id/cwl/cwl1_2/LoadListingRequirement.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/LoadListingRequirement.java index 2a73589f..d1c7f0d0 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/LoadListingRequirement.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/LoadListingRequirement.java @@ -12,9 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#LoadListingRequirement
This interface is implemented by {@link LoadListingRequirementImpl}
@@ -23,6 +24,10 @@
*/ public interface LoadListingRequirement extends ProcessRequirement, Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#LoadListingRequirement/class
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_1/LoadListingRequirementImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/LoadListingRequirementImpl.java similarity index 83% rename from src/main/java/org/w3id/cwl/cwl1_1/LoadListingRequirementImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/LoadListingRequirementImpl.java index fe427ea8..bc64e221 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/LoadListingRequirementImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/LoadListingRequirementImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_1.utils.LoaderInstances; -import org.w3id.cwl.cwl1_1.utils.LoadingOptions; -import org.w3id.cwl.cwl1_1.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_1.utils.SaveableImpl; -import org.w3id.cwl.cwl1_1.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_2.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_2.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_2.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/cwl#LoadListingRequirement
@@ -30,6 +30,9 @@ public class LoadListingRequirementImpl extends SaveableImpl implements LoadList private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -58,7 +61,7 @@ public java.util.Optional getLoadListing() { } /** - * Used by {@link org.w3id.cwl.cwl1_1.utils.RootLoader} to construct instances of LoadListingRequirementImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_2.utils.RootLoader} to construct instances of LoadListingRequirementImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -120,5 +123,14 @@ public LoadListingRequirementImpl( } this.class_ = (LoadListingRequirement_class) class_; this.loadListing = (java.util.Optional) loadListing; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("class", "loadListing"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_2/LoadListingRequirement_class.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/LoadListingRequirement_class.java similarity index 92% rename from src/main/java/org/w3id/cwl/cwl1_2/LoadListingRequirement_class.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/LoadListingRequirement_class.java index c44623bd..80353e40 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/LoadListingRequirement_class.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/LoadListingRequirement_class.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_2.utils.ValidationException; public enum LoadListingRequirement_class { LOADLISTINGREQUIREMENT("LoadListingRequirement"); diff --git a/src/main/java/org/w3id/cwl/cwl1_2/MapSchema.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/MapSchema.java similarity index 83% rename from src/main/java/org/w3id/cwl/cwl1_2/MapSchema.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/MapSchema.java index 2d6bbbbd..54d8f0bb 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/MapSchema.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/MapSchema.java @@ -12,14 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/salad#MapSchema
This interface is implemented by {@link MapSchemaImpl}
*/ public interface MapSchema extends Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/salad#type
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_1/MapSchemaImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/MapSchemaImpl.java similarity index 82% rename from src/main/java/org/w3id/cwl/cwl1_1/MapSchemaImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/MapSchemaImpl.java index 35c9d656..bb3c2860 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/MapSchemaImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/MapSchemaImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_1.utils.LoaderInstances; -import org.w3id.cwl.cwl1_1.utils.LoadingOptions; -import org.w3id.cwl.cwl1_1.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_1.utils.SaveableImpl; -import org.w3id.cwl.cwl1_1.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_2.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_2.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_2.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/salad#MapSchema
@@ -27,6 +27,9 @@ public class MapSchemaImpl extends SaveableImpl implements MapSchema { private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -56,7 +59,7 @@ public Object getValues() { } /** - * Used by {@link org.w3id.cwl.cwl1_1.utils.RootLoader} to construct instances of MapSchemaImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_2.utils.RootLoader} to construct instances of MapSchemaImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -112,5 +115,14 @@ public MapSchemaImpl( } this.type = (Map_name) type; this.values = (Object) values; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("type", "values"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_1/Map_name.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/Map_name.java similarity index 91% rename from src/main/java/org/w3id/cwl/cwl1_1/Map_name.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/Map_name.java index 3065d8e4..2d70a37c 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/Map_name.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/Map_name.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_1.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_2.utils.ValidationException; public enum Map_name { MAP("map"); diff --git a/src/main/java/org/w3id/cwl/cwl1_1/MultipleInputFeatureRequirement.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/MultipleInputFeatureRequirement.java similarity index 84% rename from src/main/java/org/w3id/cwl/cwl1_1/MultipleInputFeatureRequirement.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/MultipleInputFeatureRequirement.java index de1712c6..b075fbad 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/MultipleInputFeatureRequirement.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/MultipleInputFeatureRequirement.java @@ -12,9 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_1.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#MultipleInputFeatureRequirement
This interface is implemented by {@link MultipleInputFeatureRequirementImpl}
@@ -23,6 +24,10 @@
*/ public interface MultipleInputFeatureRequirement extends ProcessRequirement, Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#MultipleInputFeatureRequirement/class
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/MultipleInputFeatureRequirementImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/MultipleInputFeatureRequirementImpl.java similarity index 80% rename from src/main/java/org/w3id/cwl/cwl1_2/MultipleInputFeatureRequirementImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/MultipleInputFeatureRequirementImpl.java index de44f4e3..e3e28d33 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/MultipleInputFeatureRequirementImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/MultipleInputFeatureRequirementImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.LoaderInstances; -import org.w3id.cwl.cwl1_2.utils.LoadingOptions; -import org.w3id.cwl.cwl1_2.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_2.utils.SaveableImpl; -import org.w3id.cwl.cwl1_2.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_2.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_2.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_2.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/cwl#MultipleInputFeatureRequirement
@@ -30,6 +30,9 @@ public class MultipleInputFeatureRequirementImpl extends SaveableImpl implements private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -47,7 +50,7 @@ public MultipleInputFeatureRequirement_class getClass_() { } /** - * Used by {@link org.w3id.cwl.cwl1_2.utils.RootLoader} to construct instances of MultipleInputFeatureRequirementImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_2.utils.RootLoader} to construct instances of MultipleInputFeatureRequirementImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -91,5 +94,14 @@ public MultipleInputFeatureRequirementImpl( throw new ValidationException("Trying 'RecordField'", __errors); } this.class_ = (MultipleInputFeatureRequirement_class) class_; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("class"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_1/MultipleInputFeatureRequirement_class.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/MultipleInputFeatureRequirement_class.java similarity index 93% rename from src/main/java/org/w3id/cwl/cwl1_1/MultipleInputFeatureRequirement_class.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/MultipleInputFeatureRequirement_class.java index bdbc35c9..0b3150d1 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/MultipleInputFeatureRequirement_class.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/MultipleInputFeatureRequirement_class.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_1.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_2.utils.ValidationException; public enum MultipleInputFeatureRequirement_class { MULTIPLEINPUTFEATUREREQUIREMENT("MultipleInputFeatureRequirement"); diff --git a/src/main/java/org/w3id/cwl/cwl1_2/NetworkAccess.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/NetworkAccess.java similarity index 88% rename from src/main/java/org/w3id/cwl/cwl1_2/NetworkAccess.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/NetworkAccess.java index 58ae572f..2d02328a 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/NetworkAccess.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/NetworkAccess.java @@ -12,9 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#NetworkAccess
This interface is implemented by {@link NetworkAccessImpl}
@@ -36,6 +37,10 @@ assume network access, except for localhost (the loopback device).
*/ public interface NetworkAccess extends ProcessRequirement, Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#NetworkAccess/class
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/NetworkAccessImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/NetworkAccessImpl.java similarity index 84% rename from src/main/java/org/w3id/cwl/cwl1_2/NetworkAccessImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/NetworkAccessImpl.java index 5a5a179d..fc982627 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/NetworkAccessImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/NetworkAccessImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.LoaderInstances; -import org.w3id.cwl.cwl1_2.utils.LoadingOptions; -import org.w3id.cwl.cwl1_2.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_2.utils.SaveableImpl; -import org.w3id.cwl.cwl1_2.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_2.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_2.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_2.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/cwl#NetworkAccess
@@ -43,6 +43,9 @@ public class NetworkAccessImpl extends SaveableImpl implements NetworkAccess { private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -71,7 +74,7 @@ public Object getNetworkAccess() { } /** - * Used by {@link org.w3id.cwl.cwl1_2.utils.RootLoader} to construct instances of NetworkAccessImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_2.utils.RootLoader} to construct instances of NetworkAccessImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -127,5 +130,14 @@ public NetworkAccessImpl( } this.class_ = (NetworkAccess_class) class_; this.networkAccess = (Object) networkAccess; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("class", "networkAccess"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_2/NetworkAccess_class.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/NetworkAccess_class.java similarity index 92% rename from src/main/java/org/w3id/cwl/cwl1_2/NetworkAccess_class.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/NetworkAccess_class.java index 093243c5..584b1e01 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/NetworkAccess_class.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/NetworkAccess_class.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_2.utils.ValidationException; public enum NetworkAccess_class { NETWORKACCESS("NetworkAccess"); diff --git a/src/main/java/org/w3id/cwl/cwl1_2/Operation.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/Operation.java similarity index 96% rename from src/main/java/org/w3id/cwl/cwl1_2/Operation.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/Operation.java index 6670c394..fe026b94 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/Operation.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/Operation.java @@ -12,9 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#Operation
This interface is implemented by {@link OperationImpl}
@@ -28,6 +29,10 @@ an Operation to a concrete process (such as Workflow,
*/ public interface Operation extends Process, Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#Process/id
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/OperationImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/OperationImpl.java similarity index 94% rename from src/main/java/org/w3id/cwl/cwl1_2/OperationImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/OperationImpl.java index d62238c8..b88a7c0d 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/OperationImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/OperationImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.LoaderInstances; -import org.w3id.cwl.cwl1_2.utils.LoadingOptions; -import org.w3id.cwl.cwl1_2.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_2.utils.SaveableImpl; -import org.w3id.cwl.cwl1_2.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_2.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_2.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_2.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/cwl#Operation
@@ -35,6 +35,9 @@ public class OperationImpl extends SaveableImpl implements Operation { private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -202,7 +205,7 @@ public java.util.Optional> getIntent() { } /** - * Used by {@link org.w3id.cwl.cwl1_2.utils.RootLoader} to construct instances of OperationImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_2.utils.RootLoader} to construct instances of OperationImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -410,5 +413,14 @@ public OperationImpl( this.cwlVersion = (java.util.Optional) cwlVersion; this.intent = (java.util.Optional>) intent; this.class_ = (Operation_class) class_; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("id", "label", "doc", "inputs", "outputs", "requirements", "hints", "cwlVersion", "intent", "class"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_2/OperationInputParameter.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/OperationInputParameter.java similarity index 96% rename from src/main/java/org/w3id/cwl/cwl1_2/OperationInputParameter.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/OperationInputParameter.java index 42ed2527..0acb947a 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/OperationInputParameter.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/OperationInputParameter.java @@ -12,9 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#OperationInputParameter
This interface is implemented by {@link OperationInputParameterImpl}
@@ -22,6 +23,10 @@
*/ public interface OperationInputParameter extends InputParameter, Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#Identified/id
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/OperationInputParameterImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/OperationInputParameterImpl.java similarity index 94% rename from src/main/java/org/w3id/cwl/cwl1_2/OperationInputParameterImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/OperationInputParameterImpl.java index 4569c98d..88a6c97e 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/OperationInputParameterImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/OperationInputParameterImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.LoaderInstances; -import org.w3id.cwl.cwl1_2.utils.LoadingOptions; -import org.w3id.cwl.cwl1_2.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_2.utils.SaveableImpl; -import org.w3id.cwl.cwl1_2.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_2.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_2.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_2.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/cwl#OperationInputParameter
@@ -29,6 +29,9 @@ public class OperationInputParameterImpl extends SaveableImpl implements Operati private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -230,7 +233,7 @@ public Object getType() { } /** - * Used by {@link org.w3id.cwl.cwl1_2.utils.RootLoader} to construct instances of OperationInputParameterImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_2.utils.RootLoader} to construct instances of OperationInputParameterImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -450,5 +453,14 @@ public OperationInputParameterImpl( this.loadListing = (java.util.Optional) loadListing; this.default_ = (java.util.Optional) default_; this.type = (Object) type; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("label", "secondaryFiles", "streamable", "doc", "id", "format", "loadContents", "loadListing", "default", "type"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_2/OperationOutputParameter.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/OperationOutputParameter.java similarity index 95% rename from src/main/java/org/w3id/cwl/cwl1_2/OperationOutputParameter.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/OperationOutputParameter.java index 2939f1d7..aec2a6e5 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/OperationOutputParameter.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/OperationOutputParameter.java @@ -12,9 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#OperationOutputParameter
This interface is implemented by {@link OperationOutputParameterImpl}
@@ -22,6 +23,10 @@
*/ public interface OperationOutputParameter extends OutputParameter, Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#Identified/id
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/OperationOutputParameterImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/OperationOutputParameterImpl.java similarity index 92% rename from src/main/java/org/w3id/cwl/cwl1_2/OperationOutputParameterImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/OperationOutputParameterImpl.java index 90dedaba..2cb07a23 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/OperationOutputParameterImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/OperationOutputParameterImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.LoaderInstances; -import org.w3id.cwl.cwl1_2.utils.LoadingOptions; -import org.w3id.cwl.cwl1_2.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_2.utils.SaveableImpl; -import org.w3id.cwl.cwl1_2.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_2.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_2.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_2.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/cwl#OperationOutputParameter
@@ -29,6 +29,9 @@ public class OperationOutputParameterImpl extends SaveableImpl implements Operat private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -170,7 +173,7 @@ public Object getType() { } /** - * Used by {@link org.w3id.cwl.cwl1_2.utils.RootLoader} to construct instances of OperationOutputParameterImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_2.utils.RootLoader} to construct instances of OperationOutputParameterImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -336,5 +339,14 @@ public OperationOutputParameterImpl( this.id = (java.util.Optional) id; this.format = (Object) format; this.type = (Object) type; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("label", "secondaryFiles", "streamable", "doc", "id", "format", "type"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_2/Operation_class.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/Operation_class.java similarity index 92% rename from src/main/java/org/w3id/cwl/cwl1_2/Operation_class.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/Operation_class.java index d3ca76a9..f102af8a 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/Operation_class.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/Operation_class.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_2.utils.ValidationException; public enum Operation_class { OPERATION("Operation"); diff --git a/src/main/java/org/w3id/cwl/cwl1_1/OutputArraySchema.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/OutputArraySchema.java similarity index 88% rename from src/main/java/org/w3id/cwl/cwl1_1/OutputArraySchema.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/OutputArraySchema.java index 41b01f84..9fd7d6e9 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/OutputArraySchema.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/OutputArraySchema.java @@ -12,14 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_1.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#OutputArraySchema
This interface is implemented by {@link OutputArraySchemaImpl}
*/ public interface OutputArraySchema extends CWLArraySchema, OutputSchema, Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#IOSchema/name
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_1/OutputArraySchemaImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/OutputArraySchemaImpl.java similarity index 88% rename from src/main/java/org/w3id/cwl/cwl1_1/OutputArraySchemaImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/OutputArraySchemaImpl.java index 75eb2829..f638eae4 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/OutputArraySchemaImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/OutputArraySchemaImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_1.utils.LoaderInstances; -import org.w3id.cwl.cwl1_1.utils.LoadingOptions; -import org.w3id.cwl.cwl1_1.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_1.utils.SaveableImpl; -import org.w3id.cwl.cwl1_1.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_2.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_2.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_2.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/cwl#OutputArraySchema
@@ -27,6 +27,9 @@ public class OutputArraySchemaImpl extends SaveableImpl implements OutputArraySc private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -92,7 +95,7 @@ public Object getDoc() { } /** - * Used by {@link org.w3id.cwl.cwl1_1.utils.RootLoader} to construct instances of OutputArraySchemaImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_2.utils.RootLoader} to construct instances of OutputArraySchemaImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -216,5 +219,14 @@ public OutputArraySchemaImpl( this.label = (java.util.Optional) label; this.doc = (Object) doc; this.name = (java.util.Optional) name; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("items", "type", "label", "doc", "name"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_1/OutputEnumSchema.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/OutputEnumSchema.java similarity index 88% rename from src/main/java/org/w3id/cwl/cwl1_1/OutputEnumSchema.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/OutputEnumSchema.java index f1a61c4d..d6c66bfd 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/OutputEnumSchema.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/OutputEnumSchema.java @@ -12,14 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_1.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#OutputEnumSchema
This interface is implemented by {@link OutputEnumSchemaImpl}
*/ public interface OutputEnumSchema extends EnumSchema, OutputSchema, Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#IOSchema/name
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_1/OutputEnumSchemaImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/OutputEnumSchemaImpl.java similarity index 88% rename from src/main/java/org/w3id/cwl/cwl1_1/OutputEnumSchemaImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/OutputEnumSchemaImpl.java index 92a9127d..0ecfb5ae 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/OutputEnumSchemaImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/OutputEnumSchemaImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_1.utils.LoaderInstances; -import org.w3id.cwl.cwl1_1.utils.LoadingOptions; -import org.w3id.cwl.cwl1_1.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_1.utils.SaveableImpl; -import org.w3id.cwl.cwl1_1.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_2.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_2.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_2.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/cwl#OutputEnumSchema
@@ -27,6 +27,9 @@ public class OutputEnumSchemaImpl extends SaveableImpl implements OutputEnumSche private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -92,7 +95,7 @@ public Object getDoc() { } /** - * Used by {@link org.w3id.cwl.cwl1_1.utils.RootLoader} to construct instances of OutputEnumSchemaImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_2.utils.RootLoader} to construct instances of OutputEnumSchemaImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -216,5 +219,14 @@ public OutputEnumSchemaImpl( this.type = (Enum_name) type; this.label = (java.util.Optional) label; this.doc = (Object) doc; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("name", "symbols", "type", "label", "doc"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_2/OutputFormat.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/OutputFormat.java similarity index 81% rename from src/main/java/org/w3id/cwl/cwl1_2/OutputFormat.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/OutputFormat.java index 327ba843..c35a393a 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/OutputFormat.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/OutputFormat.java @@ -12,14 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#OutputFormat
*/ public interface OutputFormat extends Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#format
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_1/OutputParameter.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/OutputParameter.java similarity index 95% rename from src/main/java/org/w3id/cwl/cwl1_1/OutputParameter.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/OutputParameter.java index 8667563a..c6d47671 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/OutputParameter.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/OutputParameter.java @@ -12,14 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_1.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#OutputParameter
*/ public interface OutputParameter extends Parameter, OutputFormat, Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#Labeled/label
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_1/OutputRecordField.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/OutputRecordField.java similarity index 95% rename from src/main/java/org/w3id/cwl/cwl1_1/OutputRecordField.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/OutputRecordField.java index 5743d8c4..6913c54b 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/OutputRecordField.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/OutputRecordField.java @@ -12,14 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_1.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#OutputRecordField
This interface is implemented by {@link OutputRecordFieldImpl}
*/ public interface OutputRecordField extends CWLRecordField, FieldBase, OutputFormat, Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/salad#RecordField/name
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_1/OutputRecordFieldImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/OutputRecordFieldImpl.java similarity index 92% rename from src/main/java/org/w3id/cwl/cwl1_1/OutputRecordFieldImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/OutputRecordFieldImpl.java index 4083ecb9..6292695c 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/OutputRecordFieldImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/OutputRecordFieldImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_1.utils.LoaderInstances; -import org.w3id.cwl.cwl1_1.utils.LoadingOptions; -import org.w3id.cwl.cwl1_1.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_1.utils.SaveableImpl; -import org.w3id.cwl.cwl1_1.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_2.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_2.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_2.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/cwl#OutputRecordField
@@ -27,6 +27,9 @@ public class OutputRecordFieldImpl extends SaveableImpl implements OutputRecordF private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -169,7 +172,7 @@ public Object getFormat() { } /** - * Used by {@link org.w3id.cwl.cwl1_1.utils.RootLoader} to construct instances of OutputRecordFieldImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_2.utils.RootLoader} to construct instances of OutputRecordFieldImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -330,5 +333,14 @@ public OutputRecordFieldImpl( this.secondaryFiles = (Object) secondaryFiles; this.streamable = (java.util.Optional) streamable; this.format = (Object) format; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("doc", "name", "type", "label", "secondaryFiles", "streamable", "format"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_1/OutputRecordSchema.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/OutputRecordSchema.java similarity index 88% rename from src/main/java/org/w3id/cwl/cwl1_1/OutputRecordSchema.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/OutputRecordSchema.java index d632e511..a2cdc0c9 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/OutputRecordSchema.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/OutputRecordSchema.java @@ -12,14 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_1.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#OutputRecordSchema
This interface is implemented by {@link OutputRecordSchemaImpl}
*/ public interface OutputRecordSchema extends CWLRecordSchema, OutputSchema, Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#IOSchema/name
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/OutputRecordSchemaImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/OutputRecordSchemaImpl.java similarity index 88% rename from src/main/java/org/w3id/cwl/cwl1_2/OutputRecordSchemaImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/OutputRecordSchemaImpl.java index 94a3c789..3b4dcf0e 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/OutputRecordSchemaImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/OutputRecordSchemaImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.LoaderInstances; -import org.w3id.cwl.cwl1_2.utils.LoadingOptions; -import org.w3id.cwl.cwl1_2.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_2.utils.SaveableImpl; -import org.w3id.cwl.cwl1_2.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_2.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_2.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_2.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/cwl#OutputRecordSchema
@@ -27,6 +27,9 @@ public class OutputRecordSchemaImpl extends SaveableImpl implements OutputRecord private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -92,7 +95,7 @@ public Object getDoc() { } /** - * Used by {@link org.w3id.cwl.cwl1_2.utils.RootLoader} to construct instances of OutputRecordSchemaImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_2.utils.RootLoader} to construct instances of OutputRecordSchemaImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -222,5 +225,14 @@ public OutputRecordSchemaImpl( this.label = (java.util.Optional) label; this.doc = (Object) doc; this.name = (java.util.Optional) name; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("fields", "type", "label", "doc", "name"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_1/OutputSchema.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/OutputSchema.java similarity index 83% rename from src/main/java/org/w3id/cwl/cwl1_1/OutputSchema.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/OutputSchema.java index eacdc77a..3115db03 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/OutputSchema.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/OutputSchema.java @@ -12,14 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_1.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#OutputSchema
*/ public interface OutputSchema extends IOSchema, Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#Labeled/label
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_1/Parameter.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/Parameter.java similarity index 94% rename from src/main/java/org/w3id/cwl/cwl1_1/Parameter.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/Parameter.java index d199ea89..a416c3ba 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/Parameter.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/Parameter.java @@ -12,9 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_1.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#Parameter
@@ -22,6 +23,10 @@
*/ public interface Parameter extends FieldBase, Documented, Identified, Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#Labeled/label
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/PickValueMethod.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/PickValueMethod.java similarity index 93% rename from src/main/java/org/w3id/cwl/cwl1_2/PickValueMethod.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/PickValueMethod.java index 163d2657..9cd0bee6 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/PickValueMethod.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/PickValueMethod.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_2.utils.ValidationException; public enum PickValueMethod { FIRST_NON_NULL("first_non_null"), diff --git a/src/main/java/org/w3id/cwl/cwl1_2/PrimitiveType.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/PrimitiveType.java similarity index 93% rename from src/main/java/org/w3id/cwl/cwl1_2/PrimitiveType.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/PrimitiveType.java index 3a2f174a..47f10785 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/PrimitiveType.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/PrimitiveType.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_2.utils.ValidationException; public enum PrimitiveType { NULL("null"), diff --git a/src/main/java/org/w3id/cwl/cwl1_2/Process.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/Process.java similarity index 95% rename from src/main/java/org/w3id/cwl/cwl1_2/Process.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/Process.java index fe7af3ca..f8caeed8 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/Process.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/Process.java @@ -12,9 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#Process
@@ -25,6 +26,10 @@
*/ public interface Process extends Identified, Labeled, Documented, Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#Labeled/label
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/ProcessRequirement.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/ProcessRequirement.java similarity index 82% rename from src/main/java/org/w3id/cwl/cwl1_2/ProcessRequirement.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/ProcessRequirement.java index b49aa64e..5ade099b 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/ProcessRequirement.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/ProcessRequirement.java @@ -12,9 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#ProcessRequirement
@@ -27,4 +28,8 @@
*/ public interface ProcessRequirement extends Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + } diff --git a/src/main/java/org/w3id/cwl/cwl1_1/RecordField.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/RecordField.java similarity index 87% rename from src/main/java/org/w3id/cwl/cwl1_1/RecordField.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/RecordField.java index d0095f62..c476e818 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/RecordField.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/RecordField.java @@ -12,15 +12,20 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_1.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/salad#RecordField
This interface is implemented by {@link RecordFieldImpl}
A field of a record.
*/ public interface RecordField extends Documented, Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/salad#RecordField/name
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/RecordFieldImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/RecordFieldImpl.java similarity index 86% rename from src/main/java/org/w3id/cwl/cwl1_2/RecordFieldImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/RecordFieldImpl.java index 7239d267..3493cd90 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/RecordFieldImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/RecordFieldImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.LoaderInstances; -import org.w3id.cwl.cwl1_2.utils.LoadingOptions; -import org.w3id.cwl.cwl1_2.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_2.utils.SaveableImpl; -import org.w3id.cwl.cwl1_2.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_2.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_2.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_2.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/salad#RecordField
@@ -28,6 +28,9 @@ public class RecordFieldImpl extends SaveableImpl implements RecordField { private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -73,7 +76,7 @@ public Object getType() { } /** - * Used by {@link org.w3id.cwl.cwl1_2.utils.RootLoader} to construct instances of RecordFieldImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_2.utils.RootLoader} to construct instances of RecordFieldImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -162,5 +165,14 @@ public RecordFieldImpl( this.doc = (Object) doc; this.name = (String) name; this.type = (Object) type; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("doc", "name", "type"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_1/RecordSchema.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/RecordSchema.java similarity index 83% rename from src/main/java/org/w3id/cwl/cwl1_1/RecordSchema.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/RecordSchema.java index a45b81f3..527a094a 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/RecordSchema.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/RecordSchema.java @@ -12,14 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_1.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/salad#RecordSchema
This interface is implemented by {@link RecordSchemaImpl}
*/ public interface RecordSchema extends Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/salad#fields
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/RecordSchemaImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/RecordSchemaImpl.java similarity index 82% rename from src/main/java/org/w3id/cwl/cwl1_2/RecordSchemaImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/RecordSchemaImpl.java index 44ebe908..70728cf2 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/RecordSchemaImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/RecordSchemaImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.LoaderInstances; -import org.w3id.cwl.cwl1_2.utils.LoadingOptions; -import org.w3id.cwl.cwl1_2.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_2.utils.SaveableImpl; -import org.w3id.cwl.cwl1_2.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_2.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_2.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_2.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/salad#RecordSchema
@@ -27,6 +27,9 @@ public class RecordSchemaImpl extends SaveableImpl implements RecordSchema { private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -56,7 +59,7 @@ public Record_name getType() { } /** - * Used by {@link org.w3id.cwl.cwl1_2.utils.RootLoader} to construct instances of RecordSchemaImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_2.utils.RootLoader} to construct instances of RecordSchemaImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -118,5 +121,14 @@ public RecordSchemaImpl( } this.fields = (java.util.Optional>) fields; this.type = (Record_name) type; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("fields", "type"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_2/Record_name.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/Record_name.java similarity index 92% rename from src/main/java/org/w3id/cwl/cwl1_2/Record_name.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/Record_name.java index 82fd14c9..a1c07e90 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/Record_name.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/Record_name.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_2.utils.ValidationException; public enum Record_name { RECORD("record"); diff --git a/src/main/java/org/w3id/cwl/cwl1_2/ResourceRequirement.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/ResourceRequirement.java similarity index 96% rename from src/main/java/org/w3id/cwl/cwl1_2/ResourceRequirement.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/ResourceRequirement.java index ea8801d1..f1dda9ef 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/ResourceRequirement.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/ResourceRequirement.java @@ -12,9 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#ResourceRequirement
This interface is implemented by {@link ResourceRequirementImpl}
@@ -46,6 +47,10 @@
*/ public interface ResourceRequirement extends ProcessRequirement, Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#ResourceRequirement/class
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/ResourceRequirementImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/ResourceRequirementImpl.java similarity index 93% rename from src/main/java/org/w3id/cwl/cwl1_2/ResourceRequirementImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/ResourceRequirementImpl.java index f3e072cf..f0f503f5 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/ResourceRequirementImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/ResourceRequirementImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.LoaderInstances; -import org.w3id.cwl.cwl1_2.utils.LoadingOptions; -import org.w3id.cwl.cwl1_2.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_2.utils.SaveableImpl; -import org.w3id.cwl.cwl1_2.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_2.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_2.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_2.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/cwl#ResourceRequirement
@@ -53,6 +53,9 @@ public class ResourceRequirementImpl extends SaveableImpl implements ResourceReq private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -224,7 +227,7 @@ public Object getOutdirMax() { } /** - * Used by {@link org.w3id.cwl.cwl1_2.utils.RootLoader} to construct instances of ResourceRequirementImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_2.utils.RootLoader} to construct instances of ResourceRequirementImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -412,5 +415,14 @@ public ResourceRequirementImpl( this.tmpdirMax = (Object) tmpdirMax; this.outdirMin = (Object) outdirMin; this.outdirMax = (Object) outdirMax; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("class", "coresMin", "coresMax", "ramMin", "ramMax", "tmpdirMin", "tmpdirMax", "outdirMin", "outdirMax"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_2/ResourceRequirement_class.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/ResourceRequirement_class.java similarity index 92% rename from src/main/java/org/w3id/cwl/cwl1_2/ResourceRequirement_class.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/ResourceRequirement_class.java index 9158206c..7aeb43b7 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/ResourceRequirement_class.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/ResourceRequirement_class.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_2.utils.ValidationException; public enum ResourceRequirement_class { RESOURCEREQUIREMENT("ResourceRequirement"); diff --git a/src/main/java/org/w3id/cwl/cwl1_1/ScatterFeatureRequirement.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/ScatterFeatureRequirement.java similarity index 84% rename from src/main/java/org/w3id/cwl/cwl1_1/ScatterFeatureRequirement.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/ScatterFeatureRequirement.java index fa897b27..4068fe07 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/ScatterFeatureRequirement.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/ScatterFeatureRequirement.java @@ -12,9 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_1.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#ScatterFeatureRequirement
This interface is implemented by {@link ScatterFeatureRequirementImpl}
@@ -23,6 +24,10 @@
*/ public interface ScatterFeatureRequirement extends ProcessRequirement, Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#ScatterFeatureRequirement/class
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/ScatterFeatureRequirementImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/ScatterFeatureRequirementImpl.java similarity index 80% rename from src/main/java/org/w3id/cwl/cwl1_2/ScatterFeatureRequirementImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/ScatterFeatureRequirementImpl.java index c144faff..0718a6b2 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/ScatterFeatureRequirementImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/ScatterFeatureRequirementImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.LoaderInstances; -import org.w3id.cwl.cwl1_2.utils.LoadingOptions; -import org.w3id.cwl.cwl1_2.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_2.utils.SaveableImpl; -import org.w3id.cwl.cwl1_2.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_2.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_2.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_2.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/cwl#ScatterFeatureRequirement
@@ -30,6 +30,9 @@ public class ScatterFeatureRequirementImpl extends SaveableImpl implements Scatt private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -47,7 +50,7 @@ public ScatterFeatureRequirement_class getClass_() { } /** - * Used by {@link org.w3id.cwl.cwl1_2.utils.RootLoader} to construct instances of ScatterFeatureRequirementImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_2.utils.RootLoader} to construct instances of ScatterFeatureRequirementImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -91,5 +94,14 @@ public ScatterFeatureRequirementImpl( throw new ValidationException("Trying 'RecordField'", __errors); } this.class_ = (ScatterFeatureRequirement_class) class_; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("class"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_2/ScatterFeatureRequirement_class.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/ScatterFeatureRequirement_class.java similarity index 93% rename from src/main/java/org/w3id/cwl/cwl1_2/ScatterFeatureRequirement_class.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/ScatterFeatureRequirement_class.java index 6e10bf96..713f1fcd 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/ScatterFeatureRequirement_class.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/ScatterFeatureRequirement_class.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_2.utils.ValidationException; public enum ScatterFeatureRequirement_class { SCATTERFEATUREREQUIREMENT("ScatterFeatureRequirement"); diff --git a/src/main/java/org/w3id/cwl/cwl1_2/ScatterMethod.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/ScatterMethod.java similarity index 93% rename from src/main/java/org/w3id/cwl/cwl1_2/ScatterMethod.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/ScatterMethod.java index b6442a04..24c76529 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/ScatterMethod.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/ScatterMethod.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_2.utils.ValidationException; public enum ScatterMethod { DOTPRODUCT("dotproduct"), diff --git a/src/main/java/org/w3id/cwl/cwl1_2/SchemaDefRequirement.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/SchemaDefRequirement.java similarity index 89% rename from src/main/java/org/w3id/cwl/cwl1_2/SchemaDefRequirement.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/SchemaDefRequirement.java index 43868fa1..6473059a 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/SchemaDefRequirement.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/SchemaDefRequirement.java @@ -12,9 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#SchemaDefRequirement
This interface is implemented by {@link SchemaDefRequirementImpl}
@@ -33,6 +34,10 @@
*/ public interface SchemaDefRequirement extends ProcessRequirement, Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#SchemaDefRequirement/class
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/SchemaDefRequirementImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/SchemaDefRequirementImpl.java similarity index 84% rename from src/main/java/org/w3id/cwl/cwl1_2/SchemaDefRequirementImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/SchemaDefRequirementImpl.java index 742e92d8..765d9032 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/SchemaDefRequirementImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/SchemaDefRequirementImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.LoaderInstances; -import org.w3id.cwl.cwl1_2.utils.LoadingOptions; -import org.w3id.cwl.cwl1_2.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_2.utils.SaveableImpl; -import org.w3id.cwl.cwl1_2.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_2.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_2.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_2.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/cwl#SchemaDefRequirement
@@ -40,6 +40,9 @@ public class SchemaDefRequirementImpl extends SaveableImpl implements SchemaDefR private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -69,7 +72,7 @@ public java.util.List getTypes() { } /** - * Used by {@link org.w3id.cwl.cwl1_2.utils.RootLoader} to construct instances of SchemaDefRequirementImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_2.utils.RootLoader} to construct instances of SchemaDefRequirementImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -125,5 +128,14 @@ public SchemaDefRequirementImpl( } this.class_ = (SchemaDefRequirement_class) class_; this.types = (java.util.List) types; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("class", "types"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_2/SchemaDefRequirement_class.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/SchemaDefRequirement_class.java similarity index 92% rename from src/main/java/org/w3id/cwl/cwl1_2/SchemaDefRequirement_class.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/SchemaDefRequirement_class.java index 0b714476..8c657758 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/SchemaDefRequirement_class.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/SchemaDefRequirement_class.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_2.utils.ValidationException; public enum SchemaDefRequirement_class { SCHEMADEFREQUIREMENT("SchemaDefRequirement"); diff --git a/src/main/java/org/w3id/cwl/cwl1_2/SecondaryFileSchema.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/SecondaryFileSchema.java similarity index 95% rename from src/main/java/org/w3id/cwl/cwl1_2/SecondaryFileSchema.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/SecondaryFileSchema.java index c08ed21f..1150e8c1 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/SecondaryFileSchema.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/SecondaryFileSchema.java @@ -12,9 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#SecondaryFileSchema
This interface is implemented by {@link SecondaryFileSchemaImpl}
@@ -34,6 +35,10 @@
*/ public interface SecondaryFileSchema extends Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#SecondaryFileSchema/pattern
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/SecondaryFileSchemaImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/SecondaryFileSchemaImpl.java similarity index 89% rename from src/main/java/org/w3id/cwl/cwl1_2/SecondaryFileSchemaImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/SecondaryFileSchemaImpl.java index da495ee9..a677c1fd 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/SecondaryFileSchemaImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/SecondaryFileSchemaImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.LoaderInstances; -import org.w3id.cwl.cwl1_2.utils.LoadingOptions; -import org.w3id.cwl.cwl1_2.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_2.utils.SaveableImpl; -import org.w3id.cwl.cwl1_2.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_2.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_2.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_2.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/cwl#SecondaryFileSchema
@@ -41,6 +41,9 @@ public class SecondaryFileSchemaImpl extends SaveableImpl implements SecondaryFi private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -124,7 +127,7 @@ public Object getRequired() { } /** - * Used by {@link org.w3id.cwl.cwl1_2.utils.RootLoader} to construct instances of SecondaryFileSchemaImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_2.utils.RootLoader} to construct instances of SecondaryFileSchemaImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -186,5 +189,14 @@ public SecondaryFileSchemaImpl( } this.pattern = (Object) pattern; this.required = (Object) required; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("pattern", "required"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_2/ShellCommandRequirement.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/ShellCommandRequirement.java similarity index 87% rename from src/main/java/org/w3id/cwl/cwl1_2/ShellCommandRequirement.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/ShellCommandRequirement.java index fff3ffbd..f56d6bc8 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/ShellCommandRequirement.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/ShellCommandRequirement.java @@ -12,9 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#ShellCommandRequirement
This interface is implemented by {@link ShellCommandRequirementImpl}
@@ -28,6 +29,10 @@
*/ public interface ShellCommandRequirement extends ProcessRequirement, Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#ShellCommandRequirement/class
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/ShellCommandRequirementImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/ShellCommandRequirementImpl.java similarity index 81% rename from src/main/java/org/w3id/cwl/cwl1_2/ShellCommandRequirementImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/ShellCommandRequirementImpl.java index 0a85660a..65352c3d 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/ShellCommandRequirementImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/ShellCommandRequirementImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.LoaderInstances; -import org.w3id.cwl.cwl1_2.utils.LoadingOptions; -import org.w3id.cwl.cwl1_2.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_2.utils.SaveableImpl; -import org.w3id.cwl.cwl1_2.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_2.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_2.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_2.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/cwl#ShellCommandRequirement
@@ -35,6 +35,9 @@ public class ShellCommandRequirementImpl extends SaveableImpl implements ShellCo private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -52,7 +55,7 @@ public ShellCommandRequirement_class getClass_() { } /** - * Used by {@link org.w3id.cwl.cwl1_2.utils.RootLoader} to construct instances of ShellCommandRequirementImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_2.utils.RootLoader} to construct instances of ShellCommandRequirementImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -96,5 +99,14 @@ public ShellCommandRequirementImpl( throw new ValidationException("Trying 'RecordField'", __errors); } this.class_ = (ShellCommandRequirement_class) class_; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("class"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_2/ShellCommandRequirement_class.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/ShellCommandRequirement_class.java similarity index 93% rename from src/main/java/org/w3id/cwl/cwl1_2/ShellCommandRequirement_class.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/ShellCommandRequirement_class.java index ec6148d8..aa16182b 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/ShellCommandRequirement_class.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/ShellCommandRequirement_class.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_2.utils.ValidationException; public enum ShellCommandRequirement_class { SHELLCOMMANDREQUIREMENT("ShellCommandRequirement"); diff --git a/src/main/java/org/w3id/cwl/cwl1_2/Sink.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/Sink.java similarity index 87% rename from src/main/java/org/w3id/cwl/cwl1_2/Sink.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/Sink.java index 26e1c054..9156ecd9 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/Sink.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/Sink.java @@ -12,14 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#Sink
*/ public interface Sink extends Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#source
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/SoftwarePackage.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/SoftwarePackage.java similarity index 94% rename from src/main/java/org/w3id/cwl/cwl1_2/SoftwarePackage.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/SoftwarePackage.java index 9578da50..c64db064 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/SoftwarePackage.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/SoftwarePackage.java @@ -12,14 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#SoftwarePackage
This interface is implemented by {@link SoftwarePackageImpl}
*/ public interface SoftwarePackage extends Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#SoftwarePackage/package
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/SoftwarePackageImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/SoftwarePackageImpl.java similarity index 89% rename from src/main/java/org/w3id/cwl/cwl1_2/SoftwarePackageImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/SoftwarePackageImpl.java index 431c19ee..9f352107 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/SoftwarePackageImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/SoftwarePackageImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.LoaderInstances; -import org.w3id.cwl.cwl1_2.utils.LoadingOptions; -import org.w3id.cwl.cwl1_2.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_2.utils.SaveableImpl; -import org.w3id.cwl.cwl1_2.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_2.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_2.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_2.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/cwl#SoftwarePackage
@@ -27,6 +27,9 @@ public class SoftwarePackageImpl extends SaveableImpl implements SoftwarePackage private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -114,7 +117,7 @@ public java.util.Optional> getSpecs() { } /** - * Used by {@link org.w3id.cwl.cwl1_2.utils.RootLoader} to construct instances of SoftwarePackageImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_2.utils.RootLoader} to construct instances of SoftwarePackageImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -194,5 +197,14 @@ public SoftwarePackageImpl( this.package_ = (String) package_; this.version = (java.util.Optional>) version; this.specs = (java.util.Optional>) specs; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("package", "version", "specs"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_2/SoftwareRequirement.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/SoftwareRequirement.java similarity index 85% rename from src/main/java/org/w3id/cwl/cwl1_2/SoftwareRequirement.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/SoftwareRequirement.java index baac3388..5840063a 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/SoftwareRequirement.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/SoftwareRequirement.java @@ -12,9 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#SoftwareRequirement
This interface is implemented by {@link SoftwareRequirementImpl}
@@ -23,6 +24,10 @@
*/ public interface SoftwareRequirement extends ProcessRequirement, Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#SoftwareRequirement/class
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_1/SoftwareRequirementImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/SoftwareRequirementImpl.java similarity index 82% rename from src/main/java/org/w3id/cwl/cwl1_1/SoftwareRequirementImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/SoftwareRequirementImpl.java index 3f44c356..0b07c1f9 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/SoftwareRequirementImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/SoftwareRequirementImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_1.utils.LoaderInstances; -import org.w3id.cwl.cwl1_1.utils.LoadingOptions; -import org.w3id.cwl.cwl1_1.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_1.utils.SaveableImpl; -import org.w3id.cwl.cwl1_1.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_2.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_2.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_2.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/cwl#SoftwareRequirement
@@ -30,6 +30,9 @@ public class SoftwareRequirementImpl extends SaveableImpl implements SoftwareReq private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -59,7 +62,7 @@ public java.util.List getPackages() { } /** - * Used by {@link org.w3id.cwl.cwl1_1.utils.RootLoader} to construct instances of SoftwareRequirementImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_2.utils.RootLoader} to construct instances of SoftwareRequirementImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -115,5 +118,14 @@ public SoftwareRequirementImpl( } this.class_ = (SoftwareRequirement_class) class_; this.packages = (java.util.List) packages; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("class", "packages"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_2/SoftwareRequirement_class.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/SoftwareRequirement_class.java similarity index 92% rename from src/main/java/org/w3id/cwl/cwl1_2/SoftwareRequirement_class.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/SoftwareRequirement_class.java index f3c58f85..729bad26 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/SoftwareRequirement_class.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/SoftwareRequirement_class.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_2.utils.ValidationException; public enum SoftwareRequirement_class { SOFTWAREREQUIREMENT("SoftwareRequirement"); diff --git a/src/main/java/org/w3id/cwl/cwl1_1/StepInputExpressionRequirement.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/StepInputExpressionRequirement.java similarity index 84% rename from src/main/java/org/w3id/cwl/cwl1_1/StepInputExpressionRequirement.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/StepInputExpressionRequirement.java index 14da1eb6..9b5f60d0 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/StepInputExpressionRequirement.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/StepInputExpressionRequirement.java @@ -12,9 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_1.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#StepInputExpressionRequirement
This interface is implemented by {@link StepInputExpressionRequirementImpl}
@@ -23,6 +24,10 @@
*/ public interface StepInputExpressionRequirement extends ProcessRequirement, Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#StepInputExpressionRequirement/class
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/StepInputExpressionRequirementImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/StepInputExpressionRequirementImpl.java similarity index 80% rename from src/main/java/org/w3id/cwl/cwl1_2/StepInputExpressionRequirementImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/StepInputExpressionRequirementImpl.java index 05543012..86c3abd2 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/StepInputExpressionRequirementImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/StepInputExpressionRequirementImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.LoaderInstances; -import org.w3id.cwl.cwl1_2.utils.LoadingOptions; -import org.w3id.cwl.cwl1_2.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_2.utils.SaveableImpl; -import org.w3id.cwl.cwl1_2.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_2.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_2.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_2.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/cwl#StepInputExpressionRequirement
@@ -30,6 +30,9 @@ public class StepInputExpressionRequirementImpl extends SaveableImpl implements private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -47,7 +50,7 @@ public StepInputExpressionRequirement_class getClass_() { } /** - * Used by {@link org.w3id.cwl.cwl1_2.utils.RootLoader} to construct instances of StepInputExpressionRequirementImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_2.utils.RootLoader} to construct instances of StepInputExpressionRequirementImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -91,5 +94,14 @@ public StepInputExpressionRequirementImpl( throw new ValidationException("Trying 'RecordField'", __errors); } this.class_ = (StepInputExpressionRequirement_class) class_; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("class"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_2/StepInputExpressionRequirement_class.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/StepInputExpressionRequirement_class.java similarity index 93% rename from src/main/java/org/w3id/cwl/cwl1_2/StepInputExpressionRequirement_class.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/StepInputExpressionRequirement_class.java index 555e616b..6a806b21 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/StepInputExpressionRequirement_class.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/StepInputExpressionRequirement_class.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_2.utils.ValidationException; public enum StepInputExpressionRequirement_class { STEPINPUTEXPRESSIONREQUIREMENT("StepInputExpressionRequirement"); diff --git a/src/main/java/org/w3id/cwl/cwl1_1/SubworkflowFeatureRequirement.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/SubworkflowFeatureRequirement.java similarity index 84% rename from src/main/java/org/w3id/cwl/cwl1_1/SubworkflowFeatureRequirement.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/SubworkflowFeatureRequirement.java index fb034edf..03156cb9 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/SubworkflowFeatureRequirement.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/SubworkflowFeatureRequirement.java @@ -12,9 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_1.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#SubworkflowFeatureRequirement
This interface is implemented by {@link SubworkflowFeatureRequirementImpl}
@@ -23,6 +24,10 @@
*/ public interface SubworkflowFeatureRequirement extends ProcessRequirement, Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#SubworkflowFeatureRequirement/class
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/SubworkflowFeatureRequirementImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/SubworkflowFeatureRequirementImpl.java similarity index 80% rename from src/main/java/org/w3id/cwl/cwl1_2/SubworkflowFeatureRequirementImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/SubworkflowFeatureRequirementImpl.java index b87028b7..d347673f 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/SubworkflowFeatureRequirementImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/SubworkflowFeatureRequirementImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.LoaderInstances; -import org.w3id.cwl.cwl1_2.utils.LoadingOptions; -import org.w3id.cwl.cwl1_2.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_2.utils.SaveableImpl; -import org.w3id.cwl.cwl1_2.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_2.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_2.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_2.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/cwl#SubworkflowFeatureRequirement
@@ -30,6 +30,9 @@ public class SubworkflowFeatureRequirementImpl extends SaveableImpl implements S private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -47,7 +50,7 @@ public SubworkflowFeatureRequirement_class getClass_() { } /** - * Used by {@link org.w3id.cwl.cwl1_2.utils.RootLoader} to construct instances of SubworkflowFeatureRequirementImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_2.utils.RootLoader} to construct instances of SubworkflowFeatureRequirementImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -91,5 +94,14 @@ public SubworkflowFeatureRequirementImpl( throw new ValidationException("Trying 'RecordField'", __errors); } this.class_ = (SubworkflowFeatureRequirement_class) class_; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("class"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_1/SubworkflowFeatureRequirement_class.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/SubworkflowFeatureRequirement_class.java similarity index 93% rename from src/main/java/org/w3id/cwl/cwl1_1/SubworkflowFeatureRequirement_class.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/SubworkflowFeatureRequirement_class.java index 53793c5c..b035ef81 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/SubworkflowFeatureRequirement_class.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/SubworkflowFeatureRequirement_class.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_1.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_2.utils.ValidationException; public enum SubworkflowFeatureRequirement_class { SUBWORKFLOWFEATUREREQUIREMENT("SubworkflowFeatureRequirement"); diff --git a/src/main/java/org/w3id/cwl/cwl1_2/ToolTimeLimit.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/ToolTimeLimit.java similarity index 88% rename from src/main/java/org/w3id/cwl/cwl1_2/ToolTimeLimit.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/ToolTimeLimit.java index b47df0b4..8d3d2731 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/ToolTimeLimit.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/ToolTimeLimit.java @@ -12,9 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#ToolTimeLimit
This interface is implemented by {@link ToolTimeLimitImpl}
@@ -28,6 +29,10 @@
*/ public interface ToolTimeLimit extends ProcessRequirement, Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#ToolTimeLimit/class
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/ToolTimeLimitImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/ToolTimeLimitImpl.java similarity index 83% rename from src/main/java/org/w3id/cwl/cwl1_2/ToolTimeLimitImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/ToolTimeLimitImpl.java index b2ea528f..16bab350 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/ToolTimeLimitImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/ToolTimeLimitImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.LoaderInstances; -import org.w3id.cwl.cwl1_2.utils.LoadingOptions; -import org.w3id.cwl.cwl1_2.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_2.utils.SaveableImpl; -import org.w3id.cwl.cwl1_2.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_2.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_2.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_2.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/cwl#ToolTimeLimit
@@ -35,6 +35,9 @@ public class ToolTimeLimitImpl extends SaveableImpl implements ToolTimeLimit { private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -66,7 +69,7 @@ public Object getTimelimit() { } /** - * Used by {@link org.w3id.cwl.cwl1_2.utils.RootLoader} to construct instances of ToolTimeLimitImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_2.utils.RootLoader} to construct instances of ToolTimeLimitImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -122,5 +125,14 @@ public ToolTimeLimitImpl( } this.class_ = (ToolTimeLimit_class) class_; this.timelimit = (Object) timelimit; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("class", "timelimit"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_2/ToolTimeLimit_class.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/ToolTimeLimit_class.java similarity index 92% rename from src/main/java/org/w3id/cwl/cwl1_2/ToolTimeLimit_class.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/ToolTimeLimit_class.java index 987f0659..d607b272 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/ToolTimeLimit_class.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/ToolTimeLimit_class.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_2.utils.ValidationException; public enum ToolTimeLimit_class { TOOLTIMELIMIT("ToolTimeLimit"); diff --git a/src/main/java/org/w3id/cwl/cwl1_2/UnionSchema.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/UnionSchema.java similarity index 83% rename from src/main/java/org/w3id/cwl/cwl1_2/UnionSchema.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/UnionSchema.java index 42011267..29d613e9 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/UnionSchema.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/UnionSchema.java @@ -12,14 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/salad#UnionSchema
This interface is implemented by {@link UnionSchemaImpl}
*/ public interface UnionSchema extends Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/salad#names
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_1/UnionSchemaImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/UnionSchemaImpl.java similarity index 82% rename from src/main/java/org/w3id/cwl/cwl1_1/UnionSchemaImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/UnionSchemaImpl.java index c7fd20db..6d312d65 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/UnionSchemaImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/UnionSchemaImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_1.utils.LoaderInstances; -import org.w3id.cwl.cwl1_1.utils.LoadingOptions; -import org.w3id.cwl.cwl1_1.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_1.utils.SaveableImpl; -import org.w3id.cwl.cwl1_1.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_2.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_2.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_2.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/salad#UnionSchema
@@ -27,6 +27,9 @@ public class UnionSchemaImpl extends SaveableImpl implements UnionSchema { private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -56,7 +59,7 @@ public Union_name getType() { } /** - * Used by {@link org.w3id.cwl.cwl1_1.utils.RootLoader} to construct instances of UnionSchemaImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_2.utils.RootLoader} to construct instances of UnionSchemaImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -112,5 +115,14 @@ public UnionSchemaImpl( } this.names = (Object) names; this.type = (Union_name) type; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("names", "type"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_2/Union_name.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/Union_name.java similarity index 92% rename from src/main/java/org/w3id/cwl/cwl1_2/Union_name.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/Union_name.java index e64be468..ae0e6348 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/Union_name.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/Union_name.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_2.utils.ValidationException; public enum Union_name { UNION("union"); diff --git a/src/main/java/org/w3id/cwl/cwl1_2/WorkReuse.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/WorkReuse.java similarity index 87% rename from src/main/java/org/w3id/cwl/cwl1_2/WorkReuse.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/WorkReuse.java index 3f70b297..4e459bd4 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/WorkReuse.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/WorkReuse.java @@ -12,9 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#WorkReuse
This interface is implemented by {@link WorkReuseImpl}
@@ -30,6 +31,10 @@ For implementations that support reusing output from past work (on
*/ public interface WorkReuse extends ProcessRequirement, Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#WorkReuse/class
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/WorkReuseImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/WorkReuseImpl.java similarity index 83% rename from src/main/java/org/w3id/cwl/cwl1_2/WorkReuseImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/WorkReuseImpl.java index cee719e0..7a909268 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/WorkReuseImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/WorkReuseImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.LoaderInstances; -import org.w3id.cwl.cwl1_2.utils.LoadingOptions; -import org.w3id.cwl.cwl1_2.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_2.utils.SaveableImpl; -import org.w3id.cwl.cwl1_2.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_2.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_2.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_2.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/cwl#WorkReuse
@@ -37,6 +37,9 @@ public class WorkReuseImpl extends SaveableImpl implements WorkReuse { private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -65,7 +68,7 @@ public Object getEnableReuse() { } /** - * Used by {@link org.w3id.cwl.cwl1_2.utils.RootLoader} to construct instances of WorkReuseImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_2.utils.RootLoader} to construct instances of WorkReuseImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -121,5 +124,14 @@ public WorkReuseImpl( } this.class_ = (WorkReuse_class) class_; this.enableReuse = (Object) enableReuse; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("class", "enableReuse"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_2/WorkReuse_class.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/WorkReuse_class.java similarity index 92% rename from src/main/java/org/w3id/cwl/cwl1_2/WorkReuse_class.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/WorkReuse_class.java index 2da8c3b2..806a8cdf 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/WorkReuse_class.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/WorkReuse_class.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_2.utils.ValidationException; public enum WorkReuse_class { WORKREUSE("WorkReuse"); diff --git a/src/main/java/org/w3id/cwl/cwl1_2/Workflow.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/Workflow.java similarity index 97% rename from src/main/java/org/w3id/cwl/cwl1_2/Workflow.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/Workflow.java index 86979c04..1c554b6e 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/Workflow.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/Workflow.java @@ -12,9 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#Workflow
This interface is implemented by {@link WorkflowImpl}
@@ -72,6 +73,10 @@ workflow output parameter (the "sink"). Workflow execution cannot
*/ public interface Workflow extends Process, Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#Process/id
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/WorkflowImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/WorkflowImpl.java similarity index 95% rename from src/main/java/org/w3id/cwl/cwl1_2/WorkflowImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/WorkflowImpl.java index bb9fc43a..1630c219 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/WorkflowImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/WorkflowImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.LoaderInstances; -import org.w3id.cwl.cwl1_2.utils.LoadingOptions; -import org.w3id.cwl.cwl1_2.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_2.utils.SaveableImpl; -import org.w3id.cwl.cwl1_2.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_2.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_2.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_2.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/cwl#Workflow
@@ -79,6 +79,9 @@ public class WorkflowImpl extends SaveableImpl implements Workflow { private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -262,7 +265,7 @@ public java.util.List getSteps() { } /** - * Used by {@link org.w3id.cwl.cwl1_2.utils.RootLoader} to construct instances of WorkflowImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_2.utils.RootLoader} to construct instances of WorkflowImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -482,5 +485,14 @@ public WorkflowImpl( this.intent = (java.util.Optional>) intent; this.class_ = (Workflow_class) class_; this.steps = (java.util.List) steps; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("id", "label", "doc", "inputs", "outputs", "requirements", "hints", "cwlVersion", "intent", "class", "steps"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_2/WorkflowInputParameter.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/WorkflowInputParameter.java similarity index 96% rename from src/main/java/org/w3id/cwl/cwl1_2/WorkflowInputParameter.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/WorkflowInputParameter.java index 2683dcba..ac48d9e1 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/WorkflowInputParameter.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/WorkflowInputParameter.java @@ -12,14 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#WorkflowInputParameter
This interface is implemented by {@link WorkflowInputParameterImpl}
*/ public interface WorkflowInputParameter extends InputParameter, Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#Identified/id
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/WorkflowInputParameterImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/WorkflowInputParameterImpl.java similarity index 94% rename from src/main/java/org/w3id/cwl/cwl1_2/WorkflowInputParameterImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/WorkflowInputParameterImpl.java index e60192b7..4adaf13e 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/WorkflowInputParameterImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/WorkflowInputParameterImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.LoaderInstances; -import org.w3id.cwl.cwl1_2.utils.LoadingOptions; -import org.w3id.cwl.cwl1_2.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_2.utils.SaveableImpl; -import org.w3id.cwl.cwl1_2.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_2.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_2.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_2.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/cwl#WorkflowInputParameter
@@ -27,6 +27,9 @@ public class WorkflowInputParameterImpl extends SaveableImpl implements Workflow private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -242,7 +245,7 @@ public java.util.Optional getInputBinding() { } /** - * Used by {@link org.w3id.cwl.cwl1_2.utils.RootLoader} to construct instances of WorkflowInputParameterImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_2.utils.RootLoader} to construct instances of WorkflowInputParameterImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -480,5 +483,14 @@ public WorkflowInputParameterImpl( this.default_ = (java.util.Optional) default_; this.type = (Object) type; this.inputBinding = (java.util.Optional) inputBinding; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("label", "secondaryFiles", "streamable", "doc", "id", "format", "loadContents", "loadListing", "default", "type", "inputBinding"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_2/WorkflowOutputParameter.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/WorkflowOutputParameter.java similarity index 96% rename from src/main/java/org/w3id/cwl/cwl1_2/WorkflowOutputParameter.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/WorkflowOutputParameter.java index 000cff33..ab45069c 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/WorkflowOutputParameter.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/WorkflowOutputParameter.java @@ -12,9 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#WorkflowOutputParameter
This interface is implemented by {@link WorkflowOutputParameterImpl}
@@ -28,6 +29,10 @@
*/ public interface WorkflowOutputParameter extends OutputParameter, Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#Identified/id
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/WorkflowOutputParameterImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/WorkflowOutputParameterImpl.java similarity index 94% rename from src/main/java/org/w3id/cwl/cwl1_2/WorkflowOutputParameterImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/WorkflowOutputParameterImpl.java index 80f9eb03..1b045a40 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/WorkflowOutputParameterImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/WorkflowOutputParameterImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.LoaderInstances; -import org.w3id.cwl.cwl1_2.utils.LoadingOptions; -import org.w3id.cwl.cwl1_2.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_2.utils.SaveableImpl; -import org.w3id.cwl.cwl1_2.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_2.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_2.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_2.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/cwl#WorkflowOutputParameter
@@ -35,6 +35,9 @@ public class WorkflowOutputParameterImpl extends SaveableImpl implements Workflo private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -220,7 +223,7 @@ public Object getType() { } /** - * Used by {@link org.w3id.cwl.cwl1_2.utils.RootLoader} to construct instances of WorkflowOutputParameterImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_2.utils.RootLoader} to construct instances of WorkflowOutputParameterImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -440,5 +443,14 @@ public WorkflowOutputParameterImpl( this.linkMerge = (java.util.Optional) linkMerge; this.pickValue = (java.util.Optional) pickValue; this.type = (Object) type; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("label", "secondaryFiles", "streamable", "doc", "id", "format", "outputSource", "linkMerge", "pickValue", "type"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_2/WorkflowStep.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/WorkflowStep.java similarity index 97% rename from src/main/java/org/w3id/cwl/cwl1_2/WorkflowStep.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/WorkflowStep.java index eef67a6b..16cf0891 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/WorkflowStep.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/WorkflowStep.java @@ -12,9 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#WorkflowStep
This interface is implemented by {@link WorkflowStepImpl}
@@ -100,6 +101,10 @@ a subworkflow (recursive workflows are not allowed).
*/ public interface WorkflowStep extends Identified, Labeled, Documented, Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#Identified/id
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/WorkflowStepImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/WorkflowStepImpl.java similarity index 94% rename from src/main/java/org/w3id/cwl/cwl1_2/WorkflowStepImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/WorkflowStepImpl.java index a6bfc040..67d97be7 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/WorkflowStepImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/WorkflowStepImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.LoaderInstances; -import org.w3id.cwl.cwl1_2.utils.LoadingOptions; -import org.w3id.cwl.cwl1_2.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_2.utils.SaveableImpl; -import org.w3id.cwl.cwl1_2.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_2.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_2.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_2.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/cwl#WorkflowStep
@@ -107,6 +107,9 @@ public class WorkflowStepImpl extends SaveableImpl implements WorkflowStep { private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -266,7 +269,7 @@ public java.util.Optional getScatterMethod() { } /** - * Used by {@link org.w3id.cwl.cwl1_2.utils.RootLoader} to construct instances of WorkflowStepImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_2.utils.RootLoader} to construct instances of WorkflowStepImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -492,5 +495,14 @@ public WorkflowStepImpl( this.when = (java.util.Optional) when; this.scatter = (Object) scatter; this.scatterMethod = (java.util.Optional) scatterMethod; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("id", "label", "doc", "in", "out", "requirements", "hints", "run", "when", "scatter", "scatterMethod"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_2/WorkflowStepInput.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/WorkflowStepInput.java similarity index 97% rename from src/main/java/org/w3id/cwl/cwl1_2/WorkflowStepInput.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/WorkflowStepInput.java index ee182895..57403473 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/WorkflowStepInput.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/WorkflowStepInput.java @@ -12,9 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#WorkflowStepInput
This interface is implemented by {@link WorkflowStepInputImpl}
@@ -129,6 +130,10 @@ sources are conditional, so null sources (from skipped steps)
*/ public interface WorkflowStepInput extends Identified, Sink, LoadContents, Labeled, Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#Identified/id
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/WorkflowStepInputImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/WorkflowStepInputImpl.java similarity index 94% rename from src/main/java/org/w3id/cwl/cwl1_2/WorkflowStepInputImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/WorkflowStepInputImpl.java index c09d49a5..58745d72 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/WorkflowStepInputImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/WorkflowStepInputImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.LoaderInstances; -import org.w3id.cwl.cwl1_2.utils.LoadingOptions; -import org.w3id.cwl.cwl1_2.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_2.utils.SaveableImpl; -import org.w3id.cwl.cwl1_2.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_2.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_2.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_2.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/cwl#WorkflowStepInput
@@ -136,6 +136,9 @@ public class WorkflowStepInputImpl extends SaveableImpl implements WorkflowStepI private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -297,7 +300,7 @@ public Object getValueFrom() { } /** - * Used by {@link org.w3id.cwl.cwl1_2.utils.RootLoader} to construct instances of WorkflowStepInputImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_2.utils.RootLoader} to construct instances of WorkflowStepInputImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -505,5 +508,14 @@ public WorkflowStepInputImpl( this.label = (java.util.Optional) label; this.default_ = (java.util.Optional) default_; this.valueFrom = (Object) valueFrom; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("id", "source", "linkMerge", "pickValue", "loadContents", "loadListing", "label", "default", "valueFrom"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_2/WorkflowStepOutput.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/WorkflowStepOutput.java similarity index 86% rename from src/main/java/org/w3id/cwl/cwl1_2/WorkflowStepOutput.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/WorkflowStepOutput.java index 71e37040..4920b23e 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/WorkflowStepOutput.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/WorkflowStepOutput.java @@ -12,9 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.Saveable; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.Saveable; /** * Auto-generated interface for https://w3id.org/cwl/cwl#WorkflowStepOutput
This interface is implemented by {@link WorkflowStepOutputImpl}
@@ -29,6 +30,10 @@ parameter. The workflow parameter (given in the `id` field) be may be used
*/ public interface WorkflowStepOutput extends Identified, Saveable { + + java.util.Map getExtensionFields(); + LoadingOptions getLoadingOptions(); + /** * Getter for property https://w3id.org/cwl/cwl#Identified/id
*
diff --git a/src/main/java/org/w3id/cwl/cwl1_1/WorkflowStepOutputImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/WorkflowStepOutputImpl.java similarity index 83% rename from src/main/java/org/w3id/cwl/cwl1_1/WorkflowStepOutputImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/WorkflowStepOutputImpl.java index a3b064fd..b81cf4b9 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/WorkflowStepOutputImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/WorkflowStepOutputImpl.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_1.utils.LoaderInstances; -import org.w3id.cwl.cwl1_1.utils.LoadingOptions; -import org.w3id.cwl.cwl1_1.utils.LoadingOptionsBuilder; -import org.w3id.cwl.cwl1_1.utils.SaveableImpl; -import org.w3id.cwl.cwl1_1.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_2.utils.LoaderInstances; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptions; +import org.commonwl.cwlsdk.cwl1_2.utils.LoadingOptionsBuilder; +import org.commonwl.cwlsdk.cwl1_2.utils.SaveableImpl; +import org.commonwl.cwlsdk.cwl1_2.utils.ValidationException; /** * Auto-generated class implementation for https://w3id.org/cwl/cwl#WorkflowStepOutput
@@ -36,6 +36,9 @@ public class WorkflowStepOutputImpl extends SaveableImpl implements WorkflowStep private LoadingOptions loadingOptions_ = new LoadingOptionsBuilder().build(); private java.util.Map extensionFields_ = new java.util.HashMap(); + public LoadingOptions getLoadingOptions() { + return this.loadingOptions_; + } public java.util.Map getExtensionFields() { return this.extensionFields_; } @@ -53,7 +56,7 @@ public java.util.Optional getId() { } /** - * Used by {@link org.w3id.cwl.cwl1_1.utils.RootLoader} to construct instances of WorkflowStepOutputImpl. + * Used by {@link org.commonwl.cwlsdk.cwl1_2.utils.RootLoader} to construct instances of WorkflowStepOutputImpl. * * @param __doc_ Document fragment to load this record object from (presumably a {@link java.util.Map}). @@ -117,5 +120,14 @@ public WorkflowStepOutputImpl( throw new ValidationException("Trying 'RecordField'", __errors); } this.id = (java.util.Optional) id; + for (String field:__doc.keySet()) { + if (!attrs.contains(field)) { + if (field.contains(":")) { + String expanded_field = __loadingOptions.expandUrl(field, "", false, false, null); + extensionFields_.put(expanded_field, __doc.get(field)); + } + } + } } + private java.util.List attrs = java.util.Arrays.asList("id"); } diff --git a/src/main/java/org/w3id/cwl/cwl1_2/Workflow_class.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/Workflow_class.java similarity index 92% rename from src/main/java/org/w3id/cwl/cwl1_2/Workflow_class.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/Workflow_class.java index 444d3da8..41c06b69 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/Workflow_class.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/Workflow_class.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_2.utils.ValidationException; public enum Workflow_class { WORKFLOW("Workflow"); diff --git a/src/main/java/org/w3id/cwl/cwl1_2/package.html b/src/main/java/org/commonwl/cwlsdk/cwl1_2/package.html similarity index 100% rename from src/main/java/org/w3id/cwl/cwl1_2/package.html rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/package.html diff --git a/src/main/java/org/w3id/cwl/cwl1_1/stderr.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/stderr.java similarity index 91% rename from src/main/java/org/w3id/cwl/cwl1_1/stderr.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/stderr.java index 68e05ce9..c46c73ab 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/stderr.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/stderr.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_1.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_2.utils.ValidationException; public enum stderr { STDERR("stderr"); diff --git a/src/main/java/org/w3id/cwl/cwl1_1/stdin.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/stdin.java similarity index 91% rename from src/main/java/org/w3id/cwl/cwl1_1/stdin.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/stdin.java index c2485941..7d3bf755 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/stdin.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/stdin.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_1; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_1.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_2.utils.ValidationException; public enum stdin { STDIN("stdin"); diff --git a/src/main/java/org/w3id/cwl/cwl1_2/stdout.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/stdout.java similarity index 91% rename from src/main/java/org/w3id/cwl/cwl1_2/stdout.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/stdout.java index cd7e6d00..a5126184 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/stdout.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/stdout.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.w3id.cwl.cwl1_2; +package org.commonwl.cwlsdk.cwl1_2; -import org.w3id.cwl.cwl1_2.utils.ValidationException; +import org.commonwl.cwlsdk.cwl1_2.utils.ValidationException; public enum stdout { STDOUT("stdout"); diff --git a/src/main/java/org/w3id/cwl/cwl1_2/utils/AnyLoader.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/utils/AnyLoader.java similarity index 88% rename from src/main/java/org/w3id/cwl/cwl1_2/utils/AnyLoader.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/utils/AnyLoader.java index 78b7c3e9..60b61a4e 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/utils/AnyLoader.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/utils/AnyLoader.java @@ -1,4 +1,4 @@ -package org.w3id.cwl.cwl1_2.utils; +package org.commonwl.cwlsdk.cwl1_2.utils; public class AnyLoader implements Loader { diff --git a/src/main/java/org/w3id/cwl/cwl1_2/utils/ArrayLoader.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/utils/ArrayLoader.java similarity index 96% rename from src/main/java/org/w3id/cwl/cwl1_2/utils/ArrayLoader.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/utils/ArrayLoader.java index 62637fdb..9b06396a 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/utils/ArrayLoader.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/utils/ArrayLoader.java @@ -1,4 +1,4 @@ -package org.w3id.cwl.cwl1_2.utils; +package org.commonwl.cwlsdk.cwl1_2.utils; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/org/w3id/cwl/cwl1_2/utils/ConstantMaps.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/utils/ConstantMaps.java similarity index 99% rename from src/main/java/org/w3id/cwl/cwl1_2/utils/ConstantMaps.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/utils/ConstantMaps.java index a9176805..bb2f3618 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/utils/ConstantMaps.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/utils/ConstantMaps.java @@ -1,4 +1,4 @@ -package org.w3id.cwl.cwl1_2.utils; +package org.commonwl.cwlsdk.cwl1_2.utils; import java.util.HashMap; diff --git a/src/main/java/org/w3id/cwl/cwl1_1/utils/DefaultFetcher.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/utils/DefaultFetcher.java similarity index 97% rename from src/main/java/org/w3id/cwl/cwl1_1/utils/DefaultFetcher.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/utils/DefaultFetcher.java index 53329651..46e4ed83 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/utils/DefaultFetcher.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/utils/DefaultFetcher.java @@ -1,4 +1,4 @@ -package org.w3id.cwl.cwl1_1.utils; +package org.commonwl.cwlsdk.cwl1_2.utils; import java.io.IOException; import java.net.URI; diff --git a/src/main/java/org/w3id/cwl/cwl1_2/utils/EnumLoader.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/utils/EnumLoader.java similarity index 95% rename from src/main/java/org/w3id/cwl/cwl1_2/utils/EnumLoader.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/utils/EnumLoader.java index 90e11ec4..d93d67fe 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/utils/EnumLoader.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/utils/EnumLoader.java @@ -1,4 +1,4 @@ -package org.w3id.cwl.cwl1_2.utils; +package org.commonwl.cwlsdk.cwl1_2.utils; import java.lang.reflect.Method; import java.lang.ReflectiveOperationException; diff --git a/src/main/java/org/w3id/cwl/cwl1_1/utils/ExpressionLoader.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/utils/ExpressionLoader.java similarity index 90% rename from src/main/java/org/w3id/cwl/cwl1_1/utils/ExpressionLoader.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/utils/ExpressionLoader.java index 0716c521..10cd2cdf 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/utils/ExpressionLoader.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/utils/ExpressionLoader.java @@ -1,4 +1,4 @@ -package org.w3id.cwl.cwl1_1.utils; +package org.commonwl.cwlsdk.cwl1_2.utils; public class ExpressionLoader implements Loader { diff --git a/src/main/java/org/w3id/cwl/cwl1_2/utils/Fetcher.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/utils/Fetcher.java similarity index 79% rename from src/main/java/org/w3id/cwl/cwl1_2/utils/Fetcher.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/utils/Fetcher.java index 3a2d54f1..7b6ae32b 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/utils/Fetcher.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/utils/Fetcher.java @@ -1,4 +1,4 @@ -package org.w3id.cwl.cwl1_2.utils; +package org.commonwl.cwlsdk.cwl1_2.utils; public interface Fetcher { diff --git a/src/main/java/org/w3id/cwl/cwl1_2/utils/IdMapLoader.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/utils/IdMapLoader.java similarity index 97% rename from src/main/java/org/w3id/cwl/cwl1_2/utils/IdMapLoader.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/utils/IdMapLoader.java index de4b00e2..d561cf0b 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/utils/IdMapLoader.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/utils/IdMapLoader.java @@ -1,4 +1,4 @@ -package org.w3id.cwl.cwl1_2.utils; +package org.commonwl.cwlsdk.cwl1_2.utils; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/main/java/org/w3id/cwl/cwl1_1/utils/Loader.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/utils/Loader.java similarity index 99% rename from src/main/java/org/w3id/cwl/cwl1_1/utils/Loader.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/utils/Loader.java index 777fc24c..01f45d30 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/utils/Loader.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/utils/Loader.java @@ -1,4 +1,4 @@ -package org.w3id.cwl.cwl1_1.utils; +package org.commonwl.cwlsdk.cwl1_2.utils; import java.util.HashMap; import java.util.List; diff --git a/src/main/java/org/w3id/cwl/cwl1_2/utils/LoaderInstances.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/utils/LoaderInstances.java similarity index 75% rename from src/main/java/org/w3id/cwl/cwl1_2/utils/LoaderInstances.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/utils/LoaderInstances.java index b66719bb..0ac0025e 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/utils/LoaderInstances.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/utils/LoaderInstances.java @@ -1,7 +1,7 @@ -package org.w3id.cwl.cwl1_2.utils; +package org.commonwl.cwlsdk.cwl1_2.utils; import java.util.List; -import org.w3id.cwl.cwl1_2.*; +import org.commonwl.cwlsdk.cwl1_2.*; public class LoaderInstances { public static Loader StringInstance = new PrimitiveLoader(String.class); @@ -11,109 +11,109 @@ public class LoaderInstances { public static Loader BooleanInstance = new PrimitiveLoader(Boolean.class); public static Loader NullInstance = new NullLoader(); public static Loader AnyInstance = new AnyLoader(); - public static Loader Documented = new RecordLoader(org.w3id.cwl.cwl1_2.Documented.class, null, null); + public static Loader Documented = new RecordLoader(org.commonwl.cwlsdk.cwl1_2.Documented.class, null, null); public static Loader PrimitiveType = new EnumLoader(PrimitiveType.class); public static Loader Any = new EnumLoader(Any.class); - public static Loader RecordField = new RecordLoader(org.w3id.cwl.cwl1_2.RecordFieldImpl.class, null, null); - public static Loader RecordSchema = new RecordLoader(org.w3id.cwl.cwl1_2.RecordSchemaImpl.class, null, null); - public static Loader EnumSchema = new RecordLoader(org.w3id.cwl.cwl1_2.EnumSchemaImpl.class, null, null); - public static Loader ArraySchema = new RecordLoader(org.w3id.cwl.cwl1_2.ArraySchemaImpl.class, null, null); - public static Loader MapSchema = new RecordLoader(org.w3id.cwl.cwl1_2.MapSchemaImpl.class, null, null); - public static Loader UnionSchema = new RecordLoader(org.w3id.cwl.cwl1_2.UnionSchemaImpl.class, null, null); + public static Loader RecordField = new RecordLoader(org.commonwl.cwlsdk.cwl1_2.RecordFieldImpl.class, null, null); + public static Loader RecordSchema = new RecordLoader(org.commonwl.cwlsdk.cwl1_2.RecordSchemaImpl.class, null, null); + public static Loader EnumSchema = new RecordLoader(org.commonwl.cwlsdk.cwl1_2.EnumSchemaImpl.class, null, null); + public static Loader ArraySchema = new RecordLoader(org.commonwl.cwlsdk.cwl1_2.ArraySchemaImpl.class, null, null); + public static Loader MapSchema = new RecordLoader(org.commonwl.cwlsdk.cwl1_2.MapSchemaImpl.class, null, null); + public static Loader UnionSchema = new RecordLoader(org.commonwl.cwlsdk.cwl1_2.UnionSchemaImpl.class, null, null); public static Loader CWLType = new EnumLoader(CWLType.class); - public static Loader CWLArraySchema = new RecordLoader(org.w3id.cwl.cwl1_2.CWLArraySchemaImpl.class, null, null); - public static Loader CWLRecordField = new RecordLoader(org.w3id.cwl.cwl1_2.CWLRecordFieldImpl.class, null, null); - public static Loader CWLRecordSchema = new RecordLoader(org.w3id.cwl.cwl1_2.CWLRecordSchemaImpl.class, null, null); - public static Loader File = new RecordLoader(org.w3id.cwl.cwl1_2.FileImpl.class, null, null); - public static Loader Directory = new RecordLoader(org.w3id.cwl.cwl1_2.DirectoryImpl.class, null, null); + public static Loader CWLArraySchema = new RecordLoader(org.commonwl.cwlsdk.cwl1_2.CWLArraySchemaImpl.class, null, null); + public static Loader CWLRecordField = new RecordLoader(org.commonwl.cwlsdk.cwl1_2.CWLRecordFieldImpl.class, null, null); + public static Loader CWLRecordSchema = new RecordLoader(org.commonwl.cwlsdk.cwl1_2.CWLRecordSchemaImpl.class, null, null); + public static Loader File = new RecordLoader(org.commonwl.cwlsdk.cwl1_2.FileImpl.class, null, null); + public static Loader Directory = new RecordLoader(org.commonwl.cwlsdk.cwl1_2.DirectoryImpl.class, null, null); public static Loader CWLObjectType = new UnionLoader(new Loader[] {}); public static Loader> optional_CWLObjectType = new OptionalLoader(CWLObjectType); public static Loader>> array_of_optional_CWLObjectType = new ArrayLoader(optional_CWLObjectType); public static Loader>> map_of_optional_CWLObjectType = new MapLoader(optional_CWLObjectType, null, null); - public static Loader InlineJavascriptRequirement = new RecordLoader(org.w3id.cwl.cwl1_2.InlineJavascriptRequirementImpl.class, null, null); - public static Loader SchemaDefRequirement = new RecordLoader(org.w3id.cwl.cwl1_2.SchemaDefRequirementImpl.class, null, null); - public static Loader LoadListingRequirement = new RecordLoader(org.w3id.cwl.cwl1_2.LoadListingRequirementImpl.class, null, null); - public static Loader DockerRequirement = new RecordLoader(org.w3id.cwl.cwl1_2.DockerRequirementImpl.class, null, null); - public static Loader SoftwareRequirement = new RecordLoader(org.w3id.cwl.cwl1_2.SoftwareRequirementImpl.class, null, null); - public static Loader InitialWorkDirRequirement = new RecordLoader(org.w3id.cwl.cwl1_2.InitialWorkDirRequirementImpl.class, null, null); - public static Loader EnvVarRequirement = new RecordLoader(org.w3id.cwl.cwl1_2.EnvVarRequirementImpl.class, null, null); - public static Loader ShellCommandRequirement = new RecordLoader(org.w3id.cwl.cwl1_2.ShellCommandRequirementImpl.class, null, null); - public static Loader ResourceRequirement = new RecordLoader(org.w3id.cwl.cwl1_2.ResourceRequirementImpl.class, null, null); - public static Loader WorkReuse = new RecordLoader(org.w3id.cwl.cwl1_2.WorkReuseImpl.class, null, null); - public static Loader NetworkAccess = new RecordLoader(org.w3id.cwl.cwl1_2.NetworkAccessImpl.class, null, null); - public static Loader InplaceUpdateRequirement = new RecordLoader(org.w3id.cwl.cwl1_2.InplaceUpdateRequirementImpl.class, null, null); - public static Loader ToolTimeLimit = new RecordLoader(org.w3id.cwl.cwl1_2.ToolTimeLimitImpl.class, null, null); - public static Loader SubworkflowFeatureRequirement = new RecordLoader(org.w3id.cwl.cwl1_2.SubworkflowFeatureRequirementImpl.class, null, null); - public static Loader ScatterFeatureRequirement = new RecordLoader(org.w3id.cwl.cwl1_2.ScatterFeatureRequirementImpl.class, null, null); - public static Loader MultipleInputFeatureRequirement = new RecordLoader(org.w3id.cwl.cwl1_2.MultipleInputFeatureRequirementImpl.class, null, null); - public static Loader StepInputExpressionRequirement = new RecordLoader(org.w3id.cwl.cwl1_2.StepInputExpressionRequirementImpl.class, null, null); + public static Loader InlineJavascriptRequirement = new RecordLoader(org.commonwl.cwlsdk.cwl1_2.InlineJavascriptRequirementImpl.class, null, null); + public static Loader SchemaDefRequirement = new RecordLoader(org.commonwl.cwlsdk.cwl1_2.SchemaDefRequirementImpl.class, null, null); + public static Loader LoadListingRequirement = new RecordLoader(org.commonwl.cwlsdk.cwl1_2.LoadListingRequirementImpl.class, null, null); + public static Loader DockerRequirement = new RecordLoader(org.commonwl.cwlsdk.cwl1_2.DockerRequirementImpl.class, null, null); + public static Loader SoftwareRequirement = new RecordLoader(org.commonwl.cwlsdk.cwl1_2.SoftwareRequirementImpl.class, null, null); + public static Loader InitialWorkDirRequirement = new RecordLoader(org.commonwl.cwlsdk.cwl1_2.InitialWorkDirRequirementImpl.class, null, null); + public static Loader EnvVarRequirement = new RecordLoader(org.commonwl.cwlsdk.cwl1_2.EnvVarRequirementImpl.class, null, null); + public static Loader ShellCommandRequirement = new RecordLoader(org.commonwl.cwlsdk.cwl1_2.ShellCommandRequirementImpl.class, null, null); + public static Loader ResourceRequirement = new RecordLoader(org.commonwl.cwlsdk.cwl1_2.ResourceRequirementImpl.class, null, null); + public static Loader WorkReuse = new RecordLoader(org.commonwl.cwlsdk.cwl1_2.WorkReuseImpl.class, null, null); + public static Loader NetworkAccess = new RecordLoader(org.commonwl.cwlsdk.cwl1_2.NetworkAccessImpl.class, null, null); + public static Loader InplaceUpdateRequirement = new RecordLoader(org.commonwl.cwlsdk.cwl1_2.InplaceUpdateRequirementImpl.class, null, null); + public static Loader ToolTimeLimit = new RecordLoader(org.commonwl.cwlsdk.cwl1_2.ToolTimeLimitImpl.class, null, null); + public static Loader SubworkflowFeatureRequirement = new RecordLoader(org.commonwl.cwlsdk.cwl1_2.SubworkflowFeatureRequirementImpl.class, null, null); + public static Loader ScatterFeatureRequirement = new RecordLoader(org.commonwl.cwlsdk.cwl1_2.ScatterFeatureRequirementImpl.class, null, null); + public static Loader MultipleInputFeatureRequirement = new RecordLoader(org.commonwl.cwlsdk.cwl1_2.MultipleInputFeatureRequirementImpl.class, null, null); + public static Loader StepInputExpressionRequirement = new RecordLoader(org.commonwl.cwlsdk.cwl1_2.StepInputExpressionRequirementImpl.class, null, null); public static Loader union_of_InlineJavascriptRequirement_or_SchemaDefRequirement_or_LoadListingRequirement_or_DockerRequirement_or_SoftwareRequirement_or_InitialWorkDirRequirement_or_EnvVarRequirement_or_ShellCommandRequirement_or_ResourceRequirement_or_WorkReuse_or_NetworkAccess_or_InplaceUpdateRequirement_or_ToolTimeLimit_or_SubworkflowFeatureRequirement_or_ScatterFeatureRequirement_or_MultipleInputFeatureRequirement_or_StepInputExpressionRequirement = new UnionLoader(new Loader[] { InlineJavascriptRequirement, SchemaDefRequirement, LoadListingRequirement, DockerRequirement, SoftwareRequirement, InitialWorkDirRequirement, EnvVarRequirement, ShellCommandRequirement, ResourceRequirement, WorkReuse, NetworkAccess, InplaceUpdateRequirement, ToolTimeLimit, SubworkflowFeatureRequirement, ScatterFeatureRequirement, MultipleInputFeatureRequirement, StepInputExpressionRequirement }); public static Loader> array_of_union_of_InlineJavascriptRequirement_or_SchemaDefRequirement_or_LoadListingRequirement_or_DockerRequirement_or_SoftwareRequirement_or_InitialWorkDirRequirement_or_EnvVarRequirement_or_ShellCommandRequirement_or_ResourceRequirement_or_WorkReuse_or_NetworkAccess_or_InplaceUpdateRequirement_or_ToolTimeLimit_or_SubworkflowFeatureRequirement_or_ScatterFeatureRequirement_or_MultipleInputFeatureRequirement_or_StepInputExpressionRequirement = new ArrayLoader(union_of_InlineJavascriptRequirement_or_SchemaDefRequirement_or_LoadListingRequirement_or_DockerRequirement_or_SoftwareRequirement_or_InitialWorkDirRequirement_or_EnvVarRequirement_or_ShellCommandRequirement_or_ResourceRequirement_or_WorkReuse_or_NetworkAccess_or_InplaceUpdateRequirement_or_ToolTimeLimit_or_SubworkflowFeatureRequirement_or_ScatterFeatureRequirement_or_MultipleInputFeatureRequirement_or_StepInputExpressionRequirement); public static Loader union_of_NullInstance_or_array_of_union_of_InlineJavascriptRequirement_or_SchemaDefRequirement_or_LoadListingRequirement_or_DockerRequirement_or_SoftwareRequirement_or_InitialWorkDirRequirement_or_EnvVarRequirement_or_ShellCommandRequirement_or_ResourceRequirement_or_WorkReuse_or_NetworkAccess_or_InplaceUpdateRequirement_or_ToolTimeLimit_or_SubworkflowFeatureRequirement_or_ScatterFeatureRequirement_or_MultipleInputFeatureRequirement_or_StepInputExpressionRequirement_or_CWLObjectType = new UnionLoader(new Loader[] { NullInstance, array_of_union_of_InlineJavascriptRequirement_or_SchemaDefRequirement_or_LoadListingRequirement_or_DockerRequirement_or_SoftwareRequirement_or_InitialWorkDirRequirement_or_EnvVarRequirement_or_ShellCommandRequirement_or_ResourceRequirement_or_WorkReuse_or_NetworkAccess_or_InplaceUpdateRequirement_or_ToolTimeLimit_or_SubworkflowFeatureRequirement_or_ScatterFeatureRequirement_or_MultipleInputFeatureRequirement_or_StepInputExpressionRequirement, CWLObjectType }); public static Loader> map_of_union_of_NullInstance_or_array_of_union_of_InlineJavascriptRequirement_or_SchemaDefRequirement_or_LoadListingRequirement_or_DockerRequirement_or_SoftwareRequirement_or_InitialWorkDirRequirement_or_EnvVarRequirement_or_ShellCommandRequirement_or_ResourceRequirement_or_WorkReuse_or_NetworkAccess_or_InplaceUpdateRequirement_or_ToolTimeLimit_or_SubworkflowFeatureRequirement_or_ScatterFeatureRequirement_or_MultipleInputFeatureRequirement_or_StepInputExpressionRequirement_or_CWLObjectType = new MapLoader(union_of_NullInstance_or_array_of_union_of_InlineJavascriptRequirement_or_SchemaDefRequirement_or_LoadListingRequirement_or_DockerRequirement_or_SoftwareRequirement_or_InitialWorkDirRequirement_or_EnvVarRequirement_or_ShellCommandRequirement_or_ResourceRequirement_or_WorkReuse_or_NetworkAccess_or_InplaceUpdateRequirement_or_ToolTimeLimit_or_SubworkflowFeatureRequirement_or_ScatterFeatureRequirement_or_MultipleInputFeatureRequirement_or_StepInputExpressionRequirement_or_CWLObjectType, "@list", true); public static Loader CWLVersion = new EnumLoader(CWLVersion.class); - public static Loader Labeled = new RecordLoader(org.w3id.cwl.cwl1_2.Labeled.class, null, null); - public static Loader Identified = new RecordLoader(org.w3id.cwl.cwl1_2.Identified.class, null, null); + public static Loader Labeled = new RecordLoader(org.commonwl.cwlsdk.cwl1_2.Labeled.class, null, null); + public static Loader Identified = new RecordLoader(org.commonwl.cwlsdk.cwl1_2.Identified.class, null, null); public static Loader LoadListingEnum = new EnumLoader(LoadListingEnum.class); - public static Loader LoadContents = new RecordLoader(org.w3id.cwl.cwl1_2.LoadContents.class, null, null); - public static Loader FieldBase = new RecordLoader(org.w3id.cwl.cwl1_2.FieldBase.class, null, null); - public static Loader InputFormat = new RecordLoader(org.w3id.cwl.cwl1_2.InputFormat.class, null, null); - public static Loader OutputFormat = new RecordLoader(org.w3id.cwl.cwl1_2.OutputFormat.class, null, null); - public static Loader Parameter = new RecordLoader(org.w3id.cwl.cwl1_2.Parameter.class, null, null); + public static Loader LoadContents = new RecordLoader(org.commonwl.cwlsdk.cwl1_2.LoadContents.class, null, null); + public static Loader FieldBase = new RecordLoader(org.commonwl.cwlsdk.cwl1_2.FieldBase.class, null, null); + public static Loader InputFormat = new RecordLoader(org.commonwl.cwlsdk.cwl1_2.InputFormat.class, null, null); + public static Loader OutputFormat = new RecordLoader(org.commonwl.cwlsdk.cwl1_2.OutputFormat.class, null, null); + public static Loader Parameter = new RecordLoader(org.commonwl.cwlsdk.cwl1_2.Parameter.class, null, null); public static Loader Expression = new EnumLoader(Expression.class); - public static Loader InputBinding = new RecordLoader(org.w3id.cwl.cwl1_2.InputBindingImpl.class, null, null); - public static Loader IOSchema = new RecordLoader(org.w3id.cwl.cwl1_2.IOSchema.class, null, null); - public static Loader InputSchema = new RecordLoader(org.w3id.cwl.cwl1_2.InputSchema.class, null, null); - public static Loader OutputSchema = new RecordLoader(org.w3id.cwl.cwl1_2.OutputSchema.class, null, null); - public static Loader InputRecordField = new RecordLoader(org.w3id.cwl.cwl1_2.InputRecordFieldImpl.class, null, null); - public static Loader InputRecordSchema = new RecordLoader(org.w3id.cwl.cwl1_2.InputRecordSchemaImpl.class, null, null); - public static Loader InputEnumSchema = new RecordLoader(org.w3id.cwl.cwl1_2.InputEnumSchemaImpl.class, null, null); - public static Loader InputArraySchema = new RecordLoader(org.w3id.cwl.cwl1_2.InputArraySchemaImpl.class, null, null); - public static Loader OutputRecordField = new RecordLoader(org.w3id.cwl.cwl1_2.OutputRecordFieldImpl.class, null, null); - public static Loader OutputRecordSchema = new RecordLoader(org.w3id.cwl.cwl1_2.OutputRecordSchemaImpl.class, null, null); - public static Loader OutputEnumSchema = new RecordLoader(org.w3id.cwl.cwl1_2.OutputEnumSchemaImpl.class, null, null); - public static Loader OutputArraySchema = new RecordLoader(org.w3id.cwl.cwl1_2.OutputArraySchemaImpl.class, null, null); - public static Loader InputParameter = new RecordLoader(org.w3id.cwl.cwl1_2.InputParameter.class, null, null); - public static Loader OutputParameter = new RecordLoader(org.w3id.cwl.cwl1_2.OutputParameter.class, null, null); - public static Loader ProcessRequirement = new RecordLoader(org.w3id.cwl.cwl1_2.ProcessRequirement.class, null, null); - public static Loader Process = new RecordLoader(org.w3id.cwl.cwl1_2.Process.class, null, null); - public static Loader CommandInputSchema = new RecordLoader(org.w3id.cwl.cwl1_2.CommandInputSchema.class, null, null); - public static Loader SecondaryFileSchema = new RecordLoader(org.w3id.cwl.cwl1_2.SecondaryFileSchemaImpl.class, null, null); - public static Loader EnvironmentDef = new RecordLoader(org.w3id.cwl.cwl1_2.EnvironmentDefImpl.class, null, null); - public static Loader CommandLineBinding = new RecordLoader(org.w3id.cwl.cwl1_2.CommandLineBindingImpl.class, null, null); - public static Loader CommandOutputBinding = new RecordLoader(org.w3id.cwl.cwl1_2.CommandOutputBindingImpl.class, null, null); - public static Loader CommandLineBindable = new RecordLoader(org.w3id.cwl.cwl1_2.CommandLineBindableImpl.class, null, null); - public static Loader CommandInputRecordField = new RecordLoader(org.w3id.cwl.cwl1_2.CommandInputRecordFieldImpl.class, null, null); - public static Loader CommandInputRecordSchema = new RecordLoader(org.w3id.cwl.cwl1_2.CommandInputRecordSchemaImpl.class, null, null); - public static Loader CommandInputEnumSchema = new RecordLoader(org.w3id.cwl.cwl1_2.CommandInputEnumSchemaImpl.class, null, null); - public static Loader CommandInputArraySchema = new RecordLoader(org.w3id.cwl.cwl1_2.CommandInputArraySchemaImpl.class, null, null); - public static Loader CommandOutputRecordField = new RecordLoader(org.w3id.cwl.cwl1_2.CommandOutputRecordFieldImpl.class, null, null); - public static Loader CommandOutputRecordSchema = new RecordLoader(org.w3id.cwl.cwl1_2.CommandOutputRecordSchemaImpl.class, null, null); - public static Loader CommandOutputEnumSchema = new RecordLoader(org.w3id.cwl.cwl1_2.CommandOutputEnumSchemaImpl.class, null, null); - public static Loader CommandOutputArraySchema = new RecordLoader(org.w3id.cwl.cwl1_2.CommandOutputArraySchemaImpl.class, null, null); - public static Loader CommandInputParameter = new RecordLoader(org.w3id.cwl.cwl1_2.CommandInputParameterImpl.class, null, null); - public static Loader CommandOutputParameter = new RecordLoader(org.w3id.cwl.cwl1_2.CommandOutputParameterImpl.class, null, null); + public static Loader InputBinding = new RecordLoader(org.commonwl.cwlsdk.cwl1_2.InputBindingImpl.class, null, null); + public static Loader IOSchema = new RecordLoader(org.commonwl.cwlsdk.cwl1_2.IOSchema.class, null, null); + public static Loader InputSchema = new RecordLoader(org.commonwl.cwlsdk.cwl1_2.InputSchema.class, null, null); + public static Loader OutputSchema = new RecordLoader(org.commonwl.cwlsdk.cwl1_2.OutputSchema.class, null, null); + public static Loader InputRecordField = new RecordLoader(org.commonwl.cwlsdk.cwl1_2.InputRecordFieldImpl.class, null, null); + public static Loader InputRecordSchema = new RecordLoader(org.commonwl.cwlsdk.cwl1_2.InputRecordSchemaImpl.class, null, null); + public static Loader InputEnumSchema = new RecordLoader(org.commonwl.cwlsdk.cwl1_2.InputEnumSchemaImpl.class, null, null); + public static Loader InputArraySchema = new RecordLoader(org.commonwl.cwlsdk.cwl1_2.InputArraySchemaImpl.class, null, null); + public static Loader OutputRecordField = new RecordLoader(org.commonwl.cwlsdk.cwl1_2.OutputRecordFieldImpl.class, null, null); + public static Loader OutputRecordSchema = new RecordLoader(org.commonwl.cwlsdk.cwl1_2.OutputRecordSchemaImpl.class, null, null); + public static Loader OutputEnumSchema = new RecordLoader(org.commonwl.cwlsdk.cwl1_2.OutputEnumSchemaImpl.class, null, null); + public static Loader OutputArraySchema = new RecordLoader(org.commonwl.cwlsdk.cwl1_2.OutputArraySchemaImpl.class, null, null); + public static Loader InputParameter = new RecordLoader(org.commonwl.cwlsdk.cwl1_2.InputParameter.class, null, null); + public static Loader OutputParameter = new RecordLoader(org.commonwl.cwlsdk.cwl1_2.OutputParameter.class, null, null); + public static Loader ProcessRequirement = new RecordLoader(org.commonwl.cwlsdk.cwl1_2.ProcessRequirement.class, null, null); + public static Loader Process = new RecordLoader(org.commonwl.cwlsdk.cwl1_2.Process.class, null, null); + public static Loader CommandInputSchema = new RecordLoader(org.commonwl.cwlsdk.cwl1_2.CommandInputSchema.class, null, null); + public static Loader SecondaryFileSchema = new RecordLoader(org.commonwl.cwlsdk.cwl1_2.SecondaryFileSchemaImpl.class, null, null); + public static Loader EnvironmentDef = new RecordLoader(org.commonwl.cwlsdk.cwl1_2.EnvironmentDefImpl.class, null, null); + public static Loader CommandLineBinding = new RecordLoader(org.commonwl.cwlsdk.cwl1_2.CommandLineBindingImpl.class, null, null); + public static Loader CommandOutputBinding = new RecordLoader(org.commonwl.cwlsdk.cwl1_2.CommandOutputBindingImpl.class, null, null); + public static Loader CommandLineBindable = new RecordLoader(org.commonwl.cwlsdk.cwl1_2.CommandLineBindableImpl.class, null, null); + public static Loader CommandInputRecordField = new RecordLoader(org.commonwl.cwlsdk.cwl1_2.CommandInputRecordFieldImpl.class, null, null); + public static Loader CommandInputRecordSchema = new RecordLoader(org.commonwl.cwlsdk.cwl1_2.CommandInputRecordSchemaImpl.class, null, null); + public static Loader CommandInputEnumSchema = new RecordLoader(org.commonwl.cwlsdk.cwl1_2.CommandInputEnumSchemaImpl.class, null, null); + public static Loader CommandInputArraySchema = new RecordLoader(org.commonwl.cwlsdk.cwl1_2.CommandInputArraySchemaImpl.class, null, null); + public static Loader CommandOutputRecordField = new RecordLoader(org.commonwl.cwlsdk.cwl1_2.CommandOutputRecordFieldImpl.class, null, null); + public static Loader CommandOutputRecordSchema = new RecordLoader(org.commonwl.cwlsdk.cwl1_2.CommandOutputRecordSchemaImpl.class, null, null); + public static Loader CommandOutputEnumSchema = new RecordLoader(org.commonwl.cwlsdk.cwl1_2.CommandOutputEnumSchemaImpl.class, null, null); + public static Loader CommandOutputArraySchema = new RecordLoader(org.commonwl.cwlsdk.cwl1_2.CommandOutputArraySchemaImpl.class, null, null); + public static Loader CommandInputParameter = new RecordLoader(org.commonwl.cwlsdk.cwl1_2.CommandInputParameterImpl.class, null, null); + public static Loader CommandOutputParameter = new RecordLoader(org.commonwl.cwlsdk.cwl1_2.CommandOutputParameterImpl.class, null, null); public static Loader stdin = new EnumLoader(stdin.class); public static Loader stdout = new EnumLoader(stdout.class); public static Loader stderr = new EnumLoader(stderr.class); - public static Loader CommandLineTool = new RecordLoader(org.w3id.cwl.cwl1_2.CommandLineToolImpl.class, null, null); - public static Loader SoftwarePackage = new RecordLoader(org.w3id.cwl.cwl1_2.SoftwarePackageImpl.class, null, null); - public static Loader Dirent = new RecordLoader(org.w3id.cwl.cwl1_2.DirentImpl.class, null, null); - public static Loader ExpressionToolOutputParameter = new RecordLoader(org.w3id.cwl.cwl1_2.ExpressionToolOutputParameterImpl.class, null, null); - public static Loader WorkflowInputParameter = new RecordLoader(org.w3id.cwl.cwl1_2.WorkflowInputParameterImpl.class, null, null); - public static Loader ExpressionTool = new RecordLoader(org.w3id.cwl.cwl1_2.ExpressionToolImpl.class, null, null); + public static Loader CommandLineTool = new RecordLoader(org.commonwl.cwlsdk.cwl1_2.CommandLineToolImpl.class, null, null); + public static Loader SoftwarePackage = new RecordLoader(org.commonwl.cwlsdk.cwl1_2.SoftwarePackageImpl.class, null, null); + public static Loader Dirent = new RecordLoader(org.commonwl.cwlsdk.cwl1_2.DirentImpl.class, null, null); + public static Loader ExpressionToolOutputParameter = new RecordLoader(org.commonwl.cwlsdk.cwl1_2.ExpressionToolOutputParameterImpl.class, null, null); + public static Loader WorkflowInputParameter = new RecordLoader(org.commonwl.cwlsdk.cwl1_2.WorkflowInputParameterImpl.class, null, null); + public static Loader ExpressionTool = new RecordLoader(org.commonwl.cwlsdk.cwl1_2.ExpressionToolImpl.class, null, null); public static Loader LinkMergeMethod = new EnumLoader(LinkMergeMethod.class); public static Loader PickValueMethod = new EnumLoader(PickValueMethod.class); - public static Loader WorkflowOutputParameter = new RecordLoader(org.w3id.cwl.cwl1_2.WorkflowOutputParameterImpl.class, null, null); - public static Loader Sink = new RecordLoader(org.w3id.cwl.cwl1_2.Sink.class, null, null); - public static Loader WorkflowStepInput = new RecordLoader(org.w3id.cwl.cwl1_2.WorkflowStepInputImpl.class, null, null); - public static Loader WorkflowStepOutput = new RecordLoader(org.w3id.cwl.cwl1_2.WorkflowStepOutputImpl.class, null, null); + public static Loader WorkflowOutputParameter = new RecordLoader(org.commonwl.cwlsdk.cwl1_2.WorkflowOutputParameterImpl.class, null, null); + public static Loader Sink = new RecordLoader(org.commonwl.cwlsdk.cwl1_2.Sink.class, null, null); + public static Loader WorkflowStepInput = new RecordLoader(org.commonwl.cwlsdk.cwl1_2.WorkflowStepInputImpl.class, null, null); + public static Loader WorkflowStepOutput = new RecordLoader(org.commonwl.cwlsdk.cwl1_2.WorkflowStepOutputImpl.class, null, null); public static Loader ScatterMethod = new EnumLoader(ScatterMethod.class); - public static Loader WorkflowStep = new RecordLoader(org.w3id.cwl.cwl1_2.WorkflowStepImpl.class, null, null); - public static Loader Workflow = new RecordLoader(org.w3id.cwl.cwl1_2.WorkflowImpl.class, null, null); - public static Loader OperationInputParameter = new RecordLoader(org.w3id.cwl.cwl1_2.OperationInputParameterImpl.class, null, null); - public static Loader OperationOutputParameter = new RecordLoader(org.w3id.cwl.cwl1_2.OperationOutputParameterImpl.class, null, null); - public static Loader Operation = new RecordLoader(org.w3id.cwl.cwl1_2.OperationImpl.class, null, null); + public static Loader WorkflowStep = new RecordLoader(org.commonwl.cwlsdk.cwl1_2.WorkflowStepImpl.class, null, null); + public static Loader Workflow = new RecordLoader(org.commonwl.cwlsdk.cwl1_2.WorkflowImpl.class, null, null); + public static Loader OperationInputParameter = new RecordLoader(org.commonwl.cwlsdk.cwl1_2.OperationInputParameterImpl.class, null, null); + public static Loader OperationOutputParameter = new RecordLoader(org.commonwl.cwlsdk.cwl1_2.OperationOutputParameterImpl.class, null, null); + public static Loader Operation = new RecordLoader(org.commonwl.cwlsdk.cwl1_2.OperationImpl.class, null, null); public static Loader> array_of_StringInstance = new ArrayLoader(StringInstance); public static Loader union_of_NullInstance_or_StringInstance_or_array_of_StringInstance = new UnionLoader(new Loader[] { NullInstance, StringInstance, array_of_StringInstance }); public static Loader uri_StringInstance_True_False_None_None = new UriLoader(StringInstance, true, false, null, null); diff --git a/src/main/java/org/w3id/cwl/cwl1_2/utils/LoadingOptions.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/utils/LoadingOptions.java similarity index 97% rename from src/main/java/org/w3id/cwl/cwl1_2/utils/LoadingOptions.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/utils/LoadingOptions.java index bc9879e3..c4ae09fb 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/utils/LoadingOptions.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/utils/LoadingOptions.java @@ -1,4 +1,4 @@ -package org.w3id.cwl.cwl1_2.utils; +package org.commonwl.cwlsdk.cwl1_2.utils; import java.net.URI; import java.util.ArrayList; @@ -65,7 +65,7 @@ public String expandUrl( } if (!this.vocab.isEmpty() && url.contains(":")) { - String prefix = url.split(":", 1)[0]; + String prefix = url.split(":")[0]; if (this.vocab.containsKey(prefix)) { url = this.vocab.get(prefix) + url.substring(prefix.length() + 1); } diff --git a/src/main/java/org/w3id/cwl/cwl1_2/utils/LoadingOptionsBuilder.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/utils/LoadingOptionsBuilder.java similarity index 98% rename from src/main/java/org/w3id/cwl/cwl1_2/utils/LoadingOptionsBuilder.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/utils/LoadingOptionsBuilder.java index 53af9b73..9fbba692 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/utils/LoadingOptionsBuilder.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/utils/LoadingOptionsBuilder.java @@ -1,4 +1,4 @@ -package org.w3id.cwl.cwl1_2.utils; +package org.commonwl.cwlsdk.cwl1_2.utils; import java.util.HashMap; import java.util.List; diff --git a/src/main/java/org/w3id/cwl/cwl1_2/utils/MapLoader.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/utils/MapLoader.java similarity index 97% rename from src/main/java/org/w3id/cwl/cwl1_2/utils/MapLoader.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/utils/MapLoader.java index a284809f..26099592 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/utils/MapLoader.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/utils/MapLoader.java @@ -1,4 +1,4 @@ -package org.w3id.cwl.cwl1_2.utils; +package org.commonwl.cwlsdk.cwl1_2.utils; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/main/java/org/w3id/cwl/cwl1_1/utils/NullLoader.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/utils/NullLoader.java similarity index 87% rename from src/main/java/org/w3id/cwl/cwl1_1/utils/NullLoader.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/utils/NullLoader.java index e8e4d013..c9679b8b 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/utils/NullLoader.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/utils/NullLoader.java @@ -1,4 +1,4 @@ -package org.w3id.cwl.cwl1_1.utils; +package org.commonwl.cwlsdk.cwl1_2.utils; public class NullLoader implements Loader { diff --git a/src/main/java/org/w3id/cwl/cwl1_1/utils/OneOrListOf.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/utils/OneOrListOf.java similarity index 96% rename from src/main/java/org/w3id/cwl/cwl1_1/utils/OneOrListOf.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/utils/OneOrListOf.java index 9643dc3e..d998ecf8 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/utils/OneOrListOf.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/utils/OneOrListOf.java @@ -1,4 +1,4 @@ -package org.w3id.cwl.cwl1_1.utils; +package org.commonwl.cwlsdk.cwl1_2.utils; import java.util.List; import java.util.Optional; diff --git a/src/main/java/org/w3id/cwl/cwl1_2/utils/OneOrListOfLoader.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/utils/OneOrListOfLoader.java similarity index 96% rename from src/main/java/org/w3id/cwl/cwl1_2/utils/OneOrListOfLoader.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/utils/OneOrListOfLoader.java index 622c6ead..054244fc 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/utils/OneOrListOfLoader.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/utils/OneOrListOfLoader.java @@ -1,4 +1,4 @@ -package org.w3id.cwl.cwl1_2.utils; +package org.commonwl.cwlsdk.cwl1_2.utils; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/org/w3id/cwl/cwl1_1/utils/OptionalLoader.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/utils/OptionalLoader.java similarity index 92% rename from src/main/java/org/w3id/cwl/cwl1_1/utils/OptionalLoader.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/utils/OptionalLoader.java index 27f956ce..824b7eac 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/utils/OptionalLoader.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/utils/OptionalLoader.java @@ -1,4 +1,4 @@ -package org.w3id.cwl.cwl1_1.utils; +package org.commonwl.cwlsdk.cwl1_2.utils; import java.util.Optional; diff --git a/src/main/java/org/w3id/cwl/cwl1_1/utils/PrimitiveLoader.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/utils/PrimitiveLoader.java similarity index 89% rename from src/main/java/org/w3id/cwl/cwl1_1/utils/PrimitiveLoader.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/utils/PrimitiveLoader.java index 9dccc7d9..f1a47266 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/utils/PrimitiveLoader.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/utils/PrimitiveLoader.java @@ -1,4 +1,4 @@ -package org.w3id.cwl.cwl1_1.utils; +package org.commonwl.cwlsdk.cwl1_2.utils; public class PrimitiveLoader implements Loader { private Class clazz; diff --git a/src/main/java/org/w3id/cwl/cwl1_2/utils/RecordLoader.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/utils/RecordLoader.java similarity index 97% rename from src/main/java/org/w3id/cwl/cwl1_2/utils/RecordLoader.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/utils/RecordLoader.java index b40d4f56..f364d471 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/utils/RecordLoader.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/utils/RecordLoader.java @@ -1,4 +1,4 @@ -package org.w3id.cwl.cwl1_2.utils; +package org.commonwl.cwlsdk.cwl1_2.utils; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; diff --git a/src/main/java/org/w3id/cwl/cwl1_2/utils/RootLoader.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/utils/RootLoader.java similarity index 98% rename from src/main/java/org/w3id/cwl/cwl1_2/utils/RootLoader.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/utils/RootLoader.java index a86f2296..df3a15ea 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/utils/RootLoader.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/utils/RootLoader.java @@ -1,4 +1,4 @@ -package org.w3id.cwl.cwl1_2.utils; +package org.commonwl.cwlsdk.cwl1_2.utils; import java.io.File; import java.io.IOException; diff --git a/src/main/java/org/w3id/cwl/cwl1_1/utils/Saveable.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/utils/Saveable.java similarity index 78% rename from src/main/java/org/w3id/cwl/cwl1_1/utils/Saveable.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/utils/Saveable.java index 5d56ec65..afb775e4 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/utils/Saveable.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/utils/Saveable.java @@ -1,4 +1,4 @@ -package org.w3id.cwl.cwl1_1.utils; +package org.commonwl.cwlsdk.cwl1_2.utils; public interface Saveable { // TODO: implement writable interface diff --git a/src/main/java/org/w3id/cwl/cwl1_2/utils/SaveableImpl.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/utils/SaveableImpl.java similarity index 78% rename from src/main/java/org/w3id/cwl/cwl1_2/utils/SaveableImpl.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/utils/SaveableImpl.java index 0bcd9f49..0b229c9e 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/utils/SaveableImpl.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/utils/SaveableImpl.java @@ -1,4 +1,4 @@ -package org.w3id.cwl.cwl1_2.utils; +package org.commonwl.cwlsdk.cwl1_2.utils; public class SaveableImpl implements Saveable { public SaveableImpl(Object doc, String baseUri, LoadingOptions loadingOptions, String docRoot) {} diff --git a/src/main/java/org/w3id/cwl/cwl1_1/utils/SecondaryFilesDslLoader.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/utils/SecondaryFilesDslLoader.java similarity index 98% rename from src/main/java/org/w3id/cwl/cwl1_1/utils/SecondaryFilesDslLoader.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/utils/SecondaryFilesDslLoader.java index 5eb58816..8a560d4e 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/utils/SecondaryFilesDslLoader.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/utils/SecondaryFilesDslLoader.java @@ -1,4 +1,4 @@ -package org.w3id.cwl.cwl1_1.utils; +package org.commonwl.cwlsdk.cwl1_2.utils; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/main/java/org/w3id/cwl/cwl1_1/utils/TypeDslLoader.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/utils/TypeDslLoader.java similarity index 98% rename from src/main/java/org/w3id/cwl/cwl1_1/utils/TypeDslLoader.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/utils/TypeDslLoader.java index 41398b02..0f32b48b 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/utils/TypeDslLoader.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/utils/TypeDslLoader.java @@ -1,4 +1,4 @@ -package org.w3id.cwl.cwl1_1.utils; +package org.commonwl.cwlsdk.cwl1_2.utils; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/main/java/org/w3id/cwl/cwl1_1/utils/UnionLoader.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/utils/UnionLoader.java similarity index 96% rename from src/main/java/org/w3id/cwl/cwl1_1/utils/UnionLoader.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/utils/UnionLoader.java index b9d4f805..ec57efc9 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/utils/UnionLoader.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/utils/UnionLoader.java @@ -1,4 +1,4 @@ -package org.w3id.cwl.cwl1_1.utils; +package org.commonwl.cwlsdk.cwl1_2.utils; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/main/java/org/w3id/cwl/cwl1_2/utils/UriLoader.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/utils/UriLoader.java similarity index 97% rename from src/main/java/org/w3id/cwl/cwl1_2/utils/UriLoader.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/utils/UriLoader.java index 3ba92ad4..c861396a 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/utils/UriLoader.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/utils/UriLoader.java @@ -1,4 +1,4 @@ -package org.w3id.cwl.cwl1_2.utils; +package org.commonwl.cwlsdk.cwl1_2.utils; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/org/w3id/cwl/cwl1_2/utils/Uris.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/utils/Uris.java similarity index 98% rename from src/main/java/org/w3id/cwl/cwl1_2/utils/Uris.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/utils/Uris.java index 403b79f8..2aa12481 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/utils/Uris.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/utils/Uris.java @@ -1,4 +1,4 @@ -package org.w3id.cwl.cwl1_2.utils; +package org.commonwl.cwlsdk.cwl1_2.utils; import java.io.UnsupportedEncodingException; import java.net.URI; diff --git a/src/main/java/org/w3id/cwl/cwl1_1/utils/ValidationException.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/utils/ValidationException.java similarity index 98% rename from src/main/java/org/w3id/cwl/cwl1_1/utils/ValidationException.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/utils/ValidationException.java index 62fae309..0893e1e1 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/utils/ValidationException.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/utils/ValidationException.java @@ -1,4 +1,4 @@ -package org.w3id.cwl.cwl1_1.utils; +package org.commonwl.cwlsdk.cwl1_2.utils; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/main/java/org/w3id/cwl/cwl1_1/utils/Validator.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/utils/Validator.java similarity index 94% rename from src/main/java/org/w3id/cwl/cwl1_1/utils/Validator.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/utils/Validator.java index 4f302cc9..eea66445 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/utils/Validator.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/utils/Validator.java @@ -1,4 +1,4 @@ -package org.w3id.cwl.cwl1_1.utils; +package org.commonwl.cwlsdk.cwl1_2.utils; import java.io.File; import org.snakeyaml.engine.v2.api.Dump; diff --git a/src/main/java/org/w3id/cwl/cwl1_1/utils/YamlUtils.java b/src/main/java/org/commonwl/cwlsdk/cwl1_2/utils/YamlUtils.java similarity index 95% rename from src/main/java/org/w3id/cwl/cwl1_1/utils/YamlUtils.java rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/utils/YamlUtils.java index e2e96a5b..343c2405 100644 --- a/src/main/java/org/w3id/cwl/cwl1_1/utils/YamlUtils.java +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/utils/YamlUtils.java @@ -1,4 +1,4 @@ -package org.w3id.cwl.cwl1_1.utils; +package org.commonwl.cwlsdk.cwl1_2.utils; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/main/java/org/w3id/cwl/cwl1_2/utils/package.html b/src/main/java/org/commonwl/cwlsdk/cwl1_2/utils/package.html similarity index 53% rename from src/main/java/org/w3id/cwl/cwl1_2/utils/package.html rename to src/main/java/org/commonwl/cwlsdk/cwl1_2/utils/package.html index 7516d4c3..fb58a00d 100644 --- a/src/main/java/org/w3id/cwl/cwl1_2/utils/package.html +++ b/src/main/java/org/commonwl/cwlsdk/cwl1_2/utils/package.html @@ -1,3 +1,3 @@ -This package contains utilities for working the SchemaSalad generated code for the org.w3id.cwl.cwl1_2 package. +This package contains utilities for working the SchemaSalad generated code for the org.commonwl.cwlsdk.cwl1_2 package. diff --git a/src/main/resources/META-INF/MANIFEST.MF b/src/main/resources/META-INF/MANIFEST.MF index ffaaa36a..47659aa6 100644 --- a/src/main/resources/META-INF/MANIFEST.MF +++ b/src/main/resources/META-INF/MANIFEST.MF @@ -1,2 +1,2 @@ Manifest-Version: 1.0 -Main-Class: org.w3id.cwl.cwl1_2.utils.Validator +Main-Class: org.commonwl.cwlsdk.cwl1_2.utils.Validator diff --git a/src/test/java/org/w3id/cwl/cwl1_1/utils/AnonymousRecordTest.java b/src/test/java/org/commonwl/cwlsdk/cwl1_1/utils/AnonymousRecordTest.java similarity index 88% rename from src/test/java/org/w3id/cwl/cwl1_1/utils/AnonymousRecordTest.java rename to src/test/java/org/commonwl/cwlsdk/cwl1_1/utils/AnonymousRecordTest.java index ed9e34de..74ea0163 100644 --- a/src/test/java/org/w3id/cwl/cwl1_1/utils/AnonymousRecordTest.java +++ b/src/test/java/org/commonwl/cwlsdk/cwl1_1/utils/AnonymousRecordTest.java @@ -1,4 +1,4 @@ -package org.w3id.cwl.cwl1_1.utils; +package org.commonwl.cwlsdk.cwl1_1.utils; public class AnonymousRecordTest { diff --git a/src/test/java/org/w3id/cwl/cwl1_2/utils/DefaultFetcherTest.java b/src/test/java/org/commonwl/cwlsdk/cwl1_1/utils/DefaultFetcherTest.java similarity index 96% rename from src/test/java/org/w3id/cwl/cwl1_2/utils/DefaultFetcherTest.java rename to src/test/java/org/commonwl/cwlsdk/cwl1_1/utils/DefaultFetcherTest.java index ff2f6d5d..b4aa7e06 100644 --- a/src/test/java/org/w3id/cwl/cwl1_2/utils/DefaultFetcherTest.java +++ b/src/test/java/org/commonwl/cwlsdk/cwl1_1/utils/DefaultFetcherTest.java @@ -1,4 +1,4 @@ -package org.w3id.cwl.cwl1_2.utils; +package org.commonwl.cwlsdk.cwl1_1.utils; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/org/w3id/cwl/cwl1_1/utils/ExamplesTest.java b/src/test/java/org/commonwl/cwlsdk/cwl1_1/utils/ExamplesTest.java similarity index 99% rename from src/test/java/org/w3id/cwl/cwl1_1/utils/ExamplesTest.java rename to src/test/java/org/commonwl/cwlsdk/cwl1_1/utils/ExamplesTest.java index af988baa..b3a906f2 100644 --- a/src/test/java/org/w3id/cwl/cwl1_1/utils/ExamplesTest.java +++ b/src/test/java/org/commonwl/cwlsdk/cwl1_1/utils/ExamplesTest.java @@ -1,4 +1,4 @@ -package org.w3id.cwl.cwl1_1.utils; +package org.commonwl.cwlsdk.cwl1_1.utils; public class ExamplesTest { diff --git a/src/test/java/org/w3id/cwl/cwl1_2/utils/PackedWorkflowClassTest.java b/src/test/java/org/commonwl/cwlsdk/cwl1_1/utils/PackedWorkflowClassTest.java similarity index 83% rename from src/test/java/org/w3id/cwl/cwl1_2/utils/PackedWorkflowClassTest.java rename to src/test/java/org/commonwl/cwlsdk/cwl1_1/utils/PackedWorkflowClassTest.java index 8fd07d98..0fe3582f 100644 --- a/src/test/java/org/w3id/cwl/cwl1_2/utils/PackedWorkflowClassTest.java +++ b/src/test/java/org/commonwl/cwlsdk/cwl1_1/utils/PackedWorkflowClassTest.java @@ -1,14 +1,14 @@ -package org.w3id.cwl.cwl1_2.utils; +package org.commonwl.cwlsdk.cwl1_1.utils; import java.net.URISyntaxException; import java.nio.file.Paths; import java.util.List; import org.junit.Assert; import org.junit.Test; -import org.w3id.cwl.cwl1_2.Process; -import org.w3id.cwl.cwl1_2.Workflow; -import org.w3id.cwl.cwl1_2.WorkflowStep; -import org.w3id.cwl.cwl1_2.WorkflowStepInput; +import org.commonwl.cwlsdk.cwl1_1.Process; +import org.commonwl.cwlsdk.cwl1_1.Workflow; +import org.commonwl.cwlsdk.cwl1_1.WorkflowStep; +import org.commonwl.cwlsdk.cwl1_1.WorkflowStepInput; public class PackedWorkflowClassTest { List doc; diff --git a/src/test/java/org/w3id/cwl/cwl1_1/utils/RequirementsClassTest.java b/src/test/java/org/commonwl/cwlsdk/cwl1_1/utils/RequirementsClassTest.java similarity index 88% rename from src/test/java/org/w3id/cwl/cwl1_1/utils/RequirementsClassTest.java rename to src/test/java/org/commonwl/cwlsdk/cwl1_1/utils/RequirementsClassTest.java index bd0b4fda..22db1541 100644 --- a/src/test/java/org/w3id/cwl/cwl1_1/utils/RequirementsClassTest.java +++ b/src/test/java/org/commonwl/cwlsdk/cwl1_1/utils/RequirementsClassTest.java @@ -1,11 +1,11 @@ -package org.w3id.cwl.cwl1_1.utils; +package org.commonwl.cwlsdk.cwl1_1.utils; import java.net.URISyntaxException; import org.junit.Assert; import org.junit.Test; -import org.w3id.cwl.cwl1_1.CWLVersion; -import org.w3id.cwl.cwl1_1.InlineJavascriptRequirement; -import org.w3id.cwl.cwl1_1.Process; +import org.commonwl.cwlsdk.cwl1_1.CWLVersion; +import org.commonwl.cwlsdk.cwl1_1.InlineJavascriptRequirement; +import org.commonwl.cwlsdk.cwl1_1.Process; public class RequirementsClassTest { Process doc; diff --git a/src/test/java/org/w3id/cwl/cwl1_1/utils/SchemaDefTest.java b/src/test/java/org/commonwl/cwlsdk/cwl1_1/utils/SchemaDefTest.java similarity index 89% rename from src/test/java/org/w3id/cwl/cwl1_1/utils/SchemaDefTest.java rename to src/test/java/org/commonwl/cwlsdk/cwl1_1/utils/SchemaDefTest.java index 75edfb50..ad953da6 100644 --- a/src/test/java/org/w3id/cwl/cwl1_1/utils/SchemaDefTest.java +++ b/src/test/java/org/commonwl/cwlsdk/cwl1_1/utils/SchemaDefTest.java @@ -1,10 +1,10 @@ -package org.w3id.cwl.cwl1_1.utils; +package org.commonwl.cwlsdk.cwl1_1.utils; import java.util.List; import org.junit.Assert; -import org.w3id.cwl.cwl1_1.InputRecordSchema; -import org.w3id.cwl.cwl1_1.Process; -import org.w3id.cwl.cwl1_1.SchemaDefRequirement; +import org.commonwl.cwlsdk.cwl1_1.InputRecordSchema; +import org.commonwl.cwlsdk.cwl1_1.Process; +import org.commonwl.cwlsdk.cwl1_1.SchemaDefRequirement; public class SchemaDefTest { diff --git a/src/test/java/org/w3id/cwl/cwl1_1/utils/SecondaryFilesTest.java b/src/test/java/org/commonwl/cwlsdk/cwl1_1/utils/SecondaryFilesTest.java similarity index 87% rename from src/test/java/org/w3id/cwl/cwl1_1/utils/SecondaryFilesTest.java rename to src/test/java/org/commonwl/cwlsdk/cwl1_1/utils/SecondaryFilesTest.java index 444181aa..c91c7601 100644 --- a/src/test/java/org/w3id/cwl/cwl1_1/utils/SecondaryFilesTest.java +++ b/src/test/java/org/commonwl/cwlsdk/cwl1_1/utils/SecondaryFilesTest.java @@ -1,14 +1,14 @@ -package org.w3id.cwl.cwl1_1.utils; +package org.commonwl.cwlsdk.cwl1_1.utils; import java.net.URISyntaxException; import java.nio.file.Paths; import java.util.List; import org.junit.Assert; import org.junit.Test; -import org.w3id.cwl.cwl1_1.Process; -import org.w3id.cwl.cwl1_1.SecondaryFileSchema; -import org.w3id.cwl.cwl1_1.Workflow; -import org.w3id.cwl.cwl1_1.WorkflowInputParameter; +import org.commonwl.cwlsdk.cwl1_1.Process; +import org.commonwl.cwlsdk.cwl1_1.SecondaryFileSchema; +import org.commonwl.cwlsdk.cwl1_1.Workflow; +import org.commonwl.cwlsdk.cwl1_1.WorkflowInputParameter; public class SecondaryFilesTest { List doc; diff --git a/src/test/java/org/w3id/cwl/cwl1_1/utils/ShortnameTest.java b/src/test/java/org/commonwl/cwlsdk/cwl1_1/utils/ShortnameTest.java similarity index 96% rename from src/test/java/org/w3id/cwl/cwl1_1/utils/ShortnameTest.java rename to src/test/java/org/commonwl/cwlsdk/cwl1_1/utils/ShortnameTest.java index 0941406e..7494ceaf 100644 --- a/src/test/java/org/w3id/cwl/cwl1_1/utils/ShortnameTest.java +++ b/src/test/java/org/commonwl/cwlsdk/cwl1_1/utils/ShortnameTest.java @@ -1,4 +1,4 @@ -package org.w3id.cwl.cwl1_1.utils; +package org.commonwl.cwlsdk.cwl1_1.utils; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/org/w3id/cwl/cwl1_1/utils/WorkflowClassTest.java b/src/test/java/org/commonwl/cwlsdk/cwl1_1/utils/WorkflowClassTest.java similarity index 84% rename from src/test/java/org/w3id/cwl/cwl1_1/utils/WorkflowClassTest.java rename to src/test/java/org/commonwl/cwlsdk/cwl1_1/utils/WorkflowClassTest.java index dd990824..9116f3d3 100644 --- a/src/test/java/org/w3id/cwl/cwl1_1/utils/WorkflowClassTest.java +++ b/src/test/java/org/commonwl/cwlsdk/cwl1_1/utils/WorkflowClassTest.java @@ -1,10 +1,10 @@ -package org.w3id.cwl.cwl1_1.utils; +package org.commonwl.cwlsdk.cwl1_1.utils; import java.net.URISyntaxException; import org.junit.Assert; import org.junit.Test; -import org.w3id.cwl.cwl1_1.CWLVersion; -import org.w3id.cwl.cwl1_1.Process; +import org.commonwl.cwlsdk.cwl1_1.CWLVersion; +import org.commonwl.cwlsdk.cwl1_1.Process; public class WorkflowClassTest { Process doc; diff --git a/src/test/java/org/w3id/cwl/cwl1_1/utils/YamlUtilsTest.java b/src/test/java/org/commonwl/cwlsdk/cwl1_1/utils/YamlUtilsTest.java similarity index 89% rename from src/test/java/org/w3id/cwl/cwl1_1/utils/YamlUtilsTest.java rename to src/test/java/org/commonwl/cwlsdk/cwl1_1/utils/YamlUtilsTest.java index 9b902138..8d865186 100644 --- a/src/test/java/org/w3id/cwl/cwl1_1/utils/YamlUtilsTest.java +++ b/src/test/java/org/commonwl/cwlsdk/cwl1_1/utils/YamlUtilsTest.java @@ -1,4 +1,4 @@ -package org.w3id.cwl.cwl1_1.utils; +package org.commonwl.cwlsdk.cwl1_1.utils; import java.util.Map; import org.junit.Assert; diff --git a/src/test/java/org/w3id/cwl/cwl1_2/utils/AnonymousRecordTest.java b/src/test/java/org/commonwl/cwlsdk/cwl1_2/utils/AnonymousRecordTest.java similarity index 88% rename from src/test/java/org/w3id/cwl/cwl1_2/utils/AnonymousRecordTest.java rename to src/test/java/org/commonwl/cwlsdk/cwl1_2/utils/AnonymousRecordTest.java index a449b5b4..ca415c9e 100644 --- a/src/test/java/org/w3id/cwl/cwl1_2/utils/AnonymousRecordTest.java +++ b/src/test/java/org/commonwl/cwlsdk/cwl1_2/utils/AnonymousRecordTest.java @@ -1,4 +1,4 @@ -package org.w3id.cwl.cwl1_2.utils; +package org.commonwl.cwlsdk.cwl1_2.utils; public class AnonymousRecordTest { diff --git a/src/test/java/org/w3id/cwl/cwl1_1/utils/DefaultFetcherTest.java b/src/test/java/org/commonwl/cwlsdk/cwl1_2/utils/DefaultFetcherTest.java similarity index 96% rename from src/test/java/org/w3id/cwl/cwl1_1/utils/DefaultFetcherTest.java rename to src/test/java/org/commonwl/cwlsdk/cwl1_2/utils/DefaultFetcherTest.java index ce7edd23..3dce32c7 100644 --- a/src/test/java/org/w3id/cwl/cwl1_1/utils/DefaultFetcherTest.java +++ b/src/test/java/org/commonwl/cwlsdk/cwl1_2/utils/DefaultFetcherTest.java @@ -1,4 +1,4 @@ -package org.w3id.cwl.cwl1_1.utils; +package org.commonwl.cwlsdk.cwl1_2.utils; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/org/w3id/cwl/cwl1_2/utils/ExamplesTest.java b/src/test/java/org/commonwl/cwlsdk/cwl1_2/utils/ExamplesTest.java similarity index 99% rename from src/test/java/org/w3id/cwl/cwl1_2/utils/ExamplesTest.java rename to src/test/java/org/commonwl/cwlsdk/cwl1_2/utils/ExamplesTest.java index f2fadc72..835b408f 100644 --- a/src/test/java/org/w3id/cwl/cwl1_2/utils/ExamplesTest.java +++ b/src/test/java/org/commonwl/cwlsdk/cwl1_2/utils/ExamplesTest.java @@ -1,4 +1,4 @@ -package org.w3id.cwl.cwl1_2.utils; +package org.commonwl.cwlsdk.cwl1_2.utils; public class ExamplesTest { diff --git a/src/test/java/org/w3id/cwl/cwl1_1/utils/PackedWorkflowClassTest.java b/src/test/java/org/commonwl/cwlsdk/cwl1_2/utils/PackedWorkflowClassTest.java similarity index 83% rename from src/test/java/org/w3id/cwl/cwl1_1/utils/PackedWorkflowClassTest.java rename to src/test/java/org/commonwl/cwlsdk/cwl1_2/utils/PackedWorkflowClassTest.java index 89bffa2b..eef899cb 100644 --- a/src/test/java/org/w3id/cwl/cwl1_1/utils/PackedWorkflowClassTest.java +++ b/src/test/java/org/commonwl/cwlsdk/cwl1_2/utils/PackedWorkflowClassTest.java @@ -1,14 +1,14 @@ -package org.w3id.cwl.cwl1_1.utils; +package org.commonwl.cwlsdk.cwl1_2.utils; import java.net.URISyntaxException; import java.nio.file.Paths; import java.util.List; import org.junit.Assert; import org.junit.Test; -import org.w3id.cwl.cwl1_1.Process; -import org.w3id.cwl.cwl1_1.Workflow; -import org.w3id.cwl.cwl1_1.WorkflowStep; -import org.w3id.cwl.cwl1_1.WorkflowStepInput; +import org.commonwl.cwlsdk.cwl1_2.Process; +import org.commonwl.cwlsdk.cwl1_2.Workflow; +import org.commonwl.cwlsdk.cwl1_2.WorkflowStep; +import org.commonwl.cwlsdk.cwl1_2.WorkflowStepInput; public class PackedWorkflowClassTest { List doc; diff --git a/src/test/java/org/w3id/cwl/cwl1_2/utils/RequirementsClassTest.java b/src/test/java/org/commonwl/cwlsdk/cwl1_2/utils/RequirementsClassTest.java similarity index 88% rename from src/test/java/org/w3id/cwl/cwl1_2/utils/RequirementsClassTest.java rename to src/test/java/org/commonwl/cwlsdk/cwl1_2/utils/RequirementsClassTest.java index 811aec59..9d1b40e7 100644 --- a/src/test/java/org/w3id/cwl/cwl1_2/utils/RequirementsClassTest.java +++ b/src/test/java/org/commonwl/cwlsdk/cwl1_2/utils/RequirementsClassTest.java @@ -1,11 +1,11 @@ -package org.w3id.cwl.cwl1_2.utils; +package org.commonwl.cwlsdk.cwl1_2.utils; import java.net.URISyntaxException; import org.junit.Assert; import org.junit.Test; -import org.w3id.cwl.cwl1_2.CWLVersion; -import org.w3id.cwl.cwl1_2.InlineJavascriptRequirement; -import org.w3id.cwl.cwl1_2.Process; +import org.commonwl.cwlsdk.cwl1_2.CWLVersion; +import org.commonwl.cwlsdk.cwl1_2.InlineJavascriptRequirement; +import org.commonwl.cwlsdk.cwl1_2.Process; public class RequirementsClassTest { Process doc; diff --git a/src/test/java/org/w3id/cwl/cwl1_2/utils/SchemaDefTest.java b/src/test/java/org/commonwl/cwlsdk/cwl1_2/utils/SchemaDefTest.java similarity index 89% rename from src/test/java/org/w3id/cwl/cwl1_2/utils/SchemaDefTest.java rename to src/test/java/org/commonwl/cwlsdk/cwl1_2/utils/SchemaDefTest.java index 3e890d21..14fc18bc 100644 --- a/src/test/java/org/w3id/cwl/cwl1_2/utils/SchemaDefTest.java +++ b/src/test/java/org/commonwl/cwlsdk/cwl1_2/utils/SchemaDefTest.java @@ -1,10 +1,10 @@ -package org.w3id.cwl.cwl1_2.utils; +package org.commonwl.cwlsdk.cwl1_2.utils; import java.util.List; import org.junit.Assert; -import org.w3id.cwl.cwl1_2.InputRecordSchema; -import org.w3id.cwl.cwl1_2.Process; -import org.w3id.cwl.cwl1_2.SchemaDefRequirement; +import org.commonwl.cwlsdk.cwl1_2.InputRecordSchema; +import org.commonwl.cwlsdk.cwl1_2.Process; +import org.commonwl.cwlsdk.cwl1_2.SchemaDefRequirement; public class SchemaDefTest { diff --git a/src/test/java/org/w3id/cwl/cwl1_2/utils/SecondaryFilesTest.java b/src/test/java/org/commonwl/cwlsdk/cwl1_2/utils/SecondaryFilesTest.java similarity index 87% rename from src/test/java/org/w3id/cwl/cwl1_2/utils/SecondaryFilesTest.java rename to src/test/java/org/commonwl/cwlsdk/cwl1_2/utils/SecondaryFilesTest.java index 6bf5d274..71a53283 100644 --- a/src/test/java/org/w3id/cwl/cwl1_2/utils/SecondaryFilesTest.java +++ b/src/test/java/org/commonwl/cwlsdk/cwl1_2/utils/SecondaryFilesTest.java @@ -1,14 +1,14 @@ -package org.w3id.cwl.cwl1_2.utils; +package org.commonwl.cwlsdk.cwl1_2.utils; import java.net.URISyntaxException; import java.nio.file.Paths; import java.util.List; import org.junit.Assert; import org.junit.Test; -import org.w3id.cwl.cwl1_2.Process; -import org.w3id.cwl.cwl1_2.SecondaryFileSchema; -import org.w3id.cwl.cwl1_2.Workflow; -import org.w3id.cwl.cwl1_2.WorkflowInputParameter; +import org.commonwl.cwlsdk.cwl1_2.Process; +import org.commonwl.cwlsdk.cwl1_2.SecondaryFileSchema; +import org.commonwl.cwlsdk.cwl1_2.Workflow; +import org.commonwl.cwlsdk.cwl1_2.WorkflowInputParameter; public class SecondaryFilesTest { List doc; diff --git a/src/test/java/org/w3id/cwl/cwl1_2/utils/ShortnameTest.java b/src/test/java/org/commonwl/cwlsdk/cwl1_2/utils/ShortnameTest.java similarity index 96% rename from src/test/java/org/w3id/cwl/cwl1_2/utils/ShortnameTest.java rename to src/test/java/org/commonwl/cwlsdk/cwl1_2/utils/ShortnameTest.java index 5644e865..4a2e5081 100644 --- a/src/test/java/org/w3id/cwl/cwl1_2/utils/ShortnameTest.java +++ b/src/test/java/org/commonwl/cwlsdk/cwl1_2/utils/ShortnameTest.java @@ -1,4 +1,4 @@ -package org.w3id.cwl.cwl1_2.utils; +package org.commonwl.cwlsdk.cwl1_2.utils; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/org/w3id/cwl/cwl1_2/utils/WorkflowClassTest.java b/src/test/java/org/commonwl/cwlsdk/cwl1_2/utils/WorkflowClassTest.java similarity index 84% rename from src/test/java/org/w3id/cwl/cwl1_2/utils/WorkflowClassTest.java rename to src/test/java/org/commonwl/cwlsdk/cwl1_2/utils/WorkflowClassTest.java index e9a3fc72..765d7dbd 100644 --- a/src/test/java/org/w3id/cwl/cwl1_2/utils/WorkflowClassTest.java +++ b/src/test/java/org/commonwl/cwlsdk/cwl1_2/utils/WorkflowClassTest.java @@ -1,10 +1,10 @@ -package org.w3id.cwl.cwl1_2.utils; +package org.commonwl.cwlsdk.cwl1_2.utils; import java.net.URISyntaxException; import org.junit.Assert; import org.junit.Test; -import org.w3id.cwl.cwl1_2.CWLVersion; -import org.w3id.cwl.cwl1_2.Process; +import org.commonwl.cwlsdk.cwl1_2.CWLVersion; +import org.commonwl.cwlsdk.cwl1_2.Process; public class WorkflowClassTest { Process doc; diff --git a/src/test/java/org/w3id/cwl/cwl1_2/utils/YamlUtilsTest.java b/src/test/java/org/commonwl/cwlsdk/cwl1_2/utils/YamlUtilsTest.java similarity index 89% rename from src/test/java/org/w3id/cwl/cwl1_2/utils/YamlUtilsTest.java rename to src/test/java/org/commonwl/cwlsdk/cwl1_2/utils/YamlUtilsTest.java index 7c2df684..e79469ca 100644 --- a/src/test/java/org/w3id/cwl/cwl1_2/utils/YamlUtilsTest.java +++ b/src/test/java/org/commonwl/cwlsdk/cwl1_2/utils/YamlUtilsTest.java @@ -1,4 +1,4 @@ -package org.w3id.cwl.cwl1_2.utils; +package org.commonwl.cwlsdk.cwl1_2.utils; import java.util.Map; import org.junit.Assert; diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/525.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/525.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/525.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/525.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/capture_kit.yml b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/capture_kit.yml similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/capture_kit.yml rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/capture_kit.yml diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/envvar.yml b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/envvar.yml similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/envvar.yml rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/envvar.yml diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/params_inc.yml b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/params_inc.yml similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/params_inc.yml rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/params_inc.yml diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/record-in-format.cwl.json b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/record-in-format.cwl.json similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/record-in-format.cwl.json rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/record-in-format.cwl.json diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/schemadef-type.yml b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/schemadef-type.yml similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/schemadef-type.yml rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/schemadef-type.yml diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/underscore.js b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/underscore.js similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/underscore.js rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/underscore.js diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_anon_enum_inside_array.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_anon_enum_inside_array.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_anon_enum_inside_array.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_anon_enum_inside_array.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_anon_enum_inside_array_inside_schemadef.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_anon_enum_inside_array_inside_schemadef.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_anon_enum_inside_array_inside_schemadef.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_anon_enum_inside_array_inside_schemadef.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_any-type-compat.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_any-type-compat.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_any-type-compat.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_any-type-compat.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_basename-fields-test.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_basename-fields-test.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_basename-fields-test.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_basename-fields-test.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_binding-test.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_binding-test.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_binding-test.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_binding-test.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_bool-empty-inputbinding.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_bool-empty-inputbinding.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_bool-empty-inputbinding.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_bool-empty-inputbinding.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_bwa-mem-tool.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_bwa-mem-tool.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_bwa-mem-tool.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_bwa-mem-tool.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_cat-from-dir.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_cat-from-dir.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_cat-from-dir.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_cat-from-dir.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_cat-tool.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_cat-tool.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_cat-tool.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_cat-tool.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_cat1-testcli.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_cat1-testcli.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_cat1-testcli.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_cat1-testcli.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_cat3-from-dir.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_cat3-from-dir.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_cat3-from-dir.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_cat3-from-dir.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_cat3-nodocker.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_cat3-nodocker.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_cat3-nodocker.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_cat3-nodocker.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_cat3-tool-docker.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_cat3-tool-docker.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_cat3-tool-docker.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_cat3-tool-docker.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_cat3-tool-mediumcut.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_cat3-tool-mediumcut.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_cat3-tool-mediumcut.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_cat3-tool-mediumcut.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_cat3-tool-shortcut.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_cat3-tool-shortcut.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_cat3-tool-shortcut.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_cat3-tool-shortcut.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_cat3-tool.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_cat3-tool.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_cat3-tool.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_cat3-tool.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_cat4-tool.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_cat4-tool.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_cat4-tool.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_cat4-tool.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_cat5-tool.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_cat5-tool.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_cat5-tool.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_cat5-tool.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_conflict-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_conflict-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_conflict-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_conflict-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_count-lines1-wf-noET.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_count-lines1-wf-noET.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_count-lines1-wf-noET.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_count-lines1-wf-noET.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_count-lines1-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_count-lines1-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_count-lines1-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_count-lines1-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_count-lines10-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_count-lines10-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_count-lines10-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_count-lines10-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_count-lines11-extra-step-wf-noET.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_count-lines11-extra-step-wf-noET.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_count-lines11-extra-step-wf-noET.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_count-lines11-extra-step-wf-noET.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_count-lines11-extra-step-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_count-lines11-extra-step-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_count-lines11-extra-step-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_count-lines11-extra-step-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_count-lines11-null-step-wf-noET.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_count-lines11-null-step-wf-noET.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_count-lines11-null-step-wf-noET.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_count-lines11-null-step-wf-noET.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_count-lines11-null-step-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_count-lines11-null-step-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_count-lines11-null-step-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_count-lines11-null-step-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_count-lines11-wf-noET.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_count-lines11-wf-noET.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_count-lines11-wf-noET.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_count-lines11-wf-noET.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_count-lines11-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_count-lines11-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_count-lines11-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_count-lines11-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_count-lines12-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_count-lines12-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_count-lines12-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_count-lines12-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_count-lines13-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_count-lines13-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_count-lines13-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_count-lines13-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_count-lines14-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_count-lines14-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_count-lines14-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_count-lines14-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_count-lines15-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_count-lines15-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_count-lines15-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_count-lines15-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_count-lines16-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_count-lines16-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_count-lines16-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_count-lines16-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_count-lines17-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_count-lines17-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_count-lines17-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_count-lines17-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_count-lines18-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_count-lines18-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_count-lines18-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_count-lines18-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_count-lines2-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_count-lines2-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_count-lines2-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_count-lines2-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_count-lines3-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_count-lines3-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_count-lines3-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_count-lines3-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_count-lines4-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_count-lines4-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_count-lines4-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_count-lines4-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_count-lines5-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_count-lines5-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_count-lines5-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_count-lines5-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_count-lines6-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_count-lines6-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_count-lines6-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_count-lines6-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_count-lines7-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_count-lines7-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_count-lines7-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_count-lines7-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_count-lines8-wf-noET.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_count-lines8-wf-noET.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_count-lines8-wf-noET.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_count-lines8-wf-noET.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_count-lines8-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_count-lines8-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_count-lines8-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_count-lines8-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_count-lines9-wf-noET.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_count-lines9-wf-noET.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_count-lines9-wf-noET.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_count-lines9-wf-noET.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_count-lines9-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_count-lines9-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_count-lines9-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_count-lines9-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_default_path.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_default_path.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_default_path.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_default_path.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_dir.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_dir.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_dir.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_dir.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_dir2.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_dir2.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_dir2.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_dir2.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_dir3.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_dir3.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_dir3.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_dir3.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_dir4.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_dir4.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_dir4.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_dir4.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_dir5.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_dir5.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_dir5.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_dir5.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_dir6.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_dir6.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_dir6.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_dir6.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_dir7.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_dir7.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_dir7.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_dir7.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_docker-array-secondaryfiles.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_docker-array-secondaryfiles.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_docker-array-secondaryfiles.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_docker-array-secondaryfiles.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_docker-output-dir.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_docker-output-dir.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_docker-output-dir.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_docker-output-dir.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_docker-run-cmd.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_docker-run-cmd.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_docker-run-cmd.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_docker-run-cmd.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_dynresreq-default.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_dynresreq-default.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_dynresreq-default.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_dynresreq-default.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_dynresreq-dir.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_dynresreq-dir.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_dynresreq-dir.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_dynresreq-dir.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_dynresreq-workflow-inputdefault.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_dynresreq-workflow-inputdefault.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_dynresreq-workflow-inputdefault.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_dynresreq-workflow-inputdefault.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_dynresreq-workflow-stepdefault.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_dynresreq-workflow-stepdefault.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_dynresreq-workflow-stepdefault.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_dynresreq-workflow-stepdefault.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_dynresreq-workflow-tooldefault.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_dynresreq-workflow-tooldefault.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_dynresreq-workflow-tooldefault.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_dynresreq-workflow-tooldefault.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_dynresreq-workflow.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_dynresreq-workflow.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_dynresreq-workflow.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_dynresreq-workflow.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_dynresreq.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_dynresreq.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_dynresreq.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_dynresreq.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_echo-file-tool.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_echo-file-tool.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_echo-file-tool.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_echo-file-tool.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_echo-position-expr.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_echo-position-expr.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_echo-position-expr.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_echo-position-expr.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_echo-tool-default.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_echo-tool-default.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_echo-tool-default.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_echo-tool-default.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_echo-tool-packed.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_echo-tool-packed.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_echo-tool-packed.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_echo-tool-packed.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_echo-tool-packed2.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_echo-tool-packed2.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_echo-tool-packed2.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_echo-tool-packed2.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_echo-tool.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_echo-tool.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_echo-tool.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_echo-tool.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_echo-wf-default.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_echo-wf-default.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_echo-wf-default.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_echo-wf-default.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_empty-array-input.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_empty-array-input.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_empty-array-input.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_empty-array-input.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_env-tool1.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_env-tool1.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_env-tool1.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_env-tool1.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_env-tool2.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_env-tool2.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_env-tool2.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_env-tool2.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_env-tool3.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_env-tool3.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_env-tool3.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_env-tool3.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_env-tool4.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_env-tool4.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_env-tool4.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_env-tool4.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_env-wf1.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_env-wf1.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_env-wf1.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_env-wf1.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_env-wf2.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_env-wf2.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_env-wf2.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_env-wf2.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_env-wf3.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_env-wf3.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_env-wf3.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_env-wf3.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_envvar.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_envvar.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_envvar.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_envvar.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_envvar2.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_envvar2.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_envvar2.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_envvar2.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_envvar3.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_envvar3.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_envvar3.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_envvar3.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_exit-success.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_exit-success.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_exit-success.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_exit-success.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_exitcode.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_exitcode.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_exitcode.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_exitcode.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_fail-unconnected.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_fail-unconnected.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_fail-unconnected.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_fail-unconnected.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_fail-unspecified-input.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_fail-unspecified-input.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_fail-unspecified-input.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_fail-unspecified-input.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_file-literal-ex.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_file-literal-ex.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_file-literal-ex.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_file-literal-ex.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_formattest.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_formattest.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_formattest.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_formattest.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_formattest2.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_formattest2.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_formattest2.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_formattest2.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_formattest3.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_formattest3.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_formattest3.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_formattest3.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_glob-expr-list.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_glob-expr-list.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_glob-expr-list.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_glob-expr-list.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_glob-path-error.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_glob-path-error.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_glob-path-error.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_glob-path-error.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_glob_directory.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_glob_directory.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_glob_directory.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_glob_directory.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_glob_test.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_glob_test.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_glob_test.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_glob_test.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_import_schema-def.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_import_schema-def.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_import_schema-def.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_import_schema-def.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_import_schema-def_packed.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_import_schema-def_packed.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_import_schema-def_packed.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_import_schema-def_packed.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_imported-hint.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_imported-hint.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_imported-hint.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_imported-hint.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_initialwork-path.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_initialwork-path.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_initialwork-path.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_initialwork-path.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_initialworkdir-glob-fullpath.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_initialworkdir-glob-fullpath.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_initialworkdir-glob-fullpath.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_initialworkdir-glob-fullpath.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_initialworkdirrequirement-docker-out.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_initialworkdirrequirement-docker-out.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_initialworkdirrequirement-docker-out.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_initialworkdirrequirement-docker-out.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_inline-js.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_inline-js.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_inline-js.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_inline-js.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_inp_update_wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_inp_update_wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_inp_update_wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_inp_update_wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_inpdir_update_wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_inpdir_update_wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_inpdir_update_wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_inpdir_update_wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_io-any-1.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_io-any-1.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_io-any-1.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_io-any-1.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_io-any-wf-1.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_io-any-wf-1.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_io-any-wf-1.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_io-any-wf-1.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_io-file-default-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_io-file-default-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_io-file-default-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_io-file-default-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_io-file-or-files.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_io-file-or-files.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_io-file-or-files.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_io-file-or-files.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_io-int-default-tool-and-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_io-int-default-tool-and-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_io-int-default-tool-and-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_io-int-default-tool-and-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_io-int-default-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_io-int-default-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_io-int-default-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_io-int-default-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_io-int-optional-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_io-int-optional-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_io-int-optional-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_io-int-optional-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_io-int-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_io-int-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_io-int-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_io-int-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_io-union-input-default-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_io-union-input-default-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_io-union-input-default-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_io-union-input-default-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_iwdr-entry.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_iwdr-entry.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_iwdr-entry.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_iwdr-entry.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_iwdr_with_nested_dirs.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_iwdr_with_nested_dirs.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_iwdr_with_nested_dirs.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_iwdr_with_nested_dirs.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_js-expr-req-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_js-expr-req-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_js-expr-req-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_js-expr-req-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_linkfile.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_linkfile.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_linkfile.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_linkfile.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_listing_deep1.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_listing_deep1.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_listing_deep1.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_listing_deep1.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_listing_deep2.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_listing_deep2.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_listing_deep2.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_listing_deep2.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_listing_none1.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_listing_none1.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_listing_none1.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_listing_none1.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_listing_none2.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_listing_none2.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_listing_none2.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_listing_none2.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_listing_none3.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_listing_none3.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_listing_none3.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_listing_none3.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_listing_shallow1.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_listing_shallow1.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_listing_shallow1.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_listing_shallow1.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_listing_shallow2.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_listing_shallow2.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_listing_shallow2.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_listing_shallow2.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_metadata.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_metadata.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_metadata.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_metadata.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_mkdir.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_mkdir.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_mkdir.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_mkdir.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_nameroot.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_nameroot.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_nameroot.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_nameroot.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_nested-array.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_nested-array.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_nested-array.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_nested-array.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_networkaccess.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_networkaccess.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_networkaccess.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_networkaccess.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_networkaccess2.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_networkaccess2.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_networkaccess2.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_networkaccess2.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_no-inputs-tool.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_no-inputs-tool.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_no-inputs-tool.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_no-inputs-tool.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_no-inputs-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_no-inputs-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_no-inputs-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_no-inputs-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_no-outputs-tool.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_no-outputs-tool.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_no-outputs-tool.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_no-outputs-tool.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_no-outputs-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_no-outputs-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_no-outputs-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_no-outputs-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_null-defined.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_null-defined.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_null-defined.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_null-defined.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_null-expression1-tool.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_null-expression1-tool.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_null-expression1-tool.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_null-expression1-tool.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_null-expression2-tool.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_null-expression2-tool.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_null-expression2-tool.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_null-expression2-tool.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_null-expression3-tool.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_null-expression3-tool.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_null-expression3-tool.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_null-expression3-tool.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_optional-numerical-output-0.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_optional-numerical-output-0.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_optional-numerical-output-0.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_optional-numerical-output-0.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_optional-output.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_optional-output.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_optional-output.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_optional-output.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_output-arrays-file-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_output-arrays-file-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_output-arrays-file-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_output-arrays-file-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_output-arrays-int-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_output-arrays-int-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_output-arrays-int-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_output-arrays-int-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_output-arrays-int.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_output-arrays-int.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_output-arrays-int.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_output-arrays-int.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_params.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_params.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_params.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_params.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_params2.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_params2.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_params2.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_params2.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_parseInt-tool.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_parseInt-tool.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_parseInt-tool.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_parseInt-tool.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_pass-unconnected.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_pass-unconnected.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_pass-unconnected.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_pass-unconnected.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_record-in-format.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_record-in-format.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_record-in-format.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_record-in-format.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_record-in-secondaryFiles-missing-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_record-in-secondaryFiles-missing-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_record-in-secondaryFiles-missing-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_record-in-secondaryFiles-missing-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_record-in-secondaryFiles-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_record-in-secondaryFiles-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_record-in-secondaryFiles-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_record-in-secondaryFiles-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_record-in-secondaryFiles.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_record-in-secondaryFiles.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_record-in-secondaryFiles.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_record-in-secondaryFiles.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_record-out-format.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_record-out-format.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_record-out-format.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_record-out-format.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_record-out-secondaryFiles.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_record-out-secondaryFiles.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_record-out-secondaryFiles.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_record-out-secondaryFiles.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_record-output-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_record-output-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_record-output-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_record-output-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_record-output.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_record-output.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_record-output.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_record-output.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_record-sd-secondaryFiles.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_record-sd-secondaryFiles.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_record-sd-secondaryFiles.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_record-sd-secondaryFiles.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_recursive-input-directory.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_recursive-input-directory.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_recursive-input-directory.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_recursive-input-directory.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_rename.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_rename.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_rename.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_rename.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_revsort-packed.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_revsort-packed.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_revsort-packed.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_revsort-packed.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_revsort.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_revsort.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_revsort.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_revsort.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_revtool.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_revtool.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_revtool.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_revtool.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_runtime-paths-distinct.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_runtime-paths-distinct.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_runtime-paths-distinct.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_runtime-paths-distinct.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_scatter-valueFrom-tool.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_scatter-valueFrom-tool.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_scatter-valueFrom-tool.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_scatter-valueFrom-tool.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_scatter-valuefrom-inputs-wf1.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_scatter-valuefrom-inputs-wf1.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_scatter-valuefrom-inputs-wf1.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_scatter-valuefrom-inputs-wf1.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_scatter-valuefrom-wf1.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_scatter-valuefrom-wf1.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_scatter-valuefrom-wf1.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_scatter-valuefrom-wf1.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_scatter-valuefrom-wf2.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_scatter-valuefrom-wf2.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_scatter-valuefrom-wf2.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_scatter-valuefrom-wf2.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_scatter-valuefrom-wf3.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_scatter-valuefrom-wf3.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_scatter-valuefrom-wf3.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_scatter-valuefrom-wf3.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_scatter-valuefrom-wf4.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_scatter-valuefrom-wf4.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_scatter-valuefrom-wf4.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_scatter-valuefrom-wf4.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_scatter-valuefrom-wf5.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_scatter-valuefrom-wf5.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_scatter-valuefrom-wf5.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_scatter-valuefrom-wf5.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_scatter-valuefrom-wf6.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_scatter-valuefrom-wf6.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_scatter-valuefrom-wf6.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_scatter-valuefrom-wf6.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_scatter-wf1.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_scatter-wf1.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_scatter-wf1.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_scatter-wf1.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_scatter-wf2.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_scatter-wf2.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_scatter-wf2.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_scatter-wf2.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_scatter-wf3.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_scatter-wf3.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_scatter-wf3.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_scatter-wf3.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_scatter-wf4.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_scatter-wf4.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_scatter-wf4.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_scatter-wf4.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_schemadef-tool.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_schemadef-tool.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_schemadef-tool.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_schemadef-tool.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_schemadef-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_schemadef-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_schemadef-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_schemadef-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_search.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_search.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_search.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_search.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_shellchar.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_shellchar.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_shellchar.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_shellchar.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_shellchar2.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_shellchar2.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_shellchar2.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_shellchar2.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_size-expression-tool.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_size-expression-tool.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_size-expression-tool.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_size-expression-tool.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_sorttool.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_sorttool.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_sorttool.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_sorttool.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_stage-array-dirs.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_stage-array-dirs.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_stage-array-dirs.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_stage-array-dirs.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_stage-array.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_stage-array.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_stage-array.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_stage-array.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_stage-unprovided-file.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_stage-unprovided-file.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_stage-unprovided-file.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_stage-unprovided-file.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_stage_file_array.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_stage_file_array.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_stage_file_array.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_stage_file_array.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_stage_file_array_basename.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_stage_file_array_basename.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_stage_file_array_basename.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_stage_file_array_basename.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_stage_file_array_basename_and_entryname.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_stage_file_array_basename_and_entryname.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_stage_file_array_basename_and_entryname.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_stage_file_array_basename_and_entryname.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_stagefile.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_stagefile.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_stagefile.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_stagefile.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_stderr-mediumcut.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_stderr-mediumcut.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_stderr-mediumcut.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_stderr-mediumcut.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_stderr-shortcut.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_stderr-shortcut.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_stderr-shortcut.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_stderr-shortcut.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_stderr.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_stderr.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_stderr.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_stderr.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_step-valuefrom-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_step-valuefrom-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_step-valuefrom-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_step-valuefrom-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_step-valuefrom2-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_step-valuefrom2-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_step-valuefrom2-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_step-valuefrom2-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_step-valuefrom3-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_step-valuefrom3-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_step-valuefrom3-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_step-valuefrom3-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_step-valuefrom4-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_step-valuefrom4-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_step-valuefrom4-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_step-valuefrom4-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_step-valuefrom5-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_step-valuefrom5-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_step-valuefrom5-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_step-valuefrom5-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_steplevel-resreq.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_steplevel-resreq.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_steplevel-resreq.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_steplevel-resreq.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_sum-wf-noET.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_sum-wf-noET.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_sum-wf-noET.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_sum-wf-noET.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_sum-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_sum-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_sum-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_sum-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_symlink-illegal.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_symlink-illegal.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_symlink-illegal.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_symlink-illegal.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_symlink-legal.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_symlink-legal.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_symlink-legal.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_symlink-legal.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_template-tool.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_template-tool.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_template-tool.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_template-tool.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_test-cwl-out.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_test-cwl-out.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_test-cwl-out.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_test-cwl-out.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_test-cwl-out2.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_test-cwl-out2.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_test-cwl-out2.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_test-cwl-out2.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_timelimit.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_timelimit.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_timelimit.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_timelimit.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_timelimit2-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_timelimit2-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_timelimit2-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_timelimit2-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_timelimit2.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_timelimit2.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_timelimit2.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_timelimit2.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_timelimit3-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_timelimit3-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_timelimit3-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_timelimit3-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_timelimit3.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_timelimit3.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_timelimit3.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_timelimit3.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_timelimit4.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_timelimit4.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_timelimit4.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_timelimit4.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_timelimit5.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_timelimit5.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_timelimit5.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_timelimit5.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_tmap-tool.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_tmap-tool.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_tmap-tool.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_tmap-tool.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_touch.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_touch.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_touch.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_touch.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_updatedir_inplace.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_updatedir_inplace.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_updatedir_inplace.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_updatedir_inplace.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_updateval_inplace.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_updateval_inplace.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_updateval_inplace.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_updateval_inplace.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_valueFrom-constant.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_valueFrom-constant.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_valueFrom-constant.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_valueFrom-constant.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_vf-concat.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_vf-concat.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_vf-concat.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_vf-concat.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_wc-tool-shortcut.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_wc-tool-shortcut.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_wc-tool-shortcut.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_wc-tool-shortcut.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_wc-tool.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_wc-tool.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_wc-tool.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_wc-tool.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_wc2-tool.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_wc2-tool.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_wc2-tool.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_wc2-tool.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_wc3-tool.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_wc3-tool.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_wc3-tool.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_wc3-tool.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_wc4-tool.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_wc4-tool.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_wc4-tool.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_wc4-tool.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_wf-loadContents.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_wf-loadContents.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_wf-loadContents.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_wf-loadContents.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_wf-loadContents2.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_wf-loadContents2.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_wf-loadContents2.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_wf-loadContents2.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_wf-loadContents3.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_wf-loadContents3.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_wf-loadContents3.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_wf-loadContents3.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_wf-loadContents4.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_wf-loadContents4.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_wf-loadContents4.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_wf-loadContents4.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_writable-dir-docker.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_writable-dir-docker.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_writable-dir-docker.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_writable-dir-docker.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_writable-dir.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_writable-dir.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_1/utils/valid_writable-dir.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_1/utils/valid_writable-dir.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/525.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/525.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/525.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/525.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/EDAM.owl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/EDAM.owl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/EDAM.owl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/EDAM.owl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/action.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/action.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/action.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/action.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/args.py b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/args.py similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/args.py rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/args.py diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/bar.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/bar.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/bar.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/bar.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/capture_kit.yml b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/capture_kit.yml similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/capture_kit.yml rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/capture_kit.yml diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/cat-tool.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/cat-tool.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/cat-tool.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/cat-tool.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/cat.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/cat.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/cat.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/cat.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/check.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/check.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/check.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/check.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/count-lines1-wf-noET.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/count-lines1-wf-noET.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/count-lines1-wf-noET.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/count-lines1-wf-noET.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/count-lines1-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/count-lines1-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/count-lines1-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/count-lines1-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/dcterms.rdf b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/dcterms.rdf similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/dcterms.rdf rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/dcterms.rdf diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/dynresreq-default.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/dynresreq-default.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/dynresreq-default.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/dynresreq-default.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/dynresreq.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/dynresreq.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/dynresreq.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/dynresreq.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/echo-file-tool.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/echo-file-tool.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/echo-file-tool.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/echo-file-tool.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/echo-tool-default.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/echo-tool-default.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/echo-tool-default.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/echo-tool-default.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/echo-tool.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/echo-tool.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/echo-tool.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/echo-tool.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/env-tool1.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/env-tool1.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/env-tool1.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/env-tool1.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/env-tool2.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/env-tool2.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/env-tool2.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/env-tool2.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/envvar.yml b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/envvar.yml similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/envvar.yml rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/envvar.yml diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/fail-unspecified-input.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/fail-unspecified-input.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/fail-unspecified-input.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/fail-unspecified-input.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/foaf.rdf b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/foaf.rdf similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/foaf.rdf rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/foaf.rdf diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/foo.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/foo.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/foo.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/foo.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/gx_edam.ttl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/gx_edam.ttl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/gx_edam.ttl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/gx_edam.ttl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/hello.txt b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/hello.txt similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/hello.txt rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/hello.txt diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/inp-filelist.txt b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/inp-filelist.txt similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/inp-filelist.txt rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/inp-filelist.txt diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/io-any-1.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/io-any-1.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/io-any-1.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/io-any-1.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/loadit.py b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/loadit.py similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/loadit.py rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/loadit.py diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/mkdir.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/mkdir.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/mkdir.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/mkdir.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/mkfilelist.py b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/mkfilelist.py similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/mkfilelist.py rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/mkfilelist.py diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/null-expression3-tool.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/null-expression3-tool.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/null-expression3-tool.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/null-expression3-tool.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/params_inc.yml b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/params_inc.yml similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/params_inc.yml rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/params_inc.yml diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/parseInt-tool.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/parseInt-tool.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/parseInt-tool.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/parseInt-tool.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/record-in-format.cwl.json b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/record-in-format.cwl.json similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/record-in-format.cwl.json rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/record-in-format.cwl.json diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/record-in-secondaryFiles.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/record-in-secondaryFiles.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/record-in-secondaryFiles.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/record-in-secondaryFiles.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/record-output.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/record-output.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/record-output.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/record-output.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/rename-inputs.yml b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/rename-inputs.yml similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/rename-inputs.yml rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/rename-inputs.yml diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/rename.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/rename.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/rename.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/rename.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/revtool.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/revtool.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/revtool.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/revtool.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/scatter-valueFrom-tool.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/scatter-valueFrom-tool.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/scatter-valueFrom-tool.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/scatter-valueFrom-tool.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/schemadef-tool.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/schemadef-tool.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/schemadef-tool.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/schemadef-tool.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/schemadef-type.yml b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/schemadef-type.yml similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/schemadef-type.yml rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/schemadef-type.yml diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/schemadef_types_with_import-tool.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/schemadef_types_with_import-tool.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/schemadef_types_with_import-tool.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/schemadef_types_with_import-tool.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/schemadef_types_with_import_readgroup.yml b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/schemadef_types_with_import_readgroup.yml similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/schemadef_types_with_import_readgroup.yml rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/schemadef_types_with_import_readgroup.yml diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/search.py b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/search.py similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/search.py rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/search.py diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/sorttool.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/sorttool.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/sorttool.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/sorttool.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/special_file b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/special_file similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/special_file rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/special_file diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/testdir/a b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/testdir/a similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/testdir/a rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/testdir/a diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/testdir/b b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/testdir/b similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/testdir/b rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/testdir/b diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/testdir/c/d b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/testdir/c/d similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/testdir/c/d rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/testdir/c/d diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/touch.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/touch.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/touch.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/touch.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/underscore.js b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/underscore.js similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/underscore.js rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/underscore.js diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/updatedir_inplace.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/updatedir_inplace.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/updatedir_inplace.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/updatedir_inplace.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/updateval.py b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/updateval.py similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/updateval.py rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/updateval.py diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/updateval_inplace.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/updateval_inplace.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/updateval_inplace.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/updateval_inplace.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_action.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_action.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_action.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_action.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_anon_enum_inside_array.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_anon_enum_inside_array.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_anon_enum_inside_array.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_anon_enum_inside_array.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_anon_enum_inside_array_inside_schemadef.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_anon_enum_inside_array_inside_schemadef.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_anon_enum_inside_array_inside_schemadef.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_anon_enum_inside_array_inside_schemadef.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_any-type-compat.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_any-type-compat.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_any-type-compat.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_any-type-compat.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_bar.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_bar.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_bar.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_bar.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_basename-fields-test.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_basename-fields-test.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_basename-fields-test.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_basename-fields-test.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_bash-dollar-quote.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_bash-dollar-quote.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_bash-dollar-quote.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_bash-dollar-quote.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_bash-line-continuation-with-expression.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_bash-line-continuation-with-expression.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_bash-line-continuation-with-expression.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_bash-line-continuation-with-expression.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_bash-line-continuation.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_bash-line-continuation.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_bash-line-continuation.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_bash-line-continuation.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_binding-test.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_binding-test.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_binding-test.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_binding-test.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_bool-empty-inputbinding.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_bool-empty-inputbinding.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_bool-empty-inputbinding.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_bool-empty-inputbinding.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_bwa-mem-tool.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_bwa-mem-tool.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_bwa-mem-tool.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_bwa-mem-tool.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_cat-from-dir.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_cat-from-dir.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_cat-from-dir.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_cat-from-dir.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_cat-tool-shortcut.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_cat-tool-shortcut.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_cat-tool-shortcut.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_cat-tool-shortcut.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_cat-tool.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_cat-tool.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_cat-tool.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_cat-tool.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_cat.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_cat.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_cat.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_cat.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_cat1-testcli.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_cat1-testcli.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_cat1-testcli.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_cat1-testcli.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_cat3-from-dir.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_cat3-from-dir.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_cat3-from-dir.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_cat3-from-dir.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_cat3-nodocker.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_cat3-nodocker.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_cat3-nodocker.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_cat3-nodocker.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_cat3-tool-docker.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_cat3-tool-docker.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_cat3-tool-docker.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_cat3-tool-docker.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_cat3-tool-mediumcut.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_cat3-tool-mediumcut.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_cat3-tool-mediumcut.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_cat3-tool-mediumcut.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_cat3-tool-shortcut.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_cat3-tool-shortcut.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_cat3-tool-shortcut.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_cat3-tool-shortcut.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_cat3-tool.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_cat3-tool.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_cat3-tool.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_cat3-tool.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_cat4-from-dir.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_cat4-from-dir.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_cat4-from-dir.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_cat4-from-dir.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_cat4-tool.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_cat4-tool.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_cat4-tool.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_cat4-tool.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_cat5-tool.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_cat5-tool.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_cat5-tool.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_cat5-tool.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_check.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_check.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_check.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_check.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_colon:test.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_colon:test.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_colon:test.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_colon:test.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_colon_test_output.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_colon_test_output.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_colon_test_output.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_colon_test_output.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_cond-wf-001.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_cond-wf-001.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_cond-wf-001.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_cond-wf-001.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_cond-wf-001_nojs.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_cond-wf-001_nojs.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_cond-wf-001_nojs.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_cond-wf-001_nojs.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_cond-wf-002.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_cond-wf-002.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_cond-wf-002.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_cond-wf-002.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_cond-wf-002_nojs.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_cond-wf-002_nojs.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_cond-wf-002_nojs.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_cond-wf-002_nojs.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_cond-wf-003.1.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_cond-wf-003.1.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_cond-wf-003.1.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_cond-wf-003.1.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_cond-wf-003.1_nojs.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_cond-wf-003.1_nojs.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_cond-wf-003.1_nojs.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_cond-wf-003.1_nojs.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_cond-wf-003.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_cond-wf-003.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_cond-wf-003.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_cond-wf-003.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_cond-wf-003_nojs.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_cond-wf-003_nojs.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_cond-wf-003_nojs.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_cond-wf-003_nojs.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_cond-wf-004.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_cond-wf-004.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_cond-wf-004.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_cond-wf-004.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_cond-wf-004_nojs.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_cond-wf-004_nojs.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_cond-wf-004_nojs.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_cond-wf-004_nojs.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_cond-wf-006.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_cond-wf-006.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_cond-wf-006.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_cond-wf-006.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_cond-wf-006_nojs.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_cond-wf-006_nojs.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_cond-wf-006_nojs.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_cond-wf-006_nojs.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_cond-wf-007.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_cond-wf-007.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_cond-wf-007.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_cond-wf-007.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_cond-wf-007_nojs.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_cond-wf-007_nojs.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_cond-wf-007_nojs.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_cond-wf-007_nojs.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_cond-wf-009.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_cond-wf-009.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_cond-wf-009.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_cond-wf-009.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_cond-wf-009_nojs.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_cond-wf-009_nojs.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_cond-wf-009_nojs.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_cond-wf-009_nojs.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_cond-wf-010.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_cond-wf-010.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_cond-wf-010.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_cond-wf-010.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_cond-wf-010_nojs.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_cond-wf-010_nojs.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_cond-wf-010_nojs.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_cond-wf-010_nojs.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_cond-wf-011.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_cond-wf-011.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_cond-wf-011.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_cond-wf-011.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_cond-wf-011_nojs.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_cond-wf-011_nojs.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_cond-wf-011_nojs.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_cond-wf-011_nojs.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_cond-wf-012.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_cond-wf-012.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_cond-wf-012.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_cond-wf-012.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_cond-wf-012_nojs.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_cond-wf-012_nojs.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_cond-wf-012_nojs.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_cond-wf-012_nojs.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_cond-wf-013.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_cond-wf-013.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_cond-wf-013.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_cond-wf-013.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_cond-wf-013_nojs.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_cond-wf-013_nojs.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_cond-wf-013_nojs.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_cond-wf-013_nojs.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_cond-with-defaults.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_cond-with-defaults.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_cond-with-defaults.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_cond-with-defaults.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_cores_float.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_cores_float.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_cores_float.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_cores_float.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_count-lines1-wf-noET.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_count-lines1-wf-noET.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_count-lines1-wf-noET.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_count-lines1-wf-noET.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_count-lines1-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_count-lines1-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_count-lines1-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_count-lines1-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_count-lines10-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_count-lines10-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_count-lines10-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_count-lines10-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_count-lines11-extra-step-wf-noET.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_count-lines11-extra-step-wf-noET.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_count-lines11-extra-step-wf-noET.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_count-lines11-extra-step-wf-noET.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_count-lines11-extra-step-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_count-lines11-extra-step-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_count-lines11-extra-step-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_count-lines11-extra-step-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_count-lines11-null-step-wf-noET.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_count-lines11-null-step-wf-noET.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_count-lines11-null-step-wf-noET.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_count-lines11-null-step-wf-noET.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_count-lines11-null-step-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_count-lines11-null-step-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_count-lines11-null-step-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_count-lines11-null-step-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_count-lines11-wf-noET.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_count-lines11-wf-noET.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_count-lines11-wf-noET.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_count-lines11-wf-noET.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_count-lines11-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_count-lines11-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_count-lines11-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_count-lines11-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_count-lines12-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_count-lines12-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_count-lines12-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_count-lines12-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_count-lines13-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_count-lines13-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_count-lines13-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_count-lines13-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_count-lines14-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_count-lines14-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_count-lines14-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_count-lines14-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_count-lines15-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_count-lines15-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_count-lines15-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_count-lines15-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_count-lines16-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_count-lines16-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_count-lines16-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_count-lines16-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_count-lines17-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_count-lines17-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_count-lines17-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_count-lines17-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_count-lines18-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_count-lines18-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_count-lines18-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_count-lines18-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_count-lines19-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_count-lines19-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_count-lines19-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_count-lines19-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_count-lines2-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_count-lines2-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_count-lines2-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_count-lines2-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_count-lines3-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_count-lines3-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_count-lines3-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_count-lines3-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_count-lines4-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_count-lines4-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_count-lines4-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_count-lines4-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_count-lines5-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_count-lines5-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_count-lines5-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_count-lines5-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_count-lines6-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_count-lines6-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_count-lines6-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_count-lines6-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_count-lines7-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_count-lines7-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_count-lines7-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_count-lines7-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_count-lines8-wf-noET.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_count-lines8-wf-noET.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_count-lines8-wf-noET.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_count-lines8-wf-noET.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_count-lines8-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_count-lines8-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_count-lines8-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_count-lines8-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_count-lines9-wf-noET.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_count-lines9-wf-noET.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_count-lines9-wf-noET.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_count-lines9-wf-noET.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_count-lines9-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_count-lines9-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_count-lines9-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_count-lines9-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_cwloutput-nolimit.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_cwloutput-nolimit.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_cwloutput-nolimit.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_cwloutput-nolimit.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_default_path.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_default_path.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_default_path.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_default_path.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_dir.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_dir.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_dir.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_dir.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_dir2.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_dir2.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_dir2.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_dir2.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_dir3.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_dir3.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_dir3.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_dir3.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_dir4.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_dir4.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_dir4.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_dir4.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_dir5.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_dir5.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_dir5.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_dir5.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_dir6.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_dir6.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_dir6.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_dir6.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_dir7.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_dir7.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_dir7.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_dir7.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_docker-array-secondaryfiles.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_docker-array-secondaryfiles.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_docker-array-secondaryfiles.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_docker-array-secondaryfiles.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_docker-output-dir.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_docker-output-dir.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_docker-output-dir.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_docker-output-dir.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_docker-run-cmd.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_docker-run-cmd.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_docker-run-cmd.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_docker-run-cmd.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_dynresreq-default.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_dynresreq-default.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_dynresreq-default.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_dynresreq-default.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_dynresreq-dir.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_dynresreq-dir.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_dynresreq-dir.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_dynresreq-dir.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_dynresreq-workflow-inputdefault.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_dynresreq-workflow-inputdefault.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_dynresreq-workflow-inputdefault.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_dynresreq-workflow-inputdefault.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_dynresreq-workflow-stepdefault.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_dynresreq-workflow-stepdefault.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_dynresreq-workflow-stepdefault.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_dynresreq-workflow-stepdefault.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_dynresreq-workflow-tooldefault.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_dynresreq-workflow-tooldefault.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_dynresreq-workflow-tooldefault.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_dynresreq-workflow-tooldefault.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_dynresreq-workflow.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_dynresreq-workflow.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_dynresreq-workflow.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_dynresreq-workflow.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_dynresreq.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_dynresreq.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_dynresreq.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_dynresreq.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_echo-file-tool.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_echo-file-tool.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_echo-file-tool.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_echo-file-tool.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_echo-position-expr.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_echo-position-expr.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_echo-position-expr.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_echo-position-expr.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_echo-tool-default.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_echo-tool-default.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_echo-tool-default.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_echo-tool-default.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_echo-tool-packed.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_echo-tool-packed.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_echo-tool-packed.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_echo-tool-packed.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_echo-tool-packed2.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_echo-tool-packed2.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_echo-tool-packed2.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_echo-tool-packed2.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_echo-tool.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_echo-tool.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_echo-tool.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_echo-tool.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_echo-wf-default.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_echo-wf-default.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_echo-wf-default.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_echo-wf-default.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_empty-array-input.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_empty-array-input.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_empty-array-input.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_empty-array-input.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_env-tool1.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_env-tool1.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_env-tool1.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_env-tool1.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_env-tool2.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_env-tool2.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_env-tool2.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_env-tool2.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_env-tool3.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_env-tool3.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_env-tool3.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_env-tool3.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_env-tool4.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_env-tool4.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_env-tool4.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_env-tool4.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_env-wf1.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_env-wf1.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_env-wf1.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_env-wf1.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_env-wf2.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_env-wf2.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_env-wf2.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_env-wf2.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_env-wf3.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_env-wf3.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_env-wf3.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_env-wf3.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_envvar.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_envvar.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_envvar.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_envvar.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_envvar2.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_envvar2.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_envvar2.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_envvar2.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_envvar3.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_envvar3.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_envvar3.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_envvar3.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_exit-success.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_exit-success.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_exit-success.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_exit-success.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_exitcode.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_exitcode.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_exitcode.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_exitcode.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_fail-unconnected.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_fail-unconnected.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_fail-unconnected.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_fail-unconnected.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_fail-unspecified-input.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_fail-unspecified-input.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_fail-unspecified-input.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_fail-unspecified-input.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_file-literal-ex.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_file-literal-ex.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_file-literal-ex.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_file-literal-ex.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_foo.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_foo.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_foo.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_foo.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_formattest.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_formattest.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_formattest.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_formattest.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_formattest2.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_formattest2.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_formattest2.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_formattest2.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_formattest3.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_formattest3.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_formattest3.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_formattest3.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_glob-expr-list.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_glob-expr-list.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_glob-expr-list.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_glob-expr-list.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_glob-path-error.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_glob-path-error.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_glob-path-error.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_glob-path-error.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_glob_directory.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_glob_directory.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_glob_directory.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_glob_directory.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_glob_test.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_glob_test.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_glob_test.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_glob_test.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_import_schema-def.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_import_schema-def.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_import_schema-def.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_import_schema-def.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_import_schema-def2.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_import_schema-def2.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_import_schema-def2.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_import_schema-def2.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_import_schema-def_packed.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_import_schema-def_packed.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_import_schema-def_packed.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_import_schema-def_packed.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_imported-hint.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_imported-hint.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_imported-hint.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_imported-hint.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_initialwork-path.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_initialwork-path.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_initialwork-path.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_initialwork-path.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_initialworkdir-glob-fullpath.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_initialworkdir-glob-fullpath.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_initialworkdir-glob-fullpath.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_initialworkdir-glob-fullpath.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_initialworkdirrequirement-docker-out.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_initialworkdirrequirement-docker-out.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_initialworkdirrequirement-docker-out.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_initialworkdirrequirement-docker-out.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_inline-js.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_inline-js.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_inline-js.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_inline-js.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_inp_update_wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_inp_update_wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_inp_update_wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_inp_update_wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_inpdir_update_wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_inpdir_update_wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_inpdir_update_wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_inpdir_update_wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_io-any-1.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_io-any-1.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_io-any-1.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_io-any-1.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_io-any-wf-1.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_io-any-wf-1.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_io-any-wf-1.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_io-any-wf-1.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_io-file-default-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_io-file-default-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_io-file-default-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_io-file-default-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_io-file-or-files.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_io-file-or-files.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_io-file-or-files.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_io-file-or-files.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_io-int-default-tool-and-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_io-int-default-tool-and-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_io-int-default-tool-and-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_io-int-default-tool-and-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_io-int-default-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_io-int-default-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_io-int-default-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_io-int-default-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_io-int-optional-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_io-int-optional-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_io-int-optional-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_io-int-optional-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_io-int-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_io-int-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_io-int-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_io-int-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_io-union-input-default-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_io-union-input-default-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_io-union-input-default-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_io-union-input-default-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_iwd-container-entryname1.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_iwd-container-entryname1.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_iwd-container-entryname1.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_iwd-container-entryname1.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_iwd-container-entryname2.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_iwd-container-entryname2.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_iwd-container-entryname2.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_iwd-container-entryname2.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_iwd-container-entryname3.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_iwd-container-entryname3.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_iwd-container-entryname3.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_iwd-container-entryname3.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_iwd-container-entryname4.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_iwd-container-entryname4.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_iwd-container-entryname4.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_iwd-container-entryname4.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_iwd-fileobjs1.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_iwd-fileobjs1.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_iwd-fileobjs1.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_iwd-fileobjs1.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_iwd-fileobjs2.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_iwd-fileobjs2.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_iwd-fileobjs2.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_iwd-fileobjs2.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_iwd-jsondump1-nl.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_iwd-jsondump1-nl.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_iwd-jsondump1-nl.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_iwd-jsondump1-nl.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_iwd-jsondump1.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_iwd-jsondump1.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_iwd-jsondump1.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_iwd-jsondump1.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_iwd-jsondump2-nl.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_iwd-jsondump2-nl.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_iwd-jsondump2-nl.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_iwd-jsondump2-nl.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_iwd-jsondump2.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_iwd-jsondump2.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_iwd-jsondump2.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_iwd-jsondump2.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_iwd-jsondump3-nl.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_iwd-jsondump3-nl.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_iwd-jsondump3-nl.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_iwd-jsondump3-nl.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_iwd-jsondump3.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_iwd-jsondump3.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_iwd-jsondump3.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_iwd-jsondump3.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_iwd-nolimit.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_iwd-nolimit.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_iwd-nolimit.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_iwd-nolimit.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_iwd-passthrough1.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_iwd-passthrough1.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_iwd-passthrough1.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_iwd-passthrough1.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_iwd-passthrough2.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_iwd-passthrough2.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_iwd-passthrough2.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_iwd-passthrough2.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_iwd-passthrough3.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_iwd-passthrough3.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_iwd-passthrough3.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_iwd-passthrough3.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_iwd-passthrough4.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_iwd-passthrough4.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_iwd-passthrough4.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_iwd-passthrough4.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_iwdr-entry.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_iwdr-entry.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_iwdr-entry.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_iwdr-entry.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_iwdr_dir_literal_real_file.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_iwdr_dir_literal_real_file.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_iwdr_dir_literal_real_file.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_iwdr_dir_literal_real_file.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_iwdr_with_nested_dirs.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_iwdr_with_nested_dirs.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_iwdr_with_nested_dirs.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_iwdr_with_nested_dirs.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_js-input-record.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_js-input-record.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_js-input-record.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_js-input-record.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_js-quote.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_js-quote.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_js-quote.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_js-quote.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_linkfile.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_linkfile.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_linkfile.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_linkfile.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_listing_deep1.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_listing_deep1.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_listing_deep1.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_listing_deep1.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_listing_deep2.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_listing_deep2.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_listing_deep2.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_listing_deep2.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_listing_none1.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_listing_none1.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_listing_none1.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_listing_none1.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_listing_none2.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_listing_none2.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_listing_none2.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_listing_none2.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_listing_none3.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_listing_none3.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_listing_none3.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_listing_none3.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_listing_shallow1.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_listing_shallow1.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_listing_shallow1.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_listing_shallow1.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_listing_shallow2.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_listing_shallow2.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_listing_shallow2.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_listing_shallow2.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_loadContents-limit.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_loadContents-limit.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_loadContents-limit.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_loadContents-limit.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_metadata.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_metadata.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_metadata.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_metadata.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_mkdir.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_mkdir.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_mkdir.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_mkdir.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_multiple_input_feature_requirement.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_multiple_input_feature_requirement.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_multiple_input_feature_requirement.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_multiple_input_feature_requirement.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_nameroot.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_nameroot.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_nameroot.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_nameroot.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_nested-array.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_nested-array.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_nested-array.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_nested-array.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_networkaccess.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_networkaccess.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_networkaccess.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_networkaccess.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_networkaccess2.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_networkaccess2.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_networkaccess2.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_networkaccess2.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_no-inputs-tool.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_no-inputs-tool.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_no-inputs-tool.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_no-inputs-tool.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_no-inputs-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_no-inputs-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_no-inputs-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_no-inputs-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_no-outputs-tool.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_no-outputs-tool.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_no-outputs-tool.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_no-outputs-tool.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_no-outputs-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_no-outputs-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_no-outputs-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_no-outputs-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_null-defined.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_null-defined.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_null-defined.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_null-defined.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_null-expression1-tool.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_null-expression1-tool.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_null-expression1-tool.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_null-expression1-tool.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_null-expression2-tool.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_null-expression2-tool.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_null-expression2-tool.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_null-expression2-tool.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_null-expression3-tool.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_null-expression3-tool.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_null-expression3-tool.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_null-expression3-tool.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_operation.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_operation.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_operation.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_operation.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_optional-numerical-output-0.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_optional-numerical-output-0.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_optional-numerical-output-0.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_optional-numerical-output-0.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_optional-output.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_optional-output.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_optional-output.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_optional-output.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_output-arrays-file-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_output-arrays-file-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_output-arrays-file-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_output-arrays-file-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_output-arrays-int-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_output-arrays-int-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_output-arrays-int-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_output-arrays-int-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_output-arrays-int.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_output-arrays-int.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_output-arrays-int.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_output-arrays-int.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_output_reference_workflow_input.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_output_reference_workflow_input.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_output_reference_workflow_input.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_output_reference_workflow_input.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_action.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_action.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_action.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_action.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_anon_enum_inside_array.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_anon_enum_inside_array.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_anon_enum_inside_array.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_anon_enum_inside_array.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_anon_enum_inside_array_inside_schemadef.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_anon_enum_inside_array_inside_schemadef.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_anon_enum_inside_array_inside_schemadef.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_anon_enum_inside_array_inside_schemadef.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_any-type-compat.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_any-type-compat.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_any-type-compat.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_any-type-compat.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_bar.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_bar.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_bar.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_bar.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_basename-fields-test.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_basename-fields-test.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_basename-fields-test.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_basename-fields-test.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_bash-dollar-quote.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_bash-dollar-quote.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_bash-dollar-quote.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_bash-dollar-quote.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_bash-line-continuation-with-expression.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_bash-line-continuation-with-expression.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_bash-line-continuation-with-expression.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_bash-line-continuation-with-expression.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_bash-line-continuation.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_bash-line-continuation.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_bash-line-continuation.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_bash-line-continuation.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_binding-test.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_binding-test.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_binding-test.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_binding-test.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_bool-empty-inputbinding.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_bool-empty-inputbinding.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_bool-empty-inputbinding.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_bool-empty-inputbinding.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_bwa-mem-tool.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_bwa-mem-tool.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_bwa-mem-tool.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_bwa-mem-tool.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_cat-from-dir.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_cat-from-dir.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_cat-from-dir.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_cat-from-dir.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_cat-tool-shortcut.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_cat-tool-shortcut.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_cat-tool-shortcut.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_cat-tool-shortcut.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_cat-tool.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_cat-tool.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_cat-tool.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_cat-tool.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_cat.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_cat.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_cat.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_cat.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_cat1-testcli.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_cat1-testcli.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_cat1-testcli.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_cat1-testcli.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_cat3-from-dir.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_cat3-from-dir.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_cat3-from-dir.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_cat3-from-dir.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_cat3-nodocker.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_cat3-nodocker.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_cat3-nodocker.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_cat3-nodocker.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_cat3-tool-docker.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_cat3-tool-docker.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_cat3-tool-docker.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_cat3-tool-docker.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_cat3-tool-mediumcut.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_cat3-tool-mediumcut.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_cat3-tool-mediumcut.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_cat3-tool-mediumcut.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_cat3-tool-shortcut.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_cat3-tool-shortcut.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_cat3-tool-shortcut.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_cat3-tool-shortcut.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_cat3-tool.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_cat3-tool.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_cat3-tool.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_cat3-tool.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_cat4-from-dir.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_cat4-from-dir.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_cat4-from-dir.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_cat4-from-dir.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_cat4-tool.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_cat4-tool.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_cat4-tool.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_cat4-tool.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_cat5-tool.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_cat5-tool.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_cat5-tool.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_cat5-tool.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_check.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_check.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_check.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_check.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_colon:test.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_colon:test.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_colon:test.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_colon:test.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_colon_test_output.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_colon_test_output.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_colon_test_output.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_colon_test_output.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_cond-wf-001.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_cond-wf-001.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_cond-wf-001.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_cond-wf-001.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_cond-wf-001_nojs.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_cond-wf-001_nojs.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_cond-wf-001_nojs.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_cond-wf-001_nojs.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_cond-wf-002.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_cond-wf-002.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_cond-wf-002.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_cond-wf-002.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_cond-wf-002_nojs.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_cond-wf-002_nojs.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_cond-wf-002_nojs.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_cond-wf-002_nojs.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_cond-wf-003.1.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_cond-wf-003.1.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_cond-wf-003.1.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_cond-wf-003.1.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_cond-wf-003.1_nojs.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_cond-wf-003.1_nojs.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_cond-wf-003.1_nojs.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_cond-wf-003.1_nojs.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_cond-wf-003.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_cond-wf-003.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_cond-wf-003.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_cond-wf-003.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_cond-wf-003_nojs.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_cond-wf-003_nojs.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_cond-wf-003_nojs.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_cond-wf-003_nojs.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_cond-wf-004.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_cond-wf-004.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_cond-wf-004.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_cond-wf-004.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_cond-wf-004_nojs.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_cond-wf-004_nojs.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_cond-wf-004_nojs.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_cond-wf-004_nojs.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_cond-wf-006.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_cond-wf-006.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_cond-wf-006.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_cond-wf-006.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_cond-wf-006_nojs.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_cond-wf-006_nojs.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_cond-wf-006_nojs.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_cond-wf-006_nojs.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_cond-wf-007.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_cond-wf-007.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_cond-wf-007.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_cond-wf-007.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_cond-wf-007_nojs.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_cond-wf-007_nojs.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_cond-wf-007_nojs.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_cond-wf-007_nojs.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_cond-wf-009.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_cond-wf-009.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_cond-wf-009.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_cond-wf-009.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_cond-wf-009_nojs.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_cond-wf-009_nojs.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_cond-wf-009_nojs.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_cond-wf-009_nojs.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_cond-wf-010.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_cond-wf-010.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_cond-wf-010.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_cond-wf-010.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_cond-wf-010_nojs.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_cond-wf-010_nojs.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_cond-wf-010_nojs.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_cond-wf-010_nojs.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_cond-wf-011.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_cond-wf-011.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_cond-wf-011.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_cond-wf-011.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_cond-wf-011_nojs.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_cond-wf-011_nojs.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_cond-wf-011_nojs.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_cond-wf-011_nojs.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_cond-wf-012.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_cond-wf-012.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_cond-wf-012.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_cond-wf-012.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_cond-wf-012_nojs.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_cond-wf-012_nojs.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_cond-wf-012_nojs.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_cond-wf-012_nojs.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_cond-wf-013.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_cond-wf-013.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_cond-wf-013.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_cond-wf-013.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_cond-wf-013_nojs.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_cond-wf-013_nojs.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_cond-wf-013_nojs.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_cond-wf-013_nojs.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_cond-with-defaults.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_cond-with-defaults.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_cond-with-defaults.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_cond-with-defaults.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_cores_float.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_cores_float.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_cores_float.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_cores_float.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_count-lines1-wf-noET.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_count-lines1-wf-noET.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_count-lines1-wf-noET.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_count-lines1-wf-noET.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_count-lines1-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_count-lines1-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_count-lines1-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_count-lines1-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_count-lines10-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_count-lines10-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_count-lines10-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_count-lines10-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_count-lines11-extra-step-wf-noET.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_count-lines11-extra-step-wf-noET.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_count-lines11-extra-step-wf-noET.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_count-lines11-extra-step-wf-noET.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_count-lines11-extra-step-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_count-lines11-extra-step-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_count-lines11-extra-step-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_count-lines11-extra-step-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_count-lines11-null-step-wf-noET.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_count-lines11-null-step-wf-noET.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_count-lines11-null-step-wf-noET.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_count-lines11-null-step-wf-noET.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_count-lines11-null-step-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_count-lines11-null-step-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_count-lines11-null-step-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_count-lines11-null-step-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_count-lines11-wf-noET.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_count-lines11-wf-noET.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_count-lines11-wf-noET.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_count-lines11-wf-noET.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_count-lines11-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_count-lines11-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_count-lines11-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_count-lines11-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_count-lines12-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_count-lines12-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_count-lines12-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_count-lines12-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_count-lines13-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_count-lines13-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_count-lines13-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_count-lines13-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_count-lines14-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_count-lines14-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_count-lines14-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_count-lines14-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_count-lines15-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_count-lines15-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_count-lines15-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_count-lines15-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_count-lines16-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_count-lines16-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_count-lines16-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_count-lines16-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_count-lines17-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_count-lines17-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_count-lines17-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_count-lines17-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_count-lines18-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_count-lines18-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_count-lines18-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_count-lines18-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_count-lines19-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_count-lines19-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_count-lines19-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_count-lines19-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_count-lines2-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_count-lines2-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_count-lines2-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_count-lines2-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_count-lines3-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_count-lines3-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_count-lines3-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_count-lines3-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_count-lines4-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_count-lines4-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_count-lines4-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_count-lines4-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_count-lines5-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_count-lines5-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_count-lines5-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_count-lines5-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_count-lines6-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_count-lines6-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_count-lines6-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_count-lines6-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_count-lines7-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_count-lines7-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_count-lines7-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_count-lines7-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_count-lines8-wf-noET.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_count-lines8-wf-noET.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_count-lines8-wf-noET.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_count-lines8-wf-noET.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_count-lines8-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_count-lines8-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_count-lines8-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_count-lines8-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_count-lines9-wf-noET.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_count-lines9-wf-noET.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_count-lines9-wf-noET.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_count-lines9-wf-noET.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_count-lines9-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_count-lines9-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_count-lines9-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_count-lines9-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_cwloutput-nolimit.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_cwloutput-nolimit.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_cwloutput-nolimit.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_cwloutput-nolimit.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_default_path.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_default_path.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_default_path.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_default_path.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_dir.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_dir.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_dir.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_dir.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_dir2.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_dir2.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_dir2.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_dir2.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_dir3.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_dir3.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_dir3.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_dir3.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_dir4.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_dir4.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_dir4.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_dir4.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_dir5.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_dir5.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_dir5.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_dir5.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_dir6.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_dir6.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_dir6.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_dir6.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_dir7.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_dir7.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_dir7.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_dir7.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_docker-array-secondaryfiles.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_docker-array-secondaryfiles.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_docker-array-secondaryfiles.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_docker-array-secondaryfiles.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_docker-output-dir.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_docker-output-dir.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_docker-output-dir.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_docker-output-dir.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_docker-run-cmd.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_docker-run-cmd.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_docker-run-cmd.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_docker-run-cmd.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_dynresreq-default.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_dynresreq-default.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_dynresreq-default.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_dynresreq-default.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_dynresreq-dir.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_dynresreq-dir.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_dynresreq-dir.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_dynresreq-dir.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_dynresreq-workflow-inputdefault.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_dynresreq-workflow-inputdefault.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_dynresreq-workflow-inputdefault.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_dynresreq-workflow-inputdefault.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_dynresreq-workflow-stepdefault.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_dynresreq-workflow-stepdefault.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_dynresreq-workflow-stepdefault.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_dynresreq-workflow-stepdefault.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_dynresreq-workflow-tooldefault.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_dynresreq-workflow-tooldefault.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_dynresreq-workflow-tooldefault.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_dynresreq-workflow-tooldefault.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_dynresreq-workflow.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_dynresreq-workflow.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_dynresreq-workflow.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_dynresreq-workflow.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_dynresreq.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_dynresreq.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_dynresreq.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_dynresreq.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_echo-file-tool.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_echo-file-tool.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_echo-file-tool.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_echo-file-tool.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_echo-position-expr.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_echo-position-expr.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_echo-position-expr.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_echo-position-expr.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_echo-tool-default.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_echo-tool-default.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_echo-tool-default.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_echo-tool-default.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_echo-tool-packed.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_echo-tool-packed.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_echo-tool-packed.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_echo-tool-packed.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_echo-tool-packed2.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_echo-tool-packed2.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_echo-tool-packed2.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_echo-tool-packed2.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_echo-tool.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_echo-tool.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_echo-tool.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_echo-tool.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_echo-wf-default.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_echo-wf-default.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_echo-wf-default.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_echo-wf-default.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_empty-array-input.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_empty-array-input.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_empty-array-input.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_empty-array-input.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_env-tool1.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_env-tool1.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_env-tool1.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_env-tool1.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_env-tool2.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_env-tool2.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_env-tool2.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_env-tool2.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_env-tool3.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_env-tool3.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_env-tool3.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_env-tool3.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_env-tool4.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_env-tool4.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_env-tool4.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_env-tool4.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_env-wf1.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_env-wf1.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_env-wf1.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_env-wf1.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_env-wf2.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_env-wf2.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_env-wf2.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_env-wf2.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_env-wf3.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_env-wf3.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_env-wf3.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_env-wf3.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_envvar.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_envvar.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_envvar.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_envvar.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_envvar2.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_envvar2.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_envvar2.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_envvar2.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_envvar3.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_envvar3.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_envvar3.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_envvar3.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_exit-success.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_exit-success.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_exit-success.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_exit-success.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_exitcode.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_exitcode.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_exitcode.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_exitcode.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_fail-unconnected.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_fail-unconnected.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_fail-unconnected.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_fail-unconnected.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_fail-unspecified-input.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_fail-unspecified-input.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_fail-unspecified-input.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_fail-unspecified-input.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_file-literal-ex.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_file-literal-ex.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_file-literal-ex.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_file-literal-ex.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_foo.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_foo.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_foo.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_foo.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_formattest.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_formattest.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_formattest.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_formattest.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_formattest2.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_formattest2.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_formattest2.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_formattest2.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_formattest3.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_formattest3.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_formattest3.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_formattest3.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_glob-expr-list.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_glob-expr-list.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_glob-expr-list.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_glob-expr-list.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_glob-path-error.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_glob-path-error.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_glob-path-error.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_glob-path-error.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_glob_directory.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_glob_directory.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_glob_directory.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_glob_directory.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_glob_test.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_glob_test.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_glob_test.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_glob_test.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_import_schema-def.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_import_schema-def.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_import_schema-def.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_import_schema-def.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_import_schema-def2.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_import_schema-def2.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_import_schema-def2.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_import_schema-def2.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_import_schema-def_packed.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_import_schema-def_packed.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_import_schema-def_packed.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_import_schema-def_packed.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_imported-hint.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_imported-hint.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_imported-hint.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_imported-hint.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_initialwork-path.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_initialwork-path.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_initialwork-path.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_initialwork-path.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_initialworkdir-glob-fullpath.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_initialworkdir-glob-fullpath.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_initialworkdir-glob-fullpath.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_initialworkdir-glob-fullpath.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_initialworkdirrequirement-docker-out.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_initialworkdirrequirement-docker-out.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_initialworkdirrequirement-docker-out.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_initialworkdirrequirement-docker-out.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_inline-js.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_inline-js.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_inline-js.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_inline-js.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_inp_update_wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_inp_update_wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_inp_update_wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_inp_update_wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_inpdir_update_wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_inpdir_update_wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_inpdir_update_wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_inpdir_update_wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_io-any-1.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_io-any-1.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_io-any-1.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_io-any-1.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_io-any-wf-1.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_io-any-wf-1.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_io-any-wf-1.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_io-any-wf-1.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_io-file-default-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_io-file-default-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_io-file-default-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_io-file-default-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_io-file-or-files.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_io-file-or-files.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_io-file-or-files.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_io-file-or-files.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_io-int-default-tool-and-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_io-int-default-tool-and-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_io-int-default-tool-and-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_io-int-default-tool-and-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_io-int-default-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_io-int-default-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_io-int-default-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_io-int-default-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_io-int-optional-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_io-int-optional-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_io-int-optional-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_io-int-optional-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_io-int-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_io-int-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_io-int-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_io-int-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_io-union-input-default-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_io-union-input-default-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_io-union-input-default-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_io-union-input-default-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_iwd-container-entryname1.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_iwd-container-entryname1.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_iwd-container-entryname1.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_iwd-container-entryname1.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_iwd-container-entryname2.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_iwd-container-entryname2.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_iwd-container-entryname2.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_iwd-container-entryname2.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_iwd-container-entryname3.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_iwd-container-entryname3.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_iwd-container-entryname3.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_iwd-container-entryname3.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_iwd-container-entryname4.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_iwd-container-entryname4.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_iwd-container-entryname4.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_iwd-container-entryname4.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_iwd-fileobjs1.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_iwd-fileobjs1.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_iwd-fileobjs1.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_iwd-fileobjs1.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_iwd-fileobjs2.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_iwd-fileobjs2.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_iwd-fileobjs2.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_iwd-fileobjs2.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_iwd-jsondump1-nl.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_iwd-jsondump1-nl.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_iwd-jsondump1-nl.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_iwd-jsondump1-nl.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_iwd-jsondump1.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_iwd-jsondump1.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_iwd-jsondump1.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_iwd-jsondump1.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_iwd-jsondump2-nl.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_iwd-jsondump2-nl.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_iwd-jsondump2-nl.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_iwd-jsondump2-nl.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_iwd-jsondump2.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_iwd-jsondump2.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_iwd-jsondump2.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_iwd-jsondump2.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_iwd-jsondump3-nl.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_iwd-jsondump3-nl.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_iwd-jsondump3-nl.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_iwd-jsondump3-nl.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_iwd-jsondump3.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_iwd-jsondump3.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_iwd-jsondump3.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_iwd-jsondump3.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_iwd-nolimit.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_iwd-nolimit.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_iwd-nolimit.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_iwd-nolimit.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_iwd-passthrough1.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_iwd-passthrough1.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_iwd-passthrough1.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_iwd-passthrough1.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_iwd-passthrough2.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_iwd-passthrough2.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_iwd-passthrough2.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_iwd-passthrough2.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_iwd-passthrough3.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_iwd-passthrough3.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_iwd-passthrough3.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_iwd-passthrough3.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_iwd-passthrough4.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_iwd-passthrough4.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_iwd-passthrough4.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_iwd-passthrough4.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_iwdr-entry.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_iwdr-entry.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_iwdr-entry.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_iwdr-entry.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_iwdr_dir_literal_real_file.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_iwdr_dir_literal_real_file.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_iwdr_dir_literal_real_file.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_iwdr_dir_literal_real_file.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_iwdr_with_nested_dirs.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_iwdr_with_nested_dirs.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_iwdr_with_nested_dirs.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_iwdr_with_nested_dirs.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_js-input-record.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_js-input-record.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_js-input-record.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_js-input-record.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_js-quote.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_js-quote.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_js-quote.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_js-quote.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_linkfile.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_linkfile.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_linkfile.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_linkfile.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_listing_deep1.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_listing_deep1.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_listing_deep1.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_listing_deep1.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_listing_deep2.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_listing_deep2.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_listing_deep2.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_listing_deep2.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_listing_none1.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_listing_none1.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_listing_none1.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_listing_none1.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_listing_none2.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_listing_none2.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_listing_none2.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_listing_none2.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_listing_none3.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_listing_none3.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_listing_none3.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_listing_none3.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_listing_shallow1.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_listing_shallow1.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_listing_shallow1.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_listing_shallow1.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_listing_shallow2.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_listing_shallow2.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_listing_shallow2.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_listing_shallow2.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_loadContents-limit.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_loadContents-limit.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_loadContents-limit.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_loadContents-limit.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_metadata.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_metadata.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_metadata.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_metadata.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_mkdir.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_mkdir.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_mkdir.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_mkdir.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_multiple_input_feature_requirement.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_multiple_input_feature_requirement.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_multiple_input_feature_requirement.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_multiple_input_feature_requirement.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_nameroot.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_nameroot.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_nameroot.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_nameroot.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_nested-array.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_nested-array.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_nested-array.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_nested-array.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_networkaccess.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_networkaccess.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_networkaccess.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_networkaccess.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_networkaccess2.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_networkaccess2.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_networkaccess2.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_networkaccess2.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_no-inputs-tool.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_no-inputs-tool.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_no-inputs-tool.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_no-inputs-tool.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_no-inputs-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_no-inputs-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_no-inputs-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_no-inputs-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_no-outputs-tool.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_no-outputs-tool.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_no-outputs-tool.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_no-outputs-tool.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_no-outputs-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_no-outputs-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_no-outputs-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_no-outputs-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_null-defined.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_null-defined.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_null-defined.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_null-defined.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_null-expression1-tool.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_null-expression1-tool.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_null-expression1-tool.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_null-expression1-tool.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_null-expression2-tool.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_null-expression2-tool.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_null-expression2-tool.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_null-expression2-tool.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_null-expression3-tool.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_null-expression3-tool.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_null-expression3-tool.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_null-expression3-tool.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_operation.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_operation.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_operation.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_operation.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_optional-numerical-output-0.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_optional-numerical-output-0.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_optional-numerical-output-0.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_optional-numerical-output-0.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_optional-output.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_optional-output.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_optional-output.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_optional-output.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_output-arrays-file-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_output-arrays-file-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_output-arrays-file-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_output-arrays-file-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_output-arrays-int-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_output-arrays-int-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_output-arrays-int-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_output-arrays-int-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_output-arrays-int.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_output-arrays-int.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_output-arrays-int.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_output-arrays-int.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_output_reference_workflow_input.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_output_reference_workflow_input.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_output_reference_workflow_input.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_output_reference_workflow_input.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_params.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_params.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_params.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_params.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_params2.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_params2.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_params2.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_params2.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_params_input_length_non_array.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_params_input_length_non_array.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_params_input_length_non_array.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_params_input_length_non_array.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_parseInt-tool.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_parseInt-tool.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_parseInt-tool.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_parseInt-tool.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_pass-unconnected.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_pass-unconnected.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_pass-unconnected.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_pass-unconnected.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_record-in-format.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_record-in-format.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_record-in-format.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_record-in-format.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_record-in-secondaryFiles-missing-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_record-in-secondaryFiles-missing-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_record-in-secondaryFiles-missing-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_record-in-secondaryFiles-missing-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_record-in-secondaryFiles-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_record-in-secondaryFiles-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_record-in-secondaryFiles-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_record-in-secondaryFiles-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_record-in-secondaryFiles.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_record-in-secondaryFiles.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_record-in-secondaryFiles.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_record-in-secondaryFiles.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_record-order.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_record-order.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_record-order.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_record-order.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_record-out-format.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_record-out-format.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_record-out-format.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_record-out-format.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_record-out-secondaryFiles.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_record-out-secondaryFiles.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_record-out-secondaryFiles.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_record-out-secondaryFiles.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_record-output-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_record-output-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_record-output-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_record-output-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_record-output.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_record-output.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_record-output.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_record-output.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_record-sd-secondaryFiles.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_record-sd-secondaryFiles.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_record-sd-secondaryFiles.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_record-sd-secondaryFiles.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_record_outputeval.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_record_outputeval.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_record_outputeval.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_record_outputeval.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_record_outputeval_nojs.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_record_outputeval_nojs.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_record_outputeval_nojs.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_record_outputeval_nojs.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_recursive-input-directory.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_recursive-input-directory.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_recursive-input-directory.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_recursive-input-directory.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_rename-inputs.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_rename-inputs.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_rename-inputs.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_rename-inputs.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_rename-outputs.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_rename-outputs.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_rename-outputs.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_rename-outputs.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_rename.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_rename.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_rename.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_rename.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_revsort-abstract.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_revsort-abstract.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_revsort-abstract.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_revsort-abstract.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_revsort-packed.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_revsort-packed.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_revsort-packed.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_revsort-packed.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_revsort.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_revsort.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_revsort.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_revsort.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_revtool.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_revtool.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_revtool.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_revtool.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_runtime-outdir.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_runtime-outdir.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_runtime-outdir.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_runtime-outdir.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_runtime-paths-distinct.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_runtime-paths-distinct.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_runtime-paths-distinct.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_runtime-paths-distinct.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_scatter-valueFrom-tool.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_scatter-valueFrom-tool.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_scatter-valueFrom-tool.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_scatter-valueFrom-tool.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_scatter-valuefrom-inputs-wf1.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_scatter-valuefrom-inputs-wf1.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_scatter-valuefrom-inputs-wf1.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_scatter-valuefrom-inputs-wf1.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_scatter-valuefrom-wf1.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_scatter-valuefrom-wf1.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_scatter-valuefrom-wf1.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_scatter-valuefrom-wf1.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_scatter-valuefrom-wf2.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_scatter-valuefrom-wf2.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_scatter-valuefrom-wf2.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_scatter-valuefrom-wf2.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_scatter-valuefrom-wf3.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_scatter-valuefrom-wf3.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_scatter-valuefrom-wf3.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_scatter-valuefrom-wf3.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_scatter-valuefrom-wf4.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_scatter-valuefrom-wf4.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_scatter-valuefrom-wf4.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_scatter-valuefrom-wf4.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_scatter-valuefrom-wf5.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_scatter-valuefrom-wf5.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_scatter-valuefrom-wf5.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_scatter-valuefrom-wf5.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_scatter-valuefrom-wf6.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_scatter-valuefrom-wf6.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_scatter-valuefrom-wf6.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_scatter-valuefrom-wf6.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_scatter-wf1.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_scatter-wf1.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_scatter-wf1.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_scatter-wf1.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_scatter-wf2.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_scatter-wf2.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_scatter-wf2.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_scatter-wf2.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_scatter-wf3.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_scatter-wf3.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_scatter-wf3.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_scatter-wf3.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_scatter-wf4.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_scatter-wf4.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_scatter-wf4.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_scatter-wf4.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_schemadef-tool.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_schemadef-tool.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_schemadef-tool.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_schemadef-tool.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_schemadef-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_schemadef-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_schemadef-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_schemadef-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_schemadef_types_with_import-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_schemadef_types_with_import-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_schemadef_types_with_import-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_schemadef_types_with_import-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_search.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_search.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_search.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_search.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_shellchar.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_shellchar.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_shellchar.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_shellchar.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_shellchar2.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_shellchar2.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_shellchar2.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_shellchar2.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_size-expression-tool.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_size-expression-tool.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_size-expression-tool.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_size-expression-tool.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_sorttool.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_sorttool.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_sorttool.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_sorttool.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_stage-array-dirs.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_stage-array-dirs.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_stage-array-dirs.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_stage-array-dirs.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_stage-array.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_stage-array.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_stage-array.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_stage-array.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_stage-unprovided-file.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_stage-unprovided-file.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_stage-unprovided-file.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_stage-unprovided-file.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_stage_file_array.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_stage_file_array.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_stage_file_array.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_stage_file_array.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_stage_file_array_basename.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_stage_file_array_basename.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_stage_file_array_basename.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_stage_file_array_basename.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_stage_file_array_basename_and_entryname.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_stage_file_array_basename_and_entryname.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_stage_file_array_basename_and_entryname.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_stage_file_array_basename_and_entryname.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_stagefile.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_stagefile.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_stagefile.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_stagefile.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_stderr-mediumcut.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_stderr-mediumcut.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_stderr-mediumcut.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_stderr-mediumcut.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_stderr-shortcut.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_stderr-shortcut.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_stderr-shortcut.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_stderr-shortcut.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_stderr.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_stderr.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_stderr.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_stderr.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_stdout_chained_commands.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_stdout_chained_commands.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_stdout_chained_commands.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_stdout_chained_commands.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_step-valuefrom-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_step-valuefrom-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_step-valuefrom-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_step-valuefrom-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_step-valuefrom2-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_step-valuefrom2-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_step-valuefrom2-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_step-valuefrom2-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_step-valuefrom3-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_step-valuefrom3-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_step-valuefrom3-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_step-valuefrom3-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_step-valuefrom4-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_step-valuefrom4-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_step-valuefrom4-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_step-valuefrom4-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_step-valuefrom5-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_step-valuefrom5-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_step-valuefrom5-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_step-valuefrom5-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_steplevel-resreq.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_steplevel-resreq.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_steplevel-resreq.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_steplevel-resreq.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_storage_float.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_storage_float.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_storage_float.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_storage_float.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_sum-wf-noET.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_sum-wf-noET.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_sum-wf-noET.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_sum-wf-noET.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_sum-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_sum-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_sum-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_sum-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_symlink-illegal.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_symlink-illegal.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_symlink-illegal.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_symlink-illegal.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_symlink-legal.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_symlink-legal.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_symlink-legal.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_symlink-legal.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_synth-file.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_synth-file.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_synth-file.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_synth-file.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_template-tool.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_template-tool.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_template-tool.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_template-tool.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_test-cwl-out.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_test-cwl-out.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_test-cwl-out.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_test-cwl-out.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_test-cwl-out2.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_test-cwl-out2.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_test-cwl-out2.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_test-cwl-out2.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_timelimit.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_timelimit.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_timelimit.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_timelimit.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_timelimit2-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_timelimit2-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_timelimit2-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_timelimit2-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_timelimit2.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_timelimit2.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_timelimit2.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_timelimit2.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_timelimit3-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_timelimit3-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_timelimit3-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_timelimit3-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_timelimit3.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_timelimit3.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_timelimit3.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_timelimit3.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_timelimit4.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_timelimit4.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_timelimit4.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_timelimit4.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_timelimit5.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_timelimit5.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_timelimit5.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_timelimit5.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_tmap-tool.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_tmap-tool.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_tmap-tool.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_tmap-tool.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_tool-v12.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_tool-v12.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_tool-v12.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_tool-v12.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_touch.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_touch.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_touch.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_touch.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_updatedir_inplace.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_updatedir_inplace.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_updatedir_inplace.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_updatedir_inplace.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_updateval_inplace.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_updateval_inplace.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_updateval_inplace.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_updateval_inplace.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_valid_schemadef_types_with_import-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_valid_schemadef_types_with_import-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_valid_schemadef_types_with_import-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_valid_schemadef_types_with_import-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_valueFrom-constant.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_valueFrom-constant.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_valueFrom-constant.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_valueFrom-constant.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_vf-concat.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_vf-concat.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_vf-concat.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_vf-concat.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_wc-tool-shortcut.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_wc-tool-shortcut.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_wc-tool-shortcut.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_wc-tool-shortcut.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_wc-tool.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_wc-tool.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_wc-tool.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_wc-tool.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_wc2-tool.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_wc2-tool.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_wc2-tool.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_wc2-tool.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_wc3-tool.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_wc3-tool.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_wc3-tool.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_wc3-tool.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_wc4-tool.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_wc4-tool.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_wc4-tool.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_wc4-tool.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_wf-loadContents.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_wf-loadContents.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_wf-loadContents.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_wf-loadContents.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_wf-loadContents2.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_wf-loadContents2.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_wf-loadContents2.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_wf-loadContents2.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_wf-loadContents3.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_wf-loadContents3.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_wf-loadContents3.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_wf-loadContents3.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_wf-loadContents4.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_wf-loadContents4.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_wf-loadContents4.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_wf-loadContents4.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_wf_ren.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_wf_ren.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_wf_ren.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_wf_ren.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_writable-dir-docker.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_writable-dir-docker.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_writable-dir-docker.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_writable-dir-docker.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_writable-dir.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_writable-dir.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_packed_writable-dir.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_packed_writable-dir.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_params.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_params.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_params.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_params.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_params2.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_params2.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_params2.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_params2.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_params_input_length_non_array.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_params_input_length_non_array.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_params_input_length_non_array.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_params_input_length_non_array.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_parseInt-tool.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_parseInt-tool.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_parseInt-tool.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_parseInt-tool.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_pass-unconnected.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_pass-unconnected.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_pass-unconnected.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_pass-unconnected.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_record-in-format.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_record-in-format.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_record-in-format.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_record-in-format.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_record-in-secondaryFiles-missing-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_record-in-secondaryFiles-missing-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_record-in-secondaryFiles-missing-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_record-in-secondaryFiles-missing-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_record-in-secondaryFiles-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_record-in-secondaryFiles-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_record-in-secondaryFiles-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_record-in-secondaryFiles-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_record-in-secondaryFiles.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_record-in-secondaryFiles.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_record-in-secondaryFiles.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_record-in-secondaryFiles.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_record-order.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_record-order.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_record-order.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_record-order.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_record-out-format.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_record-out-format.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_record-out-format.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_record-out-format.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_record-out-secondaryFiles.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_record-out-secondaryFiles.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_record-out-secondaryFiles.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_record-out-secondaryFiles.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_record-output-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_record-output-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_record-output-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_record-output-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_record-output.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_record-output.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_record-output.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_record-output.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_record-sd-secondaryFiles.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_record-sd-secondaryFiles.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_record-sd-secondaryFiles.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_record-sd-secondaryFiles.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_record_outputeval.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_record_outputeval.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_record_outputeval.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_record_outputeval.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_record_outputeval_nojs.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_record_outputeval_nojs.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_record_outputeval_nojs.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_record_outputeval_nojs.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_recursive-input-directory.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_recursive-input-directory.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_recursive-input-directory.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_recursive-input-directory.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_rename-inputs.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_rename-inputs.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_rename-inputs.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_rename-inputs.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_rename-outputs.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_rename-outputs.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_rename-outputs.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_rename-outputs.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_rename.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_rename.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_rename.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_rename.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_revsort-abstract.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_revsort-abstract.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_revsort-abstract.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_revsort-abstract.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_revsort-packed.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_revsort-packed.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_revsort-packed.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_revsort-packed.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_revsort.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_revsort.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_revsort.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_revsort.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_revtool.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_revtool.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_revtool.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_revtool.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_runtime-outdir.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_runtime-outdir.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_runtime-outdir.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_runtime-outdir.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_runtime-paths-distinct.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_runtime-paths-distinct.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_runtime-paths-distinct.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_runtime-paths-distinct.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_scatter-valueFrom-tool.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_scatter-valueFrom-tool.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_scatter-valueFrom-tool.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_scatter-valueFrom-tool.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_scatter-valuefrom-inputs-wf1.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_scatter-valuefrom-inputs-wf1.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_scatter-valuefrom-inputs-wf1.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_scatter-valuefrom-inputs-wf1.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_scatter-valuefrom-wf1.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_scatter-valuefrom-wf1.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_scatter-valuefrom-wf1.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_scatter-valuefrom-wf1.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_scatter-valuefrom-wf2.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_scatter-valuefrom-wf2.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_scatter-valuefrom-wf2.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_scatter-valuefrom-wf2.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_scatter-valuefrom-wf3.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_scatter-valuefrom-wf3.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_scatter-valuefrom-wf3.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_scatter-valuefrom-wf3.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_scatter-valuefrom-wf4.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_scatter-valuefrom-wf4.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_scatter-valuefrom-wf4.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_scatter-valuefrom-wf4.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_scatter-valuefrom-wf5.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_scatter-valuefrom-wf5.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_scatter-valuefrom-wf5.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_scatter-valuefrom-wf5.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_scatter-valuefrom-wf6.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_scatter-valuefrom-wf6.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_scatter-valuefrom-wf6.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_scatter-valuefrom-wf6.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_scatter-wf1.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_scatter-wf1.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_scatter-wf1.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_scatter-wf1.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_scatter-wf2.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_scatter-wf2.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_scatter-wf2.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_scatter-wf2.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_scatter-wf3.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_scatter-wf3.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_scatter-wf3.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_scatter-wf3.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_scatter-wf4.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_scatter-wf4.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_scatter-wf4.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_scatter-wf4.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_schemadef-tool.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_schemadef-tool.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_schemadef-tool.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_schemadef-tool.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_schemadef-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_schemadef-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_schemadef-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_schemadef-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_schemadef_types_with_import-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_schemadef_types_with_import-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_schemadef_types_with_import-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_schemadef_types_with_import-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_search.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_search.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_search.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_search.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_shellchar.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_shellchar.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_shellchar.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_shellchar.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_shellchar2.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_shellchar2.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_shellchar2.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_shellchar2.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_size-expression-tool.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_size-expression-tool.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_size-expression-tool.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_size-expression-tool.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_sorttool.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_sorttool.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_sorttool.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_sorttool.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_stage-array-dirs.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_stage-array-dirs.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_stage-array-dirs.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_stage-array-dirs.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_stage-array.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_stage-array.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_stage-array.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_stage-array.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_stage-unprovided-file.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_stage-unprovided-file.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_stage-unprovided-file.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_stage-unprovided-file.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_stage_file_array.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_stage_file_array.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_stage_file_array.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_stage_file_array.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_stage_file_array_basename.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_stage_file_array_basename.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_stage_file_array_basename.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_stage_file_array_basename.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_stage_file_array_basename_and_entryname.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_stage_file_array_basename_and_entryname.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_stage_file_array_basename_and_entryname.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_stage_file_array_basename_and_entryname.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_stagefile.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_stagefile.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_stagefile.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_stagefile.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_stderr-mediumcut.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_stderr-mediumcut.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_stderr-mediumcut.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_stderr-mediumcut.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_stderr-shortcut.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_stderr-shortcut.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_stderr-shortcut.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_stderr-shortcut.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_stderr.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_stderr.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_stderr.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_stderr.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_stdout_chained_commands.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_stdout_chained_commands.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_stdout_chained_commands.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_stdout_chained_commands.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_step-valuefrom-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_step-valuefrom-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_step-valuefrom-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_step-valuefrom-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_step-valuefrom2-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_step-valuefrom2-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_step-valuefrom2-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_step-valuefrom2-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_step-valuefrom3-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_step-valuefrom3-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_step-valuefrom3-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_step-valuefrom3-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_step-valuefrom4-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_step-valuefrom4-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_step-valuefrom4-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_step-valuefrom4-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_step-valuefrom5-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_step-valuefrom5-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_step-valuefrom5-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_step-valuefrom5-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_steplevel-resreq.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_steplevel-resreq.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_steplevel-resreq.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_steplevel-resreq.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_storage_float.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_storage_float.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_storage_float.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_storage_float.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_sum-wf-noET.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_sum-wf-noET.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_sum-wf-noET.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_sum-wf-noET.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_sum-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_sum-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_sum-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_sum-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_symlink-illegal.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_symlink-illegal.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_symlink-illegal.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_symlink-illegal.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_symlink-legal.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_symlink-legal.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_symlink-legal.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_symlink-legal.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_synth-file.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_synth-file.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_synth-file.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_synth-file.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_template-tool.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_template-tool.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_template-tool.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_template-tool.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_test-cwl-out.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_test-cwl-out.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_test-cwl-out.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_test-cwl-out.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_test-cwl-out2.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_test-cwl-out2.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_test-cwl-out2.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_test-cwl-out2.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_timelimit.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_timelimit.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_timelimit.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_timelimit.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_timelimit2-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_timelimit2-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_timelimit2-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_timelimit2-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_timelimit2.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_timelimit2.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_timelimit2.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_timelimit2.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_timelimit3-wf.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_timelimit3-wf.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_timelimit3-wf.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_timelimit3-wf.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_timelimit3.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_timelimit3.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_timelimit3.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_timelimit3.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_timelimit4.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_timelimit4.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_timelimit4.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_timelimit4.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_timelimit5.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_timelimit5.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_timelimit5.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_timelimit5.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_tmap-tool.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_tmap-tool.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_tmap-tool.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_tmap-tool.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_tool-v12.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_tool-v12.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_tool-v12.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_tool-v12.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_touch.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_touch.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_touch.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_touch.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_updatedir_inplace.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_updatedir_inplace.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_updatedir_inplace.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_updatedir_inplace.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_updateval_inplace.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_updateval_inplace.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_updateval_inplace.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_updateval_inplace.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_valueFrom-constant.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_valueFrom-constant.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_valueFrom-constant.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_valueFrom-constant.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_vf-concat.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_vf-concat.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_vf-concat.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_vf-concat.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_wc-tool-shortcut.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_wc-tool-shortcut.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_wc-tool-shortcut.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_wc-tool-shortcut.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_wc-tool.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_wc-tool.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_wc-tool.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_wc-tool.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_wc2-tool.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_wc2-tool.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_wc2-tool.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_wc2-tool.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_wc3-tool.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_wc3-tool.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_wc3-tool.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_wc3-tool.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_wc4-tool.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_wc4-tool.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_wc4-tool.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_wc4-tool.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_wf-loadContents.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_wf-loadContents.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_wf-loadContents.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_wf-loadContents.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_wf-loadContents2.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_wf-loadContents2.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_wf-loadContents2.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_wf-loadContents2.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_wf-loadContents3.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_wf-loadContents3.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_wf-loadContents3.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_wf-loadContents3.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_wf-loadContents4.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_wf-loadContents4.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_wf-loadContents4.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_wf-loadContents4.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_wf_ren.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_wf_ren.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_wf_ren.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_wf_ren.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_writable-dir-docker.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_writable-dir-docker.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_writable-dir-docker.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_writable-dir-docker.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_writable-dir.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_writable-dir.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/valid_writable-dir.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/valid_writable-dir.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/wc-tool.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/wc-tool.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/wc-tool.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/wc-tool.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/wc2-tool.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/wc2-tool.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/wc2-tool.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/wc2-tool.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/wc3-tool.cwl b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/wc3-tool.cwl similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/wc3-tool.cwl rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/wc3-tool.cwl diff --git a/src/test/resources/org/w3id/cwl/cwl1_2/utils/whale.txt b/src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/whale.txt similarity index 100% rename from src/test/resources/org/w3id/cwl/cwl1_2/utils/whale.txt rename to src/test/resources/org/commonwl/cwlsdk/cwl1_2/utils/whale.txt