Merge branch 'discvr-21.3' of https://github.com/BimberLab/DiscvrLabKeyModules into discvr-21.3

bbimber · bbimber · commit b8757fbf2103 · 2021-06-25T05:46:59.000-07:00
diff --git a/jbrowse/src/org/labkey/jbrowse/JBrowseController.java b/jbrowse/src/org/labkey/jbrowse/JBrowseController.java
@@ -767,10 +767,6 @@ public Object execute(GetSessionForm form, BindException errors) throws Exceptio
                 try (InputStream is = new FileInputStream(jsonFile))
                 {
                     resp = new JSONObject(IOUtils.toString(is, StandardCharsets.UTF_8));
-                    //String url = resp.getJSONArray("plugins").getJSONObject(0).getString("url");
-                    //url = url.replace("<CONTEXT_PATH>", AppProps.getInstance().getContextPath());
-                    //resp.getJSONArray("plugins").getJSONObject(0).put("url", url);
-                    //System.out.println(resp);
                 }
             }
             else

Original file line number	Diff line number	Diff line change
`@@ -767,10 +767,6 @@ public Object execute(GetSessionForm form, BindException errors) throws Exceptio`
`767`	`767`	`try (InputStream is = new FileInputStream(jsonFile))`
`768`	`768`	`{`
`769`	`769`	`resp = new JSONObject(IOUtils.toString(is, StandardCharsets.UTF_8));`
`770`		`- //String url = resp.getJSONArray("plugins").getJSONObject(0).getString("url");`
`771`		`- //url = url.replace("<CONTEXT_PATH>", AppProps.getInstance().getContextPath());`
`772`		`- //resp.getJSONArray("plugins").getJSONObject(0).put("url", url);`
`773`		`- //System.out.println(resp);`
`774`	`770`	`}`
`775`	`771`	`}`
`776`	`772`	`else`