WFLY-9011 transactions subsystem Model version should be 4.0.0.

testsuite/integration/manualmode/src/test/resources/legacy-configs/domain/7-1-3.xml

@@ -1301,13 +1301,13 @@
     <server-groups>
         <server-group name="main-server-group" profile="full">
             <jvm name="default">
-                <heap size="64m" max-size="512m"/>
+                <heap size="64m" max-size="256m"/>
             </jvm>
             <socket-binding-group ref="full-sockets"/>
         </server-group>
         <server-group name="other-server-group" profile="full-ha">
             <jvm name="default">
-                <heap size="64m" max-size="512m"/>
+                <heap size="64m" max-size="256m"/>
             </jvm>
             <socket-binding-group ref="full-ha-sockets"/>
         </server-group>

testsuite/integration/manualmode/src/test/resources/legacy-configs/domain/7-2-0.xml

@@ -1339,13 +1339,13 @@
     <server-groups>
         <server-group name="main-server-group" profile="full">
             <jvm name="default">
-                <heap size="64m" max-size="512m"/>
+                <heap size="64m" max-size="256m"/>
             </jvm>
             <socket-binding-group ref="full-sockets"/>
         </server-group>
         <server-group name="other-server-group" profile="full-ha">
             <jvm name="default">
-                <heap size="64m" max-size="512m"/>
+                <heap size="64m" max-size="256m"/>
             </jvm>
             <socket-binding-group ref="full-ha-sockets"/>
         </server-group>

testsuite/integration/manualmode/src/test/resources/legacy-configs/domain/eap-6-0-0.xml

@@ -1290,14 +1290,14 @@
     <server-groups>
         <server-group name="main-server-group" profile="full">
             <jvm name="default">
-                <heap size="1303m" max-size="1303m"/>
+                <heap size="128m" max-size="256m"/>
                 <permgen max-size="256m"/>
             </jvm>
             <socket-binding-group ref="full-sockets"/>
         </server-group>
         <server-group name="other-server-group" profile="full-ha">
             <jvm name="default">
-                <heap size="1303m" max-size="1303m"/>
+                <heap size="128m" max-size="256m"/>
                 <permgen max-size="256m"/>
             </jvm>
             <socket-binding-group ref="full-ha-sockets"/>

testsuite/integration/manualmode/src/test/resources/legacy-configs/domain/eap-6-1-0.xml

@@ -1337,14 +1337,14 @@
     <server-groups>
         <server-group name="main-server-group" profile="full">
             <jvm name="default">
-                <heap size="1303m" max-size="1303m"/>
+                <heap size="128m" max-size="256m"/>
                 <permgen max-size="256m"/>
             </jvm>
             <socket-binding-group ref="full-sockets"/>
         </server-group>
         <server-group name="other-server-group" profile="full-ha">
             <jvm name="default">
-                <heap size="1303m" max-size="1303m"/>
+                <heap size="128m" max-size="256m"/>
                 <permgen max-size="256m"/>
             </jvm>
             <socket-binding-group ref="full-ha-sockets"/>

testsuite/integration/manualmode/src/test/resources/legacy-configs/domain/eap-6-2-0.xml

@@ -1350,14 +1350,14 @@
     <server-groups>
         <server-group name="main-server-group" profile="full">
             <jvm name="default">
-                <heap size="1303m" max-size="1303m"/>
+                <heap size="128m" max-size="256m"/>
                 <permgen max-size="256m"/>
             </jvm>
             <socket-binding-group ref="full-sockets"/>
         </server-group>
         <server-group name="other-server-group" profile="full-ha">
             <jvm name="default">
-                <heap size="1303m" max-size="1303m"/>
+                <heap size="128m" max-size="256m"/>
                 <permgen max-size="256m"/>
             </jvm>
             <socket-binding-group ref="full-ha-sockets"/>

testsuite/integration/manualmode/src/test/resources/legacy-configs/domain/eap-6-3-0.xml

@@ -1391,14 +1391,14 @@
     <server-groups>
         <server-group name="main-server-group" profile="full">
             <jvm name="default">
-                <heap size="1000m" max-size="1000m"/>
+                <heap size="128m" max-size="256m"/>
                 <permgen max-size="256m"/>
             </jvm>
             <socket-binding-group ref="full-sockets"/>
         </server-group>
         <server-group name="other-server-group" profile="full-ha">
             <jvm name="default">
