Uploaded image for project: 'WildFly'
  1. WildFly
  2. WFLY-4716

Remove temporary code following core release

    Details

      Description

      PR #7555 is the one introducing the temporary code. It prepares for the core release by implementing the new introduced methods, but comments out the @Override annotations so it will compile before the core release is made.

      The follow-up work will be to re-add these annotations, which have all been commented out as

      //@Override WFLY-4716
      

      and adjustments to AppClientXml

      --- a/appclient/src/main/java/org/jboss/as/appclient/subsystem/parsing/AppClientXml.java
      +++ b/appclient/src/main/java/org/jboss/as/appclient/subsystem/parsing/AppClientXml.java
      @@ -54,8 +54,9 @@ import org.jboss.as.controller.parsing.ExtensionXml;
       import org.jboss.as.controller.parsing.Namespace;
       import org.jboss.as.controller.parsing.ParseUtils;
       import org.jboss.as.controller.persistence.ModelMarshallingContext;
      -import org.jboss.as.controller.resource.SocketBindingGroupResourceDefinition;
       import org.jboss.as.server.parsing.CommonXml;
      +import org.jboss.as.server.parsing.SocketBindingsXml;
      +import org.jboss.as.server.services.net.SocketBindingGroupResourceDefinition;
       import org.jboss.dmr.ModelNode;
       import org.jboss.dmr.Property;
       import org.jboss.modules.ModuleLoader;
      @@ -72,7 +73,7 @@ public class AppClientXml extends CommonXml {
           private final ExtensionXml extensionXml;
       
           public AppClientXml(final ModuleLoader loader, final ExtensionRegistry extensionRegistry) {
      -        super();
      +        super(new AppClientSocketBindingsXml());
               extensionXml = new ExtensionXml(loader, null, extensionRegistry);
           }
       
      @@ -410,4 +411,12 @@ public class AppClientXml extends CommonXml {
                   throws XMLStreamException {
               // we don't marshall appclient.xml
           }
      +
      +    static class AppClientSocketBindingsXml extends SocketBindingsXml {
      +        @Override
      +        protected void writeExtraAttributes(XMLExtendedStreamWriter writer, ModelNode bindingGroup) throws XMLStreamException {
      +            SocketBindingGroupResourceDefinition.PORT_OFFSET.marshallAsAttribute(bindingGroup, writer);
      +        }
      +    }
      +
       }
      

      Full diff at https://github.com/wildfly/wildfly/commit/2dd7eb1a3885d6496762ed399745fb14923d8879 (if github keeps these when I change my branch)

      Another thing is that AutoIgnoredResourcesDomainTestCase should be removed. It now lives in core following the work on WFCORE-401.

        Gliffy Diagrams

          Attachments

            Issue Links

              Activity

                People

                • Assignee:
                  kabirkhan Kabir Khan
                  Reporter:
                  kabirkhan Kabir Khan
                • Votes:
                  0 Vote for this issue
                  Watchers:
                  1 Start watching this issue

                  Dates

                  • Created:
                    Updated:
                    Resolved: