10 files changed, 66 insertions, 55 deletions

diff --git a/subprojects/language-web/build.gradle.kts b/subprojects/language-web/build.gradle.kts
index 73e80b1d..bcc10030 100644
--- a/subprojects/language-web/build.gradle.kts
+++ b/subprojects/language-web/build.gradle.kts
@@ -9,10 +9,6 @@ plugins {
         id("tools.refinery.gradle.xtext-generated")
 }
 
-mavenArtifact {
-        description = "Cloud-based partial modeling environment"
-}
-
 val webapp: Configuration by configurations.creating {
         isCanBeConsumed = false
         isCanBeResolved = true
@@ -28,7 +24,7 @@ dependencies {
         implementation(libs.jetty.servlet)
         implementation(libs.jetty.websocket.api)
         implementation(libs.jetty.websocket.server)
-        implementation(libs.slf4j.api)
+        implementation(libs.slf4j)
         implementation(libs.xtext.web)
         xtextGenerated(project(":refinery-language", "generatedWebSources"))
         webapp(project(":refinery-frontend", "productionAssets"))
@@ -48,18 +44,6 @@ tasks {
                 }
         }
 
-        shadowJar {
-                dependsOn(webapp)
-                from(project.sourceSets.main.map { it.output })
-                exclude("META-INF/INDEX.LIST", "META-INF/*.SF", "META-INF/*.DSA", "META-INF/*.RSA", "schema/*",
-                                ".options", ".api_description", "*.profile", "about.*", "about_*.html", "about_files/*",
-                                "plugin.xml", "systembundle.properties", "profile.list", "META-INF/resources/xtext/**")
-                append("plugin.properties")
-                from(webapp) {
-                        into("webapp")
-                }
-        }
-
         register<JavaExec>("serve") {
                 dependsOn(webapp)
                 val mainRuntimeClasspath = sourceSets.main.map { it.runtimeClasspath }
diff --git a/subprojects/language-web/src/main/java/tools/refinery/language/web/generator/ModelGenerationWorker.java b/subprojects/language-web/src/main/java/tools/refinery/language/web/generator/ModelGenerationWorker.java
index 7febce7d..e7facbf7 100644
--- a/subprojects/language-web/src/main/java/tools/refinery/language/web/generator/ModelGenerationWorker.java
+++ b/subprojects/language-web/src/main/java/tools/refinery/language/web/generator/ModelGenerationWorker.java
@@ -9,11 +9,8 @@ import com.google.inject.Inject;
 import org.eclipse.xtext.service.OperationCanceledManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import tools.refinery.generator.ModelGenerator;
-import tools.refinery.generator.ModelGeneratorFactory;
+import tools.refinery.generator.*;
 import tools.refinery.language.web.semantics.metadata.MetadataCreator;
-import tools.refinery.generator.ProblemLoader;
-import tools.refinery.generator.ValidationErrorsException;
 import tools.refinery.language.web.semantics.PartialInterpretation2Json;
 import tools.refinery.language.web.xtext.server.ThreadPoolExecutorServiceProvider;
 import tools.refinery.language.web.xtext.server.push.PushWebDocument;
@@ -149,7 +146,7 @@ public class ModelGenerationWorker implements Runnable {
                 }
                 notifyResult(new ModelGenerationStatusResult(uuid, "Generating model"));
                 generator.setRandomSeed(randomSeed);
-                if (!generator.tryGenerate()) {
+                if (generator.tryGenerate() != GeneratorResult.SUCCESS) {
                         return new ModelGenerationErrorResult(uuid, "Problem is unsatisfiable");
                 }
                 notifyResult(new ModelGenerationStatusResult(uuid, "Saving generated model"));
diff --git a/subprojects/language-web/src/main/java/tools/refinery/language/web/semantics/SemanticsWorker.java b/subprojects/language-web/src/main/java/tools/refinery/language/web/semantics/SemanticsWorker.java
index a96b68f9..508e716e 100644
--- a/subprojects/language-web/src/main/java/tools/refinery/language/web/semantics/SemanticsWorker.java
+++ b/subprojects/language-web/src/main/java/tools/refinery/language/web/semantics/SemanticsWorker.java
@@ -72,7 +72,10 @@ class SemanticsWorker implements Callable<SemanticsResult> {
                 cancellationToken.checkCancelled();
                 ModelSemantics semantics;
                 try {
-                        semantics = semanticsFactory.cancellationToken(cancellationToken).tryCreateSemantics(problem);
+                        semantics = semanticsFactory
+                                        .cancellationToken(cancellationToken)
+                                        .keepNonExistingObjects(true)
+                                        .tryCreateSemantics(problem);
                 } catch (TranslationException e) {
                         return new SemanticsResult(e.getMessage());
                 } catch (TracedException e) {
diff --git a/subprojects/language-web/src/main/java/tools/refinery/language/web/semantics/metadata/BasePredicateDetail.java b/subprojects/language-web/src/main/java/tools/refinery/language/web/semantics/metadata/BasePredicateDetail.java
new file mode 100644
index 00000000..6ffaf267
--- /dev/null
+++ b/subprojects/language-web/src/main/java/tools/refinery/language/web/semantics/metadata/BasePredicateDetail.java
@@ -0,0 +1,10 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.language.web.semantics.metadata;
+
+public record BasePredicateDetail() implements RelationDetail {
+        public static final BasePredicateDetail INSTANCE = new BasePredicateDetail();
+}
diff --git a/subprojects/language-web/src/main/java/tools/refinery/language/web/semantics/metadata/MetadataCreator.java b/subprojects/language-web/src/main/java/tools/refinery/language/web/semantics/metadata/MetadataCreator.java
index 29f8ab8b..11f0a228 100644
--- a/subprojects/language-web/src/main/java/tools/refinery/language/web/semantics/metadata/MetadataCreator.java
+++ b/subprojects/language-web/src/main/java/tools/refinery/language/web/semantics/metadata/MetadataCreator.java
@@ -156,7 +156,10 @@ public class MetadataCreator {
         }
 
         private RelationDetail getPredicateDetail(PredicateDefinition predicate) {
-                return PredicateDetail.ofError(predicate.isError());
+                if (ProblemUtil.isBasePredicate(predicate)) {
+                        return BasePredicateDetail.INSTANCE;
+                }
+                return PredicateDetail.ofError(predicate.getKind() == PredicateKind.ERROR);
         }
 
         private QualifiedName getQualifiedName(EObject eObject) {
diff --git a/subprojects/language-web/src/main/java/tools/refinery/language/web/semantics/metadata/RelationDetail.java b/subprojects/language-web/src/main/java/tools/refinery/language/web/semantics/metadata/RelationDetail.java
index bbe563cd..00177858 100644
--- a/subprojects/language-web/src/main/java/tools/refinery/language/web/semantics/metadata/RelationDetail.java
+++ b/subprojects/language-web/src/main/java/tools/refinery/language/web/semantics/metadata/RelationDetail.java
@@ -6,5 +6,5 @@
 package tools.refinery.language.web.semantics.metadata;
 
 public sealed interface RelationDetail permits ClassDetail, ReferenceDetail, PredicateDetail, OppositeReferenceDetail,
-                BuiltInDetail {
+                BuiltInDetail, BasePredicateDetail {
 }
diff --git a/subprojects/language-web/src/main/java/tools/refinery/language/web/xtext/servlet/XtextWebSocket.java b/subprojects/language-web/src/main/java/tools/refinery/language/web/xtext/servlet/XtextWebSocket.java
index 818bd80e..13ae1221 100644
--- a/subprojects/language-web/src/main/java/tools/refinery/language/web/xtext/servlet/XtextWebSocket.java
+++ b/subprojects/language-web/src/main/java/tools/refinery/language/web/xtext/servlet/XtextWebSocket.java
@@ -37,7 +37,8 @@ public class XtextWebSocket implements ResponseHandler {
                                         .registerSubtype(ReferenceDetail.class, "reference")
                                         .registerSubtype(OppositeReferenceDetail.class, "opposite")
                                         .registerSubtype(PredicateDetail.class, "predicate")
-                                        .registerSubtype(BuiltInDetail.class, "builtin"))
+                                        .registerSubtype(BuiltInDetail.class, "builtin")
+                                        .registerSubtype(BasePredicateDetail.class, "base"))
                         .create();
 
         private final TransactionExecutor executor;
diff --git a/subprojects/language-web/src/test/java/tools/refinery/language/web/tests/AwaitTerminationExecutorServiceProvider.java b/subprojects/language-web/src/test/java/tools/refinery/language/web/tests/AwaitTerminationExecutorServiceProvider.java
index 52acee6d..fe4952a9 100644
--- a/subprojects/language-web/src/test/java/tools/refinery/language/web/tests/AwaitTerminationExecutorServiceProvider.java
+++ b/subprojects/language-web/src/test/java/tools/refinery/language/web/tests/AwaitTerminationExecutorServiceProvider.java
@@ -17,6 +17,13 @@ public class AwaitTerminationExecutorServiceProvider extends ExecutorServiceProv
         private final List<RestartableCachedThreadPool> servicesToShutDown = new ArrayList<>();
 
         @Override
+        public ExecutorService get(String key) {
+                synchronized (servicesToShutDown) {
+                        return super.get(key);
+                }
+        }
+
+        @Override
         protected ExecutorService createInstance(String key) {
                 var instance = new RestartableCachedThreadPool(() -> super.createInstance(key));
                 synchronized (servicesToShutDown) {
@@ -35,8 +42,8 @@ public class AwaitTerminationExecutorServiceProvider extends ExecutorServiceProv
 
         @Override
         public void dispose() {
-                super.dispose();
                 synchronized (servicesToShutDown) {
+                        super.dispose();
                         for (var executorService : servicesToShutDown) {
                                 executorService.waitForTermination();
                         }
diff --git a/subprojects/language-web/src/test/java/tools/refinery/language/web/tests/RestartableCachedThreadPool.java b/subprojects/language-web/src/test/java/tools/refinery/language/web/tests/RestartableCachedThreadPool.java
index 991ff114..4d55e548 100644
--- a/subprojects/language-web/src/test/java/tools/refinery/language/web/tests/RestartableCachedThreadPool.java
+++ b/subprojects/language-web/src/test/java/tools/refinery/language/web/tests/RestartableCachedThreadPool.java
@@ -13,29 +13,34 @@ import org.slf4j.LoggerFactory;
 import java.util.Collection;
 import java.util.List;
 import java.util.concurrent.*;
+import java.util.concurrent.atomic.AtomicReference;
 
 public class RestartableCachedThreadPool implements ExecutorService {
         private static final Logger LOG = LoggerFactory.getLogger(RestartableCachedThreadPool.class);
 
-        private ExecutorService delegate;
+        private final AtomicReference<ExecutorService> delegate = new AtomicReference<>();
 
         private final Provider<ExecutorService> executorServiceProvider;
 
         public RestartableCachedThreadPool(Provider<ExecutorService> executorServiceProvider) {
                 this.executorServiceProvider = executorServiceProvider;
-                delegate = executorServiceProvider.get();
+                delegate.set(executorServiceProvider.get());
         }
 
         public void waitForAllTasksToFinish() {
-                delegate.shutdown();
-                waitForTermination();
-                delegate = executorServiceProvider.get();
+                var oldDelegate = delegate.getAndSet(executorServiceProvider.get());
+                oldDelegate.shutdown();
+                waitForTermination(oldDelegate);
         }
 
         public void waitForTermination() {
+                waitForTermination(delegate.get());
+        }
+
+        private static void waitForTermination(ExecutorService executorService) {
                 boolean result = false;
                 try {
-                        result = delegate.awaitTermination(10, TimeUnit.SECONDS);
+                        result = executorService.awaitTermination(10, TimeUnit.SECONDS);
                 } catch (InterruptedException e) {
                         LOG.warn("Interrupted while waiting for delegate executor to stop", e);
                 }
@@ -46,70 +51,71 @@ public class RestartableCachedThreadPool implements ExecutorService {
 
         @Override
         public boolean awaitTermination(long arg0, @NotNull TimeUnit arg1) throws InterruptedException {
-                return delegate.awaitTermination(arg0, arg1);
+                return delegate.get().awaitTermination(arg0, arg1);
         }
 
         @Override
         public void execute(@NotNull Runnable arg0) {
-                delegate.execute(arg0);
+                delegate.get().execute(arg0);
         }
 
         @Override
-        public <T> List<Future<T>> invokeAll(@NotNull Collection<? extends Callable<T>> arg0, long arg1,
-                                                                                 @NotNull TimeUnit arg2)
+        public <T> @NotNull List<Future<T>> invokeAll(@NotNull Collection<? extends Callable<T>> arg0, long arg1,
+                                                                                                  @NotNull TimeUnit arg2)
                         throws InterruptedException {
-                return delegate.invokeAll(arg0, arg1, arg2);
+                return delegate.get().invokeAll(arg0, arg1, arg2);
         }
 
         @Override
-        public <T> List<Future<T>> invokeAll(@NotNull Collection<? extends Callable<T>> arg0) throws InterruptedException {
-                return delegate.invokeAll(arg0);
+        public <T> @NotNull List<Future<T>> invokeAll(@NotNull Collection<? extends Callable<T>> arg0)
+                        throws InterruptedException {
+                return delegate.get().invokeAll(arg0);
         }
 
         @Override
         public <T> T invokeAny(@NotNull Collection<? extends Callable<T>> arg0, long arg1, @NotNull TimeUnit arg2)
                         throws InterruptedException, ExecutionException, TimeoutException {
-                return delegate.invokeAny(arg0, arg1, arg2);
+                return delegate.get().invokeAny(arg0, arg1, arg2);
         }
 
         @Override
-        public <T> T invokeAny(@NotNull Collection<? extends Callable<T>> arg0) throws InterruptedException,
+        public <T> @NotNull T invokeAny(@NotNull Collection<? extends Callable<T>> arg0) throws InterruptedException,
                         ExecutionException {
-                return delegate.invokeAny(arg0);
+                return delegate.get().invokeAny(arg0);
         }
 
         @Override
         public boolean isShutdown() {
-                return delegate.isShutdown();
+                return delegate.get().isShutdown();
         }
 
         @Override
         public boolean isTerminated() {
-                return delegate.isTerminated();
+                return delegate.get().isTerminated();
         }
 
         @Override
         public void shutdown() {
-                delegate.shutdown();
+                delegate.get().shutdown();
         }
 
         @Override
-        public List<Runnable> shutdownNow() {
-                return delegate.shutdownNow();
+        public @NotNull List<Runnable> shutdownNow() {
+                return delegate.get().shutdownNow();
         }
 
         @Override
-        public <T> Future<T> submit(@NotNull Callable<T> arg0) {
-                return delegate.submit(arg0);
+        public <T> @NotNull Future<T> submit(@NotNull Callable<T> arg0) {
+                return delegate.get().submit(arg0);
         }
 
         @Override
-        public <T> Future<T> submit(@NotNull Runnable arg0, T arg1) {
-                return delegate.submit(arg0, arg1);
+        public <T> @NotNull Future<T> submit(@NotNull Runnable arg0, T arg1) {
+                return delegate.get().submit(arg0, arg1);
         }
 
         @Override
-        public Future<?> submit(@NotNull Runnable arg0) {
-                return delegate.submit(arg0);
+        public @NotNull Future<?> submit(@NotNull Runnable arg0) {
+                return delegate.get().submit(arg0);
         }
 }
diff --git a/subprojects/language-web/src/test/java/tools/refinery/language/web/tests/WebSocketIntegrationTestClient.java b/subprojects/language-web/src/test/java/tools/refinery/language/web/tests/WebSocketIntegrationTestClient.java
index d45a9d6b..6ccf1760 100644
--- a/subprojects/language-web/src/test/java/tools/refinery/language/web/tests/WebSocketIntegrationTestClient.java
+++ b/subprojects/language-web/src/test/java/tools/refinery/language/web/tests/WebSocketIntegrationTestClient.java
@@ -18,7 +18,7 @@ import java.util.List;
 import static org.junit.jupiter.api.Assertions.fail;
 
 public abstract class WebSocketIntegrationTestClient {
-        private static final long TIMEOUT_MILLIS = Duration.ofSeconds(30).toMillis();
+        private static final long TIMEOUT_MILLIS = Duration.ofSeconds(10).toMillis();
 
         private boolean finished = false;