diff --git a/core/src/main/groovy/com/predic8/schema/Annotation.groovy b/core/src/main/groovy/com/predic8/schema/Annotation.groovy index 40d71ac6..97eef300 100644 --- a/core/src/main/groovy/com/predic8/schema/Annotation.groovy +++ b/core/src/main/groovy/com/predic8/schema/Annotation.groovy @@ -41,7 +41,7 @@ class Annotation extends SchemaComponent { } } - protected getElementName(){ + public getElementName(){ new JQName(SCHEMA_NS, 'annotation') } diff --git a/core/src/main/groovy/com/predic8/schema/Appinfo.groovy b/core/src/main/groovy/com/predic8/schema/Appinfo.groovy index 1dfbbc1d..5f8c7573 100644 --- a/core/src/main/groovy/com/predic8/schema/Appinfo.groovy +++ b/core/src/main/groovy/com/predic8/schema/Appinfo.groovy @@ -38,7 +38,7 @@ class Appinfo extends SchemaComponent { creator.createAppinfo(this, ctx) } - protected getElementName(){ + public getElementName(){ 'appinfo' } diff --git a/core/src/main/groovy/com/predic8/schema/AttributeGroup.groovy b/core/src/main/groovy/com/predic8/schema/AttributeGroup.groovy index 0d11fcff..d48cc3da 100644 --- a/core/src/main/groovy/com/predic8/schema/AttributeGroup.groovy +++ b/core/src/main/groovy/com/predic8/schema/AttributeGroup.groovy @@ -63,7 +63,7 @@ class AttributeGroup extends SchemaComponent{ res.flatten() } - protected getElementName(){ + public getElementName(){ 'attributeGroup' } diff --git a/core/src/main/groovy/com/predic8/schema/BuiltInSchemaType.groovy b/core/src/main/groovy/com/predic8/schema/BuiltInSchemaType.groovy index c03cc01a..dc23e27a 100644 --- a/core/src/main/groovy/com/predic8/schema/BuiltInSchemaType.groovy +++ b/core/src/main/groovy/com/predic8/schema/BuiltInSchemaType.groovy @@ -29,7 +29,7 @@ class BuiltInSchemaType extends TypeDefinition { String namespace QName qname - protected getElementName() { + public getElementName() { 'built-in-schema-type' } diff --git a/core/src/main/groovy/com/predic8/schema/ComplexContent.groovy b/core/src/main/groovy/com/predic8/schema/ComplexContent.groovy index ec0751b6..8a5f7a05 100644 --- a/core/src/main/groovy/com/predic8/schema/ComplexContent.groovy +++ b/core/src/main/groovy/com/predic8/schema/ComplexContent.groovy @@ -86,7 +86,7 @@ class ComplexContent extends SchemaComponent { derivation instanceof Restriction } - protected getElementName(){ + public getElementName(){ new JQName(SCHEMA_NS, 'complexContent') } diff --git a/core/src/main/groovy/com/predic8/schema/ComplexType.groovy b/core/src/main/groovy/com/predic8/schema/ComplexType.groovy index 5f229858..30ef6fc4 100644 --- a/core/src/main/groovy/com/predic8/schema/ComplexType.groovy +++ b/core/src/main/groovy/com/predic8/schema/ComplexType.groovy @@ -64,7 +64,7 @@ class ComplexType extends TypeDefinition { } } - protected getElementName(){ + public getElementName(){ 'complexType' } diff --git a/core/src/main/groovy/com/predic8/schema/Documentation.groovy b/core/src/main/groovy/com/predic8/schema/Documentation.groovy index a6df5645..e48993e5 100644 --- a/core/src/main/groovy/com/predic8/schema/Documentation.groovy +++ b/core/src/main/groovy/com/predic8/schema/Documentation.groovy @@ -42,7 +42,7 @@ class Documentation extends SchemaComponent { creator.createDocumentation(this, ctx) } - protected getElementName(){ + public getElementName(){ 'documentation' } diff --git a/core/src/main/groovy/com/predic8/schema/Element.groovy b/core/src/main/groovy/com/predic8/schema/Element.groovy index c9cc59b0..0137ade3 100755 --- a/core/src/main/groovy/com/predic8/schema/Element.groovy +++ b/core/src/main/groovy/com/predic8/schema/Element.groovy @@ -90,7 +90,7 @@ class Element extends Declaration { log.debug "child [$child] of element [$name] parsed!" } - protected getElementName(){ + public getElementName(){ 'element' } diff --git a/core/src/main/groovy/com/predic8/schema/Extension.groovy b/core/src/main/groovy/com/predic8/schema/Extension.groovy index 121bd4bb..5afdd399 100644 --- a/core/src/main/groovy/com/predic8/schema/Extension.groovy +++ b/core/src/main/groovy/com/predic8/schema/Extension.groovy @@ -22,7 +22,7 @@ import static com.predic8.soamodel.Consts.SCHEMA_NS class Extension extends Derivation { - protected getElementName(){ + public getElementName(){ new JQName(SCHEMA_NS, 'extension') } diff --git a/core/src/main/groovy/com/predic8/schema/Field.groovy b/core/src/main/groovy/com/predic8/schema/Field.groovy index 4e5cb818..3e6ff3aa 100644 --- a/core/src/main/groovy/com/predic8/schema/Field.groovy +++ b/core/src/main/groovy/com/predic8/schema/Field.groovy @@ -34,7 +34,7 @@ class Field extends SchemaComponent { xpath = token.getAttributeValue( null , 'xpath') } - protected getElementName(){ + public getElementName(){ 'field' } diff --git a/core/src/main/groovy/com/predic8/schema/Group.groovy b/core/src/main/groovy/com/predic8/schema/Group.groovy index 0e18d229..c3133796 100644 --- a/core/src/main/groovy/com/predic8/schema/Group.groovy +++ b/core/src/main/groovy/com/predic8/schema/Group.groovy @@ -57,7 +57,7 @@ class Group extends SchemaComponent{ } } - protected getElementName(){ + public getElementName(){ // If changed to QName, SchemaDiffGenerator has to be modified. 'group' } diff --git a/core/src/main/groovy/com/predic8/schema/GroupRef.groovy b/core/src/main/groovy/com/predic8/schema/GroupRef.groovy index 761b6ffe..617a2873 100644 --- a/core/src/main/groovy/com/predic8/schema/GroupRef.groovy +++ b/core/src/main/groovy/com/predic8/schema/GroupRef.groovy @@ -47,7 +47,7 @@ class GroupRef extends SchemaComponent{ obj && getClass() == obj.getClass() && ref == obj.ref } - protected getElementName(){ + public getElementName(){ 'group' } diff --git a/core/src/main/groovy/com/predic8/schema/Import.groovy b/core/src/main/groovy/com/predic8/schema/Import.groovy index 408e6fc8..84a7e9b0 100755 --- a/core/src/main/groovy/com/predic8/schema/Import.groovy +++ b/core/src/main/groovy/com/predic8/schema/Import.groovy @@ -64,7 +64,7 @@ class Import extends SchemaComponent { creator.createImport(this, ctx.clone()) } - protected getElementName(){ + public getElementName(){ new JQName(SCHEMA_NS, 'import') } diff --git a/core/src/main/groovy/com/predic8/schema/Include.groovy b/core/src/main/groovy/com/predic8/schema/Include.groovy index 2609306e..2acb6db2 100755 --- a/core/src/main/groovy/com/predic8/schema/Include.groovy +++ b/core/src/main/groovy/com/predic8/schema/Include.groovy @@ -58,7 +58,7 @@ class Include extends SchemaComponent { schema.baseDir = origBaseDir } - protected getElementName(){ + public getElementName(){ new JQName(SCHEMA_NS, 'include') } diff --git a/core/src/main/groovy/com/predic8/schema/Restriction.groovy b/core/src/main/groovy/com/predic8/schema/Restriction.groovy index 2805fd8f..be7533df 100644 --- a/core/src/main/groovy/com/predic8/schema/Restriction.groovy +++ b/core/src/main/groovy/com/predic8/schema/Restriction.groovy @@ -22,7 +22,7 @@ import static com.predic8.soamodel.Consts.SCHEMA_NS class Restriction extends Derivation { - protected getElementName(){ + public getElementName(){ new JQName(SCHEMA_NS, 'restriction') } diff --git a/core/src/main/groovy/com/predic8/schema/Schema.groovy b/core/src/main/groovy/com/predic8/schema/Schema.groovy index 3917a8ea..c830ab5d 100755 --- a/core/src/main/groovy/com/predic8/schema/Schema.groovy +++ b/core/src/main/groovy/com/predic8/schema/Schema.groovy @@ -133,7 +133,7 @@ class Schema extends SchemaComponent{ } } - protected getElementName(){ + public getElementName(){ 'schema' } diff --git a/core/src/main/groovy/com/predic8/schema/SchemaList.groovy b/core/src/main/groovy/com/predic8/schema/SchemaList.groovy index 9a482a28..02a53901 100644 --- a/core/src/main/groovy/com/predic8/schema/SchemaList.groovy +++ b/core/src/main/groovy/com/predic8/schema/SchemaList.groovy @@ -43,7 +43,7 @@ class SchemaList extends SchemaComponent { simpleType == obj.simpleType ) } - protected getElementName(){ + public getElementName(){ new JQName(SCHEMA_NS, 'list') } diff --git a/core/src/main/groovy/com/predic8/schema/Selector.groovy b/core/src/main/groovy/com/predic8/schema/Selector.groovy index 5a46e6f6..212664e1 100644 --- a/core/src/main/groovy/com/predic8/schema/Selector.groovy +++ b/core/src/main/groovy/com/predic8/schema/Selector.groovy @@ -34,7 +34,7 @@ class Selector extends SchemaComponent { xpath = token.getAttributeValue( null , 'xpath') } - protected getElementName() { + public getElementName() { 'selector' } diff --git a/core/src/main/groovy/com/predic8/schema/SimpleContent.groovy b/core/src/main/groovy/com/predic8/schema/SimpleContent.groovy index bf53cdaa..cd353084 100644 --- a/core/src/main/groovy/com/predic8/schema/SimpleContent.groovy +++ b/core/src/main/groovy/com/predic8/schema/SimpleContent.groovy @@ -57,7 +57,7 @@ class SimpleContent extends SchemaComponent { return extension ?: restriction } - protected getElementName(){ + public getElementName(){ new JQName(SCHEMA_NS, 'simpleContent') } diff --git a/core/src/main/groovy/com/predic8/schema/SimpleType.groovy b/core/src/main/groovy/com/predic8/schema/SimpleType.groovy index 124a3fb9..64454ef5 100644 --- a/core/src/main/groovy/com/predic8/schema/SimpleType.groovy +++ b/core/src/main/groovy/com/predic8/schema/SimpleType.groovy @@ -73,7 +73,7 @@ class SimpleType extends TypeDefinition { list == obj.list ) } - protected getElementName(){ + public getElementName(){ 'simpleType' } diff --git a/core/src/main/groovy/com/predic8/schema/Union.groovy b/core/src/main/groovy/com/predic8/schema/Union.groovy index fc773247..150550d6 100644 --- a/core/src/main/groovy/com/predic8/schema/Union.groovy +++ b/core/src/main/groovy/com/predic8/schema/Union.groovy @@ -45,7 +45,7 @@ class Union extends SchemaComponent{ simpleTypes == obj.simpleTypes ) } - protected getElementName(){ + public getElementName(){ 'union' } diff --git a/core/src/main/groovy/com/predic8/schema/Unique.groovy b/core/src/main/groovy/com/predic8/schema/Unique.groovy index 64536262..d734a191 100644 --- a/core/src/main/groovy/com/predic8/schema/Unique.groovy +++ b/core/src/main/groovy/com/predic8/schema/Unique.groovy @@ -42,7 +42,7 @@ class Unique extends SchemaComponent { } } - protected getElementName(){ + public getElementName(){ 'unique' } diff --git a/core/src/main/groovy/com/predic8/schema/restriction/BaseRestriction.groovy b/core/src/main/groovy/com/predic8/schema/restriction/BaseRestriction.groovy index b9804cba..00d19d82 100644 --- a/core/src/main/groovy/com/predic8/schema/restriction/BaseRestriction.groovy +++ b/core/src/main/groovy/com/predic8/schema/restriction/BaseRestriction.groovy @@ -100,7 +100,7 @@ class BaseRestriction extends SchemaComponent { obj && getClass() == obj.getClass() && facets == obj.facets && base == obj.base && childSimpleType == obj.childSimpleType } - protected getElementName(){ + public getElementName(){ new JQName(SCHEMA_NS, 'restriction') } diff --git a/core/src/main/groovy/com/predic8/schema/restriction/facet/EnumerationFacet.groovy b/core/src/main/groovy/com/predic8/schema/restriction/facet/EnumerationFacet.groovy index 28da5fa0..7ab976e6 100644 --- a/core/src/main/groovy/com/predic8/schema/restriction/facet/EnumerationFacet.groovy +++ b/core/src/main/groovy/com/predic8/schema/restriction/facet/EnumerationFacet.groovy @@ -23,7 +23,7 @@ class EnumerationFacet extends Facet { creator.createEnumerationFacet(this, ctx) } - protected getElementName(){ + public getElementName(){ 'enumeration' } diff --git a/core/src/main/groovy/com/predic8/schema/restriction/facet/FractionDigits.groovy b/core/src/main/groovy/com/predic8/schema/restriction/facet/FractionDigits.groovy index 8be85b49..196cb836 100644 --- a/core/src/main/groovy/com/predic8/schema/restriction/facet/FractionDigits.groovy +++ b/core/src/main/groovy/com/predic8/schema/restriction/facet/FractionDigits.groovy @@ -26,7 +26,7 @@ class FractionDigits extends Facet { creator.createFractionDigits(this, ctx) } - protected getElementName(){ + public getElementName(){ 'fractionDigits' } diff --git a/core/src/main/groovy/com/predic8/schema/restriction/facet/LengthFacet.groovy b/core/src/main/groovy/com/predic8/schema/restriction/facet/LengthFacet.groovy index 21cceff2..cfaa5605 100644 --- a/core/src/main/groovy/com/predic8/schema/restriction/facet/LengthFacet.groovy +++ b/core/src/main/groovy/com/predic8/schema/restriction/facet/LengthFacet.groovy @@ -26,7 +26,7 @@ class LengthFacet extends Facet{ creator.createLengthFacet(this, ctx) } - protected getElementName(){ + public getElementName(){ 'length' } diff --git a/core/src/main/groovy/com/predic8/schema/restriction/facet/MaxExclusiveFacet.groovy b/core/src/main/groovy/com/predic8/schema/restriction/facet/MaxExclusiveFacet.groovy index d5b4bf73..15f811bf 100644 --- a/core/src/main/groovy/com/predic8/schema/restriction/facet/MaxExclusiveFacet.groovy +++ b/core/src/main/groovy/com/predic8/schema/restriction/facet/MaxExclusiveFacet.groovy @@ -22,7 +22,7 @@ class MaxExclusiveFacet extends Facet { creator.createMaxExclusiveFacet(this, ctx) } - protected getElementName(){ + public getElementName(){ 'maxExclusive' } diff --git a/core/src/main/groovy/com/predic8/schema/restriction/facet/MaxInclusiveFacet.groovy b/core/src/main/groovy/com/predic8/schema/restriction/facet/MaxInclusiveFacet.groovy index 1eddcd78..c0ced718 100644 --- a/core/src/main/groovy/com/predic8/schema/restriction/facet/MaxInclusiveFacet.groovy +++ b/core/src/main/groovy/com/predic8/schema/restriction/facet/MaxInclusiveFacet.groovy @@ -22,7 +22,7 @@ class MaxInclusiveFacet extends Facet { creator.createMaxInclusiveFacet(this, ctx) } - protected getElementName(){ + public getElementName(){ 'maxInclusive' } diff --git a/core/src/main/groovy/com/predic8/schema/restriction/facet/MaxLengthFacet.groovy b/core/src/main/groovy/com/predic8/schema/restriction/facet/MaxLengthFacet.groovy index 28f12e70..740b19ea 100644 --- a/core/src/main/groovy/com/predic8/schema/restriction/facet/MaxLengthFacet.groovy +++ b/core/src/main/groovy/com/predic8/schema/restriction/facet/MaxLengthFacet.groovy @@ -27,7 +27,7 @@ class MaxLengthFacet extends Facet { creator.createMaxLengthFacet(this, ctx) } - protected getElementName(){ + public getElementName(){ 'maxLength' } diff --git a/core/src/main/groovy/com/predic8/schema/restriction/facet/MinExclusiveFacet.groovy b/core/src/main/groovy/com/predic8/schema/restriction/facet/MinExclusiveFacet.groovy index a4c615e9..f4efd2f8 100644 --- a/core/src/main/groovy/com/predic8/schema/restriction/facet/MinExclusiveFacet.groovy +++ b/core/src/main/groovy/com/predic8/schema/restriction/facet/MinExclusiveFacet.groovy @@ -22,7 +22,7 @@ class MinExclusiveFacet extends Facet { creator.createMinExclusiveFacet(this, ctx) } - protected getElementName(){ + public getElementName(){ 'minExclusive' } diff --git a/core/src/main/groovy/com/predic8/schema/restriction/facet/MinInclusiveFacet.groovy b/core/src/main/groovy/com/predic8/schema/restriction/facet/MinInclusiveFacet.groovy index 15712e3b..8639cd94 100644 --- a/core/src/main/groovy/com/predic8/schema/restriction/facet/MinInclusiveFacet.groovy +++ b/core/src/main/groovy/com/predic8/schema/restriction/facet/MinInclusiveFacet.groovy @@ -22,7 +22,7 @@ class MinInclusiveFacet extends Facet { creator.createMinInclusiveFacet(this, ctx) } - protected getElementName(){ + public getElementName(){ 'minInclusive' } diff --git a/core/src/main/groovy/com/predic8/schema/restriction/facet/MinLengthFacet.groovy b/core/src/main/groovy/com/predic8/schema/restriction/facet/MinLengthFacet.groovy index 40e8f598..224eee5e 100644 --- a/core/src/main/groovy/com/predic8/schema/restriction/facet/MinLengthFacet.groovy +++ b/core/src/main/groovy/com/predic8/schema/restriction/facet/MinLengthFacet.groovy @@ -28,7 +28,7 @@ class MinLengthFacet extends Facet { creator.createMinLengthFacet(this, ctx) } - protected getElementName(){ + public getElementName(){ 'minLength' } diff --git a/core/src/main/groovy/com/predic8/schema/restriction/facet/PatternFacet.groovy b/core/src/main/groovy/com/predic8/schema/restriction/facet/PatternFacet.groovy index 7f175a23..e33ca674 100644 --- a/core/src/main/groovy/com/predic8/schema/restriction/facet/PatternFacet.groovy +++ b/core/src/main/groovy/com/predic8/schema/restriction/facet/PatternFacet.groovy @@ -22,7 +22,7 @@ class PatternFacet extends Facet { creator.createPatternFacet(this, ctx) } - protected getElementName(){ + public getElementName(){ 'pattern' } diff --git a/core/src/main/groovy/com/predic8/schema/restriction/facet/TotalDigitsFacet.groovy b/core/src/main/groovy/com/predic8/schema/restriction/facet/TotalDigitsFacet.groovy index 55565475..ccc2827e 100644 --- a/core/src/main/groovy/com/predic8/schema/restriction/facet/TotalDigitsFacet.groovy +++ b/core/src/main/groovy/com/predic8/schema/restriction/facet/TotalDigitsFacet.groovy @@ -26,7 +26,7 @@ class TotalDigitsFacet extends Facet { creator.createTotalDigitsFacet(this, ctx) } - protected getElementName(){ + public getElementName(){ 'totalDigits' } diff --git a/core/src/main/groovy/com/predic8/schema/restriction/facet/WhiteSpaceFacet.groovy b/core/src/main/groovy/com/predic8/schema/restriction/facet/WhiteSpaceFacet.groovy index c0ae96fd..fa320b64 100644 --- a/core/src/main/groovy/com/predic8/schema/restriction/facet/WhiteSpaceFacet.groovy +++ b/core/src/main/groovy/com/predic8/schema/restriction/facet/WhiteSpaceFacet.groovy @@ -22,7 +22,7 @@ class WhiteSpaceFacet extends Facet{ creator.createWhiteSpaceFacet(this, ctx) } - protected getElementName(){ + public getElementName(){ 'whiteSpace' }