[JBWS-4048] Use -elytron groovy scripts by default when running tests…

…uite against WFLY 11.0.0 as it now comes with Elytron subsystem enabled by default
jbossws · Jan 19, 2017 · b58f7ae · b58f7ae
1 parent 824fe61
commit b58f7ae
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 164 deletions.
diff --git a/modules/testsuite/cxf-tests/pom.xml b/modules/testsuite/cxf-tests/pom.xml
@@ -87,7 +87,7 @@
                   <goal>execute</goal>
                 </goals>
                 <configuration>
-                  <source>${basedir}/src/test/scripts/jbws-testsuite-default.groovy</source>
+                  <source>${basedir}/src/test/scripts/jbws-testsuite-default${additionalGroovyScriptSuffix}.groovy</source>
                   <properties>
                     <inputFile>${jboss.home}/standalone/configuration/standalone.xml</inputFile>
                     <outputFile>${jboss.home}/standalone/configuration/jbws-testsuite-default.xml</outputFile>
@@ -106,7 +106,7 @@
                   <goal>execute</goal>
                 </goals>
                 <configuration>
-                  <source>${basedir}/src/test/scripts/jbws-testsuite-ssl-mutual-auth.groovy</source>
+                  <source>${basedir}/src/test/scripts/jbws-testsuite-ssl-mutual-auth${additionalGroovyScriptSuffix}.groovy</source>
                   <properties>
                     <inputFile>${jboss.home}/standalone/configuration/standalone.xml</inputFile>
                     <outputFile>${jboss.home}/standalone/configuration/jbws-testsuite-ssl-mutual-auth.xml</outputFile>
@@ -123,7 +123,7 @@
                   <goal>execute</goal>
                 </goals>
                 <configuration>
-                  <source>${basedir}/src/test/scripts/jbws-testsuite-default-config-tests.groovy</source>
+                  <source>${basedir}/src/test/scripts/jbws-testsuite-default-config-tests${additionalGroovyScriptSuffix}.groovy</source>
                   <properties>
                     <inputFile>${jboss.home}/standalone/configuration/standalone.xml</inputFile>
                     <outputFile>${jboss.home}/standalone/configuration/jbws-testsuite-default-config-tests.xml</outputFile>
@@ -376,94 +376,6 @@
         </plugins>
       </build>
     </profile>
-    <profile>
-      <id>elytron</id>
-      <activation>
-        <property>
-          <name>elytron</name>
-        </property>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.codehaus.gmaven</groupId>
-            <artifactId>gmaven-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>elytron-testsuite-default</id>
-                <phase>pre-integration-test</phase>
-                <goals>
-                  <goal>execute</goal>
-                </goals>
-                <configuration>
-                  <source>${basedir}/src/test/scripts/jbws-testsuite-default-elytron.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>
-                    <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>
-                    <testResourcesDir>${project.build.directory}/test-resources</testResourcesDir>
-                  </properties>
-                </configuration>
-              </execution>
-              <execution>
-                <id>testsuite-ssl-mutual-auth</id>
-                <phase>pre-integration-test</phase>
-                <goals>
-                  <goal>execute</goal>
-                </goals>
-                <configuration>
-                  <source>${basedir}/src/test/scripts/jbws-testsuite-ssl-mutual-auth-elytron.groovy</source>
-                  <properties>
-                    <inputFile>${jboss.home}/standalone/configuration/standalone.xml</inputFile>
-                    <outputFile>${jboss.home}/standalone/configuration/jbws-testsuite-ssl-mutual-auth.xml</outputFile>
-                    <serverLog>jbws-testsuite-ssl-mutual-auth.log</serverLog>
-                    <keystorePath>${project.build.directory}/test-classes/test.keystore</keystorePath>
-                    <truststorePath>${project.build.directory}/test-classes/test.truststore</truststorePath>
-                  </properties>
-                </configuration>
-              </execution>
-              <execution>
-                <id>testsuite-default-config-tests</id>
-                <phase>pre-integration-test</phase>
-                <goals>
-                  <goal>execute</goal>
-                </goals>
-                <configuration>
-                  <source>${basedir}/src/test/scripts/jbws-testsuite-default-config-tests-elytron.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>
-                  </properties>
-                </configuration>
-              </execution>
-              <execution>
-                <id>testsuite-jms</id>
-                <phase>pre-integration-test</phase>
-                <goals>
-                  <goal>execute</goal>
-                </goals>
-                <configuration>
-                  <source>${basedir}/src/test/scripts/jbws-testsuite-jms-${jbossws.integration.target}.groovy</source>
-                  <properties>
-                    <inputFile>${jboss.home}/standalone/configuration/standalone-full.xml</inputFile>
-                    <outputFile>${jboss.home}/standalone/configuration/jbws-testsuite-jms-${jbossws.integration.target}.xml</outputFile>
-                    <serverLog>jbws-testsuite-jms.log</serverLog>
-                    <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>
-            </executions>
-          </plugin>
-         </plugins>
-        </build>
-       </profile>
 
   </profiles>
 

diff --git a/modules/testsuite/shared-tests/pom.xml b/modules/testsuite/shared-tests/pom.xml
@@ -66,7 +66,7 @@
                             <goal>execute</goal>
                         </goals>
                         <configuration>