-                <heap size="1000m" max-size="1000m"/>
+                <heap size="128m" max-size="256m"/>
                 <permgen max-size="256m"/>
             </jvm>
             <socket-binding-group ref="full-ha-sockets"/>

testsuite/integration/manualmode/src/test/resources/legacy-configs/domain/eap-6-4-0.xml

@@ -1399,14 +1399,14 @@
     <server-groups>
         <server-group name="main-server-group" profile="full">
             <jvm name="default">
-                <heap size="1000m" max-size="1000m"/>
+                <heap size="128m" max-size="256m"/>
                 <permgen max-size="256m"/>
             </jvm>
             <socket-binding-group ref="full-sockets"/>
         </server-group>
         <server-group name="other-server-group" profile="full-ha">
             <jvm name="default">
-                <heap size="1000m" max-size="1000m"/>
+                <heap size="128m" max-size="256m"/>
                 <permgen max-size="256m"/>
             </jvm>
             <socket-binding-group ref="full-ha-sockets"/>

testsuite/integration/manualmode/src/test/resources/legacy-configs/domain/eap-7-0-0.xml

@@ -1493,13 +1493,13 @@
     <server-groups>
         <server-group name="main-server-group" profile="full">
             <jvm name="default">
-                <heap size="1000m" max-size="1000m"/>
+                <heap size="128m" max-size="256m"/>
             </jvm>
             <socket-binding-group ref="full-sockets"/>
         </server-group>
         <server-group name="other-server-group" profile="full-ha">
             <jvm name="default">
-                <heap size="1000m" max-size="1000m"/>
+                <heap size="128m" max-size="256m"/>
             </jvm>
             <socket-binding-group ref="full-ha-sockets"/>
         </server-group>

transactions/src/main/java/org/jboss/as/txn/subsystem/LogStoreTransactionDefinition.java

@@ -31,13 +31,12 @@
 /**
  * @author <a href="mailto:tomaz.cerar@redhat.com">Tomaz Cerar</a>
  */
