keycloak-memoizeit

Merge pull request #2768 from vramik/KEYCLOAK-2936 KEYCLOAK-2936

5/6/2016 3:37:34 AM

Details

diff --git a/testsuite/integration-arquillian/servers/app-server/karaf/fuse62/src/main/resources/install-features.cli b/testsuite/integration-arquillian/servers/app-server/karaf/fuse62/src/main/resources/install-features.cli
index 9ac71e3..6244ba2 100644
--- a/testsuite/integration-arquillian/servers/app-server/karaf/fuse62/src/main/resources/install-features.cli
+++ b/testsuite/integration-arquillian/servers/app-server/karaf/fuse62/src/main/resources/install-features.cli
@@ -1,3 +1,3 @@
 features:addurl mvn:org.keycloak/keycloak-osgi-features/${project.version}/xml/features
 features:addurl mvn:org.keycloak.example.demo/keycloak-fuse-example-features/${project.version}/xml/features
-features:install keycloak-fuse-example
\ No newline at end of file
+features:install keycloak-fuse-6.2-example
\ No newline at end of file
diff --git a/testsuite/integration-arquillian/servers/app-server/karaf/fuse63/pom.xml b/testsuite/integration-arquillian/servers/app-server/karaf/fuse63/pom.xml
new file mode 100644
index 0000000..21d812f
--- /dev/null
+++ b/testsuite/integration-arquillian/servers/app-server/karaf/fuse63/pom.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0"?>
+<!--
+~ Copyright 2016 Red Hat, Inc. and/or its affiliates
+~ and other contributors as indicated by the @author tags.
+~
+~ Licensed under the Apache License, Version 2.0 (the "License");
+~ you may not use this file except in compliance with the License.
+~ You may obtain a copy of the License at
+~
+~ http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" BASIS,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+-->
+
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <parent>
+        <groupId>org.keycloak.testsuite</groupId>
+        <artifactId>integration-arquillian-servers-app-server-karaf</artifactId>
+        <version>1.9.3.Final-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>integration-arquillian-servers-app-server-fuse63</artifactId>
+    <packaging>pom</packaging>
+    <name>App Server - Karaf - JBoss Fuse 6.3</name>
+
+    <properties>
+        <app.server.karaf>fuse63</app.server.karaf>
+        <app.server.karaf.groupId>org.jboss.fuse</app.server.karaf.groupId>
+        <app.server.karaf.artifactId>jboss-fuse-full</app.server.karaf.artifactId>
+        <app.server.karaf.version>${fuse63.version}</app.server.karaf.version>
+        <app.server.karaf.unpacked.folder.name>jboss-fuse-${fuse63.version}</app.server.karaf.unpacked.folder.name>
+        <app.server.karaf.client.auth>-u admin -p admin</app.server.karaf.client.auth>
+    </properties>
+    
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-enforcer-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>enforce</goal>
+                        </goals>
+                        <configuration>
+                            <rules>
+                                <requireProperty>
+                                    <property>fuse63.version</property>
+                                </requireProperty>
+                            </rules>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>    
+
+</project>
diff --git a/testsuite/integration-arquillian/servers/app-server/karaf/fuse63/src/main/resources/install-features.cli b/testsuite/integration-arquillian/servers/app-server/karaf/fuse63/src/main/resources/install-features.cli
new file mode 100644
index 0000000..8d7890e
--- /dev/null
+++ b/testsuite/integration-arquillian/servers/app-server/karaf/fuse63/src/main/resources/install-features.cli
@@ -0,0 +1,3 @@
+features:addurl mvn:org.keycloak/keycloak-osgi-features/${project.version}/xml/features
+features:addurl mvn:org.keycloak.example.demo/keycloak-fuse-example-features/${project.version}/xml/features
+features:install keycloak-fuse-6.3-example
\ No newline at end of file
diff --git a/testsuite/integration-arquillian/servers/app-server/karaf/fuse63/src/main/resources/update-config.cli b/testsuite/integration-arquillian/servers/app-server/karaf/fuse63/src/main/resources/update-config.cli
new file mode 100644
index 0000000..d6a425a
--- /dev/null
+++ b/testsuite/integration-arquillian/servers/app-server/karaf/fuse63/src/main/resources/update-config.cli
@@ -0,0 +1,5 @@
+config:edit org.ops4j.pax.url.mvn
+config:propset org.ops4j.pax.url.mvn.localRepository ${maven.repo.local}
+config:propset org.ops4j.pax.url.mvn.settings ${maven.local.settings}
+config:propappend org.ops4j.pax.url.mvn.repositories ${repositories}
+config:update
diff --git a/testsuite/integration-arquillian/servers/app-server/karaf/fuse63/src/main/resources/users.properties b/testsuite/integration-arquillian/servers/app-server/karaf/fuse63/src/main/resources/users.properties
new file mode 100644
index 0000000..6c51920
--- /dev/null
+++ b/testsuite/integration-arquillian/servers/app-server/karaf/fuse63/src/main/resources/users.properties
@@ -0,0 +1 @@
+admin=admin,admin,manager,viewer,Monitor, Operator, Maintainer, Deployer, Auditor, Administrator, SuperUser
\ No newline at end of file
diff --git a/testsuite/integration-arquillian/servers/app-server/karaf/fuse63/src/saml-adapter-not-supported b/testsuite/integration-arquillian/servers/app-server/karaf/fuse63/src/saml-adapter-not-supported
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/testsuite/integration-arquillian/servers/app-server/karaf/fuse63/src/saml-adapter-not-supported
@@ -0,0 +1 @@
+
diff --git a/testsuite/integration-arquillian/servers/app-server/karaf/pom.xml b/testsuite/integration-arquillian/servers/app-server/karaf/pom.xml
index 1c92330..d573952 100644
--- a/testsuite/integration-arquillian/servers/app-server/karaf/pom.xml
+++ b/testsuite/integration-arquillian/servers/app-server/karaf/pom.xml
@@ -207,6 +207,12 @@
                 <module>fuse62</module>
             </modules>
         </profile>        
