From c3c6202c7aaf40e3c91f77d0aa51802fa53727ed Mon Sep 17 00:00:00 2001
From: Steve Millidge <steve@payara.co>
Date: Sat, 22 Aug 2015 23:42:59 +0100
Subject: [PATCH] PAYARA-416 Fixes #395 Also removes error in Grizzly boot due
 to incomplete HTTP2 support

---
 .../glassfish/grizzly/config/GenericGrizzlyListener.java  | 2 +-
 .../main/java/org/glassfish/grizzly/config/dom/Http2.java | 2 +-
 nucleus/grizzly/nucleus-grizzly-all/pom.xml               | 7 ++++++-
 .../src/main/java/fish/payara/micro/PayaraMicro.java      | 8 +++++---
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/nucleus/grizzly/config/src/main/java/org/glassfish/grizzly/config/GenericGrizzlyListener.java b/nucleus/grizzly/config/src/main/java/org/glassfish/grizzly/config/GenericGrizzlyListener.java
index 3d92b2177df..cebaed59f40 100644
--- a/nucleus/grizzly/config/src/main/java/org/glassfish/grizzly/config/GenericGrizzlyListener.java
+++ b/nucleus/grizzly/config/src/main/java/org/glassfish/grizzly/config/GenericGrizzlyListener.java
@@ -785,7 +785,7 @@ protected void configureHttp2Support(final ServiceLocator locator,
                                         final Http2 http2Element,
                                         final FilterChainBuilder builder,
                                         final boolean secure) {
-        if (http2Element == null || http2Element.getEnabled()) {
+        if (http2Element != null && http2Element.getEnabled()) {
 
             // first try to lookup a service appropriate for the mode
             // that has been configured.
diff --git a/nucleus/grizzly/config/src/main/java/org/glassfish/grizzly/config/dom/Http2.java b/nucleus/grizzly/config/src/main/java/org/glassfish/grizzly/config/dom/Http2.java
index c6c1dcdb02e..eee20d70389 100644
--- a/nucleus/grizzly/config/src/main/java/org/glassfish/grizzly/config/dom/Http2.java
+++ b/nucleus/grizzly/config/src/main/java/org/glassfish/grizzly/config/dom/Http2.java
@@ -51,7 +51,7 @@ public interface Http2 extends ConfigBeanProxy, PropertyBag {
     final int MAX_CONCURRENT_STREAMS = 100;
     final int INITIAL_WINDOW_SIZE_IN_BYTES = 64 * 1024 - 1;
     int MAX_FRAME_PAYLOAD_SIZE_IN_BYTES = (1 << 24) - 1;
-    final boolean ENABLED = true;
+    final boolean ENABLED = false;
     
     /**
      * Enables HTTP2 support.
diff --git a/nucleus/grizzly/nucleus-grizzly-all/pom.xml b/nucleus/grizzly/nucleus-grizzly-all/pom.xml
index 9f056627a7f..8bcbd710905 100644
--- a/nucleus/grizzly/nucleus-grizzly-all/pom.xml
+++ b/nucleus/grizzly/nucleus-grizzly-all/pom.xml
@@ -137,7 +137,12 @@
         </dependency>
         <dependency>
             <groupId>org.glassfish.grizzly</groupId>
-            <artifactId>grizzly-http-server</artifactId>
+            <artifactId>grizzly-http2</artifactId>
+        </dependency>      
+        <dependency>
+            <groupId>org.glassfish.grizzly</groupId>
+            <artifactId>grizzly-npn-api</artifactId>
+            <version>1.2</version>
         </dependency>
         <dependency>
             <groupId>org.glassfish.main.grizzly</groupId>
diff --git a/nucleus/payara-modules/payara-micro/src/main/java/fish/payara/micro/PayaraMicro.java b/nucleus/payara-modules/payara-micro/src/main/java/fish/payara/micro/PayaraMicro.java
index 7efabfe4411..018556173a8 100644
--- a/nucleus/payara-modules/payara-micro/src/main/java/fish/payara/micro/PayaraMicro.java
+++ b/nucleus/payara-modules/payara-micro/src/main/java/fish/payara/micro/PayaraMicro.java
@@ -651,7 +651,7 @@ public PayaraMicroRuntime bootStrap() throws BootstrapException {
 
             if (alternateDomainXML != null) {
                 gfproperties.setConfigFileReadOnly(false);
-                gfproperties.setConfigFileURI("file://" + alternateDomainXML.getAbsolutePath());
+                gfproperties.setConfigFileURI("file:///" + alternateDomainXML.getAbsolutePath().replace('\\', '/'));
             } else {
                 if (noCluster) {
                     gfproperties.setConfigFileURI(Thread.currentThread().getContextClassLoader().getResource("microdomain-nocluster.xml").toExternalForm());
@@ -667,7 +667,9 @@ public PayaraMicroRuntime bootStrap() throws BootstrapException {
                 if (!configFile.exists()) {
                     installFiles(gfproperties);
                 } else {
-                    gfproperties.setConfigFileURI("file://" + rootDir.getAbsolutePath() + File.separator + "config" + File.separator + "domain.xml");
+                    String absolutePath = rootDir.getAbsolutePath();
+                    absolutePath = absolutePath.replace('\\', '/');
+                    gfproperties.setConfigFileURI("file:///" + absolutePath + "/config/domain.xml");
                     gfproperties.setConfigFileReadOnly(false);
                 }
 
@@ -902,7 +904,7 @@ private void scanArgs(String[] args) {
                             + "--domainConfig overrides the complete server configuration with an alternative domain.xml file\n"
                             + "--minHttpThreads the minimum number of threads in the HTTP thread pool\n"
                             + "--maxHttpThreads the maximum number of threads in the HTTP thread pool\n"
-                            + "--hzConfigFile the hazelcast-configuration file to use to override the in-built hazelcast cluster configuration"
+                            + "--hzConfigFile the hazelcast-configuration file to use to override the in-built hazelcast cluster configuration\n"
                             + "--autoBindHttp sets autobinding of the http port to a non-bound port\n"
                             + "--autoBindSsl sets autobinding of the https port to a non-bound port\n"
                             + "--autoBindRange sets the maximum number of ports to look at for port autobinding\n"