Author: asoldano Date: 2015-03-05 10:17:02 -0500 (Thu, 05 Mar 2015) New Revision: 19529 Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/etc/jbws-application-roles.properties stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/etc/jbws-application-users.properties Removed: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/etc/application-roles.properties stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/etc/application-users.properties Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/pom.xml stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/scripts/jbws-testsuite-jms.groovy Log: [JBWS-3874] Do not overwrite application-*.properties Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/pom.xml 2015-03-05 13:32:26 UTC (rev 19528) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/pom.xml 2015-03-05 15:17:02 UTC (rev 19529) @@ -140,10 +140,10 @@ <inputFile>${jboss.home}/standalone/configuration/standalone-full.xml</inputFile> <outputFile>${jboss.home}/standalone/configuration/jbws-testsuite-jms.xml</outputFile> <serverLog>jbws-testsuite-jms.log</serverLog> - <srcUsersProperties>${project.build.directory}/test-classes/application-users.properties</srcUsersProperties> - <destUsersProperties>${jboss.home}/standalone/configuration/application-users.properties</destUsersProperties> - <srcRolesProperties>${project.build.directory}/test-classes/application-roles.properties</srcRolesProperties> - <destRolesProperties>${jboss.home}/standalone/configuration/application-roles.properties</destRolesProperties> + <srcUsersProperties>${project.build.directory}/test-classes/jbws-application-users.properties</srcUsersProperties> + <destUsersProperties>${jboss.home}/standalone/configuration/jbws-application-users.properties</destUsersProperties> + <srcRolesProperties>${project.build.directory}/test-classes/jbws-application-roles.properties</srcRolesProperties> + <destRolesProperties>${jboss.home}/standalone/configuration/jbws-application-roles.properties</destRolesProperties> </properties> </configuration> </execution> Deleted: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/etc/application-roles.properties =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/etc/application-roles.properties 2015-03-05 13:32:26 UTC (rev 19528) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/etc/application-roles.properties 2015-03-05 15:17:02 UTC (rev 19529) @@ -1 +0,0 @@ -kermit=guest Deleted: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/etc/application-users.properties =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/etc/application-users.properties 2015-03-05 13:32:26 UTC (rev 19528) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/etc/application-users.properties 2015-03-05 15:17:02 UTC (rev 19529) @@ -1 +0,0 @@ -kermit=0491092837b7e5aef6f270a3b85f8336 Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/etc/jbws-application-roles.properties =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/etc/jbws-application-roles.properties (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/etc/jbws-application-roles.properties 2015-03-05 15:17:02 UTC (rev 19529) @@ -0,0 +1 @@ +kermit=guest Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/etc/jbws-application-roles.properties ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:keywords + Rev Date Added: svn:eol-style + native Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/etc/jbws-application-users.properties =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/etc/jbws-application-users.properties (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/etc/jbws-application-users.properties 2015-03-05 15:17:02 UTC (rev 19529) @@ -0,0 +1 @@ +kermit=0491092837b7e5aef6f270a3b85f8336 Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/etc/jbws-application-users.properties ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:keywords + Rev Date Added: svn:eol-style + native Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/scripts/jbws-testsuite-jms.groovy =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/scripts/jbws-testsuite-jms.groovy 2015-03-05 13:32:26 UTC (rev 19528) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/scripts/jbws-testsuite-jms.groovy 2015-03-05 15:17:02 UTC (rev 19529) @@ -11,6 +11,28 @@ file.attributes()['path'] = project.properties['serverLog'] /** + * Modify ApplicationRealm security-realm to use custom properties files + * + * <security-realm name="ApplicationRealm"> + * <authentication> + * <local default-user="$local" allowed-users="*" skip-group-loading="true"/> + * <properties path="jbws-application-users.properties" relative-to="jboss.server.config.dir"/> + * </authentication> + * <authorization> + * <properties path="jbws-application-roles.properties" relative-to="jboss.server.config.dir"/> + * </authorization> + * </security-realm> + **/ +def securityRealms = root.management.'security-realms'[0] +def appRealm = securityRealms.find{it.@name == 'ApplicationRealm'} +def realmAuthentication = appRealm.'authentication'[0]; +def authenticationProps = realmAuthentication.'properties' +authenticationProps.@path = 'jbws-application-users.properties' +def realmAuthorization = appRealm.'authorization'[0]; +def authorizationProps = realmAuthorization.'properties' +authorizationProps.@path = 'jbws-application-roles.properties' + +/** * Add a JMS queue like this * * <subsystem xmlns="urn:jboss:domain:messaging:2.0"> @@ -43,7 +65,7 @@ f.write(writer.toString()) /* - * copy the preconfigured application-roles.properties and application-users.properties + * copy the preconfigured jbws-application-roles.properties and jbws-application-users.properties * files into the standalone/configure directory */ def srcUsersProperties = project.properties['srcUsersProperties']