From 00193393241ba0ea52282ab4e218428f453d673c Mon Sep 17 00:00:00 2001
From: Jeff Mesnil <jmesnil@gmail.com>
Date: Fri, 13 Jan 2017 10:17:00 +0100
Subject: [PATCH 1/4] Update helloworld-jms & ejb-remote quickstarts

* add *temporary* dependency to org.jboss.modules:jboss-modules
  until REM3-244 and ELY-872 are fixed
* add wildfly-config.xml to the client application so that they
  can authenticate to the server.
---
 ejb-remote/client/pom.xml                     | 10 +++++-
 .../resources/META-INF/wildfly-config.xml     | 36 +++++++++++++++++++
 helloworld-jms/pom.xml                        | 10 +++++-
 .../quickstarts/jms/HelloWorldJMSClient.java  |  2 +-
 .../resources/META-INF/wildfly-config.xml     | 36 +++++++++++++++++++
 pom.xml                                       |  4 +--
 6 files changed, 93 insertions(+), 5 deletions(-)
 create mode 100644 ejb-remote/client/src/main/resources/META-INF/wildfly-config.xml
 create mode 100644 helloworld-jms/src/main/resources/META-INF/wildfly-config.xml

diff --git a/ejb-remote/client/pom.xml b/ejb-remote/client/pom.xml
index 7124634352..2b704c1776 100644
--- a/ejb-remote/client/pom.xml
+++ b/ejb-remote/client/pom.xml
@@ -44,8 +44,9 @@
             resources, i.e. build is platform dependent! -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-        <version.wildfly>10.0.0.Final</version.wildfly>
+        <version.wildfly>11.0.0.Alpha1-SNAPSHOT</version.wildfly>
         <version.jboss.spec.javaee.7.0>1.0.3.Final</version.jboss.spec.javaee.7.0>
+        <version.jboss-modules>1.6.0.Beta3</version.jboss-modules>
 
         <!-- WildFly Maven plug-in to deploy your WAR to a local WildFly container -->
         <version.wildfly.maven.plugin>1.0.2.Final</version.wildfly.maven.plugin>
@@ -123,6 +124,13 @@
             <scope>runtime</scope>
         </dependency>
 
+
+        <!-- WFLY-7864 Temporary workaround -->
+        <dependency>
+            <groupId>org.jboss.modules</groupId>
+            <artifactId>jboss-modules</artifactId>
+            <version>${version.jboss-modules}</version>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/ejb-remote/client/src/main/resources/META-INF/wildfly-config.xml b/ejb-remote/client/src/main/resources/META-INF/wildfly-config.xml
new file mode 100644
index 0000000000..f7b1f40e37
--- /dev/null
+++ b/ejb-remote/client/src/main/resources/META-INF/wildfly-config.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  ~ JBoss, Home of Professional Open Source.
+  ~ Copyright 2016 Red Hat, Inc., and individual 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.
+  -->
+
+<configuration>
+    <authentication-client xmlns="urn:elytron:1.0">
+        <authentication-rules>
+                    <rule use-configuration="default" />
+        </authentication-rules>
+        <authentication-configurations>
+            <configuration name="default">
+                <allow-all-sasl-mechanisms />
+                <set-mechanism-properties>
+                    <property key="wildfly.sasl.local-user.quiet-auth" value="true" />
+                 </set-mechanism-properties>
+                 <use-service-loader-providers />
+             </configuration>
+        </authentication-configurations>
+    </authentication-client>
+</configuration>
diff --git a/helloworld-jms/pom.xml b/helloworld-jms/pom.xml
index 3f37f542f2..8173febec6 100644
--- a/helloworld-jms/pom.xml
+++ b/helloworld-jms/pom.xml
@@ -39,7 +39,8 @@
             resources, i.e. build is platform dependent! -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-        <version.wildfly>10.0.0.Final</version.wildfly>