-public class LogStoreTransactionDefinition extends SimpleResourceDefinition {
+class LogStoreTransactionDefinition extends SimpleResourceDefinition {
     private final LogStoreResource resource;
 
     static final SimpleAttributeDefinition[] TRANSACTION_ATTRIBUTE = new SimpleAttributeDefinition[]{
             LogStoreConstants.JMX_NAME, LogStoreConstants.TRANSACTION_ID,
-            LogStoreConstants.TRANSACTION_AGE,
-            LogStoreConstants.RECORD_TYPE};
+            LogStoreConstants.TRANSACTION_AGE, LogStoreConstants.RECORD_TYPE};
 
 
     public LogStoreTransactionDefinition(final LogStoreResource resource) {

transactions/src/main/java/org/jboss/as/txn/subsystem/Namespace.java

@@ -42,13 +42,13 @@ enum Namespace {
     TRANSACTIONS_1_5("urn:jboss:domain:transactions:1.5"),
     TRANSACTIONS_2_0("urn:jboss:domain:transactions:2.0"),
     TRANSACTIONS_3_0("urn:jboss:domain:transactions:3.0"),
-    TRANSACTIONS_3_1("urn:jboss:domain:transactions:3.1"),
+    TRANSACTIONS_4_0("urn:jboss:domain:transactions:4.0"),
     ;
 
     /**
      * The current namespace version.
      */
-    public static final Namespace CURRENT = TRANSACTIONS_3_1;
+    public static final Namespace CURRENT = TRANSACTIONS_4_0;
 
     private final String name;
 

transactions/src/main/java/org/jboss/as/txn/subsystem/TransactionExtension.java

@@ -22,6 +22,7 @@
 
 package org.jboss.as.txn.subsystem;
 
+
 import javax.management.MBeanServer;
 
 import org.jboss.as.controller.Extension;
@@ -64,7 +65,7 @@ public class TransactionExtension implements Extension {
     static final ModelVersion MODEL_VERSION_EAP62 = ModelVersion.create(1, 3);
     static final ModelVersion MODEL_VERSION_EAP63 = ModelVersion.create(1, 4);
     static final ModelVersion MODEL_VERSION_EAP64 = ModelVersion.create(1, 5);
-    private static final ModelVersion CURRENT_MODEL_VERSION = ModelVersion.create(4, 0, 0);
+    static final ModelVersion CURRENT_MODEL_VERSION = ModelVersion.create(4, 0, 0);
 
 
     private static final ServiceName MBEAN_SERVER_SERVICE_NAME = ServiceName.JBOSS.append("mbean", "server");
@@ -132,6 +133,7 @@ public void initialize(ExtensionContext context) {
     /**
      * {@inheritDoc}
      */
+    @Override
     public void initializeParsers(ExtensionParsingContext context) {
         context.setSubsystemXmlMapping(SUBSYSTEM_NAME, Namespace.TRANSACTIONS_1_0.getUriString(), TransactionSubsystem10Parser::new);
         context.setSubsystemXmlMapping(SUBSYSTEM_NAME, Namespace.TRANSACTIONS_1_1.getUriString(), TransactionSubsystem11Parser::new);
@@ -141,7 +143,7 @@ public void initializeParsers(ExtensionParsingContext context) {
         context.setSubsystemXmlMapping(SUBSYSTEM_NAME, Namespace.TRANSACTIONS_1_5.getUriString(), TransactionSubsystem15Parser::new);
         context.setSubsystemXmlMapping(SUBSYSTEM_NAME, Namespace.TRANSACTIONS_2_0.getUriString(), TransactionSubsystem20Parser::new);
         context.setSubsystemXmlMapping(SUBSYSTEM_NAME, Namespace.TRANSACTIONS_3_0.getUriString(), TransactionSubsystem30Parser::new);
-        context.setSubsystemXmlMapping(SUBSYSTEM_NAME, Namespace.TRANSACTIONS_3_1.getUriString(), TransactionSubsystem31Parser::new);
+        context.setSubsystemXmlMapping(SUBSYSTEM_NAME, Namespace.TRANSACTIONS_4_0.getUriString(), TransactionSubsystem40Parser::new);
     }
 
     // Transformation
@@ -184,5 +186,4 @@ private void registerTransformers(SubsystemRegistration subsystem) {
                 // v2_0_0
         });
     }
-
 }

transactions/src/main/java/org/jboss/as/txn/subsystem/TransactionSubsystem31Parser.java → transactions/src/main/java/org/jboss/as/txn/subsystem/TransactionSubsystem40Parser.java

@@ -25,10 +25,10 @@
 /**
  * The {@link org.jboss.staxmapper.XMLElementReader} that handles the version 3.1 of Transaction subsystem xml.
  */
-class TransactionSubsystem31Parser extends TransactionSubsystem30Parser {
+class TransactionSubsystem40Parser extends TransactionSubsystem30Parser {
 
-    TransactionSubsystem31Parser() {
-        super(Namespace.TRANSACTIONS_3_1);
+    TransactionSubsystem40Parser() {
+        super(Namespace.TRANSACTIONS_4_0);
         this.relativeToHasDefaultValue = false;
     }
 

transactions/src/main/java/org/jboss/as/txn/subsystem/TxStatsHandler.java

@@ -31,7 +31,7 @@
 import org.jboss.as.controller.AttributeDefinition;
 import org.jboss.as.controller.OperationContext;
 import org.jboss.as.controller.OperationFailedException;
-import org.jboss.as.controller.SimpleAttributeDefinition;
+import org.jboss.as.controller.SimpleAttributeDefinitionBuilder;
 import org.jboss.as.controller.descriptions.ModelDescriptionConstants;
 import org.jboss.as.controller.registry.ManagementResourceRegistration;
 import org.jboss.as.txn.logging.TransactionLogger;
@@ -47,17 +47,17 @@ public class TxStatsHandler extends AbstractRuntimeOnlyHandler {
 
     public enum TxStat {
 
-        NUMBER_OF_TRANSACTIONS(new SimpleAttributeDefinition(CommonAttributes.NUMBER_OF_TRANSACTIONS, ModelType.LONG, true)),
-        NUMBER_OF_NESTED_TRANSACTIONS(new SimpleAttributeDefinition(CommonAttributes.NUMBER_OF_NESTED_TRANSACTIONS, ModelType.LONG, true)),
-        NUMBER_OF_HEURISTICS(new SimpleAttributeDefinition(CommonAttributes.NUMBER_OF_HEURISTICS, ModelType.LONG, true)),
-        NUMBER_OF_COMMITTED_TRANSACTIONS(new SimpleAttributeDefinition(CommonAttributes.NUMBER_OF_COMMITTED_TRANSACTIONS, ModelType.LONG, true)),
-        NUMBER_OF_ABORTED_TRANSACTIONS(new SimpleAttributeDefinition(CommonAttributes.NUMBER_OF_ABORTED_TRANSACTIONS, ModelType.LONG, true)),
-        NUMBER_OF_INFLIGHT_TRANSACTIONS(new SimpleAttributeDefinition(CommonAttributes.NUMBER_OF_INFLIGHT_TRANSACTIONS, ModelType.LONG, true)),
-        NUMBER_OF_TIMED_OUT_TRANSACTIONS(new SimpleAttributeDefinition(CommonAttributes.NUMBER_OF_TIMED_OUT_TRANSACTIONS, ModelType.LONG, true)),
-        NUMBER_OF_APPLICATION_ROLLBACKS(new SimpleAttributeDefinition(CommonAttributes.NUMBER_OF_APPLICATION_ROLLBACKS, ModelType.LONG, true)),
-        NUMBER_OF_RESOURCE_ROLLBACKS(new SimpleAttributeDefinition(CommonAttributes.NUMBER_OF_RESOURCE_ROLLBACKS, ModelType.LONG, true)),
-        NUMBER_OF_SYSTEM_ROLLBACKS(new SimpleAttributeDefinition(CommonAttributes.NUMBER_OF_SYSTEM_ROLLBACKS, ModelType.LONG, true)),
-        AVERAGE_COMMIT_TIME(new SimpleAttributeDefinition(CommonAttributes.AVERAGE_COMMIT_TIME, ModelType.LONG, true));
+        NUMBER_OF_TRANSACTIONS(SimpleAttributeDefinitionBuilder.create(CommonAttributes.NUMBER_OF_TRANSACTIONS, ModelType.LONG, true).build()),
+        NUMBER_OF_NESTED_TRANSACTIONS(SimpleAttributeDefinitionBuilder.create(CommonAttributes.NUMBER_OF_NESTED_TRANSACTIONS, ModelType.LONG, true).build()),
+        NUMBER_OF_HEURISTICS(SimpleAttributeDefinitionBuilder.create(CommonAttributes.NUMBER_OF_HEURISTICS, ModelType.LONG, true).build()),
+        NUMBER_OF_COMMITTED_TRANSACTIONS(SimpleAttributeDefinitionBuilder.create(CommonAttributes.NUMBER_OF_COMMITTED_TRANSACTIONS, ModelType.LONG, true).build()),
+        NUMBER_OF_ABORTED_TRANSACTIONS(SimpleAttributeDefinitionBuilder.create(CommonAttributes.NUMBER_OF_ABORTED_TRANSACTIONS, ModelType.LONG, true).build()),
+        NUMBER_OF_INFLIGHT_TRANSACTIONS(SimpleAttributeDefinitionBuilder.create(CommonAttributes.NUMBER_OF_INFLIGHT_TRANSACTIONS, ModelType.LONG, true).build()),
+        NUMBER_OF_TIMED_OUT_TRANSACTIONS(SimpleAttributeDefinitionBuilder.create(CommonAttributes.NUMBER_OF_TIMED_OUT_TRANSACTIONS, ModelType.LONG, true).build()),
+        NUMBER_OF_APPLICATION_ROLLBACKS(SimpleAttributeDefinitionBuilder.create(CommonAttributes.NUMBER_OF_APPLICATION_ROLLBACKS, ModelType.LONG, true).build()),
+        NUMBER_OF_RESOURCE_ROLLBACKS(SimpleAttributeDefinitionBuilder.create(CommonAttributes.NUMBER_OF_RESOURCE_ROLLBACKS, ModelType.LONG, true).build()),
+        NUMBER_OF_SYSTEM_ROLLBACKS(SimpleAttributeDefinitionBuilder.create(CommonAttributes.NUMBER_OF_SYSTEM_ROLLBACKS, ModelType.LONG, true).build()),
+        AVERAGE_COMMIT_TIME(SimpleAttributeDefinitionBuilder.create(CommonAttributes.AVERAGE_COMMIT_TIME, ModelType.LONG, true).build());
 
         private static final Map<String, TxStat> MAP = new HashMap<String, TxStat>();
         static {

transactions/src/main/resources/schema/wildfly-txn_3_1.xsd → transactions/src/main/resources/schema/wildfly-txn_4_0.xsd

@@ -24,11 +24,11 @@
   -->
 
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
-            targetNamespace="urn:jboss:domain:transactions:3.1"
-            xmlns="urn:jboss:domain:transactions:3.1"
+            targetNamespace="urn:jboss:domain:transactions:4.0"
+            xmlns="urn:jboss:domain:transactions:4.0"
             elementFormDefault="qualified"
             attributeFormDefault="unqualified"
-            version="3.1">
+            version="4.0">
 
     <!-- The transaction subsystem root element -->
     <xs:element name="subsystem" type="subsystem"/>

transactions/src/main/resources/subsystem-templates/transactions.xml

@@ -2,7 +2,7 @@
 <!--  See src/resources/configuration/ReadMe.txt for how the configuration assembly works -->
 <config>
    <extension-module>org.jboss.as.transactions</extension-module>
-   <subsystem xmlns="urn:jboss:domain:transactions:3.1">
+   <subsystem xmlns="urn:jboss:domain:transactions:4.0">
        <core-environment>
            <process-id>
                <uuid/>

transactions/src/test/java/org/jboss/as/txn/subsystem/TransactionSubsystemTestCase.java

@@ -67,7 +67,7 @@ protected String getSubsystemXml() throws IOException {
 
     @Override
     protected String getSubsystemXsdPath() throws Exception {
-        return "schema/wildfly-txn_3_1.xsd";
+        return "schema/wildfly-txn_4_0.xsd";
     }
 
     @Override
@@ -132,8 +132,8 @@ public void testParser_3_0() throws Exception {
     }
 
     @Test
-    public void testParser_3_1() throws Exception {
-        standardSubsystemTest("full-3.1.xml");
+    public void testParser_4_0() throws Exception {
+        standardSubsystemTest("full-4.0.xml");
     }
 
     @Test

transactions/src/test/resources/org/jboss/as/txn/subsystem/full-3.1.xml → transactions/src/test/resources/org/jboss/as/txn/subsystem/full-4.0.xml

@@ -21,7 +21,7 @@
   ~
   -->
 
-<subsystem xmlns="urn:jboss:domain:transactions:3.1">
+<subsystem xmlns="urn:jboss:domain:transactions:4.0">
     <core-environment node-identifier="1">
         <process-id>
             <socket socket-binding="txn-socket-id" socket-process-id-max-ports="10"/>
@@ -39,4 +39,4 @@
             <xid-location name="fooTable" batch-size="10" immediate-cleanup="false"/>
         </commit-markable-resource>
     </commit-markable-resources>
-</subsystem>
+</subsystem>

transactions/src/test/resources/org/jboss/as/txn/subsystem/full-expressions-transform.xml

@@ -1,4 +1,4 @@
-<subsystem xmlns="urn:jboss:domain:transactions:3.0">
+<subsystem xmlns="urn:jboss:domain:transactions:4.0">
     <core-environment node-identifier="${test.node.identifier:1}">
         <process-id>
             <socket socket-binding="${test.socket-binding:txn-socket-id}" socket-process-id-max-ports="${test.socket.process.id-max.ports:10}"/>
@@ -12,12 +12,5 @@
     <jts/>
     <!-- Can't use expressions here since the transformer checks -->
     <use-journal-store enable-async-io="true"/>
-    <!-- Rejected in the older model
-    <commit-markable-resources>
-        <commit-markable-resource jndi-name="${test.jndi.name:java:/foo}">
-            <xid-location name="${test.table:fooTable}" batch-size="${test.batch:10}" immediate-cleanup="${test.immediate:false}"/>
-        </commit-markable-resource>
-    </commit-markable-resources>
-     -->
-
+
 </subsystem>

transactions/src/test/resources/org/jboss/as/txn/subsystem/full-expressions.xml

@@ -1,4 +1,4 @@
-<subsystem xmlns="urn:jboss:domain:transactions:3.0">
+<subsystem xmlns="urn:jboss:domain:transactions:4.0">
     <core-environment node-identifier="${test.node.identifier:1}">
         <process-id>
             <socket socket-binding="${test.socket-binding:txn-socket-id}" socket-process-id-max-ports="${test.socket.process.id-max.ports:10}"/>

transactions/src/test/resources/org/jboss/as/txn/subsystem/subsystem.xml

@@ -1,4 +1,4 @@
-<subsystem xmlns="urn:jboss:domain:transactions:3.1">
+<subsystem xmlns="urn:jboss:domain:transactions:4.0">
     <core-environment>
         <process-id>
             <uuid/>