[JBWS-3999] Remove default https listener on wfly master

jbossws · Jul 11, 2016 · 400b246 · 400b246
1 parent c8fdc66
commit 400b246
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 0 deletions.
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
@@ -203,6 +203,8 @@ def ssl = serverIdentities.appendNode('ssl')
 ssl.appendNode('keystore', ['path':project.properties['keystorePath'],'keystore-password':'changeit','alias':'tomcat'])
 
 def server = root.profile.subsystem.server[0]
+def curHttpsListener = server.'https-listener'[0]
+if (curHttpsListener != null) server.remove(curHttpsListener)
 server.appendNode('https-listener', ['name':'jbws-test-https-listener','socket-binding':'https','security-realm':'jbws-test-https-realm'])
 
 

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
@@ -38,6 +38,8 @@ def authentication = securityRealm.appendNode('authentication')
 authentication.appendNode('truststore', ['path':project.properties['truststorePath'],'keystore-password':'changeit'])
 
 def server = root.profile.subsystem.server[0]
+def curHttpsListener = server.'https-listener'[0]
+if (curHttpsListener != null) server.remove(curHttpsListener)
 server.appendNode('https-listener', ['name':'jbws-test-https-listener','socket-binding':'https','security-realm':'jbws-test-https-realm','verify-client':'REQUESTED'])
 
 

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
@@ -53,6 +53,8 @@ def ssl = serverIdentities.appendNode('ssl')
 ssl.appendNode('keystore', ['path':project.properties['keystorePath'],'keystore-password':'changeit','alias':'tomcat'])
 
 def server = root.profile.subsystem.server[0]
+def curHttpsListener = server.'https-listener'[0]
+if (curHttpsListener != null) server.remove(curHttpsListener)
 server.appendNode('https-listener', ['name':'jbws-test-https-listener','socket-binding':'https','security-realm':'jbws-test-https-realm'])
 
 /**

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
@@ -109,6 +109,8 @@ def ssl = serverIdentities.appendNode('ssl')
 ssl.appendNode('keystore', ['path':project.properties['keystorePath'],'keystore-password':'changeit','alias':'tomcat'])
 
 def server = root.profile.subsystem.server[0]
+def curHttpsListener = server.'https-listener'[0]
+if (curHttpsListener != null) server.remove(curHttpsListener)
 server.appendNode('https-listener', ['name':'jbws-test-https-listener','socket-binding':'https','security-realm':'jbws-test-https-realm'])
 
 /**