[AS7-2866] Move remoting subsystem element attributes into a child element

kabir · kabir · commit f014189bfab3 · 2011-12-01T23:14:59.000Z
diff --git a/build/src/main/resources/docs/schema/jboss-as-remoting_1_0.xsd b/build/src/main/resources/docs/schema/jboss-as-remoting_1_0.xsd
@@ -36,29 +36,31 @@
             <![CDATA[
                 The configuration of the Remoting subsystem.
 
+                The 'worker-thread-pool' element configures the worker thread pool.
                 The nested "connector" element(s) define connectors for this subsystem.
-                
-                The attributes correspond to the following xnio options:
-                  org.xnio.Options#WORKER_READ_THREADS (normally 1 or maybe 2-3 for an exceptionally busy server)
-                  org.xnio.Options#WORKER_WRITE_THREADS (same)
-                  org.xnio.Options#WORKER_ACCEPT_THREADS (we can just leave this at 1, it doesn't have to be tunable for Remoting)
-                  org.xnio.Options#WORKER_TASK_CORE_THREADS (core pool size)
-                  org.xnio.Options#WORKER_TASK_MAX_THREADS (max pool size)
-                  org.xnio.Options#WORKER_TASK_KEEPALIVE (keepalive time in milliseconds)
-                  org.xnio.Options#WORKER_TASK_LIMIT (worker queue length)
             ]]>
             </xs:documentation>
         </xs:annotation>
-        <xs:choice minOccurs="0" maxOccurs="unbounded">
-            <xs:element name="connector" type="connector"/>
-        </xs:choice>
-        <xs:attribute name="worker-read-threads" type="xs:integer" use="optional"/>
-        <xs:attribute name="worker-write-threads" type="xs:integer" use="optional"/>
-        <xs:attribute name="worker-task-core-threads" type="xs:integer" use="optional"/>
-        <xs:attribute name="worker-task-max-threads" type="xs:integer" use="optional"/>
-        <xs:attribute name="worker-task-keepalive" type="xs:integer" use="optional"/>
-        <xs:attribute name="worker-task-limit" type="xs:integer" use="optional"/>
-        
+        <xs:sequence>
+            <xs:element name="worker-thread-pool" type="workerThreadsType" minOccurs="0"/>
+            <xs:element name="connector" type="connector" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:complexType>
+    
+    <xs:complexType name="workerThreadsType">
+        <xs:annotation>
+            <xs:documentation>
+            <![CDATA[
+                The configuration of the worker thread pool.
+            ]]>
+            </xs:documentation>
+        </xs:annotation>
+        <xs:attribute name="read-threads" type="xs:integer" use="optional"/>
+        <xs:attribute name="write-threads" type="xs:integer" use="optional"/>
+        <xs:attribute name="task-core-threads" type="xs:integer" use="optional"/>
+        <xs:attribute name="task-max-threads" type="xs:integer" use="optional"/>
+        <xs:attribute name="task-keepalive" type="xs:integer" use="optional"/>
+        <xs:attribute name="task-limit" type="xs:integer" use="optional"/>
     </xs:complexType>
 
     <xs:complexType name="connector">
