From cc54bf7c2dcdcb5725407f2b0307550af780754a Mon Sep 17 00:00:00 2001 From: Emmanuel Hugonnet Date: Fri, 23 Jun 2017 11:29:38 +0200 Subject: [PATCH] WFLY-9011 transactions subsystem Model version should be 4.0.0. --- .../resources/legacy-configs/domain/7-1-3.xml | 4 ++-- .../resources/legacy-configs/domain/7-2-0.xml | 4 ++-- .../legacy-configs/domain/eap-6-0-0.xml | 4 ++-- .../legacy-configs/domain/eap-6-1-0.xml | 4 ++-- .../legacy-configs/domain/eap-6-2-0.xml | 4 ++-- .../legacy-configs/domain/eap-6-3-0.xml | 4 ++-- .../legacy-configs/domain/eap-6-4-0.xml | 4 ++-- .../legacy-configs/domain/eap-7-0-0.xml | 4 ++-- .../LogStoreTransactionDefinition.java | 5 ++-- .../org/jboss/as/txn/subsystem/Namespace.java | 4 ++-- .../txn/subsystem/TransactionExtension.java | 7 +++--- ...java => TransactionSubsystem40Parser.java} | 6 ++--- .../as/txn/subsystem/TxStatsHandler.java | 24 +++++++++---------- ...ildfly-txn_3_1.xsd => wildfly-txn_4_0.xsd} | 6 ++--- .../subsystem-templates/transactions.xml | 2 +- .../TransactionSubsystemTestCase.java | 6 ++--- .../subsystem/{full-3.1.xml => full-4.0.xml} | 4 ++-- .../subsystem/full-expressions-transform.xml | 11 ++------- .../as/txn/subsystem/full-expressions.xml | 2 +- .../org/jboss/as/txn/subsystem/subsystem.xml | 2 +- 20 files changed, 52 insertions(+), 59 deletions(-) rename transactions/src/main/java/org/jboss/as/txn/subsystem/{TransactionSubsystem31Parser.java => TransactionSubsystem40Parser.java} (89%) rename transactions/src/main/resources/schema/{wildfly-txn_3_1.xsd => wildfly-txn_4_0.xsd} (98%) rename transactions/src/test/resources/org/jboss/as/txn/subsystem/{full-3.1.xml => full-4.0.xml} (96%) diff --git a/testsuite/integration/manualmode/src/test/resources/legacy-configs/domain/7-1-3.xml b/testsuite/integration/manualmode/src/test/resources/legacy-configs/domain/7-1-3.xml index 824dd7dab356..246c65f6e648 100644 --- a/testsuite/integration/manualmode/src/test/resources/legacy-configs/domain/7-1-3.xml +++ b/testsuite/integration/manualmode/src/test/resources/legacy-configs/domain/7-1-3.xml @@ -1301,13 +1301,13 @@ - + - + diff --git a/testsuite/integration/manualmode/src/test/resources/legacy-configs/domain/7-2-0.xml b/testsuite/integration/manualmode/src/test/resources/legacy-configs/domain/7-2-0.xml index c0733950ca2e..90c8d77174c7 100644 --- a/testsuite/integration/manualmode/src/test/resources/legacy-configs/domain/7-2-0.xml +++ b/testsuite/integration/manualmode/src/test/resources/legacy-configs/domain/7-2-0.xml @@ -1339,13 +1339,13 @@ - + - + diff --git a/testsuite/integration/manualmode/src/test/resources/legacy-configs/domain/eap-6-0-0.xml b/testsuite/integration/manualmode/src/test/resources/legacy-configs/domain/eap-6-0-0.xml index fd346e3b6424..9433e989ac73 100644 --- a/testsuite/integration/manualmode/src/test/resources/legacy-configs/domain/eap-6-0-0.xml +++ b/testsuite/integration/manualmode/src/test/resources/legacy-configs/domain/eap-6-0-0.xml @@ -1290,14 +1290,14 @@ - + - + diff --git a/testsuite/integration/manualmode/src/test/resources/legacy-configs/domain/eap-6-1-0.xml b/testsuite/integration/manualmode/src/test/resources/legacy-configs/domain/eap-6-1-0.xml index f369d066c16d..a487f5ae08d6 100644 --- a/testsuite/integration/manualmode/src/test/resources/legacy-configs/domain/eap-6-1-0.xml +++ b/testsuite/integration/manualmode/src/test/resources/legacy-configs/domain/eap-6-1-0.xml @@ -1337,14 +1337,14 @@ - + - + diff --git a/testsuite/integration/manualmode/src/test/resources/legacy-configs/domain/eap-6-2-0.xml b/testsuite/integration/manualmode/src/test/resources/legacy-configs/domain/eap-6-2-0.xml index e7a6d801ec97..f9307fadc53d 100644 --- a/testsuite/integration/manualmode/src/test/resources/legacy-configs/domain/eap-6-2-0.xml +++ b/testsuite/integration/manualmode/src/test/resources/legacy-configs/domain/eap-6-2-0.xml @@ -1350,14 +1350,14 @@ - + - + diff --git a/testsuite/integration/manualmode/src/test/resources/legacy-configs/domain/eap-6-3-0.xml b/testsuite/integration/manualmode/src/test/resources/legacy-configs/domain/eap-6-3-0.xml index 94afcf89dda6..50a73a15cfbd 100644 --- a/testsuite/integration/manualmode/src/test/resources/legacy-configs/domain/eap-6-3-0.xml +++ b/testsuite/integration/manualmode/src/test/resources/legacy-configs/domain/eap-6-3-0.xml @@ -1391,14 +1391,14 @@ - + - + diff --git a/testsuite/integration/manualmode/src/test/resources/legacy-configs/domain/eap-6-4-0.xml b/testsuite/integration/manualmode/src/test/resources/legacy-configs/domain/eap-6-4-0.xml index 6c1aac215c52..533cfe82d412 100644 --- a/testsuite/integration/manualmode/src/test/resources/legacy-configs/domain/eap-6-4-0.xml +++ b/testsuite/integration/manualmode/src/test/resources/legacy-configs/domain/eap-6-4-0.xml @@ -1399,14 +1399,14 @@ - + - + diff --git a/testsuite/integration/manualmode/src/test/resources/legacy-configs/domain/eap-7-0-0.xml b/testsuite/integration/manualmode/src/test/resources/legacy-configs/domain/eap-7-0-0.xml index c46683748e69..45df142af015 100644 --- a/testsuite/integration/manualmode/src/test/resources/legacy-configs/domain/eap-7-0-0.xml +++ b/testsuite/integration/manualmode/src/test/resources/legacy-configs/domain/eap-7-0-0.xml @@ -1493,13 +1493,13 @@ - + - + diff --git a/transactions/src/main/java/org/jboss/as/txn/subsystem/LogStoreTransactionDefinition.java b/transactions/src/main/java/org/jboss/as/txn/subsystem/LogStoreTransactionDefinition.java index d603a246b3aa..3ae2143556a2 100644 --- a/transactions/src/main/java/org/jboss/as/txn/subsystem/LogStoreTransactionDefinition.java +++ b/transactions/src/main/java/org/jboss/as/txn/subsystem/LogStoreTransactionDefinition.java @@ -31,13 +31,12 @@ /** * @author Tomaz Cerar */ -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) { diff --git a/transactions/src/main/java/org/jboss/as/txn/subsystem/Namespace.java b/transactions/src/main/java/org/jboss/as/txn/subsystem/Namespace.java index c47da79bb09d..c99793061208 100644 --- a/transactions/src/main/java/org/jboss/as/txn/subsystem/Namespace.java +++ b/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; diff --git a/transactions/src/main/java/org/jboss/as/txn/subsystem/TransactionExtension.java b/transactions/src/main/java/org/jboss/as/txn/subsystem/TransactionExtension.java index 6d8e8744b6bf..8c61246560e0 100644 --- a/transactions/src/main/java/org/jboss/as/txn/subsystem/TransactionExtension.java +++ b/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 }); } - } diff --git a/transactions/src/main/java/org/jboss/as/txn/subsystem/TransactionSubsystem31Parser.java b/transactions/src/main/java/org/jboss/as/txn/subsystem/TransactionSubsystem40Parser.java similarity index 89% rename from transactions/src/main/java/org/jboss/as/txn/subsystem/TransactionSubsystem31Parser.java rename to transactions/src/main/java/org/jboss/as/txn/subsystem/TransactionSubsystem40Parser.java index bd7fe92bef53..530032e53e08 100644 --- a/transactions/src/main/java/org/jboss/as/txn/subsystem/TransactionSubsystem31Parser.java +++ b/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; } diff --git a/transactions/src/main/java/org/jboss/as/txn/subsystem/TxStatsHandler.java b/transactions/src/main/java/org/jboss/as/txn/subsystem/TxStatsHandler.java index a7d434952e01..ed9c046e0c62 100644 --- a/transactions/src/main/java/org/jboss/as/txn/subsystem/TxStatsHandler.java +++ b/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 MAP = new HashMap(); static { diff --git a/transactions/src/main/resources/schema/wildfly-txn_3_1.xsd b/transactions/src/main/resources/schema/wildfly-txn_4_0.xsd similarity index 98% rename from transactions/src/main/resources/schema/wildfly-txn_3_1.xsd rename to transactions/src/main/resources/schema/wildfly-txn_4_0.xsd index 0ddd11953756..e74fa7f79d67 100644 --- a/transactions/src/main/resources/schema/wildfly-txn_3_1.xsd +++ b/transactions/src/main/resources/schema/wildfly-txn_4_0.xsd @@ -24,11 +24,11 @@ --> + version="4.0"> diff --git a/transactions/src/main/resources/subsystem-templates/transactions.xml b/transactions/src/main/resources/subsystem-templates/transactions.xml index 6ff662ec0208..ced235be3b21 100644 --- a/transactions/src/main/resources/subsystem-templates/transactions.xml +++ b/transactions/src/main/resources/subsystem-templates/transactions.xml @@ -2,7 +2,7 @@ org.jboss.as.transactions - + diff --git a/transactions/src/test/java/org/jboss/as/txn/subsystem/TransactionSubsystemTestCase.java b/transactions/src/test/java/org/jboss/as/txn/subsystem/TransactionSubsystemTestCase.java index f71dd70a8d55..17d730662651 100644 --- a/transactions/src/test/java/org/jboss/as/txn/subsystem/TransactionSubsystemTestCase.java +++ b/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 diff --git a/transactions/src/test/resources/org/jboss/as/txn/subsystem/full-3.1.xml b/transactions/src/test/resources/org/jboss/as/txn/subsystem/full-4.0.xml similarity index 96% rename from transactions/src/test/resources/org/jboss/as/txn/subsystem/full-3.1.xml rename to transactions/src/test/resources/org/jboss/as/txn/subsystem/full-4.0.xml index 6fa1311a1a0e..d1c396a44083 100644 --- a/transactions/src/test/resources/org/jboss/as/txn/subsystem/full-3.1.xml +++ b/transactions/src/test/resources/org/jboss/as/txn/subsystem/full-4.0.xml @@ -21,7 +21,7 @@ ~ --> - + @@ -39,4 +39,4 @@ - + \ No newline at end of file diff --git a/transactions/src/test/resources/org/jboss/as/txn/subsystem/full-expressions-transform.xml b/transactions/src/test/resources/org/jboss/as/txn/subsystem/full-expressions-transform.xml index c3b2bd4fc664..de6f84237597 100644 --- a/transactions/src/test/resources/org/jboss/as/txn/subsystem/full-expressions-transform.xml +++ b/transactions/src/test/resources/org/jboss/as/txn/subsystem/full-expressions-transform.xml @@ -1,4 +1,4 @@ - + @@ -12,12 +12,5 @@ - - + diff --git a/transactions/src/test/resources/org/jboss/as/txn/subsystem/full-expressions.xml b/transactions/src/test/resources/org/jboss/as/txn/subsystem/full-expressions.xml index d0a8e6de734f..0ff2a251735e 100644 --- a/transactions/src/test/resources/org/jboss/as/txn/subsystem/full-expressions.xml +++ b/transactions/src/test/resources/org/jboss/as/txn/subsystem/full-expressions.xml @@ -1,4 +1,4 @@ - + diff --git a/transactions/src/test/resources/org/jboss/as/txn/subsystem/subsystem.xml b/transactions/src/test/resources/org/jboss/as/txn/subsystem/subsystem.xml index a3d54c722f07..e9b5a2de8320 100644 --- a/transactions/src/test/resources/org/jboss/as/txn/subsystem/subsystem.xml +++ b/transactions/src/test/resources/org/jboss/as/txn/subsystem/subsystem.xml @@ -1,4 +1,4 @@ - +