diff --git a/model/representations.aird b/model/representations.aird index b3367cbb..82c1b8bb 100644 --- a/model/representations.aird +++ b/model/representations.aird @@ -6,7 +6,7 @@ platform:/resource/org.eclipse.lyo.tools.domainmodels/vocabulary.xml - + @@ -18,7 +18,7 @@ - + @@ -26,7 +26,7 @@ - + @@ -892,77 +892,77 @@ - - - - - - - - - - - - - - - - - - - - - - - - + + + + - - - + + + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + - - - + + + - - - + + + @@ -1001,57 +1001,61 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + - - - + + + + + + + @@ -1061,21 +1065,17 @@ - - - - - - - + + + - - - + + + - - - + + + @@ -1476,42 +1476,42 @@ - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + @@ -1524,26 +1524,26 @@ - - - - + + + + - - - - + + + + - - - - + + + + @@ -1556,18 +1556,18 @@ - - - - + + + + - - - - + + + + @@ -1580,42 +1580,42 @@ - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + @@ -1687,50 +1687,58 @@ - - - - + + + + - - - - + + + + - - - - + + + + + + + + + + + + - - - - + + + + - - - - + + + + - - - - + + + + @@ -1743,26 +1751,18 @@ - - - - - - - - - - - - + + + + - - - - + + + + @@ -1775,18 +1775,26 @@ - - - - + + + + - - - - + + + + + + + + + + + + @@ -1807,34 +1815,26 @@ - - - - - - - - - - - - + + + + - - - - + + + + - - - - + + + + @@ -3231,37 +3231,37 @@ - - - - - - - + + + - - - + + + + + + + + + + + - - - - - - - + + + @@ -3296,33 +3296,33 @@ + + + + - - - - - - - + + + - - - + + + - - - + + + - - - + + + @@ -3353,21 +3353,21 @@ - - - - - - - + + + - - - + + + + + + + @@ -3377,14 +3377,14 @@ + + + + - - - - @@ -3414,14 +3414,6 @@ - - - - - - - - @@ -3430,6 +3422,14 @@ + + + + + + + + @@ -3455,37 +3455,37 @@ - - - - - - - + + + - - - - - - - + + + - - - + + + - - - + + + + + + + + + + + @@ -3598,6 +3598,17 @@ + + + + + + + + + + + @@ -3659,7 +3670,7 @@ - + @@ -3691,7 +3702,7 @@ - + @@ -4216,18 +4227,10 @@ - - - - - - - - - - - - + + + + @@ -4240,10 +4243,18 @@ - - - - + + + + + + + + + + + + @@ -4256,26 +4267,26 @@ - - - - + + + + - - - - + + + + - - - - + + + + @@ -4339,34 +4350,34 @@ - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + @@ -4379,18 +4390,18 @@ - - - - + + + + - - - - + + + + @@ -4446,18 +4457,10 @@ - - - - - - - - - - - - + + + + @@ -4470,10 +4473,18 @@ - - - - + + + + + + + + + + + + @@ -4494,18 +4505,18 @@ - - - - + + + + - - - - + + + + @@ -4561,22 +4572,6 @@ - - - - - - - - - - - - - - - - @@ -4593,6 +4588,22 @@ + + + + + + + + + + + + + + + + @@ -4636,18 +4647,10 @@ - - - - - - - - - - - - + + + + @@ -4660,26 +4663,18 @@ - - - - - - - - - - - - + + + + - - - - + + + + @@ -4692,10 +4687,26 @@ - - - - + + + + + + + + + + + + + + + + + + + + @@ -4961,6 +4972,14 @@ + + + + + + + + diff --git a/model/toolchain.xml b/model/toolchain.xml index 2a3ff26f..1451c527 100644 --- a/model/toolchain.xml +++ b/model/toolchain.xml @@ -113,6 +113,7 @@ + @@ -206,6 +207,7 @@ + diff --git a/src/server-am/src/main/java/co/oslc/refimpl/am/gen/servlet/Application.java b/src/server-am/src/main/java/co/oslc/refimpl/am/gen/servlet/Application.java index 38db0279..d16311d4 100644 --- a/src/server-am/src/main/java/co/oslc/refimpl/am/gen/servlet/Application.java +++ b/src/server-am/src/main/java/co/oslc/refimpl/am/gen/servlet/Application.java @@ -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/")) diff --git a/src/server-cm/pom.xml b/src/server-cm/pom.xml index 57b4ff77..7677d174 100644 --- a/src/server-cm/pom.xml +++ b/src/server-cm/pom.xml @@ -24,7 +24,7 @@ UTF-8 21 7.0.0-SNAPSHOT - 5.32.8 + 5.31.0 8801 / server-cm @@ -233,6 +233,10 @@ org.eclipse.lyo.oslc4j.core oslc4j-json4j-provider + + org.eclipse.lyo.trs + trs-server + org.eclipse.lyo.clients oslc-client @@ -301,7 +305,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.15.0 + 3.14.1 -Xlint:fallthrough,unchecked,removal,deprecation,dep-ann,varargs,overloads,serial,try,finally @@ -364,7 +368,7 @@ org.apache.maven.plugins maven-dependency-plugin - 3.11.0 + 3.9.0 prepare-package diff --git a/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/RestDelegate.java b/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/RestDelegate.java index aed0cf33..95486db4 100644 --- a/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/RestDelegate.java +++ b/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/RestDelegate.java @@ -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 @@ -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"; diff --git a/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/servlet/Application.java b/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/servlet/Application.java index d8db8bc7..af2b2ca9 100644 --- a/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/servlet/Application.java +++ b/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/servlet/Application.java @@ -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 @@ -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/")) @@ -154,6 +155,8 @@ public Set 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); diff --git a/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/servlet/ApplicationBinder.java b/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/servlet/ApplicationBinder.java index 7890a00d..5d3d7bd7 100644 --- a/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/servlet/ApplicationBinder.java +++ b/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/servlet/ApplicationBinder.java @@ -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 @@ -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 @@ -114,5 +122,42 @@ public void dispose(LyoAppConfiguration instance) { } } + static class InmemTrsEventHandlerFactory implements Factory { + // Start of user code TrsEventHandlerInitialise + // End of user code + + @Override + public TrsEventHandler provide() { + ArrayList uris = new ArrayList(); + // 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 { + @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 + } + } } diff --git a/src/server-qm/pom.xml b/src/server-qm/pom.xml index e7cc8405..6852e3f2 100644 --- a/src/server-qm/pom.xml +++ b/src/server-qm/pom.xml @@ -24,7 +24,7 @@ UTF-8 21 7.0.0-SNAPSHOT - 5.32.8 + 5.31.0 8802 / server-qm @@ -233,6 +233,10 @@ org.eclipse.lyo.oslc4j.core oslc4j-json4j-provider + + org.eclipse.lyo.trs + trs-server + org.eclipse.lyo.clients oslc-client @@ -297,7 +301,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.15.0 + 3.14.1 -Xlint:fallthrough,unchecked,removal,deprecation,dep-ann,varargs,overloads,serial,try,finally @@ -360,7 +364,7 @@ org.apache.maven.plugins maven-dependency-plugin - 3.11.0 + 3.9.0 prepare-package diff --git a/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/RestDelegate.java b/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/RestDelegate.java index 77e491ac..b4e6c21d 100644 --- a/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/RestDelegate.java +++ b/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/RestDelegate.java @@ -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 @@ -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"; diff --git a/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/servlet/Application.java b/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/servlet/Application.java index e451669f..20ab79f9 100644 --- a/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/servlet/Application.java +++ b/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/servlet/Application.java @@ -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 @@ -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/")) @@ -174,6 +175,8 @@ public Set 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 diff --git a/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/servlet/ApplicationBinder.java b/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/servlet/ApplicationBinder.java index 9bef46d4..9c5d24d5 100644 --- a/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/servlet/ApplicationBinder.java +++ b/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/servlet/ApplicationBinder.java @@ -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 @@ -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 @@ -114,5 +122,42 @@ public void dispose(LyoAppConfiguration instance) { } } + static class InmemTrsEventHandlerFactory implements Factory { + // Start of user code TrsEventHandlerInitialise + // End of user code + + @Override + public TrsEventHandler provide() { + ArrayList uris = new ArrayList(); + // 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 { + @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 + } + } } diff --git a/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/servlet/Application.java b/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/servlet/Application.java index f8476c94..6179c01d 100644 --- a/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/servlet/Application.java +++ b/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/servlet/Application.java @@ -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/"))