diff --git a/bundles/specmate-config/config/specmate-config.properties b/bundles/specmate-config/config/specmate-config.properties index 1d87cb957..2d343bc64 100644 --- a/bundles/specmate-config/config/specmate-config.properties +++ b/bundles/specmate-config/config/specmate-config.properties @@ -1,73 +1,71 @@ -# Logging -# Choose from debug, info, warning, error -logging.level = info - -# CDO Persistency Settings -## CDO Common -### Repository name, in case of Oracle, must be identical to the schema name -cdo.repositoryName = specmate_repository -cdo.user = cdoUser -cdo.password = cdoPass - -## CDO Server -### TCP port where the CDO server should listen -cdo.serverHostAndPort = localhost:2036 - -## CDO Client -### Name of the CDO resource to use -cdo.resourceName = specmate_resource -### CDO host to connect to. If client and server are started in same process, should match cdo.serverPort -cdo.host = localhost:2036 - -## H2 -### JDBC connection string for the H2 database -h2.jdbcConnection = jdbc:h2:./database/specmate - - -## Oracle -### JDBC connection string for the oracle database -#oracle.jdbcConnection = - -#oracle.username = -#oracle.password = - -# Connectors General Settings -## cron string to schedule, when connectors are triggered. -## Set to "disabled" (without quotes) to disable polling. -## default: disabled -## generic value (will trigger every hour): hour -## example: day 13 14 5 will trigger every day at 13:14:05 -## example: hour 14 5 will trigger every hour at xx:14:05 -## example: minute 5 will trigger every minute at xx:xx:05 -## missing numbers are replaced by 0s. -## example: day 13 will trigger every day at 13:00:00 -# connectorPollSchedule = disabled -connectorPollSchedule = minute - -# Sarch Service -search.allowedFields = extId, type, name, description -search.lucene.location = ./database/lucene -search.maxResults = 100 - -# Projects -## List of project ids, each project listed here needs to be configured below -#project.projects = jira - -## Config for project jira +# Logging +# Choose from debug, info, warning, error +logging.level = info + +# CDO Persistency Settings +## CDO Common +### Repository name, in case of Oracle, must be identical to the schema name +cdo.repositoryName = specmate_repository +cdo.user = cdoUser +cdo.password = cdoPass + +## CDO Server +### TCP port where the CDO server should listen +cdo.serverHostAndPort = localhost:2036 + +## CDO Client +### Name of the CDO resource to use +cdo.resourceName = specmate_resource +### CDO host to connect to. If client and server are started in same process, should match cdo.serverPort +cdo.host = localhost:2036 + +## H2 +### JDBC connection string for the H2 database +h2.jdbcConnection = jdbc:h2:./database/specmate + + +## Oracle +### JDBC connection string for the oracle database +#oracle.jdbcConnection = + +#oracle.username = +#oracle.password = + +# Connectors General Settings +## cron string to schedule, when connectors are triggered. +## Set to "disabled" (without quotes) to disable polling. +## default: disabled +## generic value (will trigger every hour): hour +## example: day 13 14 5 will trigger every day at 13:14:05 +## example: hour 14 5 will trigger every hour at xx:14:05 +## example: minute 5 will trigger every minute at xx:xx:05 +## missing numbers are replaced by 0s. +## example: day 13 will trigger every day at 13:00:00 +# connectorPollSchedule = disabled +connectorPollSchedule = minute + +# Sarch Service +search.allowedFields = extId, type, name, description +search.lucene.location = ./database/lucene +search.maxResults = 100 + +# Projects +## List of project ids, each project listed here needs to be configured below +#project.projects = jira + +## Config for project jira + +#project.projects = jira +#project.jira.connector.pid = com.specmate.connectors.jira.JiraConnector +#project.jira.connector.jira.url = +#project.jira.connector.jira.project = SPEM +#project.jira.connector.jira.username = +#project.jira.connector.jira.password = +#project.jira.connector.connectorID = jira + +# User session +## Number of minutes a session is valid after the last http request +session.maxIdleMinutes = 720 +## Persist sessions in database or keep in memory +session.persistent = true -#project.projects = jira -#project.jira.connector.pid = com.specmate.connectors.jira.JiraConnector -#project.jira.connector.jira.url = -#project.jira.connector.jira.project = SPEM -#project.jira.connector.jira.username = -#project.jira.connector.jira.password = -#project.jira.connector.connectorID = jira - - - -# User session -## Number of minutes a session is valid after the last http request -session.maxIdleMinutes = 720 -## Persist sessions in database or keep in memory -session.persistent = true - diff --git a/bundles/specmate-nlp/.project.bak b/bundles/specmate-nlp/.project.bak deleted file mode 100644 index 3b42b0630..000000000 --- a/bundles/specmate-nlp/.project.bak +++ /dev/null @@ -1,23 +0,0 @@ - - - specmate-auth - - - - - - org.eclipse.jdt.core.javabuilder - - - - - bndtools.core.bndbuilder - - - - - - org.eclipse.jdt.core.javanature - bndtools.core.bndnature - - diff --git a/bundles/specmate-std-env/dev-specmate-no-cdo-server.bndrun b/bundles/specmate-std-env/dev-specmate-no-cdo-server.bndrun index 2a26f05c5..b13508305 100644 --- a/bundles/specmate-std-env/dev-specmate-no-cdo-server.bndrun +++ b/bundles/specmate-std-env/dev-specmate-no-cdo-server.bndrun @@ -42,7 +42,10 @@ osgi.identity;filter:='(osgi.identity=specmate-jira-connector)',\ osgi.identity;filter:='(osgi.identity=specmate-nlp)',\ osgi.identity;filter:='(osgi.identity=specmate-model-generation)' --runbundles: \ +-runbundles: \ + specmate-logging;version=snapshot,\ + specmate-logging-slf4j;version=snapshot,\ + specmate-logging-slf4j-julbridge;version=snapshot,\ 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)',\ @@ -80,9 +83,6 @@ 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,\ diff --git a/bundles/specmate-std-env/prod-specmate-all.bndrun b/bundles/specmate-std-env/prod-specmate-all.bndrun index 6de438a0d..5e18c8853 100644 --- a/bundles/specmate-std-env/prod-specmate-all.bndrun +++ b/bundles/specmate-std-env/prod-specmate-all.bndrun @@ -1,217 +1,217 @@ -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)',\ - osgi.identity;filter:='(osgi.identity=specmate-jira-connector)',\ - osgi.identity;filter:='(osgi.identity=specmate-nlp)',\ +-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)',\ + osgi.identity;filter:='(osgi.identity=specmate-jira-connector)',\ + osgi.identity;filter:='(osgi.identity=specmate-nlp)',\ osgi.identity;filter:='(osgi.identity=specmate-model-generation)' --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)',\ - 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.eclipse.emf.cdo.server.db;version='[4.4.0,4.4.1)',\ - specmate-jira-connector;version=snapshot,\ - specmate-rest;version=snapshot,\ - specmate-scheduler;version=snapshot,\ - com.ibm.icu;version='[63.1.0,63.1.1)',\ - io.reactivex.rxjava2.rxjava;version='[2.2.3,2.2.4)',\ - it.unimi.dsi.fastutil;version='[8.2.2,8.2.3)',\ - javax.money.api;version='[1.0.1,1.0.2)',\ - joda-time;version='[2.10.1,2.10.2)',\ - org.apache.commons.commons-compress;version='[1.18.0,1.18.1)',\ - org.apache.commons.commons-pool2;version='[2.6.0,2.6.1)',\ - org.apache.commons.lang;version='[2.6.0,2.6.1)',\ - org.apache.ivy;version='[2.4.0,2.4.1)',\ - org.apache.opennlp.tools;version='[1.9.1,1.9.2)',\ - org.reactivestreams.reactive-streams;version='[1.0.2,1.0.3)',\ - specmate-model-generation;version=snapshot,\ - specmate-nlp;version=snapshot,\ - com.google.guava;version='[18.0.0,18.0.1)',\ - org.apache.commons.lang3;version='[3.5.0,3.5.1)',\ - slf4j.api;version='[1.7.25,1.7.26)',\ - com.atlassian.fugue;version='[2.7.0,2.7.1)',\ - com.atlassian.sal.api;version='[3.0.7,3.0.8)',\ - com.atlassian.util.concurrent.atlassian-util-concurrent;version='[3.0.0,3.0.1)',\ - org.apache.commons.codec;version='[1.10.0,1.10.1)',\ - org.apache.commons.logging;version='[1.1.1,1.1.2)',\ - org.apache.httpcomponents.httpasyncclient;version='[4.1.3,4.1.4)',\ - org.apache.httpcomponents.httpclient;version='[4.5.3,4.5.4)',\ - org.apache.httpcomponents.httpcore;version='[4.4.6,4.4.7)',\ - org.apache.servicemix.bundles.jcip-annotations;version='[1.0.0,1.0.1)',\ - org.apache.servicemix.bundles.spring-beans;version='[4.1.7,4.1.8)',\ - org.apache.servicemix.bundles.spring-core;version='[4.1.7,4.1.8)',\ - org.codehaus.jettison.jettison;version='[1.1.0,1.1.1)' +-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)',\ + 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.eclipse.emf.cdo.server.db;version='[4.4.0,4.4.1)',\ + specmate-jira-connector;version=snapshot,\ + specmate-rest;version=snapshot,\ + specmate-scheduler;version=snapshot,\ + com.ibm.icu;version='[63.1.0,63.1.1)',\ + io.reactivex.rxjava2.rxjava;version='[2.2.3,2.2.4)',\ + it.unimi.dsi.fastutil;version='[8.2.2,8.2.3)',\ + javax.money.api;version='[1.0.1,1.0.2)',\ + joda-time;version='[2.10.1,2.10.2)',\ + org.apache.commons.commons-compress;version='[1.18.0,1.18.1)',\ + org.apache.commons.commons-pool2;version='[2.6.0,2.6.1)',\ + org.apache.commons.lang;version='[2.6.0,2.6.1)',\ + org.apache.ivy;version='[2.4.0,2.4.1)',\ + org.apache.opennlp.tools;version='[1.9.1,1.9.2)',\ + org.reactivestreams.reactive-streams;version='[1.0.2,1.0.3)',\ + specmate-model-generation;version=snapshot,\ + specmate-nlp;version=snapshot,\ + com.google.guava;version='[18.0.0,18.0.1)',\ + org.apache.commons.lang3;version='[3.5.0,3.5.1)',\ + slf4j.api;version='[1.7.25,1.7.26)',\ + com.atlassian.fugue;version='[2.7.0,2.7.1)',\ + com.atlassian.sal.api;version='[3.0.7,3.0.8)',\ + com.atlassian.util.concurrent.atlassian-util-concurrent;version='[3.0.0,3.0.1)',\ + org.apache.commons.codec;version='[1.10.0,1.10.1)',\ + org.apache.commons.logging;version='[1.1.1,1.1.2)',\ + org.apache.httpcomponents.httpasyncclient;version='[4.1.3,4.1.4)',\ + org.apache.httpcomponents.httpclient;version='[4.5.3,4.5.4)',\ + org.apache.httpcomponents.httpcore;version='[4.4.6,4.4.7)',\ + org.apache.servicemix.bundles.jcip-annotations;version='[1.0.0,1.0.1)',\ + org.apache.servicemix.bundles.spring-beans;version='[4.1.7,4.1.8)',\ + org.apache.servicemix.bundles.spring-core;version='[4.1.7,4.1.8)',\ + org.codehaus.jettison.jettison;version='[1.1.0,1.1.1)' --runproperties: \ - jetty.http.port=8080,\ - jetty.etc.config.urls='etc/jetty.xml,etc/jetty-http.xml,etc/jetty-deployer.xml,etc/jetty-rewrite.xml',\ - osgi.console=,\ - jetty.home.bundle=specmate-jettystarter,\ +-runproperties: \ + jetty.http.port=8080,\ + jetty.etc.config.urls='etc/jetty.xml,etc/jetty-http.xml,etc/jetty-deployer.xml,etc/jetty-rewrite.xml',\ + osgi.console=,\ + jetty.home.bundle=specmate-jettystarter,\ osgi.compatibility.bootdelegation=true -runrepos: \ Workspace,\ Local --runvm: -Xmx6000m\n\ +-runvm: -Xmx6000m\n\ -Djdk.crypto.KeyAgreement.legacyKDF=true \ No newline at end of file diff --git a/bundles/specmate-std-env/prod-specmate-cdo-server-oracle.bndrun b/bundles/specmate-std-env/prod-specmate-cdo-server-oracle.bndrun index ee6d6b91a..e6a3bc099 100644 --- a/bundles/specmate-std-env/prod-specmate-cdo-server-oracle.bndrun +++ b/bundles/specmate-std-env/prod-specmate-cdo-server-oracle.bndrun @@ -28,7 +28,11 @@ Workspace,\ Local -runvm: -Xmx6000m --runbundles: \ +-runbundles: \ + org.eclipse.equinox.log;version='[1.2.300,1.2.301)',\ + specmate-logging;version=snapshot,\ + specmate-logging-slf4j;version=snapshot,\ + specmate-logging-slf4j-julbridge;version=snapshot,\ 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)',\ @@ -49,7 +53,6 @@ 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.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)',\ @@ -69,9 +72,6 @@ specmate-config;version=snapshot,\ specmate-dbprovider-api;version=snapshot,\ specmate-dbprovider-oracle;version=snapshot,\ - specmate-logging;version=snapshot,\ - specmate-logging-slf4j;version=snapshot,\ - specmate-logging-slf4j-julbridge;version=snapshot,\ specmate-migration;version=snapshot,\ specmate-model-gen;version=snapshot,\ specmate-model-support;version=snapshot,\ diff --git a/bundles/specmate-std-env/prod-specmate-no-cdo-server.bndrun b/bundles/specmate-std-env/prod-specmate-no-cdo-server.bndrun index 4ed61ec78..f4a1f045d 100644 --- a/bundles/specmate-std-env/prod-specmate-no-cdo-server.bndrun +++ b/bundles/specmate-std-env/prod-specmate-no-cdo-server.bndrun @@ -42,7 +42,10 @@ osgi.identity;filter:='(osgi.identity=specmate-jira-connector)',\ osgi.identity;filter:='(osgi.identity=specmate-nlp)',\ osgi.identity;filter:='(osgi.identity=specmate-model-generation)' --runbundles: \ +-runbundles: \ + specmate-logging;version=snapshot,\ + specmate-logging-slf4j;version=snapshot,\ + specmate-logging-slf4j-julbridge;version=snapshot,\ 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)',\ @@ -80,9 +83,6 @@ 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,\ diff --git a/bundles/specmate-testspecification/src/com/specmate/testspecification/internal/testskeleton/BaseSkeleton.java b/bundles/specmate-testspecification/src/com/specmate/testspecification/internal/testskeleton/BaseSkeleton.java index 521788a3f..d90bef8f7 100644 --- a/bundles/specmate-testspecification/src/com/specmate/testspecification/internal/testskeleton/BaseSkeleton.java +++ b/bundles/specmate-testspecification/src/com/specmate/testspecification/internal/testskeleton/BaseSkeleton.java @@ -23,14 +23,18 @@ public abstract class BaseSkeleton { private static Pattern startsNumerical = Pattern.compile("^[0-9]"); private static Pattern invalidChars = Pattern.compile("[^a-zA-Z_0-9\\_]"); - Comparator parameterComparator = (p1, p2) -> p1.getType().compareTo(p2.getType()); - Comparator assignmentComparator = (a1, a2) -> a1.getParameter().getType() - .compareTo(a2.getParameter().getType()); + Comparator parameterComparator = (p1, p2) -> compareParameter(p1, p2); + Comparator assignmentComparator = (a1, a2) -> compareParameter(a1.getParameter(), + a2.getParameter()); public BaseSkeleton(String language) { this.language = language; } + private static int compareParameter(TestParameter p1, TestParameter p2) { + return p1.getType().compareTo(p2.getType()) * 10 + p1.getName().compareTo(p2.getName()); + } + public TestSpecificationSkeleton generate(TestSpecification testSpecification) { StringBuilder sb = new StringBuilder(); diff --git a/web/src/app/model/meta/field-meta.ts b/web/src/app/model/meta/field-meta.ts index 4ba5345d7..3d4dd5844 100644 --- a/web/src/app/model/meta/field-meta.ts +++ b/web/src/app/model/meta/field-meta.ts @@ -1,532 +1,532 @@ export class FieldMetaItem { - public name: string; + public name: string; public shortDesc: string; public longDesc: string; public type: string; public required?: boolean; public values?: string; - public rows?: string; - public position?: string; + public rows?: string; + public position?: string; public allowedPattern?: string; } export class MetaInfo { - public static INamed: FieldMetaItem[] = [ - { - name: "name", - shortDesc: 'Name', - longDesc: '', - required: true, - type: 'text', - position: '0', - allowedPattern: '^[^,;|]*$' - } ]; - public static IDescribed: FieldMetaItem[] = [ - { - name: "description", - shortDesc: 'Description', - longDesc: '', - required: false, - type: 'longText', - rows: '5', - position: '100' - } ]; - public static IID: FieldMetaItem[] = [ - ]; - public static IContentElement: FieldMetaItem[] = [ - { - name: "name", - shortDesc: 'Name', - longDesc: '', - required: true, - type: 'text', - position: '0', - allowedPattern: '^[^,;|]*$' - }, { - name: "description", - shortDesc: 'Description', - longDesc: '', - required: false, - type: 'longText', - rows: '5', - position: '100' - } ]; - public static IContainer: FieldMetaItem[] = [ - { - name: "name", - shortDesc: 'Name', - longDesc: '', - required: true, - type: 'text', - position: '0', - allowedPattern: '^[^,;|]*$' - }, { - name: "description", - shortDesc: 'Description', - longDesc: '', - required: false, - type: 'longText', - rows: '5', - position: '100' - } ]; - public static ISpecmateModelObject: FieldMetaItem[] = [ - { - name: "name", - shortDesc: 'Name', - longDesc: '', - required: true, - type: 'text', - position: '0', - allowedPattern: '^[^,;|]*$' - }, { - name: "description", - shortDesc: 'Description', - longDesc: '', - required: false, - type: 'longText', - rows: '5', - position: '100' - } ]; - public static Folder: FieldMetaItem[] = [ - { - name: "name", - shortDesc: 'Name', - longDesc: '', - required: true, - type: 'text', - position: '0', - allowedPattern: '^[^,;|]*$' - }, { - name: "description", - shortDesc: 'Description', - longDesc: '', - required: false, - type: 'longText', - rows: '5', - position: '100' - } ]; - public static IPositionable: FieldMetaItem[] = [ - ]; - public static IExternal: FieldMetaItem[] = [ - ]; - public static ISpecmatePositionableModelObject: FieldMetaItem[] = [ - { - name: "name", - shortDesc: 'Name', - longDesc: '', - required: true, - type: 'text', - position: '0', - allowedPattern: '^[^,;|]*$' - }, { - name: "description", - shortDesc: 'Description', - longDesc: '', - required: false, - type: 'longText', - rows: '5', - position: '100' - } ]; - public static IModelConnection: FieldMetaItem[] = [ - { - name: "name", - shortDesc: 'Name', - longDesc: '', - required: true, - type: 'text', - position: '0', - allowedPattern: '^[^,;|]*$' - }, { - name: "description", - shortDesc: 'Description', - longDesc: '', - required: false, - type: 'longText', - rows: '5', - position: '100' - } ]; - public static IModelNode: FieldMetaItem[] = [ - { - name: "name", - shortDesc: 'Name', - longDesc: '', - required: true, - type: 'text', - position: '0', - allowedPattern: '^[^,;|]*$' - }, { - name: "description", - shortDesc: 'Description', - longDesc: '', - required: false, - type: 'longText', - rows: '5', - position: '100' - } ]; - public static ITracingElement: FieldMetaItem[] = [ - ]; - public static Requirement: FieldMetaItem[] = [ - { - name: "name", - shortDesc: 'Name', - longDesc: '', - required: true, - type: 'text', - position: '0', - allowedPattern: '^[^,;|]*$' - }, { - name: "description", - shortDesc: 'Description', - longDesc: '', - required: false, - type: 'longText', - rows: '5', - position: '100' - } ]; - public static CEGModel: FieldMetaItem[] = [ - { - name: "name", - shortDesc: 'Name', - longDesc: '', - required: true, - type: 'text', - position: '0', - allowedPattern: '^[^,;|]*$' - }, { - name: "description", - shortDesc: 'Description', - longDesc: '', - required: false, - type: 'longText', - rows: '5', - position: '100' - }, { - name: "modelRequirements", - shortDesc: 'Model Requirements', - longDesc: '', - required: false, - type: 'longText', - rows: '5', - position: '110' - } ]; - public static CEGNode: FieldMetaItem[] = [ - { - name: "type", - shortDesc: 'Type', - longDesc: 'The type of a node', - required: true, - type: 'singleSelection', - values: '["AND", "OR"]', - position: '3' - }, { - name: "variable", - shortDesc: 'Variable', - longDesc: 'The variable of a node', - required: true, - type: 'text', - position: '1' - }, { - name: "condition", - shortDesc: 'Condition', - longDesc: 'The condition the variable has to fulfil', - required: true, - type: 'text', - position: '2' - } ]; - public static CEGConnection: FieldMetaItem[] = [ - { - name: "name", - shortDesc: 'Name', - longDesc: '', - required: true, - type: 'text', - position: '0', - allowedPattern: '^[^,;|]*$' - }, { - name: "description", - shortDesc: 'Description', - longDesc: '', - required: false, - type: 'longText', - rows: '5', - position: '100' - }, { - name: "negate", - shortDesc: 'Negate', - longDesc: 'Negation of this connection', - type: 'checkbox', - position: '1' - } ]; - public static TestSpecification: FieldMetaItem[] = [ - { - name: "name", - shortDesc: 'Name', - longDesc: '', - required: true, - type: 'text', - position: '0', - allowedPattern: '^[^,;|]*$' - }, { - name: "description", - shortDesc: 'Description', - longDesc: '', - required: false, - type: 'longText', - rows: '5', - position: '100' - } ]; - public static TestSpecificationSkeleton: FieldMetaItem[] = [ - { - name: "name", - shortDesc: 'Name', - longDesc: '', - required: true, - type: 'text', - position: '0', - allowedPattern: '^[^,;|]*$' - } ]; - public static TestParameter: FieldMetaItem[] = [ - { - name: "name", - shortDesc: 'Name', - longDesc: '', - required: true, - type: 'text', - position: '0', - allowedPattern: '^[^,;|]*$' - }, { - name: "description", - shortDesc: 'Description', - longDesc: '', - required: false, - type: 'longText', - rows: '5', - position: '100' - } ]; - public static TestCase: FieldMetaItem[] = [ - { - name: "name", - shortDesc: 'Name', - longDesc: '', - required: true, - type: 'text', - position: '0', - allowedPattern: '^[^,;|]*$' - }, { - name: "description", - shortDesc: 'Description', - longDesc: '', - required: false, - type: 'longText', - rows: '5', - position: '100' - } ]; - public static ParameterAssignment: FieldMetaItem[] = [ - { - name: "name", - shortDesc: 'Name', - longDesc: '', - required: true, - type: 'text', - position: '0', - allowedPattern: '^[^,;|]*$' - }, { - name: "description", - shortDesc: 'Description', - longDesc: '', - required: false, - type: 'longText', - rows: '5', - position: '100' - } ]; - public static TestProcedure: FieldMetaItem[] = [ - { - name: "name", - shortDesc: 'Name', - longDesc: '', - required: true, - type: 'text', - position: '0', - allowedPattern: '^[^,;|]*$' - }, { - name: "description", - shortDesc: 'Description', - longDesc: '', - required: false, - type: 'longText', - rows: '5', - position: '100' - }, { - name: "isRegressionTest", - shortDesc: 'Regression Test', - type: 'checkbox', - position: '3', - longDesc: '' - } ]; - public static TestStep: FieldMetaItem[] = [ - { - name: "name", - shortDesc: 'Name', - longDesc: '', - required: true, - type: 'text', - position: '0', - allowedPattern: '^[^,;|]*$' - }, { - name: "description", - shortDesc: 'Description', - longDesc: '', - required: false, - type: 'longText', - rows: '5', - position: '100' - } ]; - public static Process: FieldMetaItem[] = [ - { - name: "name", - shortDesc: 'Name', - longDesc: '', - required: true, - type: 'text', - position: '0', - allowedPattern: '^[^,;|]*$' - }, { - name: "description", - shortDesc: 'Description', - longDesc: '', - required: false, - type: 'longText', - rows: '5', - position: '100' - } ]; - public static ProcessNode: FieldMetaItem[] = [ - { - name: "name", - shortDesc: 'Name', - longDesc: '', - required: true, - type: 'text', - position: '0', - allowedPattern: '^[^,;|]*$' - }, { - name: "description", - shortDesc: 'Description', - longDesc: '', - required: false, - type: 'longText', - rows: '5', - position: '100' - } ]; - public static ProcessStep: FieldMetaItem[] = [ - { - name: "name", - shortDesc: 'Name', - longDesc: '', - required: true, - type: 'text', - position: '0', - allowedPattern: '^[^,;|]*$' - }, { - name: "description", - shortDesc: 'Description', - longDesc: '', - required: false, - type: 'longText', - rows: '5', - position: '100' - }, { - name: "expectedOutcome", - shortDesc: 'Expected Outcome', - longDesc: '', - required: false, - type: 'text', - position: '101' - } ]; - public static ProcessDecision: FieldMetaItem[] = [ - { - name: "name", - shortDesc: 'Name', - longDesc: '', - required: true, - type: 'text', - position: '0', - allowedPattern: '^[^,;|]*$' - }, { - name: "description", - shortDesc: 'Description', - longDesc: '', - required: false, - type: 'longText', - rows: '5', - position: '100' - } ]; - public static ProcessConnection: FieldMetaItem[] = [ - { - name: "description", - shortDesc: 'Description', - longDesc: '', - required: false, - type: 'longText', - rows: '5', - position: '100' - }, { - name: "condition", - shortDesc: 'Condition', - longDesc: 'The condition the variable has to fulfil', - required: false, - type: 'text', - position: '2' - } ]; - public static ProcessStart: FieldMetaItem[] = [ - { - name: "name", - shortDesc: 'Name', - longDesc: '', - required: true, - type: 'text', - position: '0', - allowedPattern: '^[^,;|]*$' - }, { - name: "description", - shortDesc: 'Description', - longDesc: '', - required: false, - type: 'longText', - rows: '5', - position: '100' - } ]; - public static ProcessEnd: FieldMetaItem[] = [ - { - name: "name", - shortDesc: 'Name', - longDesc: '', - required: true, - type: 'text', - position: '0', - allowedPattern: '^[^,;|]*$' - }, { - name: "description", - shortDesc: 'Description', - longDesc: '', - required: false, - type: 'longText', - rows: '5', - position: '100' - } ]; - public static History: FieldMetaItem[] = [ - ]; - public static HistoryEntry: FieldMetaItem[] = [ - ]; - public static Change: FieldMetaItem[] = [ - ]; - public static Status: FieldMetaItem[] = [ - ]; - public static ProblemDetail: FieldMetaItem[] = [ - ]; - public static BatchOperation: FieldMetaItem[] = [ - ]; - public static Operation: FieldMetaItem[] = [ - ]; + public static INamed: FieldMetaItem[] = [ + { + name: 'name', + shortDesc: 'Name', + longDesc: '', + required: true, + type: 'text', + position: '0', + allowedPattern: '^[^,;|]*$' + }]; + public static IDescribed: FieldMetaItem[] = [ + { + name: 'description', + shortDesc: 'Description', + longDesc: '', + required: false, + type: 'longText', + rows: '5', + position: '100' + }]; + public static IID: FieldMetaItem[] = [ + ]; + public static IContentElement: FieldMetaItem[] = [ + { + name: 'name', + shortDesc: 'Name', + longDesc: '', + required: true, + type: 'text', + position: '0', + allowedPattern: '^[^,;|]*$' + }, { + name: 'description', + shortDesc: 'Description', + longDesc: '', + required: false, + type: 'longText', + rows: '5', + position: '100' + }]; + public static IContainer: FieldMetaItem[] = [ + { + name: 'name', + shortDesc: 'Name', + longDesc: '', + required: true, + type: 'text', + position: '0', + allowedPattern: '^[^,;|]*$' + }, { + name: 'description', + shortDesc: 'Description', + longDesc: '', + required: false, + type: 'longText', + rows: '5', + position: '100' + }]; + public static ISpecmateModelObject: FieldMetaItem[] = [ + { + name: 'name', + shortDesc: 'Name', + longDesc: '', + required: true, + type: 'text', + position: '0', + allowedPattern: '^[^,;|]*$' + }, { + name: 'description', + shortDesc: 'Description', + longDesc: '', + required: false, + type: 'longText', + rows: '5', + position: '100' + }]; + public static Folder: FieldMetaItem[] = [ + { + name: 'name', + shortDesc: 'Name', + longDesc: '', + required: true, + type: 'text', + position: '0', + allowedPattern: '^[^,;|]*$' + }, { + name: 'description', + shortDesc: 'Description', + longDesc: '', + required: false, + type: 'longText', + rows: '5', + position: '100' + }]; + public static IPositionable: FieldMetaItem[] = [ + ]; + public static IExternal: FieldMetaItem[] = [ + ]; + public static ISpecmatePositionableModelObject: FieldMetaItem[] = [ + { + name: 'name', + shortDesc: 'Name', + longDesc: '', + required: true, + type: 'text', + position: '0', + allowedPattern: '^[^,;|]*$' + }, { + name: 'description', + shortDesc: 'Description', + longDesc: '', + required: false, + type: 'longText', + rows: '5', + position: '100' + }]; + public static IModelConnection: FieldMetaItem[] = [ + { + name: 'name', + shortDesc: 'Name', + longDesc: '', + required: true, + type: 'text', + position: '0', + allowedPattern: '^[^,;|]*$' + }, { + name: 'description', + shortDesc: 'Description', + longDesc: '', + required: false, + type: 'longText', + rows: '5', + position: '100' + }]; + public static IModelNode: FieldMetaItem[] = [ + { + name: 'name', + shortDesc: 'Name', + longDesc: '', + required: true, + type: 'text', + position: '0', + allowedPattern: '^[^,;|]*$' + }, { + name: 'description', + shortDesc: 'Description', + longDesc: '', + required: false, + type: 'longText', + rows: '5', + position: '100' + }]; + public static ITracingElement: FieldMetaItem[] = [ + ]; + public static Requirement: FieldMetaItem[] = [ + { + name: 'name', + shortDesc: 'Name', + longDesc: '', + required: true, + type: 'text', + position: '0', + allowedPattern: '^[^,;|]*$' + }, { + name: 'description', + shortDesc: 'Description', + longDesc: '', + required: false, + type: 'longText', + rows: '5', + position: '100' + }]; + public static CEGModel: FieldMetaItem[] = [ + { + name: 'name', + shortDesc: 'Name', + longDesc: '', + required: true, + type: 'text', + position: '0', + allowedPattern: '^[^,;|]*$' + }, { + name: 'description', + shortDesc: 'Description', + longDesc: '', + required: false, + type: 'longText', + rows: '5', + position: '100' + }, { + name: 'modelRequirements', + shortDesc: 'Model Requirements', + longDesc: '', + required: false, + type: 'longText', + rows: '5', + position: '110' + }]; + public static CEGNode: FieldMetaItem[] = [ + { + name: 'type', + shortDesc: 'Type', + longDesc: 'The type of a node', + required: true, + type: 'singleSelection', + values: '["AND", "OR"]', + position: '3' + }, { + name: 'variable', + shortDesc: 'Variable', + longDesc: 'The variable of a node', + required: true, + type: 'text', + position: '1' + }, { + name: 'condition', + shortDesc: 'Condition', + longDesc: 'The condition the variable has to fulfil', + required: true, + type: 'text', + position: '2' + }]; + public static CEGConnection: FieldMetaItem[] = [ + { + name: 'name', + shortDesc: 'Name', + longDesc: '', + required: true, + type: 'text', + position: '0', + allowedPattern: '^[^,;|]*$' + }, { + name: 'description', + shortDesc: 'Description', + longDesc: '', + required: false, + type: 'longText', + rows: '5', + position: '100' + }, { + name: 'negate', + shortDesc: 'Negate', + longDesc: 'Negation of this connection', + type: 'checkbox', + position: '1' + }]; + public static TestSpecification: FieldMetaItem[] = [ + { + name: 'name', + shortDesc: 'Name', + longDesc: '', + required: true, + type: 'text', + position: '0', + allowedPattern: '^[^,;|]*$' + }, { + name: 'description', + shortDesc: 'Description', + longDesc: '', + required: false, + type: 'longText', + rows: '5', + position: '100' + }]; + public static TestSpecificationSkeleton: FieldMetaItem[] = [ + { + name: 'name', + shortDesc: 'Name', + longDesc: '', + required: true, + type: 'text', + position: '0', + allowedPattern: '^[^,;|]*$' + }]; + public static TestParameter: FieldMetaItem[] = [ + { + name: 'name', + shortDesc: 'Name', + longDesc: '', + required: true, + type: 'text', + position: '0', + allowedPattern: '^[^,;|]*$' + }, { + name: 'description', + shortDesc: 'Description', + longDesc: '', + required: false, + type: 'longText', + rows: '5', + position: '100' + }]; + public static TestCase: FieldMetaItem[] = [ + { + name: 'name', + shortDesc: 'Name', + longDesc: '', + required: true, + type: 'text', + position: '0', + allowedPattern: '^[^,;|]*$' + }, { + name: 'description', + shortDesc: 'Description', + longDesc: '', + required: false, + type: 'longText', + rows: '5', + position: '100' + }]; + public static ParameterAssignment: FieldMetaItem[] = [ + { + name: 'name', + shortDesc: 'Name', + longDesc: '', + required: true, + type: 'text', + position: '0', + allowedPattern: '^[^,;|]*$' + }, { + name: 'description', + shortDesc: 'Description', + longDesc: '', + required: false, + type: 'longText', + rows: '5', + position: '100' + }]; + public static TestProcedure: FieldMetaItem[] = [ + { + name: 'name', + shortDesc: 'Name', + longDesc: '', + required: true, + type: 'text', + position: '0', + allowedPattern: '^[^,;|]*$' + }, { + name: 'description', + shortDesc: 'Description', + longDesc: '', + required: false, + type: 'longText', + rows: '5', + position: '100' + }, { + name: 'isRegressionTest', + shortDesc: 'Regression Test', + type: 'checkbox', + position: '3', + longDesc: '' + }]; + public static TestStep: FieldMetaItem[] = [ + { + name: 'name', + shortDesc: 'Name', + longDesc: '', + required: true, + type: 'text', + position: '0', + allowedPattern: '^[^,;|]*$' + }, { + name: 'description', + shortDesc: 'Description', + longDesc: '', + required: false, + type: 'longText', + rows: '5', + position: '100' + }]; + public static Process: FieldMetaItem[] = [ + { + name: 'name', + shortDesc: 'Name', + longDesc: '', + required: true, + type: 'text', + position: '0', + allowedPattern: '^[^,;|]*$' + }, { + name: 'description', + shortDesc: 'Description', + longDesc: '', + required: false, + type: 'longText', + rows: '5', + position: '100' + }]; + public static ProcessNode: FieldMetaItem[] = [ + { + name: 'name', + shortDesc: 'Name', + longDesc: '', + required: true, + type: 'text', + position: '0', + allowedPattern: '^[^,;|]*$' + }, { + name: 'description', + shortDesc: 'Description', + longDesc: '', + required: false, + type: 'longText', + rows: '5', + position: '100' + }]; + public static ProcessStep: FieldMetaItem[] = [ + { + name: 'name', + shortDesc: 'Name', + longDesc: '', + required: true, + type: 'text', + position: '0', + allowedPattern: '^[^,;|]*$' + }, { + name: 'description', + shortDesc: 'Description', + longDesc: '', + required: false, + type: 'longText', + rows: '5', + position: '100' + }, { + name: 'expectedOutcome', + shortDesc: 'Expected Outcome', + longDesc: '', + required: false, + type: 'text', + position: '101' + }]; + public static ProcessDecision: FieldMetaItem[] = [ + { + name: 'name', + shortDesc: 'Name', + longDesc: '', + required: true, + type: 'text', + position: '0', + allowedPattern: '^[^,;|]*$' + }, { + name: 'description', + shortDesc: 'Description', + longDesc: '', + required: false, + type: 'longText', + rows: '5', + position: '100' + }]; + public static ProcessConnection: FieldMetaItem[] = [ + { + name: 'description', + shortDesc: 'Description', + longDesc: '', + required: false, + type: 'longText', + rows: '5', + position: '100' + }, { + name: 'condition', + shortDesc: 'Condition', + longDesc: 'The condition the variable has to fulfil', + required: false, + type: 'text', + position: '2' + }]; + public static ProcessStart: FieldMetaItem[] = [ + { + name: 'name', + shortDesc: 'Name', + longDesc: '', + required: true, + type: 'text', + position: '0', + allowedPattern: '^[^,;|]*$' + }, { + name: 'description', + shortDesc: 'Description', + longDesc: '', + required: false, + type: 'longText', + rows: '5', + position: '100' + }]; + public static ProcessEnd: FieldMetaItem[] = [ + { + name: 'name', + shortDesc: 'Name', + longDesc: '', + required: true, + type: 'text', + position: '0', + allowedPattern: '^[^,;|]*$' + }, { + name: 'description', + shortDesc: 'Description', + longDesc: '', + required: false, + type: 'longText', + rows: '5', + position: '100' + }]; + public static History: FieldMetaItem[] = [ + ]; + public static HistoryEntry: FieldMetaItem[] = [ + ]; + public static Change: FieldMetaItem[] = [ + ]; + public static Status: FieldMetaItem[] = [ + ]; + public static ProblemDetail: FieldMetaItem[] = [ + ]; + public static BatchOperation: FieldMetaItem[] = [ + ]; + public static Operation: FieldMetaItem[] = [ + ]; } diff --git a/web/src/app/modules/actions/modules/get-test-specification-skeleton-button/components/get-test-specification-skeleton-button.component.ts b/web/src/app/modules/actions/modules/get-test-specification-skeleton-button/components/get-test-specification-skeleton-button.component.ts index 1c6ac5838..24c767b7d 100644 --- a/web/src/app/modules/actions/modules/get-test-specification-skeleton-button/components/get-test-specification-skeleton-button.component.ts +++ b/web/src/app/modules/actions/modules/get-test-specification-skeleton-button/components/get-test-specification-skeleton-button.component.ts @@ -19,6 +19,8 @@ export class GetTestSpecificationSkeletonButton { private _lang: string; + private static UTF8_BOM = '\ufeff'; + @Input() public set testspecification(testspecification: TestSpecification) { if (!testspecification) { @@ -47,7 +49,7 @@ export class GetTestSpecificationSkeletonButton { throw new Error('Could not load test specification skeleton for ' + this._lang); } - saveAs(new Blob([data.code], {type: 'text/plain;charset=utf-8'}), data.name); + saveAs(new Blob([GetTestSpecificationSkeletonButton.UTF8_BOM + data.code], {type: 'text/plain;charset=utf-8'}), data.name); } public get language(): string { diff --git a/web/src/app/modules/actions/modules/short-error-message-display/components/short-model-error-message-display.component.css b/web/src/app/modules/actions/modules/short-error-message-display/components/short-model-error-message-display.component.css new file mode 100644 index 000000000..e69de29bb diff --git a/web/src/app/modules/actions/modules/short-error-message-display/components/short-model-error-message-display.component.html b/web/src/app/modules/actions/modules/short-error-message-display/components/short-model-error-message-display.component.html new file mode 100644 index 000000000..82a7ab39e --- /dev/null +++ b/web/src/app/modules/actions/modules/short-error-message-display/components/short-model-error-message-display.component.html @@ -0,0 +1,2 @@ + {{'ModelHasErrors' | translate}}  \ No newline at end of file diff --git a/web/src/app/modules/actions/modules/short-error-message-display/components/short-model-error-message-display.component.ts b/web/src/app/modules/actions/modules/short-error-message-display/components/short-model-error-message-display.component.ts new file mode 100644 index 000000000..2800883d9 --- /dev/null +++ b/web/src/app/modules/actions/modules/short-error-message-display/components/short-model-error-message-display.component.ts @@ -0,0 +1,55 @@ +import { Component, Input } from '@angular/core'; +import { TranslateService } from '@ngx-translate/core'; +import { Config } from '../../../../../config/config'; +import { ElementFactoryBase } from '../../../../../factory/element-factory-base'; +import { CEGModel } from '../../../../../model/CEGModel'; +import { IContainer } from '../../../../../model/IContainer'; +import { Process } from '../../../../../model/Process'; +import { TestSpecification } from '../../../../../model/TestSpecification'; +import { Id } from '../../../../../util/id'; +import { Url } from '../../../../../util/url'; +import { ValidationResult } from '../../../../../validation/validation-result'; +import { SpecmateDataService } from '../../../../data/modules/data-service/services/specmate-data.service'; +import { ValidationService } from '../../../../forms/modules/validation/services/validation.service'; +import { NavigatorService } from '../../../../navigation/modules/navigator/services/navigator.service'; +import { ConfirmationModal } from '../../../../notification/modules/modals/services/confirmation-modal.service'; +import { LoggingService } from '../../../../views/side/modules/log-list/services/logging.service'; + +@Component({ + moduleId: module.id.toString(), + selector: 'short-model-error-message-display', + templateUrl: 'short-model-error-message-display.component.html', + styleUrls: ['short-model-error-message-display.component.css'] +}) + +export class ShortModelErrorMessageDisplay { + + private contents: IContainer[]; + + private _model: CEGModel | Process; + + public get model(): CEGModel | Process { + return this._model; + } + + @Input() + public set model(model: CEGModel | Process) { + if (!model) { + return; + } + this._model = model; + this.dataService.readContents(model.url).then((contents: IContainer[]) => { + this.contents = contents; + }); + } + + constructor(private dataService: SpecmateDataService, + private validator: ValidationService) { } + + public get hasErrors(): boolean { + if (this.model === undefined) { + return false; + } + return !this.validator.isValid(this.model, this.contents); + } +} diff --git a/web/src/app/modules/actions/modules/short-error-message-display/short-model-error-message-display.module.ts b/web/src/app/modules/actions/modules/short-error-message-display/short-model-error-message-display.module.ts new file mode 100644 index 000000000..8a291b31d --- /dev/null +++ b/web/src/app/modules/actions/modules/short-error-message-display/short-model-error-message-display.module.ts @@ -0,0 +1,28 @@ +import { NgModule } from '@angular/core'; +import { BrowserModule } from '@angular/platform-browser'; +import { TranslateModule } from '@ngx-translate/core'; +import { ShortModelErrorMessageDisplay } from './components/short-model-error-message-display.component'; + +@NgModule({ + imports: [ + // MODULE IMPORTS + BrowserModule, + TranslateModule + ], + declarations: [ + // COMPONENTS IN THIS MODULE + ShortModelErrorMessageDisplay + ], + exports: [ + // THE COMPONENTS VISIBLE TO THE OUTSIDE + ShortModelErrorMessageDisplay + ], + providers: [ + // SERVICES + ], + bootstrap: [ + // COMPONENTS THAT ARE BOOTSTRAPPED HERE + ] +}) + +export class ShortModelErrorDisplayModule { } diff --git a/web/src/app/modules/actions/modules/test-specification-generator-button/components/test-specification-generator-button.component.css b/web/src/app/modules/actions/modules/test-specification-generator-button/components/test-specification-generator-button.component.css index be2270467..e69de29bb 100644 --- a/web/src/app/modules/actions/modules/test-specification-generator-button/components/test-specification-generator-button.component.css +++ b/web/src/app/modules/actions/modules/test-specification-generator-button/components/test-specification-generator-button.component.css @@ -1,3 +0,0 @@ -.model-error { - color: red; -} \ 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 06eb41954..8f7ed4707 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 @@ - {{'ModelHasErrors'|translate}}  - \ No newline at end of file + \ No newline at end of file diff --git a/web/src/app/modules/data/modules/data-service/services/service-interface.ts b/web/src/app/modules/data/modules/data-service/services/service-interface.ts index aed2d6897..38e0774a1 100644 --- a/web/src/app/modules/data/modules/data-service/services/service-interface.ts +++ b/web/src/app/modules/data/modules/data-service/services/service-interface.ts @@ -71,8 +71,8 @@ export class ServiceInterface { await this.http.delete(Url.urlDelete(url), { headers: this.getAuthHeader(token) }).toPromise(); } - public async performOperation(url: string, serviceSuffix: string, payload: any, token: UserToken): Promise { - await this.http.post(Url.urlCustomService(url, serviceSuffix), payload, { headers: this.getAuthHeader(token) }).toPromise(); + public async performOperation(url: string, serviceSuffix: string, payload: any, token: UserToken): Promise { + return await this.http.post(Url.urlCustomService(url, serviceSuffix), payload, { headers: this.getAuthHeader(token) }).toPromise(); } public async performQuery(url: string, serviceSuffix: string, parameters: { [key: string]: string }, token: UserToken): Promise { diff --git a/web/src/app/modules/data/modules/data-service/services/specmate-data.service.ts b/web/src/app/modules/data/modules/data-service/services/specmate-data.service.ts index 11b0a74c5..7c9bef6d3 100644 --- a/web/src/app/modules/data/modules/data-service/services/specmate-data.service.ts +++ b/web/src/app/modules/data/modules/data-service/services/specmate-data.service.ts @@ -314,9 +314,9 @@ export class SpecmateDataService { }).catch((error) => this.handleError(this.translate.instant('elementCouldNotBeDeleted'), url, error)); } - public performOperations(url: string, operation: string, payload?: any): Promise { + public performOperations(url: string, operation: string, payload?: any): Promise { if (!this.auth.isAuthenticatedForUrl(url)) { - return Promise.resolve(); + return Promise.resolve(false); } this.busy = true; return this.serviceInterface.performOperation(url, operation, payload, this.auth.token).then((result) => { diff --git a/web/src/app/modules/forms/modules/generic-form/components/form-checkbox-input.component.html b/web/src/app/modules/forms/modules/generic-form/components/form-checkbox-input.component.html index 436fb8e7b..9f2a7514b 100644 --- a/web/src/app/modules/forms/modules/generic-form/components/form-checkbox-input.component.html +++ b/web/src/app/modules/forms/modules/generic-form/components/form-checkbox-input.component.html @@ -1,10 +1,10 @@ -
- - -
+
+ + +
diff --git a/web/src/app/modules/forms/modules/generic-form/components/form-long-text-input.component.html b/web/src/app/modules/forms/modules/generic-form/components/form-long-text-input.component.html index 983ed38b0..f9bfecb7f 100644 --- a/web/src/app/modules/forms/modules/generic-form/components/form-long-text-input.component.html +++ b/web/src/app/modules/forms/modules/generic-form/components/form-long-text-input.component.html @@ -1,8 +1,8 @@ -
- - - -
+
+ + + +
diff --git a/web/src/app/modules/forms/modules/generic-form/components/form-single-selection-input.component.html b/web/src/app/modules/forms/modules/generic-form/components/form-single-selection-input.component.html index daed41887..f253c3a43 100644 --- a/web/src/app/modules/forms/modules/generic-form/components/form-single-selection-input.component.html +++ b/web/src/app/modules/forms/modules/generic-form/components/form-single-selection-input.component.html @@ -1,10 +1,10 @@ -
- - - -
+
+ + + +
diff --git a/web/src/app/modules/forms/modules/generic-form/components/form-text-input.component.html b/web/src/app/modules/forms/modules/generic-form/components/form-text-input.component.html index 51ffa4c81..ba057d5e2 100644 --- a/web/src/app/modules/forms/modules/generic-form/components/form-text-input.component.html +++ b/web/src/app/modules/forms/modules/generic-form/components/form-text-input.component.html @@ -1,10 +1,10 @@ -
- - - - -
+
+ + + + +
diff --git a/web/src/app/modules/navigation/modules/navigator/directives/navigation-target.directive.ts b/web/src/app/modules/navigation/modules/navigator/directives/navigation-target.directive.ts index e3699ba63..e75978a71 100644 --- a/web/src/app/modules/navigation/modules/navigator/directives/navigation-target.directive.ts +++ b/web/src/app/modules/navigation/modules/navigator/directives/navigation-target.directive.ts @@ -2,7 +2,6 @@ import { Directive, OnInit, Input, HostListener, ElementRef } from '@angular/cor import { IContainer } from '../../../../../model/IContainer'; import { NavigatorService } from '../services/navigator.service'; import { TranslateService } from '@ngx-translate/core'; -import { Key } from '../../../../../util/keycode'; @Directive({ selector: '[navigationTarget]' }) export class NavigationTargetDirective implements OnInit { @@ -17,11 +16,16 @@ export class NavigationTargetDirective implements OnInit { constructor(private elementRef: ElementRef, private navigatorService: NavigatorService, private translate: TranslateService) { elementRef.nativeElement.href = ''; + translate.onLangChange.subscribe(() => this.setTooltip()); } ngOnInit() { + this.setTooltip(); + } + + private setTooltip(): void { if (this.target) { - this.elementRef.nativeElement.title = this.translate.instant('navigateTo', {name: this.target.name}); + this.elementRef.nativeElement.title = this.translate.instant('navigateTo', { name: this.target.name }); } } } diff --git a/web/src/app/modules/navigation/modules/project-explorer/components/project-explorer.component.html b/web/src/app/modules/navigation/modules/project-explorer/components/project-explorer.component.html index b62d62e74..60be479aa 100644 --- a/web/src/app/modules/navigation/modules/project-explorer/components/project-explorer.component.html +++ b/web/src/app/modules/navigation/modules/project-explorer/components/project-explorer.component.html @@ -1,6 +1,6 @@
-
+
diff --git a/web/src/app/modules/views/main/editors/modules/contents-container/components/ceg-model-container.component.html b/web/src/app/modules/views/main/editors/modules/contents-container/components/ceg-model-container.component.html index 9d42ad6ed..fe23aa72e 100644 --- a/web/src/app/modules/views/main/editors/modules/contents-container/components/ceg-model-container.component.html +++ b/web/src/app/modules/views/main/editors/modules/contents-container/components/ceg-model-container.component.html @@ -20,6 +20,7 @@
{{'Cause-EffectModels' | translate}}
{{element.description | truncate: 60}} + + -
- - - - - - - - - - - - -
ElementsMessage
- - {{'NoWarnings'|translate}}. - +
+

