Skip to content

Commit

Permalink
Merge pull request wildfly#6069 from darranl/WFCORE-6891
Browse files Browse the repository at this point in the history
[WFCORE-6891] Remove support for parsing domain management schemas prior to urn:jboss:domain:1.7
  • Loading branch information
yersan authored Aug 13, 2024
2 parents 67566e1 + a18bf18 commit 8e9f202
Show file tree
Hide file tree
Showing 19 changed files with 364 additions and 19,425 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ transaction.log
*.swp
/.gitk-tmp.*
atlassian-ide-plugin.xml
# VSCode Files
.vscode
# temp files
*~
# maven versions plugin
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3782,4 +3782,16 @@ OperationFailedRuntimeException capabilityAlreadyRegisteredInContext(String capa
@LogMessage(level = WARN)
@Message(id = 512, value = "No resource exists at address '%s'. Ignoring the remove opreation.")
void removingUnexistingResource(String address);

/**
* Creates an exception indicating a namespace which is no longer supported has been encountered.
*
* @param name the fully qualified unexpected element name.
* @param location the location of the error.
*
* @return a {@link XMLStreamException} for the error.
*/
@Message(id = 513, value = "The XML namespace of %s is no longer supported.")
XMLStreamException unsupportedNamespace(QName name, @Param Location location);

}
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,20 @@ public static XMLStreamException unexpectedElement(final XMLExtendedStreamReader
ex);
}

/**
* Get an exception reporting an element using an unsupported namespace.
* @param reader the stream reader
* @return the exception
*/
public static XMLStreamException unsupportedNamespace(final XMLExtendedStreamReader reader) {
final XMLStreamException ex = ControllerLogger.ROOT_LOGGER.unsupportedNamespace(reader.getName(), reader.getLocation());

return new XMLStreamValidationException(ex.getMessage(),
ValidationError.from(ex, ErrorType.UNSUPPORTED_ELEMENT)
.element(reader.getName()),
ex);
}

/**
* Get an exception reporting an unexpected end tag for an XML element.
* @param reader the stream reader
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,9 @@ public interface DomainControllerLogger extends BasicLogger {
@Message(id = 1, value = "Ignoring 'include' child of 'socket-binding-group' %s")
void warnIgnoringSocketBindingGroupInclude(Location location);

@LogMessage(level = Level.WARN)
@Message(id = 2, value = "Ignoring 'include' child of 'profile' %s")
void warnIgnoringProfileInclude(Location location);
//@LogMessage(level = Level.WARN)
//@Message(id = 2, value = "Ignoring 'include' child of 'profile' %s")
//void warnIgnoringProfileInclude(Location location);

/**
* Logs a warning message indicating an interruption awaiting the final response from the server, represented by the
Expand Down

Large diffs are not rendered by default.

Loading

0 comments on commit 8e9f202

Please sign in to comment.