diff --git a/CHANGELOG.md b/CHANGELOG.md index c5b485c9..3fd61563 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# Lyo Designer Changelog +# Eclipse Lyo Designer Changelog ## [Unreleased] @@ -11,6 +11,8 @@ ### Changed +- (**Breaking change**🧨) Migrated from Javax to Jakarta packages +- upgrade to Jersey 3.1.5 - generate the necessary maven dependencies for domain models that (a) are imported into the adaptor model yet (b) the adaptor is configured to not generate code from imported models. In such scenario, the maven dependency for the domain is necessary. - `LYO_BASE` is replaced with `LYO_BASEURL`. To override the Base URL of the adaptor, use the `baseurl` property. This release makes the use of this property consistent and check the `LYO_BASEURL` environment variable instead of `LYO_BASE`. - Upgraded the frontend libraries from Bootstrap v4.0.0-beta to v4.2.1. @@ -26,6 +28,8 @@ ### Removed +- (**Breaking change**🧨) Removed support for JDK 11 (and all versions below 17) in the generated code. **JDK 17 is the new baseline for Eclipse Lyo.** The SDK and sample code has been tested using JDK 17, 20, and 21-ea. +- (**Breaking change**🧨) Removed support for Java EE and Jakarta EE 8 in the generated code. - The CSS and JS assets from Bootstrap are no longer bundled. The following files should be removed from the generated codebase: - `src/main/webapp/static/css/bootstrap-4.0.0-beta.min.css` - `src/main/webapp/static/js/bootstrap-4.0.0-beta.min.js` diff --git a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/config/generatePomXml.mtl b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/config/generatePomXml.mtl index 600ed329..852a079f 100644 --- a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/config/generatePomXml.mtl +++ b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/config/generatePomXml.mtl @@ -52,9 +52,9 @@ endif) [javaVersion(mavenProjectConfiguration.lyoVersion)/] [javaVersion(mavenProjectConfiguration.lyoVersion)/] [mavenProjectConfiguration.lyoVersion/] - 2.35 + 3.1.5 [if (swaggerDocumentationEnabled)] - 2.2.7 + 2.2.20 3.52.5 [/if] [if (serverImplementation)] @@ -92,6 +92,42 @@ endif) [/template] +[template public additionalProfiles(traceabilityContext : OclAny) post (trim())] +[/template] + +[template private profiles(traceabilityContext : OclAny)] + + + + + + + with-jstl-impl + + + + + + jakarta.servlet.jsp.jstl + jakarta.servlet.jsp.jstl-api + 3.0.0 + + + org.glassfish.web + jakarta.servlet.jsp.jstl + 3.0.1 + + + + [additionalProfiles()/] + +[/template] + [template private generalDependencies(traceabilityContext : OclAny)] - javax.servlet - javax.servlet-api - 3.1.0 + jakarta.servlet + jakarta.servlet-api + 6.0.0 provided jakarta.servlet.jsp.jstl jakarta.servlet.jsp.jstl-api - 1.2.5 + 3.0.0 + + provided -[if serverImplementation] org.glassfish.hk2.external jakarta.inject 2.6.1 - org.glassfish.jersey.core jersey-server @@ -167,10 +205,9 @@ endif) org.glassfish.jaxb jaxb-runtime - 4.0.2 + 4.0.5 runtime -[/if] [/template] [template private lyoDependencies(serverImplementation : Boolean, clientImplementation : Boolean, authenticationEnabled : Boolean, trsServiceEnabled : Boolean, storeEnabled : Boolean) post (trim())] @@ -277,13 +314,14 @@ If multiple DSs share the same maven dependency, we group them into 1. [projectHeader(anAdaptorInterface.name, mavenProjectConfiguration, true)/] [mavenProperties(mavenProjectConfiguration, anAdaptorInterface.swaggerDocumentationEnabled(), true, mavenServerConfiguration)/] [repositories()/] + [profiles()/] [generalDependencies()/] - [servletDependencies(true)/] + [servletDependencies()/] [lyoDependencies(true, not anAdaptorInterface.requiredAdaptors->isEmpty(), anAdaptorInterface.authenticationEnabled(), anAdaptorInterface.trsServiceEnabled(), anAdaptorInterface.storeEnabled())/] [anAdaptorInterface.domainSpecificationDependencies()/] [anAdaptorInterface.additionalDependencies()/] @@ -291,7 +329,7 @@ If multiple DSs share the same maven dependency, we group them into 1. io.swagger.core.v3 - swagger-jaxrs2 + swagger-jaxrs2-jakarta ${swagger.version} @@ -303,7 +341,7 @@ If multiple DSs share the same maven dependency, we group them into 1. io.swagger.core.v3 - swagger-jaxrs2-servlet-initializer-v2 + swagger-jaxrs2-servlet-initializer-v2-jakarta ${swagger.version} [/if] @@ -336,7 +374,7 @@ If multiple DSs share the same maven dependency, we group them into 1. org.eclipse.jetty jetty-maven-plugin - 10.0.7 + 11.0.20 ${application.contextpath} @@ -353,15 +391,13 @@ If multiple DSs share the same maven dependency, we group them into 1. org.codehaus.cargo cargo-maven3-plugin - 1.10.6 + 1.10.12 - tomcat9x - - - + tomcat10x + jetty12x @@ -459,7 +495,6 @@ If multiple DSs share the same maven dependency, we group them into 1. --> [generalDependencies()/] - [servletDependencies(false)/] [lyoDependencies(false, false, false, false, false)/] [aSpecification.domainSpecificationDependencies()/] [generalDependencies()/] - [servletDependencies(false)/] [lyoDependencies(false, false, false, false, false)/] diff --git a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/config/generateWebXml.mtl b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/config/generateWebXml.mtl index b4cc3cec..5b67dc58 100644 --- a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/config/generateWebXml.mtl +++ b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/config/generateWebXml.mtl @@ -28,7 +28,7 @@ JAX-RS Servlet org.glassfish.jersey.servlet.ServletContainer - javax.ws.rs.Application + jakarta.ws.rs.Application [javaClassFullNameForAdaptorApplication(anAdaptorInterface)/] 1 diff --git a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateAdaptorApplication.mtl b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateAdaptorApplication.mtl index 896760de..90be88d5 100644 --- a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateAdaptorApplication.mtl +++ b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateAdaptorApplication.mtl @@ -34,7 +34,7 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.glassfish.hk2.api.ServiceLocator; import org.glassfish.hk2.utilities.ServiceLocatorUtilities; @@ -130,7 +130,7 @@ package [javaClassPackageNameForAdaptorApplication(anAdaptorInterface) /]; [if (anAdaptorInterface.swaggerDocumentationEnabled())] @OpenAPIDefinition(info = @Info(title = "[anAdaptorInterface.name/]", version = "1.0.0"), servers = @Server(url = "[anAdaptorInterface.getServletFullPath()/]")) [/if] -public class [javaClassNameForAdaptorApplication(anAdaptorInterface) /] extends javax.ws.rs.core.Application { +public class [javaClassNameForAdaptorApplication(anAdaptorInterface) /] extends jakarta.ws.rs.core.Application { private static final Set> RESOURCE_CLASSES = new HashSet>(); private static final Map> RESOURCE_SHAPE_PATH_TO_RESOURCE_CLASS_MAP = new HashMap>(); diff --git a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateAdaptorClient.mtl b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateAdaptorClient.mtl index 815c3374..7d052eca 100644 --- a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateAdaptorClient.mtl +++ b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateAdaptorClient.mtl @@ -44,7 +44,7 @@ package [javaClassPackageNameForClient(aRequiredAdaptor, anAdaptorInterface) /]; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.eclipse.lyo.client.OSLCConstants; import org.eclipse.lyo.client.OslcClient; import org.eclipse.lyo.oslc4j.core.model.ServiceProviderCatalog; diff --git a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateAdaptorManager.mtl b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateAdaptorManager.mtl index 0f91dfad..b2ef10b9 100644 --- a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateAdaptorManager.mtl +++ b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateAdaptorManager.mtl @@ -82,9 +82,9 @@ package [javaClassPackageNameForAdaptorManager(anAdaptorInterface) /]; // [/protected] [/if] -import javax.inject.Inject; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.ServletContextEvent; +import jakarta.inject.Inject; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.ServletContextEvent; import java.util.List; import java.util.ArrayList; import org.slf4j.Logger; diff --git a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateAdaptorResourcesFactory.mtl b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateAdaptorResourcesFactory.mtl index e8e231cd..87e197e4 100644 --- a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateAdaptorResourcesFactory.mtl +++ b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateAdaptorResourcesFactory.mtl @@ -27,7 +27,7 @@ import java.net.URI; import java.net.URISyntaxException; import java.util.HashMap; import java.util.Map; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriBuilder; import org.eclipse.lyo.oslc4j.core.model.Link; import org.eclipse.lyo.oslc4j.core.OSLC4JUtils; diff --git a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateAdaptorServiceProviderFactory.mtl b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateAdaptorServiceProviderFactory.mtl index 5553f62c..ff546772 100644 --- a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateAdaptorServiceProviderFactory.mtl +++ b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateAdaptorServiceProviderFactory.mtl @@ -51,7 +51,7 @@ import java.util.Date; import java.util.HashMap; import java.util.Map; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriBuilder; import org.eclipse.lyo.oslc4j.core.exception.OslcCoreApplicationException; import org.eclipse.lyo.oslc4j.core.model.OslcConstants; diff --git a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateAdaptorServletListener.mtl b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateAdaptorServletListener.mtl index c0b0baeb..39cbcb52 100644 --- a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateAdaptorServletListener.mtl +++ b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateAdaptorServletListener.mtl @@ -35,11 +35,11 @@ import java.util.Optional; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.servlet.ServletContext; -import javax.servlet.ServletContextEvent; -import javax.servlet.ServletContextListener; -import javax.servlet.ServletRegistration; -import javax.ws.rs.core.UriBuilder; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletContextEvent; +import jakarta.servlet.ServletContextListener; +import jakarta.servlet.ServletRegistration; +import jakarta.ws.rs.core.UriBuilder; import org.eclipse.lyo.oslc4j.core.OSLC4JUtils; import [javaClassFullNameForAdaptorManager(anAdaptorInterface) /]; diff --git a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateApplicationBinder.mtl b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateApplicationBinder.mtl index 71ad324b..d29aacb0 100644 --- a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateApplicationBinder.mtl +++ b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateApplicationBinder.mtl @@ -46,7 +46,7 @@ import org.slf4j.LoggerFactory; import org.glassfish.hk2.api.Factory; import org.glassfish.hk2.utilities.binding.AbstractBinder; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import [anAdaptorInterface.javaClassFullNameForAdaptorManager()/]; import [anAdaptorInterface.javaClassFullNameForResourcesFactory()/]; diff --git a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateAuthenticationApplication.mtl b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateAuthenticationApplication.mtl index 8713c2d8..c4dee0dd 100644 --- a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateAuthenticationApplication.mtl +++ b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateAuthenticationApplication.mtl @@ -52,9 +52,9 @@ import java.util.Optional; import java.io.IOException; import java.io.UnsupportedEncodingException; import java.nio.charset.StandardCharsets; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateCredentialsFilter.mtl b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateCredentialsFilter.mtl index 5d17f0cd..63af5fb4 100644 --- a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateCredentialsFilter.mtl +++ b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateCredentialsFilter.mtl @@ -35,15 +35,15 @@ import java.util.Optional; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletOutputStream; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletOutputStream; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import net.oauth.OAuth; import net.oauth.OAuthException; import net.oauth.OAuthMessage; diff --git a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateResourceService.mtl b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateResourceService.mtl index 7435e226..bae286a4 100644 --- a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateResourceService.mtl +++ b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateResourceService.mtl @@ -62,30 +62,30 @@ import java.util.List; import java.util.Set; import java.util.TreeSet; -import javax.inject.Inject; -import javax.servlet.RequestDispatcher; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.FormParam; -import javax.ws.rs.GET; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; -import javax.ws.rs.core.UriInfo; -import javax.ws.rs.core.UriBuilder; +import jakarta.inject.Inject; +import jakarta.servlet.RequestDispatcher; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.FormParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.HeaderParam; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.UriInfo; +import jakarta.ws.rs.core.UriBuilder; import org.apache.wink.json4j.JSONException; import org.apache.wink.json4j.JSONObject; diff --git a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateResourceShapeService.mtl b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateResourceShapeService.mtl index b9c8bb1f..b1738e51 100644 --- a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateResourceShapeService.mtl +++ b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateResourceShapeService.mtl @@ -49,20 +49,20 @@ import java.util.Set; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.servlet.RequestDispatcher; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; -import javax.ws.rs.core.UriInfo; +import jakarta.servlet.RequestDispatcher; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.UriInfo; import org.eclipse.lyo.oslc4j.core.model.OslcConstants; import org.eclipse.lyo.oslc4j.core.model.OslcMediaType; import org.eclipse.lyo.oslc4j.core.OSLC4JUtils; @@ -87,7 +87,7 @@ public class [javaClassNameForResourceShapeService(anAdaptorInterface)/] @Context private HttpServletRequest httpServletRequest; @Context private HttpServletResponse httpServletResponse; @Context private UriInfo uriInfo; - @Context private javax.ws.rs.core.Application jaxrsApplication; + @Context private jakarta.ws.rs.core.Application jaxrsApplication; private static final Logger log = LoggerFactory.getLogger([javaClassNameForResourceShapeService(anAdaptorInterface)/].class.getName()); diff --git a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateRootServicesService.mtl b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateRootServicesService.mtl index 392c835b..47c59905 100644 --- a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateRootServicesService.mtl +++ b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateRootServicesService.mtl @@ -23,17 +23,17 @@ [template public generateImports(anAdaptorInterface : AdaptorInterface)] -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.ResponseBuilder; -import javax.ws.rs.core.UriBuilder; -import javax.ws.rs.core.UriInfo; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.ResponseBuilder; +import jakarta.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriInfo; import org.eclipse.lyo.oslc4j.core.model.OslcMediaType; import org.eclipse.lyo.oslc4j.core.OSLC4JUtils; import [javaInterfaceFullNameForAdaptorConstants(anAdaptorInterface) /]; diff --git a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateServiceProviderCatalogService.mtl b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateServiceProviderCatalogService.mtl index aceaf3f4..2870cfa3 100644 --- a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateServiceProviderCatalogService.mtl +++ b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateServiceProviderCatalogService.mtl @@ -45,19 +45,19 @@ import java.io.IOException; import java.net.URI; import java.net.URISyntaxException; -import javax.servlet.RequestDispatcher; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response.Status; -import javax.ws.rs.core.UriInfo; -import javax.ws.rs.core.Response; +import jakarta.servlet.RequestDispatcher; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.UriInfo; +import jakarta.ws.rs.core.Response; import org.eclipse.lyo.oslc4j.core.annotation.OslcDialog; import org.eclipse.lyo.oslc4j.core.annotation.OslcQueryCapability; diff --git a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateServiceProviderCatalogSingleton.mtl b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateServiceProviderCatalogSingleton.mtl index fdf7f308..5ab9148d 100644 --- a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateServiceProviderCatalogSingleton.mtl +++ b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateServiceProviderCatalogSingleton.mtl @@ -48,10 +48,10 @@ import java.util.SortedSet; import java.util.TreeMap; import java.util.TreeSet; -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.Response.Status; -import javax.ws.rs.core.UriBuilder; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.UriBuilder; import org.eclipse.lyo.oslc4j.core.exception.OslcCoreApplicationException; import org.eclipse.lyo.oslc4j.core.model.Service; diff --git a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateServiceProviderService.mtl b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateServiceProviderService.mtl index b8e7e5b0..6bbee556 100644 --- a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateServiceProviderService.mtl +++ b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateServiceProviderService.mtl @@ -44,18 +44,18 @@ [template public generateImports(aServiceProvider : ServiceProvider)] import java.io.IOException; -import javax.servlet.RequestDispatcher; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response.Status; +import jakarta.servlet.RequestDispatcher; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response.Status; import org.eclipse.lyo.oslc4j.core.annotation.OslcDialog; import org.eclipse.lyo.oslc4j.core.annotation.OslcQueryCapability; diff --git a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateWebService.mtl b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateWebService.mtl index 9802a9b7..82c26518 100644 --- a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateWebService.mtl +++ b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateWebService.mtl @@ -63,30 +63,30 @@ import java.util.List; import java.util.Set; import java.util.TreeSet; -import javax.inject.Inject; -import javax.servlet.RequestDispatcher; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.FormParam; -import javax.ws.rs.GET; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; -import javax.ws.rs.core.UriInfo; -import javax.ws.rs.core.UriBuilder; +import jakarta.inject.Inject; +import jakarta.servlet.RequestDispatcher; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.FormParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.HeaderParam; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.UriInfo; +import jakarta.ws.rs.core.UriBuilder; import org.apache.wink.json4j.JSONException; import org.apache.wink.json4j.JSONObject; diff --git a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateGetResourceJsp.mtl b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateGetResourceJsp.mtl index 3e531bbe..bc6d3c64 100644 --- a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateGetResourceJsp.mtl +++ b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateGetResourceJsp.mtl @@ -65,7 +65,7 @@ <%@page import="java.util.Iterator"%> <%@page import="java.util.Map"%> <%@page import="javax.xml.namespace.QName"%> -<%@page import="javax.ws.rs.core.UriBuilder"%> +<%@page import="jakarta.ws.rs.core.UriBuilder"%> <%@page import="[javaClassFullName(aResource, contextAdaptorInterface, null) /]"%> <%@page import="[javaInterfaceFullNameForConstants(aResource.definingDomainSpecification(), contextAdaptorInterface, defaultJavaClassPackageName)/]"%> diff --git a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateGetResourceLargePreviewJsp.mtl b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateGetResourceLargePreviewJsp.mtl index 53db4106..c8d6b6fb 100644 --- a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateGetResourceLargePreviewJsp.mtl +++ b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateGetResourceLargePreviewJsp.mtl @@ -65,7 +65,7 @@ <%@page import="java.util.Iterator"%> <%@page import="java.util.Map"%> <%@page import="javax.xml.namespace.QName"%> -<%@page import="javax.ws.rs.core.UriBuilder"%> +<%@page import="jakarta.ws.rs.core.UriBuilder"%> <%@page import="[javaClassFullName(aResource, contextAdaptorInterface, null) /]"%> <%@page import="[javaInterfaceFullNameForConstants(aResource.definingDomainSpecification(), contextAdaptorInterface, defaultJavaClassPackageName)/]"%> diff --git a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateGetResourceSmallPreviewJsp.mtl b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateGetResourceSmallPreviewJsp.mtl index a117321e..92f163d5 100644 --- a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateGetResourceSmallPreviewJsp.mtl +++ b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateGetResourceSmallPreviewJsp.mtl @@ -65,7 +65,7 @@ <%@page import="java.util.Iterator"%> <%@page import="java.util.Map"%> <%@page import="javax.xml.namespace.QName"%> -<%@page import="javax.ws.rs.core.UriBuilder"%> +<%@page import="jakarta.ws.rs.core.UriBuilder"%> <%@page import="[javaClassFullName(aResource, contextAdaptorInterface, null) /]"%> <%@page import="[javaInterfaceFullNameForConstants(aResource.definingDomainSpecification(), contextAdaptorInterface, defaultJavaClassPackageName)/]"%> diff --git a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateGetResourceViewForOslcUIJsp.mtl b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateGetResourceViewForOslcUIJsp.mtl index b1cc5d11..626dce8e 100644 --- a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateGetResourceViewForOslcUIJsp.mtl +++ b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateGetResourceViewForOslcUIJsp.mtl @@ -65,7 +65,7 @@ <%@page import="java.util.Iterator"%> <%@page import="java.util.Map"%> <%@page import="javax.xml.namespace.QName"%> -<%@page import="javax.ws.rs.core.UriBuilder"%> +<%@page import="jakarta.ws.rs.core.UriBuilder"%> <%@page import="org.eclipse.lyo.oslc4j.core.model.AbstractResource"%> <%@ page contentType="text/html" language="java" pageEncoding="UTF-8" %> diff --git a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateIndexJsp.mtl b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateIndexJsp.mtl index 6562f5b8..b18350de 100644 --- a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateIndexJsp.mtl +++ b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateIndexJsp.mtl @@ -43,7 +43,7 @@ --%> <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%> -<%@page import="javax.ws.rs.core.UriBuilder"%> +<%@page import="jakarta.ws.rs.core.UriBuilder"%> <%@page import="java.net.URI"%> <%@ page language="java" contentType="text/html; charset=UTF-8" diff --git a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateResourceCollectionJsp.mtl b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateResourceCollectionJsp.mtl index a7af7c30..31d954a6 100644 --- a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateResourceCollectionJsp.mtl +++ b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateResourceCollectionJsp.mtl @@ -47,7 +47,7 @@ <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> -<%@page import="javax.ws.rs.core.UriBuilder"%> +<%@page import="jakarta.ws.rs.core.UriBuilder"%> <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%> <%@page import="org.eclipse.lyo.oslc4j.core.model.ServiceProvider"%> <%@page import="org.eclipse.lyo.oslc4j.core.model.AbstractResource"%> diff --git a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateResourceCreatorClientJsp.mtl b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateResourceCreatorClientJsp.mtl index 0f0e23ec..0604766f 100644 --- a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateResourceCreatorClientJsp.mtl +++ b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateResourceCreatorClientJsp.mtl @@ -46,7 +46,7 @@ This file is generated by Lyo Designer (https://www.eclipse.org/lyo/) --%> -<%@page import="javax.ws.rs.core.UriBuilder"%> +<%@page import="jakarta.ws.rs.core.UriBuilder"%> <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%> <%@page import="org.eclipse.lyo.oslc4j.core.model.ServiceProvider" %> <%@ page contentType="text/html" language="java" pageEncoding="UTF-8" %> diff --git a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateResourceCreatorJsp.mtl b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateResourceCreatorJsp.mtl index af807193..424ce75b 100644 --- a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateResourceCreatorJsp.mtl +++ b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateResourceCreatorJsp.mtl @@ -54,7 +54,7 @@ <%@page import="[javaClassFullName(aResource, anAdaptorInterface, null) /]"%> [/for] <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%> -<%@page import="javax.ws.rs.core.UriBuilder"%> +<%@page import="jakarta.ws.rs.core.UriBuilder"%> <%@ page contentType="text/html" language="java" pageEncoding="UTF-8" %> diff --git a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateResourceSelectorClientJsp.mtl b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateResourceSelectorClientJsp.mtl index a1febd9b..2928158f 100644 --- a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateResourceSelectorClientJsp.mtl +++ b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateResourceSelectorClientJsp.mtl @@ -46,7 +46,7 @@ This file is generated by Lyo Designer (https://www.eclipse.org/lyo/) --%> -<%@page import="javax.ws.rs.core.UriBuilder"%> +<%@page import="jakarta.ws.rs.core.UriBuilder"%> <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%> <%@page import="org.eclipse.lyo.oslc4j.core.model.ServiceProvider" %> <%@ page contentType="text/html" language="java" pageEncoding="UTF-8" %> diff --git a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateResourceSelectorJsp.mtl b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateResourceSelectorJsp.mtl index 7d0f177d..e4ede54e 100644 --- a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateResourceSelectorJsp.mtl +++ b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateResourceSelectorJsp.mtl @@ -52,7 +52,7 @@ <%@page import="[javaClassFullName(aResource, anAdaptorInterface, null) /]"%> [/for] <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%> -<%@page import="javax.ws.rs.core.UriBuilder"%> +<%@page import="jakarta.ws.rs.core.UriBuilder"%> <%@ page contentType="text/html" language="java" pageEncoding="UTF-8" %> diff --git a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateResourceShapeJsp.mtl b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateResourceShapeJsp.mtl index b15c0f08..1c5f070c 100644 --- a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateResourceShapeJsp.mtl +++ b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateResourceShapeJsp.mtl @@ -48,7 +48,7 @@ <%@page import="org.eclipse.lyo.oslc4j.core.model.ResourceShape"%> <%@page import="org.eclipse.lyo.oslc4j.core.model.Property"%> <%@page import="org.eclipse.lyo.oslc4j.core.model.OslcConstants"%> -<%@page import="javax.ws.rs.core.UriBuilder"%> +<%@page import="jakarta.ws.rs.core.UriBuilder"%> <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%> <%@ page contentType="text/html" language="java" pageEncoding="UTF-8" %> diff --git a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateServiceProviderCatalogHTML.mtl b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateServiceProviderCatalogHTML.mtl index 478d847a..7088cc61 100644 --- a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateServiceProviderCatalogHTML.mtl +++ b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateServiceProviderCatalogHTML.mtl @@ -45,7 +45,7 @@ <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> <%@ page import="org.eclipse.lyo.oslc4j.core.model.ServiceProviderCatalog" %> <%@ page import="org.eclipse.lyo.oslc4j.core.model.ServiceProvider" %> -<%@page import="javax.ws.rs.core.UriBuilder"%> +<%@page import="jakarta.ws.rs.core.UriBuilder"%> <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%> <%@ page contentType="text/html" language="java" pageEncoding="UTF-8" %> diff --git a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateServiceProviderHTML.mtl b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateServiceProviderHTML.mtl index addb47c6..7070a0ed 100644 --- a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateServiceProviderHTML.mtl +++ b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateServiceProviderHTML.mtl @@ -53,7 +53,7 @@ <%@ page import="org.eclipse.lyo.oslc4j.core.model.CreationFactory" %> <%@ page import="org.eclipse.lyo.oslc4j.core.model.ResourceShape" %> <%@ page import="org.eclipse.lyo.oslc4j.core.model.QueryCapability" %> -<%@page import="javax.ws.rs.core.UriBuilder"%> +<%@page import="jakarta.ws.rs.core.UriBuilder"%> <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%> <%@ page contentType="text/html" language="java" pageEncoding="UTF-8" %> diff --git a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateSwaggerIndexJsp.mtl b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateSwaggerIndexJsp.mtl index f7c1f08c..36e458aa 100644 --- a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateSwaggerIndexJsp.mtl +++ b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateSwaggerIndexJsp.mtl @@ -135,7 +135,7 @@ --%> <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%> -<%@page import="javax.ws.rs.core.UriBuilder"%> +<%@page import="jakarta.ws.rs.core.UriBuilder"%> <%@page import="java.net.URI"%> <%@page import="java.io.File"%> diff --git a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/services/storeServices.mtl b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/services/storeServices.mtl index 012e868a..e75e72f7 100644 --- a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/services/storeServices.mtl +++ b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/services/storeServices.mtl @@ -97,8 +97,8 @@ import org.eclipse.lyo.store.ModelUnmarshallingException; import org.eclipse.lyo.store.Store; import org.eclipse.lyo.store.StorePool; import org.eclipse.lyo.store.StoreAccessException; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.Response.Status; [/if] [/template]