diff --git a/build/src/main/resources/docs/schema/jboss-as-remoting_1_1.xsd b/build/src/main/resources/docs/schema/jboss-as-remoting_1_1.xsd
@@ -36,31 +36,36 @@
             <![CDATA[
                 The configuration of the Remoting subsystem.
 
+                The 'worker-thread-pool' element configures the worker thread pool.
                 The nested "connector" element(s) define connectors for this subsystem.
-                
+            ]]>
+            </xs:documentation>
+        </xs:annotation>
+        <xs:sequence>
+            <xs:element name="worker-thread-pool" type="workerThreadsType" minOccurs="0"/>
+            <xs:element name="connector" type="connector" minOccurs="0" maxOccurs="unbounded"/>
+            <xs:element name="outbound-connections" minOccurs="0" type="outbound-connectionsType" />
+        </xs:sequence>
+    </xs:complexType>
+    
+    <xs:complexType name="workerThreadsType">
+        <xs:annotation>
+            <xs:documentation>
+            <![CDATA[
+                The configuration of the worker thread pool.
+
                 The attributes correspond to the following xnio options:
-                  org.xnio.Options#WORKER_READ_THREADS (normally 1 or maybe 2-3 for an exceptionally busy server)
-                  org.xnio.Options#WORKER_WRITE_THREADS (same)
-                  org.xnio.Options#WORKER_ACCEPT_THREADS (we can just leave this at 1, it doesn't have to be tunable for Remoting)
-                  org.xnio.Options#WORKER_TASK_CORE_THREADS (core pool size)
-                  org.xnio.Options#WORKER_TASK_MAX_THREADS (max pool size)
-                  org.xnio.Options#WORKER_TASK_KEEPALIVE (keepalive time in milliseconds)
-                  org.xnio.Options#WORKER_TASK_LIMIT (worker queue length)
             ]]>
             </xs:documentation>
         </xs:annotation>
-        <xs:choice minOccurs="0" maxOccurs="unbounded">
-            <xs:element name="connector" type="connector"/>
-            <xs:element name="outbound-connections" type="outbound-connectionsType" />
-        </xs:choice>
-        <xs:attribute name="worker-read-threads" type="xs:integer" use="optional"/>
-        <xs:attribute name="worker-write-threads" type="xs:integer" use="optional"/>
-        <xs:attribute name="worker-task-core-threads" type="xs:integer" use="optional"/>
-        <xs:attribute name="worker-task-max-threads" type="xs:integer" use="optional"/>
-        <xs:attribute name="worker-task-keepalive" type="xs:integer" use="optional"/>
-        <xs:attribute name="worker-task-limit" type="xs:integer" use="optional"/>
-        
+        <xs:attribute name="read-threads" type="xs:integer" use="optional"/>
+        <xs:attribute name="write-threads" type="xs:integer" use="optional"/>
+        <xs:attribute name="task-core-threads" type="xs:integer" use="optional"/>
+        <xs:attribute name="task-max-threads" type="xs:integer" use="optional"/>
+        <xs:attribute name="task-keepalive" type="xs:integer" use="optional"/>
+        <xs:attribute name="task-limit" type="xs:integer" use="optional"/>
     </xs:complexType>
+    
 
     <xs:complexType name="connector">
         <xs:annotation>
diff --git a/remoting-test/src/test/java/org/jboss/as/remoting/RemotingSubsystemTestCase.java b/remoting-test/src/test/java/org/jboss/as/remoting/RemotingSubsystemTestCase.java
@@ -39,8 +39,11 @@
 import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.VALUE;
 import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.WRITE_ATTRIBUTE_OPERATION;
 
+import java.io.File;
 import java.io.IOException;
 
+import org.jboss.as.server.ServerEnvironment;
+import org.jboss.as.server.services.path.AbsolutePathService;
 import org.jboss.as.subsystem.test.AbstractSubsystemBaseTest;
 import org.jboss.as.subsystem.test.AdditionalInitialization;
 import org.jboss.as.subsystem.test.ControllerInitializer;
@@ -49,6 +52,7 @@
 import org.jboss.msc.service.ServiceController;
 import org.jboss.msc.service.ServiceName;
 import org.jboss.msc.service.ServiceNotFoundException;
+import org.jboss.msc.service.ServiceTarget;
 import org.junit.Ignore;
 import org.junit.Test;
 
@@ -77,6 +81,12 @@ protected void setupController(ControllerInitializer controllerInitializer) {
                     controllerInitializer.addSocketBinding("test", port);
                 }
 
