[jboss-jira] [JBoss JIRA] (WFLY-4716) Remove temporary code following core release

[Kabir Khan (JIRA)]

     [ https://issues.jboss.org/browse/WFLY-4716?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ]

Kabir Khan closed WFLY-4716.
----------------------------


> Remove temporary code following core release
> --------------------------------------------
>
>                 Key: WFLY-4716
>                 URL: https://issues.jboss.org/browse/WFLY-4716
>             Project: WildFly
>          Issue Type: Task
>          Components: Domain Management
>            Reporter: Kabir Khan
>            Assignee: Kabir Khan
>             Fix For: 10.0.0.Alpha3
>
>
> 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 
> {code}
> //@Override WFLY-4716
> {code}
>  and adjustments to AppClientXml
> {code}
> --- 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);
> +        }
> +    }
> +
>  }
> {code}
> 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.



--
This message was sent by Atlassian JIRA
(v7.5.0#75005)