Skip to content

Commit

Permalink
Merge 343648f into edb854e
Browse files Browse the repository at this point in the history
  • Loading branch information
@sylvlecl
sylvlecl committed Nov 2, 2018
2 parents edb854e + 343648f commit 35cd4d8
Show file tree
Hide file tree
Showing 23 changed files with 89 additions and 105 deletions.
22 changes: 11 additions & 11 deletions distribution/pom.xml
View file
Expand Up @@ -32,16 +32,16 @@
</dependency>

<dependency>
<groupId>eu.itesla_project</groupId>
<groupId>${project.groupId}</groupId>
<artifactId>online-mpi</artifactId>
<version>${project.version}</version>
</dependency>

<!-- Dynamic database (mysql) -->
<dependency>
<groupId>eu.itesla_project.iidm-ddb</groupId>
<groupId>${project.groupId}</groupId>
<artifactId>iidm-ddb-eurostag-import-export</artifactId>
<version>0.0.1-SNAPSHOT</version>
<version>${project.version}</version>
</dependency>

<!-- Data mining -->
Expand Down Expand Up @@ -79,51 +79,51 @@

<!-- load flow based simulator -->
<dependency>
<groupId>eu.itesla_project</groupId>
<groupId>${project.groupId}</groupId>
<artifactId>pclfsim-integration</artifactId>
<version>${project.version}</version>
</dependency>

<!-- offline DB -->
<dependency>
<groupId>eu.itesla_project</groupId>
<groupId>${project.groupId}</groupId>
<artifactId>mmap-offline-db</artifactId>
<version>${project.version}</version>
</dependency>

<!-- rules DB -->
<dependency>
<groupId>eu.itesla_project</groupId>
<groupId>${project.groupId}</groupId>
<artifactId>file-system-rules-db</artifactId>
<version>${project.version}</version>
</dependency>

<!-- uncertainties -->
<dependency>
<groupId>eu.itesla_project</groupId>
<groupId>${project.groupId}</groupId>
<artifactId>uncertainties-analysis</artifactId>
<version>${project.version}</version>
</dependency>

<!-- WCA -->
<dependency>
<groupId>eu.itesla_project</groupId>
<groupId>${project.groupId}</groupId>
<artifactId>wca-integration</artifactId>
<version>${project.version}</version>
</dependency>

<!-- XML contingencies -->
<dependency>
<groupId>eu.itesla_project</groupId>
<groupId>${project.groupId}</groupId>
<artifactId>iidm-actions-contingencies-xml-client</artifactId>
<version>${project.version}</version>
</dependency>

<!-- Modelica exporter -->
<dependency>
<groupId>eu.itesla_project.iidm-ddb</groupId>
<groupId>${project.groupId}</groupId>
<artifactId>iidm-ddb-eurostag-modelica-converter</artifactId>
<version>0.0.1-SNAPSHOT</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
Expand Down
4 changes: 2 additions & 2 deletions dymola-integration/pom.xml
View file
Expand Up @@ -62,9 +62,9 @@
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>eu.itesla_project.iidm-ddb</groupId>
<groupId>${project.groupId}</groupId>
<artifactId>iidm-ddb-eurostag-import-export</artifactId>
<version>0.0.1-SNAPSHOT</version>
<version>${project.version}</version>
</dependency>

<!-- Runtime dependencies -->
Expand Down
4 changes: 2 additions & 2 deletions eurostag-integration/pom.xml
View file
Expand Up @@ -65,9 +65,9 @@
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>eu.itesla_project.iidm-ddb</groupId>
<groupId>${project.groupId}</groupId>
<artifactId>iidm-ddb-eurostag-import-export</artifactId>
<version>0.0.1-SNAPSHOT</version>
<version>${project.version}</version>
</dependency>

<!-- Runtime dependencies -->
Expand Down
2 changes: 1 addition & 1 deletion iidm-actions-contingencies-xml-client/pom.xml
View file
Expand Up @@ -21,7 +21,7 @@
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>eu.itesla_project</groupId>
<groupId>${project.groupId}</groupId>
<artifactId>modules</artifactId>
<version>${project.version}</version>
</dependency>
Expand Down
12 changes: 7 additions & 5 deletions iidm-ddb/iidm-ddb-ear/pom.xml
View file
Expand Up @@ -13,8 +13,8 @@

