Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
861 changes: 440 additions & 421 deletions model/representations.aird

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions model/toolchain.xml
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@
<webServices name="WsChangeRequest" serviceUrlPattern="change_request" resourceUrlPattern="{id}" delete="true" update="true">
<resourceTypes href="../org.eclipse.lyo.tools.domainmodels/oslcDomainSpecifications.xml#_poJRUJUdEeq-KoPaR9_Cfg"/>
</webServices>
<trsService xsi:type="oslc4j_ai:InmemPagedTrsService"/>
<specification/>
<requiredAdaptors xsi:type="oslc4j_ai:GenericRequiredAdaptor" serviceProviderCatalogURI="http://your.host.com/adaptor/services/catalog/singleton" name="GenericRequiredAdaptor"/>
<configuration xsi:type="oslc4j_ai:MavenServerConfiguration" rootServerBaseUrl="http://localhost:8801/" applicationContextPath="/" servletUrlPattern="/services/*" generateJspFilesForOslcUI="true" jettyPort="8801">
Expand Down Expand Up @@ -206,6 +207,7 @@
<webServices name="WsExecRecords" serviceUrlPattern="exec-records" resourceUrlPattern="{spSlug}-{id}" delete="true" update="true">
<resourceTypes href="../org.eclipse.lyo.tools.domainmodels/oslcDomainSpecifications.xml#_poiS4JUdEeq-KoPaR9_Cfg"/>
</webServices>
<trsService xsi:type="oslc4j_ai:InmemPagedTrsService"/>
<specification/>
<requiredAdaptors xsi:type="oslc4j_ai:GenericRequiredAdaptor" serviceProviderCatalogURI="http://your.host.com/adaptor/services/catalog/singleton" name="GenericRequiredAdaptor"/>
<configuration xsi:type="oslc4j_ai:MavenServerConfiguration" rootServerBaseUrl="http://localhost:8802/" applicationContextPath="/" servletUrlPattern="/services/*" jettyPort="8802">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@
// End of user code

/**
* Generated by Lyo Designer 7.0.0-SNAPSHOT
* Generated by Lyo Designer 7.0.0.qualifier
*/

@OpenAPIDefinition(info = @Info(title = "AM", version = "1.0.0"), servers = @Server(url = "/services/"))
Expand Down
10 changes: 7 additions & 3 deletions src/server-cm/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<maven.compiler.release>21</maven.compiler.release>
<version.lyo>7.0.0-SNAPSHOT</version.lyo>
<swagger-ui.version>5.32.8</swagger-ui.version>
<swagger-ui.version>5.31.0</swagger-ui.version>
<servlet.port>8801</servlet.port>
<application.contextpath>/</application.contextpath>
<application.filename>server-cm</application.filename>
Expand Down Expand Up @@ -233,6 +233,10 @@
<groupId>org.eclipse.lyo.oslc4j.core</groupId>
<artifactId>oslc4j-json4j-provider</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.lyo.trs</groupId>
<artifactId>trs-server</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.lyo.clients</groupId>
<artifactId>oslc-client</artifactId>
Expand Down Expand Up @@ -301,7 +305,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.15.0</version>
<version>3.14.1</version>
<configuration>
<compilerArgument>
-Xlint:fallthrough,unchecked,removal,deprecation,dep-ann,varargs,overloads,serial,try,finally
Expand Down Expand Up @@ -364,7 +368,7 @@
<!-- Download Swagger UI webjar. -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.11.0</version>
<version>3.9.0</version>
<executions>
<execution>
<phase>prepare-package</phase>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@
import org.eclipse.lyo.oslc.domains.cm.Task;
import org.eclipse.lyo.oslc.domains.config.VersionResource;

import org.eclipse.lyo.oslc4j.trs.server.TrsEventHandler;


