Skip to content

Commit

Permalink
undertow to 1.3.18.Final
Browse files Browse the repository at this point in the history
add config files for solr 5.5.0, make it default
fix old admin UI so it loads correctly
release 1.6.0
  • Loading branch information
apatrida committed Mar 9, 2016
1 parent 0449c37 commit f1d5252
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 5 deletions.
8 changes: 8 additions & 0 deletions example/example-solr-5.5.0.conf
Original file line number Diff line number Diff line change
@@ -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
}
2 changes: 1 addition & 1 deletion example/example.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
6 changes: 3 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 3 additions & 1 deletion src/main/kotlin/uy/kohesive/solr/undertow/SolrUndertow.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down

0 comments on commit f1d5252

Please sign in to comment.