Merge branch 'develop'

Author: see-eff

.classpath

@@ -5,4 +5,19 @@
 /build/cfdistro
 /undertow
 /testlibs
-tests/resource/war/simple.war/WEB-INF/logs
+src/test/resources/war/simple.war/WEB-INF/urlrewrite.xml
+src/test/resources/war/simple.war/WEB-INF/logs/
+.gradle
+gradle-app.setting
+!gradle-wrapper.jar
+.gradletasknamecache
+#ignore the various too-lazy-to-fix-and-lame-anyway bash tests
+gradle/*.sh
+testwars
+#IDE files
+*.project
+.settings
+.idea
+*.iml
+*.ipr
+*.iws

.gitignore

@@ -1,17 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
 	<name>runwar</name>
-	<comment></comment>
-	<projects>
-	</projects>
+	<comment>RunWar Gradle build script</comment>
+	<projects/>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
+	</natures>
 	<buildSpec>
 		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
+			<arguments/>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
+			<arguments/>
 		</buildCommand>
 	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
+	<linkedResources/>
+	<filteredResources>
+		<filter>
+			<id>-855317344</id>
+			<name></name>
+			<type>10</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-false-false-org.cfmlprojects.*</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
 </projectDescription>

.project

@@ -0,0 +1,48 @@
+pipeline {
+    agent any
+
+    stages {
+		   stage('Preparation') { // for display purposes
+		      // Get some code from a GitHub repository
+		      git 'https://github.com/cfmlprojects/runwar.git'
+		   }
+		   stage('Build') {
+		      if (isUnix()) {
+		         sh "'$WORKSPACE/gradlew' publishRunwarPublicationToMavenRepository"
+		      } else {
+		         bat("$WORKSPACE/runwar" publishRunwarPublicationToMavenRepository)
+		      }
+		   }
+		   stage('Results') {
+		      junit '**/target/surefire-reports/TEST-*.xml'
+		      archive 'dist/*.jar'
+		   }
+    }
+
+    post {
+        always  {
+            echo "Build completed. currentBuild.result = ${currentBuild.result}"
+        }
+
+        changed {
+            echo 'Build result changed'
+
+            script {
+                if(currentBuild.result == 'SUCCESS') {
+                    echo 'Build has changed to SUCCESS status'
+                }
+            }
+        }
+
+        failure {
+            echo 'Build failed'
+        }
+
+        success {
+            echo 'Build was a success'
+        }
+        unstable {
+            echo 'Build has gone unstable'
+        }
+    }
+}

Jenkinsfile

@@ -0,0 +1,52 @@
+# RunWAR
+
+RunWAR is a web server targeted at running Java and  CFML applications, with some added features for Adobe ColdFusion and Lucee (configurable web/admin context locations, and opening the admin pages from the taskbar).
+
+## Lightweight
+
+RunWAR has a small memory footprint (10 MB on disk, ~5M min heap), while leveraging enterprise grade server technology-- and the inner workings are simple.  It starts up very fast and has very small overhead.  It's great for running sites on even limited hardware like a Raspberry Pi since it has a smaller footprint than, say, Tomcat.
+
+## Extensible
+
+As small as RunWAR is, it still packs a lot of features.  It can run any J2EE war including all recent versions of Adobe ColdFusion, Railo, and Lucee Server.  It has a powerful Java-based web server built in that provides:
+
+ * URL Rewriting
+ * Virtual directories
+ * Basic Authencitcation
+ * Custom error pages
+ * Full control of JVM args
+ * System tray integration for managing servers
+
+## Standards Compliant
+
+Runwar is powered under the hood by a project called *Undertow* which actually does all the work.
+
+> Undertow is a flexible performant web server written in java, providing both blocking and non-blocking API’s based on NIO.
+> http://undertow.io
+
+Undertow is what powers JBoss WildFly and is a very active project with tons of support for stuff like web sockets and HTTP 2.0 and has excellent performance.  
+
+## Usage
+RunWAR can be run from the commandline like so.  This will give you all the available options:
+```bash
+$> java -jar runwar-${version}.jar
+```
+
+To start a quick server, it would look like this:
+```bash
+$> java -jar runwar.jar -war "path/to/war" --background false
+```
+
+or
+
+```bash
+$> java -jar runwar.jar -war "path/to/war" --port 8787 --dirs "virtualdir=/path/to/dir,virtualdir2=/path/to/dir2" --background false
+```
+
+## CommandBox
+Runwar also powers the servers for CommandBox, a CLI, REPL, package manager, and server for CFML developers.  
+
+## License
+
+Source code for this project is licensed under the [MIT License (MIT)] (http://www.opensource.org/licenses/mit-license.php).
+

README.adoc

@@ -1,50 +1,4 @@
 # RunWAR
 
-RunWAR is a web server targeted at running Java and  CFML applications, with some added features for Adobe ColdFusion and Lucee (configurable web/admin context locations, and opening the admin pages from the taskbar).
-
-## Lightweight
-
-RunWAR has a small memory footprint (10 MB on disk, ~5M min heap), while leveraging enterprise grade server technology-- and the inner workings are simple.  It starts up very fast and has very small overhead.  It's great for running sites on even limited hardware like a Raspberry Pi since it has a smaller footprint than, say, Tomcat.
-
-## Extensible
-
-As small as RunWAR is, it still packs a lot of features.  It can run any J2EE war including all recent versions of Adobe ColdFusion, Railo, and Lucee Server.  It has a powerful Java-based web server built in that provides:
-* URL Rewriting
-* Virtual directories
-* Basic Authencitcation
-* Custom error pages
-* Full control of JVM args
-* System tray integration for managing servers
-
-## Standards Compliant
-
-Runwar is powered under the hood by a project called *Undertow* which actually does all the work.
-> Undertow is a flexible performant web server written in java, providing both blocking and non-blocking API’s based on NIO.
-> http://undertow.io
-
-Undertow is what powers JBoss WildFly and is a very active project with tons of support for stuff like web sockets and HTTP 2.0 and has excellent performance.  
-
-## Usage
-RunWAR can be run from the commandline like so.  This will give you all the available options:
-```bash
-$> java -jar runwar-${version}.jar
-```
-
-To start a quick server, it would look like this:
-```bash
-$> java -jar runwar.jar -war "path/to/war" --background false
-```
-
-or
-
-```bash
-$> java -jar runwar.jar -war "path/to/war" --port 8787 --dirs "virtualdir=/path/to/dir,virtualdir2=/path/to/dir2" --background false
-```
-
-## CommandBox
-Runwar also powers the servers for CommandBox, a CLI, REPL, package manager, and server for CFML developers.  
-
-## License
-
-Source code for this project is licensed under the [MIT License (MIT)] (http://www.opensource.org/licenses/mit-license.php).
+[README)](README.adoc)