Skip to content

Commit

Permalink
Merge branch 'master' into separate-classes
Browse files Browse the repository at this point in the history
  • Loading branch information
mosoriob authored Jul 25, 2023
2 parents c129bf6 + 794c264 commit 3652a98
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ public ExecutionConfig(PropertyListConfiguration serverConfig) {
}
}


@SuppressWarnings("rawtypes")
private ExecutionEngineConfig getExeEngine(HierarchicalConfiguration node) {
String name = node.getString("name");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ public class MainConfig {
public String exportCommunityUrl;
public String communityPath;


public MainConfig(
PropertyListConfiguration serverConfig,
HttpServletRequest request
Expand All @@ -44,6 +45,7 @@ public MainConfig(
if (serverConfig.containsKey(MAIN_CLIENTS_KEY)) {
this.clients = serverConfig.getString(MAIN_CLIENTS_KEY);
}

if (
serverConfig.containsKey(MAIN_METAWORKFLOWS_KEY)
) this.hasMetaWorkflows = serverConfig.getBoolean(MAIN_METAWORKFLOWS_KEY);
Expand All @@ -61,6 +63,7 @@ public MainConfig(
StorageConfig.COMMUNITY_RELATIVE_DIR;
}


public static String getMainLightReasonerKey() {
return MAIN_LIGHT_REASONER_KEY;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ private String obtainConfigPath(
return app.getInitParameter("config.file");
}


private PropertyListConfiguration loadConfigurationOnProps() {
PropertyListConfiguration props = new PropertyListConfiguration();
try {
Expand Down Expand Up @@ -91,6 +92,7 @@ private void getPlannerConfiguration(PropertyListConfiguration serverConfig) {
private void getEngineNodeConfiguration(
PropertyListConfiguration serverConfig
) {

this.executionConfig = new ExecutionConfig(serverConfig);
}

Expand Down

0 comments on commit 3652a98

Please sign in to comment.