Author: asoldano Date: 2015-03-05 08:32:26 -0500 (Thu, 05 Mar 2015) New Revision: 19528 Removed: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/etc/application-roles.properties stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/etc/application-users.properties stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms/ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms_http/ Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/pom.xml stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/scripts/jbws_testsuite_spring_default.groovy Log: [JBWS-3874] Removing tests from cxf-spring-tests module Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/pom.xml 2015-03-05 13:31:10 UTC (rev 19527) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/pom.xml 2015-03-05 13:32:26 UTC (rev 19528) @@ -93,11 +93,6 @@ <rolesPropFile>${project.build.directory}/test-classes/jbossws-roles.properties</rolesPropFile> <keystorePath>${project.build.directory}/test-classes/test.keystore</keystorePath> <testResourcesDir>${project.build.directory}/test-resources</testResourcesDir> - - <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> </properties> </configuration> </execution> Deleted: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/etc/application-roles.properties =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/etc/application-roles.properties 2015-03-05 13:31:10 UTC (rev 19527) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/etc/application-roles.properties 2015-03-05 13:32:26 UTC (rev 19528) @@ -1 +0,0 @@ -kermit=guest Deleted: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/etc/application-users.properties =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/etc/application-users.properties 2015-03-05 13:31:10 UTC (rev 19527) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/etc/application-users.properties 2015-03-05 13:32:26 UTC (rev 19528) @@ -1 +0,0 @@ -kermit=0491092837b7e5aef6f270a3b85f8336 Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/scripts/jbws_testsuite_spring_default.groovy =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/scripts/jbws_testsuite_spring_default.groovy 2015-03-05 13:31:10 UTC (rev 19527) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/scripts/jbws_testsuite_spring_default.groovy 2015-03-05 13:32:26 UTC (rev 19528) @@ -94,29 +94,6 @@ loginModuleDigest.appendNode('module-option', ['name':'rolesProperties','value':project.properties['testResourcesDir'] + '/jaxws/samples/wsse/username-digest/WEB-INF/jbossws-roles.properties']) /** - * Add a JMS queue like this - * - * <subsystem xmlns="urn:jboss:domain:messaging:2.0"> - * <hornetq-server> - * <jms-destinations> - * <jms-queue name="testQueue"> - * <entry name="queue/test"/> - * <entry name="java:jboss/exported/jms/queue/test"/> - * </jms-queue> - * </jms-destinations> - * </hornetq-server> - * </subsystem> - **/ -def hornetqServer = root.profile.subsystem.'hornetq-server'[0] -def jmsDestinations = hornetqServer.'jms-destinations'[0] -if (jmsDestinations == null) { - jmsDestinations = hornetqServer.appendNode('jms-destinations'); -} -def jmsQueue = jmsDestinations.appendNode('jms-queue', ['name':'testQueue']) -jmsQueue.appendNode('entry', ['name':'queue/test']) -jmsQueue.appendNode('entry', ['name':'java:jboss/exported/jms/queue/test']) - -/** * Save the configuration to a new file */ def writer = new StringWriter() @@ -125,16 +102,3 @@ def f = new File(project.properties['outputFile']) f.write(writer.toString()) -/* - * copy the preconfigured application-roles.properties and 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)