| @@ -42,12 +42,13 @@ |
| resources.add(csip.CatalogService.class); |
| resources.add(csip.ControlService.class); |
| resources.add(csip.DynamicPyModelDataService.class); |
| + resources.add(csip.GzipWriterInterceptor.class); |
| resources.add(csip.QueryService.class); |
| resources.add(csip.QueueingModelDataService.class); |
| resources.add(csip.ReportService.class); |
| resources.add(csip.UIService.class); |
| resources.add(m.oms.ages.V1_0.class); |
| - resources.add(m.oms.dsl.V1_0.class); |
| + resources.add(m.oms.dsl.V1_0.class); |
| } |
| |
| } |
| @@ -21,6 +21,7 @@ |
| import static m.oms.ages.V1_0.KEY_SCRIPT_NP; |
| import static m.oms.ages.V1_0.KEY_SCRIPT_NP3; |
| import static m.oms.ages.V1_0.KEY_SCRIPT_NP30; |
| +import static m.oms.ages.V1_0.KEY_SCRIPT_NP300; |
| import static m.oms.ages.V1_0.KEY_SCRIPT_NP3000; |
| import static m.oms.ages.V1_0.KEY_SCRIPT_NPBDCW; |
| import ngmf.util.cosu.luca.of.NS; |
| @@ -51,6 +52,7 @@ |
| @Resource(file = "${csip.dir}/bin/ages/simulation/ages_noPL.sim", type = REFERENCE, id = KEY_SCRIPT_NP) |
| @Resource(file = "${csip.dir}/bin/ages/simulation/ages_noPLSFIR3.sim", type = REFERENCE, id = KEY_SCRIPT_NP3) |
| @Resource(file = "${csip.dir}/bin/ages/simulation/ages_noPLSFIR30.sim", type = REFERENCE, id = KEY_SCRIPT_NP30) |
| +@Resource(file = "${csip.dir}/bin/ages/simulation/ages_noPLSFIR300.sim", type = REFERENCE, id = KEY_SCRIPT_NP300) |
| @Resource(file = "${csip.dir}/bin/ages/simulation/ages_noPLSFIR3000.sim", type = REFERENCE, id = KEY_SCRIPT_NP3000) |
| @Resource(file = "${csip.dir}/bin/ages/simulation/ages_noPLBDCW.sim", type = REFERENCE, id = KEY_SCRIPT_NPBDCW) |
| public class V1_0 extends ModelDataService { |
| @@ -59,6 +61,7 @@ |
| public static final String KEY_SCRIPT_NP = "ages_noPL.sim"; // no payload script |
| public static final String KEY_SCRIPT_NP3 = "ages_noPLSFIR3.sim"; // no payload script |
| public static final String KEY_SCRIPT_NP30 = "ages_noPLSFIR30.sim"; // no payload script |
| + public static final String KEY_SCRIPT_NP300 = "ages_noPLSFIR300.sim"; // no payload script |
| public static final String KEY_SCRIPT_NP3000 = "ages_noPLSFIR3000.sim"; // no payload script |
| public static final String KEY_SCRIPT_NPBDCW = "ages_noPLBDCW.sim"; // no payload script |
| public static final String RUN_INC = "run.inc"; |
| @@ -236,13 +239,14 @@ |
| dsl = parameter().getString(KEY_SCRIPT_NP30, |
| resources().getFile(KEY_SCRIPT_NP30).toString()); |
| } |
| + if (project.equals("SFIR300")) { |
| + dsl = parameter().getString(KEY_SCRIPT_NP300, |
| + resources().getFile(KEY_SCRIPT_NP300).toString()); |
| + } |
| if (project.equals("SFIR3000")) { |
| dsl = parameter().getString(KEY_SCRIPT_NP3000, |
| resources().getFile(KEY_SCRIPT_NP3000).toString()); |
| } |
| - if (project.equals("SFIR300")) { |
| - throw new IllegalArgumentException(" NO SFIR 300 data available"); |
| - } |
| if (project.equals("BDCW")) { |
| dsl = parameter().getString(KEY_SCRIPT_NPBDCW, |
| resources().getFile(KEY_SCRIPT_NPBDCW).toString()); |
| @@ -1,7 +1,7 @@ |
| { |
| - "csip.context.version": "$version: 0.1.40 6fa494a6e98e 2020-04-02 od, built at 2020-04-02 10:17 by od$", |
| - "oms.java.home": "/opt/jdk1.8.0_51", |
| + "csip.context.version": "$version: 0.1.54 default 66 3cfae323effe 2020-09-09 holm, built at 2020-10-02 15:21 by ho$", |
| + "oms.java.home": "/usr/lib/jvm/java-8-openjdk-amd64", |
| "csip.keepworkspace": false, |
| - "csip.session.ttl": "PT10S", |
| + "csip.session.ttl": "PT60S", |
| "csip.response.stacktrace": true |
| } |