Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
73 commits
Select commit Hold shift + click to select a range
58e52f0
SED-4429 initial draft of mapping fragments to plans
cmisev Feb 6, 2026
d14ca08
Merge branch 'master' into SED-4429-step-ap-ide
cmisev Feb 12, 2026
fbad6b5
SED-4429 fix: remove unused dependencies, gemini code review inputs
cmisev Feb 12, 2026
0a7306a
SED-4429 fix: dependencies
cmisev Feb 12, 2026
12349f4
Merge branch 'master' into SED-4429-step-ap-ide
cmisev Feb 12, 2026
7911b28
SED-4539 basic plan add, remove, modify
cmisev Mar 13, 2026
99c2105
SED-4539 refactor additional field handling
cmisev Mar 13, 2026
364d3b4
SED-4539 simplify Fragment structure
cmisev Mar 13, 2026
9ee49db
Merge branch 'master' into SED-4539-automation-package-collection-and…
cmisev Mar 13, 2026
b9ace31
SED-4539 cleaner string manipulations
cmisev Mar 17, 2026
6b3ad60
SED-4539 generic PatchableYamlArtefactDeserializer
cmisev Mar 19, 2026
289beaa
Merge branch 'master' into SED-4539-automation-package-collection-and…
cmisev Mar 19, 2026
177b99d
SED-4539 fix trivial review issues
cmisev Mar 19, 2026
9caa1f5
SED-4539 fix trivial review issues
cmisev Mar 19, 2026
12b840a
SED-4539 remove unnecessary serializationregistryaware
cmisev Mar 19, 2026
3b47d4c
SED-4539 Exception handling
cmisev Mar 20, 2026
a0507b4
SED-4539 Exception handling
cmisev Mar 20, 2026
5a19c9b
Merge branch 'master' into SED-4539-automation-package-collection-and…
cmisev Mar 20, 2026
3169fc0
SED-4539 Define Collections as Patchable
cmisev Mar 20, 2026
9db55ab
SED-4539 Define Collections as Patchable
cmisev Mar 20, 2026
c07d009
Merge branch 'master' into SED-4539-automation-package-collection-and…
cmisev Mar 24, 2026
7ced285
SED-4631 Update to Jetty 12
cl-exense Mar 31, 2026
d89021f
Merge branch 'master' into SED-4631-update-to-jetty-12
cl-exense Apr 2, 2026
483ea4a
SED-4631 Update plexus-utils
cl-exense Apr 2, 2026
26ca44e
Merge branch 'master' into SED-4539-automation-package-collection-and…
cmisev Apr 2, 2026
d2a178e
Merge branch 'master' into SED-4631-update-to-jetty-12
cl-exense Apr 7, 2026
4fcde11
SED-4631 Remove unused dependency
cl-exense Apr 7, 2026
360247b
Merge branch 'master' into SED-4557-distribution-and-frontend-concept…
cl-exense Apr 8, 2026
fead30f
SED-4631 Removing leftover workarounds
cl-exense Apr 8, 2026
54b63d5
SED-4557 Create module
cl-exense Apr 8, 2026
3e70101
Merge remote-tracking branch 'origin/SED-4631-update-to-jetty-12' int…
cl-exense Apr 8, 2026
e3200c3
SED-4539 WIP Refactor
cmisev Apr 10, 2026
1d0de2c
SED-4539 refactor: introduce PatchingContext
cmisev Apr 13, 2026
fbaf665
Merge branch 'master' into SED-4539-automation-package-collection-and…
cmisev Apr 13, 2026
d007114
SED-4539 fix: unit tests
cmisev Apr 13, 2026
1a591b3
SED-4539 feat: extend patchable to additionalFields
cmisev Apr 13, 2026
dc93ae4
SED-4539 remove superfluous location aware tree parser
cmisev Apr 13, 2026
62b6f6e
SED-4539 fix review comments
cmisev Apr 16, 2026
6fda7fe
Merge branch 'master' into SED-4539-automation-package-collection-and…
cmisev Apr 16, 2026
7fcd655
SED-4539 modify parameters
cmisev Apr 20, 2026
2893c14
Merge branch 'master' into SED-4539-automation-package-collection-and…
cmisev Apr 20, 2026
ff3ed7f
Merge branch 'master' into SED-4557-distribution-and-frontend-concept…
cl-exense Apr 23, 2026
2110d89
Merge branch 'SED-4539-automation-package-collection-and-accessor' in…
cl-exense Apr 23, 2026
a98fd6f
Merge remote-tracking branch 'origin/master' into SED-4557-distributi…
cl-exense Apr 23, 2026
e6e9c0a
SED-4539 plan format fixes, re-read ap in test, function reading
cmisev May 4, 2026
210507a
Merge remote-tracking branch 'origin/SED-4539-automation-package-coll…
cmisev May 4, 2026
7949029
SED-4539 consistency check for added parameters
cmisev May 4, 2026
5449983
SED-4539 improved error message
cmisev May 4, 2026
0562593
SED-4539 keyword loading and WIP on composite keyword loading
cmisev May 4, 2026
4569c0a
SED-4429 SED-4539 Quick-n-dirty bugfixes, logging in APYamlFragmentMa…
cl-exense May 5, 2026
0d90a60
SED-4429 Very WIP - initial step-ap-ide module
cl-exense May 5, 2026
30d01cf
Merge branch 'SED-4539-automation-package-collection-and-accessor' in…
cl-exense May 5, 2026
76aefd7
SED-4539 Fix getCollection idempotence
cl-exense May 5, 2026
eef60b7
Merge remote-tracking branch 'origin/SED-4539-automation-package-coll…
cl-exense May 5, 2026
5a82afb
SED-4429 WIP
cl-exense May 5, 2026
2dbd927
Merge remote-tracking branch 'origin/master' into SED-4429-step-ap-ide
cl-exense May 5, 2026
7b5746c
SED-4429 WIP
cl-exense May 5, 2026
9c0d7ae
SED-4429 Allow switching between APs
cl-exense May 5, 2026
f2f8efc
SED-4539 fix parameter editing
cmisev May 6, 2026
75751c4
Merge remote-tracking branch 'origin/SED-4539-automation-package-coll…
cmisev May 6, 2026
9b25e37
SED-4539 improve parameter editing unit test
cmisev May 6, 2026
a6e8039
Merge remote-tracking branch 'origin/SED-4539-automation-package-coll…
cl-exense May 6, 2026
86110d9
SED-4578 Refactor test classes/resources layout
cl-exense May 6, 2026
cccb72e
SED-4678 Rename module
cl-exense May 6, 2026
6bf39b0
Merge remote-tracking branch 'origin/SED-4678-refactor-test-classes-r…
cl-exense May 6, 2026
6ac6f24
SED-4429 update collections reference name
cl-exense May 6, 2026
f9a39bd
Merge remote-tracking branch 'origin/master' into SED-4429-step-ap-ide
cl-exense May 6, 2026
72affeb
SED-4678 refactor test classes/resources layout, rename module (#640)
cl-exense May 9, 2026
cfeb124
SED-4429 WIP
cl-exense May 11, 2026
dc2884b
Merge remote-tracking branch 'origin/master' into SED-4539-automation…
cl-exense May 11, 2026
6ef962b
Merge branch 'SED-4539-automation-package-collection-and-accessor' in…
cl-exense May 11, 2026
c41364e
SED-4692 Refactor YAML patching logic (#645)
cl-exense May 15, 2026
8745ce2
Merge branch 'master' into SED-4429-step-ap-ide
cl-exense Jun 4, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ indent_size = 2
[*.{yml,yaml}]
indent_style = space
indent_size = 2

ij_yaml_spaces_within_brackets = false

########################################
# Markdown
Expand Down
21 changes: 11 additions & 10 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -72,24 +72,25 @@
</repositories>

<modules>
<module>step-commons</module>
<module>step-agent</module>
<module>step-ap-ide</module>
<module>step-automation-packages</module>
<module>step-cli</module>
<module>step-commons</module>
<module>step-constants</module>
<module>step-core-model</module>
<module>step-controller</module>
<module>step-controller-plugins</module>
<module>step-core</module>
<module>step-automation-packages</module>
<module>step-core-model</module>
<module>step-functions</module>
<module>step-functions-plugins</module>
<module>step-plans</module>
<module>step-controller</module>
<module>step-controller-plugins</module>
<module>step-maven-plugin</module>
<module>step-repositories</module>
<module>step-ide</module>
<module>step-libs-maven-client</module>
<module>step-json-schema</module>
<module>step-cli</module>
<module>step-libs-maven-client</module>
<module>step-livereporting</module>
<module>step-maven-plugin</module>
<module>step-plans</module>
<module>step-repositories</module>
</modules>

<!-- available dependencies, can be used in modules and dependent projects WITHOUT specifying a version number -->
Expand Down
1 change: 1 addition & 0 deletions step-ap-ide/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
filemanager/
12 changes: 12 additions & 0 deletions step-ap-ide/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
This is still very early Work in progress, so some of it is quick and dirty to at least get an initial prototype to work.

Basically, it's a modified and stripped down version of the step controller, meant to be executed lika a local application.
Technically, it still consists of a backend and frontend. For development, they will be separated (as they are for the main Step product),
so you'll also need to launch both of them separately.

To start the frontend, check out branch SED-4429-step-ap-ide of the step-frontend-workspace project, then run
npm run serve:os:cli:local . For a little more information, see the SED-4557 ticket.

To start the backend and use the application, start the StepUp main class. This technically launches the actual controller,
and a client app that is basically a browser. Once started, you can also use a regular browser pointed to http://localhost:4201 .

14 changes: 14 additions & 0 deletions step-ap-ide/TESTS
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
Plan:

Mode (PER_OBJECT / FRAGMENT), foreach:
create new with different name (3x); foreach
rename to longer name
rename back to shorter name
delete

rename to existing (ie conflicting) name


BUGS:
1. Adding Plan to fragment does not make the fragment visible in AP (i.e. does not add to fragments section)
2.
130 changes: 130 additions & 0 deletions step-ap-ide/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,130 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<artifactId>step-ap-ide</artifactId>
<name>${project.groupId}:${project.artifactId}</name>
<packaging>jar</packaging>

<parent>
<groupId>ch.exense.step</groupId>
<artifactId>step</artifactId>
<version>0.0.0-SNAPSHOT</version>
</parent>

<properties>
<javafx.version>21.0.2</javafx.version>
</properties>

<dependencies>
<dependency>
<groupId>ch.exense.step</groupId>
<artifactId>step-framework-server</artifactId>
</dependency>
<dependency>
<groupId>ch.exense.step</groupId>
<artifactId>step-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>ch.exense.step</groupId>
<artifactId>step-controller-backend</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>ch.exense.step</groupId>
<artifactId>step-automation-packages-collections</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-controls</artifactId>
<version>${javafx.version}</version>
<classifier>win</classifier>
</dependency>
<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-web</artifactId>
<version>${javafx.version}</version>
<classifier>win</classifier>
</dependency>

<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-controls</artifactId>
<version>${javafx.version}</version>
<classifier>linux</classifier>
</dependency>
<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-web</artifactId>
<version>${javafx.version}</version>
<classifier>linux</classifier>
</dependency>

<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-controls</artifactId>
<version>${javafx.version}</version>
<classifier>mac</classifier>
</dependency>
<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-web</artifactId>
<version>${javafx.version}</version>
<classifier>mac</classifier>
</dependency>

<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-controls</artifactId>
<version>${javafx.version}</version>
<classifier>mac-aarch64</classifier>
</dependency>
<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-web</artifactId>
<version>${javafx.version}</version>
<classifier>mac-aarch64</classifier>
</dependency>

</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.5.2</version>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
<configuration>
<createDependencyReducedPom>false</createDependencyReducedPom>
<transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>

<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>step.ap_ide.StepUp</mainClass>
</transformer>
</transformers>
<filters>
<filter>
<artifact>*:*</artifact>
<excludes>
<exclude>META-INF/*.SF</exclude>
<exclude>META-INF/*.DSA</exclude>
<exclude>META-INF/*.RSA</exclude>
</excludes>
</filter>
</filters>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
package step.ap_ide;

import step.core.collections.AutomationPackageCollectionFactory;
import step.core.collections.Collection;
import step.core.collections.CollectionFactory;
import step.core.collections.EntityVersion;

import java.io.IOException;
import java.util.Properties;
import java.util.concurrent.ConcurrentHashMap;

public class CurrentlyOpenedAutomationPackageCollectionFactory implements CollectionFactory {

private static CurrentlyOpenedAutomationPackageCollectionFactory INSTANCE;

private AutomationPackageCollectionFactory currentAPFactory;
private final ConcurrentHashMap<String, DynamicallyDelegatingCollection<?>> collectionsByName = new ConcurrentHashMap<>();

public CurrentlyOpenedAutomationPackageCollectionFactory(Properties ignored) {
if (INSTANCE == null) {
INSTANCE = this;
} else {
throw new IllegalStateException("Only one instance is allowed");
}
}

public static CurrentlyOpenedAutomationPackageCollectionFactory getInstance() {
if (INSTANCE == null) {
throw new IllegalStateException("No instance created yet");
}
return INSTANCE;
}

public void setCurrentFactory(AutomationPackageCollectionFactory currentAPFactory) {
if (this.currentAPFactory != null) {
try {
this.currentAPFactory.close();
} catch (IOException e) {
// TODO better logging
e.printStackTrace();
}
}
this.currentAPFactory = currentAPFactory;
collectionsByName.values().forEach(collection -> collection.setFromCurrentFactory(currentAPFactory));
}

@SuppressWarnings("unchecked")
@Override
public <T> Collection<T> getCollection(String name, Class<T> entityClass) {
return (Collection<T>) collectionsByName.computeIfAbsent(name, n -> new DynamicallyDelegatingCollection<T>(name, entityClass, currentAPFactory));
}

@SuppressWarnings("rawtypes")
@Override
public Collection<EntityVersion> getVersionedCollection(String name) {
throw new UnsupportedOperationException();
}

@Override
public void close() throws IOException {

}
}
Loading