<parent>
<artifactId>iidm-ddb</artifactId>
<groupId>eu.itesla_project.iidm-ddb</groupId>
<version>0.0.1-SNAPSHOT</version>
<groupId>eu.itesla_project</groupId>
<version>0.1-SNAPSHOT</version>
</parent>

<artifactId>iidm-ddb-ear</artifactId>
Expand All @@ -24,12 +24,12 @@
<dependencies>
<!-- Depend on the ejb module and war so that we can package them -->
<dependency>
<groupId>eu.itesla_project.iidm-ddb</groupId>
<groupId>${project.groupId}</groupId>
<artifactId>iidm-ddb-web</artifactId>
<type>war</type>
</dependency>
<dependency>
<groupId>eu.itesla_project.iidm-ddb</groupId>
<groupId>${project.groupId}</groupId>
<artifactId>iidm-ddb-ejb</artifactId>
<type>ejb</type>
</dependency>
Expand All @@ -50,13 +50,15 @@
have any modules (EJB-JARs and WARs) use them -->
<defaultLibBundleDir>lib</defaultLibBundleDir>
<applicationName>iidm-ddb-ear</applicationName>
<!-- to have the version out of the JNDI name -->
<fileNameMapping>no-version</fileNameMapping>
<modules>
<!-- Default context root of the web app is /iidm-ddb-web.
If a custom context root is needed, uncomment the following snippet to
register our War as a web module and set the contextRoot property -->
<!--
<webModule>
<groupId>eu.itesla_project.iidm-ddb</groupId>
<groupId>${project.groupId}</groupId>
<artifactId>iidm-ddb-web</artifactId>
<contextRoot>/iidm-ddb</contextRoot>
</webModule>
Expand Down
8 changes: 4 additions & 4 deletions iidm-ddb/iidm-ddb-ejb-remote-client-wildfly/pom.xml
View file
Expand Up @@ -13,8 +13,8 @@

<parent>
<artifactId>iidm-ddb</artifactId>
<groupId>eu.itesla_project.iidm-ddb</groupId>
<version>0.0.1-SNAPSHOT</version>
<groupId>eu.itesla_project</groupId>
<version>0.1-SNAPSHOT</version>
</parent>

<artifactId>iidm-ddb-ejb-remote-client-wildfly</artifactId>
Expand Down Expand Up @@ -82,9 +82,9 @@

<!-- We depend on the EJB remote interfaces of this application -->
<dependency>
<groupId>eu.itesla_project.iidm-ddb</groupId>
<groupId>${project.groupId}</groupId>
<artifactId>iidm-ddb-ejb</artifactId>
<version>0.0.1-SNAPSHOT</version>
<version>${project.version}</version>
<type>ejb-client</type>
</dependency>

Expand Down
4 changes: 2 additions & 2 deletions iidm-ddb/iidm-ddb-ejb/pom.xml
View file
Expand Up @@ -13,8 +13,8 @@

<parent>
<artifactId>iidm-ddb</artifactId>
<groupId>eu.itesla_project.iidm-ddb</groupId>
<version>0.0.1-SNAPSHOT</version>
<groupId>eu.itesla_project</groupId>
<version>0.1-SNAPSHOT</version>
</parent>

<artifactId>iidm-ddb-ejb</artifactId>
Expand Down
16 changes: 8 additions & 8 deletions iidm-ddb/iidm-ddb-eurostag-import-export/pom.xml
View file
Expand Up @@ -13,8 +13,8 @@

<parent>
<artifactId>iidm-ddb</artifactId>
<groupId>eu.itesla_project.iidm-ddb</groupId>
<version>0.0.1-SNAPSHOT</version>
<groupId>eu.itesla_project</groupId>
<version>0.1-SNAPSHOT</version>
</parent>

<artifactId>iidm-ddb-eurostag-import-export</artifactId>
Expand Down Expand Up @@ -61,22 +61,22 @@

<!-- We depend on the EJB remote interfaces of this application -->
<dependency>
<groupId>eu.itesla_project.iidm-ddb</groupId>
<groupId>${project.groupId}</groupId>
<artifactId>iidm-ddb-ejb</artifactId>
<version>0.0.1-SNAPSHOT</version>
<version>${project.version}</version>
<type>ejb-client</type>
</dependency>

