From e1de2c066170edbaa6e4a4eaa6852f71f1d6f6ef Mon Sep 17 00:00:00 2001 From: vramik Date: Tue, 15 Dec 2015 13:14:30 +0100 Subject: [PATCH 01/24] integration-arquillian: add support for prod testing --- testsuite/integration-arquillian/pom.xml | 4 + .../servers/eap7/assembly.xml | 29 ++ .../servers/eap7/pom.xml | 371 ++++++++++++++++++ .../eap7/src/main/keystore/keycloak.jks | Bin 0 -> 2233 bytes .../src/main/keystore/keycloak.truststore | Bin 0 -> 1857 bytes .../eap7/src/main/xslt/add-dialect-logger.xsl | 28 ++ .../servers/eap7/src/main/xslt/datasource.xsl | 94 +++++ .../servers/eap7/src/main/xslt/module.xsl | 33 ++ .../servers/eap7/src/main/xslt/security.xsl | 55 +++ .../servers/eap7/src/main/xslt/standalone.xsl | 53 +++ .../integration-arquillian/servers/pom.xml | 6 + .../base/src/test/resources/arquillian.xml | 18 +- .../integration-arquillian/tests/pom.xml | 137 ++++--- 13 files changed, 764 insertions(+), 64 deletions(-) create mode 100644 testsuite/integration-arquillian/servers/eap7/assembly.xml create mode 100644 testsuite/integration-arquillian/servers/eap7/pom.xml create mode 100644 testsuite/integration-arquillian/servers/eap7/src/main/keystore/keycloak.jks create mode 100644 testsuite/integration-arquillian/servers/eap7/src/main/keystore/keycloak.truststore create mode 100644 testsuite/integration-arquillian/servers/eap7/src/main/xslt/add-dialect-logger.xsl create mode 100644 testsuite/integration-arquillian/servers/eap7/src/main/xslt/datasource.xsl create mode 100644 testsuite/integration-arquillian/servers/eap7/src/main/xslt/module.xsl create mode 100644 testsuite/integration-arquillian/servers/eap7/src/main/xslt/security.xsl create mode 100644 testsuite/integration-arquillian/servers/eap7/src/main/xslt/standalone.xsl diff --git a/testsuite/integration-arquillian/pom.xml b/testsuite/integration-arquillian/pom.xml index 7ab4a377e2..e15c473d80 100644 --- a/testsuite/integration-arquillian/pom.xml +++ b/testsuite/integration-arquillian/pom.xml @@ -14,6 +14,10 @@ pom Keycloak Integration TestSuite with Arquillian + + 7.0.0.DR2 + + servers tests diff --git a/testsuite/integration-arquillian/servers/eap7/assembly.xml b/testsuite/integration-arquillian/servers/eap7/assembly.xml new file mode 100644 index 0000000000..e6fb9a512c --- /dev/null +++ b/testsuite/integration-arquillian/servers/eap7/assembly.xml @@ -0,0 +1,29 @@ + + + auth-server-eap7 + + + zip + + + false + + + + ${keycloak.server.home} + rh-sso-${version.rh.soo} + + **/*.sh + + + + ${keycloak.server.home} + rh-sso-${version.rh.soo} + + **/*.sh + + 0755 + + + + diff --git a/testsuite/integration-arquillian/servers/eap7/pom.xml b/testsuite/integration-arquillian/servers/eap7/pom.xml new file mode 100644 index 0000000000..cb8fe910db --- /dev/null +++ b/testsuite/integration-arquillian/servers/eap7/pom.xml @@ -0,0 +1,371 @@ + + + + org.keycloak.testsuite + integration-arquillian-servers + 1.8.0.CR1-SNAPSHOT + + 4.0.0 + + integration-arquillian-server-eap7 + pom + Server on EAP 7 + + + + + org.apache.maven.plugins + maven-deploy-plugin + + true + + + + maven-assembly-plugin + + + create-zip + package + + single + + + + assembly.xml + + false + + + + + + + + + + auth-server-eap7 + + ${project.build.directory}/unpacked/jboss-iam-1.0 + + + + org.keycloak + rh-sso + ${version.rh.soo} + zip + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + unpack-server + generate-resources + + unpack + + + + + org.keycloak + rh-sso + ${version.rh.soo} + zip + ${project.build.directory}/unpacked + + + + + + + + + + + + + diff --git a/testsuite/integration-arquillian/servers/eap7/src/main/keystore/keycloak.jks b/testsuite/integration-arquillian/servers/eap7/src/main/keystore/keycloak.jks new file mode 100644 index 0000000000000000000000000000000000000000..81570ab52922e70c047bf56442ccce582af55539 GIT binary patch literal 2233 zcmcgt`8(7L7oYE#jHMaI2&Kq!%ZzQTS;`(`OR}WFwPeXUN*YU2GuKE$t{A1P$x>t) zJ0U}gVQiVJ?E5}OE+Ss{KJR_r`xm@Foaa2Bb3Q+u=X1{UIr}U7DFvr!R?Q~ z?&g03AAI|;V(s_A9}fZ@0bz)cJq(VOqMcdl=AA29 znPJu}^_f1kNDY?gG+0WsamWy5&em}uPzeb}bQpfzVN7WG?)Q4Ce>D`M0qVBs1Izj3yYo{4iZ{k+ ze3S`AU6&YaUn~8d!LAiitH0CyXwVO#=6e1%hw|DTsX|qwWb~z>*oh+Q>lT80QJ$Q; z%5;r!b8>z5RG6k_Z+XO?GQsy_2)V4R#of5A&!fpcT*Gm!V`SS5O|)Oc^0`Lb`7Ez4 z`Sx*Bhr!9S1E2HR{JjcI^)PB$F9lWMNE?G}e3B>#;cxwUupszl$C~il7YbTrF}wWz z{-nZz*)u7cT-r@!Ef655tDS$zYLI8M-E?7TR7=7oC>XA+9#jg+2 z@{apwP3x(*f0s(*gW~Ih)@+frD^M3p*T-ZQV<^V7AcSlt*R#4P#QB^=3MxfY+USqrnWrSTB#981sqle!Hx}zb2isk-B zkKc*Md9}J*FHQ_MB4e_{J z zn*)6#OuoVGV#(NJeM9#VPb=jNV%<N+=JTL7LTVZ*idY+o?Gi$J?2h@6u=!b$(Hn;NrY~&2Pk=k&=d`d(mz&d`W(&cX1r z_ow%?Z`~%)*@7Z37~ZRqiR_ph|YHWba3h3jF-- zP5IqS%_}GuC#d+uj0e*Mlqo20Z>UyP^%n5dvAFk18SLIP5U@+w3?p7QI#>tH)W64`E0N_0|OfMx~3^yl-9fT7JwzK&Ma3R5# z`br24-(MXllIyBx@NEMAmWLAmp}QWIc#zO5o*t*MZnys-@glj*J;Sd1&n-|5>?2Uw+@<0h|vg~vfRR4f%xy!9L)N?jSx(S^L7XI$>l%&1TD zc>}pPuoN_aTROIOJ+|zfQ~XeNNi^2?7aSnXfwB{*dJsHmEL&*N-MFODlH+f@1?B)i zK&}Kv9CPY$ho|5WA&B7ROhi~JN*foOR8N&{De;i3)9U=Uh=+G{C?WvjNc^Ew9y-1M z;-z3U!Ky%Z)#{mp2=xItK{K;Vdl(gHf0P<1Y8=QaqOqfAl*3e!u;iZ zqn+r({M{6uUi$JxNakbH$&keRjb@c+ReA+R`Ro(>U+}bS6l2ajd-NwcM!MkMHlk@H8W4_LHnT8m&Fogw@|!Tij3-^a(24 zxS>4i;cs@HcH8_*%IE9ah3cCew{CaLFt^eX*I#(vlzYZ~#}B!TZPKMP5B0A8S79P0 zYrOhInU0UA*R##KSyv|aPRzPi@8jH1Uc5u^_%-Vft$&(iLtlN&IB=xKB_y`(W9Xub zjGBj^E2i(#=aHJeBk-#5xywcFGn5P%)o!M~s`~vzYUaoMPeFBpU#))>D;(~exz3P7 z`!C0{`zzP|OMe-((NeALrS`Pzb5_OQ;w?6M@lyQC4vmk}a;7`C&tJLjq4O2qKW)*6 zXIc6@7B!2FXJTe#U|g(dAa5WGj6zvH7BLo)FUuHABUY@FT*999?~z={<7W-mB#;9U zn2Lab$jIPcmbaJLw7lu;(A@;P(=-?N{B zKh9n4n;4ug%(47H=^2ZE5@`%Kr7Wt?-mUZsaa|W)@V{)5&FSsS?_61}5o=ZUd^2X`h;i+|kZX3@n30%2Qu2X-{lW8kT_B{!n9GZAOX>+hL=hl7g zDXVmLAKB3K;ppUbS1sMywK?bW9P->E=+Mn+W_rEiZxxfmPmdq-T#S4^_D<7TQ2%`X z-5<-(y5CxRHkF0(@XvX7`u0>Tyq)j#-ey61qG0t;sV4QsZ679V@zhM+@a0IPgiNf@ z%s`2`3)ee_Zn^Sd!|4a^%i{RD**_cm>S=QCW@ebaYaa9yiMmTDBE3bSUY(6+|nM{e3Hea`KDZEj@x%^88TqL zVC6JT>!{9&ySHc`T$iG>%jz^*Is#`%=Kf!Hn<}3Cn=@Brd%6D#?RWk&BP6yoGWA)` z-)MbHGcSy1OP;h_-iK93KD9nIsx%SiogA(ZTv5j`XHS(&_uDgHi~cmLOx^VE`k8yS zf%aXot3N1eMn`LXN-_L#WB(ZwjbrHtnjdr<*|2SB+OW;`Jg@wLdr!O8NYyqg-kbPZ z;;7Ke8Cw{|W8YpYnjiciZ&Re|xy@b&T&^E^UMIM(e7Cf0P4lP67X;OPnl9-xZO6Ih7^bG<^O+sfvUc1({JQodpT)7J%o~$D z`DSmJD^)tb$MaEXf5Tp{t?I@Xh3@f(^ + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/testsuite/integration-arquillian/servers/eap7/src/main/xslt/datasource.xsl b/testsuite/integration-arquillian/servers/eap7/src/main/xslt/datasource.xsl new file mode 100644 index 0000000000..66e80feb72 --- /dev/null +++ b/testsuite/integration-arquillian/servers/eap7/src/main/xslt/datasource.xsl @@ -0,0 +1,94 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/testsuite/integration-arquillian/servers/eap7/src/main/xslt/module.xsl b/testsuite/integration-arquillian/servers/eap7/src/main/xslt/module.xsl new file mode 100644 index 0000000000..88ac56b86c --- /dev/null +++ b/testsuite/integration-arquillian/servers/eap7/src/main/xslt/module.xsl @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/testsuite/integration-arquillian/servers/eap7/src/main/xslt/security.xsl b/testsuite/integration-arquillian/servers/eap7/src/main/xslt/security.xsl new file mode 100644 index 0000000000..8eea3df093 --- /dev/null +++ b/testsuite/integration-arquillian/servers/eap7/src/main/xslt/security.xsl @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/testsuite/integration-arquillian/servers/eap7/src/main/xslt/standalone.xsl b/testsuite/integration-arquillian/servers/eap7/src/main/xslt/standalone.xsl new file mode 100644 index 0000000000..f711ed93b3 --- /dev/null +++ b/testsuite/integration-arquillian/servers/eap7/src/main/xslt/standalone.xsl @@ -0,0 +1,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/testsuite/integration-arquillian/servers/pom.xml b/testsuite/integration-arquillian/servers/pom.xml index c805703d7a..5e62078d40 100644 --- a/testsuite/integration-arquillian/servers/pom.xml +++ b/testsuite/integration-arquillian/servers/pom.xml @@ -30,6 +30,12 @@ eap6 + + auth-server-eap7 + + eap7 + + diff --git a/testsuite/integration-arquillian/tests/base/src/test/resources/arquillian.xml b/testsuite/integration-arquillian/tests/base/src/test/resources/arquillian.xml index e34790383e..76f56ea8e8 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/resources/arquillian.xml +++ b/testsuite/integration-arquillian/tests/base/src/test/resources/arquillian.xml @@ -92,7 +92,7 @@ ${migration.kc12} org.jboss.as.arquillian.container.managed.ManagedDeployableContainer - ${keycloak.migration.homee} + ${keycloak.migration.home} -Djboss.socket.binding.port-offset=${auth.server.port.offset} -Xms64m -Xmx512m -XX:MaxPermSize=256m ${auth.server.management.port} ${startup.timeout.sec} @@ -114,7 +114,7 @@ ${auth.server.wildfly} org.jboss.as.arquillian.container.managed.ManagedDeployableContainer - ${auth.server.wildfly.home} + ${keycloak.home} -Djboss.socket.binding.port-offset=${auth.server.port.offset} -Xms64m -Xmx512m -XX:MaxPermSize=256m ${adapter.test.props} ${auth.server.management.port} ${startup.timeout.sec} @@ -125,7 +125,19 @@ ${auth.server.eap6} org.jboss.as.arquillian.container.managed.ManagedDeployableContainer - ${auth.server.eap6.home} + ${keycloak.home} + -Djboss.socket.binding.port-offset=${auth.server.port.offset} -Xms64m -Xmx512m -XX:MaxPermSize=256m ${adapter.test.props} + localhost + ${auth.server.management.port.jmx} + ${startup.timeout.sec} + + + + + + ${auth.server.eap7} + org.jboss.as.arquillian.container.managed.ManagedDeployableContainer + ${keycloak.home} -Djboss.socket.binding.port-offset=${auth.server.port.offset} -Xms64m -Xmx512m -XX:MaxPermSize=256m ${adapter.test.props} localhost ${auth.server.management.port.jmx} diff --git a/testsuite/integration-arquillian/tests/pom.xml b/testsuite/integration-arquillian/tests/pom.xml index bfac920ae3..a84967d978 100644 --- a/testsuite/integration-arquillian/tests/pom.xml +++ b/testsuite/integration-arquillian/tests/pom.xml @@ -38,6 +38,7 @@ 2.1.0.Alpha2 8.2.0.Final 2.1.1 + true true @@ -113,6 +114,26 @@ ${skip.unpack.previous} + + + org.keycloak.testsuite + ${migrated.server.artifactId} + ${project.version} + zip + + + ${containers.home} + true + + + + unpack + generate-test-resources + + unpack + + + ${skip.unpack.server} org.keycloak.testsuite @@ -172,7 +193,7 @@ 2.1.0.Alpha3 - + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + true + false + ${containers.home}/rh-sso-${version.rh.soo} ${adapter.test.props} @@ -485,7 +500,7 @@ false 1.6.1.Final - integration-arquillian-server-wildfly-kc16 + integration-arquillian-server-wildfly-kc16 @@ -513,7 +528,7 @@ false 1.5.1.Final - integration-arquillian-server-wildfly-kc15 + integration-arquillian-server-wildfly-kc15 @@ -541,7 +556,7 @@ false 1.4.0.Final - integration-arquillian-server-wildfly-kc14 + integration-arquillian-server-wildfly-kc14 @@ -567,7 +582,7 @@ false 1.3.1.Final - integration-arquillian-server-wildfly-kc13 + integration-arquillian-server-wildfly-kc13 @@ -593,7 +608,7 @@ false 1.2.0.Final - integration-arquillian-server-wildfly-kc12 + integration-arquillian-server-wildfly-kc12 From aa0d46348776a7b382d7a411d796b938096773ef Mon Sep 17 00:00:00 2001 From: vramik Date: Wed, 16 Dec 2015 12:22:44 +0100 Subject: [PATCH 02/24] integration-arquillian prod: add jpa profile --- .../servers/eap7/pom.xml | 146 +----------------- .../eap7/src/main/keystore/keycloak.jks | Bin 2233 -> 0 bytes .../src/main/keystore/keycloak.truststore | Bin 1857 -> 0 bytes .../servers/eap7/src/main/xslt/datasource.xsl | 6 +- .../servers/eap7/src/main/xslt/module.xsl | 5 +- .../servers/eap7/src/main/xslt/security.xsl | 55 ------- .../servers/eap7/src/main/xslt/standalone.xsl | 53 ------- 7 files changed, 5 insertions(+), 260 deletions(-) delete mode 100644 testsuite/integration-arquillian/servers/eap7/src/main/keystore/keycloak.jks delete mode 100644 testsuite/integration-arquillian/servers/eap7/src/main/keystore/keycloak.truststore delete mode 100644 testsuite/integration-arquillian/servers/eap7/src/main/xslt/security.xsl delete mode 100644 testsuite/integration-arquillian/servers/eap7/src/main/xslt/standalone.xsl diff --git a/testsuite/integration-arquillian/servers/eap7/pom.xml b/testsuite/integration-arquillian/servers/eap7/pom.xml index cb8fe910db..ba7ec2db9d 100644 --- a/testsuite/integration-arquillian/servers/eap7/pom.xml +++ b/testsuite/integration-arquillian/servers/eap7/pom.xml @@ -86,148 +86,6 @@ - + diff --git a/testsuite/integration-arquillian/servers/eap7/src/main/keystore/keycloak.jks b/testsuite/integration-arquillian/servers/eap7/src/main/keystore/keycloak.jks deleted file mode 100644 index 81570ab52922e70c047bf56442ccce582af55539..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2233 zcmcgt`8(7L7oYE#jHMaI2&Kq!%ZzQTS;`(`OR}WFwPeXUN*YU2GuKE$t{A1P$x>t) zJ0U}gVQiVJ?E5}OE+Ss{KJR_r`xm@Foaa2Bb3Q+u=X1{UIr}U7DFvr!R?Q~ z?&g03AAI|;V(s_A9}fZ@0bz)cJq(VOqMcdl=AA29 znPJu}^_f1kNDY?gG+0WsamWy5&em}uPzeb}bQpfzVN7WG?)Q4Ce>D`M0qVBs1Izj3yYo{4iZ{k+ ze3S`AU6&YaUn~8d!LAiitH0CyXwVO#=6e1%hw|DTsX|qwWb~z>*oh+Q>lT80QJ$Q; z%5;r!b8>z5RG6k_Z+XO?GQsy_2)V4R#of5A&!fpcT*Gm!V`SS5O|)Oc^0`Lb`7Ez4 z`Sx*Bhr!9S1E2HR{JjcI^)PB$F9lWMNE?G}e3B>#;cxwUupszl$C~il7YbTrF}wWz z{-nZz*)u7cT-r@!Ef655tDS$zYLI8M-E?7TR7=7oC>XA+9#jg+2 z@{apwP3x(*f0s(*gW~Ih)@+frD^M3p*T-ZQV<^V7AcSlt*R#4P#QB^=3MxfY+USqrnWrSTB#981sqle!Hx}zb2isk-B zkKc*Md9}J*FHQ_MB4e_{J z zn*)6#OuoVGV#(NJeM9#VPb=jNV%<N+=JTL7LTVZ*idY+o?Gi$J?2h@6u=!b$(Hn;NrY~&2Pk=k&=d`d(mz&d`W(&cX1r z_ow%?Z`~%)*@7Z37~ZRqiR_ph|YHWba3h3jF-- zP5IqS%_}GuC#d+uj0e*Mlqo20Z>UyP^%n5dvAFk18SLIP5U@+w3?p7QI#>tH)W64`E0N_0|OfMx~3^yl-9fT7JwzK&Ma3R5# z`br24-(MXllIyBx@NEMAmWLAmp}QWIc#zO5o*t*MZnys-@glj*J;Sd1&n-|5>?2Uw+@<0h|vg~vfRR4f%xy!9L)N?jSx(S^L7XI$>l%&1TD zc>}pPuoN_aTROIOJ+|zfQ~XeNNi^2?7aSnXfwB{*dJsHmEL&*N-MFODlH+f@1?B)i zK&}Kv9CPY$ho|5WA&B7ROhi~JN*foOR8N&{De;i3)9U=Uh=+G{C?WvjNc^Ew9y-1M z;-z3U!Ky%Z)#{mp2=xItK{K;Vdl(gHf0P<1Y8=QaqOqfAl*3e!u;iZ zqn+r({M{6uUi$JxNakbH$&keRjb@c+ReA+R`Ro(>U+}bS6l2ajd-NwcM!MkMHlk@H8W4_LHnT8m&Fogw@|!Tij3-^a(24 zxS>4i;cs@HcH8_*%IE9ah3cCew{CaLFt^eX*I#(vlzYZ~#}B!TZPKMP5B0A8S79P0 zYrOhInU0UA*R##KSyv|aPRzPi@8jH1Uc5u^_%-Vft$&(iLtlN&IB=xKB_y`(W9Xub zjGBj^E2i(#=aHJeBk-#5xywcFGn5P%)o!M~s`~vzYUaoMPeFBpU#))>D;(~exz3P7 z`!C0{`zzP|OMe-((NeALrS`Pzb5_OQ;w?6M@lyQC4vmk}a;7`C&tJLjq4O2qKW)*6 zXIc6@7B!2FXJTe#U|g(dAa5WGj6zvH7BLo)FUuHABUY@FT*999?~z={<7W-mB#;9U zn2Lab$jIPcmbaJLw7lu;(A@;P(=-?N{B zKh9n4n;4ug%(47H=^2ZE5@`%Kr7Wt?-mUZsaa|W)@V{)5&FSsS?_61}5o=ZUd^2X`h;i+|kZX3@n30%2Qu2X-{lW8kT_B{!n9GZAOX>+hL=hl7g zDXVmLAKB3K;ppUbS1sMywK?bW9P->E=+Mn+W_rEiZxxfmPmdq-T#S4^_D<7TQ2%`X z-5<-(y5CxRHkF0(@XvX7`u0>Tyq)j#-ey61qG0t;sV4QsZ679V@zhM+@a0IPgiNf@ z%s`2`3)ee_Zn^Sd!|4a^%i{RD**_cm>S=QCW@ebaYaa9yiMmTDBE3bSUY(6+|nM{e3Hea`KDZEj@x%^88TqL zVC6JT>!{9&ySHc`T$iG>%jz^*Is#`%=Kf!Hn<}3Cn=@Brd%6D#?RWk&BP6yoGWA)` z-)MbHGcSy1OP;h_-iK93KD9nIsx%SiogA(ZTv5j`XHS(&_uDgHi~cmLOx^VE`k8yS zf%aXot3N1eMn`LXN-_L#WB(ZwjbrHtnjdr<*|2SB+OW;`Jg@wLdr!O8NYyqg-kbPZ z;;7Ke8Cw{|W8YpYnjiciZ&Re|xy@b&T&^E^UMIM(e7Cf0P4lP67X;OPnl9-xZO6Ih7^bG<^O+sfvUc1({JQodpT)7J%o~$D z`DSmJD^)tb$MaEXf5Tp{t?I@Xh3@f(^ + exclude-result-prefixes="xalan"> diff --git a/testsuite/integration-arquillian/servers/eap7/src/main/xslt/module.xsl b/testsuite/integration-arquillian/servers/eap7/src/main/xslt/module.xsl index 88ac56b86c..b6484fa0de 100644 --- a/testsuite/integration-arquillian/servers/eap7/src/main/xslt/module.xsl +++ b/testsuite/integration-arquillian/servers/eap7/src/main/xslt/module.xsl @@ -1,8 +1,7 @@ + exclude-result-prefixes="xalan"> @@ -11,7 +10,7 @@ - + diff --git a/testsuite/integration-arquillian/servers/eap7/src/main/xslt/security.xsl b/testsuite/integration-arquillian/servers/eap7/src/main/xslt/security.xsl deleted file mode 100644 index 8eea3df093..0000000000 --- a/testsuite/integration-arquillian/servers/eap7/src/main/xslt/security.xsl +++ /dev/null @@ -1,55 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/testsuite/integration-arquillian/servers/eap7/src/main/xslt/standalone.xsl b/testsuite/integration-arquillian/servers/eap7/src/main/xslt/standalone.xsl deleted file mode 100644 index f711ed93b3..0000000000 --- a/testsuite/integration-arquillian/servers/eap7/src/main/xslt/standalone.xsl +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file From 53ca4b9294d3de5c43cbc7ea6718e1bc4150af04 Mon Sep 17 00:00:00 2001 From: vramik Date: Thu, 17 Dec 2015 10:27:42 +0100 Subject: [PATCH 03/24] integration-arquillian prod: add support for non default firefox --- .../tests/base/src/test/resources/arquillian.xml | 1 + testsuite/integration-arquillian/tests/pom.xml | 2 ++ 2 files changed, 3 insertions(+) diff --git a/testsuite/integration-arquillian/tests/base/src/test/resources/arquillian.xml b/testsuite/integration-arquillian/tests/base/src/test/resources/arquillian.xml index 76f56ea8e8..8f73893cbc 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/resources/arquillian.xml +++ b/testsuite/integration-arquillian/tests/base/src/test/resources/arquillian.xml @@ -7,6 +7,7 @@ ${browser} + ${firefox_binary} diff --git a/testsuite/integration-arquillian/tests/pom.xml b/testsuite/integration-arquillian/tests/pom.xml index a84967d978..5c56d19058 100644 --- a/testsuite/integration-arquillian/tests/pom.xml +++ b/testsuite/integration-arquillian/tests/pom.xml @@ -31,6 +31,7 @@ 60 phantomjs + /usr/bin/firefox 1.1.8.Final 2.45.0 @@ -82,6 +83,7 @@ ${browser} + ${firefox_binary} false ${auth.server.container} true From 6af2e1054cb9a4ee91557f9d35f9cecc534dd5b2 Mon Sep 17 00:00:00 2001 From: vramik Date: Thu, 17 Dec 2015 23:20:37 +0100 Subject: [PATCH 04/24] eap6-adapter --- .../tests/adapters/eap6/pom.xml | 163 +++++++++++------- .../tests/adapters/pom.xml | 6 + 2 files changed, 111 insertions(+), 58 deletions(-) diff --git a/testsuite/integration-arquillian/tests/adapters/eap6/pom.xml b/testsuite/integration-arquillian/tests/adapters/eap6/pom.xml index 0026220951..d5549faf32 100644 --- a/testsuite/integration-arquillian/tests/adapters/eap6/pom.xml +++ b/testsuite/integration-arquillian/tests/adapters/eap6/pom.xml @@ -12,25 +12,19 @@ Adapter Tests on EAP 6 - ${containers.home}/jboss-eap-6.4 - ${containers.home}/keycloak-eap6-adapter-dist + ${containers.home} - - org.jboss.as - jboss-as-dist - ${jboss.version} - zip - - + + - org.keycloak - keycloak-eap6-adapter-dist - zip + org.jboss.as + jboss-as-arquillian-container-managed + 7.2.0.Final @@ -43,38 +37,6 @@ true - - org.apache.maven.plugins - maven-dependency-plugin - - - unpack-as7-and-adapter - generate-resources - - unpack - - - - - org.jboss.as - jboss-as-dist - ${jboss.version} - zip - ${containers.home} - - - org.keycloak - keycloak-eap6-adapter-dist - ${project.version} - zip - ${adapter.libs.eap6} - - - - - - - org.apache.maven.plugins maven-surefire-plugin @@ -82,7 +44,7 @@ true - ${app.server.eap6.home} + ${app.server.eap6.home}/jboss-eap-6.4 ${adapter.libs.eap6} @@ -91,6 +53,91 @@ + + prod + + + + org.apache.maven.plugins + maven-dependency-plugin + + + unpack-eap6-with-adapter + generate-resources + + unpack + + + + + org.keycloak + rh-sso-eap6-adapter + ${version.rh.soo} + zip + ${app.server.eap6.home} + + + + + + + + + + + community + + ${containers.home}/keycloak-eap6-adapter-dist + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + unpack-as7-and-adapter + generate-resources + + unpack + + + + + org.jboss.as + jboss-as-dist + ${jboss.version} + zip + ${containers.home} + + + org.keycloak + keycloak-eap6-adapter-dist + ${project.version} + zip + ${adapter.libs.eap6} + + + + + + + + + + + org.jboss.as + jboss-as-dist + ${jboss.version} + zip + + + org.keycloak + keycloak-eap6-adapter-dist + zip + + + adapter-libs-provided @@ -176,20 +223,20 @@ copy-resources - ${app.server.eap6.home}/standalone/configuration - - - src/main/keystore - - adapter.jks - keycloak.truststore - - - - + ${app.server.eap6.home}/standalone/configuration + + + src/main/keystore + + adapter.jks + keycloak.truststore + + + + jks truststore - + diff --git a/testsuite/integration-arquillian/tests/adapters/pom.xml b/testsuite/integration-arquillian/tests/adapters/pom.xml index 865f8fc4b7..55498bde5b 100644 --- a/testsuite/integration-arquillian/tests/adapters/pom.xml +++ b/testsuite/integration-arquillian/tests/adapters/pom.xml @@ -342,6 +342,12 @@ wildfly-relative + + app-server-eap6 + + eap6 + + app-server-wildfly From d5950a615ab6e7fb56f3cfd02189232efcfe26d5 Mon Sep 17 00:00:00 2001 From: vramik Date: Fri, 18 Dec 2015 00:15:03 +0100 Subject: [PATCH 05/24] exclude client tests from adapters --- testsuite/integration-arquillian/tests/base/pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/testsuite/integration-arquillian/tests/base/pom.xml b/testsuite/integration-arquillian/tests/base/pom.xml index 093459a6b6..bed012376b 100644 --- a/testsuite/integration-arquillian/tests/base/pom.xml +++ b/testsuite/integration-arquillian/tests/base/pom.xml @@ -74,6 +74,7 @@ **/console/**/*Test.java **/account/**/*Test.java + **/client/**/*Test.java From 6bb05bf3395ee4f6875b59bacd2c9dc171bea119 Mon Sep 17 00:00:00 2001 From: vramik Date: Fri, 18 Dec 2015 00:23:19 +0100 Subject: [PATCH 06/24] fix --- testsuite/integration-arquillian/tests/base/pom.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/testsuite/integration-arquillian/tests/base/pom.xml b/testsuite/integration-arquillian/tests/base/pom.xml index bed012376b..9c658fe778 100644 --- a/testsuite/integration-arquillian/tests/base/pom.xml +++ b/testsuite/integration-arquillian/tests/base/pom.xml @@ -14,6 +14,7 @@ - - + - @@ -48,6 +49,7 @@ ${exclude.console} ${exclude.account} + ${exclude.client} @@ -74,7 +76,7 @@ **/console/**/*Test.java **/account/**/*Test.java - **/client/**/*Test.java + **/client/**/*Test.java From 57ea0a3b42adacabaca3634c64d3792de76feb20 Mon Sep 17 00:00:00 2001 From: vramik Date: Fri, 18 Dec 2015 10:49:57 +0100 Subject: [PATCH 07/24] set default build to community eap6 --- .../tests/adapters/eap6/pom.xml | 49 +++++++++++++++++-- 1 file changed, 46 insertions(+), 3 deletions(-) diff --git a/testsuite/integration-arquillian/tests/adapters/eap6/pom.xml b/testsuite/integration-arquillian/tests/adapters/eap6/pom.xml index d5549faf32..88d74a0e93 100644 --- a/testsuite/integration-arquillian/tests/adapters/eap6/pom.xml +++ b/testsuite/integration-arquillian/tests/adapters/eap6/pom.xml @@ -13,10 +13,11 @@ ${containers.home} + ${containers.home}/keycloak-eap6-adapter-dist - @@ -26,6 +27,17 @@ jboss-as-arquillian-container-managed 7.2.0.Final + + org.jboss.as + jboss-as-dist + ${jboss.version} + zip + + + org.keycloak + keycloak-eap6-adapter-dist + zip + @@ -49,6 +61,37 @@ + + org.apache.maven.plugins + maven-dependency-plugin + + + unpack-eap6-with-adapter + generate-resources + + unpack + + + + + org.jboss.as + jboss-as-dist + ${jboss.version} + zip + ${containers.home} + + + org.keycloak + keycloak-eap6-adapter-dist + ${project.version} + zip + ${adapter.libs.eap6} + + + + + + @@ -84,7 +127,7 @@ - + adapter-libs-provided From 19471d07b8d8db5f08deb3b613db1f3c1c2d4e61 Mon Sep 17 00:00:00 2001 From: vramik Date: Fri, 18 Dec 2015 13:40:00 +0100 Subject: [PATCH 08/24] added support for set jdk for adapter container --- .../tests/adapters/eap6/pom.xml | 69 ++++++++----------- .../eap6/src/main/xslt/arquillian_jdk.xsl | 30 ++++++++ 2 files changed, 59 insertions(+), 40 deletions(-) create mode 100644 testsuite/integration-arquillian/tests/adapters/eap6/src/main/xslt/arquillian_jdk.xsl diff --git a/testsuite/integration-arquillian/tests/adapters/eap6/pom.xml b/testsuite/integration-arquillian/tests/adapters/eap6/pom.xml index 88d74a0e93..db372ef039 100644 --- a/testsuite/integration-arquillian/tests/adapters/eap6/pom.xml +++ b/testsuite/integration-arquillian/tests/adapters/eap6/pom.xml @@ -127,60 +127,49 @@ - + adapter-libs-provided diff --git a/testsuite/integration-arquillian/tests/adapters/eap6/src/main/xslt/arquillian_jdk.xsl b/testsuite/integration-arquillian/tests/adapters/eap6/src/main/xslt/arquillian_jdk.xsl new file mode 100644 index 0000000000..53d0b2a3e6 --- /dev/null +++ b/testsuite/integration-arquillian/tests/adapters/eap6/src/main/xslt/arquillian_jdk.xsl @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From c759719e959ba5b3daea1f49d2637c63f5c67c37 Mon Sep 17 00:00:00 2001 From: vramik Date: Fri, 18 Dec 2015 14:56:49 +0100 Subject: [PATCH 09/24] added support for set jdk for adapter container --- .../integration-arquillian/tests/adapters/eap6/pom.xml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/testsuite/integration-arquillian/tests/adapters/eap6/pom.xml b/testsuite/integration-arquillian/tests/adapters/eap6/pom.xml index db372ef039..7289cc6bb1 100644 --- a/testsuite/integration-arquillian/tests/adapters/eap6/pom.xml +++ b/testsuite/integration-arquillian/tests/adapters/eap6/pom.xml @@ -172,11 +172,16 @@ adapter-libs-provided - + + ${app.server.eap6.home} From efa112f82042e4bb8a6a743c4859109e7ca95e3c Mon Sep 17 00:00:00 2001 From: vramik Date: Mon, 4 Jan 2016 16:46:47 +0100 Subject: [PATCH 10/24] updated version of xml plugin, fix adapter-libs-provided profile in eap6 adapter --- testsuite/integration-arquillian/pom.xml | 2 +- .../tests/adapters/eap6/pom.xml | 20 ++++++++++++------- .../tests/adapters/pom.xml | 1 - 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/testsuite/integration-arquillian/pom.xml b/testsuite/integration-arquillian/pom.xml index e15c473d80..bcdc85803c 100644 --- a/testsuite/integration-arquillian/pom.xml +++ b/testsuite/integration-arquillian/pom.xml @@ -34,7 +34,7 @@ org.codehaus.mojo xml-maven-plugin - 1.0 + 1.0.1 org.apache.maven.plugins diff --git a/testsuite/integration-arquillian/tests/adapters/eap6/pom.xml b/testsuite/integration-arquillian/tests/adapters/eap6/pom.xml index 7289cc6bb1..11abbf17ff 100644 --- a/testsuite/integration-arquillian/tests/adapters/eap6/pom.xml +++ b/testsuite/integration-arquillian/tests/adapters/eap6/pom.xml @@ -14,6 +14,7 @@ ${containers.home} ${containers.home}/keycloak-eap6-adapter-dist + false @@ -98,6 +99,15 @@ prod + + + prod + true + + + + true + @@ -172,16 +182,11 @@ adapter-libs-provided - - + ${app.server.eap6.home} @@ -198,6 +203,7 @@ transform + ${skip.configure.adapter.subsystem} ${app.server.eap6.home}/standalone/configuration diff --git a/testsuite/integration-arquillian/tests/adapters/pom.xml b/testsuite/integration-arquillian/tests/adapters/pom.xml index 55498bde5b..5474ad9263 100644 --- a/testsuite/integration-arquillian/tests/adapters/pom.xml +++ b/testsuite/integration-arquillian/tests/adapters/pom.xml @@ -55,7 +55,6 @@ org.codehaus.mojo xml-maven-plugin - 1.0 add-app-server-to-arquillian-xml From 448a15b2ca84ae61b4dde956ba61979a81491ee5 Mon Sep 17 00:00:00 2001 From: vramik Date: Thu, 7 Jan 2016 18:58:32 +0100 Subject: [PATCH 11/24] install adapter via cli script from java code after start --- .../servers/wildfly/pom.xml | 2 - .../tests/adapters/as7/pom.xml | 69 +++++---- .../adapters/as7/src/main/xslt/arquillian.xsl | 2 + .../adapters/as7/src/main/xslt/standalone.xsl | 51 ------- .../tests/adapters/eap6/pom.xml | 83 +---------- .../eap6/src/main/xslt/standalone.xsl | 51 ------- .../tests/adapters/pom.xml | 8 +- .../tests/adapters/wildfly/pom.xml | 30 ---- .../tests/adapters/wildfly8/pom.xml | 30 ---- .../wildfly8/src/main/xslt/standalone.xsl | 51 ------- .../integration-arquillian/tests/base/pom.xml | 3 + .../arquillian/ContainersTestEnricher.java | 102 +++++++++---- .../adapter/AbstractAdapterTest.java | 18 +-- .../resources/adapter-test/demorealm.json | 135 ++++++++++++------ 14 files changed, 233 insertions(+), 402 deletions(-) delete mode 100644 testsuite/integration-arquillian/tests/adapters/as7/src/main/xslt/standalone.xsl delete mode 100644 testsuite/integration-arquillian/tests/adapters/eap6/src/main/xslt/standalone.xsl delete mode 100644 testsuite/integration-arquillian/tests/adapters/wildfly8/src/main/xslt/standalone.xsl diff --git a/testsuite/integration-arquillian/servers/wildfly/pom.xml b/testsuite/integration-arquillian/servers/wildfly/pom.xml index f30d6c26da..361073713e 100644 --- a/testsuite/integration-arquillian/servers/wildfly/pom.xml +++ b/testsuite/integration-arquillian/servers/wildfly/pom.xml @@ -273,7 +273,6 @@ maven-resources-plugin - 2.7 copy-keystore @@ -309,7 +308,6 @@ org.apache.maven.plugins maven-enforcer-plugin - 1.4 enforce-properties diff --git a/testsuite/integration-arquillian/tests/adapters/as7/pom.xml b/testsuite/integration-arquillian/tests/adapters/as7/pom.xml index f670ea3c0a..135c1bf180 100644 --- a/testsuite/integration-arquillian/tests/adapters/as7/pom.xml +++ b/testsuite/integration-arquillian/tests/adapters/as7/pom.xml @@ -15,22 +15,29 @@ 7.1.1.Final ${containers.home}/jboss-as-${as7.version} ${containers.home}/keycloak-as7-adapter-dist + 150 + + org.wildfly + wildfly-arquillian-container-managed + + + + org.jboss.as + jboss-as-arquillian-container-managed + ${as7.version} + org.jboss.as jboss-as-dist ${as7.version} zip - - org.wildfly - wildfly-arquillian-container-managed - org.keycloak - keycloak-eap6-adapter-dist + keycloak-as7-adapter-dist zip @@ -79,15 +86,36 @@ org.apache.maven.plugins maven-surefire-plugin - 2.18.1 true ${app.server.as7.home} ${adapter.libs.as7} + ${startup.timeout.sec} + ${adapter.as7.jdk7.path} + + + org.apache.maven.plugins + maven-enforcer-plugin + + + enforce-properties + + enforce + + + + + adapter.as7.jdk7.path + + + + + + @@ -102,35 +130,6 @@ ${app.server.as7.home} - - - - org.codehaus.mojo - xml-maven-plugin - - - configure-adapter-subsystem - process-resources - - transform - - - - - ${app.server.as7.home}/standalone/configuration - - standalone.xml - - src/main/xslt/standalone.xsl - ${app.server.as7.home}/standalone/configuration - - - - - - - - diff --git a/testsuite/integration-arquillian/tests/adapters/as7/src/main/xslt/arquillian.xsl b/testsuite/integration-arquillian/tests/adapters/as7/src/main/xslt/arquillian.xsl index 9ba1e9403f..1ffc5c347f 100644 --- a/testsuite/integration-arquillian/tests/adapters/as7/src/main/xslt/arquillian.xsl +++ b/testsuite/integration-arquillian/tests/adapters/as7/src/main/xslt/arquillian.xsl @@ -20,6 +20,8 @@ localhost remote ${app.server.management.port.jmx} + ${startup.timeout.sec} + ${adapter.as7.jdk7.path} diff --git a/testsuite/integration-arquillian/tests/adapters/as7/src/main/xslt/standalone.xsl b/testsuite/integration-arquillian/tests/adapters/as7/src/main/xslt/standalone.xsl deleted file mode 100644 index 5aac0f02d6..0000000000 --- a/testsuite/integration-arquillian/tests/adapters/as7/src/main/xslt/standalone.xsl +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/testsuite/integration-arquillian/tests/adapters/eap6/pom.xml b/testsuite/integration-arquillian/tests/adapters/eap6/pom.xml index 11abbf17ff..44fce9a8a9 100644 --- a/testsuite/integration-arquillian/tests/adapters/eap6/pom.xml +++ b/testsuite/integration-arquillian/tests/adapters/eap6/pom.xml @@ -12,17 +12,17 @@ Adapter Tests on EAP 6 - ${containers.home} + ${containers.home}/jboss-eap-6.4 ${containers.home}/keycloak-eap6-adapter-dist - false - + org.wildfly wildfly-arquillian-container-managed - --> - + + org.jboss.as jboss-as-arquillian-container-managed @@ -53,11 +53,10 @@ org.apache.maven.plugins maven-surefire-plugin - 2.18.1 true - ${app.server.eap6.home}/jboss-eap-6.4 + ${app.server.eap6.home} ${adapter.libs.eap6} @@ -97,46 +96,6 @@ - - prod - - - prod - true - - - - true - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - unpack-eap6-with-adapter - generate-resources - - unpack - - - - - org.keycloak - rh-sso-eap6-adapter - ${version.rh.soo} - zip - ${app.server.eap6.home} - - - - - - - - - adapter-jdk @@ -190,36 +149,6 @@ ${app.server.eap6.home} - - - - org.codehaus.mojo - xml-maven-plugin - - - configure-adapter-subsystem - process-resources - - transform - - - ${skip.configure.adapter.subsystem} - - - ${app.server.eap6.home}/standalone/configuration - - standalone.xml - - src/main/xslt/standalone.xsl - ${app.server.eap6.home}/standalone/configuration - - - - - - - - ssl diff --git a/testsuite/integration-arquillian/tests/adapters/eap6/src/main/xslt/standalone.xsl b/testsuite/integration-arquillian/tests/adapters/eap6/src/main/xslt/standalone.xsl deleted file mode 100644 index fb3612beff..0000000000 --- a/testsuite/integration-arquillian/tests/adapters/eap6/src/main/xslt/standalone.xsl +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/testsuite/integration-arquillian/tests/adapters/pom.xml b/testsuite/integration-arquillian/tests/adapters/pom.xml index 5474ad9263..5e215fb809 100644 --- a/testsuite/integration-arquillian/tests/adapters/pom.xml +++ b/testsuite/integration-arquillian/tests/adapters/pom.xml @@ -189,7 +189,6 @@ org.apache.maven.plugins maven-dependency-plugin - 2.10 example-wars @@ -384,6 +383,13 @@ **/adapter/**/*Test.java + + no-relative + + + **/adapter/**/WildflyRelative*Test.java + + diff --git a/testsuite/integration-arquillian/tests/adapters/wildfly/pom.xml b/testsuite/integration-arquillian/tests/adapters/wildfly/pom.xml index fbac8fe3c8..46224891cb 100644 --- a/testsuite/integration-arquillian/tests/adapters/wildfly/pom.xml +++ b/testsuite/integration-arquillian/tests/adapters/wildfly/pom.xml @@ -100,35 +100,6 @@ ${app.server.wildfly.home} - - - - org.codehaus.mojo - xml-maven-plugin - - - configure-adapter-subsystem - process-resources - - transform - - - - - ${app.server.wildfly.home}/standalone/configuration - - standalone.xml - - src/main/xslt/standalone.xsl - ${app.server.wildfly.home}/standalone/configuration - - - - - - - - ssl @@ -166,7 +137,6 @@ maven-resources-plugin - 2.7 copy-keystore diff --git a/testsuite/integration-arquillian/tests/adapters/wildfly8/pom.xml b/testsuite/integration-arquillian/tests/adapters/wildfly8/pom.xml index f6378e8242..2148e18015 100644 --- a/testsuite/integration-arquillian/tests/adapters/wildfly8/pom.xml +++ b/testsuite/integration-arquillian/tests/adapters/wildfly8/pom.xml @@ -79,7 +79,6 @@ org.apache.maven.plugins maven-surefire-plugin - 2.18.1 true @@ -102,35 +101,6 @@ ${app.server.wildfly.home} - - - - org.codehaus.mojo - xml-maven-plugin - - - configure-adapter-subsystem - process-resources - - transform - - - - - ${app.server.wildfly.home}/standalone/configuration - - standalone.xml - - src/main/xslt/standalone.xsl - ${app.server.wildfly.home}/standalone/configuration - - - - - - - - diff --git a/testsuite/integration-arquillian/tests/adapters/wildfly8/src/main/xslt/standalone.xsl b/testsuite/integration-arquillian/tests/adapters/wildfly8/src/main/xslt/standalone.xsl deleted file mode 100644 index 364d8037c4..0000000000 --- a/testsuite/integration-arquillian/tests/adapters/wildfly8/src/main/xslt/standalone.xsl +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/testsuite/integration-arquillian/tests/base/pom.xml b/testsuite/integration-arquillian/tests/base/pom.xml index 9c658fe778..c1e5e9c189 100644 --- a/testsuite/integration-arquillian/tests/base/pom.xml +++ b/testsuite/integration-arquillian/tests/base/pom.xml @@ -15,6 +15,7 @@ - - - + - @@ -50,6 +51,7 @@ ${exclude.console} ${exclude.account} ${exclude.client} + ${exclude.migration} @@ -77,6 +79,7 @@ **/console/**/*Test.java **/account/**/*Test.java **/client/**/*Test.java + **/migration/**/*Test.java diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/ContainersTestEnricher.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/ContainersTestEnricher.java index 50beaa69e0..4a7473d333 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/ContainersTestEnricher.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/ContainersTestEnricher.java @@ -1,10 +1,14 @@ package org.keycloak.testsuite.arquillian; +import java.io.BufferedReader; import java.io.File; import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; import java.net.MalformedURLException; import java.net.URL; import java.util.LinkedList; +import java.util.concurrent.TimeUnit; import org.apache.commons.io.FileUtils; import org.jboss.arquillian.container.spi.Container; import org.jboss.arquillian.container.spi.ContainerRegistry; @@ -19,6 +23,7 @@ import org.jboss.arquillian.core.api.annotation.Observes; import org.jboss.arquillian.test.spi.annotation.ClassScoped; import org.jboss.arquillian.test.spi.annotation.SuiteScoped; import org.jboss.arquillian.container.spi.event.container.AfterStart; +import org.jboss.arquillian.container.spi.event.container.BeforeStart; import org.jboss.arquillian.test.spi.event.suite.BeforeClass; import org.jboss.arquillian.test.spi.event.suite.BeforeSuite; import org.jboss.logging.Logger; @@ -83,7 +88,7 @@ public class ContainersTestEnricher { } init = true; } - + /* * non-javadoc * @@ -103,43 +108,92 @@ public class ContainersTestEnricher { * After start container. Server logs are checked (in case jboss based container). * In case of migration scenario: previous container is stopped. */ - public void afterStart(@Observes AfterStart event) throws IOException { - if (System.getProperty("check.server.log", "true").equals("true")) { - checkServerLog(); + public void afterStart(@Observes AfterStart event) throws IOException, InterruptedException { + Container container = containers.pollFirst(); + String jbossHomePath = null; + + if (isJBossBased(container)) { + jbossHomePath = container.getContainerConfiguration().getContainerProperties().get("jbossHome"); + log.debug("jbossHome: " + jbossHomePath + "\n"); + + if (System.getProperty("check.server.log", "true").equals("true")) { + checkServerLog(jbossHomePath); + } } if (migrationTests && !alreadyStopped) { log.info("\n\n### Stopping keycloak " + System.getProperty("version", "- previous") + " ###\n"); stopSuiteContainers.fire(new StopSuiteContainers()); log.info("\n\n### Starting keycloak current version ###\n"); + alreadyStopped = true; } - alreadyStopped = true; + + if (isJBossBased(container) && container.getName().startsWith("app-server")) { + log.info("Installing adapter to app server via cli script"); + String jbossCliPath = jbossHomePath + "/bin/jboss-cli.sh"; + String scriptPathArg = "--file=" + jbossHomePath + "/bin/adapter-install.cli"; + String managementPort = container.getContainerConfiguration().getContainerProperties().get("managementPort"); + String controllerArg = "--controller=localhost:" + managementPort; + + execCommand(new String[]{"/bin/sh", jbossCliPath, "--connect", scriptPathArg, controllerArg}); + log.debug("Restarting container"); + execCommand(new String[]{"/bin/sh", jbossCliPath, "--connect", "--command=:reload", controllerArg}); + } + } + + private void execCommand(String... command) throws IOException, InterruptedException { + Process process = Runtime.getRuntime().exec(command); + + printOutput(process.getInputStream()); + + if (process.waitFor(10, TimeUnit.SECONDS)) { + if (process.exitValue() != 0) { + log.error("Std Error:"); + printOutput(process.getErrorStream()); + throw new RuntimeException("Adapter installation failed."); + } + } else { + process.destroy(); + throw new RuntimeException("Timeout after 10 seconds."); + } + } + + private void printOutput(InputStream is) throws IOException { + BufferedReader reader = new BufferedReader(new InputStreamReader(is)); + StringBuilder builder = new StringBuilder(); + while (reader.ready()) { + builder.append(reader.readLine()); + } + log.info(builder); + } + + private boolean isJBossBased(Container container) { + if (container == null) { + return false; + } + return container.getName().matches("a.*-server-wildfly") + || container.getName().matches("a.*-server-eap.") + || container.getName().equals("app-server-as7"); } /* * non-javadoc * - * check server logs (in case jboss based container) whether there are no ERRORs or SEVEREs + * check server logs whether there are no ERRORs or SEVEREs */ - private void checkServerLog() throws IOException { - Container container = containers.removeFirst(); - if (container.getName().equals("auth-server-wildfly") - || container.getName().matches("auth-server-eap.")) { - String jbossHomePath = container.getContainerConfiguration().getContainerProperties().get("jbossHome"); - log.debug("jbossHome: " + jbossHomePath + "\n"); + private void checkServerLog(String jbossHomePath) throws IOException { + File serverLog = new File(jbossHomePath + "/standalone/log/server.log"); + String serverLogContent = FileUtils.readFileToString(serverLog); - String serverLogContent = FileUtils.readFileToString(new File(jbossHomePath + "/standalone/log/server.log")); + boolean containsError + = serverLogContent.contains("ERROR") + || serverLogContent.contains("SEVERE") + || serverLogContent.contains("Exception "); + //There is expected string "Exception" in server log: Adding provider + //singleton org.keycloak.services.resources.ModelExceptionMapper - boolean containsError - = serverLogContent.contains("ERROR") - || serverLogContent.contains("SEVERE") - || serverLogContent.contains("Exception "); - //There is expected string "Exception" in server log: Adding provider - //singleton org.keycloak.services.resources.ModelExceptionMapper - - if (containsError) { - throw new RuntimeException(container.getName() + ": Server log contains ERROR."); - } + if (containsError) { + throw new RuntimeException(serverLog.getPath() + " contains ERROR."); } } @@ -154,9 +208,7 @@ public class ContainersTestEnricher { appServerQualifier = getAppServerQualifier(testClass); if (!controller.isStarted(appServerQualifier)) { - log.info("\nSTARTING APP SERVER: " + appServerQualifier + "\n"); controller.start(appServerQualifier); - log.info(""); } initializeTestContext(testClass); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/AbstractAdapterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/AbstractAdapterTest.java index 056a489b19..5a6c6065d7 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/AbstractAdapterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/AbstractAdapterTest.java @@ -79,14 +79,16 @@ public abstract class AbstractAdapterTest extends AbstractAuthTest { } protected void modifyClientUrls(RealmRepresentation realm, String regex, String replacement) { - for (ClientRepresentation client : realm.getClients()) { - String baseUrl = client.getBaseUrl(); - if (baseUrl != null) { - client.setBaseUrl(baseUrl.replaceAll(regex, replacement)); - } - String adminUrl = client.getAdminUrl(); - if (adminUrl != null) { - client.setAdminUrl(adminUrl.replaceAll(regex, replacement)); + if (realm.getClients() != null) { + for (ClientRepresentation client : realm.getClients()) { + String baseUrl = client.getBaseUrl(); + if (baseUrl != null) { + client.setBaseUrl(baseUrl.replaceAll(regex, replacement)); + } + String adminUrl = client.getAdminUrl(); + if (adminUrl != null) { + client.setAdminUrl(adminUrl.replaceAll(regex, replacement)); + } } } } diff --git a/testsuite/integration-arquillian/tests/base/src/test/resources/adapter-test/demorealm.json b/testsuite/integration-arquillian/tests/base/src/test/resources/adapter-test/demorealm.json index 5b82ec6387..70dc85aae4 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/resources/adapter-test/demorealm.json +++ b/testsuite/integration-arquillian/tests/base/src/test/resources/adapter-test/demorealm.json @@ -21,7 +21,7 @@ { "type" : "password", "value" : "password" } ], - "realmRoles": [ "user", "admin" ], + "realmRoles": [ "user" ], "applicationRoles": { "account": [ "manage-account" ] } @@ -34,12 +34,36 @@ "lastName": "Posolda", "credentials" : [ { "type" : "password", - "value" : "password" } + "value" : "password" } ], "realmRoles": [ "user" ], "applicationRoles": { "account": [ "manage-account" ] } + }, + { + "username" : "topGroupUser", + "enabled": true, + "email" : "top@redhat.com", + "credentials" : [ + { "type" : "password", + "value" : "password" } + ], + "groups": [ + "/top" + ] + }, + { + "username" : "level2GroupUser", + "enabled": true, + "email" : "level2@redhat.com", + "credentials" : [ + { "type" : "password", + "value" : "password" } + ], + "groups": [ + "/top/level2" + ] } ], "roles" : { @@ -54,6 +78,29 @@ } ] }, + "groups" : [ + { + "name": "top", + "attributes": { + "topAttribute": ["true"] + + }, + "realmRoles": ["user"], + "clientRoles": { + "account": ["manage-account"] + }, + "subGroups": [ + { + "name": "level2", + "realmRoles": ["admin"], + "attributes": { + "level2Attribute": ["true"] + + } + } + ] + } + ], "scopeMappings": [ { "client": "third-party", @@ -69,38 +116,39 @@ } ], - "clients": [ + "applications": [ { - "clientId": "customer-portal", + "name": "customer-portal", "enabled": true, - "adminUrl": "/customer-portal", - "baseUrl": "/customer-portal", + "directAccessGrantsEnabled": true, + "adminUrl": "http://localhost:8081/customer-portal", + "baseUrl": "http://localhost:8081/customer-portal", "redirectUris": [ - "/customer-portal/*" + "http://localhost:8081/customer-portal/*" ], "secret": "password" }, { - "clientId": "customer-cookie-portal", + "name": "customer-cookie-portal", "enabled": true, - "baseUrl": "/customer-cookie-portal", + "baseUrl": "http://localhost:8081/customer-cookie-portal", "redirectUris": [ - "/customer-cookie-portal/*" + "http://localhost:8081/customer-cookie-portal/*" ], "secret": "password" }, { - "clientId": "customer-portal-js", + "name": "customer-portal-js", "enabled": true, "publicClient": true, - "adminUrl": "/customer-portal-js", - "baseUrl": "/customer-portal-js", + "adminUrl": "http://localhost:8081/customer-portal-js", + "baseUrl": "http://localhost:8081/customer-portal-js", "redirectUris": [ - "/customer-portal-js/*" + "http://localhost:8080/customer-portal-js/*" ] }, { - "clientId": "customer-portal-cli", + "name": "customer-portal-cli", "enabled": true, "publicClient": true, "redirectUris": [ @@ -109,51 +157,56 @@ ] }, { - "clientId": "product-portal", + "name": "product-portal", "enabled": true, - "adminUrl": "/product-portal", - "baseUrl": "/product-portal", + "adminUrl": "http://localhost:8081/product-portal", + "baseUrl": "http://localhost:8081/product-portal", "redirectUris": [ - "/product-portal/*" + "http://localhost:8081/product-portal/*" ], "secret": "password" }, { - "clientId": "secure-portal", + "name": "secure-portal", "enabled": true, - "adminUrl": "/secure-portal", - "baseUrl": "/secure-portal", + "adminUrl": "http://localhost:8081/secure-portal", + "baseUrl": "http://localhost:8081/secure-portal", + "clientAuthenticatorType": "client-jwt", "redirectUris": [ - "/secure-portal/*" + "http://localhost:8081/secure-portal/*" + ], + "attributes": { + "jwt.credential.certificate": "MIICnTCCAYUCBgFPPLDaTzANBgkqhkiG9w0BAQsFADASMRAwDgYDVQQDDAdjbGllbnQxMB4XDTE1MDgxNzE3MjI0N1oXDTI1MDgxNzE3MjQyN1owEjEQMA4GA1UEAwwHY2xpZW50MTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIUjjgv+V3s96O+Za9002Lp/trtGuHBeaeVL9dFKMKzO2MPqdRmHB4PqNlDdd28Rwf5Xn6iWdFpyUKOnI/yXDLhdcuFpR0sMNK/C9Lt+hSpPFLuzDqgtPgDotlMxiHIWDOZ7g9/gPYNXbNvjv8nSiyqoguoCQiiafW90bPHsiVLdP7ZIUwCcfi1qQm7FhxRJ1NiW5dvUkuCnnWEf0XR+Wzc5eC9EgB0taLFiPsSEIlWMm5xlahYyXkPdNOqZjiRnrTWm5Y4uk8ZcsD/KbPTf/7t7cQXipVaswgjdYi1kK2/zRwOhg1QwWFX/qmvdd+fLxV0R6VqRDhn7Qep2cxwMxLsCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAKE6OA46sf20bz8LZPoiNsqRwBUDkaMGXfnob7s/hJZIIwDEx0IAQ3uKsG7q9wb+aA6s+v7S340zb2k3IxuhFaHaZpAd4CyR5cn1FHylbzoZ7rI/3ASqHDqpljdJaFqPH+m7nZWtyDvtZf+gkZ8OjsndwsSBK1d/jMZPp29qYbl1+XfO7RCp/jDqro/R3saYFaIFiEZPeKn1hUJn6BO48vxH1xspSu9FmlvDOEAOz4AuM58z4zRMP49GcFdCWr1wkonJUHaSptJaQwmBwLFUkCbE5I1ixGMb7mjEud6Y5jhfzJiZMo2U8RfcjNbrN0diZl3jB6LQIwESnhYSghaTjNQ==" + } + }, + { + "name": "session-portal", + "enabled": true, + "adminUrl": "http://localhost:8081/session-portal", + "baseUrl": "http://localhost:8081/session-portal", + "redirectUris": [ + "http://localhost:8081/session-portal/*" ], "secret": "password" }, { - "clientId": "session-portal", + "name": "input-portal", "enabled": true, - "adminUrl": "/session-portal", - "baseUrl": "/session-portal", + "adminUrl": "http://localhost:8081/input-portal", + "baseUrl": "http://localhost:8081/input-portal", "redirectUris": [ - "/session-portal/*" + "http://localhost:8081/input-portal/*" ], "secret": "password" - }, + } + ], + "oauthClients": [ { - "clientId": "input-portal", - "enabled": true, - "adminUrl": "/input-portal", - "baseUrl": "/input-portal", - "redirectUris": [ - "/input-portal/*" - ], - "secret": "password" - }, - { - "clientId": "third-party", + "name": "third-party", "enabled": true, "redirectUris": [ - "/oauth-client/*", - "/oauth-client-cdi/*" + "http://localhost:8081/oauth-client/*", + "http://localhost:8081/oauth-client-cdi/*" ], "secret": "password" } From 48be6070d02809aa5b4a7b98fec598bf3b2a2a03 Mon Sep 17 00:00:00 2001 From: vramik Date: Fri, 8 Jan 2016 11:13:59 +0100 Subject: [PATCH 12/24] add support for prod bits --- testsuite/integration-arquillian/pom.xml | 4 --- .../servers/eap7/assembly.xml | 4 +-- .../servers/eap7/pom.xml | 28 +++++++++++++++---- .../tests/adapters/eap6/pom.xml | 8 +++--- .../integration-arquillian/tests/pom.xml | 23 +++++++++++++-- 5 files changed, 50 insertions(+), 17 deletions(-) diff --git a/testsuite/integration-arquillian/pom.xml b/testsuite/integration-arquillian/pom.xml index bcdc85803c..eaafb033ad 100644 --- a/testsuite/integration-arquillian/pom.xml +++ b/testsuite/integration-arquillian/pom.xml @@ -14,10 +14,6 @@ pom Keycloak Integration TestSuite with Arquillian - - 7.0.0.DR2 - - servers tests diff --git a/testsuite/integration-arquillian/servers/eap7/assembly.xml b/testsuite/integration-arquillian/servers/eap7/assembly.xml index e6fb9a512c..5fcf9890f2 100644 --- a/testsuite/integration-arquillian/servers/eap7/assembly.xml +++ b/testsuite/integration-arquillian/servers/eap7/assembly.xml @@ -11,14 +11,14 @@ ${keycloak.server.home} - rh-sso-${version.rh.soo} + keycloak-${version.eap6.server.dist} **/*.sh ${keycloak.server.home} - rh-sso-${version.rh.soo} + keycloak-${version.eap6.server.dist} **/*.sh diff --git a/testsuite/integration-arquillian/servers/eap7/pom.xml b/testsuite/integration-arquillian/servers/eap7/pom.xml index ba7ec2db9d..cc02cc2b81 100644 --- a/testsuite/integration-arquillian/servers/eap7/pom.xml +++ b/testsuite/integration-arquillian/servers/eap7/pom.xml @@ -51,13 +51,32 @@ org.keycloak - rh-sso - ${version.rh.soo} + keycloak-eap6-server-dist + ${version.eap6.server.dist} zip + + org.apache.maven.plugins + maven-enforcer-plugin + + + enforce-properties + + enforce + + + + + version.eap6.server.dist + + + + + + org.apache.maven.plugins maven-dependency-plugin @@ -72,8 +91,8 @@ org.keycloak - rh-sso - ${version.rh.soo} + keycloak-eap6-server-dist + ${version.eap6.server.dist} zip ${project.build.directory}/unpacked @@ -96,7 +115,6 @@ org.apache.maven.plugins maven-enforcer-plugin - 1.4 enforce-properties diff --git a/testsuite/integration-arquillian/tests/adapters/eap6/pom.xml b/testsuite/integration-arquillian/tests/adapters/eap6/pom.xml index 44fce9a8a9..b9075cffa4 100644 --- a/testsuite/integration-arquillian/tests/adapters/eap6/pom.xml +++ b/testsuite/integration-arquillian/tests/adapters/eap6/pom.xml @@ -14,14 +14,15 @@ ${containers.home}/jboss-eap-6.4 ${containers.home}/keycloak-eap6-adapter-dist + ${project.version} - + org.jboss.as @@ -83,7 +84,7 @@ org.keycloak keycloak-eap6-adapter-dist - ${project.version} + ${version.adapter.dist} zip ${adapter.libs.eap6} @@ -186,7 +187,6 @@ maven-resources-plugin - 2.7 copy-keystore diff --git a/testsuite/integration-arquillian/tests/pom.xml b/testsuite/integration-arquillian/tests/pom.xml index 5c56d19058..57d09f0c33 100644 --- a/testsuite/integration-arquillian/tests/pom.xml +++ b/testsuite/integration-arquillian/tests/pom.xml @@ -469,7 +469,7 @@ 7.2.0.Final - + **/client/**/*Test.java + + adapters-only diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/ContainersTestEnricher.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/ContainersTestEnricher.java index e6f3c153c1..2512d1c321 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/ContainersTestEnricher.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/ContainersTestEnricher.java @@ -23,7 +23,6 @@ import org.jboss.arquillian.core.api.annotation.Observes; import org.jboss.arquillian.test.spi.annotation.ClassScoped; import org.jboss.arquillian.test.spi.annotation.SuiteScoped; import org.jboss.arquillian.container.spi.event.container.AfterStart; -import org.jboss.arquillian.container.spi.event.container.BeforeStart; import org.jboss.arquillian.test.spi.event.suite.BeforeClass; import org.jboss.arquillian.test.spi.event.suite.BeforeSuite; import org.jboss.logging.Logger; @@ -35,6 +34,7 @@ import org.keycloak.testsuite.util.OAuthClient; import static org.keycloak.testsuite.auth.page.AuthRealm.ADMIN; import static org.keycloak.testsuite.auth.page.AuthRealm.MASTER; +import static org.keycloak.testsuite.util.WaitUtils.pause; /** * @@ -78,7 +78,10 @@ public class ContainersTestEnricher { private ContainerController controller; private LinkedList containers; + private String jbossHomePath; private final boolean migrationTests = System.getProperty("migration", "false").equals("true"); + private final boolean skipInstallAdapters = System.getProperty("skip.install.adapters", "false").equals("true"); + private boolean alreadyInstalled = false; private boolean alreadyStopped = false; private boolean init = false; @@ -110,16 +113,12 @@ public class ContainersTestEnricher { */ public void afterStart(@Observes AfterStart event) throws IOException, InterruptedException { Container container = containers.pollFirst(); - String jbossHomePath = null; if (isJBossBased(container)) { jbossHomePath = container.getContainerConfiguration().getContainerProperties().get("jbossHome"); log.debug("jbossHome: " + jbossHomePath + "\n"); - - if (System.getProperty("check.server.log", "true").equals("true")) { - checkServerLog(jbossHomePath); - } } + checkServerLog(jbossHomePath); if (migrationTests && !alreadyStopped) { log.info("\n\n### Stopping keycloak " + System.getProperty("version", "- previous") + " ###\n"); @@ -127,44 +126,52 @@ public class ContainersTestEnricher { log.info("\n\n### Starting keycloak current version ###\n"); alreadyStopped = true; } - - if (isJBossBased(container) && container.getName().startsWith("app-server")) { - log.info("Installing adapter to app server via cli script"); + + if (!alreadyInstalled && !skipInstallAdapters && isJBossBased(container)) { String jbossCliPath = jbossHomePath + "/bin/jboss-cli.sh"; - String scriptPathArg = "--file=" + jbossHomePath + "/bin/adapter-install.cli"; + String adapterScriptPathArg = "--file=" + jbossHomePath + "/bin/adapter-install.cli"; + String samlAdapterScriptPathArg = "--file=" + jbossHomePath + "/bin/adapter-install-saml.cli"; String managementPort = container.getContainerConfiguration().getContainerProperties().get("managementPort"); String controllerArg = "--controller=localhost:" + managementPort; - execCommand(new String[]{"/bin/sh", jbossCliPath, "--connect", scriptPathArg, controllerArg}); - log.debug("Restarting container"); + log.info("Installing adapter to app server via cli script"); + execCommand(new String[]{"/bin/sh", jbossCliPath, "--connect", adapterScriptPathArg, controllerArg}); + log.info("Installing saml adapter to app server via cli script"); + execCommand(new String[]{"/bin/sh", jbossCliPath, "--connect", samlAdapterScriptPathArg, controllerArg}); + log.info("Restarting container"); execCommand(new String[]{"/bin/sh", jbossCliPath, "--connect", "--command=:reload", controllerArg}); + pause(5000); + log.info("Container restarted"); + checkServerLog(jbossHomePath); + if (container.getName().startsWith("app-server")) { + alreadyInstalled = true; + } } } private void execCommand(String... command) throws IOException, InterruptedException { Process process = Runtime.getRuntime().exec(command); - printOutput(process.getInputStream()); - if (process.waitFor(10, TimeUnit.SECONDS)) { if (process.exitValue() != 0) { - log.error("Std Error:"); - printOutput(process.getErrorStream()); - throw new RuntimeException("Adapter installation failed."); + throw new RuntimeException("Adapter installation failed. Process exitValue: " + + process.exitValue() + "; \n" + getOutput(process.getErrorStream()) + + ""); } + log.debug("process.isAlive(): " + process.isAlive()); } else { - process.destroy(); + process.destroyForcibly(); throw new RuntimeException("Timeout after 10 seconds."); } } - private void printOutput(InputStream is) throws IOException { + private String getOutput(InputStream is) throws IOException { BufferedReader reader = new BufferedReader(new InputStreamReader(is)); StringBuilder builder = new StringBuilder(); while (reader.ready()) { builder.append(reader.readLine()); } - log.info(builder); + return builder.toString(); } private boolean isJBossBased(Container container) { @@ -182,19 +189,22 @@ public class ContainersTestEnricher { * check server logs whether there are no ERRORs or SEVEREs */ private void checkServerLog(String jbossHomePath) throws IOException { - File serverLog = new File(jbossHomePath + "/standalone/log/server.log"); - String serverLogContent = FileUtils.readFileToString(serverLog); + if (jbossHomePath != null && System.getProperty("check.server.log", "true").equals("true")) { + File serverLog = new File(jbossHomePath + "/standalone/log/server.log"); + String serverLogContent = FileUtils.readFileToString(serverLog); - boolean containsError - = serverLogContent.contains("ERROR") - || serverLogContent.contains("SEVERE") - || serverLogContent.contains("Exception "); - //There is expected string "Exception" in server log: Adding provider - //singleton org.keycloak.services.resources.ModelExceptionMapper + boolean containsError + = serverLogContent.contains("ERROR") + || serverLogContent.contains("SEVERE") + || serverLogContent.contains("Exception "); + //There is expected string "Exception" in server log: Adding provider + //singleton org.keycloak.services.resources.ModelExceptionMapper - if (containsError) { - throw new RuntimeException(serverLog.getPath() + " contains ERROR."); - } + if (containsError) { + throw new RuntimeException(serverLog.getPath() + " contains ERROR."); + } + log.info(serverLog.getPath() + " doesn't contain Error"); + } } public void beforeSuite(@Observes BeforeSuite event) { diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/SuiteContext.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/SuiteContext.java index 589c316211..b99d6b3b45 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/SuiteContext.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/SuiteContext.java @@ -10,24 +10,14 @@ import static org.keycloak.testsuite.util.MailServerConfiguration.*; */ public final class SuiteContext { - private boolean adminPasswordUpdated; private final Map smtpServer = new HashMap<>(); public SuiteContext() { - this.adminPasswordUpdated = false; smtpServer.put("from", FROM); smtpServer.put("host", HOST); smtpServer.put("port", PORT); } - public boolean isAdminPasswordUpdated() { - return adminPasswordUpdated; - } - - public void setAdminPasswordUpdated(boolean adminPasswordUpdated) { - this.adminPasswordUpdated = adminPasswordUpdated; - } - public Map getSmtpServer() { return smtpServer; } diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/AbstractKeycloakTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/AbstractKeycloakTest.java index 13ec96e4d6..9400f77adf 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/AbstractKeycloakTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/AbstractKeycloakTest.java @@ -25,7 +25,6 @@ import org.keycloak.testsuite.util.OAuthClient; import org.openqa.selenium.WebDriver; import org.keycloak.testsuite.auth.page.AuthServer; import org.keycloak.testsuite.auth.page.AuthServerContextRoot; -import static org.keycloak.testsuite.util.URLAssert.*; import org.keycloak.testsuite.auth.page.AuthRealm; import static org.keycloak.testsuite.auth.page.AuthRealm.ADMIN; import static org.keycloak.testsuite.auth.page.AuthRealm.MASTER; @@ -90,12 +89,6 @@ public abstract class AbstractKeycloakTest { driverSettings(); - if (!suiteContext.isAdminPasswordUpdated()) { - log.debug("updating admin password"); - updateMasterAdminPassword(); - suiteContext.setAdminPasswordUpdated(true); - } - importTestRealms(); } @@ -106,13 +99,6 @@ public abstract class AbstractKeycloakTest { Timer.printStats(); } - private void updateMasterAdminPassword() { - welcomePage.navigateTo(); - if (!welcomePage.isPasswordSet()) { - welcomePage.setPassword("admin", "admin"); - } - } - public void deleteAllCookiesForMasterRealm() { masterRealmPage.navigateTo(); log.debug("deleting cookies in master realm"); diff --git a/testsuite/integration-arquillian/tests/base/src/test/resources/keycloak-add-user.json b/testsuite/integration-arquillian/tests/base/src/test/resources/keycloak-add-user.json index 635f144a8e..60c0f098d1 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/resources/keycloak-add-user.json +++ b/testsuite/integration-arquillian/tests/base/src/test/resources/keycloak-add-user.json @@ -5,12 +5,11 @@ "enabled" : true, "credentials" : [ { "type" : "password", - "hashedSaltedValue" : "6K5rvcPu3dXndZOhpzLAVbFtcdlUhbGCrUyV0NNzeS61IdhMpjH8Mf4y/Ag/vHZkw4Ayvtvb9/1iMNOzxR0M6g==", - "salt" : "/6M1jTMUB0uR8EOkksFn/A==", + "hashedSaltedValue" : "dqalJHLkWhUJZO/q6+z1fvXOohTcGCXcvoU8xCEyvTxGN4wmLx7DtyhKuefggh6Bkx1I2eBTEX4tiWggwyXMDw==", + "salt" : "3fBAt5GAGGxFrV9fznpZHQ==", "hashIterations" : 100000, "algorithm" : "pbkdf2" } ], "realmRoles" : [ "admin" ] - } ], - "identityFederationEnabled" : false + } ] } ] \ No newline at end of file diff --git a/testsuite/integration-arquillian/tests/pom.xml b/testsuite/integration-arquillian/tests/pom.xml index fbc4914bb4..d40218b741 100644 --- a/testsuite/integration-arquillian/tests/pom.xml +++ b/testsuite/integration-arquillian/tests/pom.xml @@ -41,6 +41,7 @@ 2.1.1 true true + true @@ -95,6 +96,7 @@ ${auth.server.ssl.required} ${startup.timeout.sec} ${project.build.directory}/undertow-configuration + ${skip.install.adapters} @@ -152,6 +154,7 @@ + org.apache.maven.plugins maven-resources-plugin @@ -416,6 +419,7 @@ 300 ${containers.home}/keycloak-${project.version} + ${keycloak.home}/standalone/configuration @@ -448,7 +452,7 @@ copy-resources - ${keycloak.home}/standalone/configuration + ${jboss.server.config.dir} src/test/resources @@ -512,6 +516,7 @@ 300 ${containers.home}/keycloak-${version.eap6.server.dist} + ${keycloak.home}/standalone/configuration @@ -570,7 +575,7 @@ copy-resources - ${keycloak.home}/standalone/configuration + ${jboss.server.config.dir} src/test/resources From a2f5d46764ede25a5eae4809720aa4b1fcae5554 Mon Sep 17 00:00:00 2001 From: Vlasta Ramik Date: Tue, 12 Jan 2016 14:59:21 +0100 Subject: [PATCH 18/24] add support for firefox_binary for second browser --- .../tests/base/src/test/resources/arquillian.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/testsuite/integration-arquillian/tests/base/src/test/resources/arquillian.xml b/testsuite/integration-arquillian/tests/base/src/test/resources/arquillian.xml index 8f73893cbc..60b3ceb4b2 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/resources/arquillian.xml +++ b/testsuite/integration-arquillian/tests/base/src/test/resources/arquillian.xml @@ -19,6 +19,7 @@ ${browser} + ${firefox_binary} From 52588bb25f3db70a9383852fbe28fb4b68ec807f Mon Sep 17 00:00:00 2001 From: Vlasta Ramik Date: Tue, 12 Jan 2016 15:13:59 +0100 Subject: [PATCH 19/24] fixed adapter dependencies for eap6 and as7 --- .../tests/adapters/as7/pom.xml | 6 - .../tests/adapters/eap6/pom.xml | 8 +- .../arquillian/ContainersTestEnricher.java | 111 +++++++++--------- 3 files changed, 61 insertions(+), 64 deletions(-) diff --git a/testsuite/integration-arquillian/tests/adapters/as7/pom.xml b/testsuite/integration-arquillian/tests/adapters/as7/pom.xml index b63ae88213..88e4732302 100644 --- a/testsuite/integration-arquillian/tests/adapters/as7/pom.xml +++ b/testsuite/integration-arquillian/tests/adapters/as7/pom.xml @@ -23,12 +23,6 @@ org.wildfly wildfly-arquillian-container-managed - - - org.jboss.as - jboss-as-arquillian-container-managed - ${as7.version} - org.jboss.as jboss-as-dist diff --git a/testsuite/integration-arquillian/tests/adapters/eap6/pom.xml b/testsuite/integration-arquillian/tests/adapters/eap6/pom.xml index cc82d36128..c74baa64a3 100644 --- a/testsuite/integration-arquillian/tests/adapters/eap6/pom.xml +++ b/testsuite/integration-arquillian/tests/adapters/eap6/pom.xml @@ -19,16 +19,16 @@ - + - + org.jboss.as jboss-as-dist diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/ContainersTestEnricher.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/ContainersTestEnricher.java index 2512d1c321..b2175d32a9 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/ContainersTestEnricher.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/ContainersTestEnricher.java @@ -127,60 +127,7 @@ public class ContainersTestEnricher { alreadyStopped = true; } - if (!alreadyInstalled && !skipInstallAdapters && isJBossBased(container)) { - String jbossCliPath = jbossHomePath + "/bin/jboss-cli.sh"; - String adapterScriptPathArg = "--file=" + jbossHomePath + "/bin/adapter-install.cli"; - String samlAdapterScriptPathArg = "--file=" + jbossHomePath + "/bin/adapter-install-saml.cli"; - String managementPort = container.getContainerConfiguration().getContainerProperties().get("managementPort"); - String controllerArg = "--controller=localhost:" + managementPort; - - log.info("Installing adapter to app server via cli script"); - execCommand(new String[]{"/bin/sh", jbossCliPath, "--connect", adapterScriptPathArg, controllerArg}); - log.info("Installing saml adapter to app server via cli script"); - execCommand(new String[]{"/bin/sh", jbossCliPath, "--connect", samlAdapterScriptPathArg, controllerArg}); - log.info("Restarting container"); - execCommand(new String[]{"/bin/sh", jbossCliPath, "--connect", "--command=:reload", controllerArg}); - pause(5000); - log.info("Container restarted"); - checkServerLog(jbossHomePath); - if (container.getName().startsWith("app-server")) { - alreadyInstalled = true; - } - } - } - - private void execCommand(String... command) throws IOException, InterruptedException { - Process process = Runtime.getRuntime().exec(command); - - if (process.waitFor(10, TimeUnit.SECONDS)) { - if (process.exitValue() != 0) { - throw new RuntimeException("Adapter installation failed. Process exitValue: " - + process.exitValue() + "; \n" + getOutput(process.getErrorStream()) - + ""); - } - log.debug("process.isAlive(): " + process.isAlive()); - } else { - process.destroyForcibly(); - throw new RuntimeException("Timeout after 10 seconds."); - } - } - - private String getOutput(InputStream is) throws IOException { - BufferedReader reader = new BufferedReader(new InputStreamReader(is)); - StringBuilder builder = new StringBuilder(); - while (reader.ready()) { - builder.append(reader.readLine()); - } - return builder.toString(); - } - - private boolean isJBossBased(Container container) { - if (container == null) { - return false; - } - return container.getName().matches("a.*-server-wildfly") - || container.getName().matches("a.*-server-eap.") - || container.getName().equals("app-server-as7"); + installAdapters(container); } /* @@ -326,4 +273,60 @@ public class ContainersTestEnricher { return "http://localhost:" + Integer.parseInt(System.getProperty("app.server.http.port", "8280")); } + private void installAdapters(Container container) throws InterruptedException, IOException { + if (!alreadyInstalled && !skipInstallAdapters && isJBossBased(container)) { + String jbossCliPath = jbossHomePath + "/bin/jboss-cli.sh"; + String adapterScriptPathArg = "--file=" + jbossHomePath + "/bin/adapter-install.cli"; + String samlAdapterScriptPathArg = "--file=" + jbossHomePath + "/bin/adapter-install-saml.cli"; + String managementPort = container.getContainerConfiguration().getContainerProperties().get("managementPort"); + String controllerArg = "--controller=localhost:" + managementPort; + + log.info("Installing adapter to app server via cli script"); + execCommand(new String[]{"/bin/sh", jbossCliPath, "--connect", adapterScriptPathArg, controllerArg}); + log.info("Installing saml adapter to app server via cli script"); + execCommand(new String[]{"/bin/sh", jbossCliPath, "--connect", samlAdapterScriptPathArg, controllerArg}); + log.info("Restarting container"); + execCommand(new String[]{"/bin/sh", jbossCliPath, "--connect", "--command=:reload", controllerArg}); + pause(5000); + log.info("Container restarted"); + checkServerLog(jbossHomePath); + if (container.getName().startsWith("app-server")) { + alreadyInstalled = true; + } + } + } + + private void execCommand(String... command) throws IOException, InterruptedException { + Process process = Runtime.getRuntime().exec(command); + + if (process.waitFor(10, TimeUnit.SECONDS)) { + if (process.exitValue() != 0) { + throw new RuntimeException("Adapter installation failed. Process exitValue: " + + process.exitValue() + "; \n" + getOutput(process.getErrorStream()) + + ""); + } + log.debug("process.isAlive(): " + process.isAlive()); + } else { + process.destroyForcibly(); + throw new RuntimeException("Timeout after 10 seconds."); + } + } + + private String getOutput(InputStream is) throws IOException { + BufferedReader reader = new BufferedReader(new InputStreamReader(is)); + StringBuilder builder = new StringBuilder(); + while (reader.ready()) { + builder.append(reader.readLine()); + } + return builder.toString(); + } + + private boolean isJBossBased(Container container) { + if (container == null) { + return false; + } + return container.getName().matches("a.*-server-wildfly") + || container.getName().matches("a.*-server-eap.") + || container.getName().equals("app-server-as7"); + } } From ef1aa2127d2655aa9c09dc963aea67c85bb3c410 Mon Sep 17 00:00:00 2001 From: Vlasta Ramik Date: Wed, 13 Jan 2016 12:10:02 +0100 Subject: [PATCH 20/24] eap7 server version bump --- testsuite/integration-arquillian/servers/eap7/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testsuite/integration-arquillian/servers/eap7/pom.xml b/testsuite/integration-arquillian/servers/eap7/pom.xml index cc02cc2b81..b4fdeb1850 100644 --- a/testsuite/integration-arquillian/servers/eap7/pom.xml +++ b/testsuite/integration-arquillian/servers/eap7/pom.xml @@ -4,7 +4,7 @@ org.keycloak.testsuite integration-arquillian-servers - 1.8.0.CR1-SNAPSHOT + 1.9.0.CR1-SNAPSHOT 4.0.0 From 06a3c3b9957b53d289c4270d77586b9e58b9e947 Mon Sep 17 00:00:00 2001 From: Vlasta Ramik Date: Wed, 13 Jan 2016 12:15:09 +0100 Subject: [PATCH 21/24] update datasource.xsl in wildfly server module --- .../servers/wildfly/src/main/xslt/datasource.xsl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testsuite/integration-arquillian/servers/wildfly/src/main/xslt/datasource.xsl b/testsuite/integration-arquillian/servers/wildfly/src/main/xslt/datasource.xsl index 0c6b3e241a..66e80feb72 100644 --- a/testsuite/integration-arquillian/servers/wildfly/src/main/xslt/datasource.xsl +++ b/testsuite/integration-arquillian/servers/wildfly/src/main/xslt/datasource.xsl @@ -30,7 +30,7 @@ - + From 2edc68fff6149365fda2911430ffbb245e200049 Mon Sep 17 00:00:00 2001 From: Vlasta Ramik Date: Wed, 13 Jan 2016 12:20:49 +0100 Subject: [PATCH 22/24] removed redundant dependency declaration --- .../tests/adapters/eap6/pom.xml | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/testsuite/integration-arquillian/tests/adapters/eap6/pom.xml b/testsuite/integration-arquillian/tests/adapters/eap6/pom.xml index 2252b13bac..300d4b6f5b 100644 --- a/testsuite/integration-arquillian/tests/adapters/eap6/pom.xml +++ b/testsuite/integration-arquillian/tests/adapters/eap6/pom.xml @@ -18,17 +18,10 @@ - org.wildfly wildfly-arquillian-container-managed - - org.jboss.as jboss-as-dist @@ -45,11 +38,6 @@ keycloak-saml-eap6-adapter-dist zip - - org.keycloak - keycloak-saml-eap6-adapter-dist - zip - @@ -98,13 +86,6 @@ zip ${adapter.libs.eap6} - - org.keycloak - keycloak-saml-eap6-adapter-dist - ${version.adapter.dist} - zip - ${adapter.libs.eap6} - org.keycloak keycloak-saml-eap6-adapter-dist From 1bbd67009134fa362111064319a48ef46e312635 Mon Sep 17 00:00:00 2001 From: Vlasta Ramik Date: Wed, 13 Jan 2016 13:49:15 +0100 Subject: [PATCH 23/24] removed redundant profile --- testsuite/integration-arquillian/tests/adapters/pom.xml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/testsuite/integration-arquillian/tests/adapters/pom.xml b/testsuite/integration-arquillian/tests/adapters/pom.xml index a86adc6e37..4c2afc48ff 100644 --- a/testsuite/integration-arquillian/tests/adapters/pom.xml +++ b/testsuite/integration-arquillian/tests/adapters/pom.xml @@ -420,12 +420,6 @@ karaf - - app-server-eap6 - - eap6 - - no-adapter-tests From 36461aabc100b97cfc05881e0f78f032d740920f Mon Sep 17 00:00:00 2001 From: Vlasta Ramik Date: Wed, 13 Jan 2016 15:37:30 +0100 Subject: [PATCH 24/24] renamed version.eap6.server.dist proprty to version.server.dist, removed auth-server-eap6 profile --- .../servers/eap6/assembly.xml | 29 -- .../servers/eap6/pom.xml | 250 ------------------ .../eap6/src/main/keystore/keycloak.jks | Bin 2233 -> 0 bytes .../src/main/keystore/keycloak.truststore | Bin 1857 -> 0 bytes .../servers/eap6/src/main/xslt/datasource.xsl | 94 ------- .../servers/eap6/src/main/xslt/module.xsl | 33 --- .../servers/eap6/src/main/xslt/security.xsl | 34 --- .../servers/eap6/src/main/xslt/standalone.xsl | 53 ---- .../servers/eap7/assembly.xml | 4 +- .../servers/eap7/pom.xml | 6 +- .../integration-arquillian/servers/pom.xml | 7 - .../base/src/test/resources/arquillian.xml | 15 +- .../integration-arquillian/tests/pom.xml | 49 +--- 13 files changed, 9 insertions(+), 565 deletions(-) delete mode 100644 testsuite/integration-arquillian/servers/eap6/assembly.xml delete mode 100644 testsuite/integration-arquillian/servers/eap6/pom.xml delete mode 100644 testsuite/integration-arquillian/servers/eap6/src/main/keystore/keycloak.jks delete mode 100644 testsuite/integration-arquillian/servers/eap6/src/main/keystore/keycloak.truststore delete mode 100644 testsuite/integration-arquillian/servers/eap6/src/main/xslt/datasource.xsl delete mode 100644 testsuite/integration-arquillian/servers/eap6/src/main/xslt/module.xsl delete mode 100644 testsuite/integration-arquillian/servers/eap6/src/main/xslt/security.xsl delete mode 100644 testsuite/integration-arquillian/servers/eap6/src/main/xslt/standalone.xsl diff --git a/testsuite/integration-arquillian/servers/eap6/assembly.xml b/testsuite/integration-arquillian/servers/eap6/assembly.xml deleted file mode 100644 index 537dd4ea25..0000000000 --- a/testsuite/integration-arquillian/servers/eap6/assembly.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - auth-server-eap6 - - - zip - - - false - - - - ${keycloak.server.home} - keycloak-${project.version} - - **/*.sh - - - - ${keycloak.server.home} - keycloak-${project.version} - - **/*.sh - - 0755 - - - - diff --git a/testsuite/integration-arquillian/servers/eap6/pom.xml b/testsuite/integration-arquillian/servers/eap6/pom.xml deleted file mode 100644 index b13f519045..0000000000 --- a/testsuite/integration-arquillian/servers/eap6/pom.xml +++ /dev/null @@ -1,250 +0,0 @@ - - - - org.keycloak.testsuite - integration-arquillian-servers - 1.9.0.CR1-SNAPSHOT - - 4.0.0 - - integration-arquillian-server-eap6 - pom - Server on EAP 6 - - - ${project.build.directory}/unpacked/jboss-eap-6.4 - - - - - org.jboss.as - jboss-as-dist - ${jboss.version} - zip - - - org.keycloak - keycloak-server-overlay-eap6 - ${project.version} - zip - - - org.keycloak - keycloak-eap6-adapter-dist - zip - - - org.keycloak - keycloak-saml-eap6-adapter-dist - zip - - - - - - - org.apache.maven.plugins - maven-deploy-plugin - - true - - - - org.apache.maven.plugins - maven-dependency-plugin - - - unpack-eap6-and-server-overlay - generate-resources - - unpack - - - - - org.jboss.as - jboss-as-dist - ${jboss.version} - zip - ${project.build.directory}/unpacked - - - org.keycloak - keycloak-server-overlay-eap6 - ${project.version} - zip - ${keycloak.server.home} - - - - - - - - org.apache.maven.plugins - maven-antrun-plugin - 1.8 - - - move-standalone-keycloak-xml - process-resources - - run - - - - - - - - - - - maven-assembly-plugin - - - create-zip - package - - single - - - - assembly.xml - - false - - - - - - - - - - adapter-libs-provided - - - !adapter.libs.bundled - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - unpack-adapter - generate-resources - - unpack - - - - - org.keycloak - keycloak-eap6-adapter-dist - ${project.version} - zip - ${keycloak.server.home} - - - - - - - - org.codehaus.mojo - xml-maven-plugin - - - configure-adapter-subsystem - process-resources - - transform - - - - - ${keycloak.server.home}/standalone/configuration - - standalone.xml - - src/main/xslt/standalone.xsl - ${keycloak.server.home}/standalone/configuration - - - - - - - - - - - ssl - - - auth.server.ssl.required - - - - - - org.codehaus.mojo - xml-maven-plugin - - - configure-adapter-subsystem-security - process-resources - - transform - - - - - ${keycloak.server.home}/standalone/configuration - - standalone.xml - - src/main/xslt/security.xsl - ${keycloak.server.home}/standalone/configuration - - - - - - - - maven-resources-plugin - 2.7 - - - copy-keystore - process-resources - - copy-resources - - - ${keycloak.server.home}/standalone/configuration - - - src/main/keystore - - keycloak.jks - keycloak.truststore - - - - - - - - - - - - \ No newline at end of file diff --git a/testsuite/integration-arquillian/servers/eap6/src/main/keystore/keycloak.jks b/testsuite/integration-arquillian/servers/eap6/src/main/keystore/keycloak.jks deleted file mode 100644 index 81570ab52922e70c047bf56442ccce582af55539..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2233 zcmcgt`8(7L7oYE#jHMaI2&Kq!%ZzQTS;`(`OR}WFwPeXUN*YU2GuKE$t{A1P$x>t) zJ0U}gVQiVJ?E5}OE+Ss{KJR_r`xm@Foaa2Bb3Q+u=X1{UIr}U7DFvr!R?Q~ z?&g03AAI|;V(s_A9}fZ@0bz)cJq(VOqMcdl=AA29 znPJu}^_f1kNDY?gG+0WsamWy5&em}uPzeb}bQpfzVN7WG?)Q4Ce>D`M0qVBs1Izj3yYo{4iZ{k+ ze3S`AU6&YaUn~8d!LAiitH0CyXwVO#=6e1%hw|DTsX|qwWb~z>*oh+Q>lT80QJ$Q; z%5;r!b8>z5RG6k_Z+XO?GQsy_2)V4R#of5A&!fpcT*Gm!V`SS5O|)Oc^0`Lb`7Ez4 z`Sx*Bhr!9S1E2HR{JjcI^)PB$F9lWMNE?G}e3B>#;cxwUupszl$C~il7YbTrF}wWz z{-nZz*)u7cT-r@!Ef655tDS$zYLI8M-E?7TR7=7oC>XA+9#jg+2 z@{apwP3x(*f0s(*gW~Ih)@+frD^M3p*T-ZQV<^V7AcSlt*R#4P#QB^=3MxfY+USqrnWrSTB#981sqle!Hx}zb2isk-B zkKc*Md9}J*FHQ_MB4e_{J z zn*)6#OuoVGV#(NJeM9#VPb=jNV%<N+=JTL7LTVZ*idY+o?Gi$J?2h@6u=!b$(Hn;NrY~&2Pk=k&=d`d(mz&d`W(&cX1r z_ow%?Z`~%)*@7Z37~ZRqiR_ph|YHWba3h3jF-- zP5IqS%_}GuC#d+uj0e*Mlqo20Z>UyP^%n5dvAFk18SLIP5U@+w3?p7QI#>tH)W64`E0N_0|OfMx~3^yl-9fT7JwzK&Ma3R5# z`br24-(MXllIyBx@NEMAmWLAmp}QWIc#zO5o*t*MZnys-@glj*J;Sd1&n-|5>?2Uw+@<0h|vg~vfRR4f%xy!9L)N?jSx(S^L7XI$>l%&1TD zc>}pPuoN_aTROIOJ+|zfQ~XeNNi^2?7aSnXfwB{*dJsHmEL&*N-MFODlH+f@1?B)i zK&}Kv9CPY$ho|5WA&B7ROhi~JN*foOR8N&{De;i3)9U=Uh=+G{C?WvjNc^Ew9y-1M z;-z3U!Ky%Z)#{mp2=xItK{K;Vdl(gHf0P<1Y8=QaqOqfAl*3e!u;iZ zqn+r({M{6uUi$JxNakbH$&keRjb@c+ReA+R`Ro(>U+}bS6l2ajd-NwcM!MkMHlk@H8W4_LHnT8m&Fogw@|!Tij3-^a(24 zxS>4i;cs@HcH8_*%IE9ah3cCew{CaLFt^eX*I#(vlzYZ~#}B!TZPKMP5B0A8S79P0 zYrOhInU0UA*R##KSyv|aPRzPi@8jH1Uc5u^_%-Vft$&(iLtlN&IB=xKB_y`(W9Xub zjGBj^E2i(#=aHJeBk-#5xywcFGn5P%)o!M~s`~vzYUaoMPeFBpU#))>D;(~exz3P7 z`!C0{`zzP|OMe-((NeALrS`Pzb5_OQ;w?6M@lyQC4vmk}a;7`C&tJLjq4O2qKW)*6 zXIc6@7B!2FXJTe#U|g(dAa5WGj6zvH7BLo)FUuHABUY@FT*999?~z={<7W-mB#;9U zn2Lab$jIPcmbaJLw7lu;(A@;P(=-?N{B zKh9n4n;4ug%(47H=^2ZE5@`%Kr7Wt?-mUZsaa|W)@V{)5&FSsS?_61}5o=ZUd^2X`h;i+|kZX3@n30%2Qu2X-{lW8kT_B{!n9GZAOX>+hL=hl7g zDXVmLAKB3K;ppUbS1sMywK?bW9P->E=+Mn+W_rEiZxxfmPmdq-T#S4^_D<7TQ2%`X z-5<-(y5CxRHkF0(@XvX7`u0>Tyq)j#-ey61qG0t;sV4QsZ679V@zhM+@a0IPgiNf@ z%s`2`3)ee_Zn^Sd!|4a^%i{RD**_cm>S=QCW@ebaYaa9yiMmTDBE3bSUY(6+|nM{e3Hea`KDZEj@x%^88TqL zVC6JT>!{9&ySHc`T$iG>%jz^*Is#`%=Kf!Hn<}3Cn=@Brd%6D#?RWk&BP6yoGWA)` z-)MbHGcSy1OP;h_-iK93KD9nIsx%SiogA(ZTv5j`XHS(&_uDgHi~cmLOx^VE`k8yS zf%aXot3N1eMn`LXN-_L#WB(ZwjbrHtnjdr<*|2SB+OW;`Jg@wLdr!O8NYyqg-kbPZ z;;7Ke8Cw{|W8YpYnjiciZ&Re|xy@b&T&^E^UMIM(e7Cf0P4lP67X;OPnl9-xZO6Ih7^bG<^O+sfvUc1({JQodpT)7J%o~$D z`DSmJD^)tb$MaEXf5Tp{t?I@Xh3@f(^ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/testsuite/integration-arquillian/servers/eap6/src/main/xslt/module.xsl b/testsuite/integration-arquillian/servers/eap6/src/main/xslt/module.xsl deleted file mode 100644 index 88ac56b86c..0000000000 --- a/testsuite/integration-arquillian/servers/eap6/src/main/xslt/module.xsl +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/testsuite/integration-arquillian/servers/eap6/src/main/xslt/security.xsl b/testsuite/integration-arquillian/servers/eap6/src/main/xslt/security.xsl deleted file mode 100644 index 4c9667361d..0000000000 --- a/testsuite/integration-arquillian/servers/eap6/src/main/xslt/security.xsl +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/testsuite/integration-arquillian/servers/eap6/src/main/xslt/standalone.xsl b/testsuite/integration-arquillian/servers/eap6/src/main/xslt/standalone.xsl deleted file mode 100644 index c0df283ac9..0000000000 --- a/testsuite/integration-arquillian/servers/eap6/src/main/xslt/standalone.xsl +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/testsuite/integration-arquillian/servers/eap7/assembly.xml b/testsuite/integration-arquillian/servers/eap7/assembly.xml index 5fcf9890f2..98df2c8e54 100644 --- a/testsuite/integration-arquillian/servers/eap7/assembly.xml +++ b/testsuite/integration-arquillian/servers/eap7/assembly.xml @@ -11,14 +11,14 @@ ${keycloak.server.home} - keycloak-${version.eap6.server.dist} + keycloak-${version.server.dist} **/*.sh ${keycloak.server.home} - keycloak-${version.eap6.server.dist} + keycloak-${version.server.dist} **/*.sh diff --git a/testsuite/integration-arquillian/servers/eap7/pom.xml b/testsuite/integration-arquillian/servers/eap7/pom.xml index b4fdeb1850..67110ef600 100644 --- a/testsuite/integration-arquillian/servers/eap7/pom.xml +++ b/testsuite/integration-arquillian/servers/eap7/pom.xml @@ -52,7 +52,7 @@ org.keycloak keycloak-eap6-server-dist - ${version.eap6.server.dist} + ${version.server.dist} zip @@ -70,7 +70,7 @@ - version.eap6.server.dist + version.server.dist @@ -92,7 +92,7 @@ org.keycloak keycloak-eap6-server-dist - ${version.eap6.server.dist} + ${version.server.dist} zip ${project.build.directory}/unpacked diff --git a/testsuite/integration-arquillian/servers/pom.xml b/testsuite/integration-arquillian/servers/pom.xml index 5da7a38ec1..c91ada581d 100644 --- a/testsuite/integration-arquillian/servers/pom.xml +++ b/testsuite/integration-arquillian/servers/pom.xml @@ -23,13 +23,6 @@ wildfly - - auth-server-eap6 - - - eap6 - - auth-server-eap7 diff --git a/testsuite/integration-arquillian/tests/base/src/test/resources/arquillian.xml b/testsuite/integration-arquillian/tests/base/src/test/resources/arquillian.xml index 60b3ceb4b2..afc3334429 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/resources/arquillian.xml +++ b/testsuite/integration-arquillian/tests/base/src/test/resources/arquillian.xml @@ -123,26 +123,13 @@ - - - ${auth.server.eap6} - org.jboss.as.arquillian.container.managed.ManagedDeployableContainer - ${keycloak.home} - -Djboss.socket.binding.port-offset=${auth.server.port.offset} -Xms64m -Xmx512m -XX:MaxPermSize=256m ${adapter.test.props} - localhost - ${auth.server.management.port.jmx} - ${startup.timeout.sec} - - - ${auth.server.eap7} org.jboss.as.arquillian.container.managed.ManagedDeployableContainer ${keycloak.home} -Djboss.socket.binding.port-offset=${auth.server.port.offset} -Xms64m -Xmx512m -XX:MaxPermSize=256m ${adapter.test.props} - localhost - ${auth.server.management.port.jmx} + ${auth.server.management.port} ${startup.timeout.sec} diff --git a/testsuite/integration-arquillian/tests/pom.xml b/testsuite/integration-arquillian/tests/pom.xml index 03aa8ec951..f8c817e618 100644 --- a/testsuite/integration-arquillian/tests/pom.xml +++ b/testsuite/integration-arquillian/tests/pom.xml @@ -471,42 +471,6 @@ - - auth-server-eap6 - - false - integration-arquillian-server-eap6 - auth-server-eap6 - 300 - - - - - org.jboss.as - jboss-as-arquillian-container-managed - 7.2.0.Final - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - true - false - ${containers.home}/keycloak-${project.version} - ${adapter.test.props} - - - - - - - - auth-server-eap7 @@ -515,22 +479,15 @@ auth-server-eap7 300 - ${containers.home}/keycloak-${version.eap6.server.dist} + ${containers.home}/keycloak-${version.server.dist} ${keycloak.home}/standalone/configuration - - org.jboss.as - jboss-as-arquillian-container-managed - 7.2.0.Final - - - + @@ -546,7 +503,7 @@ - version.eap6.server.dist + version.server.dist