Mateusz Warowny [Wed, 13 Oct 2021 13:30:56 +0000 (15:30 +0200)]
JAL-3878 Add getCalcName to AlignCalcWorkerI.
getCalcName() can be used to identify services that run the calculator.
when an alternative calculator (different host or parameters) is created
the old ones sharing the name can be stopped.
Mateusz Warowny [Wed, 13 Oct 2021 11:58:31 +0000 (13:58 +0200)]
JAL-3878 Rename web service worker to more generic pollable task.
Mateusz Warowny [Sat, 9 Oct 2021 13:01:38 +0000 (15:01 +0200)]
Update annotation operation WIP
Mateusz Warowny [Thu, 7 Oct 2021 13:31:07 +0000 (15:31 +0200)]
JAL-3878 Add dataset and viewport arguments to ResultSupplier.
Mateusz Warowny [Tue, 5 Oct 2021 16:07:34 +0000 (18:07 +0200)]
JAL-3878 Annotation operation skeleton.
Mateusz Warowny [Fri, 1 Oct 2021 15:35:55 +0000 (17:35 +0200)]
JAL-3878 Fix workers done condition to account for broken jobs.
Mateusz Warowny [Thu, 30 Sep 2021 16:26:24 +0000 (18:26 +0200)]
JAL-3878 Skip getting results of failed jobs.
Mateusz Warowny [Thu, 30 Sep 2021 15:08:32 +0000 (17:08 +0200)]
JAL-3878 Add job log messages reporting.
Mateusz Warowny [Thu, 30 Sep 2021 15:07:00 +0000 (17:07 +0200)]
JAL-3878 Fix null pointer exception when preparing empty sequences for job.
Mateusz Warowny [Thu, 30 Sep 2021 14:38:04 +0000 (16:38 +0200)]
JAL-3878 Fetch sequences for alignment on menu action, not creation.
Mateusz Warowny [Thu, 30 Sep 2021 12:23:49 +0000 (14:23 +0200)]
JAL-3878 Split web services menu entries by programs and hosts.
Mateusz Warowny [Wed, 29 Sep 2021 14:37:47 +0000 (16:37 +0200)]
JAL-3878 Add isInteractive() method to Operation interface.
Mateusz Warowny [Wed, 29 Sep 2021 13:45:55 +0000 (15:45 +0200)]
JAL-3878 Add getName() to Operation interface.
Mateusz Warowny [Mon, 27 Sep 2021 14:03:21 +0000 (16:03 +0200)]
JAL-3878 Wire web services logic to UI elements.
Mateusz Warowny [Fri, 24 Sep 2021 16:05:44 +0000 (18:05 +0200)]
JAL-3878 Fire service changed event after discovery task is done.
Mateusz Warowny [Fri, 24 Sep 2021 16:05:01 +0000 (18:05 +0200)]
JAL-3878 Fix incorrect value of isRunning in SlivkaWSDiscoverer
Mateusz Warowny [Fri, 24 Sep 2021 15:19:07 +0000 (17:19 +0200)]
JAL-3878 Move operation type from WebService to Operation.
Mateusz Warowny [Fri, 24 Sep 2021 14:04:04 +0000 (16:04 +0200)]
JAL-3878 Code reformatting.
Mateusz Warowny [Fri, 24 Sep 2021 13:49:24 +0000 (15:49 +0200)]
JAL-3878 Display results of completed alignment job
Mateusz Warowny [Fri, 24 Sep 2021 13:43:42 +0000 (15:43 +0200)]
JAL-3878 Change SERVER_ERROR.isSubmitted to false.
Some server errors may occur before the job is submitted.
It's safer to associate the error with the job not being
submitted.
Mateusz Warowny [Fri, 24 Sep 2021 13:08:34 +0000 (15:08 +0200)]
JAL-3878 Move WSJob instantiation out of WebService classes.
Mateusz Warowny [Mon, 20 Sep 2021 16:39:57 +0000 (18:39 +0200)]
JAL-3878 Implement AlignmentOperation WIP
Mateusz Warowny [Mon, 20 Sep 2021 16:30:24 +0000 (18:30 +0200)]
JAL-3878 Create interface for web service operations
Mateusz Warowny [Mon, 20 Sep 2021 16:29:16 +0000 (18:29 +0200)]
JAL-3878 Implement slivka web service and discoverer.
Mateusz Warowny [Mon, 20 Sep 2021 16:21:01 +0000 (18:21 +0200)]
JAL-3878 Add web service executor class and instantiate for each alignment viewport.
Mateusz Warowny [Mon, 20 Sep 2021 16:13:21 +0000 (18:13 +0200)]
JAL-3878 Create base interfaces for new web services.
Mateusz Warowny [Mon, 20 Sep 2021 15:23:06 +0000 (17:23 +0200)]
JAL-3878 Remove throws declaration from param store construction.
Mateusz Warowny [Fri, 3 Sep 2021 15:27:36 +0000 (17:27 +0200)]
JAL-3878 Create Slivka Web Service adapter.
Mateusz Warowny [Wed, 3 Feb 2021 15:14:50 +0000 (16:14 +0100)]
JAL-3878 Initial preparation.
Mateusz Warowny [Wed, 28 Jul 2021 10:36:30 +0000 (12:36 +0200)]
Merge branch 'improvement/JAL-3848_slivka_0.8' into alpha/JAL-3066_Jalview_212_slivka-integration
Mateusz Warowny [Tue, 27 Jul 2021 15:36:15 +0000 (17:36 +0200)]
Merge branch 'bug/JAL-3807_jpred-with-slivka' into alpha/JAL-3066_Jalview_212_slivka-integration
Mateusz Warowny [Tue, 27 Jul 2021 11:00:36 +0000 (13:00 +0200)]
Merge commit '
0b438477b16470202bddfecb54e0587036b37202' into alpha/JAL-3066_Jalview_212_slivka-integration
Mateusz Warowny [Thu, 4 Mar 2021 13:59:48 +0000 (14:59 +0100)]
JAL-3066 Fix NullPointerException thrown when showing HMMER run dialog
Jim Procter [Sun, 25 Jul 2021 16:48:01 +0000 (17:48 +0100)]
JAL-3854 patched SeqSeqUtils.deUniquify to not use instanceOf - seems to work
Jim Procter [Sun, 25 Jul 2021 15:23:50 +0000 (16:23 +0100)]
JAL-2994 disable tests for FileUtils path search methods on bamboo
Jim Procter [Sun, 25 Jul 2021 15:08:03 +0000 (16:08 +0100)]
JAL-3848 slivka preferences in javascript
Jim Procter [Sun, 25 Jul 2021 15:07:48 +0000 (16:07 +0100)]
JAL-3848 reinstate Fetch DB References submenu
Jim Procter [Sun, 25 Jul 2021 14:45:28 +0000 (15:45 +0100)]
JAL-3848 update jalview core with slivka classes, example file import and structure view
Jim Procter [Sun, 25 Jul 2021 14:51:04 +0000 (15:51 +0100)]
JAL-3848 add compbio and jalview to direct connection list for J2S
Jim Procter [Sun, 25 Jul 2021 14:04:29 +0000 (15:04 +0100)]
JAL-3853 - tweak test again - since failed a few commits after
f6cb90d43782ca99cf2b1cbee2dc76bca3d1d466
Jim Procter [Sun, 25 Jul 2021 13:47:40 +0000 (14:47 +0100)]
JAL-3848 update swingJS runtime and transpiler to 3.3.1
Jim Procter [Sun, 25 Jul 2021 13:16:07 +0000 (14:16 +0100)]
Merge branch 'improvement/JAL-3848_slivka_0.8' of https://source.jalview.org/git/jalview into improvement/JAL-3848_slivka_0.8
Mateusz Warowny [Fri, 23 Jul 2021 12:12:00 +0000 (14:12 +0200)]
JAL-3848 Update slivka client javajs library.
Jim Procter [Fri, 26 Jun 2020 16:12:31 +0000 (17:12 +0100)]
JAL-3671 hardwire log4j.root logger to INFO to supress jetty and httpclient log output
Jim Procter [Thu, 22 Jul 2021 19:44:06 +0000 (20:44 +0100)]
JAL-3848 enable slivka services dialog in JalviewJS
Jim Procter [Thu, 22 Jul 2021 19:41:26 +0000 (20:41 +0100)]
JAL-3853 JAL-1870 toggle to enable/disable posterior probability transparency when rendering per sequence annotation row scores .. needs more work
Jim Procter [Thu, 22 Jul 2021 19:40:29 +0000 (20:40 +0100)]
JAL-3853 JAL-1870 patch tests for annotation colour gradient without transparency/per sequence annotation score encoding
Jim Procter [Thu, 22 Jul 2021 19:37:51 +0000 (20:37 +0100)]
JAL-1950 patch groovy bootstrap for importing hmmer3 json
Jim Procter [Thu, 22 Jul 2021 19:36:13 +0000 (20:36 +0100)]
JAL-3853 patch sequence annotation report code and tweak the test. When merging from 2.11.2 develop there will be conflicts that need merging re HTMLXML tags
Jim Procter [Thu, 22 Jul 2021 17:04:01 +0000 (18:04 +0100)]
JAL-3848 ensure annotation from a service gets a calcId so it can be updated and tracked across multiple views - nb - service.getId() probably isn’t the right value to use for this!
Jim Procter [Thu, 22 Jul 2021 17:02:19 +0000 (18:02 +0100)]
JAL-3848 don’t include sequence limits in sequence id as it confuses slivka-0.8’s jalview-feature-file creation script
Jim Procter [Thu, 22 Jul 2021 17:00:55 +0000 (18:00 +0100)]
JAL-3848 - actually test the Slivka and JABAWS disorder services - nb still need asserts to verify the disorder annotation from Slivka looks like Jabaws
Mateusz Warowny [Wed, 21 Jul 2021 16:08:38 +0000 (18:08 +0200)]
JAL-3848 print exception for failed align jobs
Mateusz Warowny [Wed, 21 Jul 2021 16:06:57 +0000 (18:06 +0200)]
JAL-3848 add latest slivka-client fixes.
Mateusz Warowny [Fri, 9 Jul 2021 14:57:28 +0000 (16:57 +0200)]
Merge branch 'jpred-fix' into bug/JAL-3807_jpred-with-slivka
Mateusz Warowny [Fri, 9 Jul 2021 14:44:53 +0000 (16:44 +0200)]
JAL-3807 Fix SlivkaWSInstance not fetching alignments.
Mateusz Warowny [Fri, 9 Jul 2021 11:09:43 +0000 (13:09 +0200)]
Merge branch 'bug/JAL-3849_aacon-parameters' into improvement/JAL-3848_slivka_0.8
Mateusz Warowny [Fri, 9 Jul 2021 10:38:17 +0000 (12:38 +0200)]
JAL-3690 Remove references to old AlignCalcManager.
Mateusz Warowny [Thu, 8 Jul 2021 13:39:16 +0000 (15:39 +0200)]
JAL-3848 SlivkaParamSet: reformat code and add service description.
Mateusz Warowny [Tue, 6 Jul 2021 13:42:38 +0000 (15:42 +0200)]
JAL-3848 Update slivka client library.
Mateusz Warowny [Thu, 8 Jul 2021 13:43:22 +0000 (15:43 +0200)]
JAL-3849 Remove join() which blocked the ui.
Mateusz Warowny [Fri, 12 Feb 2021 16:19:54 +0000 (17:19 +0100)]
JAL-3807 - Add single sequence capabilities to jws2.JPredClient
Mateusz Warowny [Fri, 12 Feb 2021 11:26:20 +0000 (12:26 +0100)]
JAL-3807 - Move new JPred client to the jws2 package.
Mateusz Warowny [Thu, 11 Feb 2021 16:15:25 +0000 (17:15 +0100)]
JAL-3807 - Re-implement results processing.
Mateusz [Wed, 27 Jan 2021 17:11:16 +0000 (18:11 +0100)]
JAL-3807 JPred can now successfully submit and track the job.
Mateusz Warowny [Mon, 22 Feb 2021 12:20:38 +0000 (13:20 +0100)]
Merge branch 'bug/JAL-3809_ws_params_dialog_fix' into alpha/JAL-3066_Jalview_212_slivka-integration
Mateusz Warowny [Mon, 22 Feb 2021 12:05:40 +0000 (13:05 +0100)]
Merge branch 'bug/JAL-3810_annotation_ws_stopping_abruptly' into bug/JAL-3809_ws_params_dialog_fix
Mateusz Warowny [Wed, 3 Feb 2021 18:48:32 +0000 (19:48 +0100)]
JAL-3809 - Fixed param edit dialog for jalviewjs.
Edit settings dialog now works asynchronously.
Annotation services still do not add annotations to the sequences.
Mateusz Warowny [Mon, 22 Feb 2021 11:48:21 +0000 (12:48 +0100)]
Merge branch 'feature/JAL-3690_callback-based-web-services' into alpha/JAL-3066_Jalview_212_slivka-integration
Mateusz [Thu, 21 Jan 2021 15:44:25 +0000 (16:44 +0100)]
Merge branch 'feature/JAL-3690_callback-based-web-services' into alpha/JAL-3066_Jalview_212_slivka-integration
Mateusz Warowny [Fri, 5 Feb 2021 14:49:34 +0000 (15:49 +0100)]
JAL-3810 - Add trace method to javascript implementation of Logger
Mateusz Warowny [Fri, 5 Feb 2021 14:48:58 +0000 (15:48 +0100)]
JAL-3810 - Replace log.trace() calls with log.debug()
Mateusz [Wed, 27 Jan 2021 14:36:07 +0000 (15:36 +0100)]
JAL-3690 Introduce AlignCalcManager2 tests.
Mateusz [Fri, 22 Jan 2021 14:20:31 +0000 (15:20 +0100)]
Merge branch 'Jalview-JS/develop' into feature/JAL-3690_callback-based-web-services
Mateusz [Tue, 19 Jan 2021 17:29:42 +0000 (18:29 +0100)]
JAL-3690 AlignCalcManager - add full support for oneshot workers
Mateusz [Tue, 19 Jan 2021 16:10:27 +0000 (17:10 +0100)]
JAL-3690 AACon ws menu entry fix.
Mateusz [Mon, 18 Jan 2021 16:50:46 +0000 (17:50 +0100)]
JAL-3690 Allow unregistered workers to be run with CalcManager.
Mateusz [Mon, 18 Jan 2021 16:50:17 +0000 (17:50 +0100)]
JAL-3690 Fix typo in enum name in slivka client.
Mateusz [Fri, 15 Jan 2021 18:21:47 +0000 (19:21 +0100)]
JAL-3690 Fixed slivka wsmenu categories.
Mateusz [Mon, 18 Jan 2021 12:51:00 +0000 (13:51 +0100)]
Merge remote-tracking branch 'origin/merge/Jalview-JS/develop_feature/JAL-3690_callback-based-web-services' into feature/JAL-3690_callback-based-web-services
Ben Soares [Mon, 11 Jan 2021 21:30:56 +0000 (21:30 +0000)]
JAL-3789 Use j2s.config.altfileproperty in .j2s for alternative temporary build/jalviewjs/config/j2s settings file when running a headless build in gradle
Ben Soares [Mon, 11 Jan 2021 21:28:56 +0000 (21:28 +0000)]
JAL-3789 New swingjs for Java2Script 3.2.10 with j2s.config.altfileproperty
Jim Procter [Fri, 18 Dec 2020 11:37:02 +0000 (11:37 +0000)]
JAL-3690 recoded AWSThread to use javax.swing.Timer (see https://github.com/BobHanson/java2script/issues/195#issuecomment-
747695834 )- web service submission works, but doesn’t seem to be happening as a background task.
Jim Procter [Thu, 17 Dec 2020 16:31:10 +0000 (16:31 +0000)]
JAL-3690 patch out use of java.streams/spliterator not supported in java2script (yet)
Jim Procter [Tue, 15 Dec 2020 19:04:36 +0000 (19:04 +0000)]
JAL-3690 tweak J2S direct DB access registration for jalview, compbio and other sites
Jim Procter [Tue, 15 Dec 2020 18:46:26 +0000 (18:46 +0000)]
JAL-3690 direct access to slivka, compbio, jalview.org and localhost/loopback.
Jim Procter [Tue, 15 Dec 2020 18:45:32 +0000 (18:45 +0000)]
JAL-3690 patch out need for java.time in j2s (see https://github.com/BobHanson/java2script/issues/194 )
Jim Procter [Tue, 15 Dec 2020 18:42:37 +0000 (18:42 +0000)]
JAL-3690 patch out spinning animation for web service jobs
Jim Procter [Tue, 15 Dec 2020 11:53:50 +0000 (11:53 +0000)]
JAL-3690 disable proxy server for JalviewJS
Jim Procter [Mon, 14 Dec 2020 19:58:34 +0000 (19:58 +0000)]
Merge branch 'Jalview-JS/develop' into merge_js_develop
also patched new code from JAL-3690 refactorings
Jim Procter [Mon, 14 Dec 2020 16:27:15 +0000 (16:27 +0000)]
Merge branch 'Jalview-JS/develop_j2s_v3_2_9_j11' into Jalview-JS/develop
Mateusz [Fri, 11 Dec 2020 14:33:14 +0000 (15:33 +0100)]
JAL-3690 Let's enable web services (seriously this time)
Jim Procter [Thu, 10 Dec 2020 17:50:05 +0000 (17:50 +0000)]
JAL-3223 - update swingjs to 3.2.9-j11
Mateusz Waronwy [Fri, 27 Nov 2020 16:01:14 +0000 (17:01 +0100)]
JAL-3690 List.copyOf() workaround
Mateusz Waronwy [Fri, 13 Nov 2020 15:51:38 +0000 (16:51 +0100)]
JAL-3690 separate startup and poll code in SeqAnnotationCalcWorker
Mateusz Waronwy [Thu, 12 Nov 2020 15:13:36 +0000 (16:13 +0100)]
JAL-3690 - fixed state inconsistency when restarting the calcworker
Mateusz Waronwy [Wed, 11 Nov 2020 18:42:48 +0000 (19:42 +0100)]
JAL-3690 partially reworked AlignCalcManager
todo:
- modify SeqAnnotationServiceCalcWorker to implement PollableAlignCalcWorkerI
- fix race condition where worker state gets overriden by the old job (QUEUED to IDLE)
Mateusz Waronwy [Mon, 26 Oct 2020 12:20:00 +0000 (13:20 +0100)]
JAL-3690 - introduce shutdown method that cleans up manager's resources.
Mateusz Waronwy [Wed, 21 Oct 2020 14:18:05 +0000 (16:18 +0200)]
JAL-3690 Documentation for AlignCalcListener
Mateusz Waronwy [Wed, 21 Oct 2020 13:54:13 +0000 (15:54 +0200)]
JAL-3690 Catch and notify about worker cancellation separately.