// Start of user code imports
Expand All @@ -84,7 +85,7 @@ public class RestDelegate {
private static final Logger log = LoggerFactory.getLogger(RestDelegate.class);



@Inject TrsEventHandler trsEventHandler;
@Inject ResourcesFactory resourcesFactory;
// Start of user code class_attributes
public static final String SP_DEFAULT = "sp_single";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@
import org.eclipse.lyo.oslc.domains.rm.Oslc_rmDomainConstants;
import co.oslc.refimpl.cm.gen.services.Change_requestsService;
import co.oslc.refimpl.cm.gen.services.WsChangeRequest;
import org.eclipse.lyo.oslc4j.trs.server.service.TrackedResourceSetService;

// Start of user code imports
// End of user code
Expand All @@ -105,7 +106,7 @@
// End of user code

/**
* Generated by Lyo Designer 7.0.0-SNAPSHOT
* Generated by Lyo Designer 7.0.0.qualifier
*/

@OpenAPIDefinition(info = @Info(title = "CM", version = "1.0.0"), servers = @Server(url = "/services/"))
Expand Down Expand Up @@ -154,6 +155,8 @@ public Set<Object> getSingletons() {
// Start of user code OAuthServiceClasses_notFound
// End of user code
}
// TRS Server resources
RESOURCE_CLASSES.add(TrackedResourceSetService.class);

// Start of user code Custom Resource Classes
RESOURCE_CLASSES.add(OslcCorsFilter.class);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,12 @@
import static co.oslc.refimpl.cm.gen.servlet.ServletListener.getServletUrlPattern;
import java.util.Set;

import java.net.URI;
import java.util.ArrayList;
import org.eclipse.lyo.oslc4j.trs.server.InmemPagedTrs;
import org.eclipse.lyo.oslc4j.trs.server.PagedTrs;
import org.eclipse.lyo.oslc4j.trs.server.PagedTrsFactory;
import org.eclipse.lyo.oslc4j.trs.server.TrsEventHandler;
import org.eclipse.lyo.oslc4j.core.OSLC4JUtils;
// Start of user code imports
// End of user code
Expand Down Expand Up @@ -69,6 +75,8 @@ protected void configure() {
bindFactory(ResourcesFactoryFactory.class).to(ResourcesFactory.class).in(Singleton.class);


bindFactory(InmemTrsEventHandlerFactory.class).to(TrsEventHandler.class).in(Singleton.class);
bindFactory(InmemPagedTrsFactory.class).to(PagedTrs.class).in(Singleton.class);

// Start of user code ConfigureFinalize
// End of user code
Expand Down Expand Up @@ -114,5 +122,42 @@ public void dispose(LyoAppConfiguration instance) {
}
}

static class InmemTrsEventHandlerFactory implements Factory<TrsEventHandler> {
// Start of user code TrsEventHandlerInitialise
// End of user code

@Override
public TrsEventHandler provide() {
ArrayList<URI> uris = new ArrayList<URI>();
// Start of user code TrsEventHandlerInitialBase
//TODO: Provide the initial list of URIs to populate the TRS log with
// End of user code

InmemPagedTrs inmemTrs = new PagedTrsFactory().getInmemPagedTrs(0, 0, uris);
return inmemTrs;
}

@Override
public void dispose(TrsEventHandler instance) {
// Start of user code TrsEventHandlerDispose
// End of user code
}
}

static class InmemPagedTrsFactory implements Factory<PagedTrs> {
@Inject TrsEventHandler trsEventHandler;

@Override
public PagedTrs provide() {
// Start of user code PagedTrsInitialise
// End of user code
return (InmemPagedTrs) trsEventHandler;
}

@Override
public void dispose(PagedTrs instance) {
// Start of user code PagedTrsDispose
// End of user code
}
}
}
10 changes: 7 additions & 3 deletions src/server-qm/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<maven.compiler.release>21</maven.compiler.release>
<version.lyo>7.0.0-SNAPSHOT</version.lyo>
<swagger-ui.version>5.32.8</swagger-ui.version>
<swagger-ui.version>5.31.0</swagger-ui.version>
<servlet.port>8802</servlet.port>
<application.contextpath>/</application.contextpath>
<application.filename>server-qm</application.filename>
Expand Down Expand Up @@ -233,6 +233,10 @@
<groupId>org.eclipse.lyo.oslc4j.core</groupId>
<artifactId>oslc4j-json4j-provider</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.lyo.trs</groupId>
<artifactId>trs-server</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.lyo.clients</groupId>
<artifactId>oslc-client</artifactId>
Expand Down Expand Up @@ -297,7 +301,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.15.0</version>
<version>3.14.1</version>
<configuration>
<compilerArgument>
-Xlint:fallthrough,unchecked,removal,deprecation,dep-ann,varargs,overloads,serial,try,finally
Expand Down Expand Up @@ -360,7 +364,7 @@
<!-- Download Swagger UI webjar. -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.11.0</version>
<version>3.9.0</version>
<executions>
<execution>
<phase>prepare-package</phase>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@
import org.eclipse.lyo.oslc.domains.qm.TestScript;
import org.eclipse.lyo.oslc.domains.config.VersionResource;