<dependency>
<groupId>eu.itesla_project.iidm-ddb</groupId>
<groupId>${project.groupId}</groupId>
<artifactId>iidm-ddb-ejb-remote-client-wildfly</artifactId>
<version>0.0.1-SNAPSHOT</version>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>eu.itesla_project</groupId>
<groupId>${project.groupId}</groupId>
<artifactId>EU2Mod_MB</artifactId>
<version>${extends_ipst.version}</version>
<version>${project.version}</version>
<type>jar</type>
</dependency>

Expand Down
2 changes: 1 addition & 1 deletion ...import-export/src/main/java/eu/itesla_project/iidm/ddb/eurostag_imp_exp/DdbDtaImpExp.java
View file
Expand Up @@ -41,7 +41,7 @@ public class DdbDtaImpExp implements DynamicDatabaseClient {
private static final String MTC_PREFIX_NAME = "MTC_";

//DDBManager jndi name
private static final String DDBMANAGERJNDINAME = "ejb:iidm-ddb-ear/iidm-ddb-ejb-0.0.1-SNAPSHOT/DDBManagerBean!eu.itesla_project.iidm.ddb.service.DDBManager";
private static final String DDBMANAGERJNDINAME = "ejb:iidm-ddb-ear/iidm-ddb-ejb/DDBManagerBean!eu.itesla_project.iidm.ddb.service.DDBManager";
private static final String DICT_GENS_CSV = "dict_gens.csv";
private static final String SKIPPED_GENS_CSV = "skipped_gens.csv";

Expand Down
16 changes: 8 additions & 8 deletions iidm-ddb/iidm-ddb-eurostag-modelica-converter/pom.xml
View file
Expand Up @@ -13,8 +13,8 @@

<parent>
<artifactId>iidm-ddb</artifactId>
<groupId>eu.itesla_project.iidm-ddb</groupId>
<version>0.0.1-SNAPSHOT</version>
<groupId>eu.itesla_project</groupId>
<version>0.1-SNAPSHOT</version>
</parent>

<artifactId>iidm-ddb-eurostag-modelica-converter</artifactId>
Expand Down Expand Up @@ -102,22 +102,22 @@

<!-- We depend on the EJB remote interfaces of this application -->
<dependency>
<groupId>eu.itesla_project.iidm-ddb</groupId>
<groupId>${project.groupId}</groupId>
<artifactId>iidm-ddb-ejb</artifactId>
<version>0.0.1-SNAPSHOT</version>
<version>${project.version}</version>
<type>ejb-client</type>
</dependency>

<dependency>
<groupId>eu.itesla_project.iidm-ddb</groupId>
<groupId>${project.groupId}</groupId>
<artifactId>iidm-ddb-ejb-remote-client-wildfly</artifactId>
<version>0.0.1-SNAPSHOT</version>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>eu.itesla_project</groupId>
<groupId>${project.groupId}</groupId>
<artifactId>EU2Mod_MB</artifactId>
<version>${extends_ipst.version}</version>
<version>${project.version}</version>
</dependency>

<!-- Test dependencies -->
Expand Down
2 changes: 1 addition & 1 deletion ...ca-converter/src/main/java/eu/itesla_project/iidm/ddb/eurostag_modelica/DDBConverter.java
View file
Expand Up @@ -23,7 +23,7 @@
*/
public class DDBConverter {

private final String ddbManagerJNDIName = "ejb:iidm-ddb-ear/iidm-ddb-ejb-0.0.1-SNAPSHOT/DDBManagerBean!eu.itesla_project.iidm.ddb.service.DDBManager";
private final String ddbManagerJNDIName = "ejb:iidm-ddb-ear/iidm-ddb-ejb/DDBManagerBean!eu.itesla_project.iidm.ddb.service.DDBManager";
private DDBManager ddbManager;
private Context context = null;

Expand Down
12 changes: 6 additions & 6 deletions iidm-ddb/iidm-ddb-example-ejb-client/pom.xml
View file
Expand Up @@ -13,8 +13,8 @@

<parent>
<artifactId>iidm-ddb</artifactId>
<groupId>eu.itesla_project.iidm-ddb</groupId>
<version>0.0.1-SNAPSHOT</version>
<groupId>eu.itesla_project</groupId>
<version>0.1-SNAPSHOT</version>
</parent>

<artifactId>iidm-ddb-example-ejb-client</artifactId>
Expand Down Expand Up @@ -46,16 +46,16 @@

<!-- We depend on the EJB remote interfaces of this application -->
<dependency>
<groupId>eu.itesla_project.iidm-ddb</groupId>
<groupId>${project.groupId}</groupId>
<artifactId>iidm-ddb-ejb</artifactId>
<version>0.0.1-SNAPSHOT</version>
<version>${project.version}</version>
<type>ejb-client</type>
</dependency>

<dependency>
<groupId>eu.itesla_project.iidm-ddb</groupId>
<groupId>${project.groupId}</groupId>
<artifactId>iidm-ddb-ejb-remote-client-wildfly</artifactId>
<version>0.0.1-SNAPSHOT</version>
<version>${project.version}</version>
</dependency>

<dependency>
Expand Down
2 changes: 1 addition & 1 deletion ...b-client/src/main/java/eu/itesla_project/iidm/ddb/examples/ejbclient/RemoteEJBClient.java
View file
Expand Up @@ -33,7 +33,7 @@ public class RemoteEJBClient {
int DEFAULT_REMOTING_PORT = 8080;
String DEFAULT_USER = "user";
String DEFAULT_PASSWORD = "password";
String DDBMANAGERJNDINAME = "ejb:iidm-ddb-ear/iidm-ddb-ejb-0.0.1-SNAPSHOT/DDBManagerBean!eu.itesla_project.iidm.ddb.service.DDBManager";
String DDBMANAGERJNDINAME = "ejb:iidm-ddb-ear/iidm-ddb-ejb/DDBManagerBean!eu.itesla_project.iidm.ddb.service.DDBManager";

String TESTSIMULATORVERSION = "test_5.1.1";

Expand Down
12 changes: 6 additions & 6 deletions iidm-ddb/iidm-ddb-modelica-import-export/pom.xml
View file
Expand Up @@ -14,8 +14,8 @@

<parent>
<artifactId>iidm-ddb</artifactId>
<groupId>eu.itesla_project.iidm-ddb</groupId>
<version>0.0.1-SNAPSHOT</version>
<groupId>eu.itesla_project</groupId>
<version>0.1-SNAPSHOT</version>
</parent>

<artifactId>iidm-ddb-modelica-import-export</artifactId>
Expand Down Expand Up @@ -60,15 +60,15 @@
<dependencies>
<!-- We depend on the EJB remote interfaces of this application -->
<dependency>
<groupId>eu.itesla_project.iidm-ddb</groupId>
<groupId>${project.groupId}</groupId>
<artifactId>iidm-ddb-ejb</artifactId>
<version>0.0.1-SNAPSHOT</version>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>eu.itesla_project.iidm-ddb</groupId>
<groupId>${project.groupId}</groupId>
<artifactId>iidm-ddb-ejb-remote-client-wildfly</artifactId>
<version>0.0.1-SNAPSHOT</version>
<version>${project.version}</version>
</dependency>

<dependency>
Expand Down
2 changes: 1 addition & 1 deletion ...rt-export/src/main/java/eu/itesla_project/iidm/ddb/modelica_imp_exp/DdbPSLibImporter.java
View file
Expand Up @@ -317,7 +317,7 @@ static Map<String, List<String>> readModelMappingFile(File mappingFile) throws E
private static final String DEFAULT_USER = "user";
private static final String DEFAULT_PASSWORD = "password";
private static final String DEFAULT_REMOTING_PORT = "8080";
private static final String DDBMANAGERJNDINAME = "ejb:iidm-ddb-ear/iidm-ddb-ejb-0.0.1-SNAPSHOT/DDBManagerBean!eu.itesla_project.iidm.ddb.service.DDBManager";
private static final String DDBMANAGERJNDINAME = "ejb:iidm-ddb-ear/iidm-ddb-ejb/DDBManagerBean!eu.itesla_project.iidm.ddb.service.DDBManager";
private static final String DEFAULT_MODELICA_VERSION = "3.2";

private static final String REGULATORS_PACKAGE_NAME = "Regulators";
Expand Down

0 comments on commit 35cd4d8

Please sign in to comment.