Updated version to 8.8

JaneliaSciComp · Dec 19, 2019 · dd69d31 · dd69d31
1 parent 04e9275
commit dd69d31
Show file tree

Hide file tree

Showing 22 changed files with 128 additions and 39 deletions.
diff --git a/modules/AdministrationGUI/pom.xml b/modules/AdministrationGUI/pom.xml
@@ -5,14 +5,14 @@
     <parent>
         <groupId>org.janelia</groupId>
         <artifactId>workstation</artifactId>
-        <version>8.7.1</version>
+        <version>8.8</version>
         <relativePath>../..</relativePath>
     </parent>
 
     <name>AdministrationGUI</name>
     <groupId>org.janelia.workstation</groupId>
     <artifactId>adminstration</artifactId>
-    <version>8.7.1</version>
+    <version>8.8</version>
     <packaging>nbm</packaging>
 
     <dependencies>

diff --git a/modules/CommonGUI/pom.xml b/modules/CommonGUI/pom.xml
@@ -5,14 +5,14 @@
     <parent>
         <groupId>org.janelia</groupId>
         <artifactId>workstation</artifactId>
-        <version>8.7.1</version>
+        <version>8.8</version>
         <relativePath>../..</relativePath>
     </parent>
 
     <name>CommonGUI</name>
     <groupId>org.janelia.workstation</groupId>
     <artifactId>common-gui</artifactId>
-    <version>8.7.1</version>
+    <version>8.8</version>
     <packaging>nbm</packaging>
 
     <dependencies>

diff --git a/modules/CommonLibraries/pom.xml b/modules/CommonLibraries/pom.xml
@@ -5,14 +5,14 @@
     <parent>
         <groupId>org.janelia</groupId>
         <artifactId>workstation</artifactId>
-        <version>8.7.1</version>
+        <version>8.8</version>
         <relativePath>../..</relativePath>
     </parent>
 
     <name>CommonLibraries</name>
     <groupId>org.janelia.workstation</groupId>
     <artifactId>libraries</artifactId>
-    <version>8.7.1</version>
+    <version>8.8</version>
     <packaging>nbm</packaging>
 
     <properties>

diff --git a/modules/Core/pom.xml b/modules/Core/pom.xml
@@ -5,14 +5,14 @@
     <parent>
         <groupId>org.janelia</groupId>
         <artifactId>workstation</artifactId>
-        <version>8.7.1</version>
+        <version>8.8</version>
         <relativePath>../..</relativePath>
     </parent>
 
     <name>Core</name>
     <groupId>org.janelia.workstation</groupId>
     <artifactId>core</artifactId>
-    <version>8.7.1</version>
+    <version>8.8</version>
     <packaging>nbm</packaging>
 
     <dependencies>

diff --git a/modules/DarculaLAF/pom.xml b/modules/DarculaLAF/pom.xml
@@ -5,14 +5,14 @@
     <parent>
         <groupId>org.janelia</groupId>
         <artifactId>workstation</artifactId>
-        <version>8.7.1</version>
+        <version>8.8</version>
         <relativePath>../..</relativePath>
     </parent>
 
     <name>DarculaLAF</name>
     <groupId>org.janelia.workstation</groupId>
     <artifactId>darcula</artifactId>
-    <version>8.7.1</version>
+    <version>8.8</version>
     <packaging>nbm</packaging>
 
     <dependencies>

diff --git a/modules/DataBrowser/pom.xml b/modules/DataBrowser/pom.xml
@@ -5,14 +5,14 @@
     <parent>
         <groupId>org.janelia</groupId>
         <artifactId>workstation</artifactId>
-        <version>8.7.1</version>
+        <version>8.8</version>
         <relativePath>../..</relativePath>
     </parent>
 
     <name>DataBrowser</name>
     <groupId>org.janelia.workstation</groupId>
     <artifactId>browser</artifactId>
-    <version>8.7.1</version>
+    <version>8.8</version>
     <packaging>nbm</packaging>
 
     <dependencies>

