diff --git a/dev/fattest.simplicity/src/componenttest/topology/impl/LibertyServer.java b/dev/fattest.simplicity/src/componenttest/topology/impl/LibertyServer.java index 867de9d31fd..b11681fbf37 100644 --- a/dev/fattest.simplicity/src/componenttest/topology/impl/LibertyServer.java +++ b/dev/fattest.simplicity/src/componenttest/topology/impl/LibertyServer.java @@ -3630,34 +3630,36 @@ protected void checkServerRepeatFeatures() throws Exception { Set expectedFeatures = new HashSet<>(featureReplacementAction.getAddFeatures()); //the expected features, if present expectedFeatures.addAll(featureReplacementAction.getAlwaysAddFeatures()); - Set installedFeatures = getInstalledFeatures(); //the features actually installed at runtime + List> installedFeatures = getInstalledFeatures(); //the features actually installed at runtime + for (Set installedFeatureSet : installedFeatures) { - //expected feature -> actual feature - Map unexpectedFeatures = getUnexpectedFeatures(expectedFeatures, installedFeatures); + //expected feature -> actual feature + Map unexpectedFeatures = getUnexpectedFeatures(expectedFeatures, installedFeatureSet); - if (unexpectedFeatures.size() > 0) { - String message = "Runtime features were not of the expected version for repeat action (Server: " + serverName + ", Action: " + action.getID() + ").\n"; - for (Map.Entry entry : unexpectedFeatures.entrySet()) { - message = message + "Expected: " + entry.getKey() + ", Actual: " + entry.getValue() + ".\n"; - } - message = message - + "This is usually caused by a feature not being explicitly set in the FAT's server.xml such that FeatureReplacementAction does not replace it properly."; - - //if this is a local run then always throw an exception - //if not local then check if the server is exempt - //if not exempt then throw exception, otherwise just output a message - //check for exempt servers should eventually be removed - if (REPEAT_FEATURE_CHECK_ERROR) { - if (FAT_TEST_LOCALRUN) { - message = message + "\nYou should also ensure that the test server has been removed from LibertyServer.EXEMPT_SERVERS."; - throw new Exception(message); - } else if (!EXEMPT_SERVERS_SET.contains(serverName)) { - throw new Exception(message); + if (unexpectedFeatures.size() > 0) { + String message = "Runtime features were not of the expected version for repeat action (Server: " + serverName + ", Action: " + action.getID() + ").\n"; + for (Map.Entry entry : unexpectedFeatures.entrySet()) { + message = message + "Expected: " + entry.getKey() + ", Actual: " + entry.getValue() + ".\n"; + } + message = message + + "This is usually caused by a feature not being explicitly set in the FAT's server.xml such that FeatureReplacementAction does not replace it properly."; + + //if this is a local run then always throw an exception + //if not local then check if the server is exempt + //if not exempt then throw exception, otherwise just output a message + //check for exempt servers should eventually be removed + if (REPEAT_FEATURE_CHECK_ERROR) { + if (FAT_TEST_LOCALRUN) { + message = message + "\nYou should also ensure that the test server has been removed from LibertyServer.EXEMPT_SERVERS."; + throw new Exception(message); + } else if (!EXEMPT_SERVERS_SET.contains(serverName)) { + throw new Exception(message); + } else { + Log.info(c, method, message); + } } else { Log.info(c, method, message); } - } else { - Log.info(c, method, message); } } } @@ -6237,22 +6239,23 @@ public Set getInstalledAppNames(String... possiblyInstalledAppNames) thr private static final String INSTALL_FEATURE_MESSAGE_PREFIX = "CWWKF0012I: The server installed the following features:"; /** - * Returns a set of the features which were installed at runtime startup, based on the messages.log. - * We only look at the first occurrence of the message. This method does not look for subsequent feature changes. + * Returns sets of the features which were installed at runtime startup, based on the CWWKF0012I message in messages.log. + * This message can occur multiple times, hence multiple sets * * e.g. * CWWKF0012I: The server installed the following features: [bells-1.0, cdi-4.0, componenttest-2.0, concurrent-3.0, jndi-1.0, mpConfig-3.1, mpContextPropagation-1.3, * mpFaultTolerance-4.0, servlet-6.0, timedexit-1.0]. * - * @return a set of the features installed at runtime + * @return sets of the features installed at runtime * @throws Exception */ - public Set getInstalledFeatures() throws Exception { - Set installedFeatures = new HashSet<>(); + public List> getInstalledFeatures() throws Exception { + List> installedFeatures = new ArrayList<>(); for (String line : findStringsInLogs(INSTALL_FEATURE_MESSAGE_PREFIX)) { - installedFeatures.addAll(getInstalledFeaturesFromLogMessage(line)); - break; //only look at the first message + Set installedFeatureSet = new HashSet<>(); + installedFeatureSet.addAll(getInstalledFeaturesFromLogMessage(line)); + installedFeatures.add(installedFeatureSet); } return installedFeatures; diff --git a/dev/io.openliberty.jaxws.config_fat/publish/files/EnableDefaultValidationTestServer/global-true-server.xml b/dev/io.openliberty.jaxws.config_fat/publish/files/EnableDefaultValidationTestServer/global-true-server.xml index 763bf303c7f..b0923ecad09 100755 --- a/dev/io.openliberty.jaxws.config_fat/publish/files/EnableDefaultValidationTestServer/global-true-server.xml +++ b/dev/io.openliberty.jaxws.config_fat/publish/files/EnableDefaultValidationTestServer/global-true-server.xml @@ -2,6 +2,7 @@ jsp-2.2 jaxws-2.2 + servlet-3.1 diff --git a/dev/io.openliberty.jaxws.config_fat/publish/files/EnableDefaultValidationTestServer/server.xml b/dev/io.openliberty.jaxws.config_fat/publish/files/EnableDefaultValidationTestServer/server.xml index 01a01f5c696..2c6ac37177f 100755 --- a/dev/io.openliberty.jaxws.config_fat/publish/files/EnableDefaultValidationTestServer/server.xml +++ b/dev/io.openliberty.jaxws.config_fat/publish/files/EnableDefaultValidationTestServer/server.xml @@ -2,6 +2,7 @@ jsp-2.2 jaxws-2.2 + servlet-3.1 diff --git a/dev/io.openliberty.jaxws.config_fat/publish/files/EnableDefaultValidationTestServer/servicename-true-server.xml b/dev/io.openliberty.jaxws.config_fat/publish/files/EnableDefaultValidationTestServer/servicename-true-server.xml index 6f658d9c62f..2c4b5826ae6 100755 --- a/dev/io.openliberty.jaxws.config_fat/publish/files/EnableDefaultValidationTestServer/servicename-true-server.xml +++ b/dev/io.openliberty.jaxws.config_fat/publish/files/EnableDefaultValidationTestServer/servicename-true-server.xml @@ -2,6 +2,7 @@ jsp-2.2 jaxws-2.2 + servlet-3.1 diff --git a/dev/io.openliberty.jaxws.config_fat/publish/files/EnableSchemaValidationTestServer/global-false-server.xml b/dev/io.openliberty.jaxws.config_fat/publish/files/EnableSchemaValidationTestServer/global-false-server.xml index 08fc8bc168d..4a086448b55 100755 --- a/dev/io.openliberty.jaxws.config_fat/publish/files/EnableSchemaValidationTestServer/global-false-server.xml +++ b/dev/io.openliberty.jaxws.config_fat/publish/files/EnableSchemaValidationTestServer/global-false-server.xml @@ -2,6 +2,7 @@ jsp-2.2 jaxws-2.2 + servlet-3.1 diff --git a/dev/io.openliberty.jaxws.config_fat/publish/files/EnableSchemaValidationTestServer/global-true-server.xml b/dev/io.openliberty.jaxws.config_fat/publish/files/EnableSchemaValidationTestServer/global-true-server.xml index 6c018623f5a..fae71a1a231 100755 --- a/dev/io.openliberty.jaxws.config_fat/publish/files/EnableSchemaValidationTestServer/global-true-server.xml +++ b/dev/io.openliberty.jaxws.config_fat/publish/files/EnableSchemaValidationTestServer/global-true-server.xml @@ -2,6 +2,7 @@ jsp-2.2 jaxws-2.2 + servlet-3.1 diff --git a/dev/io.openliberty.jaxws.config_fat/publish/files/EnableSchemaValidationTestServer/incorrect-servicename-server.xml b/dev/io.openliberty.jaxws.config_fat/publish/files/EnableSchemaValidationTestServer/incorrect-servicename-server.xml index dbd33094448..eb67938afa9 100755 --- a/dev/io.openliberty.jaxws.config_fat/publish/files/EnableSchemaValidationTestServer/incorrect-servicename-server.xml +++ b/dev/io.openliberty.jaxws.config_fat/publish/files/EnableSchemaValidationTestServer/incorrect-servicename-server.xml @@ -2,6 +2,7 @@ jsp-2.2 jaxws-2.2 + servlet-3.1 diff --git a/dev/io.openliberty.jaxws.config_fat/publish/files/EnableSchemaValidationTestServer/server.xml b/dev/io.openliberty.jaxws.config_fat/publish/files/EnableSchemaValidationTestServer/server.xml index 420a4826930..0be5825193e 100755 --- a/dev/io.openliberty.jaxws.config_fat/publish/files/EnableSchemaValidationTestServer/server.xml +++ b/dev/io.openliberty.jaxws.config_fat/publish/files/EnableSchemaValidationTestServer/server.xml @@ -2,6 +2,7 @@ jsp-2.2 jaxws-2.2 + servlet-3.1 diff --git a/dev/io.openliberty.jaxws.config_fat/publish/files/EnableSchemaValidationTestServer/servicename-false-global-true-server.xml b/dev/io.openliberty.jaxws.config_fat/publish/files/EnableSchemaValidationTestServer/servicename-false-global-true-server.xml index 636f8dc7fab..265e66bc24e 100755 --- a/dev/io.openliberty.jaxws.config_fat/publish/files/EnableSchemaValidationTestServer/servicename-false-global-true-server.xml +++ b/dev/io.openliberty.jaxws.config_fat/publish/files/EnableSchemaValidationTestServer/servicename-false-global-true-server.xml @@ -2,6 +2,7 @@ jsp-2.2 jaxws-2.2 + servlet-3.1 diff --git a/dev/io.openliberty.jaxws.config_fat/publish/files/EnableSchemaValidationTestServer/servicename-false-server.xml b/dev/io.openliberty.jaxws.config_fat/publish/files/EnableSchemaValidationTestServer/servicename-false-server.xml index 6f33768db18..a96539010ea 100755 --- a/dev/io.openliberty.jaxws.config_fat/publish/files/EnableSchemaValidationTestServer/servicename-false-server.xml +++ b/dev/io.openliberty.jaxws.config_fat/publish/files/EnableSchemaValidationTestServer/servicename-false-server.xml @@ -2,6 +2,7 @@ jsp-2.2 jaxws-2.2 + servlet-3.1 diff --git a/dev/io.openliberty.jaxws.config_fat/publish/files/EnableSchemaValidationTestServer/servicename-true-global-false-server.xml b/dev/io.openliberty.jaxws.config_fat/publish/files/EnableSchemaValidationTestServer/servicename-true-global-false-server.xml index 7b019725825..0c6a154bae2 100755 --- a/dev/io.openliberty.jaxws.config_fat/publish/files/EnableSchemaValidationTestServer/servicename-true-global-false-server.xml +++ b/dev/io.openliberty.jaxws.config_fat/publish/files/EnableSchemaValidationTestServer/servicename-true-global-false-server.xml @@ -2,6 +2,7 @@ jsp-2.2 jaxws-2.2 + servlet-3.1 diff --git a/dev/io.openliberty.jaxws.config_fat/publish/files/EnableSchemaValidationTestServer/servicename-true-server.xml b/dev/io.openliberty.jaxws.config_fat/publish/files/EnableSchemaValidationTestServer/servicename-true-server.xml index b7e19b789f1..54fc6eb53f7 100755 --- a/dev/io.openliberty.jaxws.config_fat/publish/files/EnableSchemaValidationTestServer/servicename-true-server.xml +++ b/dev/io.openliberty.jaxws.config_fat/publish/files/EnableSchemaValidationTestServer/servicename-true-server.xml @@ -2,6 +2,7 @@ jsp-2.2 jaxws-2.2 + servlet-3.1 diff --git a/dev/io.openliberty.jaxws.config_fat/publish/files/EnableSchemaValidationWebServiceTestServer/global-false-server.xml b/dev/io.openliberty.jaxws.config_fat/publish/files/EnableSchemaValidationWebServiceTestServer/global-false-server.xml index af655aa30e7..9f195f3247c 100755 --- a/dev/io.openliberty.jaxws.config_fat/publish/files/EnableSchemaValidationWebServiceTestServer/global-false-server.xml +++ b/dev/io.openliberty.jaxws.config_fat/publish/files/EnableSchemaValidationWebServiceTestServer/global-false-server.xml @@ -2,6 +2,7 @@ jsp-2.2 jaxws-2.2 + servlet-3.1 diff --git a/dev/io.openliberty.jaxws.config_fat/publish/files/EnableSchemaValidationWebServiceTestServer/global-true-server.xml b/dev/io.openliberty.jaxws.config_fat/publish/files/EnableSchemaValidationWebServiceTestServer/global-true-server.xml index 668c5d0d5da..3431daedf96 100755 --- a/dev/io.openliberty.jaxws.config_fat/publish/files/EnableSchemaValidationWebServiceTestServer/global-true-server.xml +++ b/dev/io.openliberty.jaxws.config_fat/publish/files/EnableSchemaValidationWebServiceTestServer/global-true-server.xml @@ -2,6 +2,7 @@ jsp-2.2 jaxws-2.2 + servlet-3.1 diff --git a/dev/io.openliberty.jaxws.config_fat/publish/files/EnableSchemaValidationWebServiceTestServer/incorrect-portname-server.xml b/dev/io.openliberty.jaxws.config_fat/publish/files/EnableSchemaValidationWebServiceTestServer/incorrect-portname-server.xml index e756b504527..98cf01972b7 100755 --- a/dev/io.openliberty.jaxws.config_fat/publish/files/EnableSchemaValidationWebServiceTestServer/incorrect-portname-server.xml +++ b/dev/io.openliberty.jaxws.config_fat/publish/files/EnableSchemaValidationWebServiceTestServer/incorrect-portname-server.xml @@ -2,6 +2,7 @@ jsp-2.2 jaxws-2.2 + servlet-3.1 diff --git a/dev/io.openliberty.jaxws.config_fat/publish/files/EnableSchemaValidationWebServiceTestServer/portname-false-global-true-server.xml b/dev/io.openliberty.jaxws.config_fat/publish/files/EnableSchemaValidationWebServiceTestServer/portname-false-global-true-server.xml index 3e9d26c5842..204a4d6cf1b 100755 --- a/dev/io.openliberty.jaxws.config_fat/publish/files/EnableSchemaValidationWebServiceTestServer/portname-false-global-true-server.xml +++ b/dev/io.openliberty.jaxws.config_fat/publish/files/EnableSchemaValidationWebServiceTestServer/portname-false-global-true-server.xml @@ -2,6 +2,7 @@ jsp-2.2 jaxws-2.2 + servlet-3.1 diff --git a/dev/io.openliberty.jaxws.config_fat/publish/files/EnableSchemaValidationWebServiceTestServer/portname-false-server.xml b/dev/io.openliberty.jaxws.config_fat/publish/files/EnableSchemaValidationWebServiceTestServer/portname-false-server.xml index fb67ca96f14..c73176352b7 100755 --- a/dev/io.openliberty.jaxws.config_fat/publish/files/EnableSchemaValidationWebServiceTestServer/portname-false-server.xml +++ b/dev/io.openliberty.jaxws.config_fat/publish/files/EnableSchemaValidationWebServiceTestServer/portname-false-server.xml @@ -2,6 +2,7 @@ jsp-2.2 jaxws-2.2 + servlet-3.1 diff --git a/dev/io.openliberty.jaxws.config_fat/publish/files/EnableSchemaValidationWebServiceTestServer/portname-true-global-false-server.xml b/dev/io.openliberty.jaxws.config_fat/publish/files/EnableSchemaValidationWebServiceTestServer/portname-true-global-false-server.xml index 2619ea45d0b..ecfca780d35 100755 --- a/dev/io.openliberty.jaxws.config_fat/publish/files/EnableSchemaValidationWebServiceTestServer/portname-true-global-false-server.xml +++ b/dev/io.openliberty.jaxws.config_fat/publish/files/EnableSchemaValidationWebServiceTestServer/portname-true-global-false-server.xml @@ -2,6 +2,7 @@ jsp-2.2 jaxws-2.2 + servlet-3.1 diff --git a/dev/io.openliberty.jaxws.config_fat/publish/files/EnableSchemaValidationWebServiceTestServer/portname-true-server.xml b/dev/io.openliberty.jaxws.config_fat/publish/files/EnableSchemaValidationWebServiceTestServer/portname-true-server.xml index 19c6845f1d9..99ac319f555 100755 --- a/dev/io.openliberty.jaxws.config_fat/publish/files/EnableSchemaValidationWebServiceTestServer/portname-true-server.xml +++ b/dev/io.openliberty.jaxws.config_fat/publish/files/EnableSchemaValidationWebServiceTestServer/portname-true-server.xml @@ -2,6 +2,7 @@ jsp-2.2 jaxws-2.2 + servlet-3.1 diff --git a/dev/io.openliberty.jaxws.config_fat/publish/files/EnableSchemaValidationWebServiceTestServer/server.xml b/dev/io.openliberty.jaxws.config_fat/publish/files/EnableSchemaValidationWebServiceTestServer/server.xml index 420a4826930..0be5825193e 100755 --- a/dev/io.openliberty.jaxws.config_fat/publish/files/EnableSchemaValidationWebServiceTestServer/server.xml +++ b/dev/io.openliberty.jaxws.config_fat/publish/files/EnableSchemaValidationWebServiceTestServer/server.xml @@ -2,6 +2,7 @@ jsp-2.2 jaxws-2.2 + servlet-3.1 diff --git a/dev/io.openliberty.jaxws.config_fat/publish/files/IgnoreUnexpectedElementConfigTestServer/global-false-server.xml b/dev/io.openliberty.jaxws.config_fat/publish/files/IgnoreUnexpectedElementConfigTestServer/global-false-server.xml index 7ac1162f730..9655d0d16a0 100755 --- a/dev/io.openliberty.jaxws.config_fat/publish/files/IgnoreUnexpectedElementConfigTestServer/global-false-server.xml +++ b/dev/io.openliberty.jaxws.config_fat/publish/files/IgnoreUnexpectedElementConfigTestServer/global-false-server.xml @@ -2,6 +2,7 @@ jsp-2.2 jaxws-2.2 + servlet-3.1 diff --git a/dev/io.openliberty.jaxws.config_fat/publish/files/IgnoreUnexpectedElementConfigTestServer/global-true-server.xml b/dev/io.openliberty.jaxws.config_fat/publish/files/IgnoreUnexpectedElementConfigTestServer/global-true-server.xml index 39e9ddd3069..5781c353dc3 100755 --- a/dev/io.openliberty.jaxws.config_fat/publish/files/IgnoreUnexpectedElementConfigTestServer/global-true-server.xml +++ b/dev/io.openliberty.jaxws.config_fat/publish/files/IgnoreUnexpectedElementConfigTestServer/global-true-server.xml @@ -2,6 +2,7 @@ jsp-2.2 jaxws-2.2 + servlet-3.1 diff --git a/dev/io.openliberty.jaxws.config_fat/publish/files/IgnoreUnexpectedElementConfigTestServer/incorrect-servicename-server.xml b/dev/io.openliberty.jaxws.config_fat/publish/files/IgnoreUnexpectedElementConfigTestServer/incorrect-servicename-server.xml index 880872af3b8..be21d2cdf66 100755 --- a/dev/io.openliberty.jaxws.config_fat/publish/files/IgnoreUnexpectedElementConfigTestServer/incorrect-servicename-server.xml +++ b/dev/io.openliberty.jaxws.config_fat/publish/files/IgnoreUnexpectedElementConfigTestServer/incorrect-servicename-server.xml @@ -2,6 +2,7 @@ jsp-2.2 jaxws-2.2 + servlet-3.1 diff --git a/dev/io.openliberty.jaxws.config_fat/publish/files/IgnoreUnexpectedElementConfigTestServer/servicename-false-global-false-server.xml b/dev/io.openliberty.jaxws.config_fat/publish/files/IgnoreUnexpectedElementConfigTestServer/servicename-false-global-false-server.xml index 858458a76d5..cf4e4a9fde8 100755 --- a/dev/io.openliberty.jaxws.config_fat/publish/files/IgnoreUnexpectedElementConfigTestServer/servicename-false-global-false-server.xml +++ b/dev/io.openliberty.jaxws.config_fat/publish/files/IgnoreUnexpectedElementConfigTestServer/servicename-false-global-false-server.xml @@ -2,6 +2,7 @@ jsp-2.2 jaxws-2.2 + servlet-3.1 diff --git a/dev/io.openliberty.jaxws.config_fat/publish/files/IgnoreUnexpectedElementConfigTestServer/servicename-false-global-true-server.xml b/dev/io.openliberty.jaxws.config_fat/publish/files/IgnoreUnexpectedElementConfigTestServer/servicename-false-global-true-server.xml index 151daeaa288..26bcf227019 100755 --- a/dev/io.openliberty.jaxws.config_fat/publish/files/IgnoreUnexpectedElementConfigTestServer/servicename-false-global-true-server.xml +++ b/dev/io.openliberty.jaxws.config_fat/publish/files/IgnoreUnexpectedElementConfigTestServer/servicename-false-global-true-server.xml @@ -2,6 +2,7 @@ jsp-2.2 jaxws-2.2 + servlet-3.1 diff --git a/dev/io.openliberty.jaxws.config_fat/publish/files/IgnoreUnexpectedElementConfigTestServer/servicename-false-server.xml b/dev/io.openliberty.jaxws.config_fat/publish/files/IgnoreUnexpectedElementConfigTestServer/servicename-false-server.xml index a8ac5d387ff..359fa74a850 100755 --- a/dev/io.openliberty.jaxws.config_fat/publish/files/IgnoreUnexpectedElementConfigTestServer/servicename-false-server.xml +++ b/dev/io.openliberty.jaxws.config_fat/publish/files/IgnoreUnexpectedElementConfigTestServer/servicename-false-server.xml @@ -2,6 +2,7 @@ jsp-2.2 jaxws-2.2 + servlet-3.1 diff --git a/dev/io.openliberty.jaxws.config_fat/publish/files/IgnoreUnexpectedElementConfigTestServer/servicename-true-global-false-server.xml b/dev/io.openliberty.jaxws.config_fat/publish/files/IgnoreUnexpectedElementConfigTestServer/servicename-true-global-false-server.xml index 7815e49f99e..b0d2e675b67 100755 --- a/dev/io.openliberty.jaxws.config_fat/publish/files/IgnoreUnexpectedElementConfigTestServer/servicename-true-global-false-server.xml +++ b/dev/io.openliberty.jaxws.config_fat/publish/files/IgnoreUnexpectedElementConfigTestServer/servicename-true-global-false-server.xml @@ -2,6 +2,7 @@ jsp-2.2 jaxws-2.2 + servlet-3.1 diff --git a/dev/io.openliberty.jaxws.config_fat/publish/files/IgnoreUnexpectedElementConfigTestServer/servicename-true-global-true-server.xml b/dev/io.openliberty.jaxws.config_fat/publish/files/IgnoreUnexpectedElementConfigTestServer/servicename-true-global-true-server.xml index ee46c0137e3..ef2dd398007 100755 --- a/dev/io.openliberty.jaxws.config_fat/publish/files/IgnoreUnexpectedElementConfigTestServer/servicename-true-global-true-server.xml +++ b/dev/io.openliberty.jaxws.config_fat/publish/files/IgnoreUnexpectedElementConfigTestServer/servicename-true-global-true-server.xml @@ -2,6 +2,7 @@ jsp-2.2 jaxws-2.2 + servlet-3.1 diff --git a/dev/io.openliberty.jaxws.config_fat/publish/files/IgnoreUnexpectedElementConfigTestServer/servicename-true-server.xml b/dev/io.openliberty.jaxws.config_fat/publish/files/IgnoreUnexpectedElementConfigTestServer/servicename-true-server.xml index 1178940349e..276fd38bae8 100755 --- a/dev/io.openliberty.jaxws.config_fat/publish/files/IgnoreUnexpectedElementConfigTestServer/servicename-true-server.xml +++ b/dev/io.openliberty.jaxws.config_fat/publish/files/IgnoreUnexpectedElementConfigTestServer/servicename-true-server.xml @@ -2,6 +2,7 @@ jsp-2.2 jaxws-2.2 + servlet-3.1