+        <version.wildfly>11.0.0.Alpha1-SNAPSHOT</version.wildfly>
+        <version.jboss-modules>1.6.0.Beta3</version.jboss-modules>
 
         <!-- WildFly Maven plug-in to deploy your WAR to a local WildFly container -->
         <version.wildfly.maven.plugin>1.0.2.Final</version.wildfly.maven.plugin>
@@ -60,6 +61,13 @@
             <version>${version.wildfly}</version>
             <type>pom</type>
         </dependency>
+
+        <!-- WFLY-7864 Temporary workaround -->
+        <dependency>
+            <groupId>org.jboss.modules</groupId>
+            <artifactId>jboss-modules</artifactId>
+            <version>${version.jboss-modules}</version>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/helloworld-jms/src/main/java/org/jboss/as/quickstarts/jms/HelloWorldJMSClient.java b/helloworld-jms/src/main/java/org/jboss/as/quickstarts/jms/HelloWorldJMSClient.java
index c5f8c87a38..5c759dec0b 100644
--- a/helloworld-jms/src/main/java/org/jboss/as/quickstarts/jms/HelloWorldJMSClient.java
+++ b/helloworld-jms/src/main/java/org/jboss/as/quickstarts/jms/HelloWorldJMSClient.java
@@ -37,7 +37,7 @@ public class HelloWorldJMSClient {
     private static final String DEFAULT_MESSAGE_COUNT = "1";
     private static final String DEFAULT_USERNAME = "quickstartUser";
     private static final String DEFAULT_PASSWORD = "quickstartPwd1!";
-    private static final String INITIAL_CONTEXT_FACTORY = "org.jboss.naming.remote.client.InitialContextFactory";
+    private static final String INITIAL_CONTEXT_FACTORY = "org.wildfly.naming.client.WildFlyInitialContextFactory";
     private static final String PROVIDER_URL = "http-remoting://127.0.0.1:8080";
 
     public static void main(String[] args) {
diff --git a/helloworld-jms/src/main/resources/META-INF/wildfly-config.xml b/helloworld-jms/src/main/resources/META-INF/wildfly-config.xml
new file mode 100644
index 0000000000..f7b1f40e37
--- /dev/null
+++ b/helloworld-jms/src/main/resources/META-INF/wildfly-config.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  ~ JBoss, Home of Professional Open Source.
+  ~ Copyright 2016 Red Hat, Inc., and individual 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.
+  -->
+
+<configuration>
+    <authentication-client xmlns="urn:elytron:1.0">
+        <authentication-rules>
+                    <rule use-configuration="default" />
+        </authentication-rules>
+        <authentication-configurations>
+            <configuration name="default">
+                <allow-all-sasl-mechanisms />
+                <set-mechanism-properties>
+                    <property key="wildfly.sasl.local-user.quiet-auth" value="true" />
+                 </set-mechanism-properties>
+                 <use-service-loader-providers />
+             </configuration>
+        </authentication-configurations>
+    </authentication-client>
+</configuration>
diff --git a/pom.xml b/pom.xml
index d937296ab3..0d375e00ed 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,13 +45,13 @@
 
         <!-- JBoss dependency versions -->
 
-        <version.wildfly>10.1.0.Final</version.wildfly>
+        <version.wildfly>11.0.0.Alpha1-SNAPSHOT</version.wildfly>
 
 
         <version.wildfly.maven.plugin>1.0.2.Final</version.wildfly.maven.plugin>
 
         <!-- Define the version of the JBoss BOMs we want to import to specify tested stacks. -->
-        <version.jboss.bom>10.1.0.Final</version.jboss.bom>
+        <version.jboss.bom>11.0.0.Alpha1-SNAPSHOT</version.jboss.bom>
 
 
         <version.jboss.spec.javaee.7.0>1.0.3.Final</version.jboss.spec.javaee.7.0>

From 20fc59ad53ed63f5a5e378637f5c7c084225de25 Mon Sep 17 00:00:00 2001
From: Tomaz Cerar <tomaz.cerar@gmail.com>
Date: Fri, 24 Feb 2017 17:38:57 +0100
Subject: [PATCH 2/4] Update pom.xml

---
 ejb-remote/client/pom.xml | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/ejb-remote/client/pom.xml b/ejb-remote/client/pom.xml
index ca259dcc50..088119b003 100644
--- a/ejb-remote/client/pom.xml
+++ b/ejb-remote/client/pom.xml
@@ -26,8 +26,6 @@
     </parent>
     <artifactId>ejb-remote-client</artifactId>
     <packaging>jar</packaging>
-
-
     <name>${qs.name.prefix} ejb-remote - client</name>
     <description>This project demonstrates how to access an EJB from a remote client; this is the client POM file</description>
 
@@ -54,14 +52,6 @@
             <groupId>org.jboss.modules</groupId>
             <artifactId>jboss-modules</artifactId>
         </dependency>
-
-
-        <!-- WFLY-7864 Temporary workaround -->
-        <dependency>
-            <groupId>org.jboss.modules</groupId>
-            <artifactId>jboss-modules</artifactId>
-            <version>${version.jboss-modules}</version>
-        </dependency>
     </dependencies>
 
     <build>

From 2b835427c4ac85c19d8785963557dd4c5fc7c2e0 Mon Sep 17 00:00:00 2001
From: Tomaz Cerar <tomaz.cerar@gmail.com>
Date: Fri, 24 Feb 2017 17:39:29 +0100
Subject: [PATCH 3/4] Update pom.xml

---
 helloworld-jms/pom.xml | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/helloworld-jms/pom.xml b/helloworld-jms/pom.xml
index bd9a43f985..eadfc7cad1 100644
--- a/helloworld-jms/pom.xml
+++ b/helloworld-jms/pom.xml
@@ -44,13 +44,7 @@
             <artifactId>wildfly-jms-client-bom</artifactId>
             <type>pom</type>
         </dependency>
-
-        <!-- WFLY-7864 Temporary workaround -->
-        <dependency>
-            <groupId>org.jboss.modules</groupId>
-            <artifactId>jboss-modules</artifactId>
-            <version>${version.jboss-modules}</version>
-        </dependency>
+        
     </dependencies>
 
     <build>

From 807396dcf343ab9f9f3d63fc3a592e6df0bd5db6 Mon Sep 17 00:00:00 2001
From: Tomaz Cerar <tomaz.cerar@gmail.com>
Date: Fri, 24 Feb 2017 17:40:56 +0100
Subject: [PATCH 4/4] Update pom.xml

---
 pom.xml | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5033ddf7c2..1a77d4b400 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,17 +52,18 @@
         <!-- other plug-in versions -->
         <version.com.mycyla.license>3.0</version.com.mycyla.license>
 
-
+        <!-- Explicitly declaring the source encoding eliminates the following
+            message: [WARNING] Using platform encoding (UTF-8 actually) to copy
+            filtered resources, i.e. build is platform dependent! -->
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ 
         <version.spring.framework>4.3.6.RELEASE</version.spring.framework>
-        <!-- EAP component version management BOM -->
-        <version.server.bom>11.0.0.Alpha1</version.server.bom>
-        
-        <version.jboss.spec.javaee.7.0>1.1.0.Beta1</version.jboss.spec.javaee.7.0>
+         <!-- EAP component version management BOM -->
 
-        <!-- maven-compiler-plugin -->
         <maven.compiler.target>1.8</maven.compiler.target>
         <maven.compiler.source>1.8</maven.compiler.source>
-
+ 
+        <version.jaxws-tools-maven-plugin>1.2.0.Final</version.jaxws-tools-maven-plugin>
 
         <!-- Other dependency versions -->
         <version.ro.isdc.wro4j>1.7.9</version.ro.isdc.wro4j>