[jbossws-commits] JBossWS SVN: r19359 - in stack/cxf/branches/arquillian/modules/testsuite/shared-tests: src/test/etc and 1 other directories.

Author: asoldano Date: 2015-01-09 09:48:13 -0500 (Fri, 09 Jan 2015) New Revision: 19359 Added: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/scripts/jbws-testsuite-shared-default-config-tests.groovy stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/scripts/jbws-testsuite-shared-default.groovy Removed: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/scripts/jbws-testsuite-default-config-tests.groovy stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/scripts/jbws-testsuite-default.groovy Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/pom.xml stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/etc/arquillian.xml Log: Use different script and log file names for shared-testsuite run Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/pom.xml =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/pom.xml 2015-01-09 11:08:42 UTC (rev 19358) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/pom.xml 2015-01-09 14:48:13 UTC (rev 19359) @@ -62,11 +62,11 @@ <goal>execute</goal> </goals> <configuration> - <source>${basedir}/src/test/scripts/jbws-testsuite-default.groovy</source> + <source>${basedir}/src/test/scripts/jbws-testsuite-shared-default.groovy</source> <properties> <inputFile>${jboss.home}/standalone/configuration/standalone.xml</inputFile> - <outputFile>${jboss.home}/standalone/configuration/jbws-testsuite-default.xml</outputFile> - <serverLog>jbws-testsuite-default.log</serverLog> + <outputFile>${jboss.home}/standalone/configuration/jbws-testsuite-shared-default.xml</outputFile> + <serverLog>jbws-testsuite-shared-default.log</serverLog> <usersPropFile>${project.build.directory}/test-classes/jbossws-users.properties</usersPropFile> <rolesPropFile>${project.build.directory}/test-classes/jbossws-roles.properties</rolesPropFile> <keystorePath>${project.build.directory}/test-classes/test.keystore</keystorePath> @@ -81,11 +81,11 @@ <goal>execute</goal> </goals> <configuration> - <source>${basedir}/src/test/scripts/jbws-testsuite-default-config-tests.groovy</source> + <source>${basedir}/src/test/scripts/jbws-testsuite-shared-default-config-tests.groovy</source> <properties> <inputFile>${jboss.home}/standalone/configuration/standalone.xml</inputFile> - <outputFile>${jboss.home}/standalone/configuration/jbws-testsuite-default-config-tests.xml</outputFile> - <serverLog>jbws-testsuite-default-config-tests.log</serverLog> + <outputFile>${jboss.home}/standalone/configuration/jbws-testsuite-shared-default-config-tests.xml</outputFile> + <serverLog>jbws-testsuite-shared-default-config-tests.log</serverLog> </properties> </configuration> </execution> @@ -212,7 +212,7 @@ </goals> <configuration> <jvmArgs>-server -XX:+UseCompressedOops -Xms64m -Xmx512m -XX:MaxPermSize=256m ${additionalJvmArgs}</jvmArgs> - <serverConfig>jbws-testsuite-default.xml</serverConfig> + <serverConfig>jbws-testsuite-shared-default.xml</serverConfig> <jbossHome>${jboss.home}</jbossHome> <port>9990</port> </configuration> @@ -225,7 +225,7 @@ </goals> <configuration> <jvmArgs>-server -XX:+UseCompressedOops -Xms48m -Xmx384m -XX:MaxPermSize=192m -Djboss.socket.binding.port-offset=20000 ${additionalJvmArgs}</jvmArgs> - <serverConfig>jbws-testsuite-default-config-tests.xml</serverConfig> + <serverConfig>jbws-testsuite-shared-default-config-tests.xml</serverConfig> <jbossHome>${jboss.home}</jbossHome> <port>29990</port> </configuration> Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/etc/arquillian.xml =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/etc/arquillian.xml 2015-01-09 11:08:42 UTC (rev 19358) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/etc/arquillian.xml 2015-01-09 14:48:13 UTC (rev 19359) @@ -7,7 +7,7 @@ <configuration> <property name="jbossHome">${jboss.home}</property> <property name="javaVmArguments">-server -XX:+UseCompressedOops -Xms64m -Xmx512m -XX:MaxPermSize=256m -Djavax.wsdl.factory.WSDLFactory=com.ibm.wsdl.factory.WSDLFactoryImpl</property> - <property name="serverConfig">jbws-testsuite-default.xml</property> + <property name="serverConfig">jbws-testsuite-shared-default.xml</property> <property name="allowConnectingToRunningServer">true</property> <property name="managementPort">${as.managementPort:9990}</property> <!-- AS7-4070 --> @@ -19,7 +19,7 @@ <configuration> <property name="jbossHome">${jboss.home}</property> <property name="javaVmArguments">-server -XX:+UseCompressedOops -Xms48m -Xmx384m -XX:MaxPermSize=192m -Djboss.socket.binding.port-offset=20000 -Djavax.wsdl.factory.WSDLFactory=com.ibm.wsdl.factory.WSDLFactoryImpl</property> - <property name="serverConfig">jbws-testsuite-default-config-tests.xml</property> + <property name="serverConfig">jbws-testsuite-shared-default-config-tests.xml</property> <property name="allowConnectingToRunningServer">true</property> <property name="managementPort">${as.managementPort:29990}</property> <!-- AS7-4070 --> Deleted: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/scripts/jbws-testsuite-default-config-tests.groovy =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/scripts/jbws-testsuite-default-config-tests.groovy 2015-01-09 11:08:42 UTC (rev 19358) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/scripts/jbws-testsuite-default-config-tests.groovy 2015-01-09 14:48:13 UTC (rev 19359) @@ -1,44 +0,0 @@ -def root = new XmlParser().parse(project.properties['inputFile']) - -/** - * Fix logging: remove CONSOLE handler and set a specific log file - * - */ -def logHandlers = root.profile.subsystem.'root-logger'.handlers[0] -def consoleHandler = logHandlers.find{it.@name == 'CONSOLE'} -logHandlers.remove(consoleHandler) -def file = root.profile.subsystem.'periodic-rotating-file-handler'.file[0] -file.attributes()['path'] = project.properties['serverLog'] - -/** - * Add a security-domain block like this: - * - * <security-domain name="JBossWS" cache-type="default"> - * <authentication> - * <login-module code="UsersRoles" flag="required"> - * <module-option name="usersProperties" value="/mnt/ssd/jbossws/stack/cxf/trunk/modules/testsuite/cxf-tests/target/test-classes/jbossws-users.properties"/> - * <module-option name="unauthenticatedIdentity" value="anonymous"/> - * <module-option name="rolesProperties" value="/mnt/ssd/jbossws/stack/cxf/trunk/modules/testsuite/cxf-tests/target/test-classes/jbossws-roles.properties"/> - * </login-module> - * </authentication> - * </security-domain> - * - */ - -def securityDomains = root.profile.subsystem.'security-domains'[0] -def securityDomain = securityDomains.appendNode('security-domain', ['name':'JBossWS','cache-type':'default']) -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']]) - -/** - * Save the configuration to a new file - */ - -def writer = new StringWriter() -writer.println('<?xml version="1.0" encoding="UTF-8"?>') -new XmlNodePrinter(new PrintWriter(writer)).print(root) -def f = new File(project.properties['outputFile']) -f.write(writer.toString()) Deleted: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/scripts/jbws-testsuite-default.groovy =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/scripts/jbws-testsuite-default.groovy 2015-01-09 11:08:42 UTC (rev 19358) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/scripts/jbws-testsuite-default.groovy 2015-01-09 14:48:13 UTC (rev 19359) @@ -1,100 +0,0 @@ -def root = new XmlParser().parse(project.properties['inputFile']) - -/** - * Fix logging: remove CONSOLE handler and set a specific log file - * - */ -def logHandlers = root.profile.subsystem.'root-logger'.handlers[0] -def consoleHandler = logHandlers.find{it.@name == 'CONSOLE'} -logHandlers.remove(consoleHandler) -def file = root.profile.subsystem.'periodic-rotating-file-handler'.file[0] -file.attributes()['path'] = project.properties['serverLog'] - -/** - * Add a security-domain block like this: - * - * <security-domain name="JBossWS" cache-type="default"> - * <authentication> - * <login-module code="UsersRoles" flag="required"> - * <module-option name="usersProperties" value="/mnt/ssd/jbossws/stack/cxf/trunk/modules/testsuite/cxf-tests/target/test-classes/jbossws-users.properties"/> - * <module-option name="unauthenticatedIdentity" value="anonymous"/> - * <module-option name="rolesProperties" value="/mnt/ssd/jbossws/stack/cxf/trunk/modules/testsuite/cxf-tests/target/test-classes/jbossws-roles.properties"/> - * </login-module> - * </authentication> - * </security-domain> - * - */ -def securityDomains = root.profile.subsystem.'security-domains'[0] -def securityDomain = securityDomains.appendNode('security-domain', ['name':'JBossWS','cache-type':'default']) -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']]) - -/** - * Settings for modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2937/JBWS2937TestCase.java - * Add a security-domain block like this: - * - * <security-domain name="handlerauth-security-domain" cache-type="default"> - * <authentication> - * <login-module code="UsersRoles" flag="required"> - * <module-option name="usersProperties" value="/jaxws/handlerauth/jbossws-users.properties"/> - * <module-option name="rolesProperties" value="/jaxws/handlerauth/jbossws-roles.properties"/> - * </login-module> - * </authentication> - * </security-domain> - */ -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']) - -/** - * Settings for modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/securityDomain/PermitAllTestCase.java - * Add a security-domain block like this: - * - * <security-domain name="JBossWSSecurityDomainPermitAllTest" cache-type="default"> - * <authentication> - * <login-module code="UsersRoles" flag="required"> - * <module-option name="usersProperties" value="/jaxws/samples/securityDomain/jbossws-users.properties"/> - * <module-option name="rolesProperties" value="/jaxws/samples/securityDomain/jbossws-roles.properties"/> - * </login-module> - * </authentication> - * </security-domain> - */ -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']) - -/** - * Settings for modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/securityDomain/SecurityDomainTestCase.java - * Add a security-domain block like this: - * - * <security-domain name="JBossWSSecurityDomainTest" cache-type="default"> - * <authentication> - * <login-module code="UsersRoles" flag="required"> - * <module-option name="usersProperties" value="/jaxws/samples/securityDomain/jbossws-users.properties"/> - * <module-option name="rolesProperties" value="/jaxws/samples/securityDomain/jbossws-roles.properties"/> - * </login-module> - * </authentication> - * </security-domain> - */ -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']) - -/** - * Save the configuration to a new file - */ - -def writer = new StringWriter() -writer.println('<?xml version="1.0" encoding="UTF-8"?>') -new XmlNodePrinter(new PrintWriter(writer)).print(root) -def f = new File(project.properties['outputFile']) -f.write(writer.toString()) Added: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/scripts/jbws-testsuite-shared-default-config-tests.groovy =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/scripts/jbws-testsuite-shared-default-config-tests.groovy (rev 0) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/scripts/jbws-testsuite-shared-default-config-tests.groovy 2015-01-09 14:48:13 UTC (rev 19359) @@ -0,0 +1,44 @@ +def root = new XmlParser().parse(project.properties['inputFile']) + +/** + * Fix logging: remove CONSOLE handler and set a specific log file + * + */ +def logHandlers = root.profile.subsystem.'root-logger'.handlers[0] +def consoleHandler = logHandlers.find{it.@name == 'CONSOLE'} +logHandlers.remove(consoleHandler) +def file = root.profile.subsystem.'periodic-rotating-file-handler'.file[0] +file.attributes()['path'] = project.properties['serverLog'] + +/** + * Add a security-domain block like this: + * + * <security-domain name="JBossWS" cache-type="default"> + * <authentication> + * <login-module code="UsersRoles" flag="required"> + * <module-option name="usersProperties" value="/mnt/ssd/jbossws/stack/cxf/trunk/modules/testsuite/cxf-tests/target/test-classes/jbossws-users.properties"/> + * <module-option name="unauthenticatedIdentity" value="anonymous"/> + * <module-option name="rolesProperties" value="/mnt/ssd/jbossws/stack/cxf/trunk/modules/testsuite/cxf-tests/target/test-classes/jbossws-roles.properties"/> + * </login-module> + * </authentication> + * </security-domain> + * + */ + +def securityDomains = root.profile.subsystem.'security-domains'[0] +def securityDomain = securityDomains.appendNode('security-domain', ['name':'JBossWS','cache-type':'default']) +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']]) + +/** + * Save the configuration to a new file + */ + +def writer = new StringWriter() +writer.println('<?xml version="1.0" encoding="UTF-8"?>') +new XmlNodePrinter(new PrintWriter(writer)).print(root) +def f = new File(project.properties['outputFile']) +f.write(writer.toString()) Added: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/scripts/jbws-testsuite-shared-default.groovy =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/scripts/jbws-testsuite-shared-default.groovy (rev 0) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/scripts/jbws-testsuite-shared-default.groovy 2015-01-09 14:48:13 UTC (rev 19359) @@ -0,0 +1,100 @@ +def root = new XmlParser().parse(project.properties['inputFile']) + +/** + * Fix logging: remove CONSOLE handler and set a specific log file + * + */ +def logHandlers = root.profile.subsystem.'root-logger'.handlers[0] +def consoleHandler = logHandlers.find{it.@name == 'CONSOLE'} +logHandlers.remove(consoleHandler) +def file = root.profile.subsystem.'periodic-rotating-file-handler'.file[0] +file.attributes()['path'] = project.properties['serverLog'] + +/** + * Add a security-domain block like this: + * + * <security-domain name="JBossWS" cache-type="default"> + * <authentication> + * <login-module code="UsersRoles" flag="required"> + * <module-option name="usersProperties" value="/mnt/ssd/jbossws/stack/cxf/trunk/modules/testsuite/cxf-tests/target/test-classes/jbossws-users.properties"/> + * <module-option name="unauthenticatedIdentity" value="anonymous"/> + * <module-option name="rolesProperties" value="/mnt/ssd/jbossws/stack/cxf/trunk/modules/testsuite/cxf-tests/target/test-classes/jbossws-roles.properties"/> + * </login-module> + * </authentication> + * </security-domain> + * + */ +def securityDomains = root.profile.subsystem.'security-domains'[0] +def securityDomain = securityDomains.appendNode('security-domain', ['name':'JBossWS','cache-type':'default']) +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']]) + +/** + * Settings for modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2937/JBWS2937TestCase.java + * Add a security-domain block like this: + * + * <security-domain name="handlerauth-security-domain" cache-type="default"> + * <authentication> + * <login-module code="UsersRoles" flag="required"> + * <module-option name="usersProperties" value="/jaxws/handlerauth/jbossws-users.properties"/> + * <module-option name="rolesProperties" value="/jaxws/handlerauth/jbossws-roles.properties"/> + * </login-module> + * </authentication> + * </security-domain> + */ +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']) + +/** + * Settings for modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/securityDomain/PermitAllTestCase.java + * Add a security-domain block like this: + * + * <security-domain name="JBossWSSecurityDomainPermitAllTest" cache-type="default"> + * <authentication> + * <login-module code="UsersRoles" flag="required"> + * <module-option name="usersProperties" value="/jaxws/samples/securityDomain/jbossws-users.properties"/> + * <module-option name="rolesProperties" value="/jaxws/samples/securityDomain/jbossws-roles.properties"/> + * </login-module> + * </authentication> + * </security-domain> + */ +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']) + +/** + * Settings for modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/securityDomain/SecurityDomainTestCase.java + * Add a security-domain block like this: + * + * <security-domain name="JBossWSSecurityDomainTest" cache-type="default"> + * <authentication> + * <login-module code="UsersRoles" flag="required"> + * <module-option name="usersProperties" value="/jaxws/samples/securityDomain/jbossws-users.properties"/> + * <module-option name="rolesProperties" value="/jaxws/samples/securityDomain/jbossws-roles.properties"/> + * </login-module> + * </authentication> + * </security-domain> + */ +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']) + +/** + * Save the configuration to a new file + */ + +def writer = new StringWriter() +writer.println('<?xml version="1.0" encoding="UTF-8"?>') +new XmlNodePrinter(new PrintWriter(writer)).print(root) +def f = new File(project.properties['outputFile']) +f.write(writer.toString())