From f1d525287ca2940ac547f0825475ee6f58981eb1 Mon Sep 17 00:00:00 2001
From: apatrida <jayson.minard@gmail.com>
Date: Wed, 9 Mar 2016 15:43:20 -0300
Subject: [PATCH] undertow to 1.3.18.Final add config files for solr 5.5.0,
 make it default fix old admin UI so it loads correctly release 1.6.0

---
 example/example-solr-5.5.0.conf                           | 8 ++++++++
 example/example.conf                                      | 2 +-
 gradle.properties                                         | 6 +++---
 src/main/kotlin/uy/kohesive/solr/undertow/SolrUndertow.kt | 4 +++-
 4 files changed, 15 insertions(+), 5 deletions(-)
 create mode 100644 example/example-solr-5.5.0.conf

diff --git a/example/example-solr-5.5.0.conf b/example/example-solr-5.5.0.conf
new file mode 100644
index 0000000..e7622ad
--- /dev/null
+++ b/example/example-solr-5.5.0.conf
@@ -0,0 +1,8 @@
+solr.undertow: {
+  httpClusterPort: 8983
+  solrHome: "./solr-home"
+  solrLogs: "./solr-logs"
+  tempDir: "./solr-temp"
+  solrVersion: "5.5.0"
+  solrWarFile: ./solr-wars/solr-${solr.undertow.solrVersion}.zip
+}
diff --git a/example/example.conf b/example/example.conf
index ce1428e..e7622ad 100644
--- a/example/example.conf
+++ b/example/example.conf
@@ -3,6 +3,6 @@ solr.undertow: {
   solrHome: "./solr-home"
   solrLogs: "./solr-logs"
   tempDir: "./solr-temp"
-  solrVersion: "5.4.1"
+  solrVersion: "5.5.0"
   solrWarFile: ./solr-wars/solr-${solr.undertow.solrVersion}.zip
 }
diff --git a/gradle.properties b/gradle.properties
index 61eebd2..c85708c 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,12 +1,12 @@
 group=uy.kohesive.solr
-version=1.6.0-RC-3
+version=1.6.0
 
 systemProp.file.encoding=UTF-8
 
 version_kotlin=1.0.0
 
-version_undertow=1.3.0.Final
-version_solr=5.4.1
+version_undertow=1.3.18.Final
+version_solr=5.5.0
 
 version_klutter=1.15.1
 version_typesafe_config=1.2.1
diff --git a/src/main/kotlin/uy/kohesive/solr/undertow/SolrUndertow.kt b/src/main/kotlin/uy/kohesive/solr/undertow/SolrUndertow.kt
index 032b406..3a32340 100644
--- a/src/main/kotlin/uy/kohesive/solr/undertow/SolrUndertow.kt
+++ b/src/main/kotlin/uy/kohesive/solr/undertow/SolrUndertow.kt
@@ -424,7 +424,9 @@ class Server(cfgLoader: ServerConfigLoader) {
         val pathHandler = Handlers.path(Handlers.redirect(cfg.solrContextPath.mustEndWith('/')+"index.html"))
                 .addPrefixPath(cfg.solrContextPath, wrappedHandlers)
 
-        return ServletDeploymentAndHandler(servletDeploymentMgr, pathHandler)
+        val oldAdminUiFixer = Handlers.path(pathHandler).addExactPath(cfg.solrContextPath, Handlers.redirect(cfg.solrContextPath.mustEndWith('/')+"admin.html"))
+
+        return ServletDeploymentAndHandler(servletDeploymentMgr, oldAdminUiFixer)
     }
 
     private class RequestLimitHelper(private val rlCfg: RequestLimitConfig) {