From dd69d317a2df2b13ec3beb2e430311d24bde2e4b Mon Sep 17 00:00:00 2001 From: porterbot Date: Thu, 19 Dec 2019 04:59:56 -0500 Subject: [PATCH] Updated version to 8.8 --- modules/AdministrationGUI/pom.xml | 4 +- modules/CommonGUI/pom.xml | 4 +- modules/CommonLibraries/pom.xml | 4 +- modules/Core/pom.xml | 4 +- modules/DarculaLAF/pom.xml | 4 +- modules/DataBrowser/pom.xml | 4 +- .../src/main/resources/console.properties | 88 +++++++++++++++++++ modules/GLViewerTools/pom.xml | 4 +- modules/Geometry3d/pom.xml | 4 +- modules/HortaTracer/pom.xml | 4 +- modules/IntegrationAPIs/pom.xml | 4 +- modules/Jogl213Lib/pom.xml | 4 +- modules/Jogl224Lib/pom.xml | 4 +- modules/LargeVolumeViewer/pom.xml | 4 +- modules/SceneWindow/pom.xml | 4 +- modules/SiteJRC/pom.xml | 4 +- modules/Viewer3D/pom.xml | 4 +- modules/ViewerAPI/pom.xml | 4 +- modules/application/pom.xml | 4 +- modules/branding/pom.xml | 4 +- newmessaging/jacs-messaging | 1 + pom.xml | 2 +- 22 files changed, 128 insertions(+), 39 deletions(-) create mode 100644 modules/DataBrowser/src/main/resources/console.properties create mode 160000 newmessaging/jacs-messaging diff --git a/modules/AdministrationGUI/pom.xml b/modules/AdministrationGUI/pom.xml index dd2dac7806..8ce953c259 100644 --- a/modules/AdministrationGUI/pom.xml +++ b/modules/AdministrationGUI/pom.xml @@ -5,14 +5,14 @@ org.janelia workstation - 8.7.1 + 8.8 ../.. AdministrationGUI org.janelia.workstation adminstration - 8.7.1 + 8.8 nbm diff --git a/modules/CommonGUI/pom.xml b/modules/CommonGUI/pom.xml index dc0598775a..40bbd05ced 100644 --- a/modules/CommonGUI/pom.xml +++ b/modules/CommonGUI/pom.xml @@ -5,14 +5,14 @@ org.janelia workstation - 8.7.1 + 8.8 ../.. CommonGUI org.janelia.workstation common-gui - 8.7.1 + 8.8 nbm diff --git a/modules/CommonLibraries/pom.xml b/modules/CommonLibraries/pom.xml index 1857cd3080..955a4798dd 100644 --- a/modules/CommonLibraries/pom.xml +++ b/modules/CommonLibraries/pom.xml @@ -5,14 +5,14 @@ org.janelia workstation - 8.7.1 + 8.8 ../.. CommonLibraries org.janelia.workstation libraries - 8.7.1 + 8.8 nbm diff --git a/modules/Core/pom.xml b/modules/Core/pom.xml index b13cf1514a..565818a30b 100644 --- a/modules/Core/pom.xml +++ b/modules/Core/pom.xml @@ -5,14 +5,14 @@ org.janelia workstation - 8.7.1 + 8.8 ../.. Core org.janelia.workstation core - 8.7.1 + 8.8 nbm diff --git a/modules/DarculaLAF/pom.xml b/modules/DarculaLAF/pom.xml index c0c8d2447e..71a341811f 100644 --- a/modules/DarculaLAF/pom.xml +++ b/modules/DarculaLAF/pom.xml @@ -5,14 +5,14 @@ org.janelia workstation - 8.7.1 + 8.8 ../.. DarculaLAF org.janelia.workstation darcula - 8.7.1 + 8.8 nbm diff --git a/modules/DataBrowser/pom.xml b/modules/DataBrowser/pom.xml index a61be4ee19..7e10f4b3b3 100644 --- a/modules/DataBrowser/pom.xml +++ b/modules/DataBrowser/pom.xml @@ -5,14 +5,14 @@ org.janelia workstation - 8.7.1 + 8.8 ../.. DataBrowser org.janelia.workstation browser - 8.7.1 + 8.8 nbm diff --git a/modules/DataBrowser/src/main/resources/console.properties b/modules/DataBrowser/src/main/resources/console.properties new file mode 100644 index 0000000000..e8a7f5ba42 --- /dev/null +++ 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=jira-default@janelia.hhmi.org +console.HelpEmail=workstation-support@janelia.hhmi.org +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 \ No newline at end of file diff --git a/modules/GLViewerTools/pom.xml b/modules/GLViewerTools/pom.xml index 823e056ad5..c9d3e5d829 100644 --- a/modules/GLViewerTools/pom.xml +++ b/modules/GLViewerTools/pom.xml @@ -5,14 +5,14 @@ org.janelia workstation - 8.7.1 + 8.8 ../.. GLViewerTools org.janelia.workstation gltools - 8.7.1 + 8.8 nbm diff --git a/modules/Geometry3d/pom.xml b/modules/Geometry3d/pom.xml index d9cef8c20e..3c1d9153f9 100644 --- a/modules/Geometry3d/pom.xml +++ b/modules/Geometry3d/pom.xml @@ -5,14 +5,14 @@ org.janelia workstation - 8.7.1 + 8.8 ../.. Geometry3d org.janelia.workstation geometry3d - 8.7.1 + 8.8 nbm diff --git a/modules/HortaTracer/pom.xml b/modules/HortaTracer/pom.xml index f600332a9f..7aa64c5fd4 100644 --- a/modules/HortaTracer/pom.xml +++ b/modules/HortaTracer/pom.xml @@ -5,14 +5,14 @@ org.janelia workstation - 8.7.1 + 8.8 ../.. HortaTracer org.janelia.workstation horta - 8.7.1 + 8.8 nbm diff --git a/modules/IntegrationAPIs/pom.xml b/modules/IntegrationAPIs/pom.xml index 4c558d6633..51cc5d940c 100644 --- a/modules/IntegrationAPIs/pom.xml +++ b/modules/IntegrationAPIs/pom.xml @@ -5,14 +5,14 @@ org.janelia workstation - 8.7.1 + 8.8 ../.. IntegrationAPIs org.janelia.workstation integration - 8.7.1 + 8.8 nbm diff --git a/modules/Jogl213Lib/pom.xml b/modules/Jogl213Lib/pom.xml index 46ab6cf346..c5f88a8e92 100644 --- a/modules/Jogl213Lib/pom.xml +++ b/modules/Jogl213Lib/pom.xml @@ -5,14 +5,14 @@ org.janelia workstation - 8.7.1 + 8.8 ../.. Jogl213Lib org.janelia.workstation jogl213lib - 8.7.1 + 8.8 nbm diff --git a/modules/Jogl224Lib/pom.xml b/modules/Jogl224Lib/pom.xml index be5ca9eee8..bb329f58f3 100644 --- a/modules/Jogl224Lib/pom.xml +++ b/modules/Jogl224Lib/pom.xml @@ -5,14 +5,14 @@ org.janelia workstation - 8.7.1 + 8.8 ../.. Jogl224Lib org.janelia.workstation jogl224lib - 8.7.1 + 8.8 nbm diff --git a/modules/LargeVolumeViewer/pom.xml b/modules/LargeVolumeViewer/pom.xml index b3c0d10978..2588bfb678 100644 --- a/modules/LargeVolumeViewer/pom.xml +++ b/modules/LargeVolumeViewer/pom.xml @@ -5,14 +5,14 @@ org.janelia workstation - 8.7.1 + 8.8 ../.. LargeVolumeViewer org.janelia.workstation large_volume_viewer - 8.7.1 + 8.8 nbm diff --git a/modules/SceneWindow/pom.xml b/modules/SceneWindow/pom.xml index 29f910f858..c91c1440d5 100644 --- a/modules/SceneWindow/pom.xml +++ b/modules/SceneWindow/pom.xml @@ -5,14 +5,14 @@ org.janelia workstation - 8.7.1 + 8.8 ../.. SceneWindow org.janelia.workstation scenegraph - 8.7.1 + 8.8 nbm diff --git a/modules/SiteJRC/pom.xml b/modules/SiteJRC/pom.xml index 78520e4601..c7cde8c44d 100644 --- a/modules/SiteJRC/pom.xml +++ b/modules/SiteJRC/pom.xml @@ -5,14 +5,14 @@ org.janelia workstation - 8.7.1 + 8.8 ../.. SiteJRC org.janelia.workstation sitejrc - 8.7.1 + 8.8 nbm diff --git a/modules/Viewer3D/pom.xml b/modules/Viewer3D/pom.xml index 3d9ed8de38..d4e82caac7 100644 --- a/modules/Viewer3D/pom.xml +++ b/modules/Viewer3D/pom.xml @@ -5,14 +5,14 @@ org.janelia workstation - 8.7.1 + 8.8 ../.. Viewer3D org.janelia.workstation viewer3d - 8.7.1 + 8.8 nbm diff --git a/modules/ViewerAPI/pom.xml b/modules/ViewerAPI/pom.xml index 09af54ba04..8e60b044f0 100644 --- a/modules/ViewerAPI/pom.xml +++ b/modules/ViewerAPI/pom.xml @@ -5,14 +5,14 @@ org.janelia workstation - 8.7.1 + 8.8 ../.. ViewerAPI org.janelia.workstation viewerapi - 8.7.1 + 8.8 nbm diff --git a/modules/application/pom.xml b/modules/application/pom.xml index 2310a1fcb6..2f2394f3c2 100644 --- a/modules/application/pom.xml +++ b/modules/application/pom.xml @@ -5,14 +5,14 @@ org.janelia workstation - 8.7.1 + 8.8 ../.. Janelia Workstation org.janelia.workstation application - 8.7.1 + 8.8 nbm-application diff --git a/modules/branding/pom.xml b/modules/branding/pom.xml index b92b1633ef..ff2eb7e8bd 100644 --- a/modules/branding/pom.xml +++ b/modules/branding/pom.xml @@ -5,13 +5,13 @@ org.janelia workstation - 8.7.1 + 8.8 ../.. org.janelia.workstation branding - 8.7.1 + 8.8 nbm Branding diff --git a/newmessaging/jacs-messaging b/newmessaging/jacs-messaging new file mode 160000 index 0000000000..31fcab9abf --- /dev/null +++ b/newmessaging/jacs-messaging @@ -0,0 +1 @@ +Subproject commit 31fcab9abf2e619bd23fdcbdb792d5a461fb3d5b diff --git a/pom.xml b/pom.xml index a11482bd7e..64996fceaa 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ Janelia Workstation org.janelia workstation - 8.7.1 + 8.8 pom