test with Heliosearch solr distribution

kohesive · Aug 28, 2015 · 63bde67 · 63bde67
1 parent 592531d
commit 63bde67
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 4 deletions.
diff --git a/src/main/kotlin/org/bremeld/solr/undertow/SolrUndertow.kt b/src/main/kotlin/org/bremeld/solr/undertow/SolrUndertow.kt
@@ -219,11 +219,12 @@ public class Server(cfgLoader: ServerConfigLoader) {
             val rootDir = Files.newDirectoryStream(checkRootOfZip).firstOrNull()
             if (rootDir != null) {
                 val firstLevelDir = rootDir.getName(0).toString().mustNotStartWith('/').mustNotEndWith('/')
-                val checkInnerWarFilename = "/${firstLevelDir}/server/webapps/solr.war"
-                val checkInnerWar = checkZipFs.getPath(checkInnerWarFilename)
-                if (checkInnerWar.exists()) {
+                val checkInnerWar = checkZipFs.getPath("/${firstLevelDir}/server/webapps/solr.war")
+                val checkOldInnerWar =  checkZipFs.getPath("/${firstLevelDir}/example/webapps/solr.war")
+                val correctWar = if (checkInnerWar.exists()) { checkInnerWar } else { if (checkOldInnerWar.exists()) checkOldInnerWar else null  }
+                if (correctWar != null) {
                     val tempWar = tempDirThisSolr.resolve("extracted-solr.war")
-                    Files.copy(checkInnerWar, tempWar, StandardCopyOption.REPLACE_EXISTING, StandardCopyOption.COPY_ATTRIBUTES)
+                    Files.copy(correctWar, tempWar, StandardCopyOption.REPLACE_EXISTING, StandardCopyOption.COPY_ATTRIBUTES)
                     val warUri = URI("jar:file", tempWar.toString().mustStartWith('/'), null)
 
                     val warJarFs = try {

diff --git a/test-data/solr-standalone/solr-temp/.gitignore b/test-data/solr-standalone/solr-temp/.gitignore
@@ -1,2 +1,3 @@
 /4*/
 /5*/
+/hs_*/
diff --git a/test-data/solr-standalone/standalone-hs_0.09.from.zip.conf b/test-data/solr-standalone/standalone-hs_0.09.from.zip.conf
@@ -0,0 +1,11 @@
+solr.undertow: {
+  httpClusterPort: 8983
+  solrHome: "./solr-home"
+  solrLogs: "./solr-logs"
+  tempDir: "./solr-temp"
+  solrVersion: "hs_0.09"
+  solrWarFile: ../solr-wars/solr-${solr.undertow.solrVersion}.zip
+  shutdown: {
+     password: "diediedie"
+  }
+}