+                @Override
+                protected void addExtraServices(ServiceTarget target) {
+                    //Needed for initialization of the RealmAuthenticationProviderService
+                    AbsolutePathService.addService(ServerEnvironment.CONTROLLER_TEMP_DIR, new File("target/temp" + System.currentTimeMillis()).getAbsolutePath(), target);
+                }
+
             },readResource("remoting-with-threads.xml"));
 
         ServiceController<?> endPointService = services.getContainer().getRequiredService(RemotingServices.SUBSYSTEM_ENDPOINT);
@@ -108,6 +118,12 @@ protected void setupController(ControllerInitializer controllerInitializer) {
                     controllerInitializer.addSocketBinding("test", port);
                 }
 
+                @Override
+                protected void addExtraServices(ServiceTarget target) {
+                    //Needed for initialization of the RealmAuthenticationProviderService
+                    AbsolutePathService.addService(ServerEnvironment.CONTROLLER_TEMP_DIR, new File("target/temp" + System.currentTimeMillis()).getAbsolutePath(), target);
+                }
+
             },readResource("remoting-with-threads.xml"));
 
         CurrentConnectorAndController current = CurrentConnectorAndController.create(services, RemotingServices.SUBSYSTEM_ENDPOINT, RemotingServices.serverServiceName("test-connector"));
@@ -147,6 +163,11 @@ protected void setupController(ControllerInitializer controllerInitializer) {
                     controllerInitializer.addSocketBinding("test", port);
                 }
 
+                @Override
+                protected void addExtraServices(ServiceTarget target) {
+                    //Needed for initialization of the RealmAuthenticationProviderService
+                    AbsolutePathService.addService(ServerEnvironment.CONTROLLER_TEMP_DIR, new File("target/temp" + System.currentTimeMillis()).getAbsolutePath(), target);
+                }
             },readResource("remoting-with-threads.xml"));
 
         CurrentConnectorAndController current = CurrentConnectorAndController.create(services, RemotingServices.SUBSYSTEM_ENDPOINT, RemotingServices.serverServiceName("test-connector"));
