From c21eb55b6c6742a58e9f84255512316677d19ebc Mon Sep 17 00:00:00 2001 From: Alessio Soldano Date: Mon, 13 Mar 2017 18:42:02 +0100 Subject: [PATCH] [JBWS-4027] Move to gmavenplus plugin to allow upgrading to a recent Groovy version supporting JDK9. --- .mvn/jvm.config | 1 + modules/testsuite/cxf-tests/pom.xml | 138 ++++++++++++++---- ...tsuite-default-config-tests-elytron.groovy | 14 +- ...jbws-testsuite-default-config-tests.groovy | 12 +- .../jbws-testsuite-default-elytron.groovy | 50 +++---- .../scripts/jbws-testsuite-default.groovy | 42 +++--- .../jbws-testsuite-jms-wildfly1000.groovy | 10 +- .../jbws-testsuite-jms-wildfly1010.groovy | 10 +- .../jbws-testsuite-jms-wildfly1100.groovy | 10 +- .../jbws-testsuite-jms-wildfly902.groovy | 10 +- ...s-testsuite-ssl-mutual-auth-elytron.groovy | 10 +- .../jbws-testsuite-ssl-mutual-auth.groovy | 10 +- modules/testsuite/perf-tests/pom.xml | 23 ++- .../perf-tests/src/test/scripts/perf.groovy | 6 +- modules/testsuite/shared-tests/pom.xml | 96 +++++++++--- ...uite-shared-address-rewrite-elytron.groovy | 16 +- ...ws-testsuite-shared-address-rewrite.groovy | 14 +- ...shared-default-config-tests-elytron.groovy | 14 +- ...stsuite-shared-default-config-tests.groovy | 12 +- ...ws-testsuite-shared-default-elytron.groovy | 28 ++-- .../jbws-testsuite-shared-default.groovy | 26 ++-- pom.xml | 16 +- 22 files changed, 356 insertions(+), 212 deletions(-) create mode 100644 .mvn/jvm.config diff --git a/.mvn/jvm.config b/.mvn/jvm.config new file mode 100644 index 000000000..ef5a16852 --- /dev/null +++ b/.mvn/jvm.config @@ -0,0 +1 @@ +-DdownloadSources=true diff --git a/modules/testsuite/cxf-tests/pom.xml b/modules/testsuite/cxf-tests/pom.xml index aee733dfe..6e81cce0b 100644 --- a/modules/testsuite/cxf-tests/pom.xml +++ b/modules/testsuite/cxf-tests/pom.xml @@ -93,8 +93,8 @@ - org.codehaus.gmaven - gmaven-plugin + org.codehaus.gmavenplus + gmavenplus-plugin testsuite-default @@ -103,15 +103,38 @@ execute - ${basedir}/src/test/scripts/jbws-testsuite-default${additionalGroovyScriptSuffix}.groovy + + + - ${jboss.home}/standalone/configuration/standalone.xml - ${jboss.home}/standalone/configuration/jbws-testsuite-default.xml - jbws-testsuite-default.log - ${project.build.directory}/test-classes/jbossws-users.properties - ${project.build.directory}/test-classes/jbossws-roles.properties - ${project.build.directory}/test-classes/test.keystore - ${project.build.directory}/test-resources + + inputFile + ${jboss.home}/standalone/configuration/standalone.xml + + + outputFile + ${jboss.home}/standalone/configuration/jbws-testsuite-default.xml + + + serverLog + jbws-testsuite-default.log + + + usersPropFile + ${project.build.directory}/test-classes/jbossws-users.properties + + + rolesPropFile + ${project.build.directory}/test-classes/jbossws-roles.properties + + + keystorePath + ${project.build.directory}/test-classes/test.keystore + + + testResourcesDir + ${project.build.directory}/test-resources + @@ -122,13 +145,30 @@ execute - ${basedir}/src/test/scripts/jbws-testsuite-ssl-mutual-auth${additionalGroovyScriptSuffix}.groovy + + + - ${jboss.home}/standalone/configuration/standalone.xml - ${jboss.home}/standalone/configuration/jbws-testsuite-ssl-mutual-auth.xml - jbws-testsuite-ssl-mutual-auth.log - ${project.build.directory}/test-classes/test.keystore - ${project.build.directory}/test-classes/test.truststore + + inputFile + ${jboss.home}/standalone/configuration/standalone.xml + + + outputFile + ${jboss.home}/standalone/configuration/jbws-testsuite-ssl-mutual-auth.xml + + + serverLog + jbws-testsuite-ssl-mutual-auth.log + + + keystorePath + ${project.build.directory}/test-classes/test.keystore + + + truststorePath + ${project.build.directory}/test-classes/test.truststore + @@ -139,11 +179,30 @@ execute - ${basedir}/src/test/scripts/jbws-testsuite-default-config-tests${additionalGroovyScriptSuffix}.groovy + + + - ${jboss.home}/standalone/configuration/standalone.xml - ${jboss.home}/standalone/configuration/jbws-testsuite-default-config-tests.xml - jbws-testsuite-default-config-tests.log + + inputFile + ${jboss.home}/standalone/configuration/standalone.xml + + + outputFile + ${jboss.home}/standalone/configuration/jbws-testsuite-default-config-tests.xml + + + usersPropFile + ${project.build.directory}/test-classes/jbossws-users.properties + + + rolesPropFile + ${project.build.directory}/test-classes/jbossws-roles.properties + + + serverLog + jbws-testsuite-default-config-tests.log + @@ -154,15 +213,38 @@ execute - ${basedir}/src/test/scripts/jbws-testsuite-jms-${jbossws.integration.target}.groovy + + + - ${jboss.home}/standalone/configuration/standalone-full.xml - ${jboss.home}/standalone/configuration/jbws-testsuite-jms-${jbossws.integration.target}.xml - jbws-testsuite-jms.log - ${project.build.directory}/test-classes/jbws-application-users.properties - ${jboss.home}/standalone/configuration/jbws-application-users.properties - ${project.build.directory}/test-classes/jbws-application-roles.properties - ${jboss.home}/standalone/configuration/jbws-application-roles.properties + + inputFile + ${jboss.home}/standalone/configuration/standalone-full.xml + + + outputFile + ${jboss.home}/standalone/configuration/jbws-testsuite-jms-${jbossws.integration.target}.xml + + + serverLog + jbws-testsuite-jms.log + + + srcUsersProperties + ${project.build.directory}/test-classes/jbws-application-users.properties + + + destUsersProperties + ${jboss.home}/standalone/configuration/jbws-application-users.properties + + + srcRolesProperties + ${project.build.directory}/test-classes/jbws-application-roles.properties + + + destRolesProperties + ${jboss.home}/standalone/configuration/jbws-application-roles.properties + diff --git a/modules/testsuite/cxf-tests/src/test/scripts/jbws-testsuite-default-config-tests-elytron.groovy b/modules/testsuite/cxf-tests/src/test/scripts/jbws-testsuite-default-config-tests-elytron.groovy index 9680b4796..4c5ef98de 100644 --- a/modules/testsuite/cxf-tests/src/test/scripts/jbws-testsuite-default-config-tests-elytron.groovy +++ b/modules/testsuite/cxf-tests/src/test/scripts/jbws-testsuite-default-config-tests-elytron.groovy @@ -1,4 +1,4 @@ -def root = new XmlParser().parse(project.properties['inputFile']) +def root = new XmlParser().parse(inputFile) /** * Fix logging: optionally remove CONSOLE handler and set a specific log file @@ -8,7 +8,7 @@ def logHandlers = root.profile.subsystem.'root-logger'.handlers[0] def consoleHandler = logHandlers.find{it.@name == 'CONSOLE'} if (!project.properties['enableServerLoggingToConsole']) logHandlers.remove(consoleHandler) def file = root.profile.subsystem.'periodic-rotating-file-handler'.file[0] -file.attributes()['path'] = project.properties['serverLog'] +file.attributes()['path'] = serverLog /** * Add a security-domain block like this: * @@ -28,7 +28,7 @@ for (item in subsystems) { if (item.name().getNamespaceURI().contains("urn:wildfly:elytron:")) { securitySubsystem = item for (element in item) { - if (element.name().getLocalPart().equals("security-domains")) { + if (element.name().getLocalPart() == 'security-domains') { securityDomains = element } } @@ -46,8 +46,8 @@ def realm = securityDomain.appendNode('realm',['name':'JBossWS','role-decoder':' */ def securityRealms = root.profile.subsystem.'security-realms'[0] def propertiesRealm = securityRealms.appendNode('properties-realm', ['name':'JBossWS']) -def usersProperties = propertiesRealm.appendNode('users-properties',['path':project.properties['usersPropFile'], 'plain-text':'true']) -def groupsProperties = propertiesRealm.appendNode('groups-properties',['path':project.properties['rolesPropFile']]) +def usersProperties = propertiesRealm.appendNode('users-properties',['path':usersPropFile, 'plain-text':'true']) +def groupsProperties = propertiesRealm.appendNode('groups-properties',['path':rolesPropFile]) /* * @@ -59,7 +59,7 @@ def groupsProperties = propertiesRealm.appendNode('groups-properties',['path':pr */ def httpAuthen = null for (element in securitySubsystem) { - if (element.name().getLocalPart().equals("http")) { + if (element.name().getLocalPart() == 'http') { httpAuthen = element break } @@ -88,5 +88,5 @@ def appSecurityDomain = undertowAppSecurityDomains.appendNode('application-secur def writer = new StringWriter() writer.println('') new XmlNodePrinter(new PrintWriter(writer)).print(root) -def f = new File(project.properties['outputFile']) +def f = new File(outputFile) f.write(writer.toString()) diff --git a/modules/testsuite/cxf-tests/src/test/scripts/jbws-testsuite-default-config-tests.groovy b/modules/testsuite/cxf-tests/src/test/scripts/jbws-testsuite-default-config-tests.groovy index 717a5eaf6..0c5faacea 100644 --- a/modules/testsuite/cxf-tests/src/test/scripts/jbws-testsuite-default-config-tests.groovy +++ b/modules/testsuite/cxf-tests/src/test/scripts/jbws-testsuite-default-config-tests.groovy @@ -1,4 +1,4 @@ -def root = new XmlParser().parse(project.properties['inputFile']) +def root = new XmlParser().parse(inputFile) /** * Fix logging: optionally remove CONSOLE handler and set a specific log file @@ -8,7 +8,7 @@ def logHandlers = root.profile.subsystem.'root-logger'.handlers[0] def consoleHandler = logHandlers.find{it.@name == 'CONSOLE'} if (!project.properties['enableServerLoggingToConsole']) logHandlers.remove(consoleHandler) def file = root.profile.subsystem.'periodic-rotating-file-handler'.file[0] -file.attributes()['path'] = project.properties['serverLog'] +file.attributes()['path'] = serverLog /** * Add a security-domain block like this: @@ -30,7 +30,7 @@ def securityDomains = null for (item in subsystems) { if (item.name().getNamespaceURI().contains("urn:jboss:domain:security:")) { for (element in item) { - if (element.name().getLocalPart().equals("security-domains")) { + if (element.name().getLocalPart() == 'security-domains') { securityDomains = element } } @@ -41,8 +41,8 @@ def securityDomain = securityDomains.appendNode('security-domain', ['name':'JBos def authentication = securityDomain.appendNode('authentication') def loginModule = authentication.appendNode('login-module', ['code':'UsersRoles','flag':'required']) loginModule.appendNode('module-option', ['name':'unauthenticatedIdentity','value':'anonymous']) -loginModule.appendNode('module-option', ['name':'usersProperties','value':project.properties['usersPropFile']]) -loginModule.appendNode('module-option', ['name':'rolesProperties','value':project.properties['rolesPropFile']]) +loginModule.appendNode('module-option', ['name':'usersProperties','value':usersPropFile]) +loginModule.appendNode('module-option', ['name':'rolesProperties','value':rolesPropFile]) /** * Save the configuration to a new file @@ -51,5 +51,5 @@ loginModule.appendNode('module-option', ['name':'rolesProperties','value':projec def writer = new StringWriter() writer.println('') new XmlNodePrinter(new PrintWriter(writer)).print(root) -def f = new File(project.properties['outputFile']) +def f = new File(outputFile) f.write(writer.toString()) diff --git a/modules/testsuite/cxf-tests/src/test/scripts/jbws-testsuite-default-elytron.groovy b/modules/testsuite/cxf-tests/src/test/scripts/jbws-testsuite-default-elytron.groovy index 82875f206..6a80160fe 100644 --- a/modules/testsuite/cxf-tests/src/test/scripts/jbws-testsuite-default-elytron.groovy +++ b/modules/testsuite/cxf-tests/src/test/scripts/jbws-testsuite-default-elytron.groovy @@ -1,4 +1,4 @@ -def root = new XmlParser().parse(project.properties['inputFile']) +def root = new XmlParser().parse(inputFile) /** * Fix logging: optionally remove CONSOLE handler and set a specific log file @@ -9,7 +9,7 @@ def logHandlers = root.profile.subsystem.'root-logger'.handlers[0] def consoleHandler = logHandlers.find{it.@name == 'CONSOLE'} if (!project.properties['enableServerLoggingToConsole']) logHandlers.remove(consoleHandler) def file = root.profile.subsystem.'periodic-rotating-file-handler'.file[0] -file.attributes()['path'] = project.properties['serverLog'] +file.attributes()['path'] = serverLog /** * Add a security-domain block like this: @@ -34,7 +34,7 @@ for (item in subsystems) { if (item.name().getNamespaceURI().contains("urn:wildfly:elytron:")) { securitySubsystem = item for (element in item) { - if (element.name().getLocalPart().equals("security-domains")) { + if (element.name().getLocalPart() == 'security-domains') { securityDomains = element } } @@ -76,18 +76,18 @@ def jaasJBossWDigestRealm = legacyDigestDomain.appendNode('realm',['name':'JAASJ */ def securityRealms = root.profile.subsystem.'security-realms'[0] def propertiesRealm = securityRealms.appendNode('properties-realm', ['name':'JBossWS']) -def usersProperties = propertiesRealm.appendNode('users-properties',['path':project.properties['usersPropFile'], 'plain-text':'true']) -def groupsProperties = propertiesRealm.appendNode('groups-properties',['path':project.properties['rolesPropFile']]) +def usersProperties = propertiesRealm.appendNode('users-properties',['path':usersPropFile, 'plain-text':'true']) +def groupsProperties = propertiesRealm.appendNode('groups-properties',['path':rolesPropFile]) def basicPropertiesRealm = securityRealms.appendNode('properties-realm', ['name':'ws-basic-domain']) -def basicUsersProperties = basicPropertiesRealm.appendNode('users-properties',['path': project.properties['testResourcesDir'] + '/jaxws/cxf/httpauth/WEB-INF/ws-users.properties', 'plain-text':'true']) -def basicGroupsProperties = basicPropertiesRealm.appendNode('groups-properties',['path': project.properties['testResourcesDir'] + '/jaxws/cxf/httpauth/WEB-INF/ws-roles.properties']) +def basicUsersProperties = basicPropertiesRealm.appendNode('users-properties',['path': testResourcesDir + '/jaxws/cxf/httpauth/WEB-INF/ws-users.properties', 'plain-text':'true']) +def basicGroupsProperties = basicPropertiesRealm.appendNode('groups-properties',['path': testResourcesDir + '/jaxws/cxf/httpauth/WEB-INF/ws-roles.properties']) def digestRealm = securityRealms.appendNode('properties-realm', ['name':'ws-digest-domain']) -def digestUserProperties = digestRealm.appendNode('users-properties',['path': project.properties['testResourcesDir'] + '/jaxws/cxf/httpauth/WEB-INF/ws-digest-users.properties']) -def digestGroupsProperties = digestRealm.appendNode('groups-properties',['path': project.properties['testResourcesDir'] + '/jaxws/cxf/httpauth/WEB-INF/ws-roles.properties']) +def digestUserProperties = digestRealm.appendNode('users-properties',['path': testResourcesDir + '/jaxws/cxf/httpauth/WEB-INF/ws-digest-users.properties']) +def digestGroupsProperties = digestRealm.appendNode('groups-properties',['path': testResourcesDir + '/jaxws/cxf/httpauth/WEB-INF/ws-roles.properties']) @@ -113,7 +113,7 @@ def digestGroupsProperties = digestRealm.appendNode('groups-properties',['path': */ def httpAuthen = null for (element in securitySubsystem) { - if (element.name().getLocalPart().equals("http")) { + if (element.name().getLocalPart() == 'http') { httpAuthen = element break } @@ -179,7 +179,7 @@ def digestAppSecurityDomain = undertowAppSecurityDomains.appendNode('application for (item in subsystems) { if (item.name().getNamespaceURI().contains("urn:jboss:domain:security:")) { for (element in item) { - if (element.name().getLocalPart().equals("security-domains")) { + if (element.name().getLocalPart() == 'security-domains') { securityDomains = element } } @@ -205,8 +205,8 @@ securityDomain = securityDomains.appendNode('security-domain', ['name':'JAASJBos authentication = securityDomain.appendNode('authentication') loginModule = authentication.appendNode('login-module', ['code':'UsersRoles','flag':'required']) loginModule.appendNode('module-option', ['name':'unauthenticatedIdentity','value':'anonymous']) -loginModule.appendNode('module-option', ['name':'usersProperties','value':project.properties['usersPropFile']]) -loginModule.appendNode('module-option', ['name':'rolesProperties','value':project.properties['rolesPropFile']]) +loginModule.appendNode('module-option', ['name':'usersProperties','value':usersPropFile]) +loginModule.appendNode('module-option', ['name':'rolesProperties','value':rolesPropFile]) /** * Add a security-domain block like this: @@ -227,8 +227,8 @@ def securityDomainSts = securityDomains.appendNode('security-domain', ['name':'J def authenticationSts = securityDomainSts.appendNode('authentication') def loginModuleSts = authenticationSts.appendNode('login-module', ['code':'UsersRoles','flag':'required']) loginModuleSts.appendNode('module-option', ['name':'unauthenticatedIdentity','value':'anonymous']) -loginModuleSts.appendNode('module-option', ['name':'usersProperties','value':project.properties['testResourcesDir'] + '/jaxws/samples/wsse/policy/trust/WEB-INF/jbossws-users.properties']) -loginModuleSts.appendNode('module-option', ['name':'rolesProperties','value':project.properties['testResourcesDir'] + '/jaxws/samples/wsse/policy/trust/WEB-INF/jbossws-roles.properties']) +loginModuleSts.appendNode('module-option', ['name':'usersProperties','value':testResourcesDir + '/jaxws/samples/wsse/policy/trust/WEB-INF/jbossws-users.properties']) +loginModuleSts.appendNode('module-option', ['name':'rolesProperties','value':testResourcesDir + '/jaxws/samples/wsse/policy/trust/WEB-INF/jbossws-roles.properties']) /** @@ -262,8 +262,8 @@ loginModuleDigest.appendNode('module-option', ['name':'hashEncoding','value':'BA loginModuleDigest.appendNode('module-option', ['name':'storeDigestCallback','value':'org.jboss.wsf.stack.cxf.security.authentication.callback.UsernameTokenCallback']) loginModuleDigest.appendNode('module-option', ['name':'hashStorePassword','value':'true']) loginModuleDigest.appendNode('module-option', ['name':'unauthenticatedIdentity','value':'anonymous']) -loginModuleDigest.appendNode('module-option', ['name':'usersProperties','value':project.properties['testResourcesDir'] + '/jaxws/samples/wsse/policy/jaas/digest/WEB-INF/jbossws-users.properties']) -loginModuleDigest.appendNode('module-option', ['name':'rolesProperties','value':project.properties['testResourcesDir'] + '/jaxws/samples/wsse/policy/jaas/digest/WEB-INF/jbossws-roles.properties']) +loginModuleDigest.appendNode('module-option', ['name':'usersProperties','value':testResourcesDir + '/jaxws/samples/wsse/policy/jaas/digest/WEB-INF/jbossws-users.properties']) +loginModuleDigest.appendNode('module-option', ['name':'rolesProperties','value':testResourcesDir + '/jaxws/samples/wsse/policy/jaas/digest/WEB-INF/jbossws-roles.properties']) /** * Add a security-domain block like this: @@ -288,10 +288,10 @@ def securityDomainDigestAuth = securityDomains.appendNode('security-domain', ['n def authenticationDigestAuth = securityDomainDigestAuth.appendNode('authentication') def loginModuleDigestAuth = authenticationDigestAuth.appendNode('login-module', ['code':'UsersRoles','flag':'required']) loginModuleDigestAuth.appendNode('module-option', ['name':'hashUserPassword','value':'false']) -loginModuleDigestAuth.appendNode('module-option', ['name':'usersProperties','value':project.properties['testResourcesDir'] + '/jaxws/cxf/httpauth/WEB-INF/ws-users.properties']) +loginModuleDigestAuth.appendNode('module-option', ['name':'usersProperties','value':testResourcesDir + '/jaxws/cxf/httpauth/WEB-INF/ws-users.properties']) loginModuleDigestAuth.appendNode('module-option', ['name':'hashAlgorithm','value':'MD5']) loginModuleDigestAuth.appendNode('module-option', ['name':'hashEncoding','value':'RFC2617']) -loginModuleDigestAuth.appendNode('module-option', ['name':'rolesProperties','value':project.properties['testResourcesDir'] + '/jaxws/cxf/httpauth/WEB-INF/ws-roles.properties']) +loginModuleDigestAuth.appendNode('module-option', ['name':'rolesProperties','value':testResourcesDir + '/jaxws/cxf/httpauth/WEB-INF/ws-roles.properties']) loginModuleDigestAuth.appendNode('module-option', ['name':'storeDigestCallback','value':'org.jboss.security.auth.callback.RFC2617Digest']) loginModuleDigestAuth.appendNode('module-option', ['name':'hashStorePassword','value':'true']) @@ -326,16 +326,16 @@ def securityDomainJaspi = securityDomains.appendNode('security-domain', ['name': def authenticationJaspi = securityDomainJaspi.appendNode('authentication-jaspi') def loginModuleStack = authenticationJaspi.appendNode('login-module-stack', ['name':'jaas-lm-stack']) def loginModuleJaspi = loginModuleStack.appendNode('login-module', ['code':'UsersRoles','flag':'required']) -loginModuleJaspi.appendNode('module-option', ['name':'usersProperties','value':project.properties['usersPropFile']]) -loginModuleJaspi.appendNode('module-option', ['name':'rolesProperties','value':project.properties['rolesPropFile']]) +loginModuleJaspi.appendNode('module-option', ['name':'usersProperties','value':usersPropFile]) +loginModuleJaspi.appendNode('module-option', ['name':'rolesProperties','value':rolesPropFile]) authenticationJaspi.appendNode('auth-module', ['code':'org.jboss.wsf.stack.cxf.jaspi.module.UsernameTokenServerAuthModule','login-module-stack-ref':'jaas-lm-stack']) def securityDomainJaspiClient = securityDomains.appendNode('security-domain', ['name':'clientJaspi']) def authenticationJaspiClient = securityDomainJaspiClient.appendNode('authentication-jaspi') def loginModuleStackClient = authenticationJaspiClient.appendNode('login-module-stack', ['name':'jaas-lm-stack']) def loginModuleJaspiClient = loginModuleStackClient.appendNode('login-module', ['code':'UsersRoles','flag':'required']) -loginModuleJaspiClient.appendNode('module-option', ['name':'usersProperties','value':project.properties['usersPropFile']]) -loginModuleJaspiClient.appendNode('module-option', ['name':'rolesProperties','value':project.properties['rolesPropFile']]) +loginModuleJaspiClient.appendNode('module-option', ['name':'usersProperties','value':usersPropFile]) +loginModuleJaspiClient.appendNode('module-option', ['name':'rolesProperties','value':rolesPropFile]) authenticationJaspiClient.appendNode('auth-module', ['code':'org.jboss.wsf.stack.cxf.jaspi.client.module.SOAPClientAuthModule','login-module-stack-ref':'jaas-lm-stack']) @@ -364,7 +364,7 @@ def rootsecurityRealms = root.management.'security-realms'[0] def rootsecurityRealm = rootsecurityRealms.appendNode('security-realm', ['name':'jbws-test-https-realm']) def serverIdentities = rootsecurityRealm.appendNode('server-identities') def ssl = serverIdentities.appendNode('ssl') -ssl.appendNode('keystore', ['path':project.properties['keystorePath'],'keystore-password':'changeit','alias':'tomcat']) +ssl.appendNode('keystore', ['path':keystorePath,'keystore-password':'changeit','alias':'tomcat']) def server = root.profile.subsystem.server[0] def curHttpsListener = server.'https-listener'[0] @@ -388,5 +388,5 @@ systemProperties.appendNode('property', ['name':'org.jboss.wsf.test.JBWS3628Test def writer = new StringWriter() writer.println('') new XmlNodePrinter(new PrintWriter(writer)).print(root) -def f = new File(project.properties['outputFile']) +def f = new File(outputFile) f.write(writer.toString()) diff --git a/modules/testsuite/cxf-tests/src/test/scripts/jbws-testsuite-default.groovy b/modules/testsuite/cxf-tests/src/test/scripts/jbws-testsuite-default.groovy index 4828fc639..b7d926bf8 100644 --- a/modules/testsuite/cxf-tests/src/test/scripts/jbws-testsuite-default.groovy +++ b/modules/testsuite/cxf-tests/src/test/scripts/jbws-testsuite-default.groovy @@ -1,4 +1,4 @@ -def root = new XmlParser().parse(project.properties['inputFile']) +def root = new XmlParser().parse(inputFile) /** * Fix logging: optionally remove CONSOLE handler and set a specific log file @@ -8,7 +8,7 @@ def logHandlers = root.profile.subsystem.'root-logger'.handlers[0] def consoleHandler = logHandlers.find{it.@name == 'CONSOLE'} if (!project.properties['enableServerLoggingToConsole']) logHandlers.remove(consoleHandler) def file = root.profile.subsystem.'periodic-rotating-file-handler'.file[0] -file.attributes()['path'] = project.properties['serverLog'] +file.attributes()['path'] = serverLog /** * Add a security-domain block like this: @@ -30,7 +30,7 @@ def securityDomains = null for (item in subsystems) { if (item.name().getNamespaceURI().contains("urn:jboss:domain:security:")) { for (element in item) { - if (element.name().getLocalPart().equals("security-domains")) { + if (element.name().getLocalPart() == 'security-domains') { securityDomains = element } } @@ -41,8 +41,8 @@ def securityDomain = securityDomains.appendNode('security-domain', ['name':'JAAS def authentication = securityDomain.appendNode('authentication') def loginModule = authentication.appendNode('login-module', ['code':'UsersRoles','flag':'required']) loginModule.appendNode('module-option', ['name':'unauthenticatedIdentity','value':'anonymous']) -loginModule.appendNode('module-option', ['name':'usersProperties','value':project.properties['usersPropFile']]) -loginModule.appendNode('module-option', ['name':'rolesProperties','value':project.properties['rolesPropFile']]) +loginModule.appendNode('module-option', ['name':'usersProperties','value':usersPropFile]) +loginModule.appendNode('module-option', ['name':'rolesProperties','value':rolesPropFile]) /** @@ -64,8 +64,8 @@ def jbsecurityDomain = securityDomains.appendNode('security-domain', ['name':'JB def jbauthentication = jbsecurityDomain.appendNode('authentication') def jbloginModule = jbauthentication.appendNode('login-module', ['code':'UsersRoles','flag':'required']) jbloginModule.appendNode('module-option', ['name':'unauthenticatedIdentity','value':'anonymous']) -jbloginModule.appendNode('module-option', ['name':'usersProperties','value':project.properties['usersPropFile']]) -jbloginModule.appendNode('module-option', ['name':'rolesProperties','value':project.properties['rolesPropFile']]) +jbloginModule.appendNode('module-option', ['name':'usersProperties','value':usersPropFile]) +jbloginModule.appendNode('module-option', ['name':'rolesProperties','value':rolesPropFile]) /** * Add a security-domain block like this: @@ -86,8 +86,8 @@ def securityDomainSts = securityDomains.appendNode('security-domain', ['name':'J def authenticationSts = securityDomainSts.appendNode('authentication') def loginModuleSts = authenticationSts.appendNode('login-module', ['code':'UsersRoles','flag':'required']) loginModuleSts.appendNode('module-option', ['name':'unauthenticatedIdentity','value':'anonymous']) -loginModuleSts.appendNode('module-option', ['name':'usersProperties','value':project.properties['testResourcesDir'] + '/jaxws/samples/wsse/policy/trust/WEB-INF/jbossws-users.properties']) -loginModuleSts.appendNode('module-option', ['name':'rolesProperties','value':project.properties['testResourcesDir'] + '/jaxws/samples/wsse/policy/trust/WEB-INF/jbossws-roles.properties']) +loginModuleSts.appendNode('module-option', ['name':'usersProperties','value':testResourcesDir + '/jaxws/samples/wsse/policy/trust/WEB-INF/jbossws-users.properties']) +loginModuleSts.appendNode('module-option', ['name':'rolesProperties','value':testResourcesDir + '/jaxws/samples/wsse/policy/trust/WEB-INF/jbossws-roles.properties']) /** * Add a security-domain block like this: @@ -107,8 +107,8 @@ loginModuleSts.appendNode('module-option', ['name':'rolesProperties','value':pro def securityDomainBasicAuth = securityDomains.appendNode('security-domain', ['name':'ws-basic-domain','cache-type':'default']) def authenticationBasicAuth = securityDomainBasicAuth.appendNode('authentication') def loginModuleBasicAuth = authenticationBasicAuth.appendNode('login-module', ['code':'UsersRoles','flag':'required']) -loginModuleBasicAuth.appendNode('module-option', ['name':'usersProperties','value':project.properties['testResourcesDir'] + '/jaxws/cxf/httpauth/WEB-INF/ws-users.properties']) -loginModuleBasicAuth.appendNode('module-option', ['name':'rolesProperties','value':project.properties['testResourcesDir'] + '/jaxws/cxf/httpauth/WEB-INF/ws-roles.properties']) +loginModuleBasicAuth.appendNode('module-option', ['name':'usersProperties','value':testResourcesDir + '/jaxws/cxf/httpauth/WEB-INF/ws-users.properties']) +loginModuleBasicAuth.appendNode('module-option', ['name':'rolesProperties','value':testResourcesDir + '/jaxws/cxf/httpauth/WEB-INF/ws-roles.properties']) loginModuleBasicAuth.appendNode('module-option', ['name':'password-stacking','value':'useFirstPass']) /** @@ -134,10 +134,10 @@ def securityDomainDigestAuth = securityDomains.appendNode('security-domain', ['n def authenticationDigestAuth = securityDomainDigestAuth.appendNode('authentication') def loginModuleDigestAuth = authenticationDigestAuth.appendNode('login-module', ['code':'UsersRoles','flag':'required']) loginModuleDigestAuth.appendNode('module-option', ['name':'hashUserPassword','value':'false']) -loginModuleDigestAuth.appendNode('module-option', ['name':'usersProperties','value':project.properties['testResourcesDir'] + '/jaxws/cxf/httpauth/WEB-INF/ws-users.properties']) +loginModuleDigestAuth.appendNode('module-option', ['name':'usersProperties','value':testResourcesDir + '/jaxws/cxf/httpauth/WEB-INF/ws-users.properties']) loginModuleDigestAuth.appendNode('module-option', ['name':'hashAlgorithm','value':'MD5']) loginModuleDigestAuth.appendNode('module-option', ['name':'hashEncoding','value':'RFC2617']) -loginModuleDigestAuth.appendNode('module-option', ['name':'rolesProperties','value':project.properties['testResourcesDir'] + '/jaxws/cxf/httpauth/WEB-INF/ws-roles.properties']) +loginModuleDigestAuth.appendNode('module-option', ['name':'rolesProperties','value':testResourcesDir + '/jaxws/cxf/httpauth/WEB-INF/ws-roles.properties']) loginModuleDigestAuth.appendNode('module-option', ['name':'storeDigestCallback','value':'org.jboss.security.auth.callback.RFC2617Digest']) loginModuleDigestAuth.appendNode('module-option', ['name':'hashStorePassword','value':'true']) @@ -172,8 +172,8 @@ loginModuleDigest.appendNode('module-option', ['name':'hashEncoding','value':'BA loginModuleDigest.appendNode('module-option', ['name':'storeDigestCallback','value':'org.jboss.wsf.stack.cxf.security.authentication.callback.UsernameTokenCallback']) loginModuleDigest.appendNode('module-option', ['name':'hashStorePassword','value':'true']) loginModuleDigest.appendNode('module-option', ['name':'unauthenticatedIdentity','value':'anonymous']) -loginModuleDigest.appendNode('module-option', ['name':'usersProperties','value':project.properties['testResourcesDir'] + '/jaxws/samples/wsse/policy/jaas/digest/WEB-INF/jbossws-users.properties']) -loginModuleDigest.appendNode('module-option', ['name':'rolesProperties','value':project.properties['testResourcesDir'] + '/jaxws/samples/wsse/policy/jaas/digest/WEB-INF/jbossws-roles.properties']) +loginModuleDigest.appendNode('module-option', ['name':'usersProperties','value':testResourcesDir + '/jaxws/samples/wsse/policy/jaas/digest/WEB-INF/jbossws-users.properties']) +loginModuleDigest.appendNode('module-option', ['name':'rolesProperties','value':testResourcesDir + '/jaxws/samples/wsse/policy/jaas/digest/WEB-INF/jbossws-roles.properties']) /** * Add two security-domain blocks for JASPI tests as below: @@ -205,16 +205,16 @@ def securityDomainJaspi = securityDomains.appendNode('security-domain', ['name': def authenticationJaspi = securityDomainJaspi.appendNode('authentication-jaspi') def loginModuleStack = authenticationJaspi.appendNode('login-module-stack', ['name':'jaas-lm-stack']) def loginModuleJaspi = loginModuleStack.appendNode('login-module', ['code':'UsersRoles','flag':'required']) -loginModuleJaspi.appendNode('module-option', ['name':'usersProperties','value':project.properties['usersPropFile']]) -loginModuleJaspi.appendNode('module-option', ['name':'rolesProperties','value':project.properties['rolesPropFile']]) +loginModuleJaspi.appendNode('module-option', ['name':'usersProperties','value':usersPropFile]) +loginModuleJaspi.appendNode('module-option', ['name':'rolesProperties','value':rolesPropFile]) authenticationJaspi.appendNode('auth-module', ['code':'org.jboss.wsf.stack.cxf.jaspi.module.UsernameTokenServerAuthModule','login-module-stack-ref':'jaas-lm-stack']) def securityDomainJaspiClient = securityDomains.appendNode('security-domain', ['name':'clientJaspi']) def authenticationJaspiClient = securityDomainJaspiClient.appendNode('authentication-jaspi') def loginModuleStackClient = authenticationJaspiClient.appendNode('login-module-stack', ['name':'jaas-lm-stack']) def loginModuleJaspiClient = loginModuleStackClient.appendNode('login-module', ['code':'UsersRoles','flag':'required']) -loginModuleJaspiClient.appendNode('module-option', ['name':'usersProperties','value':project.properties['usersPropFile']]) -loginModuleJaspiClient.appendNode('module-option', ['name':'rolesProperties','value':project.properties['rolesPropFile']]) +loginModuleJaspiClient.appendNode('module-option', ['name':'usersProperties','value':usersPropFile]) +loginModuleJaspiClient.appendNode('module-option', ['name':'rolesProperties','value':rolesPropFile]) authenticationJaspiClient.appendNode('auth-module', ['code':'org.jboss.wsf.stack.cxf.jaspi.client.module.SOAPClientAuthModule','login-module-stack-ref':'jaas-lm-stack']) /** @@ -234,7 +234,7 @@ def securityRealms = root.management.'security-realms'[0] def securityRealm = securityRealms.appendNode('security-realm', ['name':'jbws-test-https-realm']) def serverIdentities = securityRealm.appendNode('server-identities') def ssl = serverIdentities.appendNode('ssl') -ssl.appendNode('keystore', ['path':project.properties['keystorePath'],'keystore-password':'changeit','alias':'tomcat']) +ssl.appendNode('keystore', ['path':keystorePath,'keystore-password':'changeit','alias':'tomcat']) def server = root.profile.subsystem.server[0] def curHttpsListener = server.'https-listener'[0] @@ -257,5 +257,5 @@ systemProperties.appendNode('property', ['name':'org.jboss.wsf.test.JBWS3628Test def writer = new StringWriter() writer.println('') new XmlNodePrinter(new PrintWriter(writer)).print(root) -def f = new File(project.properties['outputFile']) +def f = new File(outputFile) f.write(writer.toString()) diff --git a/modules/testsuite/cxf-tests/src/test/scripts/jbws-testsuite-jms-wildfly1000.groovy b/modules/testsuite/cxf-tests/src/test/scripts/jbws-testsuite-jms-wildfly1000.groovy index 66c2eb8b3..a34414656 100644 --- a/modules/testsuite/cxf-tests/src/test/scripts/jbws-testsuite-jms-wildfly1000.groovy +++ b/modules/testsuite/cxf-tests/src/test/scripts/jbws-testsuite-jms-wildfly1000.groovy @@ -1,4 +1,4 @@ -def root = new XmlParser().parse(project.properties['inputFile']) +def root = new XmlParser().parse(inputFile) /** * Fix logging: optionally remove CONSOLE handler and set a specific log file @@ -8,7 +8,7 @@ def logHandlers = root.profile.subsystem.'root-logger'.handlers[0] def consoleHandler = logHandlers.find{it.@name == 'CONSOLE'} if (!project.properties['enableServerLoggingToConsole']) logHandlers.remove(consoleHandler) def file = root.profile.subsystem.'periodic-rotating-file-handler'.file[0] -file.attributes()['path'] = project.properties['serverLog'] +file.attributes()['path'] = serverLog /** * Modify ApplicationRealm security-realm to use custom properties files @@ -50,19 +50,15 @@ def jmsQueue = server.appendNode('jms-queue', ['name':'testQueue', 'entries':'qu def writer = new StringWriter() writer.println('') new XmlNodePrinter(new PrintWriter(writer)).print(root) -def f = new File(project.properties['outputFile']) +def f = new File(outputFile) f.write(writer.toString()) /* * copy the preconfigured jbws-application-roles.properties and jbws-application-users.properties * files into the standalone/configure directory */ -def srcUsersProperties = project.properties['srcUsersProperties'] -def destUsersProperties = project.properties['destUsersProperties'] new AntBuilder().copy( file:srcUsersProperties, tofile:destUsersProperties) -def srcRolesProperties = project.properties['srcRolesProperties'] -def destRolesProperties = project.properties['destRolesProperties'] new AntBuilder().copy( file:srcRolesProperties, tofile:destRolesProperties) diff --git a/modules/testsuite/cxf-tests/src/test/scripts/jbws-testsuite-jms-wildfly1010.groovy b/modules/testsuite/cxf-tests/src/test/scripts/jbws-testsuite-jms-wildfly1010.groovy index 66c2eb8b3..a34414656 100644 --- a/modules/testsuite/cxf-tests/src/test/scripts/jbws-testsuite-jms-wildfly1010.groovy +++ b/modules/testsuite/cxf-tests/src/test/scripts/jbws-testsuite-jms-wildfly1010.groovy @@ -1,4 +1,4 @@ -def root = new XmlParser().parse(project.properties['inputFile']) +def root = new XmlParser().parse(inputFile) /** * Fix logging: optionally remove CONSOLE handler and set a specific log file @@ -8,7 +8,7 @@ def logHandlers = root.profile.subsystem.'root-logger'.handlers[0] def consoleHandler = logHandlers.find{it.@name == 'CONSOLE'} if (!project.properties['enableServerLoggingToConsole']) logHandlers.remove(consoleHandler) def file = root.profile.subsystem.'periodic-rotating-file-handler'.file[0] -file.attributes()['path'] = project.properties['serverLog'] +file.attributes()['path'] = serverLog /** * Modify ApplicationRealm security-realm to use custom properties files @@ -50,19 +50,15 @@ def jmsQueue = server.appendNode('jms-queue', ['name':'testQueue', 'entries':'qu def writer = new StringWriter() writer.println('') new XmlNodePrinter(new PrintWriter(writer)).print(root) -def f = new File(project.properties['outputFile']) +def f = new File(outputFile) f.write(writer.toString()) /* * copy the preconfigured jbws-application-roles.properties and jbws-application-users.properties * files into the standalone/configure directory */ -def srcUsersProperties = project.properties['srcUsersProperties'] -def destUsersProperties = project.properties['destUsersProperties'] new AntBuilder().copy( file:srcUsersProperties, tofile:destUsersProperties) -def srcRolesProperties = project.properties['srcRolesProperties'] -def destRolesProperties = project.properties['destRolesProperties'] new AntBuilder().copy( file:srcRolesProperties, tofile:destRolesProperties) diff --git a/modules/testsuite/cxf-tests/src/test/scripts/jbws-testsuite-jms-wildfly1100.groovy b/modules/testsuite/cxf-tests/src/test/scripts/jbws-testsuite-jms-wildfly1100.groovy index 66c2eb8b3..a34414656 100644 --- a/modules/testsuite/cxf-tests/src/test/scripts/jbws-testsuite-jms-wildfly1100.groovy +++ b/modules/testsuite/cxf-tests/src/test/scripts/jbws-testsuite-jms-wildfly1100.groovy @@ -1,4 +1,4 @@ -def root = new XmlParser().parse(project.properties['inputFile']) +def root = new XmlParser().parse(inputFile) /** * Fix logging: optionally remove CONSOLE handler and set a specific log file @@ -8,7 +8,7 @@ def logHandlers = root.profile.subsystem.'root-logger'.handlers[0] def consoleHandler = logHandlers.find{it.@name == 'CONSOLE'} if (!project.properties['enableServerLoggingToConsole']) logHandlers.remove(consoleHandler) def file = root.profile.subsystem.'periodic-rotating-file-handler'.file[0] -file.attributes()['path'] = project.properties['serverLog'] +file.attributes()['path'] = serverLog /** * Modify ApplicationRealm security-realm to use custom properties files @@ -50,19 +50,15 @@ def jmsQueue = server.appendNode('jms-queue', ['name':'testQueue', 'entries':'qu def writer = new StringWriter() writer.println('') new XmlNodePrinter(new PrintWriter(writer)).print(root) -def f = new File(project.properties['outputFile']) +def f = new File(outputFile) f.write(writer.toString()) /* * copy the preconfigured jbws-application-roles.properties and jbws-application-users.properties * files into the standalone/configure directory */ -def srcUsersProperties = project.properties['srcUsersProperties'] -def destUsersProperties = project.properties['destUsersProperties'] new AntBuilder().copy( file:srcUsersProperties, tofile:destUsersProperties) -def srcRolesProperties = project.properties['srcRolesProperties'] -def destRolesProperties = project.properties['destRolesProperties'] new AntBuilder().copy( file:srcRolesProperties, tofile:destRolesProperties) diff --git a/modules/testsuite/cxf-tests/src/test/scripts/jbws-testsuite-jms-wildfly902.groovy b/modules/testsuite/cxf-tests/src/test/scripts/jbws-testsuite-jms-wildfly902.groovy index bdb3b17eb..f278b154b 100644 --- a/modules/testsuite/cxf-tests/src/test/scripts/jbws-testsuite-jms-wildfly902.groovy +++ b/modules/testsuite/cxf-tests/src/test/scripts/jbws-testsuite-jms-wildfly902.groovy @@ -1,4 +1,4 @@ -def root = new XmlParser().parse(project.properties['inputFile']) +def root = new XmlParser().parse(inputFile) /** * Fix logging: optionally remove CONSOLE handler and set a specific log file @@ -8,7 +8,7 @@ def logHandlers = root.profile.subsystem.'root-logger'.handlers[0] def consoleHandler = logHandlers.find{it.@name == 'CONSOLE'} if (!project.properties['enableServerLoggingToConsole']) logHandlers.remove(consoleHandler) def file = root.profile.subsystem.'periodic-rotating-file-handler'.file[0] -file.attributes()['path'] = project.properties['serverLog'] +file.attributes()['path'] = serverLog /** * Modify ApplicationRealm security-realm to use custom properties files @@ -61,19 +61,15 @@ jmsQueue.appendNode('entry', ['name':'java:jboss/exported/jms/queue/test']) def writer = new StringWriter() writer.println('') new XmlNodePrinter(new PrintWriter(writer)).print(root) -def f = new File(project.properties['outputFile']) +def f = new File(outputFile) f.write(writer.toString()) /* * copy the preconfigured jbws-application-roles.properties and jbws-application-users.properties * files into the standalone/configure directory */ -def srcUsersProperties = project.properties['srcUsersProperties'] -def destUsersProperties = project.properties['destUsersProperties'] new AntBuilder().copy( file:srcUsersProperties, tofile:destUsersProperties) -def srcRolesProperties = project.properties['srcRolesProperties'] -def destRolesProperties = project.properties['destRolesProperties'] new AntBuilder().copy( file:srcRolesProperties, tofile:destRolesProperties) diff --git a/modules/testsuite/cxf-tests/src/test/scripts/jbws-testsuite-ssl-mutual-auth-elytron.groovy b/modules/testsuite/cxf-tests/src/test/scripts/jbws-testsuite-ssl-mutual-auth-elytron.groovy index ece05e693..dbf5844da 100644 --- a/modules/testsuite/cxf-tests/src/test/scripts/jbws-testsuite-ssl-mutual-auth-elytron.groovy +++ b/modules/testsuite/cxf-tests/src/test/scripts/jbws-testsuite-ssl-mutual-auth-elytron.groovy @@ -1,4 +1,4 @@ -def root = new XmlParser().parse(project.properties['inputFile']) +def root = new XmlParser().parse(inputFile) /** * Fix logging: optionally remove CONSOLE handler and set a specific log file @@ -8,7 +8,7 @@ def logHandlers = root.profile.subsystem.'root-logger'.handlers[0] def consoleHandler = logHandlers.find{it.@name == 'CONSOLE'} if (!project.properties['enableServerLoggingToConsole']) logHandlers.remove(consoleHandler) def file = root.profile.subsystem.'periodic-rotating-file-handler'.file[0] -file.attributes()['path'] = project.properties['serverLog'] +file.attributes()['path'] = serverLog /** * Add a https connector like this: @@ -33,9 +33,9 @@ def securityRealms = root.management.'security-realms'[0] def securityRealm = securityRealms.appendNode('security-realm', ['name':'jbws-test-https-realm']) def serverIdentities = securityRealm.appendNode('server-identities') def ssl = serverIdentities.appendNode('ssl') -ssl.appendNode('keystore', ['path':project.properties['keystorePath'],'keystore-password':'changeit','alias':'tomcat']) +ssl.appendNode('keystore', ['path':keystorePath,'keystore-password':'changeit','alias':'tomcat']) def authentication = securityRealm.appendNode('authentication') -authentication.appendNode('truststore', ['path':project.properties['truststorePath'],'keystore-password':'changeit']) +authentication.appendNode('truststore', ['path':truststorePath,'keystore-password':'changeit']) def server = root.profile.subsystem.server[0] def curHttpsListener = server.'https-listener'[0] @@ -50,5 +50,5 @@ server.appendNode('https-listener', ['name':'jbws-test-https-listener','socket-b def writer = new StringWriter() writer.println('') new XmlNodePrinter(new PrintWriter(writer)).print(root) -def f = new File(project.properties['outputFile']) +def f = new File(outputFile) f.write(writer.toString()) diff --git a/modules/testsuite/cxf-tests/src/test/scripts/jbws-testsuite-ssl-mutual-auth.groovy b/modules/testsuite/cxf-tests/src/test/scripts/jbws-testsuite-ssl-mutual-auth.groovy index ece05e693..dbf5844da 100644 --- a/modules/testsuite/cxf-tests/src/test/scripts/jbws-testsuite-ssl-mutual-auth.groovy +++ b/modules/testsuite/cxf-tests/src/test/scripts/jbws-testsuite-ssl-mutual-auth.groovy @@ -1,4 +1,4 @@ -def root = new XmlParser().parse(project.properties['inputFile']) +def root = new XmlParser().parse(inputFile) /** * Fix logging: optionally remove CONSOLE handler and set a specific log file @@ -8,7 +8,7 @@ def logHandlers = root.profile.subsystem.'root-logger'.handlers[0] def consoleHandler = logHandlers.find{it.@name == 'CONSOLE'} if (!project.properties['enableServerLoggingToConsole']) logHandlers.remove(consoleHandler) def file = root.profile.subsystem.'periodic-rotating-file-handler'.file[0] -file.attributes()['path'] = project.properties['serverLog'] +file.attributes()['path'] = serverLog /** * Add a https connector like this: @@ -33,9 +33,9 @@ def securityRealms = root.management.'security-realms'[0] def securityRealm = securityRealms.appendNode('security-realm', ['name':'jbws-test-https-realm']) def serverIdentities = securityRealm.appendNode('server-identities') def ssl = serverIdentities.appendNode('ssl') -ssl.appendNode('keystore', ['path':project.properties['keystorePath'],'keystore-password':'changeit','alias':'tomcat']) +ssl.appendNode('keystore', ['path':keystorePath,'keystore-password':'changeit','alias':'tomcat']) def authentication = securityRealm.appendNode('authentication') -authentication.appendNode('truststore', ['path':project.properties['truststorePath'],'keystore-password':'changeit']) +authentication.appendNode('truststore', ['path':truststorePath,'keystore-password':'changeit']) def server = root.profile.subsystem.server[0] def curHttpsListener = server.'https-listener'[0] @@ -50,5 +50,5 @@ server.appendNode('https-listener', ['name':'jbws-test-https-listener','socket-b def writer = new StringWriter() writer.println('') new XmlNodePrinter(new PrintWriter(writer)).print(root) -def f = new File(project.properties['outputFile']) +def f = new File(outputFile) f.write(writer.toString()) diff --git a/modules/testsuite/perf-tests/pom.xml b/modules/testsuite/perf-tests/pom.xml index f58bcb3c5..5d29f5bb9 100644 --- a/modules/testsuite/perf-tests/pom.xml +++ b/modules/testsuite/perf-tests/pom.xml @@ -88,8 +88,8 @@ - org.codehaus.gmaven - gmaven-plugin + org.codehaus.gmavenplus + gmavenplus-plugin testsuite-perf @@ -98,11 +98,22 @@ execute - ${basedir}/src/test/scripts/perf.groovy + + + - ${jboss.home}/standalone/configuration/standalone.xml - ${jboss.home}/standalone/configuration/jbws-testsuite-perf.xml - jbws-testsuite-perf.log + + inputFile + ${jboss.home}/standalone/configuration/standalone.xml + + + outputFile + ${jboss.home}/standalone/configuration/jbws-testsuite-perf.xml + + + serverLog + jbws-testsuite-perf.log + diff --git a/modules/testsuite/perf-tests/src/test/scripts/perf.groovy b/modules/testsuite/perf-tests/src/test/scripts/perf.groovy index f34ef67a5..230306bcb 100644 --- a/modules/testsuite/perf-tests/src/test/scripts/perf.groovy +++ b/modules/testsuite/perf-tests/src/test/scripts/perf.groovy @@ -1,4 +1,4 @@ -def root = new XmlParser().parse(project.properties['inputFile']) +def root = new XmlParser().parse(inputFile) /** * Fix logging: @@ -11,7 +11,7 @@ def logHandlers = root.profile.subsystem.'root-logger'.handlers[0] def consoleHandler = logHandlers.find{it.@name == 'CONSOLE'} if (!project.properties['enableServerLoggingToConsole']) logHandlers.remove(consoleHandler) def file = root.profile.subsystem.'periodic-rotating-file-handler'.file[0] -file.attributes()['path'] = project.properties['serverLog'] +file.attributes()['path'] = serverLog def rootLogger = root.profile.subsystem.'root-logger'[0] rootLogger.level.@name = 'ERROR' @@ -28,5 +28,5 @@ apacheCategory.appendNode('level', ['name':'ERROR']) def writer = new StringWriter() writer.println('') new XmlNodePrinter(new PrintWriter(writer)).print(root) -def f = new File(project.properties['outputFile']) +def f = new File(outputFile) f.write(writer.toString()) diff --git a/modules/testsuite/shared-tests/pom.xml b/modules/testsuite/shared-tests/pom.xml index d3d2a8e02..2eb2cc1b0 100644 --- a/modules/testsuite/shared-tests/pom.xml +++ b/modules/testsuite/shared-tests/pom.xml @@ -56,8 +56,8 @@ - org.codehaus.gmaven - gmaven-plugin + org.codehaus.gmavenplus + gmavenplus-plugin testsuite-default @@ -66,15 +66,36 @@ execute - ${basedir}/src/test/scripts/jbws-testsuite-shared-default${additionalGroovyScriptSuffix}.groovy + - ${jboss.home}/standalone/configuration/standalone.xml - ${jboss.home}/standalone/configuration/jbws-testsuite-shared-default.xml - jbws-testsuite-shared-default.log - ${project.build.directory}/test-classes/jbossws-users.properties - ${project.build.directory}/test-classes/jbossws-roles.properties - ${project.build.directory}/test-classes/test.keystore - ${project.build.directory}/test-resources + + inputFile + ${jboss.home}/standalone/configuration/standalone.xml + + + outputFile + ${jboss.home}/standalone/configuration/jbws-testsuite-shared-default.xml + + + serverLog + jbws-testsuite-shared-default.log + + + usersPropFile + ${project.build.directory}/test-classes/jbossws-users.properties + + + rolesPropFile + ${project.build.directory}/test-classes/jbossws-roles.properties + + + keystorePath + ${project.build.directory}/test-classes/test.keystore + + + testResourcesDir + ${project.build.directory}/test-resources + @@ -85,11 +106,28 @@ execute - ${basedir}/src/test/scripts/jbws-testsuite-shared-default-config-tests${additionalGroovyScriptSuffix}.groovy + - ${jboss.home}/standalone/configuration/standalone.xml - ${jboss.home}/standalone/configuration/jbws-testsuite-shared-default-config-tests.xml - jbws-testsuite-shared-default-config-tests.log + + inputFile + ${jboss.home}/standalone/configuration/standalone.xml + + + outputFile + ${jboss.home}/standalone/configuration/jbws-testsuite-shared-default-config-tests.xml + + + usersPropFile + ${project.build.directory}/test-classes/jbossws-users.properties + + + rolesPropFile + ${project.build.directory}/test-classes/jbossws-roles.properties + + + serverLog + jbws-testsuite-shared-default-config-tests.log + @@ -100,12 +138,32 @@ execute - ${basedir}/src/test/scripts/jbws-testsuite-shared-address-rewrite${additionalGroovyScriptSuffix}.groovy + - ${jboss.home}/standalone/configuration/standalone.xml - ${jboss.home}/standalone/configuration/jbws-testsuite-shared-address-rewrite.xml - jbws-testsuite-shared-address-rewrite.log - ${project.build.directory}/test-classes/test.keystore + + inputFile + ${jboss.home}/standalone/configuration/standalone.xml + + + outputFile + ${jboss.home}/standalone/configuration/jbws-testsuite-shared-address-rewrite.xml + + + serverLog + jbws-testsuite-shared-address-rewrite.log + + + usersPropFile + ${project.build.directory}/test-classes/jbossws-users.properties + + + rolesPropFile + ${project.build.directory}/test-classes/jbossws-roles.properties + + + keystorePath + ${project.build.directory}/test-classes/test.keystore + diff --git a/modules/testsuite/shared-tests/src/test/scripts/jbws-testsuite-shared-address-rewrite-elytron.groovy b/modules/testsuite/shared-tests/src/test/scripts/jbws-testsuite-shared-address-rewrite-elytron.groovy index cc71acf6a..3028f4ad3 100644 --- a/modules/testsuite/shared-tests/src/test/scripts/jbws-testsuite-shared-address-rewrite-elytron.groovy +++ b/modules/testsuite/shared-tests/src/test/scripts/jbws-testsuite-shared-address-rewrite-elytron.groovy @@ -1,4 +1,4 @@ -def root = new XmlParser().parse(project.properties['inputFile']) +def root = new XmlParser().parse(inputFile) /** * Fix logging: optionally remove CONSOLE handler and set a specific log file @@ -8,7 +8,7 @@ def logHandlers = root.profile.subsystem.'root-logger'.handlers[0] def consoleHandler = logHandlers.find{it.@name == 'CONSOLE'} if (!project.properties['enableServerLoggingToConsole']) logHandlers.remove(consoleHandler) def file = root.profile.subsystem.'periodic-rotating-file-handler'.file[0] -file.attributes()['path'] = project.properties['serverLog'] +file.attributes()['path'] = serverLog /** @@ -30,7 +30,7 @@ for (item in subsystems) { if (item.name().getNamespaceURI().contains("urn:wildfly:elytron:")) { securitySubsystem = item for (element in item) { - if (element.name().getLocalPart().equals("security-domains")) { + if (element.name().getLocalPart() == 'security-domains') { securityDomains = element } } @@ -48,8 +48,8 @@ def realm = securityDomain.appendNode('realm',['name':'JBossWS','role-decoder':' */ def securityRealms = root.profile.subsystem.'security-realms'[0] def propertiesRealm = securityRealms.appendNode('properties-realm', ['name':'JBossWS']) -def usersProperties = propertiesRealm.appendNode('users-properties',['path':project.properties['usersPropFile'], 'plain-text':'true']) -def groupsProperties = propertiesRealm.appendNode('groups-properties',['path':project.properties['rolesPropFile']]) +def usersProperties = propertiesRealm.appendNode('users-properties',['path':usersPropFile, 'plain-text':'true']) +def groupsProperties = propertiesRealm.appendNode('groups-properties',['path':rolesPropFile]) /* * @@ -61,7 +61,7 @@ def groupsProperties = propertiesRealm.appendNode('groups-properties',['path':pr */ def httpAuthen = null for (element in securitySubsystem) { - if (element.name().getLocalPart().equals("http")) { + if (element.name().getLocalPart() == 'http') { httpAuthen = element break } @@ -88,7 +88,7 @@ def secRealms = root.management.'security-realms'[0] def secRealm = secRealms.appendNode('security-realm', ['name':'jbws-test-https-realm']) def serverIdentities = secRealm.appendNode('server-identities') def ssl = serverIdentities.appendNode('ssl') -ssl.appendNode('keystore', ['path':project.properties['keystorePath'],'keystore-password':'changeit','alias':'tomcat']) +ssl.appendNode('keystore', ['path':keystorePath,'keystore-password':'changeit','alias':'tomcat']) def server = root.profile.subsystem.server[0] def curHttpsListener = server.'https-listener'[0] @@ -102,5 +102,5 @@ server.appendNode('https-listener', ['name':'jbws-test-https-listener','socket-b def writer = new StringWriter() writer.println('') new XmlNodePrinter(new PrintWriter(writer)).print(root) -def f = new File(project.properties['outputFile']) +def f = new File(outputFile) f.write(writer.toString()) diff --git a/modules/testsuite/shared-tests/src/test/scripts/jbws-testsuite-shared-address-rewrite.groovy b/modules/testsuite/shared-tests/src/test/scripts/jbws-testsuite-shared-address-rewrite.groovy index c4c96c096..f46a865bb 100644 --- a/modules/testsuite/shared-tests/src/test/scripts/jbws-testsuite-shared-address-rewrite.groovy +++ b/modules/testsuite/shared-tests/src/test/scripts/jbws-testsuite-shared-address-rewrite.groovy @@ -1,4 +1,4 @@ -def root = new XmlParser().parse(project.properties['inputFile']) +def root = new XmlParser().parse(inputFile) /** * Fix logging: optionally remove CONSOLE handler and set a specific log file @@ -8,7 +8,7 @@ def logHandlers = root.profile.subsystem.'root-logger'.handlers[0] def consoleHandler = logHandlers.find{it.@name == 'CONSOLE'} if (!project.properties['enableServerLoggingToConsole']) logHandlers.remove(consoleHandler) def file = root.profile.subsystem.'periodic-rotating-file-handler'.file[0] -file.attributes()['path'] = project.properties['serverLog'] +file.attributes()['path'] = serverLog /** * Add a security-domain block like this: @@ -30,7 +30,7 @@ def securityDomains = null for (item in subsystems) { if (item.name().getNamespaceURI().contains("urn:jboss:domain:security:")) { for (element in item) { - if (element.name().getLocalPart().equals("security-domains")) { + if (element.name().getLocalPart() == 'security-domains') { securityDomains = element } } @@ -41,8 +41,8 @@ def securityDomain = securityDomains.appendNode('security-domain', ['name':'JBos def authentication = securityDomain.appendNode('authentication') def loginModule = authentication.appendNode('login-module', ['code':'UsersRoles','flag':'required']) loginModule.appendNode('module-option', ['name':'unauthenticatedIdentity','value':'anonymous']) -loginModule.appendNode('module-option', ['name':'usersProperties','value':project.properties['usersPropFile']]) -loginModule.appendNode('module-option', ['name':'rolesProperties','value':project.properties['rolesPropFile']]) +loginModule.appendNode('module-option', ['name':'usersProperties','value':usersPropFile]) +loginModule.appendNode('module-option', ['name':'rolesProperties','value':rolesPropFile]) /** * Add a https connector like this: @@ -61,7 +61,7 @@ def securityRealms = root.management.'security-realms'[0] def securityRealm = securityRealms.appendNode('security-realm', ['name':'jbws-test-https-realm']) def serverIdentities = securityRealm.appendNode('server-identities') def ssl = serverIdentities.appendNode('ssl') -ssl.appendNode('keystore', ['path':project.properties['keystorePath'],'keystore-password':'changeit','alias':'tomcat']) +ssl.appendNode('keystore', ['path':keystorePath,'keystore-password':'changeit','alias':'tomcat']) def server = root.profile.subsystem.server[0] def curHttpsListener = server.'https-listener'[0] @@ -75,5 +75,5 @@ server.appendNode('https-listener', ['name':'jbws-test-https-listener','socket-b def writer = new StringWriter() writer.println('') new XmlNodePrinter(new PrintWriter(writer)).print(root) -def f = new File(project.properties['outputFile']) +def f = new File(outputFile) f.write(writer.toString()) diff --git a/modules/testsuite/shared-tests/src/test/scripts/jbws-testsuite-shared-default-config-tests-elytron.groovy b/modules/testsuite/shared-tests/src/test/scripts/jbws-testsuite-shared-default-config-tests-elytron.groovy index 0dd477cb5..874dc4923 100644 --- a/modules/testsuite/shared-tests/src/test/scripts/jbws-testsuite-shared-default-config-tests-elytron.groovy +++ b/modules/testsuite/shared-tests/src/test/scripts/jbws-testsuite-shared-default-config-tests-elytron.groovy @@ -1,4 +1,4 @@ -def root = new XmlParser().parse(project.properties['inputFile']) +def root = new XmlParser().parse(inputFile) /** * Fix logging: optionally remove CONSOLE handler and set a specific log file @@ -8,7 +8,7 @@ def logHandlers = root.profile.subsystem.'root-logger'.handlers[0] def consoleHandler = logHandlers.find{it.@name == 'CONSOLE'} if (!project.properties['enableServerLoggingToConsole']) logHandlers.remove(consoleHandler) def file = root.profile.subsystem.'periodic-rotating-file-handler'.file[0] -file.attributes()['path'] = project.properties['serverLog'] +file.attributes()['path'] = serverLog /** * Add a security-domain block like this: @@ -29,7 +29,7 @@ for (item in subsystems) { if (item.name().getNamespaceURI().contains("urn:wildfly:elytron:")) { securitySubsystem = item; for (element in item) { - if (element.name().getLocalPart().equals("security-domains")) { + if (element.name().getLocalPart() == 'security-domains') { securityDomains = element } } @@ -47,8 +47,8 @@ def realm = securityDomain.appendNode('realm',['name':'JBossWS','role-decoder':' */ def securityRealms = root.profile.subsystem.'security-realms'[0] def propertiesRealm = securityRealms.appendNode('properties-realm', ['name':'JBossWS']) -def usersProperties = propertiesRealm.appendNode('users-properties',['path':project.properties['usersPropFile'], 'plain-text':'true']) -def groupsProperties = propertiesRealm.appendNode('groups-properties',['path':project.properties['rolesPropFile']]) +def usersProperties = propertiesRealm.appendNode('users-properties',['path':usersPropFile, 'plain-text':'true']) +def groupsProperties = propertiesRealm.appendNode('groups-properties',['path':rolesPropFile]) /* * @@ -60,7 +60,7 @@ def groupsProperties = propertiesRealm.appendNode('groups-properties',['path':pr */ def httpAuthen = null for (element in securitySubsystem) { - if (element.name().getLocalPart().equals("http")) { + if (element.name().getLocalPart() == 'http') { httpAuthen = element break } @@ -90,5 +90,5 @@ def appSecurityDomain = undertowAppSecurityDomains.appendNode('application-secur def writer = new StringWriter() writer.println('') new XmlNodePrinter(new PrintWriter(writer)).print(root) -def f = new File(project.properties['outputFile']) +def f = new File(outputFile) f.write(writer.toString()) diff --git a/modules/testsuite/shared-tests/src/test/scripts/jbws-testsuite-shared-default-config-tests.groovy b/modules/testsuite/shared-tests/src/test/scripts/jbws-testsuite-shared-default-config-tests.groovy index 717a5eaf6..0c5faacea 100644 --- a/modules/testsuite/shared-tests/src/test/scripts/jbws-testsuite-shared-default-config-tests.groovy +++ b/modules/testsuite/shared-tests/src/test/scripts/jbws-testsuite-shared-default-config-tests.groovy @@ -1,4 +1,4 @@ -def root = new XmlParser().parse(project.properties['inputFile']) +def root = new XmlParser().parse(inputFile) /** * Fix logging: optionally remove CONSOLE handler and set a specific log file @@ -8,7 +8,7 @@ def logHandlers = root.profile.subsystem.'root-logger'.handlers[0] def consoleHandler = logHandlers.find{it.@name == 'CONSOLE'} if (!project.properties['enableServerLoggingToConsole']) logHandlers.remove(consoleHandler) def file = root.profile.subsystem.'periodic-rotating-file-handler'.file[0] -file.attributes()['path'] = project.properties['serverLog'] +file.attributes()['path'] = serverLog /** * Add a security-domain block like this: @@ -30,7 +30,7 @@ def securityDomains = null for (item in subsystems) { if (item.name().getNamespaceURI().contains("urn:jboss:domain:security:")) { for (element in item) { - if (element.name().getLocalPart().equals("security-domains")) { + if (element.name().getLocalPart() == 'security-domains') { securityDomains = element } } @@ -41,8 +41,8 @@ def securityDomain = securityDomains.appendNode('security-domain', ['name':'JBos def authentication = securityDomain.appendNode('authentication') def loginModule = authentication.appendNode('login-module', ['code':'UsersRoles','flag':'required']) loginModule.appendNode('module-option', ['name':'unauthenticatedIdentity','value':'anonymous']) -loginModule.appendNode('module-option', ['name':'usersProperties','value':project.properties['usersPropFile']]) -loginModule.appendNode('module-option', ['name':'rolesProperties','value':project.properties['rolesPropFile']]) +loginModule.appendNode('module-option', ['name':'usersProperties','value':usersPropFile]) +loginModule.appendNode('module-option', ['name':'rolesProperties','value':rolesPropFile]) /** * Save the configuration to a new file @@ -51,5 +51,5 @@ loginModule.appendNode('module-option', ['name':'rolesProperties','value':projec def writer = new StringWriter() writer.println('') new XmlNodePrinter(new PrintWriter(writer)).print(root) -def f = new File(project.properties['outputFile']) +def f = new File(outputFile) f.write(writer.toString()) diff --git a/modules/testsuite/shared-tests/src/test/scripts/jbws-testsuite-shared-default-elytron.groovy b/modules/testsuite/shared-tests/src/test/scripts/jbws-testsuite-shared-default-elytron.groovy index 375e87cd5..d2a3913e5 100644 --- a/modules/testsuite/shared-tests/src/test/scripts/jbws-testsuite-shared-default-elytron.groovy +++ b/modules/testsuite/shared-tests/src/test/scripts/jbws-testsuite-shared-default-elytron.groovy @@ -1,4 +1,4 @@ -def root = new XmlParser().parse(project.properties['inputFile']) +def root = new XmlParser().parse(inputFile) /** * Fix logging: optionally remove CONSOLE handler and set a specific log file @@ -8,7 +8,7 @@ def logHandlers = root.profile.subsystem.'root-logger'.handlers[0] def consoleHandler = logHandlers.find{it.@name == 'CONSOLE'} if (!project.properties['enableServerLoggingToConsole']) logHandlers.remove(consoleHandler) def file = root.profile.subsystem.'periodic-rotating-file-handler'.file[0] -file.attributes()['path'] = project.properties['serverLog'] +file.attributes()['path'] = serverLog /** @@ -21,7 +21,7 @@ for (item in subsystems) { if (item.name().getNamespaceURI().contains("urn:wildfly:elytron:")) { securitySubsystem = item; for (element in item) { - if (element.name().getLocalPart().equals("security-domains")) { + if (element.name().getLocalPart() == 'security-domains') { securityDomains = element } } @@ -48,22 +48,22 @@ def realm4 = securityDomain4.appendNode('realm',['name':'JBossWSSecurityDomainTe def securityRealms = root.profile.subsystem.'security-realms'[0] def propertiesRealm = securityRealms.appendNode('properties-realm', ['name':'JBossWS']) -def usersProperties = propertiesRealm.appendNode('users-properties',['path':project.properties['usersPropFile'], 'plain-text':'true']) -def groupsProperties = propertiesRealm.appendNode('groups-properties',['path':project.properties['rolesPropFile']]) +def usersProperties = propertiesRealm.appendNode('users-properties',['path':usersPropFile, 'plain-text':'true']) +def groupsProperties = propertiesRealm.appendNode('groups-properties',['path':rolesPropFile']]) def propertiesRealm2 = securityRealms.appendNode('properties-realm', ['name':'handlerauth-security-domain']) -def usersProperties2 = propertiesRealm2.appendNode('users-properties',['path':project.properties['testResourcesDir'] + '/jaxws/handlerauth/jbossws-users.properties', 'plain-text':'true']) -def groupsProperties2 = propertiesRealm2.appendNode('groups-properties',['path':project.properties['testResourcesDir'] + '/jaxws/handlerauth/jbossws-roles.properties']) +def usersProperties2 = propertiesRealm2.appendNode('users-properties',['path':testResourcesDir + '/jaxws/handlerauth/jbossws-users.properties', 'plain-text':'true']) +def groupsProperties2 = propertiesRealm2.appendNode('groups-properties',['path':testResourcesDir + '/jaxws/handlerauth/jbossws-roles.properties']) def propertiesRealm3 = securityRealms.appendNode('properties-realm', ['name':'JBossWSSecurityDomainPermitAllTest']) -def usersProperties3 = propertiesRealm3.appendNode('users-properties',['path':project.properties['testResourcesDir'] + '/jaxws/samples/securityDomain/jbossws-users.properties', 'plain-text':'true']) -def groupsProperties3 = propertiesRealm3.appendNode('groups-properties',['path':project.properties['testResourcesDir'] + '/jaxws/samples/securityDomain/jbossws-roles.properties']) +def usersProperties3 = propertiesRealm3.appendNode('users-properties',['path':testResourcesDir + '/jaxws/samples/securityDomain/jbossws-users.properties', 'plain-text':'true']) +def groupsProperties3 = propertiesRealm3.appendNode('groups-properties',['path':testResourcesDir + '/jaxws/samples/securityDomain/jbossws-roles.properties']) def propertiesRealm4 = securityRealms.appendNode('properties-realm', ['name':'JBossWSSecurityDomainTest']) -def usersProperties4 = propertiesRealm4.appendNode('users-properties',['path':project.properties['testResourcesDir'] + '/jaxws/samples/securityDomain/jbossws-users.properties', 'plain-text':'true']) -def groupsProperties4 = propertiesRealm4.appendNode('groups-properties',['path':project.properties['testResourcesDir'] + '/jaxws/samples/securityDomain/jbossws-roles.properties']) +def usersProperties4 = propertiesRealm4.appendNode('users-properties',['path':testResourcesDir + '/jaxws/samples/securityDomain/jbossws-users.properties', 'plain-text':'true']) +def groupsProperties4 = propertiesRealm4.appendNode('groups-properties',['path':testResourcesDir + '/jaxws/samples/securityDomain/jbossws-roles.properties']) @@ -73,7 +73,7 @@ def groupsProperties4 = propertiesRealm4.appendNode('groups-properties',['path': def httpAuthen = null for (element in securitySubsystem) { - if (element.name().getLocalPart().equals("http")) { + if (element.name().getLocalPart() == 'http') { httpAuthen = element break } @@ -151,7 +151,7 @@ def rootsecurityRealms = root.management.'security-realms'[0] def rootsecurityRealm = rootsecurityRealms.appendNode('security-realm', ['name':'jbws-test-https-realm']) def serverIdentities = rootsecurityRealm.appendNode('server-identities') def ssl = serverIdentities.appendNode('ssl') -ssl.appendNode('keystore', ['path':project.properties['keystorePath'],'keystore-password':'changeit','alias':'tomcat']) +ssl.appendNode('keystore', ['path':keystorePath,'keystore-password':'changeit','alias':'tomcat']) def server = root.profile.subsystem.server[0] def curHttpsListener = server.'https-listener'[0] @@ -165,5 +165,5 @@ server.appendNode('https-listener', ['name':'jbws-test-https-listener','socket-b def writer = new StringWriter() writer.println('') new XmlNodePrinter(new PrintWriter(writer)).print(root) -def f = new File(project.properties['outputFile']) +def f = new File(outputFile) f.write(writer.toString()) diff --git a/modules/testsuite/shared-tests/src/test/scripts/jbws-testsuite-shared-default.groovy b/modules/testsuite/shared-tests/src/test/scripts/jbws-testsuite-shared-default.groovy index 45fe6f5f5..7430087a9 100644 --- a/modules/testsuite/shared-tests/src/test/scripts/jbws-testsuite-shared-default.groovy +++ b/modules/testsuite/shared-tests/src/test/scripts/jbws-testsuite-shared-default.groovy @@ -1,4 +1,4 @@ -def root = new XmlParser().parse(project.properties['inputFile']) +def root = new XmlParser().parse(inputFile) /** * Fix logging: optionally remove CONSOLE handler and set a specific log file @@ -8,7 +8,7 @@ def logHandlers = root.profile.subsystem.'root-logger'.handlers[0] def consoleHandler = logHandlers.find{it.@name == 'CONSOLE'} if (!project.properties['enableServerLoggingToConsole']) logHandlers.remove(consoleHandler) def file = root.profile.subsystem.'periodic-rotating-file-handler'.file[0] -file.attributes()['path'] = project.properties['serverLog'] +file.attributes()['path'] = serverLog /** * Add a security-domain block like this: @@ -29,7 +29,7 @@ def securityDomains = null for (item in subsystems) { if (item.name().getNamespaceURI().contains("urn:jboss:domain:security:")) { for (element in item) { - if (element.name().getLocalPart().equals("security-domains")) { + if (element.name().getLocalPart() == 'security-domains') { securityDomains = element } } @@ -40,8 +40,8 @@ def securityDomain = securityDomains.appendNode('security-domain', ['name':'JBos def authentication = securityDomain.appendNode('authentication') def loginModule = authentication.appendNode('login-module', ['code':'UsersRoles','flag':'required']) loginModule.appendNode('module-option', ['name':'unauthenticatedIdentity','value':'anonymous']) -loginModule.appendNode('module-option', ['name':'usersProperties','value':project.properties['usersPropFile']]) -loginModule.appendNode('module-option', ['name':'rolesProperties','value':project.properties['rolesPropFile']]) +loginModule.appendNode('module-option', ['name':'usersProperties','value':usersPropFile]) +loginModule.appendNode('module-option', ['name':'rolesProperties','value':rolesPropFile]) /** * Settings for modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2937/JBWS2937TestCase.java @@ -59,8 +59,8 @@ loginModule.appendNode('module-option', ['name':'rolesProperties','value':projec def securityDomainBasicAuth = securityDomains.appendNode('security-domain', ['name':'handlerauth-security-domain','cache-type':'default']) def authenticationBasicAuth = securityDomainBasicAuth.appendNode('authentication') def loginModuleBasicAuth = authenticationBasicAuth.appendNode('login-module', ['code':'UsersRoles','flag':'required']) -loginModuleBasicAuth.appendNode('module-option', ['name':'usersProperties','value':project.properties['testResourcesDir'] + '/jaxws/handlerauth/jbossws-users.properties']) -loginModuleBasicAuth.appendNode('module-option', ['name':'rolesProperties','value':project.properties['testResourcesDir'] + '/jaxws/handlerauth/jbossws-roles.properties']) +loginModuleBasicAuth.appendNode('module-option', ['name':'usersProperties','value':testResourcesDir + '/jaxws/handlerauth/jbossws-users.properties']) +loginModuleBasicAuth.appendNode('module-option', ['name':'rolesProperties','value':testResourcesDir + '/jaxws/handlerauth/jbossws-roles.properties']) /** * Settings for modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/securityDomain/PermitAllTestCase.java @@ -78,8 +78,8 @@ loginModuleBasicAuth.appendNode('module-option', ['name':'rolesProperties','valu def aSecurityDomainBasicAuth = securityDomains.appendNode('security-domain', ['name':'JBossWSSecurityDomainPermitAllTest','cache-type':'default']) def aAuthenticationBasicAuth = aSecurityDomainBasicAuth.appendNode('authentication') def aLoginModuleBasicAuth = aAuthenticationBasicAuth.appendNode('login-module', ['code':'UsersRoles','flag':'required']) -aLoginModuleBasicAuth.appendNode('module-option', ['name':'usersProperties','value':project.properties['testResourcesDir'] + '/jaxws/samples/securityDomain/jbossws-users.properties']) -aLoginModuleBasicAuth.appendNode('module-option', ['name':'rolesProperties','value':project.properties['testResourcesDir'] + '/jaxws/samples/securityDomain/jbossws-roles.properties']) +aLoginModuleBasicAuth.appendNode('module-option', ['name':'usersProperties','value':testResourcesDir + '/jaxws/samples/securityDomain/jbossws-users.properties']) +aLoginModuleBasicAuth.appendNode('module-option', ['name':'rolesProperties','value':testResourcesDir + '/jaxws/samples/securityDomain/jbossws-roles.properties']) /** * Settings for modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/securityDomain/SecurityDomainTestCase.java @@ -97,8 +97,8 @@ aLoginModuleBasicAuth.appendNode('module-option', ['name':'rolesProperties','val def bSecurityDomainBasicAuth = securityDomains.appendNode('security-domain', ['name':'JBossWSSecurityDomainTest','cache-type':'default']) def bAuthenticationBasicAuth = bSecurityDomainBasicAuth.appendNode('authentication') def bLoginModuleBasicAuth = bAuthenticationBasicAuth.appendNode('login-module', ['code':'UsersRoles','flag':'required']) -bLoginModuleBasicAuth.appendNode('module-option', ['name':'usersProperties','value':project.properties['testResourcesDir'] + '/jaxws/samples/securityDomain/jbossws-users.properties']) -bLoginModuleBasicAuth.appendNode('module-option', ['name':'rolesProperties','value':project.properties['testResourcesDir'] + '/jaxws/samples/securityDomain/jbossws-roles.properties']) +bLoginModuleBasicAuth.appendNode('module-option', ['name':'usersProperties','value':testResourcesDir + '/jaxws/samples/securityDomain/jbossws-users.properties']) +bLoginModuleBasicAuth.appendNode('module-option', ['name':'rolesProperties','value':testResourcesDir + '/jaxws/samples/securityDomain/jbossws-roles.properties']) /** * Add a https connector like this: @@ -117,7 +117,7 @@ def securityRealms = root.management.'security-realms'[0] def securityRealm = securityRealms.appendNode('security-realm', ['name':'jbws-test-https-realm']) def serverIdentities = securityRealm.appendNode('server-identities') def ssl = serverIdentities.appendNode('ssl') -ssl.appendNode('keystore', ['path':project.properties['keystorePath'],'keystore-password':'changeit','alias':'tomcat']) +ssl.appendNode('keystore', ['path':keystorePath,'keystore-password':'changeit','alias':'tomcat']) def server = root.profile.subsystem.server[0] def curHttpsListener = server.'https-listener'[0] @@ -131,5 +131,5 @@ server.appendNode('https-listener', ['name':'jbws-test-https-listener','socket-b def writer = new StringWriter() writer.println('') new XmlNodePrinter(new PrintWriter(writer)).print(root) -def f = new File(project.properties['outputFile']) +def f = new File(outputFile) f.write(writer.toString()) diff --git a/pom.xml b/pom.xml index d397117ce..359c55fee 100644 --- a/pom.xml +++ b/pom.xml @@ -1297,9 +1297,17 @@ - org.codehaus.gmaven - gmaven-plugin + org.codehaus.gmavenplus + gmavenplus-plugin 1.5 + + + org.codehaus.groovy + groovy-all + 2.4.7 + runtime + + org.wildfly.plugins @@ -1575,8 +1583,8 @@ - org.codehaus.gmaven - gmaven-plugin + org.codehaus.gmavenplus + gmavenplus-plugin [1.5,) execute