+ + +  {{'NoWarnings' | translate}}. + +

- + + + + + + + + + + + + +
ElementsMessage
\ No newline at end of file diff --git a/web/src/app/modules/views/side/modules/errors-warnings/components/errors-warnings.component.ts b/web/src/app/modules/views/side/modules/errors-warnings/components/errors-warnings.component.ts index 485e7914a..b1fa2a28a 100644 --- a/web/src/app/modules/views/side/modules/errors-warnings/components/errors-warnings.component.ts +++ b/web/src/app/modules/views/side/modules/errors-warnings/components/errors-warnings.component.ts @@ -2,6 +2,7 @@ import { Component } from '@angular/core'; import { ValidationResult } from '../../../../../../validation/validation-result'; import { ValidationService } from '../../../../../forms/modules/validation/services/validation.service'; import { AdditionalInformationService } from '../../links-actions/services/additional-information.service'; +import { IContainer } from '../../../../../../model/IContainer'; @Component({ @@ -23,6 +24,9 @@ export class ErrorsWarings { return this._isCollapsed; } + public get model(): IContainer { + return this.additionalInformationService.element; + } public visible = true; constructor(private validationService: ValidationService, diff --git a/web/src/app/modules/views/side/modules/errors-warnings/errors-warnings.module.ts b/web/src/app/modules/views/side/modules/errors-warnings/errors-warnings.module.ts index b2abe8295..aff2ac45a 100644 --- a/web/src/app/modules/views/side/modules/errors-warnings/errors-warnings.module.ts +++ b/web/src/app/modules/views/side/modules/errors-warnings/errors-warnings.module.ts @@ -5,6 +5,8 @@ import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; import { ErrorsWarings } from './components/errors-warnings.component'; import { Warning } from './components/warning.component'; +// tslint:disable-next-line:max-line-length +import { ShortModelErrorDisplayModule } from '../../../../actions/modules/short-error-message-display/short-model-error-message-display.module'; @NgModule({ imports: [ @@ -12,7 +14,8 @@ import { Warning } from './components/warning.component'; BrowserModule, NavigatorModule, NgbModule.forRoot(), - TranslateModule + TranslateModule, + ShortModelErrorDisplayModule ], declarations: [ // COMPONENTS IN THIS MODULE diff --git a/web/src/assets/i18n/de.json b/web/src/assets/i18n/de.json index d06d615f4..515f6e172 100644 --- a/web/src/assets/i18n/de.json +++ b/web/src/assets/i18n/de.json @@ -16,7 +16,8 @@ "ElementDeleted": "Element gelöscht", "Error": "Fehler", "ErrorsandWarnings": "Fehler & Warnungen", - "ExpectedOutcome": "Erwartetes Ergebnis", + "Expected Outcome": "Erwartetes Ergebnis", + "ExpectedOutcome": "", "GeneralInformation": "Allgemeine Informationen", "ImplementingBO-team": "Verantwortliches BO-Team", "ImplementingIT-team": "Verantwortliches IT-Team", @@ -27,6 +28,7 @@ "Model": "Modell", "ModelHasErrors": "Fehlerhaftes Model", "Name": "Name", + "Negation of this connection": "Negation der Verbindung", "NoWarnings": "Keine Warnungen", "NumberOfTestCases": "Anzahl Testfälle", "Output": "Ausgabe", @@ -53,10 +55,15 @@ "TestSpecifications": "Testspezifikationen", "TestSteps": "Test Schritte", "TestandRelease": "Test und Freigabe", + "The condition the variable has to fulfil": "Die Bedingung, welche eine Variable erfüllen muss", + "The type of a node": "Der Typ eines Knotens", + "The variable of a node": "Die Variable eines Knotens", "ThisPageWasNotFoundProbablyWeAreStillMissingAFeature": "Seite konnte nicht gefunden werden. Möglicherweise wurde das Feature noch nicht hinzugefügt.", "Title": "Titel", "Traces": "Traces", + "Type": "Typ", "Value": "Wert", + "Variable": "Variable", "addARequirement": "Anforderung hinzufügen", "addInputColumn": "Eingabespalte hinzufügen", "addOutputColumn": "Ausgabespalte hinzufügen", @@ -164,6 +171,7 @@ "restoreZoom": "Zoom wiederherstellen", "save": "Speichern", "saveBeforeTestprocedureExport": "Vor dem Export muss die Testprozedur gespeichert werden. Fortfahren?", + "search": "suchen", "searchRequirements": "Suchen", "searchResults": "Resultate", "searching": "suchen", diff --git a/web/src/assets/i18n/gb.json b/web/src/assets/i18n/gb.json index 9075581aa..b3e68fbe6 100644 --- a/web/src/assets/i18n/gb.json +++ b/web/src/assets/i18n/gb.json @@ -16,7 +16,8 @@ "ElementDeleted": "Element deleted", "Error": "Error", "ErrorsandWarnings": "Errors & Warnings", - "ExpectedOutcome": "Expected Outcome", + "Expected Outcome": "Expected Outcome", + "ExpectedOutcome": "", "GeneralInformation": "General Information", "ImplementingBO-team": "Implementing BO-Team", "ImplementingIT-team": "Implementing IT-Team", @@ -27,6 +28,7 @@ "Model": "Model", "ModelHasErrors": "The Model has Errors", "Name": "Name", + "Negation of this connection": "Negation of this connection", "NoWarnings": "No Warnings", "NumberOfTestCases": "Number of Test Cases", "Output": "Output", @@ -53,10 +55,15 @@ "TestSpecifications": "Test Specifications", "TestSteps": "Test Steps", "TestandRelease": "Test and Release", + "The condition the variable has to fulfil": "The condition the variable has to fulfil", + "The type of a node": "The type of a node", + "The variable of a node": "The variable of a node", "ThisPageWasNotFoundProbablyWeAreStillMissingAFeature": "This Page was not found. Probably, we are still missing a feature.", "Title": "Title", "Traces": "Traces", + "Type": "Type", "Value": "Value", + "Variable": "Variable", "addARequirement": "Add a Requirement", "addInputColumn": "Add input column", "addOutputColumn": "Add output column", @@ -163,6 +170,7 @@ "restoreZoom": "Restore zoom", "save": "Save", "saveBeforeTestprocedureExport": "Before the export the test procedure will be saved. Continue?", + "search": "search", "searchRequirements": "Search", "searchResults": "Search results", "searching": "Searching", diff --git a/web/webpack/webpack.common.js b/web/webpack/webpack.common.js index 25ae5cbc2..fb07c3260 100644 --- a/web/webpack/webpack.common.js +++ b/web/webpack/webpack.common.js @@ -1,4 +1,4 @@ -const SPECMATE_VERSION = '0.2.14' +const SPECMATE_VERSION = '0.2.15' const webpack = require('webpack'); const HtmlWebpackPlugin = require('html-webpack-plugin');