Skip to content

Commit 01553ce

Browse files
committed
Refactor JBrowse pipeline steps to allow registration on cluster startup
1 parent 0f15349 commit 01553ce

File tree

4 files changed

+34
-2
lines changed

4 files changed

+34
-2
lines changed

jbrowse/src/org/labkey/jbrowse/JBrowseModule.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,10 @@ public void doStartupAfterSpringConfig(ModuleContext moduleContext)
110110

111111
WebdavService.get().registerPreGzippedExtensions("jsonz");
112112
WebdavService.get().registerPreGzippedExtensions("txtz");
113+
}
113114

115+
public static void registerPipelineSteps()
116+
{
114117
SequencePipelineService.get().registerPipelineStep(new IndexVariantsStep.Provider());
115118
}
116119

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
package org.labkey.jbrowse;
2+
3+
import org.apache.logging.log4j.LogManager;
4+
import org.apache.logging.log4j.Logger;
5+
6+
public class PipelineStartup
7+
{
8+
private static final Logger _log = LogManager.getLogger(PipelineStartup.class);
9+
private static boolean _hasRegistered = false;
10+
11+
public PipelineStartup()
12+
{
13+
if (_hasRegistered)
14+
{
15+
_log.warn("JBrowse resources have already been registered, skipping");
16+
}
17+
else
18+
{
19+
_log.info("Registering JBrowse resources");
20+
JBrowseModule.registerPipelineSteps();
21+
_hasRegistered = true;
22+
}
23+
}
24+
}

jbrowse/webapp/WEB-INF/jbrowse/jbrowseContext.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,9 @@
3131
</list>
3232
</property>
3333
</bean>
34+
35+
<!-- This is intended to force registration of the PipelineSteps -->
36+
<bean id="pipelineStartup" class="org.labkey.jbrowse.PipelineStartup">
37+
38+
</bean>
3439
</beans>

singlecell/src/org/labkey/singlecell/pipeline/singlecell/CalculateUCellScores.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ public Provider()
2323
{
2424
super("CalculateUCellScores", "Calculate UCell Scores", "Seurat", "This will generate UCell scores for a set of pre-defined gene modules", Arrays.asList(
2525
SeuratToolParameter.create("storeRanks", "Store Ranks", "Passed directly to UCell::AddModuleScore_UCell.", "checkbox", new JSONObject(){{
26-
27-
}}, false),
26+
put("checked", true);
27+
}}, true),
2828
SeuratToolParameter.create("assayName", "Assay Name", "Passed directly to UCell::AddModuleScore_UCell.", "textfield", new JSONObject(){{
2929

3030
}}, "RNA"),

0 commit comments

Comments
 (0)