+        <profile>
+            <id>app-server-fuse63</id>
+            <modules>
+                <module>fuse63</module>
+            </modules>
+        </profile>        
         
     </profiles>
 
diff --git a/testsuite/integration-arquillian/tests/other/adapters/karaf/fuse63/pom.xml b/testsuite/integration-arquillian/tests/other/adapters/karaf/fuse63/pom.xml
new file mode 100644
index 0000000..e438d44
--- /dev/null
+++ b/testsuite/integration-arquillian/tests/other/adapters/karaf/fuse63/pom.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0"?>
+<!--
+~ Copyright 2016 Red Hat, Inc. and/or its affiliates
+~ and other contributors as indicated by the @author tags.
+~
+~ Licensed under the Apache License, Version 2.0 (the "License");
+~ you may not use this file except in compliance with the License.
+~ You may obtain a copy of the License at
+~
+~ http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" BASIS,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+-->
+
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.keycloak.testsuite</groupId>
+        <artifactId>integration-arquillian-tests-adapters-karaf</artifactId>
+        <version>1.9.3.Final-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>integration-arquillian-tests-adapters-fuse63</artifactId>
+
+    <name>Adapter Tests - Karaf - JBoss Fuse 6.3</name>
+        
+    <properties>
+        <app.server>fuse63</app.server>
+
+        <app.server.management.user>admin</app.server.management.user>
+        <app.server.management.password>admin</app.server.management.password>
+    </properties>
+    
+</project>
\ No newline at end of file
diff --git a/testsuite/integration-arquillian/tests/other/adapters/karaf/fuse63/src/test/java/org/keycloak/testsuite/adapter/example/Fuse63ExampleAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/karaf/fuse63/src/test/java/org/keycloak/testsuite/adapter/example/Fuse63ExampleAdapterTest.java
new file mode 100644
index 0000000..c42a9a1
--- /dev/null
+++ b/testsuite/integration-arquillian/tests/other/adapters/karaf/fuse63/src/test/java/org/keycloak/testsuite/adapter/example/Fuse63ExampleAdapterTest.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2016 Red Hat, Inc. and/or its affiliates
+ * and other contributors as indicated by the @author tags.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.keycloak.testsuite.adapter.example;
+
+import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
+
+/**
+ * @author <a href="mailto:vramik@redhat.com">Vlastislav Ramik</a>
+ */
+@AppServerContainer("app-server-fuse63")
+public class Fuse63ExampleAdapterTest extends AbstractFuseExampleAdapterTest {
+
+}
diff --git a/testsuite/integration-arquillian/tests/other/adapters/karaf/pom.xml b/testsuite/integration-arquillian/tests/other/adapters/karaf/pom.xml
index ef63532..5942fe3 100644
--- a/testsuite/integration-arquillian/tests/other/adapters/karaf/pom.xml
+++ b/testsuite/integration-arquillian/tests/other/adapters/karaf/pom.xml
@@ -132,8 +132,14 @@
                 <module>fuse62</module>
             </modules>
         </profile>                
+        <profile>
+            <id>app-server-fuse63</id>
+            <modules>
+                <module>fuse63</module>
+            </modules>
+        </profile>                
         
     </profiles>
 
 
-</project>
\ No newline at end of file
+</project>