gCubeSystem
/
common-smartgears-app
16
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

moved to jakarta

This commit is contained in:
lucio 2024-03-12 14:25:51 +01:00
parent 28db5c0522
commit 502100d73e
4 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.classpath
View File

@ -8,7 +8,6 @@
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"> <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes> <attributes>
<attribute name="maven.pomderived" value="true"/> <attribute name="maven.pomderived" value="true"/>
<attribute name="org.eclipse.jst.component.nondependency" value=""/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry kind="src" output="target/classes" path="src/main/java"> <classpathentry kind="src" output="target/classes" path="src/main/java">
@ -19,9 +18,16 @@
</classpathentry> </classpathentry>
<classpathentry kind="src" output="target/test-classes" path="src/test/java"> <classpathentry kind="src" output="target/test-classes" path="src/test/java">
<attributes> <attributes>
<attribute name="test" value="true"/>
<attribute name="optional" value="true"/> <attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/> <attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
<attributes>
<attribute name="test" value="true"/> <attribute name="test" value="true"/>
<attribute name="maven.pomderived" value="true"/>
<attribute name="optional" value="true"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry kind="output" path="target/classes"/> <classpathentry kind="output" path="target/classes"/>

14
pom.xml
View File

@ -19,12 +19,14 @@
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>11</maven.compiler.source> <maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target> <maven.compiler.target>11</maven.compiler.target>
</properties> </properties>
<scm> <scm>
<connection>scm:git:https://code-repo.d4science.org/gCubeSystem/common-smartgears-app</connection> <connection>
<developerConnection>scm:git:https://code-repo.d4science.org/gCubeSystem/common-smartgears-app</developerConnection> scm:git:https://code-repo.d4science.org/gCubeSystem/common-smartgears-app</connection>
<developerConnection>
scm:git:https://code-repo.d4science.org/gCubeSystem/common-smartgears-app</developerConnection>
<url>https://code-repo.d4science.org/gCubeSystem/common-smartgears-app</url> <url>https://code-repo.d4science.org/gCubeSystem/common-smartgears-app</url>
</scm> </scm>
@ -43,10 +45,8 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>javax.servlet</groupId> <groupId>jakarta.servlet</groupId>
<artifactId>javax.servlet-api</artifactId> <artifactId>jakarta.servlet-api</artifactId>
<version>3.0.1</version>
<scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>

8
src/main/java/org/gcube/smartgears/ContextListener.java
View File

@ -4,9 +4,9 @@ import java.util.HashSet;
import java.util.Set; import java.util.Set;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import javax.servlet.ServletContextEvent; import jakarta.servlet.ServletContextEvent;
import javax.servlet.ServletContextListener; import jakarta.servlet.ServletContextListener;
import javax.servlet.annotation.WebListener; import jakarta.servlet.annotation.WebListener;
import org.gcube.smartgears.annotations.ManagedBy; import org.gcube.smartgears.annotations.ManagedBy;
import org.gcube.smartgears.application.manager.AppManagerObserver; import org.gcube.smartgears.application.manager.AppManagerObserver;
@ -81,7 +81,7 @@ public class ContextListener implements ServletContextListener {
context.events().subscribe(observer); context.events().subscribe(observer);
} }
else { else {
log.info("no application managers faound for {}",context.name()); log.info("no application managers found for {}",context.name());
} }
} }

2
src/main/java/org/gcube/smartgears/ContextProvider.java
View File

@ -1,6 +1,6 @@
package org.gcube.smartgears; package org.gcube.smartgears;
import javax.servlet.ServletContext; import jakarta.servlet.ServletContext;
import org.gcube.common.events.Hub; import org.gcube.common.events.Hub;
import org.gcube.smartgears.configuration.application.ApplicationConfiguration; import org.gcube.smartgears.configuration.application.ApplicationConfiguration;