@@ -213,7 +234,7 @@ protected void setupController(ControllerInitializer controllerInitializer) {
     /**
      * Tests that the outbound connections configured in the remoting subsytem are processed and services
      * are created for them
-     * 
+     *
      * @throws Exception
      */
     @Test
diff --git a/remoting-test/src/test/resources/org/jboss/as/remoting/remoting-with-bad-connector-property.xml b/remoting-test/src/test/resources/org/jboss/as/remoting/remoting-with-bad-connector-property.xml
@@ -1,11 +1,13 @@
-<subsystem xmlns="urn:jboss:domain:remoting:1.0"
-    worker-read-threads="5"
-    worker-task-core-threads="6"
-    worker-task-keepalive="7"
-    worker-task-limit="8"
-    worker-task-max-threads="9"
-    worker-write-threads="10"
->
+<subsystem xmlns="urn:jboss:domain:remoting:1.0">
+
+   <worker-thread-pool
+	    read-threads="5"
+	    task-core-threads="6"
+	    task-keepalive="7"
+	    task-limit="8"
+	    task-max-threads="9"
+	    write-threads="10"
+	 />
     <connector name="test-connector" socket-binding="test">
       <properties>
          <property name="WORKER_ACCEPT_THREADS" value="1"/>
diff --git a/remoting-test/src/test/resources/org/jboss/as/remoting/remoting-with-outbound-connections.xml b/remoting-test/src/test/resources/org/jboss/as/remoting/remoting-with-outbound-connections.xml
@@ -1,11 +1,4 @@
-<subsystem xmlns="urn:jboss:domain:remoting:1.1"
-    worker-read-threads="5"
-    worker-task-core-threads="6"
-    worker-task-keepalive="7"
-    worker-task-limit="8"
-    worker-task-max-threads="9"
-    worker-write-threads="10"
->
+<subsystem xmlns="urn:jboss:domain:remoting:1.1">
     <connector name="test-connector" socket-binding="test"/>
 
     <outbound-connections>
diff --git a/remoting-test/src/test/resources/org/jboss/as/remoting/remoting-with-threads.xml b/remoting-test/src/test/resources/org/jboss/as/remoting/remoting-with-threads.xml
@@ -1,11 +1,12 @@
-<subsystem xmlns="urn:jboss:domain:remoting:1.0"
-    worker-read-threads="5"
-    worker-task-core-threads="6"
-    worker-task-keepalive="7"
-    worker-task-limit="8"
-    worker-task-max-threads="9"
-    worker-write-threads="10"
->
+<subsystem xmlns="urn:jboss:domain:remoting:1.0">
+   <worker-thread-pool
+       read-threads="5"
+       task-core-threads="6"
+       task-keepalive="7"
+       task-limit="8"
+       task-max-threads="9"
+       write-threads="10"
+    />
     <connector name="test-connector" socket-binding="test">
       <properties>
          <!-- This must be smaller than worker-read-threads -->
diff --git a/remoting/src/main/java/org/jboss/as/remoting/Attribute.java b/remoting/src/main/java/org/jboss/as/remoting/Attribute.java
@@ -36,13 +36,14 @@ public enum Attribute {
     SOCKET_BINDING(CommonAttributes.SOCKET_BINDING),
     URI("uri"),
     VALUE(CommonAttributes.VALUE),
-    WORKER_READ_THREADS(CommonAttributes.WORKER_READ_THREADS),
-    WORKER_TASK_CORE_THREADS(CommonAttributes.WORKER_TASK_CORE_THREADS),
-    WORKER_TASK_KEEPALIVE(CommonAttributes.WORKER_TASK_KEEPALIVE),
-    WORKER_TASK_LIMIT(CommonAttributes.WORKER_TASK_LIMIT),
-    WORKER_TASK_MAX_THREADS(CommonAttributes.WORKER_TASK_MAX_THREADS),
-    WORKER_WRITE_THREADS(CommonAttributes.WORKER_WRITE_THREADS)
+    WORKER_READ_THREADS("read-threads"),
+    WORKER_TASK_CORE_THREADS("task-core-threads"),
+    WORKER_TASK_KEEPALIVE("task-keepalive"),
+    WORKER_TASK_LIMIT("task-limit"),
+    WORKER_TASK_MAX_THREADS("task-max-threads"),
+    WORKER_WRITE_THREADS("write-threads")
     ;
+
     private final String name;
 
     Attribute(final String name) {
diff --git a/remoting/src/main/java/org/jboss/as/remoting/Element.java b/remoting/src/main/java/org/jboss/as/remoting/Element.java
@@ -57,6 +57,7 @@ public enum Element {
     SERVER_AUTH("server-auth"),
     STRENGTH("strength"),
     SUBSYSTEM("subsystem"),
+    WORKER_THREAD_POOL("worker-thread-pool")
     ;
 
     private final String name;
diff --git a/remoting/src/main/java/org/jboss/as/remoting/RemotingExtension.java b/remoting/src/main/java/org/jboss/as/remoting/RemotingExtension.java
diff --git a/remoting/src/main/java/org/jboss/as/remoting/RemotingSubsystem11Parser.java b/remoting/src/main/java/org/jboss/as/remoting/RemotingSubsystem11Parser.java
diff --git a/remoting/src/main/java/org/jboss/as/remoting/RemotingSubsystemRootResource.java b/remoting/src/main/java/org/jboss/as/remoting/RemotingSubsystemRootResource.java

Original file line number	Diff line number	Diff line change
`@@ -57,6 +57,7 @@ public enum Element {`
`57`	`57`	`SERVER_AUTH("server-auth"),`
`58`	`58`	`STRENGTH("strength"),`
`59`	`59`	`SUBSYSTEM("subsystem"),`
	`60`	`+ WORKER_THREAD_POOL("worker-thread-pool")`
`60`	`61`	`;`
`61`	`62`
`62`	`63`	`private final String name;`