Merge branch 'release/1.0.0-alpha.3'

CHANGELOG.md

@@ -1,5 +1,14 @@
 # Change Log
 
+## [v1.0.0-alpha.3](https://github.com/paxtonhare/marklogic-debugger/tree/v1.0.0-alpha.3)
+
+[Full Changelog](https://github.com/paxtonhare/marklogic-debugger/compare/v1.0.0-alpha.2...v1.0.0-alpha.3)
+
+**Closed issues:**
+
+- Create a custom session name to avoid stomping on other appservers [\#9](https://github.com/paxtonhare/marklogic-debugger/issues/9)
+- Change to non-8080 port [\#8](https://github.com/paxtonhare/marklogic-debugger/issues/8)
+
 ## [v1.0.0-alpha.2](https://github.com/paxtonhare/marklogic-debugger/tree/v1.0.0-alpha.2) (2017-02-09)
 [Full Changelog](https://github.com/paxtonhare/marklogic-debugger/compare/1.0.0-alpha.1...v1.0.0-alpha.2)
 
@@ -15,4 +24,4 @@
 ## [1.0.0-alpha.1](https://github.com/paxtonhare/marklogic-debugger/tree/1.0.0-alpha.1) (2017-02-02)
 
 
-\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
+\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*

README.md

@@ -12,11 +12,11 @@ Run it with:
 
 `java -jar marklogic-debugger.war`
 
-Open your browser to [http://localhost:8080](http://localhost:8080)
+Open your browser to [http://localhost:9999](http://localhost:9999)
 
 ##### Changing the port
 
-Want to use a port other than 8080? Run it like this:
+Want to use a port other than 9999? Run it like this:
 
 `java -jar marklogic-debugger.war --server.port=8090`
 

gradle.properties

@@ -1,2 +1,2 @@
-version=1.0.0-alpha.2
+version=1.0.0-alpha.3
 

proxy.config.json

@@ -1,6 +1,6 @@
 {
   "/api/*": {
-    "target": "http://localhost:8080",
+    "target": "http://localhost:9999",
     "secure": false
   }
 }

src/main/resources/application.properties

@@ -12,7 +12,7 @@ mlRestAdminUsername=admin
 mlRestAdminPassword=admin
 
 # Spring Boot property for the port that the app server runs on
-server.port=8080
+server.port=9999
 
 # By default, enable the dev profile
 spring.profiles.active=dev
@@ -22,3 +22,9 @@ spring.thymeleaf.cache=false
 
 # No need to restart when a web file is modified
 spring.devtools.restart.exclude=static/**,templates/**
+
+# The cookie name is application-specific so it doesn't conflict with other Spring Boot-based apps
+server.session.cookie.name=marklogicDebuggerSessionid
+
+# Default the timeout to 10 hours (Spring Boot docs say this is in seconds, but it seems to be minutes instead)
+server.session.timeout=600