diff --git a/security/run-tck.sh b/security/run-tck.sh index a8e8fcc..9cf588e 100755 --- a/security/run-tck.sh +++ b/security/run-tck.sh @@ -164,7 +164,8 @@ echo "Executing NEW Jakarta Security TCK." pushd $TCK_ROOT mvn ${MVN_ARGS} clean -pl '!old-tck,!old-tck/build,!old-tck/run' mkdir target -safeRun mvn ${MVN_ARGS} install -Pnew-wildfly -pl '!old-tck,!old-tck/build,!old-tck/run' -Dtest.wildfly.home=$NEW_WILDFLY -fae +# safeRun mvn ${MVN_ARGS} install -Pnew-wildfly -pl '!old-tck,!old-tck/build,!old-tck/run' -Dtest.wildfly.home=$NEW_WILDFLY -fae +safeRun mvn ${MVN_ARGS} install -Pnew-wildfly -pl 'app-openid2' -Dtest.wildfly.home=$NEW_WILDFLY -fae newTckStatus=${status} popd diff --git a/security/wildfly-mods/arquillian.xml b/security/wildfly-mods/arquillian.xml index 5b099fc..dce365f 100644 --- a/security/wildfly-mods/arquillian.xml +++ b/security/wildfly-mods/arquillian.xml @@ -6,7 +6,7 @@ ${test.wildfly.home} - ${debugJvmArgs} -Djboss.https.port=9443 + ${debugJvmArgs} -Djboss.https.port=9443 -Djavax.net.debug=all wildfly localhost diff --git a/security/wildfly/configure-server.cli b/security/wildfly/configure-server.cli index b6901f7..2d4a25a 100644 --- a/security/wildfly/configure-server.cli +++ b/security/wildfly/configure-server.cli @@ -26,14 +26,13 @@ if (outcome != success) of /subsystem=elytron/key-store=tckKs:read-resource /subsystem=elytron/key-manager=tckKm:add(key-store=tckKs,credential-reference={clear-text=changeit}) /subsystem=elytron/trust-manager=tckTm:add(key-store=tckKs) - # /subsystem=elytron/server-ssl-context=tckSsl:add(key-manager=tckKm,protocols=["TLSv1.2"],trust-manager=tckTm,need-client-auth=true) - # /subsystem=undertow/server=default-server/https-listener=https:undefine-attribute(name=security-realm) - # /subsystem=undertow/server=default-server/https-listener=https:write-attribute(name=ssl-context,value=tckSsl) + #/subsystem=elytron/server-ssl-context=tckSsl:add(key-manager=tckKm,protocols=["TLSv1.2"],trust-manager=tckTm,need-client-auth=true) /subsystem=elytron/client-ssl-context=tckSsl:add(key-manager=tckKm,trust-manager=tckTm) - /subsystem=elytron/authentication-context=tckAc:add(match-rules=[{match-port=9443,ssl-context=tckSsl}]) - /subsystem=elytron/dynamic-client-ssl-context=dynamicClientSSLContext:add(authentication-context=tckAc) + /subsystem=elytron:write-attribute(name=default-ssl-context, value=tckSsl) + + /subsystem=elytron/configurable-http-server-mechanism-factory=configuredCert:add(http-server-mechanism-factory=global, properties={org.wildfly.security.http.skip-certificate-verification=true}) end-if stop-embedded-server \ No newline at end of file