diff --git a/modules/DataBrowser/src/main/resources/console.properties b/modules/DataBrowser/src/main/resources/console.properties
@@ -0,0 +1,88 @@
+# This file is the main property file read by the Workstation at run time.
+#
+# To override any of these properties, add a new file in this same directory called "my.properties" and
+# put your properties there. That additional file will be ignored by Git.
+#
+
+# Name displayed in the title bar
+console.Title=Janelia Workstation
+
+# Version (must remain "DEV" on the master branch for the release build to work)
+console.versionNumber=DEV
+
+mainserver.name=localhost:8080
+
+interactive.server.url={mainserver.name}
+
+# API Gateway reverse-proxy
+api.gateway=http://{mainserver.name}
+
+# Authentication service for logging in and obtaining a JWT
+auth.rest.url=http://{mainserver.name}/api/rest-v2/auth
+
+async.services=http://{mainserver.name}/api/rest-v2/
+
+sync.services=http://{mainserver.name}/api/rest-v2/
+
+# Domain object metadata CRUD service
+domain.facade.rest.url={sync.services}
+
+# MouseLight data service for fetching octree tiles and KTX images over HTTP
+mouselight.rest.url={sync.services}
+
+# Jade Service for file access
+jadestorage.rest.url={api.gateway}/SCSW/JADEServices/v1
+console.webDavClient.baseUrl={jadestorage.rest.url}/webdav
+
+# Legacy JNP interface, used for submitting Tasks for execution in JACSv1, and for a few MouseLight data calls
+interactive.server.url=jacs.int.janelia.org
+
+# Web URLs exposed to the user
+webstation.url=http://webstation.int.janelia.org
+workstation.url=http://workstation.int.janelia.org
+splitgen.url=http://stable-split.int.janelia.org
+manual.url=http://wiki.int.janelia.org/wiki/display/JW/Introduction
+manual.color.depth.url=http://wiki.int.janelia.org/wiki/display/JW/Color+Depth+Mask+Search
+
+# File shares
+remote.defaultMacPath=/Volumes/jacsData
+remote.defaultLinuxDataPath=/nrs/jacs/jacsData
+remote.defaultLinuxDeploymentPath=/groups/jacs/jacsShare
+remote.defaultWindowsPath=Q:
+remote.remoteMacMount=http://jacs/jacsData/
+remote.remoteWindowsMount=\\\\dm11\\jacsData
+
+# RabbitMQ messaging
+domain.msgserver.url=jacs-messaging.int.janelia.org
+domain.msgserver.useraccount=
+domain.msgserver.password=
+domain.msgserver.exchange.refresh=ModelRefresh
+domain.msgserver.exchange.updates=ModelUpdates
+domain.msgserver.routingkey.updates=brokerqueue
+
+# Configuration
+console.upload.StorageTags.nrs=nrs,prod,filestore,includesUserFolder
+console.upload.StorageTags.jade=jade,local,prod,includesUserFolder
+
+Console.Home.Path=/.JaneliaWorkstationSuite/Console/
+domain.facade.package=org.janelia.it.workstation.browser.api.facade.impl.rest
+console.FromEmail=[email protected]
+console.HelpEmail=[email protected]
+console.MailServer=mail.hhmi.org:25
+
+console.AutoSendExceptions=true
+console.WebService.startingPort=30001
+console.WebServer.startingPort=40001
+console.WebServer.proxyFiles=true
+console.images.workerThreads=50
+console.images.ayncCacheBehind=true
+SecondaryDataRemoval.stitched_file_rm_implications=org/janelia/it/workstation/browser/gui/dialogs/stitched_file_implications.html
+SecondaryDataRemoval.aa_rm_implications=org/janelia/it/workstation/browser/gui/dialogs/aa_implications.html
+SecondaryDataRemoval.neuron_sep_rm_implications=org/janelia/it/workstation/browser/gui/dialogs/neuron_separation_implications.html
+
+console.LVVHorta.tracersgroup=group:mouselight
+console.LVVHorta.activetracersgroup=group:mouselight_tracers
+console.lvv.volumes.cache.size=2
+console.lvv.tiles.cache.size=100
+
+console.startPage.showOnStartup=true
diff --git a/modules/GLViewerTools/pom.xml b/modules/GLViewerTools/pom.xml
@@ -5,14 +5,14 @@
     <parent>
         <groupId>org.janelia</groupId>
         <artifactId>workstation</artifactId>
