properties = new Hashtable<>();
- properties.put(SpecmateCDOServerConfig.KEY_SERVER_PORT, "2036");
+ properties.put(SpecmateCDOServerConfig.KEY_SERVER_HOST_PORT, "localhost:2036");
properties.put(SpecmateCDOServerConfig.KEY_REPOSITORY_NAME, SPECMATE_REPOSITORY);
properties.put(SpecmateCDOServerConfig.KEY_CDO_USER, CDO_USER);
properties.put(SpecmateCDOServerConfig.KEY_CDO_PASSWORD, CDO_PASSWORD);
@@ -109,15 +110,17 @@ public void doMigration() throws Exception {
assertTrue(migratorService.needsMigration());
- // Initiate the migration
- server.shutdown();
- server.start();
persistency.shutdown();
+ server.shutdown();
+
+ server.start();
persistency.start();
+
checkMigrationPostconditions();
+
// Resetting the model to the base model such that all tests start with
// the same
// model
diff --git a/bundles/specmate-std-env/specmate.bndrun b/bundles/specmate-std-env/dev-specmate-all.bndrun
similarity index 100%
rename from bundles/specmate-std-env/specmate.bndrun
rename to bundles/specmate-std-env/dev-specmate-all.bndrun
diff --git a/bundles/specmate-std-env/prod-specmate-all.bndrun b/bundles/specmate-std-env/prod-specmate-all.bndrun
new file mode 100644
index 000000000..d62dd2793
--- /dev/null
+++ b/bundles/specmate-std-env/prod-specmate-all.bndrun
@@ -0,0 +1,184 @@
+-runfw: org.eclipse.osgi;version='[3.10.2.v20150203-1939,3.10.2.v20150203-1939]'
+-runee: JavaSE-1.8
+-runrequires: \
+ osgi.identity;filter:='(osgi.identity=specmate-cdo-server)',\
+ osgi.identity;filter:='(osgi.identity=org.glassfish.hk2.locator)',\
+ osgi.identity;filter:='(osgi.identity=org.eclipse.equinox.log)',\
+ osgi.identity;filter:='(osgi.identity=jul.to.slf4j)',\
+ osgi.identity;filter:='(osgi.identity=log4j.over.slf4j)',\
+ osgi.identity;filter:='(osgi.identity=specmate-common)',\
+ osgi.identity;filter:='(osgi.identity=specmate-emfjson)',\
+ osgi.identity;filter:='(osgi.identity=specmate-logging)',\
+ osgi.identity;filter:='(osgi.identity=specmate-logging-slf4j)',\
+ osgi.identity;filter:='(osgi.identity=specmate-logging-slf4j-julbridge)',\
+ osgi.identity;filter:='(osgi.identity=specmate-persistency-api)',\
+ osgi.identity;filter:='(osgi.identity=org.glassfish.jersey.containers.jersey-container-servlet)',\
+ osgi.identity;filter:='(osgi.identity=org.eclipse.equinox.event)',\
+ osgi.identity;filter:='(osgi.identity=specmate-emfrest)',\
+ osgi.identity;filter:='(osgi.identity=specmate-model-gen)',\
+ osgi.identity;filter:='(osgi.identity=org.eclipse.equinox.cm)',\
+ osgi.identity;filter:='(osgi.identity=org.eclipse.equinox.metatype)',\
+ osgi.identity;filter:='(osgi.identity=specmate-model-support)',\
+ osgi.identity;filter:='(osgi.identity=specmate-ui-core)',\
+ osgi.identity;filter:='(osgi.identity=specmate-config)',\
+ osgi.identity;filter:='(osgi.identity=specmate-connectors)',\
+ osgi.identity;filter:='(osgi.identity=specmate-testspecification)',\
+ osgi.identity;filter:='(osgi.identity=specmate-hp-connector)',\
+ osgi.identity;filter:='(osgi.identity=org.apache.felix.scr)',\
+ osgi.identity;filter:='(&(osgi.identity=org.eclipse.jetty.osgi.boot)(version>=9.4.6))',\
+ osgi.identity;filter:='(osgi.identity=org.eclipse.jetty.osgi.httpservice)',\
+ osgi.identity;filter:='(osgi.identity=org.eclipse.jetty.rewrite)',\
+ osgi.identity;filter:='(osgi.identity=specmate-jettystarter)',\
+ osgi.identity;filter:='(osgi.identity=org.eclipse.emf.cdo.server.ocl)',\
+ osgi.identity;filter:='(osgi.identity=org.json)',\
+ osgi.identity;filter:='(osgi.identity=specmate-file-connector)',\
+ osgi.identity;filter:='(osgi.identity=specmate-search)',\
+ osgi.identity;filter:='(osgi.identity=specmate-migration)',\
+ osgi.identity;filter:='(osgi.identity=specmate-persistency-cdo)',\
+ osgi.identity;filter:='(osgi.identity=specmate-administration)',\
+ osgi.identity;filter:='(osgi.identity=org.apache.commons.fileupload)',\
+ osgi.identity;filter:='(osgi.identity=specmate-trello-connector)',\
+ osgi.identity;filter:='(osgi.identity=specmate-auth-api)',\
+ osgi.identity;filter:='(osgi.identity=specmate-auth)',\
+ osgi.identity;filter:='(osgi.identity=specmate-dbprovider-api)',\
+ osgi.identity;filter:='(osgi.identity=specmate-dbprovider-h2)'
+-runbundles: \
+ javassist;version='[3.18.1,3.18.2)',\
+ javax.annotation-api;version='[1.2.0,1.2.1)',\
+ javax.validation.api;version='[1.1.0,1.1.1)',\
+ javax.ws.rs-api;version='[2.0.1,2.0.2)',\
+ jul.to.slf4j;version='[1.7.12,1.7.13)',\
+ log4j.over.slf4j;version='[1.7.12,1.7.13)',\
+ org.eclipse.core.contenttype;version='[3.4.200,3.4.201)',\
+ org.eclipse.core.jobs;version='[3.6.1,3.6.2)',\
+ org.eclipse.core.runtime;version='[3.10.0,3.10.1)',\
+ org.eclipse.emf.ecore.change;version='[2.11.0,2.11.1)',\
+ org.eclipse.equinox.app;version='[1.3.200,1.3.201)',\
+ org.eclipse.equinox.cm;version='[1.1.0,1.1.1)',\
+ org.eclipse.equinox.common;version='[3.6.200,3.6.201)',\
+ org.eclipse.equinox.event;version='[1.3.100,1.3.101)',\
+ org.eclipse.equinox.log;version='[1.2.300,1.2.301)',\
+ org.eclipse.equinox.metatype;version='[1.4.0,1.4.1)',\
+ org.eclipse.equinox.preferences;version='[3.5.200,3.5.201)',\
+ org.eclipse.equinox.registry;version='[3.5.400,3.5.401)',\
+ org.eclipse.osgi.services;version='[3.4.0,3.4.1)',\
+ org.glassfish.hk2.api;version='[2.4.0,2.4.1)',\
+ org.glassfish.hk2.external.aopalliance-repackaged;version='[2.4.0,2.4.1)',\
+ org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\
+ org.glassfish.hk2.locator;version='[2.4.0,2.4.1)',\
+ org.glassfish.hk2.osgi-resource-locator;version='[1.0.1,1.0.2)',\
+ org.glassfish.hk2.utils;version='[2.4.0,2.4.1)',\
+ org.glassfish.jersey.bundles.repackaged.jersey-guava;version='[2.17.0,2.17.1)',\
+ org.glassfish.jersey.containers.jersey-container-servlet;version='[2.17.0,2.17.1)',\
+ org.glassfish.jersey.containers.jersey-container-servlet-core;version='[2.17.0,2.17.1)',\
+ org.glassfish.jersey.core.jersey-client;version='[2.17.0,2.17.1)',\
+ org.glassfish.jersey.core.jersey-common;version='[2.17.0,2.17.1)',\
+ org.glassfish.jersey.core.jersey-server;version='[2.17.0,2.17.1)',\
+ org.glassfish.jersey.media.jersey-media-sse;version='[2.17.0,2.17.1)',\
+ org.json;version=snapshot,\
+ org.slf4j.api;version='[1.7.2,1.7.3)',\
+ slf4j.api;version='[1.7.12,1.7.13)',\
+ specmate-common;version=snapshot,\
+ specmate-emfjson;version=snapshot,\
+ specmate-emfrest;version=snapshot,\
+ specmate-logging;version=snapshot,\
+ specmate-logging-slf4j;version=snapshot,\
+ specmate-logging-slf4j-julbridge;version=snapshot,\
+ specmate-model-gen;version=snapshot,\
+ specmate-persistency-api;version=snapshot,\
+ specmate-persistency-cdo;version=snapshot,\
+ specmate-model-support;version=snapshot,\
+ specmate-ui-core;version=snapshot,\
+ specmate-config;version=snapshot,\
+ specmate-connectors;version=snapshot,\
+ org.eclipse.emf.cdo;version='[4.5.0,4.5.1)',\
+ org.eclipse.emf.cdo.common;version='[4.5.0,4.5.1)',\
+ org.eclipse.emf.cdo.ecore.retrofit;version='[4.2.300,4.2.301)',\
+ org.eclipse.emf.cdo.net4j;version='[4.1.400,4.1.401)',\
+ org.eclipse.emf.cdo.server;version='[4.5.0,4.5.1)',\
+ org.eclipse.emf.cdo.server.net4j;version='[4.1.300,4.1.301)',\
+ org.eclipse.emf.common;version='[2.12.0,2.12.1)',\
+ org.eclipse.emf.ecore;version='[2.12.0,2.12.1)',\
+ org.eclipse.emf.ecore.xmi;version='[2.12.0,2.12.1)',\
+ org.eclipse.net4j;version='[4.5.0,4.5.1)',\
+ org.eclipse.net4j.tcp;version='[4.1.400,4.1.401)',\
+ org.eclipse.net4j.util;version='[3.6.0,3.6.1)',\
+ com.google.guava;version='[21.0.0,21.0.1)',\
+ specmate-hp-connector;version=snapshot,\
+ specmate-testspecification;version=snapshot,\
+ org.apache.felix.scr;version='[2.0.8,2.0.9)',\
+ org.apache.commons.fileupload;version='[1.3.1,1.3.2)',\
+ org.apache.commons.io;version='[2.4.0,2.4.1)',\
+ org.eclipse.equinox.http.servlet;version='[1.1.500,1.1.501)',\
+ org.eclipse.jetty.deploy;version='[9.4.6,9.4.7)',\
+ org.eclipse.jetty.http;version='[9.4.6,9.4.7)',\
+ org.eclipse.jetty.io;version='[9.4.6,9.4.7)',\
+ org.eclipse.jetty.osgi-servlet-api;version='[3.1.0,3.1.1)',\
+ org.eclipse.jetty.osgi.boot;version='[9.4.6,9.4.7)',\
+ org.eclipse.jetty.osgi.httpservice;version='[9.4.6,9.4.7)',\
+ org.eclipse.jetty.rewrite;version='[9.4.6,9.4.7)',\
+ org.eclipse.jetty.security;version='[9.4.6,9.4.7)',\
+ org.eclipse.jetty.server;version='[9.4.6,9.4.7)',\
+ org.eclipse.jetty.servlet;version='[9.4.6,9.4.7)',\
+ org.eclipse.jetty.util;version='[9.4.6,9.4.7)',\
+ org.eclipse.jetty.webapp;version='[9.4.6,9.4.7)',\
+ org.eclipse.jetty.xml;version='[9.4.6,9.4.7)',\
+ org.eclipse.equinox.http.jetty;version='[3.0.200,3.0.201)',\
+ org.eclipse.jetty.continuation;version='[8.1.16,8.1.17)',\
+ org.eclipse.jetty.http;version='[8.1.16,8.1.17)',\
+ org.eclipse.jetty.io;version='[8.1.16,8.1.17)',\
+ org.eclipse.jetty.security;version='[8.1.16,8.1.17)',\
+ org.eclipse.jetty.server;version='[8.1.16,8.1.17)',\
+ org.eclipse.jetty.servlet;version='[8.1.16,8.1.17)',\
+ org.eclipse.jetty.util;version='[8.1.16,8.1.17)',\
+ specmate-jettystarter;version=snapshot,\
+ lpg.runtime.java;version='[2.0.17,2.0.18)',\
+ org.eclipse.emf.cdo.server.ocl;version='[4.2.100,4.2.101)',\
+ org.eclipse.ocl;version='[3.6.200,3.6.201)',\
+ org.eclipse.ocl.common;version='[1.4.200,1.4.201)',\
+ org.eclipse.ocl.ecore;version='[3.6.200,3.6.201)',\
+ org.sat4j.core;version='[2.3.5,2.3.6)',\
+ org.jgrapht.core;version='[1.0.1,1.0.2)',\
+ org.apache.commons.cli;version='[1.4.0,1.4.1)',\
+ org.sat4j.maxsat;version='[2.3.5,2.3.6)',\
+ org.sat4j.pb;version='[2.3.5,2.3.6)',\
+ specmate-file-connector;version=snapshot,\
+ org.apache.servicemix.bundles.jakarta-regexp;version='[1.4.0,1.4.1)',\
+ org.apache.servicemix.bundles.lucene;version='[7.2.0,7.2.1)',\
+ org.apache.servicemix.bundles.lucene-queries;version='[7.2.0,7.2.1)',\
+ org.apache.servicemix.bundles.lucene-queryparser;version='[7.2.0,7.2.1)',\
+ org.apache.servicemix.bundles.lucene-sandbox;version='[7.2.0,7.2.1)',\
+ specmate-search;version=snapshot,\
+ specmate-migration;version=snapshot,\
+ specmate-administration;version=snapshot,\
+ specmate-emfrest-api;version=snapshot,\
+ specmate-trello-connector;version=snapshot,\
+ specmate-auth-api;version=snapshot,\
+ specmate-auth;version=snapshot,\
+ specmate-dbprovider-api;version=snapshot,\
+ org.eclipse.net4j.db;version='[4.5.0,4.5.1)',\
+ org.eclipse.net4j.db.jdbc;version='[4.3.100,4.3.101)',\
+ org.eclipse.net4j.db.h2;version='[4.2.300,4.2.301)',\
+ specmate-dbprovider-h2;version=snapshot,\
+ specmate-config-api;version=snapshot,\
+ com.diffplug.osgi.extension.sun.misc;version='[0.0.0,0.0.1)',\
+ io.prometheus.simpleclient;version='[0.4.0,0.4.1)',\
+ io.prometheus.simpleclient_common;version='[0.4.0,0.4.1)',\
+ io.prometheus.simpleclient_servlet;version='[0.4.0,0.4.1)',\
+ specmate-metrics;version=snapshot,\
+ io.prometheus.simpleclient_hotspot;version='[0.4.0,0.4.1)',\
+ org.h2;version='[1.3.168,1.3.169)',\
+ specmate-cdo-server;version=snapshot,\
+ org.apache.commons.lang3;version='[3.3.2,3.3.3)',\
+ org.eclipse.emf.cdo.server.db;version='[4.4.0,4.4.1)'
+
+-runproperties: \
+ jetty.http.port=8080,\
+ osgi.console=,\
+ jetty.home.bundle=specmate-jettystarter,\
+ jetty.etc.config.urls='etc/jetty.xml,etc/jetty-http.xml,etc/jetty-deployer.xml,etc/jetty-rewrite.xml',\
+ osgi.compatibility.bootdelegation=true
+-runrepos: \
+ Workspace,\
+ Local
+-runvm: -Xmx6000m
\ No newline at end of file
diff --git a/bundles/specmate-std-env/specmate-cdo-server-oracle.bndrun b/bundles/specmate-std-env/prod-specmate-cdo-server-oracle.bndrun
similarity index 93%
rename from bundles/specmate-std-env/specmate-cdo-server-oracle.bndrun
rename to bundles/specmate-std-env/prod-specmate-cdo-server-oracle.bndrun
index 0bab7f091..366072f3b 100644
--- a/bundles/specmate-std-env/specmate-cdo-server-oracle.bndrun
+++ b/bundles/specmate-std-env/prod-specmate-cdo-server-oracle.bndrun
@@ -11,7 +11,6 @@
osgi.identity;filter:='(osgi.identity=org.eclipse.equinox.cm)',\
osgi.identity;filter:='(osgi.identity=org.eclipse.equinox.metatype)',\
osgi.identity;filter:='(osgi.identity=org.apache.felix.scr)',\
- osgi.identity;filter:='(&(osgi.identity=org.apache.felix.webconsole)(version>=4.3.0))',\
osgi.identity;filter:='(osgi.identity=specmate-cdo-server)',\
osgi.identity;filter:='(osgi.identity=org.eclipse.emf.cdo.server.ocl)',\
osgi.identity;filter:='(osgi.identity=specmate-migration)',\
@@ -36,10 +35,7 @@
jul.to.slf4j;version='[1.7.12,1.7.13)',\
log4j.over.slf4j;version='[1.7.12,1.7.13)',\
lpg.runtime.java;version='[2.0.17,2.0.18)',\
- org.apache.commons.fileupload;version='[1.3.1,1.3.2)',\
- org.apache.commons.io;version='[2.4.0,2.4.1)',\
org.apache.felix.scr;version='[2.0.8,2.0.9)',\
- org.apache.felix.webconsole;version='[4.3.0,4.3.1)',\
org.eclipse.core.contenttype;version='[3.4.200,3.4.201)',\
org.eclipse.core.jobs;version='[3.6.1,3.6.2)',\
org.eclipse.core.runtime;version='[3.10.0,3.10.1)',\
@@ -60,7 +56,6 @@
org.eclipse.equinox.metatype;version='[1.4.0,1.4.1)',\
org.eclipse.equinox.preferences;version='[3.5.200,3.5.201)',\
org.eclipse.equinox.registry;version='[3.5.400,3.5.401)',\
- org.eclipse.jetty.osgi-servlet-api;version='[3.1.0,3.1.1)',\
org.eclipse.net4j;version='[4.5.0,4.5.1)',\
org.eclipse.net4j.db;version='[4.5.0,4.5.1)',\
org.eclipse.net4j.db.jdbc;version='[4.3.100,4.3.101)',\
diff --git a/bundles/specmate-std-env/specmate-cdo-server.bndrun b/bundles/specmate-std-env/prod-specmate-cdo-server.bndrun
similarity index 98%
rename from bundles/specmate-std-env/specmate-cdo-server.bndrun
rename to bundles/specmate-std-env/prod-specmate-cdo-server.bndrun
index 4f6947c44..219834008 100644
--- a/bundles/specmate-std-env/specmate-cdo-server.bndrun
+++ b/bundles/specmate-std-env/prod-specmate-cdo-server.bndrun
@@ -12,7 +12,6 @@
osgi.identity;filter:='(osgi.identity=org.eclipse.equinox.metatype)',\
osgi.identity;filter:='(osgi.identity=specmate-config)',\
osgi.identity;filter:='(osgi.identity=org.apache.felix.scr)',\
- osgi.identity;filter:='(&(osgi.identity=org.apache.felix.webconsole)(version>=4.3.0))',\
osgi.identity;filter:='(osgi.identity=specmate-cdo-server)',\
osgi.identity;filter:='(osgi.identity=org.eclipse.emf.cdo.server.ocl)',\
osgi.identity;filter:='(&(osgi.identity=org.h2)(version>=1.3.168))',\
diff --git a/bundles/specmate-std-env/specmate-no-cdo-server.bndrun b/bundles/specmate-std-env/prod-specmate-no-cdo-server.bndrun
similarity index 94%
rename from bundles/specmate-std-env/specmate-no-cdo-server.bndrun
rename to bundles/specmate-std-env/prod-specmate-no-cdo-server.bndrun
index b72ad184e..fb6b0af32 100644
--- a/bundles/specmate-std-env/specmate-no-cdo-server.bndrun
+++ b/bundles/specmate-std-env/prod-specmate-no-cdo-server.bndrun
@@ -1,8 +1,6 @@
-runfw: org.eclipse.osgi;version='[3.10.2.v20150203-1939,3.10.2.v20150203-1939]'
-runee: JavaSE-1.8
-runrequires: \
- osgi.identity;filter:='(osgi.identity=org.apache.felix.gogo.command)',\
- osgi.identity;filter:='(osgi.identity=org.apache.felix.gogo.shell)',\
osgi.identity;filter:='(osgi.identity=org.glassfish.hk2.locator)',\
osgi.identity;filter:='(osgi.identity=org.eclipse.equinox.log)',\
osgi.identity;filter:='(osgi.identity=jul.to.slf4j)',\
@@ -21,13 +19,11 @@
osgi.identity;filter:='(osgi.identity=org.eclipse.equinox.metatype)',\
osgi.identity;filter:='(osgi.identity=specmate-model-support)',\
osgi.identity;filter:='(osgi.identity=specmate-ui-core)',\
- osgi.identity;filter:='(osgi.identity=specmate-dummy-data)',\
osgi.identity;filter:='(osgi.identity=specmate-config)',\
osgi.identity;filter:='(osgi.identity=specmate-connectors)',\
osgi.identity;filter:='(osgi.identity=specmate-testspecification)',\
osgi.identity;filter:='(osgi.identity=specmate-hp-connector)',\
osgi.identity;filter:='(osgi.identity=org.apache.felix.scr)',\
- osgi.identity;filter:='(&(osgi.identity=org.apache.felix.webconsole)(version>=4.3.0))',\
osgi.identity;filter:='(&(osgi.identity=org.eclipse.jetty.osgi.boot)(version>=9.4.6))',\
osgi.identity;filter:='(osgi.identity=org.eclipse.jetty.osgi.httpservice)',\
osgi.identity;filter:='(osgi.identity=org.eclipse.jetty.rewrite)',\
@@ -50,9 +46,6 @@
javax.ws.rs-api;version='[2.0.1,2.0.2)',\
jul.to.slf4j;version='[1.7.12,1.7.13)',\
log4j.over.slf4j;version='[1.7.12,1.7.13)',\
- org.apache.felix.gogo.command;version='[0.10.0,0.10.1)',\
- org.apache.felix.gogo.runtime;version='[0.10.0,0.10.1)',\
- org.apache.felix.gogo.shell;version='[0.10.0,0.10.1)',\
org.eclipse.core.contenttype;version='[3.4.200,3.4.201)',\
org.eclipse.core.jobs;version='[3.6.1,3.6.2)',\
org.eclipse.core.runtime;version='[3.10.0,3.10.1)',\
@@ -93,7 +86,6 @@
specmate-persistency-cdo;version=snapshot,\
specmate-model-support;version=snapshot,\
specmate-ui-core;version=snapshot,\
- specmate-dummy-data;version=snapshot,\
specmate-config;version=snapshot,\
specmate-connectors;version=snapshot,\
org.eclipse.emf.cdo;version='[4.5.0,4.5.1)',\
@@ -113,7 +105,6 @@
org.apache.felix.scr;version='[2.0.8,2.0.9)',\
org.apache.commons.fileupload;version='[1.3.1,1.3.2)',\
org.apache.commons.io;version='[2.4.0,2.4.1)',\
- org.apache.felix.webconsole;version='[4.3.0,4.3.1)',\
org.eclipse.equinox.http.servlet;version='[1.1.500,1.1.501)',\
org.eclipse.jetty.deploy;version='[9.4.6,9.4.7)',\
org.eclipse.jetty.http;version='[9.4.6,9.4.7)',\
diff --git a/web/src/app/config/config.ts b/web/src/app/config/config.ts
index a3a9011cf..395e9b992 100644
--- a/web/src/app/config/config.ts
+++ b/web/src/app/config/config.ts
@@ -25,6 +25,9 @@ export class Config {
public static USE_BROWSER_LANGUAGE = false;
public static CONNECTIVITY_CHECK_DELAY = 10000;
+ public static NUM_HTTP_RETRIES = 10;
+ public static HTTP_RETRY_DELAY = 500;
+ public static HTTP_RETRY_ERRORS = [503, 404, 403, 401];
public static LOG_START_MESSAGE = 'Specmate Started';
public static LOG_LENGTH = 100;
diff --git a/web/src/app/modules/actions/modules/common-controls/components/common-controls.component.html b/web/src/app/modules/actions/modules/common-controls/components/common-controls.component.html
index 678ab8956..92799853b 100644
--- a/web/src/app/modules/actions/modules/common-controls/components/common-controls.component.html
+++ b/web/src/app/modules/actions/modules/common-controls/components/common-controls.component.html
@@ -1,7 +1,7 @@
{{'connection.lost' | translate}}
\ No newline at end of file
diff --git a/web/src/app/modules/actions/modules/test-specification-generator-button/components/test-specification-generator-button.component.html b/web/src/app/modules/actions/modules/test-specification-generator-button/components/test-specification-generator-button.component.html
index a9ddb0dd2..9441f1f61 100644
--- a/web/src/app/modules/actions/modules/test-specification-generator-button/components/test-specification-generator-button.component.html
+++ b/web/src/app/modules/actions/modules/test-specification-generator-button/components/test-specification-generator-button.component.html
@@ -1,2 +1,2 @@
{{error}}
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/web/src/app/modules/actions/modules/test-specification-generator-button/components/test-specification-generator-button.component.ts b/web/src/app/modules/actions/modules/test-specification-generator-button/components/test-specification-generator-button.component.ts
index b17feb428..20343d87c 100644
--- a/web/src/app/modules/actions/modules/test-specification-generator-button/components/test-specification-generator-button.component.ts
+++ b/web/src/app/modules/actions/modules/test-specification-generator-button/components/test-specification-generator-button.component.ts
@@ -72,7 +72,25 @@ export class TestSpecificationGeneratorButton {
.then(() => this.dataService.createElement(testSpec, true, Id.uuid))
.then(() => this.dataService.commit(this.translate.instant('save')))
.then(() => this.dataService.performOperations(testSpec.url, 'generateTests'))
- .then(() => this.dataService.readContents(testSpec.url))
+ .then(async () => {
+ let contents: IContainer[] = [];
+
+ let numRetries = 0;
+ while ((contents === undefined || contents === null || contents.length === 0) && numRetries < 10) {
+ try {
+ contents = await this.dataService.readContents(testSpec.url);
+ } catch (e) {
+ this.logger.warn('Error while loading contents for test specification');
+ }
+ await new Promise(res => setTimeout(res, 500));
+ this.logger.warn('Retry loading of test spec contents');
+ numRetries++;
+ }
+ if (contents === undefined || contents === null || contents.length === 0) {
+ throw new Error('Could not load contents of generated test specification');
+ }
+ return contents;
+ })
.then((contents: IContainer[]) => this.finalizeTestGeneration(contents, testSpec))
.catch(() => { });
}
diff --git a/web/src/app/modules/common/modules/i18n/components/language-chooser.component.html b/web/src/app/modules/common/modules/i18n/components/language-chooser.component.html
index 01fa0eee3..738a7aaaa 100644
--- a/web/src/app/modules/common/modules/i18n/components/language-chooser.component.html
+++ b/web/src/app/modules/common/modules/i18n/components/language-chooser.component.html
@@ -1,9 +1,9 @@
-
-
+
@@ -29,7 +29,7 @@
{{'login' | translate}}
-
+
@@ -40,17 +40,17 @@
{{'login' | translate}}
-
+
{{project ? project : ('project' | translate)}}
- {{name}}
+ {{name}}
-
+
@@ -58,7 +58,7 @@ {{'login' | translate}}
{{'login' | translate}}
-
+
diff --git a/web/src/app/modules/views/main/authentication/modules/logout/components/logout.component.html b/web/src/app/modules/views/main/authentication/modules/logout/components/logout.component.html
index eff4e22d5..582826ca9 100644
--- a/web/src/app/modules/views/main/authentication/modules/logout/components/logout.component.html
+++ b/web/src/app/modules/views/main/authentication/modules/logout/components/logout.component.html
@@ -1,3 +1,3 @@
-
+
{{'logout' | translate}}
\ No newline at end of file
diff --git a/web/src/app/modules/views/main/editors/modules/graphical-editor/components/graphical-editor.component.html b/web/src/app/modules/views/main/editors/modules/graphical-editor/components/graphical-editor.component.html
index 1bfcaae2e..55df81849 100644
--- a/web/src/app/modules/views/main/editors/modules/graphical-editor/components/graphical-editor.component.html
+++ b/web/src/app/modules/views/main/editors/modules/graphical-editor/components/graphical-editor.component.html
@@ -5,9 +5,9 @@
@@ -29,7 +29,7 @@