import org.eclipse.lyo.oslc4j.trs.server.TrsEventHandler;


// Start of user code imports
Expand All @@ -85,7 +86,7 @@ public class RestDelegate {
private static final Logger log = LoggerFactory.getLogger(RestDelegate.class);



@Inject TrsEventHandler trsEventHandler;
@Inject ResourcesFactory resourcesFactory;
// Start of user code class_attributes
public static final String SP_DEFAULT = "sp_single";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@
import co.oslc.refimpl.qm.gen.services.WsScripts;
import co.oslc.refimpl.qm.gen.services.WsResults;
import co.oslc.refimpl.qm.gen.services.WsExecRecords;
import org.eclipse.lyo.oslc4j.trs.server.service.TrackedResourceSetService;

// Start of user code imports
// End of user code
Expand All @@ -117,7 +118,7 @@
// End of user code

/**
* Generated by Lyo Designer 7.0.0-SNAPSHOT
* Generated by Lyo Designer 7.0.0.qualifier
*/

@OpenAPIDefinition(info = @Info(title = "QM", version = "1.0.0"), servers = @Server(url = "/services/"))
Expand Down Expand Up @@ -174,6 +175,8 @@ public Set<Object> getSingletons() {
// Start of user code OAuthServiceClasses_notFound
// End of user code
}
// TRS Server resources
RESOURCE_CLASSES.add(TrackedResourceSetService.class);

// Start of user code Custom Resource Classes
// End of user code
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,12 @@
import static co.oslc.refimpl.qm.gen.servlet.ServletListener.getServletUrlPattern;
import java.util.Set;

import java.net.URI;
import java.util.ArrayList;
import org.eclipse.lyo.oslc4j.trs.server.InmemPagedTrs;
import org.eclipse.lyo.oslc4j.trs.server.PagedTrs;
import org.eclipse.lyo.oslc4j.trs.server.PagedTrsFactory;
import org.eclipse.lyo.oslc4j.trs.server.TrsEventHandler;
import org.eclipse.lyo.oslc4j.core.OSLC4JUtils;
// Start of user code imports
// End of user code
Expand Down Expand Up @@ -69,6 +75,8 @@ protected void configure() {
bindFactory(ResourcesFactoryFactory.class).to(ResourcesFactory.class).in(Singleton.class);


bindFactory(InmemTrsEventHandlerFactory.class).to(TrsEventHandler.class).in(Singleton.class);
bindFactory(InmemPagedTrsFactory.class).to(PagedTrs.class).in(Singleton.class);

// Start of user code ConfigureFinalize
// End of user code
Expand Down Expand Up @@ -114,5 +122,42 @@ public void dispose(LyoAppConfiguration instance) {
}
}

static class InmemTrsEventHandlerFactory implements Factory<TrsEventHandler> {
// Start of user code TrsEventHandlerInitialise
// End of user code

@Override
public TrsEventHandler provide() {
ArrayList<URI> uris = new ArrayList<URI>();
// Start of user code TrsEventHandlerInitialBase
//TODO: Provide the initial list of URIs to populate the TRS log with
// End of user code

InmemPagedTrs inmemTrs = new PagedTrsFactory().getInmemPagedTrs(0, 0, uris);
return inmemTrs;
}

@Override
public void dispose(TrsEventHandler instance) {
// Start of user code TrsEventHandlerDispose
// End of user code
}
}

static class InmemPagedTrsFactory implements Factory<PagedTrs> {
@Inject TrsEventHandler trsEventHandler;

@Override
public PagedTrs provide() {
// Start of user code PagedTrsInitialise
// End of user code
return (InmemPagedTrs) trsEventHandler;
}

@Override
public void dispose(PagedTrs instance) {
// Start of user code PagedTrsDispose
// End of user code
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
// End of user code

/**
* Generated by Lyo Designer 7.0.0-SNAPSHOT
* Generated by Lyo Designer 7.0.0.qualifier
*/

@OpenAPIDefinition(info = @Info(title = "RM", version = "1.0.0"), servers = @Server(url = "/services/"))
Expand All @@ -103,14 +103,14 @@
// End of user code

@Override
public Set<Object> getSingletons() {

Check warning on line 106 in src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/servlet/Application.java

View workflow job for this annotation

GitHub Actions / build (25, liberica, false)

getSingletons() in jakarta.ws.rs.core.Application has been deprecated

Check warning on line 106 in src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/servlet/Application.java

View workflow job for this annotation

GitHub Actions / build (21, temurin, false)

getSingletons() in jakarta.ws.rs.core.Application has been deprecated

Check warning on line 106 in src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/servlet/Application.java

View workflow job for this annotation

GitHub Actions / maven-enforcer (21, temurin, false)

getSingletons() in jakarta.ws.rs.core.Application has been deprecated

Check warning on line 106 in src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/servlet/Application.java

View workflow job for this annotation

GitHub Actions / docker-compose-e2e-tomcat (21, temurin, false)

getSingletons() in jakarta.ws.rs.core.Application has been deprecated

Check warning on line 106 in src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/servlet/Application.java

View workflow job for this annotation

GitHub Actions / docker-compose-e2e (21, temurin, false)

getSingletons() in jakarta.ws.rs.core.Application has been deprecated

Check warning on line 106 in src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/servlet/Application.java

View workflow job for this annotation

GitHub Actions / mvn-acceptance (21, temurin, false)

getSingletons() in jakarta.ws.rs.core.Application has been deprecated

Check warning on line 106 in src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/servlet/Application.java

View workflow job for this annotation

GitHub Actions / mvn-acceptance (25, temurin, false)

getSingletons() in jakarta.ws.rs.core.Application has been deprecated
return Collections.singleton(new ApplicationBinder());
}
static
{
// RDF serialization/deserialization providers
RESOURCE_CLASSES.addAll(JenaProvidersRegistry.getProviders());
RESOURCE_CLASSES.addAll(Json4JProvidersRegistry.getProviders());

Check warning on line 113 in src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/servlet/Application.java

View workflow job for this annotation

GitHub Actions / build (25, liberica, false)

org.eclipse.lyo.oslc4j.provider.json4j.Json4JProvidersRegistry in org.eclipse.lyo.oslc4j.provider.json4j has been deprecated

Check warning on line 113 in src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/servlet/Application.java

View workflow job for this annotation

GitHub Actions / build (21, temurin, false)

org.eclipse.lyo.oslc4j.provider.json4j.Json4JProvidersRegistry in org.eclipse.lyo.oslc4j.provider.json4j has been deprecated

Check warning on line 113 in src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/servlet/Application.java

View workflow job for this annotation

GitHub Actions / maven-enforcer (21, temurin, false)

org.eclipse.lyo.oslc4j.provider.json4j.Json4JProvidersRegistry in org.eclipse.lyo.oslc4j.provider.json4j has been deprecated

Check warning on line 113 in src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/servlet/Application.java

View workflow job for this annotation

GitHub Actions / docker-compose-e2e-tomcat (21, temurin, false)

org.eclipse.lyo.oslc4j.provider.json4j.Json4JProvidersRegistry in org.eclipse.lyo.oslc4j.provider.json4j has been deprecated

Check warning on line 113 in src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/servlet/Application.java

View workflow job for this annotation

GitHub Actions / docker-compose-e2e (21, temurin, false)

org.eclipse.lyo.oslc4j.provider.json4j.Json4JProvidersRegistry in org.eclipse.lyo.oslc4j.provider.json4j has been deprecated

Check warning on line 113 in src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/servlet/Application.java

View workflow job for this annotation

GitHub Actions / mvn-acceptance (21, temurin, false)

org.eclipse.lyo.oslc4j.provider.json4j.Json4JProvidersRegistry in org.eclipse.lyo.oslc4j.provider.json4j has been deprecated

Check warning on line 113 in src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/servlet/Application.java

View workflow job for this annotation

GitHub Actions / mvn-acceptance (25, temurin, false)

org.eclipse.lyo.oslc4j.provider.json4j.Json4JProvidersRegistry in org.eclipse.lyo.oslc4j.provider.json4j has been deprecated

// CORS support
RESOURCE_CLASSES.add(co.oslc.refimpl.rm.gen.servlet.CorsFilter.class);
Expand Down
Loading