-        <version>8.7.1</version>
+        <version>8.8</version>
         <relativePath>../..</relativePath>
     </parent>
 
     <name>GLViewerTools</name>
     <groupId>org.janelia.workstation</groupId>
     <artifactId>gltools</artifactId>
-    <version>8.7.1</version>
+    <version>8.8</version>
     <packaging>nbm</packaging>
 
     <dependencies>

diff --git a/modules/Geometry3d/pom.xml b/modules/Geometry3d/pom.xml
@@ -5,14 +5,14 @@
     <parent>
         <groupId>org.janelia</groupId>
         <artifactId>workstation</artifactId>
-        <version>8.7.1</version>
+        <version>8.8</version>
         <relativePath>../..</relativePath>
     </parent>
 
     <name>Geometry3d</name>
     <groupId>org.janelia.workstation</groupId>
     <artifactId>geometry3d</artifactId>
-    <version>8.7.1</version>
+    <version>8.8</version>
     <packaging>nbm</packaging>
 
     <dependencies>

diff --git a/modules/HortaTracer/pom.xml b/modules/HortaTracer/pom.xml
@@ -5,14 +5,14 @@
     <parent>
         <groupId>org.janelia</groupId>
         <artifactId>workstation</artifactId>
-        <version>8.7.1</version>
+        <version>8.8</version>
         <relativePath>../..</relativePath>
     </parent>
 
     <name>HortaTracer</name>
     <groupId>org.janelia.workstation</groupId>
     <artifactId>horta</artifactId>
-    <version>8.7.1</version>
+    <version>8.8</version>
     <packaging>nbm</packaging>
 
     <dependencies>

diff --git a/modules/IntegrationAPIs/pom.xml b/modules/IntegrationAPIs/pom.xml
@@ -5,14 +5,14 @@
     <parent>
         <groupId>org.janelia</groupId>
         <artifactId>workstation</artifactId>
-        <version>8.7.1</version>
+        <version>8.8</version>
         <relativePath>../..</relativePath>
     </parent>
 
     <name>IntegrationAPIs</name>
     <groupId>org.janelia.workstation</groupId>
     <artifactId>integration</artifactId>
-    <version>8.7.1</version>
+    <version>8.8</version>
     <packaging>nbm</packaging>
 
     <dependencies>

diff --git a/modules/Jogl213Lib/pom.xml b/modules/Jogl213Lib/pom.xml
@@ -5,14 +5,14 @@
     <parent>
         <groupId>org.janelia</groupId>
         <artifactId>workstation</artifactId>
-        <version>8.7.1</version>
+        <version>8.8</version>
         <relativePath>../..</relativePath>
     </parent>
 
     <name>Jogl213Lib</name>
     <groupId>org.janelia.workstation</groupId>
     <artifactId>jogl213lib</artifactId>
-    <version>8.7.1</version>
+    <version>8.8</version>
     <packaging>nbm</packaging>
 
     <dependencies>

diff --git a/modules/Jogl224Lib/pom.xml b/modules/Jogl224Lib/pom.xml
@@ -5,14 +5,14 @@
     <parent>
         <groupId>org.janelia</groupId>
         <artifactId>workstation</artifactId>
-        <version>8.7.1</version>
+        <version>8.8</version>
         <relativePath>../..</relativePath>
     </parent>
 
     <name>Jogl224Lib</name>
     <groupId>org.janelia.workstation</groupId>
     <artifactId>jogl224lib</artifactId>