-                            <source>${basedir}/src/test/scripts/jbws-testsuite-shared-default.groovy</source>
+                            <source>${basedir}/src/test/scripts/jbws-testsuite-shared-default${additionalGroovyScriptSuffix}.groovy</source>
                             <properties>
                                 <inputFile>${jboss.home}/standalone/configuration/standalone.xml</inputFile>
                                 <outputFile>${jboss.home}/standalone/configuration/jbws-testsuite-shared-default.xml</outputFile>
@@ -85,7 +85,7 @@
                             <goal>execute</goal>
                         </goals>
                         <configuration>
-                            <source>${basedir}/src/test/scripts/jbws-testsuite-shared-default-config-tests.groovy</source>
+                            <source>${basedir}/src/test/scripts/jbws-testsuite-shared-default-config-tests${additionalGroovyScriptSuffix}.groovy</source>
                             <properties>
                                 <inputFile>${jboss.home}/standalone/configuration/standalone.xml</inputFile>
                                 <outputFile>${jboss.home}/standalone/configuration/jbws-testsuite-shared-default-config-tests.xml</outputFile>
@@ -100,7 +100,7 @@
                             <goal>execute</goal>
                         </goals>
                         <configuration>
-                            <source>${basedir}/src/test/scripts/jbws-testsuite-shared-address-rewrite.groovy</source>
+                            <source>${basedir}/src/test/scripts/jbws-testsuite-shared-address-rewrite${additionalGroovyScriptSuffix}.groovy</source>
                             <properties>
                                 <inputFile>${jboss.home}/standalone/configuration/standalone.xml</inputFile>
                                 <outputFile>${jboss.home}/standalone/configuration/jbws-testsuite-shared-address-rewrite.xml</outputFile>
@@ -272,76 +272,6 @@
           </build>
       </profile>
 
-
-    <profile>
-      <id>elytron</id>
-      <activation>
-        <property>
-          <name>elytron</name>
-        </property>
-      </activation>
-      <build>
-        <plugins>
-           <plugin>
-                <groupId>org.codehaus.gmaven</groupId>
-                <artifactId>gmaven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>testsuite-default</id>
-                        <phase>pre-integration-test</phase>
-                        <goals>
-                            <goal>execute</goal>
-                        </goals>
-                        <configuration>
-                            <source>${basedir}/src/test/scripts/jbws-testsuite-shared-default-elytron.groovy</source>
-                            <properties>
-                                <inputFile>${jboss.home}/standalone/configuration/standalone.xml</inputFile>
-                                <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>
-                                <testResourcesDir>${project.build.directory}/test-resources</testResourcesDir>
-                            </properties>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>testsuite-default-config-tests</id>
-                        <phase>pre-integration-test</phase>
-                        <goals>
-                            <goal>execute</goal>
-                        </goals>
-                        <configuration>
-                            <source>${basedir}/src/test/scripts/jbws-testsuite-shared-default-config-tests-elytron.groovy</source>
-                            <properties>
-                                <inputFile>${jboss.home}/standalone/configuration/standalone.xml</inputFile>
-                                <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>
-                    <execution>
-                        <id>testsuite-address-rewrite</id>
-                        <phase>pre-integration-test</phase>
-                        <goals>
-                            <goal>execute</goal>
-                        </goals>
-                        <configuration>
-                            <source>${basedir}/src/test/scripts/jbws-testsuite-shared-address-rewrite-elytron.groovy</source>
-                            <properties>
-                                <inputFile>${jboss.home}/standalone/configuration/standalone.xml</inputFile>
-                                <outputFile>${jboss.home}/standalone/configuration/jbws-testsuite-shared-address-rewrite.xml</outputFile>
-                                <serverLog>jbws-testsuite-shared-address-rewrite.log</serverLog>
-                                <keystorePath>${project.build.directory}/test-classes/test.keystore</keystorePath>
-                            </properties>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-        </plugins>
-      </build>
-    </profile>
   </profiles>
 
 </project>
diff --git a/pom.xml b/pom.xml
@@ -1379,6 +1379,7 @@
         <jboss.home>${server.home}</jboss.home>
         <jboss.version>${wildfly902.version}</jboss.version>
         <additionalJvmArgs>${ipVerArgs}</additionalJvmArgs>
+        <additionalGroovyScriptSuffix></additionalGroovyScriptSuffix>
       </properties>
       <modules>
         <module>modules/dist</module>
@@ -1397,6 +1398,7 @@
         <jboss.home>${server.home}</jboss.home>
         <jboss.version>${wildfly1000.version}</jboss.version>
         <additionalJvmArgs>${ipVerArgs}</additionalJvmArgs>
+        <additionalGroovyScriptSuffix></additionalGroovyScriptSuffix>
       </properties>
       <modules>
         <module>modules/dist</module>
@@ -1415,6 +1417,7 @@
         <jboss.home>${server.home}</jboss.home>
         <jboss.version>${wildfly1010.version}</jboss.version>
         <additionalJvmArgs>${ipVerArgs}</additionalJvmArgs>
+        <additionalGroovyScriptSuffix></additionalGroovyScriptSuffix>
       </properties>
       <modules>
         <module>modules/dist</module>
@@ -1433,6 +1436,7 @@
         <jboss.home>${server.home}</jboss.home>
         <jboss.version>${wildfly1100.version}</jboss.version>
         <additionalJvmArgs>${ipVerArgs}</additionalJvmArgs>
+        <additionalGroovyScriptSuffix>-elytron</additionalGroovyScriptSuffix>
       </properties>
       <modules>
         <module>modules/dist</module>