-    <version>8.7.1</version>
+    <version>8.8</version>
     <packaging>nbm</packaging>
 
     <dependencies>

diff --git a/modules/LargeVolumeViewer/pom.xml b/modules/LargeVolumeViewer/pom.xml
@@ -5,14 +5,14 @@
     <parent>
         <groupId>org.janelia</groupId>
         <artifactId>workstation</artifactId>
-        <version>8.7.1</version>
+        <version>8.8</version>
         <relativePath>../..</relativePath>
     </parent>
 
     <name>LargeVolumeViewer</name>
     <groupId>org.janelia.workstation</groupId>
     <artifactId>large_volume_viewer</artifactId>
-    <version>8.7.1</version>
+    <version>8.8</version>
     <packaging>nbm</packaging>
 
     <dependencies>

diff --git a/modules/SceneWindow/pom.xml b/modules/SceneWindow/pom.xml
@@ -5,14 +5,14 @@
     <parent>
         <groupId>org.janelia</groupId>
         <artifactId>workstation</artifactId>
-        <version>8.7.1</version>
+        <version>8.8</version>
         <relativePath>../..</relativePath>
     </parent>
 
     <name>SceneWindow</name>
     <groupId>org.janelia.workstation</groupId>
     <artifactId>scenegraph</artifactId>
-    <version>8.7.1</version>
+    <version>8.8</version>
     <packaging>nbm</packaging>
 
     <dependencies>

diff --git a/modules/SiteJRC/pom.xml b/modules/SiteJRC/pom.xml
@@ -5,14 +5,14 @@
     <parent>
         <groupId>org.janelia</groupId>
         <artifactId>workstation</artifactId>
-        <version>8.7.1</version>
+        <version>8.8</version>
         <relativePath>../..</relativePath>
     </parent>
 
     <name>SiteJRC</name>
     <groupId>org.janelia.workstation</groupId>
     <artifactId>sitejrc</artifactId>
-    <version>8.7.1</version>
+    <version>8.8</version>
     <packaging>nbm</packaging>
 
     <dependencies>

diff --git a/modules/Viewer3D/pom.xml b/modules/Viewer3D/pom.xml
@@ -5,14 +5,14 @@
     <parent>
         <groupId>org.janelia</groupId>
         <artifactId>workstation</artifactId>
-        <version>8.7.1</version>
+        <version>8.8</version>
         <relativePath>../..</relativePath>
     </parent>
 
     <name>Viewer3D</name>
     <groupId>org.janelia.workstation</groupId>
     <artifactId>viewer3d</artifactId>
-    <version>8.7.1</version>
+    <version>8.8</version>
     <packaging>nbm</packaging>
 
     <dependencies>

diff --git a/modules/ViewerAPI/pom.xml b/modules/ViewerAPI/pom.xml
@@ -5,14 +5,14 @@
     <parent>
         <groupId>org.janelia</groupId>
         <artifactId>workstation</artifactId>
-        <version>8.7.1</version>
+        <version>8.8</version>
         <relativePath>../..</relativePath>
     </parent>
 
     <name>ViewerAPI</name>
     <groupId>org.janelia.workstation</groupId>
     <artifactId>viewerapi</artifactId>
-    <version>8.7.1</version>
+    <version>8.8</version>
     <packaging>nbm</packaging>
 
     <dependencies>

diff --git a/modules/application/pom.xml b/modules/application/pom.xml
@@ -5,14 +5,14 @@
     <parent>
         <groupId>org.janelia</groupId>
         <artifactId>workstation</artifactId>
-        <version>8.7.1</version>
+        <version>8.8</version>
         <relativePath>../..</relativePath>
     </parent>
 
     <name>Janelia Workstation</name>
     <groupId>org.janelia.workstation</groupId>
     <artifactId>application</artifactId>
-    <version>8.7.1</version>
+    <version>8.8</version>
     <packaging>nbm-application</packaging>
 
     <properties>